From patchwork Thu Apr 13 06:29:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Liu X-Patchwork-Id: 41130 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp1013664pzb; Wed, 12 Apr 2023 23:30:05 -0700 (PDT) X-Google-Smtp-Source: AKy350aPhVGH1O+U5LgGoF86MDiLlSCJeMGWc4AxFlmVOtKgbxoLBCDOM6/fVZHauJLvev33nGk7 X-Received: by 2002:a17:906:a185:b0:94d:cebe:691 with SMTP id s5-20020a170906a18500b0094dcebe0691mr1369167ejy.69.1681367404956; Wed, 12 Apr 2023 23:30:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681367404; cv=none; d=google.com; s=arc-20160816; b=OD0vBBx6tcvWftPsT+EkQC7dvypnG2KDPxYGL46fh8885PCefuPW3NBbEfn7d2Ros8 aFaKDTYbGJ66lJXwlavK4LJie40Xw4FVKyx0vGkBNxPOKundo2uOUwqzN4IAglDbswU4 4KpSpYPQL/iRAclNaAOlq+L4Omi5xo/vpzNYTEue4xYyXb56B6ILbqraM+IiNieTV6Jw 7JdScs6H/r5Ibiu+ST/8qGjQmJd7InDpuShsS+RWP5PW6Eu+Fq7EJmR5PImtfO4CpVFK N9PoE1oTAuMHXJSC0pvZHd20dgRBIn700aGiGdB2sCIgjj8K7bFqRmEpdeDSt9RNwkWF AL+A== 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=8tb7rA4fPKlhapAzB+dI3FqOJWG1q+qMH7MV6qDi70U=; b=HMWCpTwtuMXWiOSJvweX1TvPVHvQDS6Kh9enERPcltl5o1A2T+LpRdNJl3TDZw5N8e 0ASzGkJYvoRcfWiztn3kV2KM4HQs9W8bWkjJfzbjfdNwy34DlO8VmCnj/Y8uB7tL4Lmy KIIuijMgCi/mfcIkoKXJ0X8/yUp8cwcsdakz88rfHMA7GQxMhYx3+6RIO6yXtZSyJZ9Y XLkXiwGNIeKC6azWg11RE1saIZgesq5JeudDKCW43ZiRBu20PFcJLpeeuU827YXcg4u5 I0ODSytX6lX5kwtMOzBLva8+Roq8iWMR0xoMkMNbm8yvPUQIMzRj0bPuKS5O4TzZ/jM3 5H+g== 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 fe24-20020a1709072a5800b0094e4c2fbb2bsi1089104ejc.656.2023.04.12.23.30.04; Wed, 12 Apr 2023 23:30:04 -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 2E44B68BBE3; Thu, 13 Apr 2023 09:29:46 +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.155.67.158]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 946B068BAEC for ; Thu, 13 Apr 2023 09:29:38 +0300 (EEST) X-QQ-mid: bizesmtpipv603t1681367373tpl2 Received: from localhost ( [255.62.16.15]) by bizesmtp.qq.com (ESMTP) with id ; Thu, 13 Apr 2023 14:29:32 +0800 (CST) X-QQ-SSF: 01100000000000Z0Z000000A0000000 X-QQ-FEAT: G46xFj+wOV+Pt1dQZ7GmbHd6Gy5X+ltzEr/2ah4tJEwmMe/ogNQjGTkdwJrdS 5gfwv5uZ3rJMRSLLhe2tGJHzPe0kFe9KLKchsqSlFsMJ2LtaUp7PjtSpHsx8DuBIOmOepJb NZbCK5oqIUYJ31C7jDpQ5TfH+r4BsUPqYg0QEZtmJGXI8YfV/4RANgbyi/6ropM3IKdfO4P gm8h908SwHicSsubnbyFjP6uQLpbEpHS8+OEAihn0o5pQdoto/eNIQJvF5+Ula5yY9v7kmY 4cSFulcR2mGjPgnuklvGbCoz5aPmT7v/Wt3v24UQ/1CjP/+79hKN53srARZ/ipq9r8bC/tI zYQtahc3PyMc5Y0HJ8YLlsxKZ9MzO55i+Eni1xaVR/ApdLlN3Q= X-QQ-GoodBg: 0 X-BIZMAIL-ID: 6505279366245678992 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Apr 2023 14:29:18 +0800 Message-Id: <20230413062919.3501-3-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230413062919.3501-1-lq@chinaffmpeg.org> References: <1f4144d9-484e-43e1-958c-99b24e931907@app.fastmail.com> <20230413062919.3501-1-lq@chinaffmpeg.org> MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtpipv:chinaffmpeg.org:qybglogicsvr:qybglogicsvr2 Subject: [FFmpeg-devel] [PATCH v7 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: PEIThAL645MH Signed-off-by: Steven Liu --- libavformat/flvenc.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 57a26245ff..7b43ecaefa 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 } }; @@ -494,7 +496,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 ? @@ -540,6 +543,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 @@ -548,6 +554,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); } @@ -640,7 +648,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)); @@ -848,13 +857,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))) { @@ -874,7 +885,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); @@ -987,6 +999,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); + avio_write(pb, "av01", 4); } else { avio_w8(pb, flags); }