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

Unified Diff: webrtc/video/video_receive_stream.cc

Issue 2039053002: Make VideoReceiveStream not inherit from I420FrameCallback. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 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
« no previous file with comments | « webrtc/video/video_receive_stream.h ('k') | webrtc/video/video_stream_decoder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video/video_receive_stream.cc
diff --git a/webrtc/video/video_receive_stream.cc b/webrtc/video/video_receive_stream.cc
index cee820a7daacb6e4a855c73ebbb5620cc3f68bae..770fc96fc30fe2b23509fb1b550e8c8a48ff5f6e 100644
--- a/webrtc/video/video_receive_stream.cc
+++ b/webrtc/video/video_receive_stream.cc
@@ -181,7 +181,7 @@ VideoReceiveStream::VideoReceiveStream(
rtp_stream_receiver_.IsFecEnabled(),
&stats_proxy_,
&incoming_video_stream_,
- this),
+ config.pre_render_callback),
vie_sync_(&video_receiver_) {
LOG(LS_INFO) << "VideoReceiveStream: " << config_.ToString();
@@ -290,17 +290,9 @@ VideoReceiveStream::Stats VideoReceiveStream::GetStats() const {
return stats_proxy_.GetStats();
}
-void VideoReceiveStream::FrameCallback(VideoFrame* video_frame) {
+void VideoReceiveStream::OnFrame(const VideoFrame& video_frame) {
stats_proxy_.OnDecodedFrame();
- // Post processing is not supported if the frame is backed by a texture.
- if (!video_frame->video_frame_buffer()->native_handle()) {
- if (config_.pre_render_callback)
- config_.pre_render_callback->FrameCallback(video_frame);
- }
-}
-
-void VideoReceiveStream::OnFrame(const VideoFrame& video_frame) {
int64_t sync_offset_ms;
if (vie_sync_.GetStreamSyncOffsetInMs(video_frame, &sync_offset_ms))
stats_proxy_.OnSyncOffsetUpdated(sync_offset_ms);
« no previous file with comments | « webrtc/video/video_receive_stream.h ('k') | webrtc/video/video_stream_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698