From 9a7bdb6d711c160734b498b6ba1a7b8fb6c230ec Mon Sep 17 00:00:00 2001 From: Xu Guangxin Date: Thu, 13 Aug 2020 14:51:02 +0800 Subject: [PATCH] avformat/av1dec: add low-overhead bitstream format It's defined in Section 5.2, used by netflix. Signed-off-by: James Almer --- Changelog | 1 + configure | 1 + libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/av1dec.c | 263 +++++++++++++++++++++++++++++++++++---- libavformat/version.h | 2 +- 6 files changed, 245 insertions(+), 24 deletions(-) diff --git a/Changelog b/Changelog index 0108f8f1a80..1efc768387b 100644 --- a/Changelog +++ b/Changelog @@ -13,6 +13,7 @@ version : - Cineform HD encoder - ADPCM Argonaut Games encoder - Argonaut Games ASF muxer +- AV1 Low overhead bitstream format demuxer version 4.3: diff --git a/configure b/configure index 8de1afcb998..d4a1fea9ce2 100755 --- a/configure +++ b/configure @@ -3331,6 +3331,7 @@ mxf_d10_muxer_select="mxf_muxer" mxf_opatom_muxer_select="mxf_muxer" nut_muxer_select="riffenc" nuv_demuxer_select="riffdec" +obu_demuxer_select="av1_frame_merge_bsf av1_parser" oga_muxer_select="ogg_muxer" ogg_demuxer_select="dirac_parse" ogv_muxer_select="ogg_muxer" diff --git a/libavformat/Makefile b/libavformat/Makefile index 610d43ca990..cbb33fe37c1 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -362,6 +362,7 @@ OBJS-$(CONFIG_NUT_DEMUXER) += nutdec.o nut.o isom.o OBJS-$(CONFIG_NUT_MUXER) += nutenc.o nut.o OBJS-$(CONFIG_NUV_DEMUXER) += nuv.o OBJS-$(CONFIG_AV1_DEMUXER) += av1dec.o +OBJS-$(CONFIG_OBU_DEMUXER) += av1dec.o OBJS-$(CONFIG_OGG_DEMUXER) += oggdec.o \ oggparsecelt.o \ oggparsedirac.o \ diff --git a/libavformat/allformats.c b/libavformat/allformats.c index b7e59ae170d..0aa9dd71988 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -293,6 +293,7 @@ extern AVOutputFormat ff_null_muxer; extern AVInputFormat ff_nut_demuxer; extern AVOutputFormat ff_nut_muxer; extern AVInputFormat ff_nuv_demuxer; +extern AVInputFormat ff_obu_demuxer; extern AVOutputFormat ff_oga_muxer; extern AVInputFormat ff_ogg_demuxer; extern AVOutputFormat ff_ogg_muxer; diff --git a/libavformat/av1dec.c b/libavformat/av1dec.c index 1be2fac1c10..3fa87643877 100644 --- a/libavformat/av1dec.c +++ b/libavformat/av1dec.c @@ -22,6 +22,7 @@ #include "config.h" #include "libavutil/common.h" +#include "libavutil/fifo.h" #include "libavutil/opt.h" #include "libavcodec/av1_parse.h" #include "avformat.h" @@ -70,6 +71,25 @@ static int read_obu(const uint8_t *buf, int size, int64_t *obu_size, int *type) return 0; } +//return < 0 if we need more data +static int get_score(int type, int *seq) +{ + switch (type) { + case AV1_OBU_SEQUENCE_HEADER: + *seq = 1; + return -1; + case AV1_OBU_FRAME: + case AV1_OBU_FRAME_HEADER: + return *seq ? AVPROBE_SCORE_EXTENSION + 1 : 0; + case AV1_OBU_METADATA: + case AV1_OBU_PADDING: + return -1; + default: + break; + } + return 0; +} + static int annexb_probe(const AVProbeData *p) { AVIOContext pb; @@ -123,19 +143,9 @@ static int annexb_probe(const AVProbeData *p) return 0; cnt += obu_unit_size; - switch (type) { - case AV1_OBU_SEQUENCE_HEADER: - seq = 1; - break; - case AV1_OBU_FRAME: - case AV1_OBU_FRAME_HEADER: - return seq ? AVPROBE_SCORE_EXTENSION + 1 : 0; - case AV1_OBU_TILE_GROUP: - case AV1_OBU_TEMPORAL_DELIMITER: - return 0; - default: - break; - } + ret = get_score(type, &seq); + if (ret >= 0) + return ret; temporal_unit_size -= obu_unit_size + ret; frame_unit_size -= obu_unit_size + ret; @@ -144,15 +154,14 @@ static int annexb_probe(const AVProbeData *p) return 0; } -static int annexb_read_header(AVFormatContext *s) +static int read_header(AVFormatContext *s, const AVRational *framerate, AVBSFContext **bsf, void *logctx) { - AnnexBContext *c = s->priv_data; const AVBitStreamFilter *filter = av_bsf_get_by_name("av1_frame_merge"); AVStream *st; int ret; if (!filter) { - av_log(c, AV_LOG_ERROR, "av1_frame_merge bitstream filter " + av_log(logctx, AV_LOG_ERROR, "av1_frame_merge bitstream filter " "not found. This is a bug, please report it.\n"); return AVERROR_BUG; } @@ -165,25 +174,32 @@ static int annexb_read_header(AVFormatContext *s) st->codecpar->codec_id = AV_CODEC_ID_AV1; st->need_parsing = AVSTREAM_PARSE_HEADERS; - st->internal->avctx->framerate = c->framerate; + st->internal->avctx->framerate = *framerate; // taken from rawvideo demuxers avpriv_set_pts_info(st, 64, 1, 1200000); - ret = av_bsf_alloc(filter, &c->bsf); + ret = av_bsf_alloc(filter, bsf); if (ret < 0) return ret; - ret = avcodec_parameters_copy(c->bsf->par_in, st->codecpar); + ret = avcodec_parameters_copy((*bsf)->par_in, st->codecpar); if (ret < 0) { - av_bsf_free(&c->bsf); + av_bsf_free(bsf); return ret; } - ret = av_bsf_init(c->bsf); + ret = av_bsf_init(*bsf); if (ret < 0) - av_bsf_free(&c->bsf); + av_bsf_free(bsf); return ret; + +} + +static int annexb_read_header(AVFormatContext *s) +{ + AnnexBContext *c = s->priv_data; + return read_header(s, &c->framerate, &c->bsf, c); } static int annexb_read_packet(AVFormatContext *s, AVPacket *pkt) @@ -251,12 +267,193 @@ static int annexb_read_close(AVFormatContext *s) return 0; } -#define OFFSET(x) offsetof(AnnexBContext, x) +typedef struct ObuContext { + const AVClass *class; + AVBSFContext *bsf; + AVRational framerate; + AVFifoBuffer *fifo; +} ObuContext; + +//For low overhead obu, we can't foresee the obu size before we parsed the header. +//So, we can't use parse_obu_header here, since it will check size <= buf_size +//see c27c7b49dc for more details +static int read_obu_with_size(const uint8_t *buf, int buf_size, int64_t *obu_size, int *type) +{ + GetBitContext gb; + int ret, extension_flag, start_pos; + int64_t size; + + ret = init_get_bits8(&gb, buf, FFMIN(buf_size, MAX_OBU_HEADER_SIZE)); + if (ret < 0) + return ret; + + if (get_bits1(&gb) != 0) // obu_forbidden_bit + return AVERROR_INVALIDDATA; + + *type = get_bits(&gb, 4); + extension_flag = get_bits1(&gb); + if (!get_bits1(&gb)) // has_size_flag + return AVERROR_INVALIDDATA; + skip_bits1(&gb); // obu_reserved_1bit + + if (extension_flag) { + get_bits(&gb, 3); // temporal_id + get_bits(&gb, 2); // spatial_id + skip_bits(&gb, 3); // extension_header_reserved_3bits + } + + *obu_size = leb128(&gb); + if (*obu_size > INT_MAX) + return AVERROR_INVALIDDATA; + + if (get_bits_left(&gb) < 0) + return AVERROR_INVALIDDATA; + + start_pos = get_bits_count(&gb) / 8; + + size = *obu_size + start_pos; + if (size > INT_MAX) + return AVERROR_INVALIDDATA; + return size; +} + +static int obu_probe(const AVProbeData *p) +{ + int64_t obu_size; + int seq = 0; + int ret, type, cnt; + + // Check that the first OBU is a Temporal Delimiter. + cnt = read_obu_with_size(p->buf, p->buf_size, &obu_size, &type); + if (cnt < 0 || type != AV1_OBU_TEMPORAL_DELIMITER || obu_size != 0) + return 0; + + while (1) { + ret = read_obu_with_size(p->buf + cnt, p->buf_size - cnt, &obu_size, &type); + if (ret < 0 || obu_size <= 0) + return 0; + cnt += ret; + + ret = get_score(type, &seq); + if (ret >= 0) + return ret; + } + return 0; +} + +static int obu_read_header(AVFormatContext *s) +{ + ObuContext *c = s->priv_data; + c->fifo = av_fifo_alloc(MAX_OBU_HEADER_SIZE); + if (!c->fifo) + return AVERROR(ENOMEM); + return read_header(s, &c->framerate, &c->bsf, c); +} + +static int obu_prefetch(AVFormatContext *s, uint8_t* dest) +{ + ObuContext *c = s->priv_data; + int size = av_fifo_space(c->fifo); + av_fifo_generic_write(c->fifo, s->pb, size, + (int (*)(void*, void*, int))avio_read); + size = av_fifo_size(c->fifo); + if (size > 0) { + av_fifo_generic_peek(c->fifo, dest, size, NULL); + } + return size; +} + +static int obu_read_data(AVFormatContext *s, AVPacket *pkt, int len) +{ + int size, left; + ObuContext *c = s->priv_data; + int ret = av_new_packet(pkt, len); + if (ret < 0) { + av_log(c, AV_LOG_ERROR, "Failed to allocate packet for obu\n"); + return ret; + } + size = FFMIN(av_fifo_size(c->fifo), len); + av_fifo_generic_read(c->fifo, pkt->data, size, NULL); + left = len - size; + if (left > 0) { + ret = avio_read(s->pb, pkt->data + size, left); + if (ret != left) { + av_log(c, AV_LOG_ERROR, "Failed to read %d frome file\n", left); + return ret; + } + } + return 0; +} + +static int obu_get_packet(AVFormatContext *s, AVPacket *pkt) +{ + ObuContext *c = s->priv_data; + int64_t obu_size; + int ret, type; + uint8_t header[MAX_OBU_HEADER_SIZE]; + + ret = obu_prefetch(s, header); + if (!ret) + return AVERROR(EOF); + + ret = read_obu_with_size(header, ret, &obu_size, &type); + if (ret < 0) { + av_log(c, AV_LOG_ERROR, "Failed to read obu\n"); + return ret; + } + return obu_read_data(s, pkt, ret); +} + +static int obu_read_packet(AVFormatContext *s, AVPacket *pkt) +{ + ObuContext *c = s->priv_data; + int ret; + + while (1) { + ret = obu_get_packet(s, pkt); + if (ret < 0) + return ret; + ret = av_bsf_send_packet(c->bsf, pkt); + if (ret < 0) { + av_log(s, AV_LOG_ERROR, "Failed to send packet to " + "av1_frame_merge filter\n"); + return ret; + } + ret = av_bsf_receive_packet(c->bsf, pkt); + if (ret < 0 && ret != AVERROR(EAGAIN) && ret != AVERROR_EOF) + av_log(s, AV_LOG_ERROR, "av1_frame_merge filter failed to " + "send output packet\n"); + if (ret != AVERROR(EAGAIN)) + break; + } + + return ret; +} + +static int obu_read_close(AVFormatContext *s) +{ + ObuContext *c = s->priv_data; + + av_fifo_freep(&c->fifo); + av_bsf_free(&c->bsf); + return 0; +} + #define DEC AV_OPT_FLAG_DECODING_PARAM + +#define OFFSET(x) offsetof(AnnexBContext, x) static const AVOption annexb_options[] = { { "framerate", "", OFFSET(framerate), AV_OPT_TYPE_VIDEO_RATE, {.str = "25"}, 0, INT_MAX, DEC}, { NULL }, }; +#undef OFFSET + +#define OFFSET(x) offsetof(ObuContext, x) +static const AVOption obu_options[] = { + { "framerate", "", OFFSET(framerate), AV_OPT_TYPE_VIDEO_RATE, {.str = "25"}, 0, INT_MAX, DEC}, + { NULL }, +}; +#undef OFFSET static const AVClass annexb_demuxer_class = { .class_name = "AV1 Annex B demuxer", @@ -277,3 +474,23 @@ AVInputFormat ff_av1_demuxer = { .flags = AVFMT_GENERIC_INDEX, .priv_class = &annexb_demuxer_class, }; + +static const AVClass obu_demuxer_class = { + .class_name = "AV1 low overhead OBU demuxer", + .item_name = av_default_item_name, + .option = obu_options, + .version = LIBAVUTIL_VERSION_INT, +}; + +AVInputFormat ff_obu_demuxer = { + .name = "obu", + .long_name = NULL_IF_CONFIG_SMALL("AV1 low overhead OBU"), + .priv_data_size = sizeof(ObuContext), + .read_probe = obu_probe, + .read_header = obu_read_header, + .read_packet = obu_read_packet, + .read_close = obu_read_close, + .extensions = "obu", + .flags = AVFMT_GENERIC_INDEX, + .priv_class = &obu_demuxer_class, +}; diff --git a/libavformat/version.h b/libavformat/version.h index 4d31e1ec3ee..aa309ecc773 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,7 +32,7 @@ // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 58 -#define LIBAVFORMAT_VERSION_MINOR 50 +#define LIBAVFORMAT_VERSION_MINOR 51 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ -- 2.39.2