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

Side by Side Diff: media/mp4/mp4_stream_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: 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 unified diff | Download patch
« no previous file with comments | « media/mp3/mp3_stream_parser_unittest.cc ('k') | media/mp4/mp4_stream_parser.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_MP4_MP4_STREAM_PARSER_H_ 5 #ifndef MEDIA_MP4_MP4_STREAM_PARSER_H_
6 #define MEDIA_MP4_MP4_STREAM_PARSER_H_ 6 #define MEDIA_MP4_MP4_STREAM_PARSER_H_
7 7
8 #include <set> 8 #include <set>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 14 matching lines...) Expand all
25 25
26 class MEDIA_EXPORT MP4StreamParser : public StreamParser { 26 class MEDIA_EXPORT MP4StreamParser : public StreamParser {
27 public: 27 public:
28 MP4StreamParser(const std::set<int>& audio_object_types, bool has_sbr); 28 MP4StreamParser(const std::set<int>& audio_object_types, bool has_sbr);
29 virtual ~MP4StreamParser(); 29 virtual ~MP4StreamParser();
30 30
31 virtual void Init(const InitCB& init_cb, const NewConfigCB& config_cb, 31 virtual void Init(const InitCB& init_cb, const NewConfigCB& config_cb,
32 const NewBuffersCB& new_buffers_cb, 32 const NewBuffersCB& new_buffers_cb,
33 const NewTextBuffersCB& text_cb, 33 const NewTextBuffersCB& text_cb,
34 const NeedKeyCB& need_key_cb, 34 const NeedKeyCB& need_key_cb,
35 const AddTextTrackCB& add_text_track_cb,
36 const NewMediaSegmentCB& new_segment_cb, 35 const NewMediaSegmentCB& new_segment_cb,
37 const base::Closure& end_of_segment_cb, 36 const base::Closure& end_of_segment_cb,
38 const LogCB& log_cb) OVERRIDE; 37 const LogCB& log_cb) OVERRIDE;
39 virtual void Flush() OVERRIDE; 38 virtual void Flush() OVERRIDE;
40 virtual bool Parse(const uint8* buf, int size) OVERRIDE; 39 virtual bool Parse(const uint8* buf, int size) OVERRIDE;
41 40
42 private: 41 private:
43 enum State { 42 enum State {
44 kWaitingForInit, 43 kWaitingForInit,
45 kParsingBoxes, 44 kParsingBoxes,
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 bool is_audio_track_encrypted_; 112 bool is_audio_track_encrypted_;
114 bool is_video_track_encrypted_; 113 bool is_video_track_encrypted_;
115 114
116 DISALLOW_COPY_AND_ASSIGN(MP4StreamParser); 115 DISALLOW_COPY_AND_ASSIGN(MP4StreamParser);
117 }; 116 };
118 117
119 } // namespace mp4 118 } // namespace mp4
120 } // namespace media 119 } // namespace media
121 120
122 #endif // MEDIA_MP4_MP4_STREAM_PARSER_H_ 121 #endif // MEDIA_MP4_MP4_STREAM_PARSER_H_
OLDNEW
« no previous file with comments | « media/mp3/mp3_stream_parser_unittest.cc ('k') | media/mp4/mp4_stream_parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698