generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert 8538 "Reland "Fix CVO in androidvideocapturer."""

Browse Source 
> Reland "Fix CVO in androidvideocapturer.""
> This reverts commit b8bcf8cbbf.
> after I fixed a rebase mistake. The fix is the delta between patchset 1 and 2.
> 
> The original cl was reviewed here:
> https://webrtc-codereview.appspot.com/40759004/
> 
> TBR=magjed@webrtc.org
> 
> BUG=4145
> 
> Review URL: https://webrtc-codereview.appspot.com/45409004

TBR=perkj@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/44439004

Cr-Commit-Position: refs/heads/master@{#8539}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8539 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
aluebs@webrtc.org 2015-02-27 23:27:26 +00:00
parent 3a93e33c56
commit 73acc15c69
7 changed files with 33 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
talk/app/webrtc/androidvideocapturer.cc
View File

@ -85,7 +85,7 @@ class AndroidVideoCapturer::FrameFactory : public cricket::VideoFrameFactory {
// Check that captured_frame is actually our frame. // Check that captured_frame is actually our frame.
DCHECK(captured_frame == &captured_frame_); DCHECK(captured_frame == &captured_frame_);
scoped_ptr<WebRtcVideoFrame> frame(new WebRtcVideoFrame()); scoped_ptr<WebRtcVideoFrame> frame(new WebRtcVideoFrame());
frame->Init(captured_frame, dst_width, dst_height, apply_rotation_); frame->Init(captured_frame, dst_width, dst_height);
return frame.release(); return frame.release();
} }

2
talk/media/base/videoadapter_unittest.cc
View File

@ -100,7 +100,7 @@ class VideoAdapterTest : public testing::Test {
const CapturedFrame* captured_frame) { const CapturedFrame* captured_frame) {
WebRtcVideoFrame temp_i420; WebRtcVideoFrame temp_i420;
EXPECT_TRUE(temp_i420.Init(captured_frame, EXPECT_TRUE(temp_i420.Init(captured_frame,
captured_frame->width, abs(captured_frame->height), true)); captured_frame->width, abs(captured_frame->height)));
VideoFrame* out_frame = NULL; VideoFrame* out_frame = NULL;
rtc::CritScope lock(&crit_); rtc::CritScope lock(&crit_);
EXPECT_TRUE(video_adapter_->AdaptFrame(&temp_i420, &out_frame)); EXPECT_TRUE(video_adapter_->AdaptFrame(&temp_i420, &out_frame));

7
talk/media/base/videoframe.h
View File

@ -62,8 +62,7 @@ class VideoFrame {
size_t pixel_height, size_t pixel_height,
int64_t elapsed_time, int64_t elapsed_time,
int64_t time_stamp, int64_t time_stamp,
webrtc::VideoRotation rotation, webrtc::VideoRotation rotation) {
bool apply_rotation) {
return false; return false;
} }
@ -81,7 +80,7 @@ class VideoFrame {
int rotation) { int rotation) {
return Reset(fourcc, w, h, dw, dh, sample, sample_size, pixel_width, return Reset(fourcc, w, h, dw, dh, sample, sample_size, pixel_width,
pixel_height, elapsed_time, time_stamp, pixel_height, elapsed_time, time_stamp,
static_cast<webrtc::VideoRotation>(rotation), true); static_cast<webrtc::VideoRotation>(rotation));
} }
// Basic accessors. // Basic accessors.
@ -124,6 +123,8 @@ class VideoFrame {
virtual webrtc::VideoRotation GetVideoRotation() const { virtual webrtc::VideoRotation GetVideoRotation() const {
return webrtc::kVideoRotation_0; return webrtc::kVideoRotation_0;
} }
// TODO(guoweis): Remove the skeleton implementation once chrome is updated.
virtual void SetRotation(webrtc::VideoRotation rotation) {}
// Make a shallow copy of the frame. The frame buffer itself is not copied. // Make a shallow copy of the frame. The frame buffer itself is not copied.
// Both the current and new VideoFrame will share a single reference-counted // Both the current and new VideoFrame will share a single reference-counted

3
talk/media/base/videoframe_unittest.h
View File

@ -1428,8 +1428,7 @@ class VideoFrameTest : public testing::Test {
EXPECT_TRUE(IsEqual(frame1, frame2, 0)); EXPECT_TRUE(IsEqual(frame1, frame2, 0));
EXPECT_TRUE(frame1.Reset(cricket::FOURCC_I420, kWidth, kHeight, kWidth, EXPECT_TRUE(frame1.Reset(cricket::FOURCC_I420, kWidth, kHeight, kWidth,
kHeight, reinterpret_cast<uint8*>(ms->GetBuffer()), kHeight, reinterpret_cast<uint8*>(ms->GetBuffer()),
data_size, 1, 1, 0, 0, webrtc::kVideoRotation_0, data_size, 1, 1, 0, 0, webrtc::kVideoRotation_0));
true));
EXPECT_FALSE(IsBlack(frame1)); EXPECT_FALSE(IsBlack(frame1));
EXPECT_FALSE(IsEqual(frame1, frame2, 0)); EXPECT_FALSE(IsEqual(frame1, frame2, 0));
} }

31
talk/media/webrtc/webrtcvideoframe.cc
View File

@ -112,8 +112,7 @@ const webrtc::VideoFrame* WebRtcVideoFrame::FrameBuffer::frame() const {
} }
WebRtcVideoFrame::WebRtcVideoFrame() WebRtcVideoFrame::WebRtcVideoFrame()
: video_buffer_(new RefCountedBuffer()), : video_buffer_(new RefCountedBuffer()) {}
rotation_(webrtc::kVideoRotation_0) {}
WebRtcVideoFrame::~WebRtcVideoFrame() {} WebRtcVideoFrame::~WebRtcVideoFrame() {}
@ -130,18 +129,14 @@ bool WebRtcVideoFrame::Init(uint32 format,
int64_t time_stamp, int64_t time_stamp,
webrtc::VideoRotation rotation) { webrtc::VideoRotation rotation) {
return Reset(format, w, h, dw, dh, sample, sample_size, pixel_width, return Reset(format, w, h, dw, dh, sample, sample_size, pixel_width,
pixel_height, elapsed_time, time_stamp, rotation, pixel_height, elapsed_time, time_stamp, rotation);
true /*apply_rotation*/);
} }
bool WebRtcVideoFrame::Init(const CapturedFrame* frame, int dw, int dh, bool WebRtcVideoFrame::Init(const CapturedFrame* frame, int dw, int dh) {
bool apply_rotation) {
return Reset(frame->fourcc, frame->width, frame->height, dw, dh, return Reset(frame->fourcc, frame->width, frame->height, dw, dh,
static_cast<uint8*>(frame->data), frame->data_size, static_cast<uint8*>(frame->data), frame->data_size,
frame->pixel_width, frame->pixel_height, frame->elapsed_time, frame->pixel_width, frame->pixel_height, frame->elapsed_time,
frame->time_stamp, frame->time_stamp, frame->GetRotation());
frame->GetRotation(),
apply_rotation);
} }
bool WebRtcVideoFrame::Alias(const CapturedFrame* frame, bool WebRtcVideoFrame::Alias(const CapturedFrame* frame,
@ -153,7 +148,7 @@ bool WebRtcVideoFrame::Alias(const CapturedFrame* frame,
frame->GetRotation() != webrtc::kVideoRotation_0) || frame->GetRotation() != webrtc::kVideoRotation_0) ||
frame->width != dw || frame->height != dh) { frame->width != dw || frame->height != dh) {
// TODO(fbarchard): Enable aliasing of more formats. // TODO(fbarchard): Enable aliasing of more formats.
return Init(frame, dw, dh, apply_rotation); return Init(frame, dw, dh);
} else { } else {
Alias(static_cast<uint8*>(frame->data), frame->data_size, frame->width, Alias(static_cast<uint8*>(frame->data), frame->data_size, frame->width,
frame->height, frame->pixel_width, frame->pixel_height, frame->height, frame->pixel_width, frame->pixel_height,
@ -307,8 +302,7 @@ bool WebRtcVideoFrame::Reset(uint32 format,
size_t pixel_height, size_t pixel_height,
int64_t elapsed_time, int64_t elapsed_time,
int64_t time_stamp, int64_t time_stamp,
webrtc::VideoRotation rotation, webrtc::VideoRotation rotation) {
bool apply_rotation) {
if (!Validate(format, w, h, sample, sample_size)) { if (!Validate(format, w, h, sample, sample_size)) {
return false; return false;
} }
@ -325,8 +319,7 @@ bool WebRtcVideoFrame::Reset(uint32 format,
// TODO(fbarchard): Support lazy allocation. // TODO(fbarchard): Support lazy allocation.
int new_width = dw; int new_width = dw;
int new_height = dh; int new_height = dh;
// If rotated swap width, height. if (rotation == 90 || rotation == 270) { // If rotated swap width, height.
if (apply_rotation && (rotation == 90 || rotation == 270)) {
new_width = dh; new_width = dh;
new_height = dw; new_height = dw;
} }
@ -340,8 +333,7 @@ bool WebRtcVideoFrame::Reset(uint32 format,
// Since the libyuv::ConvertToI420 will handle the rotation, so the // Since the libyuv::ConvertToI420 will handle the rotation, so the
// new frame's rotation should always be 0. // new frame's rotation should always be 0.
Attach(video_buffer.get(), desired_size, new_width, new_height, pixel_width, Attach(video_buffer.get(), desired_size, new_width, new_height, pixel_width,
pixel_height, elapsed_time, time_stamp, pixel_height, elapsed_time, time_stamp, webrtc::kVideoRotation_0);
apply_rotation ? webrtc::kVideoRotation_0 : rotation);
} }
int horiz_crop = ((w - dw) / 2) & ~1; int horiz_crop = ((w - dw) / 2) & ~1;
@ -358,9 +350,7 @@ bool WebRtcVideoFrame::Reset(uint32 format,
int v_stride = GetVPitch(); int v_stride = GetVPitch();
int r = libyuv::ConvertToI420( int r = libyuv::ConvertToI420(
sample, sample_size, y, y_stride, u, u_stride, v, v_stride, horiz_crop, sample, sample_size, y, y_stride, u, u_stride, v, v_stride, horiz_crop,
vert_crop, w, h, dw, idh, vert_crop, w, h, dw, idh, static_cast<libyuv::RotationMode>(rotation),
static_cast<libyuv::RotationMode>(
apply_rotation ? rotation : webrtc::kVideoRotation_0),
format); format);
if (r) { if (r) {
LOG(LS_ERROR) << "Error parsing format: " << GetFourccName(format) LOG(LS_ERROR) << "Error parsing format: " << GetFourccName(format)
@ -417,8 +407,7 @@ bool WebRtcVideoRenderFrame::Reset(uint32 fourcc,
size_t pixel_height, size_t pixel_height,
int64_t elapsed_time, int64_t elapsed_time,
int64_t time_stamp, int64_t time_stamp,
webrtc::VideoRotation rotation, webrtc::VideoRotation rotation) {
bool apply_rotation) {
UNIMPLEMENTED; UNIMPLEMENTED;
return false; return false;
} }

11
talk/media/webrtc/webrtcvideoframe.h
View File

@ -65,7 +65,7 @@ class WebRtcVideoFrame : public VideoFrame {
int64_t time_stamp, int64_t time_stamp,
webrtc::VideoRotation rotation); webrtc::VideoRotation rotation);
bool Init(const CapturedFrame* frame, int dw, int dh, bool apply_rotation); bool Init(const CapturedFrame* frame, int dw, int dh);
void InitToEmptyBuffer(int w, int h, size_t pixel_width, size_t pixel_height, void InitToEmptyBuffer(int w, int h, size_t pixel_width, size_t pixel_height,
int64_t elapsed_time, int64_t time_stamp); int64_t elapsed_time, int64_t time_stamp);
@ -107,8 +107,7 @@ class WebRtcVideoFrame : public VideoFrame {
size_t pixel_height, size_t pixel_height,
int64_t elapsed_time, int64_t elapsed_time,
int64_t time_stamp, int64_t time_stamp,
webrtc::VideoRotation rotation, webrtc::VideoRotation rotation);
bool apply_rotation);
virtual size_t GetWidth() const; virtual size_t GetWidth() const;
virtual size_t GetHeight() const; virtual size_t GetHeight() const;
@ -133,6 +132,9 @@ class WebRtcVideoFrame : public VideoFrame {
virtual void SetTimeStamp(int64_t time_stamp) { time_stamp_ = time_stamp; } virtual void SetTimeStamp(int64_t time_stamp) { time_stamp_ = time_stamp; }
virtual webrtc::VideoRotation GetVideoRotation() const { return rotation_; } virtual webrtc::VideoRotation GetVideoRotation() const { return rotation_; }
virtual void SetRotation(webrtc::VideoRotation rotation) {
rotation_ = rotation;
}
virtual VideoFrame* Copy() const; virtual VideoFrame* Copy() const;
virtual bool MakeExclusive(); virtual bool MakeExclusive();
@ -192,8 +194,7 @@ class WebRtcVideoRenderFrame : public VideoFrame {
size_t pixel_height, size_t pixel_height,
int64_t elapsed_time, int64_t elapsed_time,
int64_t time_stamp, int64_t time_stamp,
webrtc::VideoRotation rotation, webrtc::VideoRotation rotation) OVERRIDE;
bool apply_rotation) OVERRIDE;
virtual size_t GetWidth() const OVERRIDE; virtual size_t GetWidth() const OVERRIDE;
virtual size_t GetHeight() const OVERRIDE; virtual size_t GetHeight() const OVERRIDE;
virtual const uint8* GetYPlane() const OVERRIDE; virtual const uint8* GetYPlane() const OVERRIDE;

43
talk/media/webrtc/webrtcvideoframe_unittest.cc
View File

@ -33,9 +33,7 @@ class WebRtcVideoFrameTest : public VideoFrameTest<cricket::WebRtcVideoFrame> {
WebRtcVideoFrameTest() { WebRtcVideoFrameTest() {
} }
void TestInit(int cropped_width, int cropped_height, void TestInit(int cropped_width, int cropped_height) {
webrtc::VideoRotation frame_rotation,
bool apply_rotation) {
const int frame_width = 1920; const int frame_width = 1920;
const int frame_height = 1080; const int frame_height = 1080;
@ -46,7 +44,7 @@ class WebRtcVideoFrameTest : public VideoFrameTest<cricket::WebRtcVideoFrame> {
captured_frame.pixel_height = 1; captured_frame.pixel_height = 1;
captured_frame.elapsed_time = 1234; captured_frame.elapsed_time = 1234;
captured_frame.time_stamp = 5678; captured_frame.time_stamp = 5678;
captured_frame.rotation = frame_rotation; captured_frame.rotation = webrtc::kVideoRotation_0;
captured_frame.width = frame_width; captured_frame.width = frame_width;
captured_frame.height = frame_height; captured_frame.height = frame_height;
captured_frame.data_size = (frame_width * frame_height) + captured_frame.data_size = (frame_width * frame_height) +
@ -57,30 +55,17 @@ class WebRtcVideoFrameTest : public VideoFrameTest<cricket::WebRtcVideoFrame> {
// Create the new frame from the CapturedFrame. // Create the new frame from the CapturedFrame.
cricket::WebRtcVideoFrame frame; cricket::WebRtcVideoFrame frame;
EXPECT_TRUE( EXPECT_TRUE(frame.Init(&captured_frame, cropped_width, cropped_height));
frame.Init(&captured_frame, cropped_width, cropped_height,
apply_rotation));
// Verify the new frame. // Verify the new frame.
EXPECT_EQ(1u, frame.GetPixelWidth()); EXPECT_EQ(1u, frame.GetPixelWidth());
EXPECT_EQ(1u, frame.GetPixelHeight()); EXPECT_EQ(1u, frame.GetPixelHeight());
EXPECT_EQ(1234, frame.GetElapsedTime()); EXPECT_EQ(1234, frame.GetElapsedTime());
EXPECT_EQ(5678, frame.GetTimeStamp()); EXPECT_EQ(5678, frame.GetTimeStamp());
if (apply_rotation) EXPECT_EQ(webrtc::kVideoRotation_0, frame.GetRotation());
EXPECT_EQ(webrtc::kVideoRotation_0, frame.GetRotation());
else
EXPECT_EQ(frame_rotation, frame.GetRotation());
// The size of the new frame should have been cropped to multiple of 4. // The size of the new frame should have been cropped to multiple of 4.
// If |apply_rotation| and the frame rotation is 90 or 270, width and EXPECT_EQ(static_cast<size_t>(cropped_width & ~3), frame.GetWidth());
// height are flipped. EXPECT_EQ(static_cast<size_t>(cropped_height & ~3), frame.GetHeight());
if (apply_rotation && (frame_rotation == webrtc::kVideoRotation_90
|| frame_rotation == webrtc::kVideoRotation_270)) {
EXPECT_EQ(static_cast<size_t>(cropped_width & ~3), frame.GetHeight());
EXPECT_EQ(static_cast<size_t>(cropped_height & ~3), frame.GetWidth() );
} else {
EXPECT_EQ(static_cast<size_t>(cropped_width & ~3), frame.GetWidth());
EXPECT_EQ(static_cast<size_t>(cropped_height & ~3), frame.GetHeight());
}
} }
}; };
@ -289,25 +274,17 @@ TEST_F(WebRtcVideoFrameTest, Alias) {
// Tests the Init function with different cropped size. // Tests the Init function with different cropped size.
TEST_F(WebRtcVideoFrameTest, InitEvenSize) { TEST_F(WebRtcVideoFrameTest, InitEvenSize) {
TestInit(640, 360, webrtc::kVideoRotation_0, true); TestInit(640, 360);
} }
TEST_F(WebRtcVideoFrameTest, InitOddWidth) { TEST_F(WebRtcVideoFrameTest, InitOddWidth) {
TestInit(601, 480, webrtc::kVideoRotation_0, true); TestInit(601, 480);
} }
TEST_F(WebRtcVideoFrameTest, InitOddHeight) { TEST_F(WebRtcVideoFrameTest, InitOddHeight) {
TestInit(360, 765, webrtc::kVideoRotation_0, true); TestInit(360, 765);
} }
TEST_F(WebRtcVideoFrameTest, InitOddWidthHeight) { TEST_F(WebRtcVideoFrameTest, InitOddWidthHeight) {
TestInit(355, 1021, webrtc::kVideoRotation_0, true); TestInit(355, 1021);
}
TEST_F(WebRtcVideoFrameTest, InitRotated90ApplyRotation) {
TestInit(640, 360, webrtc::kVideoRotation_90, true);
}
TEST_F(WebRtcVideoFrameTest, InitRotated90DontApplyRotation) {
TestInit(640, 360, webrtc::kVideoRotation_90, false);
} }