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

Unified Diff: media/filters/ffmpeg_glue_unittest.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/filters/audio_decoder_unittest.cc ('k') | media/media.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_glue_unittest.cc
diff --git a/media/filters/ffmpeg_glue_unittest.cc b/media/filters/ffmpeg_glue_unittest.cc
index f9cfda5a646bac28066a65b5afc8088cfcd72e67..5b97f3636f2e5658b9b43d92b80091643c3fd874 100644
--- a/media/filters/ffmpeg_glue_unittest.cc
+++ b/media/filters/ffmpeg_glue_unittest.cc
@@ -235,9 +235,11 @@ TEST_F(FFmpegGlueDestructionTest, WithOpenWithOpenStreams) {
ASSERT_TRUE(glue_->OpenContext());
ASSERT_GT(glue_->format_context()->nb_streams, 0u);
- AVCodecContext* context = glue_->format_context()->streams[0]->codec;
- ASSERT_EQ(avcodec_open2(
- context, avcodec_find_decoder(context->codec_id), NULL), 0);
+ // Pick the audio stream (1) so this works when the ffmpeg video decoders are
+ // disabled.
+ AVCodecContext* context = glue_->format_context()->streams[1]->codec;
+ ASSERT_EQ(0, avcodec_open2(
+ context, avcodec_find_decoder(context->codec_id), NULL));
}
} // namespace media
« no previous file with comments | « media/filters/audio_decoder_unittest.cc ('k') | media/media.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698