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 cdadae55cd560cc65a60864302399a9afb21df07..4eb434918a6a2dbfc9fa052762f554970bb508fe 100644 |
--- a/content/renderer/media/rtc_video_encoder.cc |
+++ b/content/renderer/media/rtc_video_encoder.cc |
@@ -13,6 +13,7 @@ |
#include "base/single_thread_task_runner.h" |
#include "base/synchronization/waitable_event.h" |
#include "base/thread_task_runner_handle.h" |
+#include "media/base/bind_to_current_loop.h" |
#include "media/base/bitstream_buffer.h" |
#include "media/base/video_frame.h" |
#include "media/base/video_util.h" |
@@ -491,6 +492,18 @@ void RTCVideoEncoder::Impl::EncodeOneFrame() { |
} |
const int index = input_buffers_free_.back(); |
+ |
+ if (next_frame->native_handle()) { |
+ scoped_refptr<media::VideoFrame> frame( |
+ static_cast<media::VideoFrame*>(next_frame->native_handle())); |
+ frame->AddDestructionObserver(media::BindToCurrentLoop( |
+ base::Bind(&RTCVideoEncoder::Impl::EncodeFrameFinished, this, index))); |
+ video_encoder_->Encode(frame, next_frame_keyframe); |
Pawel Osciak
2015/06/03 10:28:56
Could we please not duplicate these lines, but ins
emircan
2015/06/03 20:56:12
Done.
I am preparing a followup CL for RTCVideoE
|
+ input_buffers_free_.pop_back(); |
+ SignalAsyncWaiter(WEBRTC_VIDEO_CODEC_OK); |
+ return; |
+ } |
+ |
base::SharedMemory* input_buffer = input_buffers_[index]; |
scoped_refptr<media::VideoFrame> frame = |
media::VideoFrame::WrapExternalSharedMemory( |