content/renderer/media/video_track_adapter.cc - Issue 1154153003: Relanding 1143663007: VideoFrame: Separate Pixel Format from Storage Type.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/media/video_track_adapter.cc

Issue 1154153003: Relanding 1143663007: VideoFrame: Separate Pixel Format from Storage Type. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Added NV12 support in CrOS Created 5 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: content/renderer/media/video_track_adapter.cc

diff --git a/content/renderer/media/video_track_adapter.cc b/content/renderer/media/video_track_adapter.cc

index 2953f7d5679b63249d030785b736150cbe9b8b96..3f7fde2840b584003a370c56c1289362db2ae1a3 100644

--- a/content/renderer/media/video_track_adapter.cc

+++ b/content/renderer/media/video_track_adapter.cc

@@ -211,7 +211,7 @@ void VideoTrackAdapter::VideoFrameResolutionAdapter::DeliverFrame(

// TODO(perkj): Allow cropping / scaling of textures once

// http://crbug/362521 is fixed.

- if (frame->format() == media::VideoFrame::NATIVE_TEXTURE) {

+ if (frame->storage_type() == media::VideoFrame::STORAGE_TEXTURE) {

DoDeliverFrame(frame, estimated_capture_time);

return;

}

« no previous file with comments | « content/renderer/media/video_capture_impl.cc ('k') | content/renderer/media/webmediaplayer_ms.cc » ('j') | no next file with comments »