IWMMXT configure support + runtime selection patch by (Gildas Bazin, gbazin : altern...

[ffmpeg] / libavcodec / a52dec.c

diff --git a/libavcodec/a52dec.c b/libavcodec/a52dec.c
index d639b8ae30ee24af3bff5a8c9f6d21d5972a6234..76c63b79052000d3fac6b0b222916e217985f3e2 100644 (file)
--- a/libavcodec/a52dec.c
+++ b/libavcodec/a52dec.c
@@ -1,21 +1,27 @@
 /*
  * A52 decoder
- * Copyright (c) 2001 Gerard Lantau.
+ * Copyright (c) 2001 Fabrice Bellard.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
+/**
+ * @file a52dec.c
+ * A52 decoder.
+ */
+
 #include "avcodec.h"
 #include "liba52/a52.h"
 
@@ -29,8 +35,8 @@ static const char* liba52name = "liba52.so.0";
  * released under the GPL license.
  */
 typedef struct AC3DecodeState {
-    UINT8 inbuf[4096]; /* input buffer */
-    UINT8 *inbuf_ptr;
+    uint8_t inbuf[4096]; /* input buffer */
+    uint8_t *inbuf_ptr;
     int frame_size;
     int flags;
     int channels;
@@ -123,7 +129,7 @@ static inline int blah (int32_t i)
     return i - 0x43c00000;
 }
 
-static inline void float_to_int (float * _f, INT16 * s16, int nchannels)
+static inline void float_to_int (float * _f, int16_t * s16, int nchannels)
 {
     int i, j, c;
     int32_t * f = (int32_t *) _f;      // XXX assumes IEEE float format
@@ -142,10 +148,10 @@ static inline void float_to_int (float * _f, INT16 * s16, int nchannels)
 
 static int a52_decode_frame(AVCodecContext *avctx,
                             void *data, int *data_size,
-                            UINT8 *buf, int buf_size)
+                            uint8_t *buf, int buf_size)
 {
     AC3DecodeState *s = avctx->priv_data;
-    UINT8 *buf_ptr;
+    uint8_t *buf_ptr;
     int flags, i, len;
     int sample_rate, bit_rate;
     short *out_samples = data;
@@ -154,7 +160,6 @@ static int a52_decode_frame(AVCodecContext *avctx,
        2, 1, 2, 3, 3, 4, 4, 5
     };
 
-    *data_size = 0;
     buf_ptr = buf;
     while (buf_size > 0) {
         len = s->inbuf_ptr - s->inbuf;
@@ -184,7 +189,7 @@ static int a52_decode_frame(AVCodecContext *avctx,
                        /* No specific number of channel requested */
                        avctx->channels = s->channels;
                    else if (s->channels < avctx->channels) {
-                       fprintf(stderr, "ac3dec: AC3 Source channels are less than specified: output to %d channels.. (frmsize: %d)\n", s->channels, len);
+                       av_log(avctx, AV_LOG_ERROR, "ac3dec: AC3 Source channels are less than specified: output to %d channels.. (frmsize: %d)\n", s->channels, len);
                        avctx->channels = s->channels;
                    }
                    avctx->bit_rate = bit_rate;
@@ -221,7 +226,7 @@ static int a52_decode_frame(AVCodecContext *avctx,
             }
             s->inbuf_ptr = s->inbuf;
             s->frame_size = 0;
-            *data_size = 6 * avctx->channels * 256 * sizeof(INT16);
+            *data_size = 6 * avctx->channels * 256 * sizeof(int16_t);
             break;
         }
     }