Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1922)

Unified Diff: content/renderer/media/gpu/rtc_video_encoder.cc

Issue 2925313002: Update WebRtcVideoFrameAdapter to new buffer interface (Closed)
Patch Set: Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/gpu/rtc_video_encoder.cc
diff --git a/content/renderer/media/gpu/rtc_video_encoder.cc b/content/renderer/media/gpu/rtc_video_encoder.cc
index d0133bf80752249a476272d8c4e94b06dc270e84..d9433d7c09d0c5615f7b12123a6fda603cb70d7e 100644
--- a/content/renderer/media/gpu/rtc_video_encoder.cc
+++ b/content/renderer/media/gpu/rtc_video_encoder.cc
@@ -22,6 +22,7 @@
#include "base/synchronization/waitable_event.h"
#include "base/threading/thread_task_runner_handle.h"
#include "base/time/time.h"
+#include "content/renderer/media/webrtc/webrtc_video_frame_adapter.h"
#include "media/base/bind_to_current_loop.h"
#include "media/base/bitstream_buffer.h"
#include "media/base/video_frame.h"
@@ -605,9 +606,11 @@ void RTCVideoEncoder::Impl::EncodeOneFrame() {
const int index = input_buffers_free_.back();
bool requires_copy = false;
scoped_refptr<media::VideoFrame> frame;
- if (next_frame->video_frame_buffer()->native_handle()) {
- frame = static_cast<media::VideoFrame*>(
- next_frame->video_frame_buffer()->native_handle());
+ if (next_frame->video_frame_buffer()->type() ==
+ webrtc::VideoFrameBuffer::Type::kNative) {
+ frame = static_cast<WebRtcVideoFrameAdapter*>(
+ next_frame->video_frame_buffer().get())
+ ->getMediaVideoFrame();
requires_copy = RequiresSizeChange(frame) ||
frame->storage_type() != media::VideoFrame::STORAGE_SHMEM;
} else {

Powered by Google App Engine
This is Rietveld 408576698