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

Revert "Fix CVO in androidvideocapturer."

Browse Source 
This reverts commit 02ed57bf9d.
https://webrtc-codereview.appspot.com/40759004/

Reason- breaks tests after rebase.

TBR=magjed@webrtc.org

BUG=4145

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

Cr-Commit-Position: refs/heads/master@{#8537}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8537 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
perkj@webrtc.org
2015-02-27 19:47:41 +00:00
parent 02ed57bf9d
commit b8bcf8cbbf
7 changed files with 32 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,7 +100,7 @@ class VideoAdapterTest : public testing::Test {
const CapturedFrame* captured_frame) {
WebRtcVideoFrame temp_i420;
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;
rtc::CritScope lock(&crit_);
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,
int64_t elapsed_time,
int64_t time_stamp,
webrtc::VideoRotation rotation,
bool apply_rotation) {
webrtc::VideoRotation rotation) {
return false;
}
@@ -81,7 +80,7 @@ class VideoFrame {
int rotation) {
return Reset(fourcc, w, h, dw, dh, sample, sample_size, pixel_width,
pixel_height, elapsed_time, time_stamp,
static_cast<webrtc::VideoRotation>(rotation), true);
static_cast<webrtc::VideoRotation>(rotation));
}
// Basic accessors.
@@ -124,6 +123,8 @@ class VideoFrame {
virtual webrtc::VideoRotation GetVideoRotation() const {
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.
// 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(frame1.Reset(cricket::FOURCC_I420, kWidth, kHeight, kWidth,
kHeight, reinterpret_cast<uint8*>(ms->GetBuffer()),
data_size, 1, 1, 0, 0, webrtc::kVideoRotation_0,
true));
data_size, 1, 1, 0, 0, webrtc::kVideoRotation_0));
EXPECT_FALSE(IsBlack(frame1));
EXPECT_FALSE(IsEqual(frame1, frame2, 0));
}