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

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: build_ffmpegsumo is gone! yay 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
« no previous file with comments | « media/blink/media_blink.gyp ('k') | media/filters/audio_decoder_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/ffmpeg/ffmpeg_common.cc
diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc
index cfd9e9aabdcb75ba0842b2867a24d52fed54334d..5b6ef7fe3c19c3df7b31ffb194240198bc3e6f81 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;
« no previous file with comments | « media/blink/media_blink.gyp ('k') | media/filters/audio_decoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698