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

Unified Diff: webrtc/video/video_stream_decoder.cc

Issue 2678343002: Delete VideoReceiveStream::Config::pre_render_callback. (Closed)
Patch Set: Created 3 years, 10 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: webrtc/video/video_stream_decoder.cc
diff --git a/webrtc/video/video_stream_decoder.cc b/webrtc/video/video_stream_decoder.cc
index 34469ed30bb2e98026f7783d378628ef1e695d1c..5dee76193efe8dc72b3a731b0bad4245f4336903 100644
--- a/webrtc/video/video_stream_decoder.cc
+++ b/webrtc/video/video_stream_decoder.cc
@@ -32,12 +32,10 @@ VideoStreamDecoder::VideoStreamDecoder(
bool enable_nack,
bool enable_fec,
ReceiveStatisticsProxy* receive_statistics_proxy,
- rtc::VideoSinkInterface<VideoFrame>* incoming_video_stream,
- I420FrameCallback* pre_render_callback)
+ rtc::VideoSinkInterface<VideoFrame>* incoming_video_stream)
: video_receiver_(video_receiver),
receive_stats_callback_(receive_statistics_proxy),
incoming_video_stream_(incoming_video_stream),
- pre_render_callback_(pre_render_callback),
last_rtt_ms_(0) {
RTC_DCHECK(video_receiver_);
@@ -76,13 +74,6 @@ VideoStreamDecoder::~VideoStreamDecoder() {
// thread may have held the lock when calling VideoDecoder::Decode, Reset, or
// Release. Acquiring the same lock in the path of decode callback can deadlock.
int32_t VideoStreamDecoder::FrameToRender(VideoFrame& video_frame) { // NOLINT
- if (pre_render_callback_) {
- // Post processing is not supported if the frame is backed by a texture.
- if (!video_frame.video_frame_buffer()->native_handle()) {
- pre_render_callback_->FrameCallback(&video_frame);
- }
- }
-
incoming_video_stream_->OnFrame(video_frame);
return 0;

Powered by Google App Engine
This is Rietveld 408576698