media/webm/webm_cluster_parser_unittest.cc - Issue 23702007: Render inband text tracks in the media pipeline

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/webm/webm_cluster_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: fix compile errors 11/21 #6 Created 7 years, 1 month 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/webm/webm_cluster_parser_unittest.cc

diff --git a/media/webm/webm_cluster_parser_unittest.cc b/media/webm/webm_cluster_parser_unittest.cc

index 5c5837fa8660e3e61baf57df95da3da1081767f6..fe5e83fdfd79264d236cef006c1a97ec8e2205df 100644

--- a/media/webm/webm_cluster_parser_unittest.cc

+++ b/media/webm/webm_cluster_parser_unittest.cc

@@ -374,11 +374,9 @@ TEST_F(WebMClusterParserTest, IgnoredTracks) {

TEST_F(WebMClusterParserTest, ParseTextTracks) {

typedef WebMTracksParser::TextTracks TextTracks;

TextTracks text_tracks;

- WebMTracksParser::TextTrackInfo text_track_info;

- text_track_info.kind = kTextSubtitles;

text_tracks.insert(std::make_pair(TextTracks::key_type(kTextTrackNum),

- text_track_info));

+ TextTrackConfig(kTextSubtitles, "", "")));

parser_.reset(new WebMClusterParser(kTimecodeScale,

kAudioTrackNum,

@@ -410,12 +408,10 @@ TEST_F(WebMClusterParserTest, ParseTextTracks) {

TEST_F(WebMClusterParserTest, TextTracksSimpleBlock) {

typedef WebMTracksParser::TextTracks TextTracks;

- TextTracks text_tracks;

- WebMTracksParser::TextTrackInfo text_track_info;

+ WebMTracksParser::TextTracks text_tracks;

- text_track_info.kind = kTextSubtitles;

text_tracks.insert(std::make_pair(TextTracks::key_type(kTextTrackNum),

- text_track_info));

+ TextTrackConfig(kTextSubtitles, "", "")));

parser_.reset(new WebMClusterParser(kTimecodeScale,

kAudioTrackNum,

@@ -441,18 +437,15 @@ TEST_F(WebMClusterParserTest, TextTracksSimpleBlock) {

TEST_F(WebMClusterParserTest, ParseMultipleTextTracks) {

typedef WebMTracksParser::TextTracks TextTracks;

TextTracks text_tracks;

- WebMTracksParser::TextTrackInfo text_track_info;

const int kSubtitleTextTrackNum = kTextTrackNum;

const int kCaptionTextTrackNum = kTextTrackNum + 1;

- text_track_info.kind = kTextSubtitles;

text_tracks.insert(std::make_pair(TextTracks::key_type(kSubtitleTextTrackNum),

- text_track_info));

+ TextTrackConfig(kTextSubtitles, "", "")));

- text_track_info.kind = kTextCaptions;

text_tracks.insert(std::make_pair(TextTracks::key_type(kCaptionTextTrackNum),

- text_track_info));

+ TextTrackConfig(kTextCaptions, "", "")));

parser_.reset(new WebMClusterParser(kTimecodeScale,

kAudioTrackNum,

« no previous file with comments | « media/webm/webm_cluster_parser.cc ('k') | media/webm/webm_stream_parser.h » ('j') | no next file with comments »