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

Unified Diff: content/renderer/media/webrtc/media_stream_remote_video_source.cc

Issue 1067803002: Roll WebRTC 8931:8933, Libjingle 8930:8932 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove NativeHandleImpl Created 5 years, 8 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/webrtc/media_stream_remote_video_source.cc
diff --git a/content/renderer/media/webrtc/media_stream_remote_video_source.cc b/content/renderer/media/webrtc/media_stream_remote_video_source.cc
index e3b2c4dcf84ba7baf17b43cc3c3bad8671d0c8bf..a151647a7b100221f0f14eb18fbd930fabc43521 100644
--- a/content/renderer/media/webrtc/media_stream_remote_video_source.cc
+++ b/content/renderer/media/webrtc/media_stream_remote_video_source.cc
@@ -10,7 +10,6 @@
#include "base/message_loop/message_loop_proxy.h"
#include "base/threading/thread_checker.h"
#include "base/trace_event/trace_event.h"
-#include "content/renderer/media/native_handle_impl.h"
#include "content/renderer/media/webrtc/track_observer.h"
#include "media/base/bind_to_current_loop.h"
#include "media/base/video_frame.h"
@@ -71,9 +70,8 @@ void MediaStreamRemoteVideoSource::RemoteVideoSourceDelegate::RenderFrame(
scoped_refptr<media::VideoFrame> video_frame;
if (incoming_frame->GetNativeHandle() != NULL) {
- NativeHandleImpl* handle =
- static_cast<NativeHandleImpl*>(incoming_frame->GetNativeHandle());
- video_frame = static_cast<media::VideoFrame*>(handle->GetHandle());
+ video_frame =
+ static_cast<media::VideoFrame*>(incoming_frame->GetNativeHandle());
video_frame->set_timestamp(timestamp);
} else {
const cricket::VideoFrame* frame =
« no previous file with comments | « content/renderer/media/rtc_video_decoder.cc ('k') | content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698