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

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

Issue 23702007: Render inband text tracks in the media pipeline (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: modified ffmpeg demuxer unittest 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 unified diff | Download patch
OLDNEW
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 #ifndef MEDIA_WEBM_WEBM_TRACKS_PARSER_H_ 5 #ifndef MEDIA_WEBM_WEBM_TRACKS_PARSER_H_
6 #define MEDIA_WEBM_WEBM_TRACKS_PARSER_H_ 6 #define MEDIA_WEBM_WEBM_TRACKS_PARSER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "media/base/audio_decoder_config.h" 15 #include "media/base/audio_decoder_config.h"
16 #include "media/base/media_log.h" 16 #include "media/base/media_log.h"
17 #include "media/base/text_track.h" 17 #include "media/base/text_track_config.h"
18 #include "media/base/video_decoder_config.h" 18 #include "media/base/video_decoder_config.h"
19 #include "media/webm/webm_audio_client.h" 19 #include "media/webm/webm_audio_client.h"
20 #include "media/webm/webm_content_encodings_client.h" 20 #include "media/webm/webm_content_encodings_client.h"
21 #include "media/webm/webm_parser.h" 21 #include "media/webm/webm_parser.h"
22 #include "media/webm/webm_video_client.h" 22 #include "media/webm/webm_video_client.h"
23 23
24 namespace media { 24 namespace media {
25 25
26 // Parser for WebM Tracks element. 26 // Parser for WebM Tracks element.
27 class MEDIA_EXPORT WebMTracksParser : public WebMParserClient { 27 class MEDIA_EXPORT WebMTracksParser : public WebMParserClient {
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 101
102 WebMVideoClient video_client_; 102 WebMVideoClient video_client_;
103 VideoDecoderConfig video_decoder_config_; 103 VideoDecoderConfig video_decoder_config_;
104 104
105 DISALLOW_COPY_AND_ASSIGN(WebMTracksParser); 105 DISALLOW_COPY_AND_ASSIGN(WebMTracksParser);
106 }; 106 };
107 107
108 } // namespace media 108 } // namespace media
109 109
110 #endif // MEDIA_WEBM_WEBM_TRACKS_PARSER_H_ 110 #endif // MEDIA_WEBM_WEBM_TRACKS_PARSER_H_
OLDNEW
« media/webm/webm_stream_parser.cc ('K') | « media/webm/webm_stream_parser.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698