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

Unified Diff: media/base/demuxer_perftest.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 | « media/base/demuxer.h ('k') | media/base/media_track.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/demuxer_perftest.cc
diff --git a/media/base/demuxer_perftest.cc b/media/base/demuxer_perftest.cc
index 7d8a10ba1def945431ed2c82645b29311040949c..6703222bc71a700c9d71724d799d030c154cfc8f 100644
--- a/media/base/demuxer_perftest.cc
+++ b/media/base/demuxer_perftest.cc
@@ -14,6 +14,7 @@
#include "build/build_config.h"
#include "media/base/media.h"
#include "media/base/media_log.h"
+#include "media/base/media_tracks.h"
#include "media/base/test_data_util.h"
#include "media/base/timestamp_constants.h"
#include "media/filters/ffmpeg_demuxer.h"
@@ -54,6 +55,10 @@ static void OnEncryptedMediaInitData(EmeInitDataType init_data_type,
VLOG(0) << "File is encrypted.";
}
+static void OnMediaTracksUpdated(scoped_ptr<MediaTracks> tracks) {
+ VLOG(0) << "Got media tracks info, tracks = " << tracks->tracks().size();
+}
+
typedef std::vector<media::DemuxerStream* > Streams;
// Simulates playback reading requirements by reading from each stream
@@ -183,8 +188,11 @@ static void RunDemuxerBenchmark(const std::string& filename) {
Demuxer::EncryptedMediaInitDataCB encrypted_media_init_data_cb =
base::Bind(&OnEncryptedMediaInitData);
+ Demuxer::MediaTracksUpdatedCB tracks_updated_cb =
+ base::Bind(&OnMediaTracksUpdated);
FFmpegDemuxer demuxer(message_loop.task_runner(), &data_source,
- encrypted_media_init_data_cb, new MediaLog());
+ encrypted_media_init_data_cb, tracks_updated_cb,
+ new MediaLog());
demuxer.Initialize(&demuxer_host,
base::Bind(&QuitLoopWithStatus, &message_loop),
« no previous file with comments | « media/base/demuxer.h ('k') | media/base/media_track.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698