diff options
| author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-21 23:15:09 +0000 |
|---|---|---|
| committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-21 23:15:09 +0000 |
| commit | a2af3611b7301a54dd553fafcdafff3827172e6c (patch) | |
| tree | 335964f24dbba6165ae9e3558f7f2e10e7c5dfda /media/mp4 | |
| parent | 0991fa9f11722cc5d0959476668904aaa0f2b9c7 (diff) | |
| download | chromium_src-a2af3611b7301a54dd553fafcdafff3827172e6c.zip chromium_src-a2af3611b7301a54dd553fafcdafff3827172e6c.tar.gz chromium_src-a2af3611b7301a54dd553fafcdafff3827172e6c.tar.bz2 | |
Add support for config changes during playback to FFmpegVideoDecoder.
Also fixed a minor config change related bug in SourceBufferStream.
BUG=122913
TEST=PipelineIntegrationTest.MediaSource_MP4ConfigChange, SourceBufferStreamTest.ConfigChange_Basic, PipelineIntegrationTest.MediaSource_Seek
Review URL: https://chromiumcodereview.appspot.com/10828425
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152666 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/mp4')
| -rw-r--r-- | media/mp4/mp4_stream_parser.cc | 9 | ||||
| -rw-r--r-- | media/mp4/mp4_stream_parser_unittest.cc | 5 |
2 files changed, 1 insertions, 13 deletions
diff --git a/media/mp4/mp4_stream_parser.cc b/media/mp4/mp4_stream_parser.cc index 1aa8c70..b025b7a 100644 --- a/media/mp4/mp4_stream_parser.cc +++ b/media/mp4/mp4_stream_parser.cc @@ -237,14 +237,7 @@ bool MP4StreamParser::ParseMoov(BoxReader* reader) { } } - // TODO(strobe): For now, we avoid sending new configs on a new - // reinitialization segment, and instead simply embed the updated parameter - // sets into the video stream. The conditional should be removed when - // http://crbug.com/122913 is fixed. (We detect whether we've already sent - // configs by looking at init_cb_ instead of config_cb_, because init_cb_ - // should only be fired once even after that bug is fixed.) - if (!init_cb_.is_null()) - RCHECK(config_cb_.Run(audio_config, video_config)); + RCHECK(config_cb_.Run(audio_config, video_config)); base::TimeDelta duration; if (moov_->extends.header.fragment_duration > 0) { diff --git a/media/mp4/mp4_stream_parser_unittest.cc b/media/mp4/mp4_stream_parser_unittest.cc index 830f35b..20c32f1 100644 --- a/media/mp4/mp4_stream_parser_unittest.cc +++ b/media/mp4/mp4_stream_parser_unittest.cc @@ -62,11 +62,6 @@ class MP4StreamParserTest : public testing::Test { const VideoDecoderConfig& vc) { DVLOG(1) << "NewConfigF: audio=" << ac.IsValidConfig() << ", video=" << vc.IsValidConfig(); - - // TODO(strobe): Until http://crbug.com/122913 is fixed, we want to make - // sure that this callback isn't called more than once per stream. Remove - // when that bug is fixed. - EXPECT_FALSE(configs_received_); configs_received_ = true; return true; } |