From patchwork Thu Apr 13 09:44:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 41137 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp1111019pzb; Thu, 13 Apr 2023 02:45:45 -0700 (PDT) X-Google-Smtp-Source: AKy350bWyR2n6AvvAKEz4xBYXGSlI+B5K150rkLNdEWg4qS/n/RzgBqs7ugJ/HE/ZApUbk7OeJeO X-Received: by 2002:a17:906:8e8e:b0:93e:5baa:d443 with SMTP id ru14-20020a1709068e8e00b0093e5baad443mr2014348ejc.63.1681379144702; Thu, 13 Apr 2023 02:45:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681379144; cv=none; d=google.com; s=arc-20160816; b=qnyiTjjddH6a5UnZOZF8vyJc0GjHfJC7PtCUQBbEXJjaAj27uYocXqBB5CcLiH+Uun yWQ5OGpjPgAbD9LdPMLgXl8SZ6z8VZgKiUXwcVz0Af/bX+NK4Xk84loOFEeIEQBow1v0 ymDWmTkH1XH4sWDs9i0HgHaY3tsjOIhMcQtjwTknvvcptUeLNb3t2smNAbYbllhNj3f9 VmRelpVQ25x9xgZzHqYZtTYM7IaSIEoIPgLp8VzYLpD8s+8SRyo/A2G/6F39QnCs9V+Q n88vRDSRkZrspOIDu+wA/2I4C3BiRXeO7zUPialOf85E66AlKqvp/+N4H/nkbktXHfAm BpNg== 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=yJrCxPMfVuyEZymV25aZK3P7/Im0Qjv0K6oDot+7Rd4=; b=xiwnNojerlqnXShnPVi1QHHHuJd6keV2SQIStSyVhLsn6zkKhE50GWKRQM85csLCa8 N+v2FE795mAuSGXhdlO/cCPJ9Iv1eZwM79+IVTTSpnWOSSiA1B5749aPvHVhlmxBCUez XiixRIVPiKhYPn9lFj5ggIu17lBTqW6JfKYCQ9QHpByXOrFbnfXKWL0rMmMpisGj+tY9 rXMksCr7k6+iJQfqETacTS1tiqCZx9bGxPTk6U9tnRnkVgS0rb+GyG8ahJowgSVW+luQ 2vva8TR8q2W6I5YfS2jFQU7cHg2KwARSgMCeXX/smWflbWmpchOhmxTnmtZU9lBDb6YO MBdA== 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 kb19-20020a170907925300b00947c7226bc6si1436040ejb.150.2023.04.13.02.45.44; Thu, 13 Apr 2023 02:45:44 -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 4976068BCC3; Thu, 13 Apr 2023 12:45:19 +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 4326568BCBF for ; Thu, 13 Apr 2023 12:45:15 +0300 (EEST) X-QQ-mid: bizesmtpipv603t1681379110t0do Received: from localhost ( [255.254.22.15]) by bizesmtp.qq.com (ESMTP) with id ; Thu, 13 Apr 2023 17:45:09 +0800 (CST) X-QQ-SSF: 01100000000000Z0Z000000A0000000 X-QQ-FEAT: M0bc4q6Ne4vs1ymRvHq53jn4Fe2GJXJarkB76WhnU0C0hlmZKbn7TsO8YWWcd KHAvCCwLvBZ4CHsPusKJDB2PvqjHhdl12q99fCXaYFU2V7Koh3+cfOq5x2Nitqar16xo8Gh Uv4PogbOUAyM4Am3CD3tsq64XufxsTHBVcpQPDFJifQzGiJq3+DiyzUgOR3cM2UB6ucY5xc g1SOfIVXgMcbzlfDsnYjUvowukSGIoYeB27o6h4Bqu4oN3zIO5+OeHE2CsEXfC3sDksfZsP gThMl70dWinlE/7FReeJP7ia5sB3kbNsOQzehBZ/ExFCW/N/qZJrMaqj1KxGpjPdf2YMWeC cTo1RIcZhT8Vyodk7mKWuLTPHwZK4q5bF0c+mOS+H3SrhP6amE= X-QQ-GoodBg: 0 X-BIZMAIL-ID: 9907064926686496026 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Apr 2023 17:44:39 +0800 Message-Id: <20230413094441.56225-5-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 4/6] avformat/flvdec: support demux 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: nDPkJ7c8vyiY Signed-off-by: Steven Liu --- libavformat/flvdec.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 6a1e6e7ff0..98a2231559 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -318,6 +318,8 @@ static int flv_same_video_codec(AVFormatContext *s, AVCodecParameters *vpar, int switch(codec_id) { case MKBETAG('h', 'v', 'c', '1'): return vpar->codec_id == AV_CODEC_ID_HEVC; + case MKBETAG('a', 'v', '0', '1'): + return vpar->codec_id == AV_CODEC_ID_AV1; default: break; } @@ -359,6 +361,10 @@ static int flv_set_video_codec(AVFormatContext *s, AVStream *vstream, par->codec_id = AV_CODEC_ID_HEVC; vstreami->need_parsing = AVSTREAM_PARSE_HEADERS; return 4; + case MKBETAG('a', 'v', '0', '1'): + par->codec_id = AV_CODEC_ID_AV1; + vstreami->need_parsing = AVSTREAM_PARSE_HEADERS; + return 4; default: break; } @@ -1278,7 +1284,8 @@ retry_duration: if (st->codecpar->codec_id == AV_CODEC_ID_AAC || st->codecpar->codec_id == AV_CODEC_ID_H264 || st->codecpar->codec_id == AV_CODEC_ID_MPEG4 || - st->codecpar->codec_id == AV_CODEC_ID_HEVC) { + st->codecpar->codec_id == AV_CODEC_ID_HEVC || + st->codecpar->codec_id == AV_CODEC_ID_AV1) { int type = 0; if (flv->exheader) { type = flags & 0x0F; @@ -1309,7 +1316,8 @@ retry_duration: } } if (type == 0 && (!st->codecpar->extradata || st->codecpar->codec_id == AV_CODEC_ID_AAC || - st->codecpar->codec_id == AV_CODEC_ID_H264 || st->codecpar->codec_id == AV_CODEC_ID_HEVC)) { + st->codecpar->codec_id == AV_CODEC_ID_H264 || st->codecpar->codec_id == AV_CODEC_ID_HEVC || + st->codecpar->codec_id == AV_CODEC_ID_AV1)) { AVDictionaryEntry *t; if (st->codecpar->extradata) {