media/webm/webm_tracks_parser.cc - Issue 13419002: Media Source dispatches inband text tracks

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: media/webm/webm_tracks_parser.cc

Issue 13419002: Media Source dispatches inband text tracks (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: clean compile Created 7 years, 7 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 unified diff | Download patch

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "media/webm/webm_tracks_parser.h"	5 #include "media/webm/webm_tracks_parser.h"

6	6

7 #include "base/logging.h"	7 #include "base/logging.h"

8 #include "base/string_util.h"	8 #include "base/string_util.h"

9 #include "media/base/buffers.h"	9 #include "media/base/buffers.h"

	10 #include "media/base/text_track.h"

10 #include "media/webm/webm_constants.h"	11 #include "media/webm/webm_constants.h"

11 #include "media/webm/webm_content_encodings.h"	12 #include "media/webm/webm_content_encodings.h"

12	13

13 namespace media {	14 namespace media {

14	15

15 // Values for TrackType element.	16 // Values for TrackType element.

16 static const int kWebMTrackTypeVideo = 1;	17 static const int kWebMTrackTypeVideo = 1;

17 static const int kWebMTrackTypeAudio = 2;	18 static const int kWebMTrackTypeAudio = 2;

18 static const int kWebMTrackTypeSubtitlesOrCaptions = 0x11;	19 static const int kWebMTrackTypeSubtitlesOrCaptions = 0x11;

19 static const int kWebMTrackTypeDescriptionsOrMetadata = 0x21;	20 static const int kWebMTrackTypeDescriptionsOrMetadata = 0x21;

(...skipping 235 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
255 }	256 }

256	257

257 codec_id_ = str;	258 codec_id_ = str;

258 return true;	259 return true;

259 }	260 }

260	261

261 return true;	262 return true;

262 }	263 }

263	264

264 } // namespace media	265 } // namespace media

OLD	NEW

« media/webm/webm_stream_parser.cc ('K') | « media/webm/webm_stream_parser.cc ('k') | webkit/media/webinbandtexttrack_impl.h » ('j') | webkit/media/webmediaplayer_impl.h » ('J')