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

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

Issue 1091293005: MSE: Relax the 'media segment must begin with keyframe' requirement (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased(noop) + addressed comments from PS12 Created 4 years, 11 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/filters/source_buffer_stream_unittest.cc ('k') | media/formats/mp4/mp4_stream_parser.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/mp2t/mp2t_stream_parser.h" 5 #include "media/formats/mp2t/mp2t_stream_parser.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback_helpers.h" 10 #include "base/callback_helpers.h"
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 const EncryptedMediaInitDataCB& encrypted_media_init_data_cb, 173 const EncryptedMediaInitDataCB& encrypted_media_init_data_cb,
174 const NewMediaSegmentCB& new_segment_cb, 174 const NewMediaSegmentCB& new_segment_cb,
175 const EndMediaSegmentCB& end_of_segment_cb, 175 const EndMediaSegmentCB& end_of_segment_cb,
176 const scoped_refptr<MediaLog>& media_log) { 176 const scoped_refptr<MediaLog>& media_log) {
177 DCHECK(!is_initialized_); 177 DCHECK(!is_initialized_);
178 DCHECK(init_cb_.is_null()); 178 DCHECK(init_cb_.is_null());
179 DCHECK(!init_cb.is_null()); 179 DCHECK(!init_cb.is_null());
180 DCHECK(!config_cb.is_null()); 180 DCHECK(!config_cb.is_null());
181 DCHECK(!new_buffers_cb.is_null()); 181 DCHECK(!new_buffers_cb.is_null());
182 DCHECK(!encrypted_media_init_data_cb.is_null()); 182 DCHECK(!encrypted_media_init_data_cb.is_null());
183 DCHECK(!new_segment_cb.is_null());
183 DCHECK(!end_of_segment_cb.is_null()); 184 DCHECK(!end_of_segment_cb.is_null());
184 185
185 init_cb_ = init_cb; 186 init_cb_ = init_cb;
186 config_cb_ = config_cb; 187 config_cb_ = config_cb;
187 new_buffers_cb_ = new_buffers_cb; 188 new_buffers_cb_ = new_buffers_cb;
188 encrypted_media_init_data_cb_ = encrypted_media_init_data_cb; 189 encrypted_media_init_data_cb_ = encrypted_media_init_data_cb;
189 new_segment_cb_ = new_segment_cb; 190 new_segment_cb_ = new_segment_cb;
190 end_of_segment_cb_ = end_of_segment_cb; 191 end_of_segment_cb_ = end_of_segment_cb;
191 media_log_ = media_log; 192 media_log_ = media_log;
192 } 193 }
(...skipping 451 matching lines...) Expand 10 before | Expand all | Expand 10 after
644 // so that buffers with the same config can be added later on. 645 // so that buffers with the same config can be added later on.
645 BufferQueueWithConfig queue_with_config( 646 BufferQueueWithConfig queue_with_config(
646 true, last_audio_config, last_video_config); 647 true, last_audio_config, last_video_config);
647 buffer_queue_chain_.push_back(queue_with_config); 648 buffer_queue_chain_.push_back(queue_with_config);
648 649
649 return true; 650 return true;
650 } 651 }
651 652
652 } // namespace mp2t 653 } // namespace mp2t
653 } // namespace media 654 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/source_buffer_stream_unittest.cc ('k') | media/formats/mp4/mp4_stream_parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698