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

Side by Side Diff: media/filters/decrypting_demuxer_stream.cc

Issue 23014009: media: Opus support for WebM in Media Source (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixing errors causing try bot failure Created 7 years, 3 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/decrypting_audio_decoder_unittest.cc ('k') | media/filters/opus_audio_decoder.h » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/filters/decrypting_demuxer_stream.h" 5 #include "media/filters/decrypting_demuxer_stream.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback_helpers.h" 8 #include "base/callback_helpers.h"
9 #include "base/location.h" 9 #include "base/location.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 case AUDIO: { 295 case AUDIO: {
296 AudioDecoderConfig input_audio_config = 296 AudioDecoderConfig input_audio_config =
297 demuxer_stream_->audio_decoder_config(); 297 demuxer_stream_->audio_decoder_config();
298 audio_config_.Initialize(input_audio_config.codec(), 298 audio_config_.Initialize(input_audio_config.codec(),
299 input_audio_config.sample_format(), 299 input_audio_config.sample_format(),
300 input_audio_config.channel_layout(), 300 input_audio_config.channel_layout(),
301 input_audio_config.samples_per_second(), 301 input_audio_config.samples_per_second(),
302 input_audio_config.extra_data(), 302 input_audio_config.extra_data(),
303 input_audio_config.extra_data_size(), 303 input_audio_config.extra_data_size(),
304 false, // Output audio is not encrypted. 304 false, // Output audio is not encrypted.
305 false); 305 false,
306 base::TimeDelta(),
307 base::TimeDelta());
306 break; 308 break;
307 } 309 }
308 310
309 case VIDEO: { 311 case VIDEO: {
310 VideoDecoderConfig input_video_config = 312 VideoDecoderConfig input_video_config =
311 demuxer_stream_->video_decoder_config(); 313 demuxer_stream_->video_decoder_config();
312 video_config_.Initialize(input_video_config.codec(), 314 video_config_.Initialize(input_video_config.codec(),
313 input_video_config.profile(), 315 input_video_config.profile(),
314 input_video_config.format(), 316 input_video_config.format(),
315 input_video_config.coded_size(), 317 input_video_config.coded_size(),
316 input_video_config.visible_rect(), 318 input_video_config.visible_rect(),
317 input_video_config.natural_size(), 319 input_video_config.natural_size(),
318 input_video_config.extra_data(), 320 input_video_config.extra_data(),
319 input_video_config.extra_data_size(), 321 input_video_config.extra_data_size(),
320 false, // Output video is not encrypted. 322 false, // Output video is not encrypted.
321 false); 323 false);
322 break; 324 break;
323 } 325 }
324 326
325 default: 327 default:
326 NOTREACHED(); 328 NOTREACHED();
327 return; 329 return;
328 } 330 }
329 } 331 }
330 332
331 } // namespace media 333 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/decrypting_audio_decoder_unittest.cc ('k') | media/filters/opus_audio_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698