#include "libavutil/log.h"
#include "libavutil/opt.h"
-#include "avcodec.h"
+#include "av1.h"
+#include "av1_parse.h"
#include "bsf.h"
+#include "bsf_internal.h"
+#include "bytestream.h"
#include "h2645_parse.h"
#include "h264.h"
#include "hevc.h"
int (*extract)(AVBSFContext *ctx, AVPacket *pkt,
uint8_t **data, int *size);
- /* H264/HEVC specifc fields */
+ /* AV1 specific fields */
+ AV1Packet av1_pkt;
+
+ /* H264/HEVC specific fields */
H2645Packet h2645_pkt;
/* AVOptions */
return 0;
}
+static int extract_extradata_av1(AVBSFContext *ctx, AVPacket *pkt,
+ uint8_t **data, int *size)
+{
+ static const int extradata_obu_types[] = {
+ AV1_OBU_SEQUENCE_HEADER, AV1_OBU_METADATA,
+ };
+ ExtractExtradataContext *s = ctx->priv_data;
+
+ int extradata_size = 0, filtered_size = 0;
+ int nb_extradata_obu_types = FF_ARRAY_ELEMS(extradata_obu_types);
+ int i, has_seq = 0, ret = 0;
+
+ ret = ff_av1_packet_split(&s->av1_pkt, pkt->data, pkt->size, ctx);
+ if (ret < 0)
+ return ret;
+
+ for (i = 0; i < s->av1_pkt.nb_obus; i++) {
+ AV1OBU *obu = &s->av1_pkt.obus[i];
+ if (val_in_array(extradata_obu_types, nb_extradata_obu_types, obu->type)) {
+ extradata_size += obu->raw_size;
+ if (obu->type == AV1_OBU_SEQUENCE_HEADER)
+ has_seq = 1;
+ } else if (s->remove) {
+ filtered_size += obu->raw_size;
+ }
+ }
+
+ if (extradata_size && has_seq) {
+ AVBufferRef *filtered_buf = NULL;
+ PutByteContext pb_filtered_data, pb_extradata;
+ uint8_t *extradata;
+
+ if (s->remove) {
+ filtered_buf = av_buffer_alloc(filtered_size + AV_INPUT_BUFFER_PADDING_SIZE);
+ if (!filtered_buf) {
+ return AVERROR(ENOMEM);
+ }
+ memset(filtered_buf->data + filtered_size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
+ }
+
+ extradata = av_malloc(extradata_size + AV_INPUT_BUFFER_PADDING_SIZE);
+ if (!extradata) {
+ av_buffer_unref(&filtered_buf);
+ return AVERROR(ENOMEM);
+ }
+
+ *data = extradata;
+ *size = extradata_size;
+
+ bytestream2_init_writer(&pb_extradata, extradata, extradata_size);
+ if (s->remove)
+ bytestream2_init_writer(&pb_filtered_data, filtered_buf->data, filtered_size);
+
+ for (i = 0; i < s->av1_pkt.nb_obus; i++) {
+ AV1OBU *obu = &s->av1_pkt.obus[i];
+ if (val_in_array(extradata_obu_types, nb_extradata_obu_types,
+ obu->type)) {
+ bytestream2_put_bufferu(&pb_extradata, obu->raw_data, obu->raw_size);
+ } else if (s->remove) {
+ bytestream2_put_bufferu(&pb_filtered_data, obu->raw_data, obu->raw_size);
+ }
+ }
+
+ if (s->remove) {
+ av_buffer_unref(&pkt->buf);
+ pkt->buf = filtered_buf;
+ pkt->data = filtered_buf->data;
+ pkt->size = filtered_size;
+ }
+ }
+
+ return 0;
+}
+
static int extract_extradata_h2645(AVBSFContext *ctx, AVPacket *pkt,
uint8_t **data, int *size)
{
}
ret = ff_h2645_packet_split(&s->h2645_pkt, pkt->data, pkt->size,
- ctx, 0, 0, ctx->par_in->codec_id, 1);
+ ctx, 0, 0, ctx->par_in->codec_id, 1, 0);
if (ret < 0)
return ret;
if (extradata_size &&
((ctx->par_in->codec_id == AV_CODEC_ID_HEVC && has_sps && has_vps) ||
(ctx->par_in->codec_id == AV_CODEC_ID_H264 && has_sps))) {
- AVBufferRef *filtered_buf;
- uint8_t *extradata, *filtered_data;
+ AVBufferRef *filtered_buf = NULL;
+ PutByteContext pb_filtered_data, pb_extradata;
+ uint8_t *extradata;
if (s->remove) {
filtered_buf = av_buffer_alloc(filtered_size + AV_INPUT_BUFFER_PADDING_SIZE);
return AVERROR(ENOMEM);
}
memset(filtered_buf->data + filtered_size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
-
- filtered_data = filtered_buf->data;
}
extradata = av_malloc(extradata_size + AV_INPUT_BUFFER_PADDING_SIZE);
av_buffer_unref(&filtered_buf);
return AVERROR(ENOMEM);
}
- memset(extradata + extradata_size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
*data = extradata;
*size = extradata_size;
+ bytestream2_init_writer(&pb_extradata, extradata, extradata_size);
+ if (s->remove)
+ bytestream2_init_writer(&pb_filtered_data, filtered_buf->data, filtered_size);
+
for (i = 0; i < s->h2645_pkt.nb_nals; i++) {
H2645NAL *nal = &s->h2645_pkt.nals[i];
if (val_in_array(extradata_nal_types, nb_extradata_nal_types,
nal->type)) {
- AV_WB24(extradata, 1); // startcode
- memcpy(extradata + 3, nal->raw_data, nal->raw_size);
- extradata += 3 + nal->raw_size;
+ bytestream2_put_be24u(&pb_extradata, 1); //startcode
+ bytestream2_put_bufferu(&pb_extradata, nal->raw_data, nal->raw_size);
} else if (s->remove) {
- AV_WB24(filtered_data, 1); // startcode
- memcpy(filtered_data + 3, nal->raw_data, nal->raw_size);
- filtered_data += 3 + nal->raw_size;
+ bytestream2_put_be24u(&pb_filtered_data, 1); // startcode
+ bytestream2_put_bufferu(&pb_filtered_data, nal->raw_data, nal->raw_size);
}
}
return AVERROR(ENOMEM);
memcpy(*data, pkt->data, extradata_size);
- memset(*data + extradata_size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
*size = extradata_size;
if (s->remove) {
if (state == 0x1B3)
found = 1;
else if (found && state != 0x1B5 && state < 0x200 && state >= 0x100) {
- if (i > 3) {
- *size = i - 3;
- *data = av_malloc(*size + AV_INPUT_BUFFER_PADDING_SIZE);
- if (!*data)
- return AVERROR(ENOMEM);
+ *size = i - 3;
+ *data = av_malloc(*size + AV_INPUT_BUFFER_PADDING_SIZE);
+ if (!*data)
+ return AVERROR(ENOMEM);
- memcpy(*data, pkt->data, *size);
- memset(*data + *size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
+ memcpy(*data, pkt->data, *size);
- if (s->remove) {
- pkt->data += *size;
- pkt->size -= *size;
- }
+ if (s->remove) {
+ pkt->data += *size;
+ pkt->size -= *size;
}
break;
}
return AVERROR(ENOMEM);
memcpy(*data, pkt->data, *size);
- memset(*data + *size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
if (s->remove) {
pkt->data += *size;
int (*extract)(AVBSFContext *ctx, AVPacket *pkt,
uint8_t **data, int *size);
} extract_tab[] = {
+ { AV_CODEC_ID_AV1, extract_extradata_av1 },
+ { AV_CODEC_ID_AVS2, extract_extradata_mpeg4 },
{ AV_CODEC_ID_CAVS, extract_extradata_mpeg4 },
{ AV_CODEC_ID_H264, extract_extradata_h2645 },
{ AV_CODEC_ID_HEVC, extract_extradata_h2645 },
goto fail;
if (extradata) {
+ memset(extradata + extradata_size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
ret = av_packet_add_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA,
extradata, extradata_size);
if (ret < 0) {
static void extract_extradata_close(AVBSFContext *ctx)
{
ExtractExtradataContext *s = ctx->priv_data;
+ ff_av1_packet_uninit(&s->av1_pkt);
ff_h2645_packet_uninit(&s->h2645_pkt);
}
static const enum AVCodecID codec_ids[] = {
+ AV_CODEC_ID_AV1,
+ AV_CODEC_ID_AVS2,
AV_CODEC_ID_CAVS,
AV_CODEC_ID_H264,
AV_CODEC_ID_HEVC,
projects / ffmpeg / blobdiff