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

Side by Side Diff: media/formats/mp2t/mp2t_stream_parser.cc

Issue 2815303006: Convert MediaLog from being ref counted to owned by WebMediaPlayer. (Closed)
Patch Set: Rebase. Created 3 years, 8 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/formats/mp2t/mp2t_stream_parser.h" 5 #include "media/formats/mp2t/mp2t_stream_parser.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 } 202 }
203 203
204 void Mp2tStreamParser::Init( 204 void Mp2tStreamParser::Init(
205 const InitCB& init_cb, 205 const InitCB& init_cb,
206 const NewConfigCB& config_cb, 206 const NewConfigCB& config_cb,
207 const NewBuffersCB& new_buffers_cb, 207 const NewBuffersCB& new_buffers_cb,
208 bool /* ignore_text_tracks */, 208 bool /* ignore_text_tracks */,
209 const EncryptedMediaInitDataCB& encrypted_media_init_data_cb, 209 const EncryptedMediaInitDataCB& encrypted_media_init_data_cb,
210 const NewMediaSegmentCB& new_segment_cb, 210 const NewMediaSegmentCB& new_segment_cb,
211 const EndMediaSegmentCB& end_of_segment_cb, 211 const EndMediaSegmentCB& end_of_segment_cb,
212 const scoped_refptr<MediaLog>& media_log) { 212 MediaLog* media_log) {
213 DCHECK(!is_initialized_); 213 DCHECK(!is_initialized_);
214 DCHECK(init_cb_.is_null()); 214 DCHECK(init_cb_.is_null());
215 DCHECK(!init_cb.is_null()); 215 DCHECK(!init_cb.is_null());
216 DCHECK(!config_cb.is_null()); 216 DCHECK(!config_cb.is_null());
217 DCHECK(!new_buffers_cb.is_null()); 217 DCHECK(!new_buffers_cb.is_null());
218 DCHECK(!encrypted_media_init_data_cb.is_null()); 218 DCHECK(!encrypted_media_init_data_cb.is_null());
219 DCHECK(!new_segment_cb.is_null()); 219 DCHECK(!new_segment_cb.is_null());
220 DCHECK(!end_of_segment_cb.is_null()); 220 DCHECK(!end_of_segment_cb.is_null());
221 221
222 init_cb_ = init_cb; 222 init_cb_ = init_cb;
(...skipping 587 matching lines...) Expand 10 before | Expand all | Expand 10 after
810 810
811 void Mp2tStreamParser::RegisterPsshBoxes( 811 void Mp2tStreamParser::RegisterPsshBoxes(
812 const std::vector<uint8_t>& init_data) { 812 const std::vector<uint8_t>& init_data) {
813 encrypted_media_init_data_cb_.Run(EmeInitDataType::CENC, init_data); 813 encrypted_media_init_data_cb_.Run(EmeInitDataType::CENC, init_data);
814 } 814 }
815 815
816 #endif 816 #endif
817 817
818 } // namespace mp2t 818 } // namespace mp2t
819 } // namespace media 819 } // namespace media
OLDNEW
« no previous file with comments | « media/formats/mp2t/mp2t_stream_parser.h ('k') | media/formats/mp2t/mp2t_stream_parser_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698