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

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: addressed comments 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 e2e9892f50fa238595218ae1e190ad49933bdd62..26e76ef8cdbd0893da1f8bfa9b6f6b5b27f20373 100644
--- a/media/ffmpeg/ffmpeg_common.cc
+++ b/media/ffmpeg/ffmpeg_common.cc
@@ -408,6 +408,15 @@ void AVStreamToVideoDecoderConfig(
VideoPixelFormat format =
PixelFormatToVideoPixelFormat(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 == PIXEL_FORMAT_UNKNOWN)
+ format = PIXEL_FORMAT_YV12;
+ if (coded_size == gfx::Size(0, 0))
+ coded_size = visible_rect.size();
+#endif
+
if (codec == kCodecVP9) {
// TODO(tomfinegan): libavcodec doesn't know about VP9.
format = PIXEL_FORMAT_YV12;

Powered by Google App Engine
This is Rietveld 408576698