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

Unified Diff: media/ffmpeg/ffmpeg_common.cc

Issue 11888011: media: Fix Opus support, and handle bad timestamps correctly in the Opus wrapper. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 | « no previous file | media/filters/opus_audio_decoder.cc » ('j') | media/filters/opus_audio_decoder.cc » ('J')
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 8a504d71393c92723ddad38eb682ac562b0e0277..2ae0b1b804631d5906cedc2d52f1bdd747682f33 100644
--- a/media/ffmpeg/ffmpeg_common.cc
+++ b/media/ffmpeg/ffmpeg_common.cc
@@ -289,8 +289,10 @@ void AVCodecContextToAudioDecoderConfig(
codec_context->extradata_size,
false, // Not encrypted.
true);
- DCHECK_EQ(av_get_bytes_per_sample(codec_context->sample_fmt) * 8,
- config->bits_per_channel());
+ if (codec != kCodecOpus) {
fbarchard1 2013/01/14 20:42:30 add a comment or todo to remove this.
fbarchard1 2013/01/15 02:26:50 Isn't Opus already in current ffmpeg? I ran some
Tom Finegan 2013/01/15 02:44:51 Disabled in chromium's version.
+ DCHECK_EQ(av_get_bytes_per_sample(codec_context->sample_fmt) * 8,
+ config->bits_per_channel());
+ }
}
void AudioDecoderConfigToAVCodecContext(const AudioDecoderConfig& config,
« no previous file with comments | « no previous file | media/filters/opus_audio_decoder.cc » ('j') | media/filters/opus_audio_decoder.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698