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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/ffmpeg/ffmpeg_common.cc

Issue 178133005: Audit/fix use of media::VideoFrame::coded_size() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 2121885f Rebase. Created 6 years, 9 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
« media/base/video_frame.cc ('K') | « media/cast/test/end2end_unittest.cc ('k') | media/filters/skcanvas_video_renderer_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 05dcd17155cd5b09a6066780af3b3da6c7ddc14d..344e2656b9d4c4b004947aaf25df2e3ca01fb7e4 100644
--- a/media/ffmpeg/ffmpeg_common.cc
+++ b/media/ffmpeg/ffmpeg_common.cc
@@ -404,6 +404,11 @@ void AVStreamToVideoDecoderConfig(
coded_size = natural_size;
}
+ // Pad out |coded_size| for subsampled YUV formats.
+ coded_size.set_width((coded_size.width() + 1) / 2 * 2);
+ if (format != VideoFrame::YV16)
+ coded_size.set_height((coded_size.height() + 1) / 2 * 2);
+
bool is_encrypted = false;
AVDictionaryEntry* key = av_dict_get(stream->metadata, "enc_key_id", NULL, 0);
if (key)
« media/base/video_frame.cc ('K') | « media/cast/test/end2end_unittest.cc ('k') | media/filters/skcanvas_video_renderer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698