Fix media code to work with new ffmpeg.

media/base/audio_decoder_config.h

 // 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.
 
 #ifndef MEDIA_BASE_AUDIO_DECODER_CONFIG_H_
 #define MEDIA_BASE_AUDIO_DECODER_CONFIG_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/base/channel_layout.h"
@@ skipping 17 matching lines @@
   kCodecAMR_WB,
   kCodecPCM_MULAW,
   // DO NOT ADD RANDOM AUDIO CODECS!
   //
   // The only acceptable time to add a new codec is if there is production code
   // that uses said codec in the same CL.
 
   kAudioCodecMax = kCodecPCM_MULAW  // Must equal the last "real" codec above.
 };
 
+// TODO(dalecurtis): FFmpeg API uses bytes_per_channel instead of
+// bits_per_channel, we should match them.

[scherkus (not reviewing), 2012/02/07 19:21:29]

nit: want to move this down by the function itself?

also annotate w/ ()

I'd also say that this TODO isn't about matching FFmpeg per se, just that bits
are more confusing to work with :)

[DaleCurtis, 2012/02/07 22:53:55]

I put it up here since there are several functions and variables which
references bits_per_channel. The () is just for functions right? These are
variable names.

I did clarify the comment a bit. Once the DEPS roll is ready, I'll ping you
again for one last look at those bits.

 class MEDIA_EXPORT AudioDecoderConfig {
  public:
   // Constructs an uninitialized object. Clients should call Initialize() with
   // appropriate values before using.
   AudioDecoderConfig();
 
   // Constructs an initialized object. It is acceptable to pass in NULL for
   // |extra_data|, otherwise the memory is copied.
   AudioDecoderConfig(AudioCodec codec, int bits_per_channel,
                      ChannelLayout channel_layout, int samples_per_second,
@@ skipping 32 matching lines @@
 
   scoped_array<uint8> extra_data_;
   size_t extra_data_size_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioDecoderConfig);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_AUDIO_DECODER_CONFIG_H_