From patchwork Thu Apr 13 09:44:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Liu X-Patchwork-Id: 41139 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp1111184pzb; Thu, 13 Apr 2023 02:46:04 -0700 (PDT) X-Google-Smtp-Source: AKy350Y5yPXrRvPNjNyDA4XQmyMqOlRZBBk3VnMsEUteYFlT9D4v2vv+fzvULBkzgCvDFOke/+SL X-Received: by 2002:a17:906:8043:b0:94a:959f:6d58 with SMTP id x3-20020a170906804300b0094a959f6d58mr2531414ejw.18.1681379164404; Thu, 13 Apr 2023 02:46:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681379164; cv=none; d=google.com; s=arc-20160816; b=L9L8Xy8MZSfB77LOLruvQcnLParRqO2qCVoUCPslkMc6V1uozYWkEHzTY1t/tTR6H7 TXFK7T5RU4NASJAw6yafr5sy/nxcSHVLowpGB8F9Ikfb57LYeELs2yti+BwV2/CWRJMl 6IHgrN4WxVpCSnA9ktedAXlMh12TXwh0yGyiGDID5W5XFyPrSU4fuoDFESpW40ReA0/F y2lLVI02dmzZQYqn0iNvyuc/LO/KKDFrvUL8EFjQ9Ic44j95BNul4GxZ/cotAOp2Iuiy flmdKzLQADmsC7oGx+rIdHiD0IBUcDOg7r18f/XdgGzTllPZtk+I2RXtW3ZYtPtptKxw hOHw== 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=p/bq/ozE/dwgJMzxwuD+9Q0720TUJx3MW4rWQw8gSic=; b=QEUQZS8bELnC/Hk4jYAlrVpWfPB/gEoKC9AKj6Ib4/0Roc4rc+1F2sKEqs2Gh50EiU WmsTIzV/fxiDvgJqwQGyFgCKP0FnpKdWx59rtNFMvh/6V3aDouYNkvjabMgUe7wmdeU0 5Cs3wy5dvXcjR3xKy6vK/7Ucnvgw9LFisjZBWHqxbVI9JzZEB2Y4WkiV2iqdWlaz8+u8 9BDRqbyMEi+Ya6nPnIGUdMi6H88JhJDvDplyOTt/N5s1KUGeJjeSVWjbRbsVpUuQILIJ 9IVsrOWNttCkHwxJS5MZj9v1ZbMAynXgP+RRRIPYwg4teKJhQUeKFdXFsv+PkhlNlowP 0dxQ== 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 gi15-20020a1709070c8f00b008e1cbdcd3d1si1613965ejc.97.2023.04.13.02.46.04; Thu, 13 Apr 2023 02:46: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 6B7DB68BD13; Thu, 13 Apr 2023 12:45:22 +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 189C868BD00 for ; Thu, 13 Apr 2023 12:45:19 +0300 (EEST) X-QQ-mid: bizesmtpipv601t1681379114t6of Received: from localhost ( [255.254.22.15]) by bizesmtp.qq.com (ESMTP) with id ; Thu, 13 Apr 2023 17:45:13 +0800 (CST) X-QQ-SSF: 01100000000000Z0Z000000A0000000 X-QQ-FEAT: 83ShfzFP0oDUDTLbHvbhynG9xQ5jp00ywVL3Zi9pYNQSrqthTOXu/f3gbRreQ vWbHgVSN//NWVxhtw+XZKmfQSbG2r7RJgUWycLNBqoc2xrwqZrvui/HI1yXG351lWizvtc4 MY4LTS2V6qIoo8mEZo2tl4kV870UgorMs1E/ta9VDSfbUx8nvxxgbzlHvv9dEsDCEVoN8M0 6kdCoJlsRj8Qw/Gp7OBZZ2B+grZ8nCb+y+HrIMqKMzxEhDQuhOYTDtkMKBzLrnTrYG7jRrw zzdyDRNH2ZuDkiXl/AQ/SdmjNfIDZHDbPr+ZJvSmbNsF22P+P2yTqQ0zsgUVaMq7hUk3SVu EjY8FFud5xJcJHO3AxzbeUM500CbkPkFiASN1acqRbJfDH691JLrsxlktzi9g== X-QQ-GoodBg: 0 X-BIZMAIL-ID: 11568931875665239399 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Apr 2023 17:44:40 +0800 Message-Id: <20230413094441.56225-6-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230413094441.56225-1-lq@chinaffmpeg.org> References: <20230413094441.56225-1-lq@chinaffmpeg.org> MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtpipv:chinaffmpeg.org:qybglogicsvr:qybglogicsvr2 Subject: [FFmpeg-devel] [PATCH v8 5/6] avformat/flvenc: support mux vp9 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: oJmUJI2JSakg Signed-off-by: Steven Liu --- libavformat/flvenc.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 7b43ecaefa..400dd3d573 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -29,6 +29,7 @@ #include "avio.h" #include "avc.h" #include "av1.h" +#include "vpcc.h" #include "hevc.h" #include "avformat.h" #include "flv.h" @@ -50,6 +51,7 @@ static const AVCodecTag flv_video_codec_ids[] = { { 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_VP9, MKBETAG('v', 'p', '0', '9') }, { AV_CODEC_ID_NONE, 0 } }; @@ -497,7 +499,7 @@ static void flv_write_codec_header(AVFormatContext* s, AVCodecParameters* par, i 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_AV1) { + || par->codec_id == AV_CODEC_ID_AV1 || par->codec_id == AV_CODEC_ID_VP9) { int64_t pos; avio_w8(pb, par->codec_type == AVMEDIA_TYPE_VIDEO ? @@ -543,9 +545,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) { + } else if (par->codec_id == AV_CODEC_ID_AV1 || par->codec_id == AV_CODEC_ID_VP9) { avio_w8(pb, FLV_IS_EX_HEADER | PacketTypeSequenceStart); - avio_write(pb, "av01", 4); + avio_write(pb, par->codec_id == AV_CODEC_ID_AV1 ? "av01" : "vp09", 4); } else { avio_w8(pb, par->codec_tag | FLV_FRAME_KEY); // flags avio_w8(pb, 0); // AVC sequence header @@ -556,6 +558,8 @@ static void flv_write_codec_header(AVFormatContext* s, AVCodecParameters* par, i 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 if (par->codec_id == AV_CODEC_ID_VP9) + ff_isom_write_vpcc(s, pb, par->extradata, par->extradata_size, par); else ff_isom_write_avcc(pb, par->extradata, par->extradata_size); } @@ -649,7 +653,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_AV1) { + par->codec_id == AV_CODEC_ID_AV1 || + par->codec_id == AV_CODEC_ID_VP9) { 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)); @@ -858,14 +863,15 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) 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 || par->codec_id == AV_CODEC_ID_AV1) + par->codec_id == AV_CODEC_ID_HEVC || par->codec_id == AV_CODEC_ID_AV1 || + par->codec_id == AV_CODEC_ID_VP9) 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_AV1) { + || par->codec_id == AV_CODEC_ID_AV1 || par->codec_id == AV_CODEC_ID_VP9) { 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))) { @@ -886,7 +892,8 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) 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 || par->codec_id == AV_CODEC_ID_AV1) { + par->codec_id == AV_CODEC_ID_HEVC || par->codec_id == AV_CODEC_ID_AV1 || + par->codec_id == AV_CODEC_ID_VP9) { if (pkt->pts == AV_NOPTS_VALUE) { av_log(s, AV_LOG_ERROR, "Packet is missing PTS\n"); return AVERROR(EINVAL); @@ -999,9 +1006,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) { + } else if (par->codec_id == AV_CODEC_ID_AV1 || par->codec_id == AV_CODEC_ID_VP9) { avio_w8(pb, FLV_IS_EX_HEADER | PacketTypeCodedFrames); - avio_write(pb, "av01", 4); + avio_write(pb, par->codec_id == AV_CODEC_ID_AV1 ? "av01" : "vp09", 4); } else { avio_w8(pb, flags); }