[FFmpeg-devel] [PATCH 1/2] ADPCM DTK decoder

Paul B Mahol onemda at gmail.com
Fri May 3 12:00:11 CEST 2013


On 4/22/13, James Almer <jamrial at gmail.com> wrote:
>
> Signed-off-by: James Almer <jamrial at gmail.com>
> ---
>  Changelog               |  1 +
>  doc/general.texi        |  1 +
>  libavcodec/Makefile     |  1 +
>  libavcodec/adpcm.c      | 58
> +++++++++++++++++++++++++++++++++++++++++++++++++
>  libavcodec/adpcm.h      |  4 ++--
>  libavcodec/allcodecs.c  |  1 +
>  libavcodec/avcodec.h    |  1 +
>  libavcodec/codec_desc.c |  7 ++++++
>  libavcodec/version.h    |  2 +-
>  9 files changed, 73 insertions(+), 3 deletions(-)
>
> diff --git a/Changelog b/Changelog
> index 7481a7c..436da5c 100644
> --- a/Changelog
> +++ b/Changelog
> @@ -30,6 +30,7 @@ version <next>:
>  - decent native animated GIF encoding
>  - asetrate filter
>  - interleave filter
> +- ADPCM DTK decoder
>
>
>  version 1.2:
> diff --git a/doc/general.texi b/doc/general.texi
> index b6e731a..215abe6 100644
> --- a/doc/general.texi
> +++ b/doc/general.texi
> @@ -771,6 +771,7 @@ following image formats are supported:
>  @item ADPCM Microsoft        @tab  X  @tab  X
>  @item ADPCM MS IMA           @tab  X  @tab  X
>  @item ADPCM Nintendo Gamecube AFC  @tab     @tab  X
> + at item ADPCM Nintendo Gamecube DTK  @tab     @tab  X
>  @item ADPCM Nintendo Gamecube THP  @tab     @tab  X
>  @item ADPCM QT IMA           @tab  X  @tab  X
>  @item ADPCM SEGA CRI ADX     @tab  X  @tab  X
> diff --git a/libavcodec/Makefile b/libavcodec/Makefile
> index ac342b1..4a8f7c0 100644
> --- a/libavcodec/Makefile
> +++ b/libavcodec/Makefile
> @@ -567,6 +567,7 @@ OBJS-$(CONFIG_ADPCM_ADX_DECODER)          += adxdec.o
> adx.o
>  OBJS-$(CONFIG_ADPCM_ADX_ENCODER)          += adxenc.o adx.o
>  OBJS-$(CONFIG_ADPCM_AFC_DECODER)          += adpcm.o adpcm_data.o
>  OBJS-$(CONFIG_ADPCM_CT_DECODER)           += adpcm.o adpcm_data.o
> +OBJS-$(CONFIG_ADPCM_DTK_DECODER)          += adpcm.o adpcm_data.o
>  OBJS-$(CONFIG_ADPCM_EA_DECODER)           += adpcm.o adpcm_data.o
>  OBJS-$(CONFIG_ADPCM_EA_MAXIS_XA_DECODER)  += adpcm.o adpcm_data.o
>  OBJS-$(CONFIG_ADPCM_EA_R1_DECODER)        += adpcm.o adpcm_data.o
> diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
> index f5af5d4..98a1152 100644
> --- a/libavcodec/adpcm.c
> +++ b/libavcodec/adpcm.c
> @@ -96,6 +96,7 @@ static av_cold int adpcm_decode_init(AVCodecContext *
> avctx)
>      unsigned int max_channels = 2;
>
>      switch(avctx->codec->id) {
> +    case AV_CODEC_ID_ADPCM_DTK:
>      case AV_CODEC_ID_ADPCM_EA:
>          min_channels = 2;
>          break;
> @@ -148,6 +149,7 @@ static av_cold int adpcm_decode_init(AVCodecContext *
> avctx)
>          case AV_CODEC_ID_ADPCM_EA_XAS:
>          case AV_CODEC_ID_ADPCM_THP:
>          case AV_CODEC_ID_ADPCM_AFC:
> +        case AV_CODEC_ID_ADPCM_DTK:
>              avctx->sample_fmt = AV_SAMPLE_FMT_S16P;
>              break;
>          case AV_CODEC_ID_ADPCM_IMA_WS:
> @@ -603,6 +605,9 @@ static int get_nb_samples(AVCodecContext *avctx,
> GetByteContext *gb,
>      case AV_CODEC_ID_ADPCM_XA:
>          nb_samples = (buf_size / 128) * 224 / ch;
>          break;
> +    case AV_CODEC_ID_ADPCM_DTK:
> +        nb_samples = buf_size / 32 * 28;
> +        break;
>      }
>
>      /* validate coded sample count */
> @@ -1363,6 +1368,58 @@ static int adpcm_decode_frame(AVCodecContext *avctx,
> void *data,
>          }
>          break;
>      }
> +    case AV_CODEC_ID_ADPCM_DTK:
> +    {
> +        int ch;

There is already channel, no need to add another variable and use {}.
Or just put it where channel is just to avoid ugly {}.

> +
> +        for (ch = 0; ch < avctx->channels; ch++) {
> +            samples = samples_p[ch];
> +
> +            /* Read in every sample for this channel.  */
> +            for (i = 0; i < nb_samples / 28; i++) {
> +                int byte, header;
> +                if (ch)
> +                    bytestream2_skipu(&gb, 1);
> +                header = bytestream2_get_byteu(&gb);
> +                bytestream2_skipu(&gb, 3 - ch);
> +
> +                /* Decode 28 samples.  */
> +                for (n = 0; n < 28; n++) {
> +                    int32_t sampledat, prev;
> +
> +                    switch (header >> 4) {
> +                    case 1:
> +                        prev = (c->status[ch].sample1 * 0x3c);
> +                        break;
> +                    case 2:
> +                        prev = (c->status[ch].sample1 * 0x73) -
> (c->status[ch].sample2 * 0x34);
> +                        break;
> +                    case 3:
> +                        prev = (c->status[ch].sample1 * 0x62) -
> (c->status[ch].sample2 * 0x37);
> +                        break;
> +                    default:
> +                        prev = 0;
> +                    }
> +
> +                    prev = av_clip((prev + 0x20) >> 6, -0x200000,
> 0x1fffff);
> +
> +                    byte = bytestream2_get_byteu(&gb);
> +                    if (!ch)
> +                        sampledat = sign_extend(byte, 4);
> +                    else
> +                        sampledat = sign_extend(byte >> 4, 4);
> +
> +                    sampledat = (((sampledat << 12) >> (header & 0xf)) <<
> 6) + prev;
> +                    *samples++ = av_clip_int16(sampledat >> 6);
> +                    c->status[ch].sample2 = c->status[ch].sample1;
> +                    c->status[ch].sample1 = sampledat;
> +                }
> +            }
> +            if (!ch)
> +                bytestream2_seek(&gb, 0, SEEK_SET);
> +        }
> +        break;
> +    }
>
>      default:
>          return -1;
> @@ -1404,6 +1461,7 @@ AVCodec ff_ ## name_ ## _decoder = {
>      \
>  ADPCM_DECODER(AV_CODEC_ID_ADPCM_4XM,         sample_fmts_s16p, adpcm_4xm,
>       "ADPCM 4X Movie");
>  ADPCM_DECODER(AV_CODEC_ID_ADPCM_AFC,         sample_fmts_s16p, adpcm_afc,
>       "ADPCM Nintendo Gamecube AFC");
>  ADPCM_DECODER(AV_CODEC_ID_ADPCM_CT,          sample_fmts_s16,  adpcm_ct,
>       "ADPCM Creative Technology");
> +ADPCM_DECODER(AV_CODEC_ID_ADPCM_DTK,         sample_fmts_s16p, adpcm_dtk,
>       "ADPCM Nintendo Gamecube DTK");
>  ADPCM_DECODER(AV_CODEC_ID_ADPCM_EA,          sample_fmts_s16,  adpcm_ea,
>       "ADPCM Electronic Arts");
>  ADPCM_DECODER(AV_CODEC_ID_ADPCM_EA_MAXIS_XA, sample_fmts_s16,
> adpcm_ea_maxis_xa, "ADPCM Electronic Arts Maxis CDROM XA");
>  ADPCM_DECODER(AV_CODEC_ID_ADPCM_EA_R1,       sample_fmts_s16p, adpcm_ea_r1,
>       "ADPCM Electronic Arts R1");
> diff --git a/libavcodec/adpcm.h b/libavcodec/adpcm.h
> index 08fd23f..f43a28c 100644
> --- a/libavcodec/adpcm.h
> +++ b/libavcodec/adpcm.h
> @@ -38,8 +38,8 @@ typedef struct ADPCMChannelStatus {
>      int prev_sample;
>
>      /* MS version */
> -    int16_t sample1;
> -    int16_t sample2;
> +    int sample1;
> +    int sample2;
>      int coeff1;
>      int coeff2;
>      int idelta;
> diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
> index 19a638c..35e0408 100644
> --- a/libavcodec/allcodecs.c
> +++ b/libavcodec/allcodecs.c
> @@ -418,6 +418,7 @@ void avcodec_register_all(void)
>      REGISTER_ENCDEC (ADPCM_ADX,         adpcm_adx);
>      REGISTER_DECODER(ADPCM_AFC,         adpcm_afc);
>      REGISTER_DECODER(ADPCM_CT,          adpcm_ct);
> +    REGISTER_DECODER(ADPCM_DTK,         adpcm_dtk);
>      REGISTER_DECODER(ADPCM_EA,          adpcm_ea);
>      REGISTER_DECODER(ADPCM_EA_MAXIS_XA, adpcm_ea_maxis_xa);
>      REGISTER_DECODER(ADPCM_EA_R1,       adpcm_ea_r1);
> diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
> index aba3aea..bd0dd6f 100644
> --- a/libavcodec/avcodec.h
> +++ b/libavcodec/avcodec.h
> @@ -362,6 +362,7 @@ enum AVCodecID {
>      AV_CODEC_ID_VIMA       = MKBETAG('V','I','M','A'),
>      AV_CODEC_ID_ADPCM_AFC  = MKBETAG('A','F','C',' '),
>      AV_CODEC_ID_ADPCM_IMA_OKI = MKBETAG('O','K','I',' '),
> +    AV_CODEC_ID_ADPCM_DTK  = MKBETAG('D','T','K',' '),
>
>      /* AMR */
>      AV_CODEC_ID_AMR_NB = 0x12000,
> diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c
> index c973025..a36aaad 100644
> --- a/libavcodec/codec_desc.c
> +++ b/libavcodec/codec_desc.c
> @@ -1816,6 +1816,13 @@ static const AVCodecDescriptor codec_descriptors[] =
> {
>          .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA Dialogic OKI"),
>          .props     = AV_CODEC_PROP_LOSSY,
>      },
> +    {
> +        .id        = AV_CODEC_ID_ADPCM_DTK,
> +        .type      = AVMEDIA_TYPE_AUDIO,
> +        .name      = "adpcm_dtk",
> +        .long_name = NULL_IF_CONFIG_SMALL("ADPCM Nintendo Gamecube DTK"),
> +        .props     = AV_CODEC_PROP_LOSSY,
> +    },
>
>      /* AMR */
>      {
> diff --git a/libavcodec/version.h b/libavcodec/version.h
> index b1918f1..d6f7b8e 100644
> --- a/libavcodec/version.h
> +++ b/libavcodec/version.h
> @@ -29,7 +29,7 @@
>  #include "libavutil/avutil.h"
>
>  #define LIBAVCODEC_VERSION_MAJOR 55
> -#define LIBAVCODEC_VERSION_MINOR  5
> +#define LIBAVCODEC_VERSION_MINOR  6
>  #define LIBAVCODEC_VERSION_MICRO 100
>
>  #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
> --
> 1.8.1.msysgit.1

rest lgtm


More information about the ffmpeg-devel mailing list