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

Side by Side Diff: media/formats/mp4/mp4_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
« no previous file with comments | « media/formats/mp4/mp4_stream_parser.h ('k') | media/formats/mp4/mp4_stream_parser_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/mp4/mp4_stream_parser.h" 5 #include "media/formats/mp4/mp4_stream_parser.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <limits> 9 #include <limits>
10 #include <memory> 10 #include <memory>
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 MP4StreamParser::~MP4StreamParser() {} 88 MP4StreamParser::~MP4StreamParser() {}
89 89
90 void MP4StreamParser::Init( 90 void MP4StreamParser::Init(
91 const InitCB& init_cb, 91 const InitCB& init_cb,
92 const NewConfigCB& config_cb, 92 const NewConfigCB& config_cb,
93 const NewBuffersCB& new_buffers_cb, 93 const NewBuffersCB& new_buffers_cb,
94 bool /* ignore_text_tracks */, 94 bool /* ignore_text_tracks */,
95 const EncryptedMediaInitDataCB& encrypted_media_init_data_cb, 95 const EncryptedMediaInitDataCB& encrypted_media_init_data_cb,
96 const NewMediaSegmentCB& new_segment_cb, 96 const NewMediaSegmentCB& new_segment_cb,
97 const EndMediaSegmentCB& end_of_segment_cb, 97 const EndMediaSegmentCB& end_of_segment_cb,
98 const scoped_refptr<MediaLog>& media_log) { 98 MediaLog* media_log) {
99 DCHECK_EQ(state_, kWaitingForInit); 99 DCHECK_EQ(state_, kWaitingForInit);
100 DCHECK(init_cb_.is_null()); 100 DCHECK(init_cb_.is_null());
101 DCHECK(!init_cb.is_null()); 101 DCHECK(!init_cb.is_null());
102 DCHECK(!config_cb.is_null()); 102 DCHECK(!config_cb.is_null());
103 DCHECK(!new_buffers_cb.is_null()); 103 DCHECK(!new_buffers_cb.is_null());
104 DCHECK(!encrypted_media_init_data_cb.is_null()); 104 DCHECK(!encrypted_media_init_data_cb.is_null());
105 DCHECK(!new_segment_cb.is_null()); 105 DCHECK(!new_segment_cb.is_null());
106 DCHECK(!end_of_segment_cb.is_null()); 106 DCHECK(!end_of_segment_cb.is_null());
107 107
108 ChangeState(kParsingBoxes); 108 ChangeState(kParsingBoxes);
(...skipping 668 matching lines...) Expand 10 before | Expand all | Expand 10 after
777 runs.AdvanceSample(); 777 runs.AdvanceSample();
778 } 778 }
779 runs.AdvanceRun(); 779 runs.AdvanceRun();
780 } 780 }
781 781
782 return true; 782 return true;
783 } 783 }
784 784
785 } // namespace mp4 785 } // namespace mp4
786 } // namespace media 786 } // namespace media
OLDNEW
« no previous file with comments | « media/formats/mp4/mp4_stream_parser.h ('k') | media/formats/mp4/mp4_stream_parser_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698