media: Fix Opus support, and handle bad timestamps correctly in the Opus wrapper.

media/ffmpeg/ffmpeg_common.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/ffmpeg/ffmpeg_common.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/video_frame.h"
@@ skipping 254 matching lines @@
     const AVCodecContext* codec_context,
     AudioDecoderConfig* config) {
   DCHECK_EQ(codec_context->codec_type, AVMEDIA_TYPE_AUDIO);
 
   AudioCodec codec = CodecIDToAudioCodec(codec_context->codec_id);
 
   SampleFormat sample_format =
       AVSampleFormatToSampleFormat(codec_context->sample_fmt);
 
   if (codec == kCodecOpus) {
     // TODO(tomfinegan): |sample_fmt| in |codec_context| is -1... because

[fbarchard1, 2013/01/15 23:10:17]

Should be // TODO(finegan): ?
I didnt see this comment before.  Looks ok.

[Tom Finegan, 2013/01/15 23:22:28]

I'm tomfinegan@ for chromium and google-- this is correct. :)

     // libopusdec.c isn't built into ffmpegsumo...? Maybe it's not *that* big
     // a deal since libopus will produce either float or S16 samples, and
     // OpusAudioDecoder is the only provider of Opus support.
     sample_format = kSampleFormatS16;
   }
 
   ChannelLayout channel_layout = ChannelLayoutToChromeChannelLayout(
       codec_context->channel_layout, codec_context->channels);
   config->Initialize(codec,
                      sample_format,
                      channel_layout,
                      codec_context->sample_rate,
                      codec_context->extradata,
                      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 tests on ffmpeg with opus on
webm and it seemed ok?  Or do you mean opus is disabled in chromium's version of
ffmpeg?

[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,
                                         AVCodecContext* codec_context) {
   codec_context->codec_type = AVMEDIA_TYPE_AUDIO;
   codec_context->codec_id = AudioCodecToCodecID(config.codec(),
                                                 config.sample_format());
   codec_context->sample_fmt = SampleFormatToAVSampleFormat(
       config.sample_format());
 
@@ skipping 172 matching lines @@
       return PIX_FMT_YUV422P;
     case VideoFrame::YV12:
       return PIX_FMT_YUV420P;
     default:
       DVLOG(1) << "Unsupported VideoFrame::Format: " << video_format;
   }
   return PIX_FMT_NONE;
 }
 
 }  // namespace media