| Index: content/renderer/media/rtc_video_encoder.cc
|
| diff --git a/content/renderer/media/rtc_video_encoder.cc b/content/renderer/media/rtc_video_encoder.cc
|
| index c930a7cea7565f4854ef19b2e6b1e98b4084636c..e078b7ea735c178094e110472cd7456c234e4f77 100644
|
| --- a/content/renderer/media/rtc_video_encoder.cc
|
| +++ b/content/renderer/media/rtc_video_encoder.cc
|
| @@ -76,7 +76,6 @@ class RTCVideoEncoder::Impl
|
| void Destroy();
|
|
|
| // media::VideoEncodeAccelerator::Client implementation.
|
| - virtual void NotifyInitializeDone() OVERRIDE;
|
| virtual void RequireBitstreamBuffers(unsigned int input_count,
|
| const gfx::Size& input_coded_size,
|
| size_t output_buffer_size) OVERRIDE;
|
| @@ -198,11 +197,14 @@ void RTCVideoEncoder::Impl::CreateAndInitializeVEA(
|
| return;
|
| }
|
| input_visible_size_ = input_visible_size;
|
| - video_encoder_->Initialize(media::VideoFrame::I420,
|
| - input_visible_size_,
|
| - profile,
|
| - bitrate * 1000,
|
| - this);
|
| + if (!video_encoder_->Initialize(media::VideoFrame::I420,
|
| + input_visible_size_,
|
| + profile,
|
| + bitrate * 1000,
|
| + this)) {
|
| + NOTIFY_ERROR(media::VideoEncodeAccelerator::kInvalidArgumentError);
|
| + return;
|
| + }
|
| }
|
|
|
| void RTCVideoEncoder::Impl::Enqueue(const webrtc::I420VideoFrame* input_frame,
|
| @@ -281,11 +283,6 @@ void RTCVideoEncoder::Impl::Destroy() {
|
| video_encoder_.release()->Destroy();
|
| }
|
|
|
| -void RTCVideoEncoder::Impl::NotifyInitializeDone() {
|
| - DVLOG(3) << "Impl::NotifyInitializeDone()";
|
| - DCHECK(thread_checker_.CalledOnValidThread());
|
| -}
|
| -
|
| void RTCVideoEncoder::Impl::RequireBitstreamBuffers(
|
| unsigned int input_count,
|
| const gfx::Size& input_coded_size,
|
|
|