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

Side by Side Diff: media/base/text_renderer.cc

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
(Empty)
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file.
4
5 #include "media/base/text_renderer.h"
6
7 #include "base/bind.h"
8 #include "base/callback_helpers.h"
9 #include "base/logging.h"
10 #include "base/message_loop/message_loop_proxy.h"
11 #include "base/stl_util.h"
12 #include "media/base/bind_to_loop.h"
13 #include "media/base/decoder_buffer.h"
14 #include "media/base/demuxer.h"
15 #include "media/base/demuxer_stream.h"
16 #include "media/base/text_cue.h"
17
18 namespace media {
19
20 TextRenderer::TextRenderer(
21 const scoped_refptr<base::MessageLoopProxy>& message_loop,
22 const AddTextTrackCB& add_text_track_cb)
23 : message_loop_(message_loop),
24 weak_factory_(this),
25 add_text_track_cb_(add_text_track_cb),
26 state_(kUninitialized),
27 pending_read_count_(0),
28 pending_eos_count_(0) {
29 }
30
31 TextRenderer::~TextRenderer() {
32 DCHECK(state_ == kUninitialized ||
33 state_ == kStopped) << "state_ " << state_;
34 DCHECK_EQ(pending_read_count_, 0);
35 STLDeleteValues(&text_track_state_map_);
36 }
37
38 void TextRenderer::Initialize(const base::Closure& ended_cb) {
39 DCHECK(message_loop_->BelongsToCurrentThread());
40 DCHECK(!ended_cb.is_null());
41 DCHECK_EQ(kUninitialized, state_) << "state_ " << state_;
42 DCHECK(text_track_state_map_.empty());
43 DCHECK_EQ(pending_read_count_, 0);
44 DCHECK_EQ(pending_eos_count_, 0);
45 DCHECK(ended_cb_.is_null());
46
47 weak_this_ = weak_factory_.GetWeakPtr();
48 ended_cb_ = ended_cb;
49 state_ = kPaused;
50 }
51
52 void TextRenderer::Play(const base::Closure& callback) {
53 DCHECK(message_loop_->BelongsToCurrentThread());
54 DCHECK_EQ(state_, kPaused) << "state_ " << state_;
55
56 for (TextTrackStateMap::iterator itr = text_track_state_map_.begin();
57 itr != text_track_state_map_.end(); ++itr) {
58 TextTrackState* state = itr->second;
59 if (state->read_state == TextTrackState::kReadPending) {
60 DCHECK_GT(pending_read_count_, 0);
61 continue;
62 }
63
64 state->read_state = TextTrackState::kReadPending;
65 ++pending_read_count_;
66
67 DemuxerStream* const stream = itr->first;
acolwell GONE FROM CHROMIUM 2013/10/29 21:14:19 nit: fix indent here and the line below
Matthew Heaney (Chromium) 2013/11/05 04:52:40 Done.
68 stream->Read(base::Bind(&TextRenderer::BufferReady,
69 weak_this_,
70 stream));
71 }
72
73 state_ = kPlaying;
74 callback.Run();
75 }
76
77 void TextRenderer::Pause(const base::Closure& callback) {
78 DCHECK(message_loop_->BelongsToCurrentThread());
79 DCHECK(state_ == kPlaying || state_ == kEnded) << "state_ " << state_;
80 DCHECK_GE(pending_read_count_, 0);
81 pause_cb_ = callback;
82
83 if (pending_read_count_ == 0) {
84 state_ = kPaused;
85 base::ResetAndReturn(&pause_cb_).Run();
86 return;
87 }
88
89 state_ = kPausePending;
90 }
91
92 void TextRenderer::Flush(const base::Closure& callback) {
93 DCHECK(message_loop_->BelongsToCurrentThread());
94 DCHECK_EQ(pending_read_count_, 0);
95 DCHECK(state_ == kPaused || state_ == kEnded) << "state_ " << state_;
96
97 pending_eos_count_ = text_track_state_map_.size();
98
99 callback.Run();
100 }
101
102 void TextRenderer::Stop(const base::Closure& cb) {
103 DCHECK(message_loop_->BelongsToCurrentThread());
104 DCHECK(!cb.is_null());
105 DCHECK(state_ == kPlaying ||
106 state_ == kPausePending ||
107 state_ == kPaused ||
108 state_ == kEnded) << "state_ " << state_;
109 DCHECK_GE(pending_read_count_, 0);
110
111 stop_cb_ = cb;
112
113 if (pending_read_count_ == 0) {
114 state_ = kStopped;
115 base::ResetAndReturn(&stop_cb_).Run();
116 return;
117 }
118
119 state_ = kStopPending;
120 }
121
122 void TextRenderer::AddTextStream(DemuxerStream* text_stream,
123 const TextTrackConfig& config) {
124 DCHECK(message_loop_->BelongsToCurrentThread());
125 DCHECK(state_ != kUninitialized) << "state_ " << state_;
126 DCHECK_NE(state_, kStopPending);
127 DCHECK_NE(state_, kStopped);
128
129 media::AddTextTrackDoneCB done_cb =
130 media::BindToLoop(message_loop_,
131 base::Bind(&TextRenderer::OnAddTextTrackDone,
132 weak_this_,
133 text_stream));
134
135 add_text_track_cb_.Run(config, done_cb);
136 }
137
138 void TextRenderer::RemoveTextStream(DemuxerStream* text_stream) {
139 DCHECK(message_loop_->BelongsToCurrentThread());
140
141 TextTrackStateMap::iterator itr = text_track_state_map_.find(text_stream);
142
143 if (itr != text_track_state_map_.end()) {
acolwell GONE FROM CHROMIUM 2013/10/29 21:14:19 Should a DCHECK be used here instead? What is the
Matthew Heaney (Chromium) 2013/11/05 04:52:40 Done.
144 TextTrackState* state = itr->second;
145 DCHECK_EQ(state->read_state, TextTrackState::kReadIdle);
146 delete state;
147 text_track_state_map_.erase(itr);
148 }
149 }
150
151 bool TextRenderer::HasTracks() const {
152 DCHECK(message_loop_->BelongsToCurrentThread());
153 return !text_track_state_map_.empty();
154 }
155
156 void TextRenderer::BufferReady(
157 DemuxerStream* stream,
158 DemuxerStream::Status status,
159 const scoped_refptr<DecoderBuffer>& input) {
160 DCHECK(message_loop_->BelongsToCurrentThread());
161 DCHECK_NE(status, DemuxerStream::kConfigChanged);
162
163 if (status == DemuxerStream::kAborted) {
164 DCHECK(!input);
165 DCHECK_GT(pending_read_count_, 0);
166 DCHECK_GT(pending_eos_count_, 0);
167
168 TextTrackStateMap::iterator itr = text_track_state_map_.find(stream);
169 DCHECK(itr != text_track_state_map_.end());
170
171 TextTrackState* state = itr->second;
172 DCHECK_EQ(state->read_state, TextTrackState::kReadPending);
173
174 --pending_read_count_;
175 state->read_state = TextTrackState::kReadIdle;
176 return;
177 }
178
179 if (input->end_of_stream()) {
180 CueReady(stream, NULL);
181 return;
182 }
183
184 DCHECK_EQ(status, DemuxerStream::kOk);
185 DCHECK_GE(input->side_data_size(), 2);
186
187 // The side data contains both the cue id and cue settings,
188 // each terminated with a NUL.
189 const char* id_ptr = reinterpret_cast<const char*>(input->side_data());
190 size_t id_len = strlen(id_ptr);
191 std::string id(id_ptr, id_len);
192
193 const char* settings_ptr = id_ptr + id_len + 1;
194 size_t settings_len = strlen(settings_ptr);
195 std::string settings(settings_ptr, settings_len);
196
197 // The cue payload is stored in the data-part of the input buffer.
198 std::string text(input->data(), input->data() + input->data_size());
199
200 scoped_refptr<TextCue> text_cue(
201 new TextCue(input->timestamp(),
202 input->duration(),
203 id,
204 settings,
205 text));
206
207 CueReady(stream, text_cue);
208 }
209
210 void TextRenderer::CueReady(
211 DemuxerStream* text_stream,
212 const scoped_refptr<TextCue>& text_cue) {
213 DCHECK(message_loop_->BelongsToCurrentThread());
214 DCHECK(state_ != kUninitialized &&
215 state_ != kStopped) << "state_ " << state_;
216 DCHECK_GT(pending_read_count_, 0);
217 DCHECK_GT(pending_eos_count_, 0);
218
219 TextTrackStateMap::iterator itr = text_track_state_map_.find(text_stream);
220 DCHECK(itr != text_track_state_map_.end());
221
222 TextTrackState* state = itr->second;
223 DCHECK_EQ(state->read_state, TextTrackState::kReadPending);
224 DCHECK(state->text_track);
225
226 --pending_read_count_;
227 state->read_state = TextTrackState::kReadIdle;
228
229 switch (state_) {
230 case kPlaying:
231 case kPausePending:
232 if (text_cue)
233 break;
234
235 // A NULL buffer means that we have reached EOS (or there's an error).
236
237 --pending_eos_count_;
238
239 if (pending_eos_count_ > 0)
240 return;
241
242 if (state_ == kPausePending)
243 pause_cb_.Run();
acolwell GONE FROM CHROMIUM 2013/10/29 21:14:19 I think you need base::ResetAndReturn(&pause_cb_)
Matthew Heaney (Chromium) 2013/11/05 04:52:40 Done.
244
245 state_ = kEnded;
246 ended_cb_.Run();
247
248 return;
249
250 case kStopPending:
251 if (pending_read_count_ == 0) {
252 state_ = kStopped;
253 stop_cb_.Run();
254 }
255
256 return;
257
258 case kPaused:
259 case kStopped:
260 case kUninitialized:
261 case kEnded:
262 NOTREACHED();
263 return;
264 }
265
266 base::TimeDelta start = text_cue->timestamp();
267 base::TimeDelta end = start + text_cue->duration();
268
269 state->text_track->addWebVTTCue(start, end,
270 text_cue->id(),
271 text_cue->text(),
272 text_cue->settings());
273
274 if (state_ == kPlaying) {
275 state->read_state = TextTrackState::kReadPending;
276 ++pending_read_count_;
277 text_stream->Read(base::Bind(&TextRenderer::BufferReady,
278 weak_this_,
279 text_stream));
280 return;
281 }
282
283 if (pending_read_count_ == 0) {
284 DCHECK_EQ(state_, kPausePending) << "state_ " << state_;
285 state_ = kPaused;
286 pause_cb_.Run();
acolwell GONE FROM CHROMIUM 2013/10/29 21:14:19 Use base::ResetAndReturn(&pause_cb_) here.
Matthew Heaney (Chromium) 2013/11/05 04:52:40 Done.
287 }
288 }
289
290 void TextRenderer::OnAddTextTrackDone(DemuxerStream* text_stream,
291 scoped_ptr<TextTrack> text_track) {
292 DCHECK(message_loop_->BelongsToCurrentThread());
293 DCHECK(state_ != kUninitialized &&
294 state_ != kStopped) << "state_ " << state_;
295
296 TextTrackState* state = new TextTrackState;
acolwell GONE FROM CHROMIUM 2013/10/29 21:14:19 nit: Use scoped_ptr here and release below.
Matthew Heaney (Chromium) 2013/11/05 04:52:40 Done.
297 state->text_track.reset(text_track.release());
acolwell GONE FROM CHROMIUM 2013/10/29 21:14:19 nit: This and setting read_state to kReadIdle shou
Matthew Heaney (Chromium) 2013/11/05 04:52:40 Done.
298
299 if (state_ != kPlaying) {
300 state->read_state = TextTrackState::kReadIdle;
301 } else {
302 state->read_state = TextTrackState::kReadPending;
acolwell GONE FROM CHROMIUM 2013/10/29 21:14:19 nit: This appears to duplicate code in CueReady. P
Matthew Heaney (Chromium) 2013/11/05 04:52:40 Done.
303 ++pending_read_count_;
304
305 text_stream->Read(base::Bind(&TextRenderer::BufferReady,
306 weak_this_,
307 text_stream));
308 }
309
310 text_track_state_map_[text_stream] = state;
311 ++pending_eos_count_;
312 }
313
314 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698