aacdec: reset max_sfb on invalid data.

[ffmpeg] / libavcodec / pcm.c

diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c
index d8b926d33e9a7563b93d8920f2e198bf58bb0e5c..72a4e2aebb2656645cd886a6e34eab8a06295fa3 100644 (file)
--- a/libavcodec/pcm.c
+++ b/libavcodec/pcm.c
@@ -96,8 +96,7 @@ static int pcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
     n           = frame->nb_samples * avctx->channels;
     samples     = (const short *)frame->data[0];
 
-    if ((ret = ff_alloc_packet(avpkt, n * sample_size))) {
-        av_log(avctx, AV_LOG_ERROR, "Error getting output packet\n");
+    if ((ret = ff_alloc_packet2(avctx, avpkt, n * sample_size))) {
         return ret;
     }
     dst = avpkt->data;
@@ -194,7 +193,6 @@ static int pcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
         return -1;
     }
 
-    avpkt->size = frame->nb_samples * avctx->channels * sample_size;
     *got_packet_ptr = 1;
     return 0;
 }
@@ -341,15 +339,15 @@ static int pcm_decode_frame(AVCodecContext *avctx, void *data,
         break;
     case CODEC_ID_PCM_S16LE_PLANAR:
     {
-        const uint8_t *src2[MAX_CHANNELS];
+        int i;
         n /= avctx->channels;
-        for(c=0;c<avctx->channels;c++)
-            src2[c] = &src[c*n*2];
-        for(;n>0;n--)
-            for(c=0;c<avctx->channels;c++) {
-                AV_WN16A(samples, bytestream_get_le16(&src2[c]));
+        for(c=0;c<avctx->channels;c++) {
+            samples = s->frame.data[c];
+            for(i=n;i>0;i--) {
+                AV_WN16A(samples, bytestream_get_le16(&src));
                 samples += 2;
             }
+        }
         break;
     }
     case CODEC_ID_PCM_U16LE:
@@ -446,21 +444,18 @@ static int pcm_decode_frame(AVCodecContext *avctx, void *data,
     case CODEC_ID_PCM_LXF:
     {
         int i;
-        const uint8_t *src8;
-        dst_int32_t = (int32_t *)s->frame.data[0];
         n /= avctx->channels;
-        //unpack and de-planerize
-        for (i = 0; i < n; i++) {
-            for (c = 0, src8 = src + i*5; c < avctx->channels; c++, src8 += n*5) {
+        //unpack
+        for (c = 0; c < avctx->channels; c++) {
+            dst_int32_t = (int32_t *)s->frame.data[c];
+            for (i = 0; i < n; i++) {
                 //extract low 20 bits and expand to 32 bits
-                *dst_int32_t++ = (src8[2] << 28) | (src8[1] << 20) | (src8[0] << 12) |
-                                 ((src8[2] & 0xF) << 8) | src8[1];
-            }
-
-            for (c = 0, src8 = src + i*5; c < avctx->channels; c++, src8 += n*5) {
+                *dst_int32_t++ = (src[2] << 28) | (src[1] << 20) | (src[0] << 12) |
+                                 ((src[2] & 0xF) << 8) | src[1];
                 //extract high 20 bits and expand to 32 bits
-                *dst_int32_t++ = (src8[4] << 24) | (src8[3] << 16) |
-                                 ((src8[2] & 0xF0) << 8) | (src8[4] << 4) | (src8[3] >> 4);
+                *dst_int32_t++ = (src[4] << 24) | (src[3] << 16) |
+                                 ((src[2] & 0xF0) << 8) | (src[4] << 4) | (src[3] >> 4);
+                src += 5;
             }
         }
         break;
@@ -513,18 +508,18 @@ AVCodec ff_ ## name_ ## _decoder = {            \
     PCM_ENCODER(id,sample_fmt_,name,long_name_); PCM_DECODER(id,sample_fmt_,name,long_name_)
 
 /* Note: Do not forget to add new entries to the Makefile as well. */
-PCM_CODEC  (CODEC_ID_PCM_ALAW,  AV_SAMPLE_FMT_S16, pcm_alaw, "PCM A-law");
+PCM_CODEC  (CODEC_ID_PCM_ALAW,  AV_SAMPLE_FMT_S16, pcm_alaw, "PCM A-law / G.711 A-law");
 PCM_DECODER(CODEC_ID_PCM_DVD,   AV_SAMPLE_FMT_S32, pcm_dvd, "PCM signed 20|24-bit big-endian");
 PCM_CODEC  (CODEC_ID_PCM_F32BE, AV_SAMPLE_FMT_FLT, pcm_f32be, "PCM 32-bit floating point big-endian");
 PCM_CODEC  (CODEC_ID_PCM_F32LE, AV_SAMPLE_FMT_FLT, pcm_f32le, "PCM 32-bit floating point little-endian");
 PCM_CODEC  (CODEC_ID_PCM_F64BE, AV_SAMPLE_FMT_DBL, pcm_f64be, "PCM 64-bit floating point big-endian");
 PCM_CODEC  (CODEC_ID_PCM_F64LE, AV_SAMPLE_FMT_DBL, pcm_f64le, "PCM 64-bit floating point little-endian");
-PCM_DECODER(CODEC_ID_PCM_LXF,   AV_SAMPLE_FMT_S32, pcm_lxf, "PCM signed 20-bit little-endian planar");
-PCM_CODEC  (CODEC_ID_PCM_MULAW, AV_SAMPLE_FMT_S16, pcm_mulaw, "PCM mu-law");
+PCM_DECODER(CODEC_ID_PCM_LXF,   AV_SAMPLE_FMT_S32P, pcm_lxf, "PCM signed 20-bit little-endian planar");
+PCM_CODEC  (CODEC_ID_PCM_MULAW, AV_SAMPLE_FMT_S16, pcm_mulaw, "PCM mu-law / G.711 mu-law");
 PCM_CODEC  (CODEC_ID_PCM_S8,    AV_SAMPLE_FMT_U8,  pcm_s8, "PCM signed 8-bit");
 PCM_CODEC  (CODEC_ID_PCM_S16BE, AV_SAMPLE_FMT_S16, pcm_s16be, "PCM signed 16-bit big-endian");
 PCM_CODEC  (CODEC_ID_PCM_S16LE, AV_SAMPLE_FMT_S16, pcm_s16le, "PCM signed 16-bit little-endian");
-PCM_DECODER(CODEC_ID_PCM_S16LE_PLANAR, AV_SAMPLE_FMT_S16, pcm_s16le_planar, "PCM 16-bit little-endian planar");
+PCM_DECODER(CODEC_ID_PCM_S16LE_PLANAR, AV_SAMPLE_FMT_S16P, pcm_s16le_planar, "PCM 16-bit little-endian planar");
 PCM_CODEC  (CODEC_ID_PCM_S24BE, AV_SAMPLE_FMT_S32, pcm_s24be, "PCM signed 24-bit big-endian");
 PCM_CODEC  (CODEC_ID_PCM_S24DAUD, AV_SAMPLE_FMT_S16,  pcm_s24daud, "PCM D-Cinema audio signed 24-bit");
 PCM_CODEC  (CODEC_ID_PCM_S24LE, AV_SAMPLE_FMT_S32, pcm_s24le, "PCM signed 24-bit little-endian");