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

Side by Side Diff: media/mp3/mp3_stream_parser.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/12) 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/mp3/mp3_stream_parser.h" 5 #include "media/mp3/mp3_stream_parser.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback_helpers.h" 8 #include "base/callback_helpers.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "media/base/bit_reader.h" 10 #include "media/base/bit_reader.h"
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 in_media_segment_(false) { 112 in_media_segment_(false) {
113 } 113 }
114 114
115 MP3StreamParser::~MP3StreamParser() {} 115 MP3StreamParser::~MP3StreamParser() {}
116 116
117 void MP3StreamParser::Init(const InitCB& init_cb, 117 void MP3StreamParser::Init(const InitCB& init_cb,
118 const NewConfigCB& config_cb, 118 const NewConfigCB& config_cb,
119 const NewBuffersCB& new_buffers_cb, 119 const NewBuffersCB& new_buffers_cb,
120 const NewTextBuffersCB& text_cb, 120 const NewTextBuffersCB& text_cb,
121 const NeedKeyCB& need_key_cb, 121 const NeedKeyCB& need_key_cb,
122 const AddTextTrackCB& add_text_track_cb, 122 const NewTextTrackCB& /* new_text_track_cb */ ,
123 const NewMediaSegmentCB& new_segment_cb, 123 const NewMediaSegmentCB& new_segment_cb,
124 const base::Closure& end_of_segment_cb, 124 const base::Closure& end_of_segment_cb,
125 const LogCB& log_cb) { 125 const LogCB& log_cb) {
126 DVLOG(1) << __FUNCTION__; 126 DVLOG(1) << __FUNCTION__;
127 DCHECK_EQ(state_, UNINITIALIZED); 127 DCHECK_EQ(state_, UNINITIALIZED);
128 init_cb_ = init_cb; 128 init_cb_ = init_cb;
129 config_cb_ = config_cb; 129 config_cb_ = config_cb;
130 new_buffers_cb_ = new_buffers_cb; 130 new_buffers_cb_ = new_buffers_cb;
131 new_segment_cb_ = new_segment_cb; 131 new_segment_cb_ = new_segment_cb;
132 end_of_segment_cb_ = end_of_segment_cb; 132 end_of_segment_cb_ = end_of_segment_cb;
(...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after
588 588
589 if (end_of_segment) { 589 if (end_of_segment) {
590 in_media_segment_ = false; 590 in_media_segment_ = false;
591 end_of_segment_cb_.Run(); 591 end_of_segment_cb_.Run();
592 } 592 }
593 593
594 return true; 594 return true;
595 } 595 }
596 596
597 } // namespace media 597 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698