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

Unified Diff: webrtc/video/video_stream_decoder.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.cc ('k') | webrtc/video_receive_stream.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video/video_stream_decoder.cc
diff --git a/webrtc/video/video_stream_decoder.cc b/webrtc/video/video_stream_decoder.cc
index 5aab7b246c7dab15caf1fdb7c531dadaffa62778..4caa9dea0367df17891726f659cb20431a0b4c38 100644
--- a/webrtc/video/video_stream_decoder.cc
+++ b/webrtc/video/video_stream_decoder.cc
@@ -77,8 +77,12 @@ 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_)
- pre_render_callback_->FrameCallback(&video_frame);
+ 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;
« no previous file with comments | « webrtc/video/video_receive_stream.cc ('k') | webrtc/video_receive_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698