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

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

Issue 437203002: copy codec_delay in decrypting_demuxer to fix bug 400095 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: copy seek_preroll too Created 6 years, 4 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 | « no previous file | no next file » | 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 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 AudioDecoderConfig input_audio_config = 353 AudioDecoderConfig input_audio_config =
354 demuxer_stream_->audio_decoder_config(); 354 demuxer_stream_->audio_decoder_config();
355 audio_config_.Initialize(input_audio_config.codec(), 355 audio_config_.Initialize(input_audio_config.codec(),
356 input_audio_config.sample_format(), 356 input_audio_config.sample_format(),
357 input_audio_config.channel_layout(), 357 input_audio_config.channel_layout(),
358 input_audio_config.samples_per_second(), 358 input_audio_config.samples_per_second(),
359 input_audio_config.extra_data(), 359 input_audio_config.extra_data(),
360 input_audio_config.extra_data_size(), 360 input_audio_config.extra_data_size(),
361 false, // Output audio is not encrypted. 361 false, // Output audio is not encrypted.
362 false, 362 false,
363 base::TimeDelta(), 363 input_audio_config.seek_preroll(),
364 0); 364 input_audio_config.codec_delay());
365 break; 365 break;
366 } 366 }
367 367
368 case VIDEO: { 368 case VIDEO: {
369 VideoDecoderConfig input_video_config = 369 VideoDecoderConfig input_video_config =
370 demuxer_stream_->video_decoder_config(); 370 demuxer_stream_->video_decoder_config();
371 video_config_.Initialize(input_video_config.codec(), 371 video_config_.Initialize(input_video_config.codec(),
372 input_video_config.profile(), 372 input_video_config.profile(),
373 input_video_config.format(), 373 input_video_config.format(),
374 input_video_config.coded_size(), 374 input_video_config.coded_size(),
375 input_video_config.visible_rect(), 375 input_video_config.visible_rect(),
376 input_video_config.natural_size(), 376 input_video_config.natural_size(),
377 input_video_config.extra_data(), 377 input_video_config.extra_data(),
378 input_video_config.extra_data_size(), 378 input_video_config.extra_data_size(),
379 false, // Output video is not encrypted. 379 false, // Output video is not encrypted.
380 false); 380 false);
381 break; 381 break;
382 } 382 }
383 383
384 default: 384 default:
385 NOTREACHED(); 385 NOTREACHED();
386 return; 386 return;
387 } 387 }
388 } 388 }
389 389
390 } // namespace media 390 } // namespace media
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698