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

Unified Diff: media/ffmpeg/ffmpeg_common.cc

Issue 1230793009: Initial support for the desktop media pipeline on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: I forgot what year it is Created 5 years, 5 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/ffmpeg/ffmpeg_common.cc
diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc
index cb806c74812aba84ee66885a36f746f161ad0129..6b77416fe0a91b3ba64e496dbd72b77c3538ec06 100644
--- a/media/ffmpeg/ffmpeg_common.cc
+++ b/media/ffmpeg/ffmpeg_common.cc
@@ -407,8 +407,17 @@ void AVStreamToVideoDecoderConfig(
}
VideoFrame::Format format = PixelFormatToVideoFormat(stream->codec->pix_fmt);
+ // The format and coded size may be unknown if FFmpeg is compiled without
+ // video decoders.
+#if defined(DISABLE_FFMPEG_VIDEO_DECODERS)
+ if (format == VideoFrame::UNKNOWN)
+ format = VideoFrame::YV12;
+ if (coded_size == gfx::Size(0, 0))
+ coded_size = visible_rect.size();
+#endif
+
+ // TODO(tomfinegan): libavcodec doesn't know about VP9.
if (codec == kCodecVP9) {
- // TODO(tomfinegan): libavcodec doesn't know about VP9.
format = VideoFrame::YV12;
coded_size = visible_rect.size();
}

Powered by Google App Engine
This is Rietveld 408576698