From patchwork Wed Apr 12 07:30:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 41113 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp278488pzb; Wed, 12 Apr 2023 00:31:45 -0700 (PDT) X-Google-Smtp-Source: AKy350Yx1kweL7iESpjN1HOyawpdlZ3GLEqc975tSGzEP6n+Oum1vuJ8H5pZ27lFwHDS2VEUAKzV X-Received: by 2002:aa7:d985:0:b0:504:9b7e:1e5a with SMTP id u5-20020aa7d985000000b005049b7e1e5amr4208045eds.40.1681284705438; Wed, 12 Apr 2023 00:31:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681284705; cv=none; d=google.com; s=arc-20160816; b=Sz0Gc/79X7vzdXsDnhQ/REVb/s9E4+Ddo9oT85BIwE+DX6oau6wZh2ec2DQjTpItfE 5Udi8lFSGHHaiwVYC6t8PrnzpZaMs/hcfU/9aH14+DRQIsVYKOB27YnccpINeHdfXWEH XlRI+pcV98hpJQaEYK0I2Sw9WnkvHrMn5gVh0pGbRG06+rn6JeE2ANm4Ka2FBneHVTXt HSEq4hb9rVUawnUv8zN/mHbEvuIo7GV5IQdo7mWQg81DHFfVUTjFJztj6PZOjan+aCe1 M2JxNfBIftcCSPYEbk/ENktva/aJSmUgKXOVJRyJ+Dpuh7ss2tXKQSOnf9xAuNkIYcIe JrGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:feedback-id:mime-version:references :in-reply-to:message-id:date:to:from:delivered-to; bh=xFHK+q7CsRM9eMOFR0DvWadvEoI43B9Km/87Zfav0+A=; b=QsJkjV8pUYk9Bl38p9i9cD+wW+Oh0kfJ73apmT+cUTLjFkMMXsUjkZbMxM0oi/S/QN 84MGHWE2Qe4SfPBEoXvdT/OeGD5MpuCajNOflzofKjyYjSFp2QU+BHBrE4agTzJ5PWRU F3I+PYgBYloE0fAvAxqX7ZDFr+JtHVEcUhT+ZrEO3Eu7ECudE+GZmHuFv1PcBw7x4AKW G8xQECmp7yBuRNwrJfdftL0SJ8bxpC1/5EI1yf+pmaKjfBhH5BLWb45NvYolRPd2PMrS vmCrJY/7QOqurXckmvjyAAbHBk/xTOPPFb5darW/R90/Db8ZRnK1fk+lo97FQpuc7vBX AjgA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q4-20020aa7da84000000b0050504d2df36si778131eds.400.2023.04.12.00.31.45; Wed, 12 Apr 2023 00:31:45 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7AF7868BAEC; Wed, 12 Apr 2023 10:31:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from bg4.exmail.qq.com (bg4.exmail.qq.com [43.154.221.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C4DE168AF6B for ; Wed, 12 Apr 2023 10:31:22 +0300 (EEST) X-QQ-mid: bizesmtp62t1681284676tf2nywsb Received: from localhost ( [103.107.217.225]) by bizesmtp.qq.com (ESMTP) with id ; Wed, 12 Apr 2023 15:31:14 +0800 (CST) X-QQ-SSF: 01100000000000Z0Z000000A0000000 X-QQ-FEAT: XBN7tc9DADJeq5xJNeXjOmUoPojzj1yHZhRRJUFlmBARmvwu0nL/ZIgmaLF2M DqFZpgIhWwGpBzcR02RXr+QM//ONCXL6dQCHQ5hBeaQY5sFA/9kHobAsAKSKI819ubf1ZJq ifRRnPH4VaSUcr/stsCClfNZ8xuM5xj5sWasujkDTRvPHTrEA7Fs1JYidEUytveWEv46MT7 eD2SvhKMD6devuQxO5lYYjAhRhcn1Z+/kRFh3ATWY0U4ZB45qfMP0vJ1aRtBDznOwnCKOs9 q7nnmye3aqHUdnvWB7dHWen1nT6z0AVd+PNTBfp5hXz7UByqc9s/d3XVMx0tYFj73bpqrkN T56E48ikwoFgOkcj4/7kLi0SrYzcO/0Qn3Wc4zqZkoePp15ODdi7KhKFMQahw== X-QQ-GoodBg: 0 X-BIZMAIL-ID: 18280013036996905866 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Apr 2023 15:30:59 +0800 Message-Id: <20230412073100.53743-3-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230412073100.53743-1-lq@chinaffmpeg.org> References: <20230412073100.53743-1-lq@chinaffmpeg.org> MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybglogicsvr:qybglogicsvr2 Subject: [FFmpeg-devel] [PATCH v6 3/4] avformat/flvenc: support mux av1 in Enhanced FLV X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Steven Liu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 7WKMrBO6A2gV Signed-off-by: Steven Liu --- libavformat/flv.h | 1 + libavformat/flvenc.c | 32 ++++++++++++++++++++++++++------ 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/libavformat/flv.h b/libavformat/flv.h index 44d3b04ff9..398a958e60 100644 --- a/libavformat/flv.h +++ b/libavformat/flv.h @@ -117,6 +117,7 @@ enum { FLV_CODECID_REALH263= 8, FLV_CODECID_MPEG4 = 9, FLV_CODECID_HEVC = 10, + FLV_CODECID_AV1 = 11, }; enum { diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 620ad08ca1..b570fa91be 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, FLV_CODECID_HEVC }, + { AV_CODEC_ID_AV1, FLV_CODECID_AV1 }, { AV_CODEC_ID_NONE, 0 } }; @@ -251,6 +253,11 @@ static void put_eos_tag(AVIOContext *pb, unsigned ts, enum AVCodecID codec_id) avio_w8(pb, FLV_IS_EX_HEADER | PacketTypeSequenceEnd); avio_write(pb, "hvc1", 4); flvtag_size = 19; + } else if (codec_id == AV_CODEC_ID_AV1) { + avio_w8(pb, FLV_IS_EX_HEADER | PacketTypeSequenceEnd); + avio_write(pb, "av01", 4); + flvtag_size = 19; + } else { avio_w8(pb, tag); avio_w8(pb, 2); /* AVC end of sequence */ @@ -502,7 +509,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 ? @@ -548,6 +556,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 @@ -556,6 +567,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); } @@ -648,7 +661,8 @@ static int flv_init(struct AVFormatContext *s) if (par->codec_id == AV_CODEC_ID_MPEG4 || par->codec_id == AV_CODEC_ID_H263 || - par->codec_id == AV_CODEC_ID_HEVC) { + par->codec_id == AV_CODEC_ID_HEVC || + par->codec_id == AV_CODEC_ID_AV1) { int error = s->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL; av_log(s, error ? AV_LOG_ERROR : AV_LOG_WARNING, "Codec %s is not supported in the official FLV specification,\n", avcodec_get_name(par->codec_id)); @@ -806,7 +820,7 @@ end: FLVStreamContext *sc = s->streams[i]->priv_data; if (par->codec_type == AVMEDIA_TYPE_VIDEO && (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_HEVC || par->codec_id == AV_CODEC_ID_AV1)) put_eos_tag(pb, sc->last_ts, par->codec_id); } } @@ -857,13 +871,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))) { @@ -883,7 +899,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); @@ -996,6 +1013,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 | PacketTypeCodedFrames); // ExVideoTagHeader mode with PacketTypeCodedFrames avio_write(pb, "hvc1", 4); + } else if (par->codec_id == AV_CODEC_ID_AV1) { + avio_w8(pb, FLV_IS_EX_HEADER | PacketTypeCodedFrames); + avio_write(pb, "av01", 4); } else { avio_w8(pb, flags); }