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

Unified Diff: trunk/src/media/formats/mpeg/mpeg_audio_stream_parser_base.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/formats/mpeg/mpeg_audio_stream_parser_base.cc
===================================================================
--- trunk/src/media/formats/mpeg/mpeg_audio_stream_parser_base.cc (revision 264802)
+++ trunk/src/media/formats/mpeg/mpeg_audio_stream_parser_base.cc (working copy)
@@ -44,13 +44,11 @@
}
MPEGAudioStreamParserBase::MPEGAudioStreamParserBase(uint32 start_code_mask,
- AudioCodec audio_codec,
- int codec_delay)
+ AudioCodec audio_codec)
: state_(UNINITIALIZED),
in_media_segment_(false),
start_code_mask_(start_code_mask),
- audio_codec_(audio_codec),
- codec_delay_(codec_delay) {}
+ audio_codec_(audio_codec) {}
MPEGAudioStreamParserBase::~MPEGAudioStreamParserBase() {}
@@ -201,16 +199,9 @@
}
if (!config_.IsValidConfig()) {
- config_.Initialize(audio_codec_,
- kSampleFormatF32,
- channel_layout,
- sample_rate,
- NULL,
- 0,
- false,
- false,
- base::TimeDelta(),
- codec_delay_);
+ config_.Initialize(audio_codec_, kSampleFormatF32, channel_layout,
+ sample_rate, NULL, 0, false, false,
+ base::TimeDelta(), base::TimeDelta());
base::TimeDelta base_timestamp;
if (timestamp_helper_)
« no previous file with comments | « trunk/src/media/formats/mpeg/mpeg_audio_stream_parser_base.h ('k') | trunk/src/media/formats/webm/webm_audio_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698