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

Unified Diff: media/ffmpeg/ffmpeg_common.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/audio_decoder_config.cc ('k') | media/filters/decrypting_audio_decoder_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/ffmpeg/ffmpeg_common.cc
diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc
index abc2a1a87d247a2f0968edac11ed6d63dca093d4..a65d19f7e9f6e48d6719fdb64dc65f316cc01525 100644
--- a/media/ffmpeg/ffmpeg_common.cc
+++ b/media/ffmpeg/ffmpeg_common.cc
@@ -298,12 +298,6 @@ static void AVCodecContextToAudioDecoderConfig(
codec_context->seek_preroll * 1000000.0 / codec_context->sample_rate);
}
- base::TimeDelta codec_delay;
- if (codec_context->delay > 0) {
- codec_delay = base::TimeDelta::FromMicroseconds(
- codec_context->delay * 1000000.0 / codec_context->sample_rate);
- }
-
config->Initialize(codec,
sample_format,
channel_layout,
@@ -313,7 +307,7 @@ static void AVCodecContextToAudioDecoderConfig(
is_encrypted,
record_stats,
seek_preroll,
- codec_delay);
+ codec_context->delay);
if (codec != kCodecOpus) {
DCHECK_EQ(av_get_bytes_per_sample(codec_context->sample_fmt) * 8,
config->bits_per_channel());
« no previous file with comments | « media/base/audio_decoder_config.cc ('k') | media/filters/decrypting_audio_decoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698