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

Side by Side Diff: media/formats/webm/webm_stream_parser.cc

Issue 1826583003: MSE: Record counts of detected MSE audio, video and text tracks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Yet another attempt to fix that link failure. MEDIA_EXPORT should do it! Created 4 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/webm/webm_stream_parser.h" 5 #include "media/formats/webm/webm_stream_parser.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/callback_helpers.h" 10 #include "base/callback_helpers.h"
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 cluster_parser_.reset(new WebMClusterParser( 235 cluster_parser_.reset(new WebMClusterParser(
236 info_parser.timecode_scale(), tracks_parser.audio_track_num(), 236 info_parser.timecode_scale(), tracks_parser.audio_track_num(),
237 tracks_parser.GetAudioDefaultDuration(timecode_scale_in_us), 237 tracks_parser.GetAudioDefaultDuration(timecode_scale_in_us),
238 tracks_parser.video_track_num(), 238 tracks_parser.video_track_num(),
239 tracks_parser.GetVideoDefaultDuration(timecode_scale_in_us), 239 tracks_parser.GetVideoDefaultDuration(timecode_scale_in_us),
240 tracks_parser.text_tracks(), tracks_parser.ignored_tracks(), 240 tracks_parser.text_tracks(), tracks_parser.ignored_tracks(),
241 tracks_parser.audio_encryption_key_id(), 241 tracks_parser.audio_encryption_key_id(),
242 tracks_parser.video_encryption_key_id(), audio_config.codec(), 242 tracks_parser.video_encryption_key_id(), audio_config.codec(),
243 media_log_)); 243 media_log_));
244 244
245 if (!init_cb_.is_null()) 245 if (!init_cb_.is_null()) {
246 params.detected_audio_track_count =
247 tracks_parser.detected_audio_track_count();
248 params.detected_video_track_count =
249 tracks_parser.detected_video_track_count();
250 params.detected_text_track_count =
251 tracks_parser.detected_text_track_count();
246 base::ResetAndReturn(&init_cb_).Run(params); 252 base::ResetAndReturn(&init_cb_).Run(params);
253 }
247 254
248 return bytes_parsed; 255 return bytes_parsed;
249 } 256 }
250 257
251 int WebMStreamParser::ParseCluster(const uint8_t* data, int size) { 258 int WebMStreamParser::ParseCluster(const uint8_t* data, int size) {
252 if (!cluster_parser_) 259 if (!cluster_parser_)
253 return -1; 260 return -1;
254 261
255 int bytes_parsed = cluster_parser_->Parse(data, size); 262 int bytes_parsed = cluster_parser_->Parse(data, size);
256 if (bytes_parsed < 0) 263 if (bytes_parsed < 0)
(...skipping 18 matching lines...) Expand all
275 282
276 return bytes_parsed; 283 return bytes_parsed;
277 } 284 }
278 285
279 void WebMStreamParser::OnEncryptedMediaInitData(const std::string& key_id) { 286 void WebMStreamParser::OnEncryptedMediaInitData(const std::string& key_id) {
280 std::vector<uint8_t> key_id_vector(key_id.begin(), key_id.end()); 287 std::vector<uint8_t> key_id_vector(key_id.begin(), key_id.end());
281 encrypted_media_init_data_cb_.Run(EmeInitDataType::WEBM, key_id_vector); 288 encrypted_media_init_data_cb_.Run(EmeInitDataType::WEBM, key_id_vector);
282 } 289 }
283 290
284 } // namespace media 291 } // namespace media
OLDNEW
« no previous file with comments | « media/formats/mpeg/mpeg_audio_stream_parser_base.cc ('k') | media/formats/webm/webm_stream_parser_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698