Make VideoReceiveStream not inherit from I420FrameCallback.

webrtc/video/video_receive_stream.cc

 /*
  *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 163 matching lines @@
                            config,
                            &stats_proxy_,
                            process_thread_),
       video_stream_decoder_(&video_receiver_,
                             &rtp_stream_receiver_,
                             &rtp_stream_receiver_,
                             rtp_stream_receiver_.IsRetransmissionsEnabled(),
                             rtp_stream_receiver_.IsFecEnabled(),
                             &stats_proxy_,
                             &incoming_video_stream_,
-                            this),
+                            config.pre_render_callback),
       vie_sync_(&video_receiver_) {
   LOG(LS_INFO) << "VideoReceiveStream: " << config_.ToString();
 
   RTC_DCHECK(process_thread_);
   RTC_DCHECK(congestion_controller_);
   RTC_DCHECK(call_stats_);
 
   // Register the channel to receive stats updates.
   call_stats_->RegisterStatsObserver(&video_stream_decoder_);
 
@@ skipping 88 matching lines @@
   } else {
     vie_sync_.ConfigureSync(-1, nullptr, rtp_stream_receiver_.rtp_rtcp(),
                             rtp_stream_receiver_.GetRtpReceiver());
   }
 }
 
 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);
 
   if (config_.renderer)
     config_.renderer->OnFrame(video_frame);
 
   stats_proxy_.OnRenderedFrame(video_frame.width(), video_frame.height());
 }
 
@@ skipping 40 matching lines @@
     const std::vector<uint16_t>& sequence_numbers) {
   rtp_stream_receiver_.RequestPacketRetransmit(sequence_numbers);
 }
 
 void VideoReceiveStream::RequestKeyFrame() {
   rtp_stream_receiver_.RequestKeyFrame();
 }
 
 }  // namespace internal
 }  // namespace webrtc