Message ID | 20190808210905.24456-1-ccawley2011@gmail.com |
---|---|
State | New |
Headers | show |
On Thu, Aug 8, 2019 at 11:20 PM Cameron Cawley <ccawley2011@gmail.com> wrote: > Signed-off-by: Cameron Cawley <ccawley2011@gmail.com> > --- > doc/general.texi | 1 + > libavcodec/Makefile | 1 + > libavcodec/adpcm.c | 14 ++++++++++++++ > libavcodec/allcodecs.c | 1 + > libavcodec/avcodec.h | 1 + > libavcodec/codec_desc.c | 7 +++++++ > libavcodec/utils.c | 1 + > 7 files changed, 26 insertions(+) > > diff --git a/doc/general.texi b/doc/general.texi > index 3c0c803449..db30738716 100644 > --- a/doc/general.texi > +++ b/doc/general.texi > @@ -1072,6 +1072,7 @@ following image formats are supported: > @item ADPCM Electronic Arts XAS @tab @tab X > @item ADPCM G.722 @tab X @tab X > @item ADPCM G.726 @tab X @tab X > +@item ADPCM IMA Acorn Replay @tab @tab X > @item ADPCM IMA AMV @tab @tab X > @tab Used in AMV files > @item ADPCM IMA Electronic Arts EACS @tab @tab X > diff --git a/libavcodec/Makefile b/libavcodec/Makefile > index 3cd73fbcc6..c0a038495f 100644 > --- a/libavcodec/Makefile > +++ b/libavcodec/Makefile > @@ -825,6 +825,7 @@ OBJS-$(CONFIG_ADPCM_G726_DECODER) += g726.o > OBJS-$(CONFIG_ADPCM_G726_ENCODER) += g726.o > OBJS-$(CONFIG_ADPCM_G726LE_DECODER) += g726.o > OBJS-$(CONFIG_ADPCM_G726LE_ENCODER) += g726.o > +OBJS-$(CONFIG_ADPCM_IMA_ACORN_DECODER) += adpcm.o adpcm_data.o > OBJS-$(CONFIG_ADPCM_IMA_AMV_DECODER) += adpcm.o adpcm_data.o > OBJS-$(CONFIG_ADPCM_IMA_APC_DECODER) += adpcm.o adpcm_data.o > OBJS-$(CONFIG_ADPCM_IMA_DAT4_DECODER) += adpcm.o adpcm_data.o > diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c > index fb126503d6..70503fc0b1 100644 > --- a/libavcodec/adpcm.c > +++ b/libavcodec/adpcm.c > @@ -599,6 +599,7 @@ static int get_nb_samples(AVCodecContext *avctx, > GetByteContext *gb, > switch (avctx->codec->id) { > case AV_CODEC_ID_ADPCM_4XM: > case AV_CODEC_ID_ADPCM_AGM: > + case AV_CODEC_ID_ADPCM_IMA_ACORN: > case AV_CODEC_ID_ADPCM_IMA_DAT4: > case AV_CODEC_ID_ADPCM_IMA_ISS: header_size = 4 * ch; > break; > case AV_CODEC_ID_ADPCM_IMA_AMV: header_size = 8; > break; > @@ -1441,6 +1442,18 @@ static int adpcm_decode_frame(AVCodecContext > *avctx, void *data, > } > } > break; > + case AV_CODEC_ID_ADPCM_IMA_ACORN: > + for (i=0; i<=st; i++) { > + bytestream2_skip(&gb, 2); // TODO: What does this do? > Have you checked this is not some state that helps with seeking? > + c->status[i].step_index = bytestream2_get_le16u(&gb); > + } > + > + for (n = nb_samples >> (1 - st); n > 0; n--) { > + int byte = bytestream2_get_byteu(&gb); > + *samples++ = adpcm_ima_expand_nibble(&c->status[0], byte & > 0x0F, 6); > + *samples++ = adpcm_ima_expand_nibble(&c->status[st], byte >> > 4, 6); > + } > + break; > case AV_CODEC_ID_ADPCM_IMA_AMV: > c->status[0].predictor = sign_extend(bytestream2_get_le16u(&gb), > 16); > c->status[0].step_index = bytestream2_get_byteu(&gb); > @@ -1825,6 +1838,7 @@ ADPCM_DECODER(AV_CODEC_ID_ADPCM_EA_R1, > sample_fmts_s16p, adpcm_ea_r1, > ADPCM_DECODER(AV_CODEC_ID_ADPCM_EA_R2, sample_fmts_s16p, > adpcm_ea_r2, "ADPCM Electronic Arts R2"); > ADPCM_DECODER(AV_CODEC_ID_ADPCM_EA_R3, sample_fmts_s16p, > adpcm_ea_r3, "ADPCM Electronic Arts R3"); > ADPCM_DECODER(AV_CODEC_ID_ADPCM_EA_XAS, sample_fmts_s16p, > adpcm_ea_xas, "ADPCM Electronic Arts XAS"); > +ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_ACORN, sample_fmts_s16, > adpcm_ima_acorn, "ADPCM IMA Acorn Replay"); > ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_AMV, sample_fmts_s16, > adpcm_ima_amv, "ADPCM IMA AMV"); > ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_APC, sample_fmts_s16, > adpcm_ima_apc, "ADPCM IMA CRYO APC"); > ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_DAT4, sample_fmts_s16, > adpcm_ima_dat4, "ADPCM IMA Eurocom DAT4"); > diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c > index d2f9a39ce5..78177a1255 100644 > --- a/libavcodec/allcodecs.c > +++ b/libavcodec/allcodecs.c > @@ -592,6 +592,7 @@ extern AVCodec ff_adpcm_g726_encoder; > extern AVCodec ff_adpcm_g726_decoder; > extern AVCodec ff_adpcm_g726le_encoder; > extern AVCodec ff_adpcm_g726le_decoder; > +extern AVCodec ff_adpcm_ima_acorn_decoder; > extern AVCodec ff_adpcm_ima_amv_decoder; > extern AVCodec ff_adpcm_ima_apc_decoder; > extern AVCodec ff_adpcm_ima_dat4_decoder; > diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h > index d234271c5b..c8b6ec7f3c 100644 > --- a/libavcodec/avcodec.h > +++ b/libavcodec/avcodec.h > @@ -542,6 +542,7 @@ enum AVCodecID { > AV_CODEC_ID_ADPCM_IMA_DAT4, > AV_CODEC_ID_ADPCM_MTAF, > AV_CODEC_ID_ADPCM_AGM, > + AV_CODEC_ID_ADPCM_IMA_ACORN, > > /* AMR */ > AV_CODEC_ID_AMR_NB = 0x12000, > diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c > index 4d033c20ff..dc39b50e33 100644 > --- a/libavcodec/codec_desc.c > +++ b/libavcodec/codec_desc.c > @@ -2276,6 +2276,13 @@ static const AVCodecDescriptor codec_descriptors[] > = { > .long_name = NULL_IF_CONFIG_SMALL("ADPCM AmuseGraphics Movie > AGM"), > .props = AV_CODEC_PROP_LOSSY, > }, > + { > + .id = AV_CODEC_ID_ADPCM_IMA_ACORN, > + .type = AVMEDIA_TYPE_AUDIO, > + .name = "adpcm_ima_acorn", > + .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA Acorn Replay"), > + .props = AV_CODEC_PROP_LOSSY, > + }, > > /* AMR */ > { > diff --git a/libavcodec/utils.c b/libavcodec/utils.c > index a6a646636d..2bcc2065ef 100644 > --- a/libavcodec/utils.c > +++ b/libavcodec/utils.c > @@ -1621,6 +1621,7 @@ static int get_audio_frame_duration(enum AVCodecID > id, int sr, int ch, int ba, > case AV_CODEC_ID_ADPCM_DTK: > return frame_bytes / (16 * ch) * 28; > case AV_CODEC_ID_ADPCM_4XM: > + case AV_CODEC_ID_ADPCM_IMA_ACORN: > case AV_CODEC_ID_ADPCM_IMA_DAT4: > case AV_CODEC_ID_ADPCM_IMA_ISS: > return (frame_bytes - 4 * ch) * 2 / ch; > -- > 2.11.0 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
On Thu, Aug 08, 2019 at 22:09:04 +0100, Cameron Cawley wrote: > Signed-off-by: Cameron Cawley <ccawley2011@gmail.com> > --- > doc/general.texi | 1 + > libavcodec/Makefile | 1 + > libavcodec/adpcm.c | 14 ++++++++++++++ > libavcodec/allcodecs.c | 1 + > libavcodec/avcodec.h | 1 + > libavcodec/codec_desc.c | 7 +++++++ > libavcodec/utils.c | 1 + > 7 files changed, 26 insertions(+) You should also bump the micro version when adding a new decoder. Cheers, Moritz
On Fri, Aug 9, 2019 at 1:34 PM Moritz Barsnick <barsnick@gmx.net> wrote: > On Thu, Aug 08, 2019 at 22:09:04 +0100, Cameron Cawley wrote: > > Signed-off-by: Cameron Cawley <ccawley2011@gmail.com> > > --- > > doc/general.texi | 1 + > > libavcodec/Makefile | 1 + > > libavcodec/adpcm.c | 14 ++++++++++++++ > > libavcodec/allcodecs.c | 1 + > > libavcodec/avcodec.h | 1 + > > libavcodec/codec_desc.c | 7 +++++++ > > libavcodec/utils.c | 1 + > > 7 files changed, 26 insertions(+) > > You should also bump the micro version when adding a new decoder. > Nope. Developer documentation clearly states that minor should be bumped. > > Cheers, > Moritz > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
diff --git a/doc/general.texi b/doc/general.texi index 3c0c803449..db30738716 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -1072,6 +1072,7 @@ following image formats are supported: @item ADPCM Electronic Arts XAS @tab @tab X @item ADPCM G.722 @tab X @tab X @item ADPCM G.726 @tab X @tab X +@item ADPCM IMA Acorn Replay @tab @tab X @item ADPCM IMA AMV @tab @tab X @tab Used in AMV files @item ADPCM IMA Electronic Arts EACS @tab @tab X diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 3cd73fbcc6..c0a038495f 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -825,6 +825,7 @@ OBJS-$(CONFIG_ADPCM_G726_DECODER) += g726.o OBJS-$(CONFIG_ADPCM_G726_ENCODER) += g726.o OBJS-$(CONFIG_ADPCM_G726LE_DECODER) += g726.o OBJS-$(CONFIG_ADPCM_G726LE_ENCODER) += g726.o +OBJS-$(CONFIG_ADPCM_IMA_ACORN_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_IMA_AMV_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_IMA_APC_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_IMA_DAT4_DECODER) += adpcm.o adpcm_data.o diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index fb126503d6..70503fc0b1 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -599,6 +599,7 @@ static int get_nb_samples(AVCodecContext *avctx, GetByteContext *gb, switch (avctx->codec->id) { case AV_CODEC_ID_ADPCM_4XM: case AV_CODEC_ID_ADPCM_AGM: + case AV_CODEC_ID_ADPCM_IMA_ACORN: case AV_CODEC_ID_ADPCM_IMA_DAT4: case AV_CODEC_ID_ADPCM_IMA_ISS: header_size = 4 * ch; break; case AV_CODEC_ID_ADPCM_IMA_AMV: header_size = 8; break; @@ -1441,6 +1442,18 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, } } break; + case AV_CODEC_ID_ADPCM_IMA_ACORN: + for (i=0; i<=st; i++) { + bytestream2_skip(&gb, 2); // TODO: What does this do? + c->status[i].step_index = bytestream2_get_le16u(&gb); + } + + for (n = nb_samples >> (1 - st); n > 0; n--) { + int byte = bytestream2_get_byteu(&gb); + *samples++ = adpcm_ima_expand_nibble(&c->status[0], byte & 0x0F, 6); + *samples++ = adpcm_ima_expand_nibble(&c->status[st], byte >> 4, 6); + } + break; case AV_CODEC_ID_ADPCM_IMA_AMV: c->status[0].predictor = sign_extend(bytestream2_get_le16u(&gb), 16); c->status[0].step_index = bytestream2_get_byteu(&gb); @@ -1825,6 +1838,7 @@ ADPCM_DECODER(AV_CODEC_ID_ADPCM_EA_R1, sample_fmts_s16p, adpcm_ea_r1, ADPCM_DECODER(AV_CODEC_ID_ADPCM_EA_R2, sample_fmts_s16p, adpcm_ea_r2, "ADPCM Electronic Arts R2"); ADPCM_DECODER(AV_CODEC_ID_ADPCM_EA_R3, sample_fmts_s16p, adpcm_ea_r3, "ADPCM Electronic Arts R3"); ADPCM_DECODER(AV_CODEC_ID_ADPCM_EA_XAS, sample_fmts_s16p, adpcm_ea_xas, "ADPCM Electronic Arts XAS"); +ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_ACORN, sample_fmts_s16, adpcm_ima_acorn, "ADPCM IMA Acorn Replay"); ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_AMV, sample_fmts_s16, adpcm_ima_amv, "ADPCM IMA AMV"); ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_APC, sample_fmts_s16, adpcm_ima_apc, "ADPCM IMA CRYO APC"); ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_DAT4, sample_fmts_s16, adpcm_ima_dat4, "ADPCM IMA Eurocom DAT4"); diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index d2f9a39ce5..78177a1255 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -592,6 +592,7 @@ extern AVCodec ff_adpcm_g726_encoder; extern AVCodec ff_adpcm_g726_decoder; extern AVCodec ff_adpcm_g726le_encoder; extern AVCodec ff_adpcm_g726le_decoder; +extern AVCodec ff_adpcm_ima_acorn_decoder; extern AVCodec ff_adpcm_ima_amv_decoder; extern AVCodec ff_adpcm_ima_apc_decoder; extern AVCodec ff_adpcm_ima_dat4_decoder; diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index d234271c5b..c8b6ec7f3c 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -542,6 +542,7 @@ enum AVCodecID { AV_CODEC_ID_ADPCM_IMA_DAT4, AV_CODEC_ID_ADPCM_MTAF, AV_CODEC_ID_ADPCM_AGM, + AV_CODEC_ID_ADPCM_IMA_ACORN, /* AMR */ AV_CODEC_ID_AMR_NB = 0x12000, diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 4d033c20ff..dc39b50e33 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -2276,6 +2276,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("ADPCM AmuseGraphics Movie AGM"), .props = AV_CODEC_PROP_LOSSY, }, + { + .id = AV_CODEC_ID_ADPCM_IMA_ACORN, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_ima_acorn", + .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA Acorn Replay"), + .props = AV_CODEC_PROP_LOSSY, + }, /* AMR */ { diff --git a/libavcodec/utils.c b/libavcodec/utils.c index a6a646636d..2bcc2065ef 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1621,6 +1621,7 @@ static int get_audio_frame_duration(enum AVCodecID id, int sr, int ch, int ba, case AV_CODEC_ID_ADPCM_DTK: return frame_bytes / (16 * ch) * 28; case AV_CODEC_ID_ADPCM_4XM: + case AV_CODEC_ID_ADPCM_IMA_ACORN: case AV_CODEC_ID_ADPCM_IMA_DAT4: case AV_CODEC_ID_ADPCM_IMA_ISS: return (frame_bytes - 4 * ch) * 2 / ch;
Signed-off-by: Cameron Cawley <ccawley2011@gmail.com> --- doc/general.texi | 1 + libavcodec/Makefile | 1 + libavcodec/adpcm.c | 14 ++++++++++++++ libavcodec/allcodecs.c | 1 + libavcodec/avcodec.h | 1 + libavcodec/codec_desc.c | 7 +++++++ libavcodec/utils.c | 1 + 7 files changed, 26 insertions(+)