Revert "Revert "Update video_coding/codecs to new VideoFrameBuffer interface""
This reverts commit 88f94fa36aa61f7904d30251205c544ada2c4301.
Chromium code has been updated.
Original change's description:
> Revert "Update video_coding/codecs to new VideoFrameBuffer interface"
>
> This reverts commit 20ebf4ede803cd4f628ef9378700f60b72f2eab0.
>
> Reason for revert:
>
> Suspect of breaking FYI bots.
> See https://build.chromium.org/p/chromium.webrtc.fyi/builders/Win7%20Tester/builds/9036 and others.
>
> Sample logs:
> Backtrace:
> [5024:1036:0607/173649.857:FATAL:webrtc_video_frame_adapter.cc(98)] Check failed: false.
> Backtrace:
> base::debug::StackTrace::StackTrace [0x02D04A37+55]
> base::debug::StackTrace::StackTrace [0x02CCBB8A+10]
> content::WebRtcVideoFrameAdapter::NativeToI420Buffer [0x0508AD71+305]
> webrtc::VideoFrameBuffer::ToI420 [0x0230BF67+39]
> webrtc::H264EncoderImpl::Encode [0x057E8D0B+267]
> webrtc::VCMGenericEncoder::Encode [0x057E0E34+333]
> webrtc::vcm::VideoSender::AddVideoFrame [0x057DED9B+796]
> webrtc::ViEEncoder::EncodeVideoFrame [0x057C00F6+884]
> webrtc::ViEEncoder::EncodeTask::Run [0x057C12D7+215]
> rtc::TaskQueue::PostTask [0x03EE5CFB+194]
> base::internal::Invoker<base::internal::BindState<enum extensions::`anonymous namespace'::VerificationResult (__cdecl*)(std::unique_ptr<extensions::NetworkingCastPrivateDelegate::Credentials,std::default_delete<extensions::NetworkingCastPrivateDelegate::C [0x02DDCAA5+31]
> base::internal::Invoker<base::internal::BindState<enum extensions::`anonymous namespace'::VerificationResult (__cdecl*)(std::unique_ptr<extensions::NetworkingCastPrivateDelegate::Credentials,std::default_delete<extensions::NetworkingCastPrivateDelegate::C [0x02DDEE86+22]
> base::debug::TaskAnnotator::RunTask [0x02D08289+409]
> base::MessageLoop::RunTask [0x02C8CEC1+1233]
> base::MessageLoop::DoWork [0x02C8C1AD+765]
> base::MessagePumpDefault::Run [0x02D0A20B+219]
> base::MessageLoop::Run [0x02C8C9DB+107]
> base::RunLoop::Run [0x02C89583+147]
> base::Thread::Run [0x02CBEFCD+173]
> base::Thread::ThreadMain [0x02CBFADE+622]
> base::PlatformThread::Sleep [0x02C9E1A2+290]
> BaseThreadInitThunk [0x75C3338A+18]
> RtlInitializeExceptionChain [0x773A9902+99]
> RtlInitializeExceptionChain [0x773A98D5+54]
>
> Original change's description:
> > Update video_coding/codecs to new VideoFrameBuffer interface
> >
> > This is a follow-up cleanup for CL
> > https://codereview.webrtc.org/2847383002/.
> >
> > Bug: webrtc:7632
> > Change-Id: I47861d779968f2fee94db9c017102a8e87e67fb7
> > Reviewed-on: https://chromium-review.googlesource.com/524163
> > Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
> > Reviewed-by: Niels Moller <nisse@webrtc.org>
> > Commit-Queue: Magnus Jedvert <magjed@webrtc.org>
> > Cr-Commit-Position: refs/heads/master@{#18477}
>
> TBR=magjed@webrtc.org,nisse@webrtc.org,brandtr@webrtc.org
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: webrtc:7632
>
> Change-Id: I3b73fc7d16ff19ceba196e964dcb36a36510912c
> Reviewed-on: https://chromium-review.googlesource.com/527793
> Reviewed-by: Guido Urdaneta <guidou@chromium.org>
> Commit-Queue: Guido Urdaneta <guidou@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#18489}
TBR=tterriberry@mozilla.com,mflodman@webrtc.org,magjed@webrtc.org,stefan@webrtc.org,guidou@chromium.org,nisse@webrtc.org,brandtr@webrtc.org,webrtc-reviews@webrtc.org
# Not skipping CQ checks because original CL landed > 1 day ago.
No-Presubmit: true
Bug: webrtc:7632
Change-Id: I0962a704e8a9939d4364ce9069c863c9951654c9
Reviewed-on: https://chromium-review.googlesource.com/530684
Commit-Queue: Magnus Jedvert <magjed@webrtc.org>
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Cr-Original-Commit-Position: refs/heads/master@{#18527}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: 72dbe2a2112fb4b83f0367413d99a21d4ff308b4diff --git a/modules/video_coding/codecs/vp8/simulcast_unittest.h b/modules/video_coding/codecs/vp8/simulcast_unittest.h
index dfb15a9..d097dcf 100644
--- a/modules/video_coding/codecs/vp8/simulcast_unittest.h
+++ b/modules/video_coding/codecs/vp8/simulcast_unittest.h
@@ -129,14 +129,16 @@
public:
Vp8TestDecodedImageCallback() : decoded_frames_(0) {}
int32_t Decoded(VideoFrame& decoded_image) override {
+ rtc::scoped_refptr<I420BufferInterface> i420_buffer =
+ decoded_image.video_frame_buffer()->ToI420();
for (int i = 0; i < decoded_image.width(); ++i) {
- EXPECT_NEAR(kColorY, decoded_image.video_frame_buffer()->DataY()[i], 1);
+ EXPECT_NEAR(kColorY, i420_buffer->DataY()[i], 1);
}
// TODO(mikhal): Verify the difference between U,V and the original.
- for (int i = 0; i < ((decoded_image.width() + 1) / 2); ++i) {
- EXPECT_NEAR(kColorU, decoded_image.video_frame_buffer()->DataU()[i], 4);
- EXPECT_NEAR(kColorV, decoded_image.video_frame_buffer()->DataV()[i], 4);
+ for (int i = 0; i < i420_buffer->ChromaWidth(); ++i) {
+ EXPECT_NEAR(kColorU, i420_buffer->DataU()[i], 4);
+ EXPECT_NEAR(kColorV, i420_buffer->DataV()[i], 4);
}
decoded_frames_++;
return 0;
@@ -178,21 +180,14 @@
// Fills in an I420Buffer from |plane_colors|.
static void CreateImage(const rtc::scoped_refptr<I420Buffer>& buffer,
int plane_colors[kNumOfPlanes]) {
- int width = buffer->width();
- int height = buffer->height();
- int chroma_width = (width + 1) / 2;
- int chroma_height = (height + 1) / 2;
+ SetPlane(buffer->MutableDataY(), plane_colors[0], buffer->width(),
+ buffer->height(), buffer->StrideY());
- SetPlane(buffer->MutableDataY(), plane_colors[0],
- width, height, buffer->StrideY());
+ SetPlane(buffer->MutableDataU(), plane_colors[1], buffer->ChromaWidth(),
+ buffer->ChromaHeight(), buffer->StrideU());
- SetPlane(buffer->MutableDataU(), plane_colors[1],
- chroma_width, chroma_height,
- buffer->StrideU());
-
- SetPlane(buffer->MutableDataV(), plane_colors[2],
- chroma_width, chroma_height,
- buffer->StrideV());
+ SetPlane(buffer->MutableDataV(), plane_colors[2], buffer->ChromaWidth(),
+ buffer->ChromaHeight(), buffer->StrideV());
}
static void DefaultSettings(VideoCodec* settings,
@@ -260,9 +255,7 @@
SetUpRateAllocator();
EXPECT_EQ(0, encoder_->InitEncode(&settings_, 1, 1200));
EXPECT_EQ(0, decoder_->InitDecode(&settings_, 1));
- int half_width = (kDefaultWidth + 1) / 2;
- input_buffer_ = I420Buffer::Create(kDefaultWidth, kDefaultHeight,
- kDefaultWidth, half_width, half_width);
+ input_buffer_ = I420Buffer::Create(kDefaultWidth, kDefaultHeight);
input_buffer_->InitializeData();
input_frame_.reset(
new VideoFrame(input_buffer_, 0, 0, webrtc::kVideoRotation_0));
@@ -513,9 +506,7 @@
settings_.simulcastStream[i].height = settings_.height;
}
// Setting input image to new resolution.
- int half_width = (settings_.width + 1) / 2;
- input_buffer_ = I420Buffer::Create(settings_.width, settings_.height,
- settings_.width, half_width, half_width);
+ input_buffer_ = I420Buffer::Create(settings_.width, settings_.height);
input_buffer_->InitializeData();
input_frame_.reset(
@@ -556,9 +547,7 @@
SetRates(settings_.startBitrate, 30);
ExpectStreams(kVideoFrameKey, 1);
// Resize |input_frame_| to the new resolution.
- half_width = (settings_.width + 1) / 2;
- input_buffer_ = I420Buffer::Create(settings_.width, settings_.height,
- settings_.width, half_width, half_width);
+ input_buffer_ = I420Buffer::Create(settings_.width, settings_.height);
input_buffer_->InitializeData();
input_frame_.reset(
new VideoFrame(input_buffer_, 0, 0, webrtc::kVideoRotation_0));
