| 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/mp2t/mp2t_stream_parser.h" |    5 #include "media/mp2t/mp2t_stream_parser.h" | 
|    6  |    6  | 
|    7 #include "base/bind.h" |    7 #include "base/bind.h" | 
|    8 #include "base/memory/scoped_ptr.h" |    8 #include "base/memory/scoped_ptr.h" | 
|    9 #include "base/stl_util.h" |    9 #include "base/stl_util.h" | 
|   10 #include "media/base/audio_decoder_config.h" |   10 #include "media/base/audio_decoder_config.h" | 
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  161 Mp2tStreamParser::~Mp2tStreamParser() { |  161 Mp2tStreamParser::~Mp2tStreamParser() { | 
|  162   STLDeleteValues(&pids_); |  162   STLDeleteValues(&pids_); | 
|  163 } |  163 } | 
|  164  |  164  | 
|  165 void Mp2tStreamParser::Init( |  165 void Mp2tStreamParser::Init( | 
|  166     const InitCB& init_cb, |  166     const InitCB& init_cb, | 
|  167     const NewConfigCB& config_cb, |  167     const NewConfigCB& config_cb, | 
|  168     const NewBuffersCB& new_buffers_cb, |  168     const NewBuffersCB& new_buffers_cb, | 
|  169     const NewTextBuffersCB& text_cb, |  169     const NewTextBuffersCB& text_cb, | 
|  170     const NeedKeyCB& need_key_cb, |  170     const NeedKeyCB& need_key_cb, | 
|  171     const AddTextTrackCB& add_text_track_cb, |  171     const NewTextTrackCB& /* new_text_track_cb */ , | 
|  172     const NewMediaSegmentCB& new_segment_cb, |  172     const NewMediaSegmentCB& new_segment_cb, | 
|  173     const base::Closure& end_of_segment_cb, |  173     const base::Closure& end_of_segment_cb, | 
|  174     const LogCB& log_cb) { |  174     const LogCB& log_cb) { | 
|  175   DCHECK(!is_initialized_); |  175   DCHECK(!is_initialized_); | 
|  176   DCHECK(init_cb_.is_null()); |  176   DCHECK(init_cb_.is_null()); | 
|  177   DCHECK(!init_cb.is_null()); |  177   DCHECK(!init_cb.is_null()); | 
|  178   DCHECK(!config_cb.is_null()); |  178   DCHECK(!config_cb.is_null()); | 
|  179   DCHECK(!new_buffers_cb.is_null()); |  179   DCHECK(!new_buffers_cb.is_null()); | 
|  180   DCHECK(!need_key_cb.is_null()); |  180   DCHECK(!need_key_cb.is_null()); | 
|  181   DCHECK(!end_of_segment_cb.is_null()); |  181   DCHECK(!end_of_segment_cb.is_null()); | 
| (...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  607   BufferQueueWithConfig queue_with_config( |  607   BufferQueueWithConfig queue_with_config( | 
|  608       true, last_audio_config, last_video_config); |  608       true, last_audio_config, last_video_config); | 
|  609   buffer_queue_chain_.push_back(queue_with_config); |  609   buffer_queue_chain_.push_back(queue_with_config); | 
|  610  |  610  | 
|  611   return true; |  611   return true; | 
|  612 } |  612 } | 
|  613  |  613  | 
|  614 }  // namespace mp2t |  614 }  // namespace mp2t | 
|  615 }  // namespace media |  615 }  // namespace media | 
|  616  |  616  | 
| OLD | NEW |