| OLD | NEW |
| 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/base/text_renderer.h" | 5 #include "media/base/text_renderer.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/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/single_thread_task_runner.h" | 10 #include "base/single_thread_task_runner.h" |
| 11 #include "base/stl_util.h" | 11 #include "base/stl_util.h" |
| 12 #include "media/base/bind_to_current_loop.h" | 12 #include "media/base/bind_to_current_loop.h" |
| 13 #include "media/base/decoder_buffer.h" | 13 #include "media/base/decoder_buffer.h" |
| 14 #include "media/base/demuxer.h" | 14 #include "media/base/demuxer.h" |
| 15 #include "media/base/demuxer_stream.h" | |
| 16 #include "media/base/text_cue.h" | 15 #include "media/base/text_cue.h" |
| 17 | 16 |
| 18 namespace media { | 17 namespace media { |
| 19 | 18 |
| 20 TextRenderer::TextRenderer( | 19 TextRenderer::TextRenderer( |
| 21 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, | 20 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, |
| 22 const AddTextTrackCB& add_text_track_cb) | 21 const AddTextTrackCB& add_text_track_cb) |
| 23 : task_runner_(task_runner), | 22 : task_runner_(task_runner), |
| 24 add_text_track_cb_(add_text_track_cb), | 23 add_text_track_cb_(add_text_track_cb), |
| 25 state_(kUninitialized), | 24 state_(kUninitialized), |
| (...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 317 | 316 |
| 318 TextRenderer::TextTrackState::TextTrackState(scoped_ptr<TextTrack> tt) | 317 TextRenderer::TextTrackState::TextTrackState(scoped_ptr<TextTrack> tt) |
| 319 : read_state(kReadIdle), | 318 : read_state(kReadIdle), |
| 320 text_track(tt.Pass()) { | 319 text_track(tt.Pass()) { |
| 321 } | 320 } |
| 322 | 321 |
| 323 TextRenderer::TextTrackState::~TextTrackState() { | 322 TextRenderer::TextTrackState::~TextTrackState() { |
| 324 } | 323 } |
| 325 | 324 |
| 326 } // namespace media | 325 } // namespace media |
| OLD | NEW |