---
libavcodec/aac_adtstoasc_bsf.c | 95 ++++++++++++++++++++++++++----------------
libavcodec/allcodecs.c | 1 -
libavcodec/bitstream_filters.c | 5 +++
3 files changed, 65 insertions(+), 36 deletions(-)
diff --git a/libavcodec/aac_adtstoasc_bsf.c b/libavcodec/aac_adtstoasc_bsf.c
index d3cbeae..52756f8 100644
--- a/libavcodec/aac_adtstoasc_bsf.c
+++ b/libavcodec/aac_adtstoasc_bsf.c
@@ -21,6 +21,7 @@
#include "avcodec.h"
#include "aacadtsdec.h"
+#include "bsf.h"
#include "put_bits.h"
#include "get_bits.h"
#include "mpeg4audio.h"
@@ -34,65 +35,76 @@ typedef struct AACBSFContext {
* This filter creates an MPEG-4 AudioSpecificConfig from an MPEG-2/4
* ADTS header and removes the ADTS header.
*/
-static int aac_adtstoasc_filter(AVBitStreamFilterContext *bsfc,
- AVCodecContext *avctx, const char *args,
- uint8_t **poutbuf, int *poutbuf_size,
- const uint8_t *buf, int buf_size,
- int keyframe)
+static int aac_adtstoasc_filter(AVBSFContext *bsfc, AVPacket *out)
{
+ AACBSFContext *ctx = bsfc->priv_data;
+
GetBitContext gb;
PutBitContext pb;
AACADTSHeaderInfo hdr;
+ AVPacket *in;
+ int ret;
- AACBSFContext *ctx = bsfc->priv_data;
+ ret = ff_bsf_get_packet(bsfc, &in);
+ if (ret < 0)
+ return ret;
- init_get_bits(&gb, buf, AAC_ADTS_HEADER_SIZE*8);
+ if (in->size < AAC_ADTS_HEADER_SIZE)
+ goto packet_too_small;
- *poutbuf = (uint8_t*) buf;
- *poutbuf_size = buf_size;
+ init_get_bits(&gb, in->data, AAC_ADTS_HEADER_SIZE * 8);
- if (avctx->extradata)
- if (show_bits(&gb, 12) != 0xfff)
- return 0;
+ if (bsfc->par_in->extradata && show_bits(&gb, 12) != 0xfff)
+ goto finish;
if (avpriv_aac_parse_header(&gb, &hdr) < 0) {
- av_log(avctx, AV_LOG_ERROR, "Error parsing ADTS frame header!\n");
- return AVERROR_INVALIDDATA;
+ av_log(bsfc, AV_LOG_ERROR, "Error parsing ADTS frame header!\n");
+ ret = AVERROR_INVALIDDATA;
+ goto fail;
}
if (!hdr.crc_absent && hdr.num_aac_frames > 1) {
- avpriv_report_missing_feature(avctx,
+ avpriv_report_missing_feature(bsfc,
"Multiple RDBs per frame with CRC");
- return AVERROR_PATCHWELCOME;
+ ret = AVERROR_PATCHWELCOME;
+ goto fail;
}
- buf += AAC_ADTS_HEADER_SIZE + 2*!hdr.crc_absent;
- buf_size -= AAC_ADTS_HEADER_SIZE + 2*!hdr.crc_absent;
+ in->size -= AAC_ADTS_HEADER_SIZE + 2 * !hdr.crc_absent;
+ if (in->size <= 0)
+ goto packet_too_small;
+ in->data += AAC_ADTS_HEADER_SIZE + 2 * !hdr.crc_absent;
if (!ctx->first_frame_done) {
int pce_size = 0;
uint8_t pce_data[MAX_PCE_SIZE];
+ uint8_t *extradata;
+
if (!hdr.chan_config) {
- init_get_bits(&gb, buf, buf_size * 8);
+ init_get_bits(&gb, in->data, in->size * 8);
if (get_bits(&gb, 3) != 5) {
- avpriv_report_missing_feature(avctx,
+ avpriv_report_missing_feature(bsfc,
"PCE-based channel configuration
"
"without PCE as first syntax "
"element");
- return AVERROR_PATCHWELCOME;
+ ret = AVERROR_PATCHWELCOME;
+ goto fail;
}
init_put_bits(&pb, pce_data, MAX_PCE_SIZE);
pce_size = avpriv_copy_pce_data(&pb, &gb)/8;
flush_put_bits(&pb);
- buf_size -= get_bits_count(&gb)/8;
- buf += get_bits_count(&gb)/8;
+ in->size -= get_bits_count(&gb)/8;
+ in->data += get_bits_count(&gb)/8;
}
- avctx->extradata_size = 2 + pce_size;
- avctx->extradata = av_mallocz(avctx->extradata_size +
AV_INPUT_BUFFER_PADDING_SIZE);
- if (!avctx->extradata)
- return AVERROR(ENOMEM);
- init_put_bits(&pb, avctx->extradata, avctx->extradata_size);
+ extradata = av_packet_new_side_data(in, AV_PKT_DATA_NEW_EXTRADATA,
+ 2 + pce_size);
+ if (!extradata) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
+
+ init_put_bits(&pb, extradata, 2 + pce_size);
put_bits(&pb, 5, hdr.object_type);
put_bits(&pb, 4, hdr.sampling_index);
put_bits(&pb, 4, hdr.chan_config);
@@ -101,20 +113,33 @@ static int aac_adtstoasc_filter(AVBitStreamFilterContext
*bsfc,
put_bits(&pb, 1, 0); //is not extension
flush_put_bits(&pb);
if (pce_size) {
- memcpy(avctx->extradata + 2, pce_data, pce_size);
+ memcpy(extradata + 2, pce_data, pce_size);
}
ctx->first_frame_done = 1;
}
- *poutbuf = (uint8_t*) buf;
- *poutbuf_size = buf_size;
+finish:
+ av_packet_move_ref(out, in);
+ av_packet_free(&in);
return 0;
+
+packet_too_small:
+ av_log(bsfc, AV_LOG_ERROR, "Input packet too small\n");
+ ret = AVERROR_INVALIDDATA;
+fail:
+ av_packet_free(&in);
+ return ret;
}
-AVBitStreamFilter ff_aac_adtstoasc_bsf = {
- "aac_adtstoasc",
- sizeof(AACBSFContext),
- aac_adtstoasc_filter,
+static const enum AVCodecID codec_ids[] = {
+ AV_CODEC_ID_AAC, AV_CODEC_ID_NONE,
+};
+
+const AVBitStreamFilter ff_aac_adtstoasc_bsf = {
+ .name = "aac_adtstoasc",
+ .priv_data_size = sizeof(AACBSFContext),
+ .filter = aac_adtstoasc_filter,
+ .codec_ids = codec_ids,
};
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 7c2ab50..4d03363 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -538,7 +538,6 @@ void avcodec_register_all(void)
REGISTER_PARSER(VP8, vp8);
/* bitstream filters */
- REGISTER_BSF(AAC_ADTSTOASC, aac_adtstoasc);
REGISTER_BSF(CHOMP, chomp);
REGISTER_BSF(DUMP_EXTRADATA, dump_extradata);
REGISTER_BSF(H264_MP4TOANNEXB, h264_mp4toannexb);
diff --git a/libavcodec/bitstream_filters.c b/libavcodec/bitstream_filters.c
index 28d028d..7556bdb 100644
--- a/libavcodec/bitstream_filters.c
+++ b/libavcodec/bitstream_filters.c
@@ -24,7 +24,12 @@
#include "avcodec.h"
#include "bsf.h"
+extern const AVBitStreamFilter ff_aac_adtstoasc_bsf;
+
static const AVBitStreamFilter *bitstream_filters[] = {
+#if CONFIG_AAC_ADTSTOASC_BSF
+ &ff_aac_adtstoasc_bsf,
+#endif
NULL,
};
--
2.0.0
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
