[FFmpeg-devel] [PATCH] ADPCM: Bump THP channel limit to 14

[Paul B Mahol]

On 9/11/15, Rodger Combs <rodger.combs at gmail.com> wrote:
> ---
>  libavcodec/adpcm.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
> index 52d0d44..ba38041 100644
> --- a/libavcodec/adpcm.c
> +++ b/libavcodec/adpcm.c
> @@ -84,7 +84,7 @@ static const int swf_index_tables[4][16] = {
>  /* end of tables */
>
>  typedef struct ADPCMDecodeContext {
> -    ADPCMChannelStatus status[10];
> +    ADPCMChannelStatus status[14];
>      int vqa_version;                /**< VQA version. Used for ADPCM_IMA_WS
> */
>      int has_status;
>  } ADPCMDecodeContext;
> @@ -109,7 +109,7 @@ static av_cold int adpcm_decode_init(AVCodecContext *
> avctx)
>          break;
>      case AV_CODEC_ID_ADPCM_THP:
>      case AV_CODEC_ID_ADPCM_THP_LE:
> -        max_channels = 10;
> +        max_channels = 14;
>          break;
>      }
>      if (avctx->channels < min_channels || avctx->channels > max_channels) {
> @@ -1431,7 +1431,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx,
> void *data,
>      case AV_CODEC_ID_ADPCM_THP:
>      case AV_CODEC_ID_ADPCM_THP_LE:
>      {
> -        int table[10][16];
> +        int table[14][16];

Perhaps this should be moved to private context and nb of channels
raised to 64....

>          int ch;
>
>  #define THP_GET16(g) \
> --
> 2.5.1
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>