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

Unified Diff: media/filters/ffmpeg_video_decoder.cc

Issue 1117423002: media: Let VideoFrame carry more than one native texture. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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: media/filters/ffmpeg_video_decoder.cc
diff --git a/media/filters/ffmpeg_video_decoder.cc b/media/filters/ffmpeg_video_decoder.cc
index a269afbfdf335a17e512e8a51c978cf57c38bb64..8a7ea513e576fd018a7130613a1a7d5b976b8123 100644
--- a/media/filters/ffmpeg_video_decoder.cc
+++ b/media/filters/ffmpeg_video_decoder.cc
@@ -125,8 +125,8 @@ int FFmpegVideoDecoder::GetVideoBuffer(struct AVCodecContext* codec_context,
RoundUp(std::max(size.width(), codec_context->coded_width), 2),
RoundUp(std::max(size.height(), codec_context->coded_height), 2));
- if (!VideoFrame::IsValidConfig(
- format, coded_size, gfx::Rect(size), natural_size))
+ if (!VideoFrame::IsValidConfig(format, VideoFrame::TEXTURE_NONE, coded_size,
+ gfx::Rect(size), natural_size))
return AVERROR(EINVAL);
scoped_refptr<VideoFrame> video_frame = frame_pool_.CreateFrame(

Powered by Google App Engine
This is Rietveld 408576698