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 b75272126ec13263c5201ba0f5db6324b75a01d2..389f6d21e48ea6189523bd1c355f10b0b4306711 100644 |
--- a/content/renderer/media/webrtc/media_stream_remote_video_source.cc |
+++ b/content/renderer/media/webrtc/media_stream_remote_video_source.cc |
@@ -40,8 +40,7 @@ class MediaStreamRemoteVideoSource::RemoteVideoSourceDelegate |
void SetSize(int width, int height) override; |
void RenderFrame(const cricket::VideoFrame* frame) override; |
- void DoRenderFrameOnIOThread(scoped_refptr<media::VideoFrame> video_frame, |
- const media::VideoCaptureFormat& format); |
+ void DoRenderFrameOnIOThread(scoped_refptr<media::VideoFrame> video_frame); |
private: |
// Bound to the render thread. |
base::ThreadChecker thread_checker_; |
@@ -103,30 +102,19 @@ RemoteVideoSourceDelegate::RenderFrame( |
frame->GetVPlane(), frame->GetVPitch(), uv_rows, video_frame.get()); |
} |
- media::VideoPixelFormat pixel_format = |
- (video_frame->format() == media::VideoFrame::YV12) ? |
- media::PIXEL_FORMAT_YV12 : media::PIXEL_FORMAT_TEXTURE; |
- |
- media::VideoCaptureFormat format( |
- gfx::Size(video_frame->natural_size().width(), |
- video_frame->natural_size().height()), |
- MediaStreamVideoSource::kUnknownFrameRate, |
- pixel_format); |
- |
io_message_loop_->PostTask( |
FROM_HERE, |
base::Bind(&RemoteVideoSourceDelegate::DoRenderFrameOnIOThread, |
- this, video_frame, format)); |
+ this, video_frame)); |
} |
void MediaStreamRemoteVideoSource:: |
RemoteVideoSourceDelegate::DoRenderFrameOnIOThread( |
- scoped_refptr<media::VideoFrame> video_frame, |
- const media::VideoCaptureFormat& format) { |
+ scoped_refptr<media::VideoFrame> video_frame) { |
DCHECK(io_message_loop_->BelongsToCurrentThread()); |
TRACE_EVENT0("webrtc", "RemoteVideoSourceDelegate::DoRenderFrameOnIOThread"); |
// TODO(hclam): Give the estimated capture time. |
- frame_callback_.Run(video_frame, format, base::TimeTicks()); |
+ frame_callback_.Run(video_frame, base::TimeTicks()); |
} |
MediaStreamRemoteVideoSource::MediaStreamRemoteVideoSource( |