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

Unified Diff: trunk/src/media/ffmpeg/ffmpeg_common.cc

Issue 242203006: Revert 264763 "Wire up codec_delay() to MP3StreamParser and FFmp..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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
Index: trunk/src/media/ffmpeg/ffmpeg_common.cc
===================================================================
--- trunk/src/media/ffmpeg/ffmpeg_common.cc (revision 264802)
+++ trunk/src/media/ffmpeg/ffmpeg_common.cc (working copy)
@@ -298,6 +298,12 @@
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,
@@ -307,7 +313,7 @@
is_encrypted,
record_stats,
seek_preroll,
- codec_context->delay);
+ codec_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 | « trunk/src/media/base/audio_decoder_config.cc ('k') | trunk/src/media/filters/decrypting_audio_decoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698