summaryrefslogtreecommitdiff
path: root/libavcodec/atrac3plusdec.c
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2017-01-25 13:33:52 +0100
committerPaul B Mahol <onemda@gmail.com>2017-02-11 12:00:38 +0100
commit280a40dd2739e9a23bf6372752dcd133ff36e149 (patch)
tree95e116d64a70560c95d4c6979ef1af7edbecadf3 /libavcodec/atrac3plusdec.c
parentd96ebc5ef88024869de06bcf92b2ad99b01d47e3 (diff)
downloadffmpeg-280a40dd2739e9a23bf6372752dcd133ff36e149.tar.gz
avcodec: add ATRAC Advanced Lossless decoders
Only lossy part is decoded for now. Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavcodec/atrac3plusdec.c')
-rw-r--r--libavcodec/atrac3plusdec.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/libavcodec/atrac3plusdec.c b/libavcodec/atrac3plusdec.c
index ec2b1ad3b2..7a2ab3ef95 100644
--- a/libavcodec/atrac3plusdec.c
+++ b/libavcodec/atrac3plusdec.c
@@ -384,7 +384,7 @@ static int atrac3p_decode_frame(AVCodecContext *avctx, void *data,
*got_frame_ptr = 1;
- return FFMIN(avctx->block_align, avpkt->size);
+ return avctx->codec_id == AV_CODEC_ID_ATRAC3P ? FFMIN(avctx->block_align, avpkt->size) : avpkt->size;
}
AVCodec ff_atrac3p_decoder = {
@@ -398,3 +398,15 @@ AVCodec ff_atrac3p_decoder = {
.close = atrac3p_decode_close,
.decode = atrac3p_decode_frame,
};
+
+AVCodec ff_atrac3pal_decoder = {
+ .name = "atrac3plusal",
+ .long_name = NULL_IF_CONFIG_SMALL("ATRAC3+ AL (Adaptive TRansform Acoustic Coding 3+ Advanced Lossless)"),
+ .type = AVMEDIA_TYPE_AUDIO,
+ .id = AV_CODEC_ID_ATRAC3PAL,
+ .capabilities = AV_CODEC_CAP_DR1,
+ .priv_data_size = sizeof(ATRAC3PContext),
+ .init = atrac3p_decode_init,
+ .close = atrac3p_decode_close,
+ .decode = atrac3p_decode_frame,
+};