#include "libavutil/intreadwrite.h"
#include "libavutil/mem.h"
+
#include "avcodec.h"
+#include "bsf.h"
typedef struct H264BSFContext {
uint8_t length_size;
int extradata_parsed;
} H264BSFContext;
-static int alloc_and_copy(uint8_t **poutbuf, int *poutbuf_size,
+static int alloc_and_copy(AVPacket *out,
const uint8_t *sps_pps, uint32_t sps_pps_size,
const uint8_t *in, uint32_t in_size)
{
- uint32_t offset = *poutbuf_size;
+ uint32_t offset = out->size;
uint8_t nal_header_size = offset ? 3 : 4;
- void *tmp;
+ int err;
+
+ err = av_grow_packet(out, sps_pps_size + in_size + nal_header_size);
+ if (err < 0)
+ return err;
- *poutbuf_size += sps_pps_size + in_size + nal_header_size;
- tmp = av_realloc(*poutbuf, *poutbuf_size);
- if (!tmp)
- return AVERROR(ENOMEM);
- *poutbuf = tmp;
if (sps_pps)
- memcpy(*poutbuf + offset, sps_pps, sps_pps_size);
- memcpy(*poutbuf + sps_pps_size + nal_header_size + offset, in, in_size);
+ memcpy(out->data + offset, sps_pps, sps_pps_size);
+ memcpy(out->data + sps_pps_size + nal_header_size + offset, in, in_size);
if (!offset) {
- AV_WB32(*poutbuf + sps_pps_size, 1);
+ AV_WB32(out->data + sps_pps_size, 1);
} else {
- (*poutbuf + offset + sps_pps_size)[0] =
- (*poutbuf + offset + sps_pps_size)[1] = 0;
- (*poutbuf + offset + sps_pps_size)[2] = 1;
+ (out->data + offset + sps_pps_size)[0] =
+ (out->data + offset + sps_pps_size)[1] = 0;
+ (out->data + offset + sps_pps_size)[2] = 1;
}
return 0;
}
-static int h264_extradata_to_annexb(AVCodecContext *avctx, const int padding)
+static int h264_extradata_to_annexb(AVBSFContext *ctx, const int padding)
{
uint16_t unit_size;
uint64_t total_size = 0;
uint8_t *out = NULL, unit_nb, sps_done = 0,
sps_seen = 0, pps_seen = 0;
- const uint8_t *extradata = avctx->extradata + 4;
+ const uint8_t *extradata = ctx->par_in->extradata + 4;
static const uint8_t nalu_header[4] = { 0, 0, 0, 1 };
int length_size = (*extradata++ & 0x3) + 1; // retrieve length coded size
}
while (unit_nb--) {
- void *tmp;
+ int err;
unit_size = AV_RB16(extradata);
total_size += unit_size + 4;
if (total_size > INT_MAX - padding ||
- extradata + 2 + unit_size > avctx->extradata +
- avctx->extradata_size) {
+ extradata + 2 + unit_size > ctx->par_in->extradata +
+ ctx->par_in->extradata_size) {
av_free(out);
return AVERROR(EINVAL);
}
- tmp = av_realloc(out, total_size + padding);
- if (!tmp) {
- av_free(out);
- return AVERROR(ENOMEM);
- }
- out = tmp;
+ if ((err = av_reallocp(&out, total_size + padding)) < 0)
+ return err;
memcpy(out + total_size - unit_size - 4, nalu_header, 4);
memcpy(out + total_size - unit_size, extradata + 2, unit_size);
extradata += 2 + unit_size;
}
if (out)
- memset(out + total_size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+ memset(out + total_size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
if (!sps_seen)
- av_log(avctx, AV_LOG_WARNING,
+ av_log(ctx, AV_LOG_WARNING,
"Warning: SPS NALU missing or invalid. "
"The resulting stream may not play.\n");
if (!pps_seen)
- av_log(avctx, AV_LOG_WARNING,
+ av_log(ctx, AV_LOG_WARNING,
"Warning: PPS NALU missing or invalid. "
"The resulting stream may not play.\n");
- av_free(avctx->extradata);
- avctx->extradata = out;
- avctx->extradata_size = total_size;
+ av_freep(&ctx->par_out->extradata);
+ ctx->par_out->extradata = out;
+ ctx->par_out->extradata_size = total_size;
return length_size;
}
-static int h264_mp4toannexb_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 h264_mp4toannexb_init(AVBSFContext *ctx)
{
- H264BSFContext *ctx = bsfc->priv_data;
+ H264BSFContext *s = ctx->priv_data;
+ int extra_size = ctx->par_in->extradata_size;
+ int ret;
+
+ /* retrieve sps and pps NAL units from extradata */
+ if (!extra_size ||
+ (extra_size >= 3 && AV_RB24(ctx->par_in->extradata) == 1) ||
+ (extra_size >= 4 && AV_RB32(ctx->par_in->extradata) == 1)) {
+ av_log(ctx, AV_LOG_VERBOSE,
+ "The input looks like it is Annex B already\n");
+ } else if (extra_size >= 6) {
+ ret = h264_extradata_to_annexb(ctx, AV_INPUT_BUFFER_PADDING_SIZE);
+ if (ret < 0)
+ return ret;
+
+ s->length_size = ret;
+ s->first_idr = 1;
+ s->extradata_parsed = 1;
+ } else {
+ av_log(ctx, AV_LOG_ERROR, "Invalid extradata size: %d\n", extra_size);
+ return AVERROR_INVALIDDATA;
+ }
+
+ return 0;
+}
+
+static int h264_mp4toannexb_filter(AVBSFContext *ctx, AVPacket *out)
+{
+ H264BSFContext *s = ctx->priv_data;
+
+ AVPacket *in;
uint8_t unit_type;
int32_t nal_size;
uint32_t cumul_size = 0;
- const uint8_t *buf_end = buf + buf_size;
+ const uint8_t *buf;
+ const uint8_t *buf_end;
+ int buf_size;
int ret = 0;
+ ret = ff_bsf_get_packet(ctx, &in);
+ if (ret < 0)
+ return ret;
+
/* nothing to filter */
- if (!avctx->extradata || avctx->extradata_size < 6) {
- *poutbuf = (uint8_t *)buf;
- *poutbuf_size = buf_size;
+ if (!s->extradata_parsed) {
+ av_packet_move_ref(out, in);
+ av_packet_free(&in);
return 0;
}
- /* retrieve sps and pps NAL units from extradata */
- if (!ctx->extradata_parsed) {
- ret = h264_extradata_to_annexb(avctx, FF_INPUT_BUFFER_PADDING_SIZE);
- if (ret < 0)
- return ret;
- ctx->length_size = ret;
- ctx->first_idr = 1;
- ctx->extradata_parsed = 1;
- }
+ buf = in->data;
+ buf_size = in->size;
+ buf_end = in->data + in->size;
- *poutbuf_size = 0;
- *poutbuf = NULL;
do {
- if (buf + ctx->length_size > buf_end)
+ if (buf + s->length_size > buf_end)
goto fail;
- if (ctx->length_size == 1) {
+ if (s->length_size == 1) {
nal_size = buf[0];
- } else if (ctx->length_size == 2) {
+ } else if (s->length_size == 2) {
nal_size = AV_RB16(buf);
} else
nal_size = AV_RB32(buf);
- buf += ctx->length_size;
+ buf += s->length_size;
unit_type = *buf & 0x1f;
if (buf + nal_size > buf_end || nal_size < 0)
goto fail;
/* prepend only to the first type 5 NAL unit of an IDR picture */
- if (ctx->first_idr && unit_type == 5) {
- if (alloc_and_copy(poutbuf, poutbuf_size,
- avctx->extradata, avctx->extradata_size,
+ if (s->first_idr && unit_type == 5) {
+ if (alloc_and_copy(out,
+ ctx->par_out->extradata, ctx->par_out->extradata_size,
buf, nal_size) < 0)
goto fail;
- ctx->first_idr = 0;
+ s->first_idr = 0;
} else {
- if (alloc_and_copy(poutbuf, poutbuf_size,
+ if (alloc_and_copy(out,
NULL, 0, buf, nal_size) < 0)
goto fail;
- if (!ctx->first_idr && unit_type == 1)
- ctx->first_idr = 1;
+ if (!s->first_idr && unit_type == 1)
+ s->first_idr = 1;
}
buf += nal_size;
- cumul_size += nal_size + ctx->length_size;
+ cumul_size += nal_size + s->length_size;
} while (cumul_size < buf_size);
- return 1;
+ ret = av_packet_copy_props(out, in);
+ if (ret < 0)
+ goto fail;
fail:
- av_freep(poutbuf);
- *poutbuf_size = 0;
- return AVERROR(EINVAL);
+ if (ret < 0)
+ av_packet_unref(out);
+ av_packet_free(&in);
+
+ return ret;
}
-AVBitStreamFilter ff_h264_mp4toannexb_bsf = {
- "h264_mp4toannexb",
- sizeof(H264BSFContext),
- h264_mp4toannexb_filter,
+static const enum AVCodecID codec_ids[] = {
+ AV_CODEC_ID_H264, AV_CODEC_ID_NONE,
+};
+
+const AVBitStreamFilter ff_h264_mp4toannexb_bsf = {
+ .name = "h264_mp4toannexb",
+ .priv_data_size = sizeof(H264BSFContext),
+ .init = h264_mp4toannexb_init,
+ .filter = h264_mp4toannexb_filter,
+ .codec_ids = codec_ids,
};