src/patches/ffmpeg-0.4.9-pre1-amr_fixes-1.patch

   1 Submitted By:            Randy McMurchy <randy_at_linuxfromscratch_dot_org>
   2 Date:                    2006-01-12
   3 Initial Package Version: 0.4.9-pre1
   4 Upstream Status:         Applied in upstream CVS
   5 Origin:                  MPlayer-1.0pre7try2 version of FFmpeg (upstream CVS)
   6 Description:             Fixes building with AMR code
   7
   8
   9 diff -Naur ffmpeg-0.4.9-pre1-orig/libavcodec/Makefile ffmpeg-0.4.9-pre1/libavcodec/Makefile
  10 --- ffmpeg-0.4.9-pre1-orig/libavcodec/Makefile  2004-06-18 13:11:15.000000000 +0000
  11 +++ ffmpeg-0.4.9-pre1/libavcodec/Makefile       2006-01-12 18:27:33.000000000 +0000
  12 @@ -7,7 +7,7 @@
  13  VPATH=$(SRC_PATH)/libavcodec
  14
  15  # NOTE: -I.. is needed to include config.h
  16 -CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
  17 +CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE $(AMR_CFLAGS)
  18
  19  OBJS= common.o utils.o mem.o allcodecs.o \
  20        mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o\
  21 @@ -22,14 +22,16 @@
  22        smc.o parser.o flicvideo.o truemotion1.o vmdav.o lcl.o qtrle.o g726.o \
  23        flac.o vp3dsp.o integer.o
  24
  25 +AMROBJS=
  26  ifeq ($(AMR_NB),yes)
  27  ifeq ($(AMR_NB_FIXED),yes)
  28 -OBJS+= amr.o
  29 +AMROBJS= amr.o
  30  AMREXTRALIBS+= amr/*.o
  31  AMRLIBS=amrlibs
  32  CLEANAMR=cleanamr
  33  else
  34 -OBJS+= amr.o amr_float/sp_dec.o amr_float/sp_enc.o amr_float/interf_dec.o amr_float/interf_enc.o
  35 +AMROBJS= amr.o
  36 +OBJS+= amr_float/sp_dec.o amr_float/sp_enc.o amr_float/interf_dec.o amr_float/interf_enc.o
  37  CLEANAMR=cleanamrfloat
  38  endif
  39  endif
  40 @@ -43,13 +45,15 @@
  41  endif
  42
  43  ifeq ($(AMR_WB),yes)
  44 -OBJS+= amr.o amrwb_float/dec_acelp.o amrwb_float/dec_dtx.o amrwb_float/dec_gain.o \
  45 +AMROBJS= amr.o
  46 +OBJS+= amrwb_float/dec_acelp.o amrwb_float/dec_dtx.o amrwb_float/dec_gain.o \
  47                 amrwb_float/dec_if.o amrwb_float/dec_lpc.o amrwb_float/dec_main.o \
  48                 amrwb_float/dec_rom.o amrwb_float/dec_util.o amrwb_float/enc_acelp.o \
  49                 amrwb_float/enc_dtx.o amrwb_float/enc_gain.o amrwb_float/enc_if.o \
  50                 amrwb_float/enc_lpc.o amrwb_float/enc_main.o amrwb_float/enc_rom.o \
  51                 amrwb_float/enc_util.o amrwb_float/if_rom.o
  52  endif
  53 +OBJS+= $(AMROBJS)
  54  CLEANAMRWB=cleanamrwbfloat
  55  ASM_OBJS=
  56
  57 diff -Naur ffmpeg-0.4.9-pre1-orig/libavcodec/amr.c ffmpeg-0.4.9-pre1/libavcodec/amr.c
  58 --- ffmpeg-0.4.9-pre1-orig/libavcodec/amr.c     2004-05-21 14:37:16.000000000 +0000
  59 +++ ffmpeg-0.4.9-pre1/libavcodec/amr.c  2006-01-12 18:27:33.000000000 +0000
  60 @@ -411,27 +411,32 @@
  61      AMRContext *s = (AMRContext*)avctx->priv_data;
  62
  63      uint8_t*amrData=buf;
  64 -    int offset=0;
  65      static short block_size[16]={ 12, 13, 15, 17, 19, 20, 26, 31, 5, 0, 0, 0, 0, 0, 0, 0 };
  66      enum Mode dec_mode;
  67      int packet_size;
  68
  69 -    //printf("amr_decode_frame data_size=%i buf=0x%X buf_size=%d frameCount=%d!!\n",*data_size,buf,buf_size,s->frameCount);
  70 +    /* av_log(NULL,AV_LOG_DEBUG,"amr_decode_frame buf=%p buf_size=%d frameCount=%d!!\n",buf,buf_size,s->frameCount); */
  71 +
  72 +    if(buf_size==0) {
  73 +        /* nothing to do */
  74 +        return 0;
  75 +    }
  76
  77 -    while(offset<buf_size)
  78 -    {
  79 -       dec_mode = (amrData[offset] >> 3) & 0x000F;
  80 -       packet_size = block_size[dec_mode];
  81 +    dec_mode = (buf[0] >> 3) & 0x000F;
  82 +    packet_size = block_size[dec_mode]+1;
  83 +
  84 +    if(packet_size > buf_size) {
  85 +        av_log(avctx, AV_LOG_ERROR, "amr frame too short (%u, should be %u)\n", buf_size, packet_size);
  86 +        return -1;
  87 +    }
  88
  89 -        s->frameCount++;
  90 -        //printf("offset=%d, packet_size=%d amrData= 0x%X %X %X %X\n",offset,packet_size,amrData[offset],amrData[offset+1],amrData[offset+2],amrData[offset+3]);
  91 -       /* call decoder */
  92 -       Decoder_Interface_Decode(s->decState, &amrData[offset], data+*data_size, 0);
  93 -       *data_size+=160*2;
  94 +    s->frameCount++;
  95 +    /* av_log(NULL,AV_LOG_DEBUG,"packet_size=%d amrData= 0x%X %X %X %X\n",packet_size,amrData[0],amrData[1],amrData[2],amrData[3]); */
  96 +    /* call decoder */
  97 +    Decoder_Interface_Decode(s->decState, amrData, data, 0);
  98 +    *data_size=160*2;
  99
 100 -        offset+=packet_size+1;
 101 -    }
 102 -    return buf_size;
 103 +    return packet_size;
 104  }
 105
 106  static int amr_nb_encode_frame(AVCodecContext *avctx,
 107 @@ -445,6 +450,7 @@
 108          data,
 109          frame,
 110          0);
 111 +    /* av_log(NULL,AV_LOG_DEBUG,"amr_nb_encode_frame encoded %u bytes, bitrate %u, first byte was %#02x\n",written, s->enc_bitrate, frame[0] ); */
 112
 113      return written;
 114  }
 115 @@ -598,20 +604,26 @@
 116      AMRWBContext *s = (AMRWBContext*)avctx->priv_data;
 117
 118      uint8_t*amrData=buf;
 119 -    int offset=0;
 120      int mode;
 121      int packet_size;
 122
 123 -    while(offset<buf_size)
 124 -    {
 125 -        s->frameCount++;
 126 -        mode = (Word16)((amrData[offset] >> 3) & 0x0F);
 127 -        packet_size = block_size[mode];
 128 -        D_IF_decode( s->state, &amrData[offset], data+*data_size, _good_frame);
 129 -       *data_size+=320*2;
 130 -        offset+=packet_size;
 131 +    if(buf_size==0) {
 132 +        /* nothing to do */
 133 +        return 0;
 134      }
 135 -    return buf_size;
 136 +
 137 +    mode = (amrData[0] >> 3) & 0x000F;
 138 +    packet_size = block_size[mode];
 139 +
 140 +    if(packet_size > buf_size) {
 141 +        av_log(avctx, AV_LOG_ERROR, "amr frame too short (%u, should be %u)\n", buf_size, packet_size+1);
 142 +        return -1;
 143 +    }
 144 +
 145 +    s->frameCount++;
 146 +    D_IF_decode( s->state, amrData, data, _good_frame);
 147 +    *data_size=320*2;
 148 +    return packet_size;
 149  }
 150
 151  static int amr_wb_decode_close(AVCodecContext * avctx)
 152
 153 diff -Naur ffmpeg-0.4.9-pre1-orig/libavcodec/avcodec.h ffmpeg-0.4.9-pre1/libavcodec/avcodec.h
 154 --- ffmpeg-0.4.9-pre1-orig/libavcodec/avcodec.h 2004-07-09 12:49:55.000000000 +0000
 155 +++ ffmpeg-0.4.9-pre1/libavcodec/avcodec.h      2006-01-12 18:27:33.000000000 +0000
 156 @@ -124,7 +124,7 @@
 157      CODEC_ID_ADPCM_G726,
 158
 159         /* AMR */
 160 -    CODEC_ID_AMR_NB,
 161 +    CODEC_ID_AMR_NB= 0x12000,
 162      CODEC_ID_AMR_WB,
 163
 164      /* RealAudio codecs*/
 165
 166 diff -Naur ffmpeg-0.4.9-pre1-orig/libavformat/Makefile ffmpeg-0.4.9-pre1/libavformat/Makefile
 167 --- ffmpeg-0.4.9-pre1-orig/libavformat/Makefile 2004-04-24 15:16:23.000000000 +0000
 168 +++ ffmpeg-0.4.9-pre1/libavformat/Makefile      2006-01-12 18:27:33.000000000 +0000
 169 @@ -23,15 +23,17 @@
 170  OBJS+= asf-enc.o
 171  endif
 172
 173 +AMROBJS=
 174  ifeq ($(AMR_NB),yes)
 175 -OBJS+= amr.o
 176 +AMROBJS= amr.o
 177  endif
 178  ifeq ($(AMR_NB_FIXED),yes)
 179 -OBJS+= amr.o
 180 +AMROBJS= amr.o
 181  endif
 182  ifeq ($(AMR_WB),yes)
 183 -OBJS+= amr.o
 184 +AMROBJS= amr.o
 185  endif
 186 +OBJS+= $(AMROBJS)
 187
 188  # image formats
 189  OBJS+= pnm.o yuv.o png.o jpeg.o gifdec.o sgi.o
 190