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

Unified Diff: media/mp3/mp3_stream_parser_unittest.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 (10/16) Created 7 years, 2 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/mp3/mp3_stream_parser_unittest.cc
diff --git a/media/mp3/mp3_stream_parser_unittest.cc b/media/mp3/mp3_stream_parser_unittest.cc
index 2e2b12e1246435071e72c6bf8b872a823cefa2d7..f637f288f6b85070737b2a1d084c1002924553ae 100644
--- a/media/mp3/mp3_stream_parser_unittest.cc
+++ b/media/mp3/mp3_stream_parser_unittest.cc
@@ -44,7 +44,8 @@ class MP3StreamParserTest : public testing::Test {
}
bool OnNewConfig(const AudioDecoderConfig& audio_config,
- const VideoDecoderConfig& video_config) {
+ const VideoDecoderConfig& video_config,
+ const TextTrackConfigMap& text_config) {
DVLOG(1) << __FUNCTION__ << "(" << audio_config.IsValidConfig() << ", "
<< video_config.IsValidConfig() << ")";
EXPECT_TRUE(audio_config.IsValidConfig());
@@ -79,7 +80,7 @@ class MP3StreamParserTest : public testing::Test {
return true;
}
- bool OnNewTextBuffers(TextTrack* text_track,
+ bool OnNewTextBuffers(int text_track,
const StreamParser::BufferQueue& buffers) {
return true;
}
@@ -89,12 +90,6 @@ class MP3StreamParserTest : public testing::Test {
DVLOG(1) << __FUNCTION__ << "(" << type << ", " << init_data.size() << ")";
}
- scoped_ptr<TextTrack> OnAddTextTrack(TextKind kind,
- const std::string& label,
- const std::string& language) {
- return scoped_ptr<TextTrack>();
- }
-
void OnNewSegment() {
DVLOG(1) << __FUNCTION__;
results_stream_ << "NewSegment";
@@ -113,8 +108,7 @@ class MP3StreamParserTest : public testing::Test {
base::Bind(&MP3StreamParserTest::OnNewTextBuffers,
base::Unretained(this)),
base::Bind(&MP3StreamParserTest::OnKeyNeeded, base::Unretained(this)),
- base::Bind(&MP3StreamParserTest::OnAddTextTrack,
- base::Unretained(this)),
+ true,
base::Bind(&MP3StreamParserTest::OnNewSegment, base::Unretained(this)),
base::Bind(&MP3StreamParserTest::OnEndOfSegment,
base::Unretained(this)),

Powered by Google App Engine
This is Rietveld 408576698