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

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

Issue 239423005: Wire up codec_delay() to MP3StreamParser and FFmpegAudioDecoder. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ResetTimestampState() on config change. Created 6 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 | Annotate | Revision Log
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 352 matching lines...) Expand 10 before | Expand all | Expand 10 after
363 demuxer_stream_->audio_decoder_config(); 363 demuxer_stream_->audio_decoder_config();
364 audio_config_.Initialize(input_audio_config.codec(), 364 audio_config_.Initialize(input_audio_config.codec(),
365 input_audio_config.sample_format(), 365 input_audio_config.sample_format(),
366 input_audio_config.channel_layout(), 366 input_audio_config.channel_layout(),
367 input_audio_config.samples_per_second(), 367 input_audio_config.samples_per_second(),
368 input_audio_config.extra_data(), 368 input_audio_config.extra_data(),
369 input_audio_config.extra_data_size(), 369 input_audio_config.extra_data_size(),
370 false, // Output audio is not encrypted. 370 false, // Output audio is not encrypted.
371 false, 371 false,
372 base::TimeDelta(), 372 base::TimeDelta(),
373 base::TimeDelta()); 373 0);
374 break; 374 break;
375 } 375 }
376 376
377 case VIDEO: { 377 case VIDEO: {
378 VideoDecoderConfig input_video_config = 378 VideoDecoderConfig input_video_config =
379 demuxer_stream_->video_decoder_config(); 379 demuxer_stream_->video_decoder_config();
380 video_config_.Initialize(input_video_config.codec(), 380 video_config_.Initialize(input_video_config.codec(),
381 input_video_config.profile(), 381 input_video_config.profile(),
382 input_video_config.format(), 382 input_video_config.format(),
383 input_video_config.coded_size(), 383 input_video_config.coded_size(),
384 input_video_config.visible_rect(), 384 input_video_config.visible_rect(),
385 input_video_config.natural_size(), 385 input_video_config.natural_size(),
386 input_video_config.extra_data(), 386 input_video_config.extra_data(),
387 input_video_config.extra_data_size(), 387 input_video_config.extra_data_size(),
388 false, // Output video is not encrypted. 388 false, // Output video is not encrypted.
389 false); 389 false);
390 break; 390 break;
391 } 391 }
392 392
393 default: 393 default:
394 NOTREACHED(); 394 NOTREACHED();
395 return; 395 return;
396 } 396 }
397 } 397 }
398 398
399 } // namespace media 399 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/decrypting_audio_decoder_unittest.cc ('k') | media/filters/ffmpeg_audio_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698