From patchwork Fri May 12 03:58: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: 41593 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp5097307pzb; Thu, 11 May 2023 21:00:03 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4ubpLcVxcZB3NNYK2qe6liRZRpSEb20AJB7yOzkp/otYNYzf+MvrEEvWEhPQp5aCDmpGZV X-Received: by 2002:aa7:ca46:0:b0:50d:8991:d1b9 with SMTP id j6-20020aa7ca46000000b0050d8991d1b9mr17752416edt.8.1683864003189; Thu, 11 May 2023 21:00:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683864003; cv=none; d=google.com; s=arc-20160816; b=UR3rfKXsbqYGUg6bCruH+NTKWqtI+PpggIM36sowuqN2gJ5DpoGEWdZxY90P4hSaLC MMzCNMvKPTzQb/bU8cSn4ehaoObkyylqP33U9B13+UwpnjTz6/cj3yPMVDz3rm685Lse /zjJjniiUgtAXCEywyOMklfRfplhLYIukoB901ilD4y/a9pcrj/g0rc8+p9+bLIdO+xu tKzSqT5hzDssdfjvtHAxzUV3Uqm2NZiMpBr2gqOLJhlbk42JxW3A+FLKKN2bjZHM3uZ1 MUQWOMaHHpJAuJGqAkR/WIehEs5/X5/4hgUP6D+4z2EEGk2qBFn5fhVZai2tFWADg5he gzRw== 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=JqqeZD3BpLnv7LcANpNbkPicf1mFNzlCEKYbRNmMwy/3Yg3XuUK5xS3tjY1NY5HmTo lxwMOK7SSRMeFHS2j1J+jCtRdHty3LOWFB3+ES/rvkHdpAf7qWE+zOpzTEYnWO4FaTad K/fq94BdeoMidZTz+MPEP8I5L4K3BuWHkDxKyevLRv7T/G6OuaumBYBkVFXbVVLzuxV8 x2E6tTUfNPMsEgl78YVl9pmii/r/l92VOyL7m6r8N8gwy16v25Sxfei1rUoPNZDnsGlG 6hBRm7GoCGfBOPUbZE7TAWtIKLoF0T2tJJWFW9h+3FIju7XefNk1DUdEqntIP4N7gAiA Ofhw== 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 ba29-20020a0564021add00b00504ae1b658dsi5613257edb.490.2023.05.11.21.00.02; Thu, 11 May 2023 21:00:03 -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 A012268C19C; Fri, 12 May 2023 06:59:48 +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 56AAF68C199 for ; Fri, 12 May 2023 06:59:41 +0300 (EEST) X-QQ-mid: bizesmtp71t1683863975tu6mh6wh Received: from localhost ( [103.102.203.204]) by bizesmtp.qq.com (ESMTP) with id ; Fri, 12 May 2023 11:59:33 +0800 (CST) X-QQ-SSF: 01100000000000Z0Z000000A0000000 X-QQ-FEAT: 7jw2iSiCazoEvWKWDupEN9pe2Gy7Q1qP1vcMLMRfoUe7r+a7D1o0DYrwnvpPg Mi9fL2oGY/WWw+k6CW/3Fp0sTMFHORDqYeLZcMQcvGZoX55e8EoWXRa1RbV45JgVqobvjLI UTVJ8MnVF1ehaEmO1ETLiK73bas6SfKL71h5uldHqvLQyQQKK+rIVCSTTITfHp5y0qfyH/3 etk8KoWDG+igGfT+03AVXnTvXYchEZz5g4EmgqCYFyD7MaC8+OSkm5Htyxj3viHoFuB9HCL ROnwOhtS5FvtAqDVemiE0kDJM03abPYzgyGJZ0h+6D8MUXX1Kf8I16C/MGVdP8NvU261S6Q CegK8r5Dcv8l2HyjLBVBeL09DlhiTasEjvDQHfD X-QQ-GoodBg: 0 X-BIZMAIL-ID: 1692691690689332665 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Fri, 12 May 2023 11:58:59 +0800 Message-Id: <20230512035901.22731-5-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230512035901.22731-1-lq@chinaffmpeg.org> References: <20230512035901.22731-1-lq@chinaffmpeg.org> MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybglogicsvrsz:qybglogicsvrsz3a-3 Subject: [FFmpeg-devel] [PATCH v9 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: sqS9fVVpoXMS 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) {