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

Unified Diff: chromecast/media/cma/test/frame_segmenter_for_test.cc

Issue 1735803002: Implemented passing media track info from ffmpeg into blink (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: wolenetz@ CR feedback + better track info extraction in ffmpeg Created 4 years, 10 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 | « no previous file | media/base/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromecast/media/cma/test/frame_segmenter_for_test.cc
diff --git a/chromecast/media/cma/test/frame_segmenter_for_test.cc b/chromecast/media/cma/test/frame_segmenter_for_test.cc
index 7d4d06ded1cc1f656aac5494c71b9a462155a2f4..b8172eee7d05e90dc15397248eb45f6a4838192d 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(),
« no previous file with comments | « no previous file | media/base/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698