[FFmpeg-devel] [PATCH v10 3/6] avformat/flvenc: support mux av1 in enhanced flv
Tristan Matthews
tmatth at videolan.org
Fri Jun 2 07:49:49 EEST 2023
On Mon, May 15, 2023 at 4:43 AM Steven Liu <lq at chinaffmpeg.org> wrote:
>
> Signed-off-by: Steven Liu <lq at chinaffmpeg.org>
> ---
> libavformat/Makefile | 2 +-
> libavformat/flvenc.c | 22 ++++++++++++++++++----
> 2 files changed, 19 insertions(+), 5 deletions(-)
>
> diff --git a/libavformat/Makefile b/libavformat/Makefile
> index 1ef3d15467..c868e1626c 100644
> --- a/libavformat/Makefile
> +++ b/libavformat/Makefile
> @@ -214,7 +214,7 @@ OBJS-$(CONFIG_FLAC_MUXER) += flacenc.o flacenc_header.o \
> OBJS-$(CONFIG_FLIC_DEMUXER) += flic.o
> OBJS-$(CONFIG_FLV_DEMUXER) += flvdec.o
> OBJS-$(CONFIG_LIVE_FLV_DEMUXER) += flvdec.o
> -OBJS-$(CONFIG_FLV_MUXER) += flvenc.o avc.o hevc.o
> +OBJS-$(CONFIG_FLV_MUXER) += flvenc.o avc.o hevc.o av1.o
> OBJS-$(CONFIG_FOURXM_DEMUXER) += 4xm.o
> OBJS-$(CONFIG_FRAMECRC_MUXER) += framecrcenc.o framehash.o
> OBJS-$(CONFIG_FRAMEHASH_MUXER) += hashenc.o framehash.o
> diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c
> index 35e198fa15..c1784b332d 100644
> --- a/libavformat/flvenc.c
> +++ b/libavformat/flvenc.c
> @@ -28,6 +28,7 @@
> #include "libavcodec/mpeg4audio.h"
> #include "avio.h"
> #include "avc.h"
> +#include "av1.h"
> #include "hevc.h"
> #include "avformat.h"
> #include "flv.h"
> @@ -48,6 +49,7 @@ static const AVCodecTag flv_video_codec_ids[] = {
> { AV_CODEC_ID_VP6A, FLV_CODECID_VP6A },
> { AV_CODEC_ID_H264, FLV_CODECID_H264 },
> { AV_CODEC_ID_HEVC, MKBETAG('h', 'v', 'c', '1') },
> + { AV_CODEC_ID_AV1, MKBETAG('a', 'v', '0', '1') },
> { AV_CODEC_ID_NONE, 0 }
> };
>
> @@ -491,7 +493,8 @@ static void flv_write_codec_header(AVFormatContext* s, AVCodecParameters* par, i
> FLVContext *flv = s->priv_data;
>
> if (par->codec_id == AV_CODEC_ID_AAC || par->codec_id == AV_CODEC_ID_H264
> - || par->codec_id == AV_CODEC_ID_MPEG4 || par->codec_id == AV_CODEC_ID_HEVC) {
> + || par->codec_id == AV_CODEC_ID_MPEG4 || par->codec_id == AV_CODEC_ID_HEVC
> + || par->codec_id == AV_CODEC_ID_AV1) {
> int64_t pos;
> avio_w8(pb,
> par->codec_type == AVMEDIA_TYPE_VIDEO ?
> @@ -537,6 +540,9 @@ static void flv_write_codec_header(AVFormatContext* s, AVCodecParameters* par, i
> if (par->codec_id == AV_CODEC_ID_HEVC) {
> avio_w8(pb, FLV_IS_EX_HEADER | PacketTypeSequenceStart); // ExVideoTagHeader mode with PacketTypeSequenceStart
> avio_write(pb, "hvc1", 4);
> + } else if (par->codec_id == AV_CODEC_ID_AV1) {
> + avio_w8(pb, FLV_IS_EX_HEADER | PacketTypeSequenceStart);
> + avio_write(pb, "av01", 4);
> } else {
> avio_w8(pb, par->codec_tag | FLV_FRAME_KEY); // flags
> avio_w8(pb, 0); // AVC sequence header
> @@ -545,6 +551,8 @@ static void flv_write_codec_header(AVFormatContext* s, AVCodecParameters* par, i
>
> if (par->codec_id == AV_CODEC_ID_HEVC)
> ff_isom_write_hvcc(pb, par->extradata, par->extradata_size, 0);
> + else if (par->codec_id == AV_CODEC_ID_AV1)
> + ff_isom_write_av1c(pb, par->extradata, par->extradata_size, 1);
> else
> ff_isom_write_avcc(pb, par->extradata, par->extradata_size);
> }
> @@ -843,13 +851,15 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt)
> if (par->codec_id == AV_CODEC_ID_VP6F || par->codec_id == AV_CODEC_ID_VP6A ||
> par->codec_id == AV_CODEC_ID_VP6 || par->codec_id == AV_CODEC_ID_AAC)
> flags_size = 2;
> - else if (par->codec_id == AV_CODEC_ID_H264 || par->codec_id == AV_CODEC_ID_MPEG4 || par->codec_id == AV_CODEC_ID_HEVC)
> + else if (par->codec_id == AV_CODEC_ID_H264 || par->codec_id == AV_CODEC_ID_MPEG4 ||
> + par->codec_id == AV_CODEC_ID_HEVC || par->codec_id == AV_CODEC_ID_AV1)
> flags_size = 5;
> else
> flags_size = 1;
>
> if (par->codec_id == AV_CODEC_ID_AAC || par->codec_id == AV_CODEC_ID_H264
> - || par->codec_id == AV_CODEC_ID_MPEG4 || par->codec_id == AV_CODEC_ID_HEVC) {
> + || par->codec_id == AV_CODEC_ID_MPEG4 || par->codec_id == AV_CODEC_ID_HEVC
> + || par->codec_id == AV_CODEC_ID_AV1) {
> size_t side_size;
> uint8_t *side = av_packet_get_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, &side_size);
> if (side && side_size > 0 && (side_size != par->extradata_size || memcmp(side, par->extradata, side_size))) {
> @@ -869,7 +879,8 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt)
> "Packets are not in the proper order with respect to DTS\n");
> return AVERROR(EINVAL);
> }
> - if (par->codec_id == AV_CODEC_ID_H264 || par->codec_id == AV_CODEC_ID_MPEG4 || par->codec_id == AV_CODEC_ID_HEVC) {
> + if (par->codec_id == AV_CODEC_ID_H264 || par->codec_id == AV_CODEC_ID_MPEG4 ||
> + par->codec_id == AV_CODEC_ID_HEVC || par->codec_id == AV_CODEC_ID_AV1) {
> if (pkt->pts == AV_NOPTS_VALUE) {
> av_log(s, AV_LOG_ERROR, "Packet is missing PTS\n");
> return AVERROR(EINVAL);
> @@ -982,6 +993,9 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt)
> if (par->codec_id == AV_CODEC_ID_HEVC) {
> avio_w8(pb, FLV_IS_EX_HEADER | PacketTypeCodedFramesX); // ExVideoTagHeader mode with PacketTypeCodedFramesX
> avio_write(pb, "hvc1", 4);
> + } else if (par->codec_id == AV_CODEC_ID_AV1) {
> + avio_w8(pb, FLV_IS_EX_HEADER | PacketTypeCodedFrames);
For this and all the other instances of writing the EX_HEADER bytes,
given that in the spec it specifies:
> isExHeader | FrameType UB[4]
where FrameType is in this context either keyframe (1) or inter frame
(2), shouldn't this be something like:
avio_w8(pb, FLV_IS_EX_HEADER | PacketTypeCodedFramesX | is_keyframe?
FLV_KEY : FLV_INTER);
?
Best,
-t
More information about the ffmpeg-devel
mailing list