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

Unified Diff: trunk/src/media/formats/webm/webm_audio_client.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
« no previous file with comments | « trunk/src/media/formats/mpeg/mpeg_audio_stream_parser_base.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/media/formats/webm/webm_audio_client.cc
===================================================================
--- trunk/src/media/formats/webm/webm_audio_client.cc (revision 264802)
+++ trunk/src/media/formats/webm/webm_audio_client.cc (working copy)
@@ -65,27 +65,15 @@
extra_data_size = codec_private.size();
}
- // Convert |codec_delay| from nanoseconds into frames.
- int codec_delay_in_frames = 0;
- if (codec_delay != -1) {
- codec_delay_in_frames =
- 0.5 +
- samples_per_second * (static_cast<double>(codec_delay) /
- base::Time::kNanosecondsPerSecond);
- }
-
config->Initialize(
audio_codec,
(audio_codec == kCodecOpus) ? kSampleFormatS16 : kSampleFormatPlanarF32,
channel_layout,
- samples_per_second,
- extra_data,
- extra_data_size,
- is_encrypted,
- true,
+ samples_per_second, extra_data, extra_data_size, is_encrypted, true,
base::TimeDelta::FromMicroseconds(
(seek_preroll != -1 ? seek_preroll : 0) / 1000),
- codec_delay_in_frames);
+ base::TimeDelta::FromMicroseconds(
+ (codec_delay != -1 ? codec_delay : 0) / 1000));
return config->IsValidConfig();
}
« no previous file with comments | « trunk/src/media/formats/mpeg/mpeg_audio_stream_parser_base.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698