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

Unified Diff: media/filters/pipeline_integration_test_base.cc

Issue 23702007: Render inband text tracks in the media pipeline (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: incorporate aaron's comments (9/28) Created 7 years, 3 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
Index: media/filters/pipeline_integration_test_base.cc
diff --git a/media/filters/pipeline_integration_test_base.cc b/media/filters/pipeline_integration_test_base.cc
index 3f0910a2b8b2a4180573d4aefc609cfa5b8ed6a9..91cb2f4b01d331b639d5c980bc3238589b1419e6 100644
--- a/media/filters/pipeline_integration_test_base.cc
+++ b/media/filters/pipeline_integration_test_base.cc
@@ -7,6 +7,7 @@
#include "base/bind.h"
#include "base/memory/scoped_vector.h"
#include "media/base/media_log.h"
+#include "media/base/text_renderer.h"
#include "media/filters/audio_renderer_impl.h"
#include "media/filters/chunk_demuxer.h"
#include "media/filters/ffmpeg_audio_decoder.h"
@@ -14,6 +15,7 @@
#include "media/filters/ffmpeg_video_decoder.h"
#include "media/filters/file_data_source.h"
#include "media/filters/opus_audio_decoder.h"
+#include "media/filters/text_decoder_impl.h"
acolwell GONE FROM CHROMIUM 2013/10/08 15:45:24 nit: not used
Matthew Heaney (Chromium) 2013/10/13 05:30:17 Done.
#include "media/filters/vpx_video_decoder.h"
using ::testing::AnyNumber;
@@ -216,6 +218,7 @@ PipelineIntegrationTestBase::CreateFilterCollection(
new FFmpegDemuxer(message_loop_.message_loop_proxy(),
data_source_.get(),
need_key_cb,
+ false, // don't enable inband text tracks
acolwell GONE FROM CHROMIUM 2013/10/08 15:45:24 nit: This should be true. We should be testing inb
Matthew Heaney (Chromium) 2013/10/13 05:30:17 Done.
new MediaLog()));
return CreateFilterCollection(demuxer.Pass(), decryptor);
}

Powered by Google App Engine
This is Rietveld 408576698