diff options
| author | servolk <servolk@chromium.org> | 2016-03-04 19:29:15 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-05 03:30:48 +0000 |
| commit | 81e01e07b928180ce12b0229dbb7ca0e157984d2 (patch) | |
| tree | 2e70dc23dfe29eef339ae15f488df01376d45bfa /chromecast | |
| parent | ebeddadd639d34653036db5c29246cea272c9920 (diff) | |
| download | chromium_src-81e01e07b928180ce12b0229dbb7ca0e157984d2.zip chromium_src-81e01e07b928180ce12b0229dbb7ca0e157984d2.tar.gz chromium_src-81e01e07b928180ce12b0229dbb7ca0e157984d2.tar.bz2 | |
Unify media track info reporting on a demuxer level
This will work for both FFmpegDemuxer and MSE/ChunkDemuxer
Review URL: https://codereview.chromium.org/1727243002
Cr-Commit-Position: refs/heads/master@{#379449}
Diffstat (limited to 'chromecast')
| -rw-r--r-- | chromecast/media/cma/test/frame_segmenter_for_test.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chromecast/media/cma/test/frame_segmenter_for_test.cc b/chromecast/media/cma/test/frame_segmenter_for_test.cc index 7d4d06d..b8172ee 100644 --- a/chromecast/media/cma/test/frame_segmenter_for_test.cc +++ b/chromecast/media/cma/test/frame_segmenter_for_test.cc @@ -15,6 +15,7 @@ #include "media/base/decoder_buffer.h" #include "media/base/demuxer.h" #include "media/base/media_log.h" +#include "media/base/media_tracks.h" #include "media/base/test_helpers.h" #include "media/filters/ffmpeg_demuxer.h" #include "media/filters/file_data_source.h" @@ -269,6 +270,9 @@ void OnEncryptedMediaInitData(::media::EmeInitDataType init_data_type, LOG(FATAL) << "Unexpected test failure: file is encrypted."; } +void OnMediaTracksUpdated(scoped_ptr<::media::MediaTracks> tracks) { +} + void OnNewBuffer(BufferList* buffer_list, const base::Closure& finished_cb, ::media::DemuxerStream::Status status, @@ -310,7 +314,8 @@ DemuxResult FFmpegDemuxForTest(const base::FilePath& filepath, ::media::FFmpegDemuxer demuxer( base::ThreadTaskRunnerHandle::Get(), &data_source, - base::Bind(&OnEncryptedMediaInitData), new ::media::MediaLog()); + base::Bind(&OnEncryptedMediaInitData), base::Bind(&OnMediaTracksUpdated), + new ::media::MediaLog()); ::media::WaitableMessageLoopEvent init_event; demuxer.Initialize(&fake_demuxer_host, init_event.GetPipelineStatusCB(), |