Clean up FFmpeg media formats and switch to using av_get_bits_per_sample_format().

media/base/media_posix.cc

 // Copyright (c) 2009 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/base/media.h"
 
 #include <string>
 
 #include <dlfcn.h>
 
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "media/filters/ffmpeg_common.h"
 
 // We create stub references to dynamically loaded functions in ffmpeg
 // for ease of linking.
 //
 // TODO(ajwong): We need to find a more maintainable way to have this work.
 // Also, this code should really be in the ffmpeg wrapper, and not here
 // in the media level.  The concept of "weak symbols" looks like it might
 // be promising, but I don't quite understand it yet.
 extern "C" {
 
+int (*av_get_bits_per_sample_format_ptr)(enum SampleFormat sample_fmt);
+int av_get_bits_per_sample_format(enum SampleFormat sample_fmt) {
+  return av_get_bits_per_sample_format(sample_fmt);
+}
+
 void (*avcodec_init_ptr)(void) = NULL;
 void avcodec_init(void) {
   avcodec_init_ptr();
 }
 
 AVCodec* (*avcodec_find_decoder_ptr)(enum CodecID id) = NULL;
 AVCodec* avcodec_find_decoder(enum CodecID id) {
   return avcodec_find_decoder_ptr(id);
 }
 
@@ skipping 12 matching lines @@
   return avcodec_alloc_frame_ptr();
 }
 
 int (*avcodec_decode_audio2_ptr)(AVCodecContext* avctx, int16_t* samples,
                                  int* frame_size_ptr, const uint8_t* buf,
                                  int buf_size) = NULL;
 int avcodec_decode_audio2(AVCodecContext* avctx, int16_t* samples,
                           int* frame_size_ptr,
                           const uint8_t* buf, int buf_size) {
 
-  return avcodec_decode_audio2_ptr(avctx, samples, frame_size_ptr, buf, 
+  return avcodec_decode_audio2_ptr(avctx, samples, frame_size_ptr, buf,
                                    buf_size);
 }
 
 
 int (*avcodec_decode_video_ptr)(AVCodecContext* avctx, AVFrame* picture,
                                 int* got_picture_ptr, const uint8_t* buf,
                                 int buf_size) = NULL;
 int avcodec_decode_video(AVCodecContext* avctx, AVFrame* picture,
                          int* got_picture_ptr, const uint8_t* buf,
                          int buf_size) {
@@ skipping 89 matching lines @@
     for (size_t i = 0; i < arraysize(libs) && libs[i] != NULL; ++i) {
       dlclose(libs[i]);
       libs[i] = NULL;  // Just to be safe.
     }
     return false;
   }
 
   // TODO(ajwong): Extract this to somewhere saner, and hopefully
   // autogenerate the bindings from the .def files.  Having all this
   // code here is incredibly ugly.
+  av_get_bits_per_sample_format_ptr =
+      reinterpret_cast<int (*)(enum SampleFormat)>(
+          dlsym(libs[FILE_LIBAVCODEC], "av_get_bits_per_sample_format"));

[awong, 2009/04/28 23:25:56]

:-/ I really need to fix this.  next week. next week. *sigh*

   avcodec_init_ptr =
       reinterpret_cast<void(*)(void)>(
           dlsym(libs[FILE_LIBAVCODEC], "avcodec_init"));
   avcodec_find_decoder_ptr =
       reinterpret_cast<AVCodec* (*)(enum CodecID)>(
           dlsym(libs[FILE_LIBAVCODEC], "avcodec_find_decoder"));
   avcodec_thread_init_ptr =
       reinterpret_cast<int (*)(AVCodecContext*, int)>(
           dlsym(libs[FILE_LIBAVCODEC], "avcodec_thread_init"));
   avcodec_open_ptr =
@@ skipping 45 matching lines @@
       av_read_frame_ptr &&
 
       av_malloc_ptr) {
     return true;
   }
 
   return false;
 }
 
 }  // namespace media