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

Unified Diff: webrtc/media/base/adaptedvideotracksource.cc

Issue 2906053002: Update I420Buffer to new VideoFrameBuffer interface (Closed)
Patch Set: Created 3 years, 7 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/media/base/adaptedvideotracksource.cc
diff --git a/webrtc/media/base/adaptedvideotracksource.cc b/webrtc/media/base/adaptedvideotracksource.cc
index 7a3e9f2f2da363ea8088ed71d78e0bc92bb0dd4d..9513be8230ed7e5a3d6f8acdc474f8a66424c52b 100644
--- a/webrtc/media/base/adaptedvideotracksource.cc
+++ b/webrtc/media/base/adaptedvideotracksource.cc
@@ -45,12 +45,11 @@ void AdaptedVideoTrackSource::OnFrame(const webrtc::VideoFrame& frame) {
true was just added. The VideoBroadcaster enforces
synchronization for us in this case, by not passing the frame on
to sinks which don't want it. */
- if (apply_rotation() &&
- frame.rotation() != webrtc::kVideoRotation_0 &&
- !buffer->native_handle()) {
+ if (apply_rotation() && frame.rotation() != webrtc::kVideoRotation_0 &&
+ buffer->type() == webrtc::VideoFrameBuffer::Type::kI420) {
/* Apply pending rotation. */
broadcaster_.OnFrame(webrtc::VideoFrame(
- webrtc::I420Buffer::Rotate(*buffer, frame.rotation()),
+ webrtc::I420Buffer::Rotate(*buffer->GetI420(), frame.rotation()),
nisse-webrtc 2017/05/29 08:22:22 What's the right way to add support for rotating n
magjed_webrtc 2017/05/29 12:12:06 Hopefully we don't need to handle rotating non-I42
nisse-webrtc 2017/05/29 12:37:17 Hmm, in the case of texture frames rotation mismat
magjed_webrtc 2017/05/29 13:57:02 Only the Android capture implementation depends on
nisse-webrtc 2017/05/29 14:35:55 I think logic which is generally useful to any vid
webrtc::kVideoRotation_0, frame.timestamp_us()));
} else {
broadcaster_.OnFrame(frame);

Powered by Google App Engine
This is Rietveld 408576698