From patchwork Fri Jun 2 07:31:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Liu X-Patchwork-Id: 41945 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51c:b0:10c:5e6f:955f with SMTP id gm28csp1037076pzb; Fri, 2 Jun 2023 00:32:17 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5mfHWEZlCB9uLyfBhVVs6nh42I2Z9PeCYVQFdIZJB6yMy3xE7s39KpGkCP+PDNUV7qc5pu X-Received: by 2002:a05:6402:1513:b0:50b:fb29:1d8f with SMTP id f19-20020a056402151300b0050bfb291d8fmr1407894edw.0.1685691137585; Fri, 02 Jun 2023 00:32:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685691137; cv=none; d=google.com; s=arc-20160816; b=eH7X3MYAZaGs0qfAy/ilHj768tSdxARelE1h6H779uVmvfU/x04Kvmj/76Fa6Tmcog vzV7FIz7fCAhaAI+hv6IqoNawXH2eLvyJ6gaYJFbWAWLu0Hb1R6Icd6Wri4sx9YzewOf xQbzPQqb0tMeOHr26bxs3Qo+5hYy6/A89VyQ0EwcrLUopcLNOOhqi2+cpb9yD5/itSiL Ui4uO/pWiVrYcaMvkAZGQplf+3iRnXWPTy29D/3rdxc/+u6wgq7a6+LBoj4mUXxpJzZR d6AsH+H/BUsHrqm8m/6t/M7TIPxC4U2FaYg2SuqhAmNFtW4n69kV6vcKOH3sXkt7ZvMA Mixg== 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=J5hIt8/6l7983HWQOAGA1qy6mjWmMWu6DJ2RZRfJeuQ=; b=UOT8EvukgegGXDPHgjiaXIZBtH9IZtD/x6+Wkk4BNpKyG5h1k0R2XAAxVXEsCRKwmZ 2zCecH+p+/uW2EY58d+EbnxBEmjzDxRDsseaY84WqM60XTjJ5/9mOLMPnQVw877rbMeA pGbWKLW3ayhTht7uSIFOCKMzc9jyd2NOfrwSfSxb5GfggZM0o1rwQZYpsKi/dh4Db8fq oYiVmRTUUKcdfq0yIqbRXwm7jgctWWeLou3WX7C01BGCn7ImBGPM8YblO9+omUyrELns bgBN9JQVLElnqUsmw+eBfUH90Q148HIlayIibbfC0olZE/yGJtHpnukr7OWUSQDkIpxz +gMg== 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 s11-20020a056402164b00b005148f905f6dsi433324edx.564.2023.06.02.00.32.17; Fri, 02 Jun 2023 00:32:17 -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 13FA868C30E; Fri, 2 Jun 2023 10:31:42 +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.54.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6E21568C300 for ; Fri, 2 Jun 2023 10:31:40 +0300 (EEST) X-QQ-mid: bizesmtp62t1685691095t0qjz4km Received: from localhost ( [103.102.203.204]) by bizesmtp.qq.com (ESMTP) with id ; Fri, 02 Jun 2023 15:31:34 +0800 (CST) X-QQ-SSF: 01100000000000Z0Z000000A0000000 X-QQ-FEAT: RiweTmIJF2y37gZyCrFo/xKLlElkDhYStzx1tXs13VtDXpg1vtofeP6I1hrV0 Dp6lgEUGbFOxPZG2AGP6miY2CPDiiKgkucsEx4I3/Tq4ujcUpsNoBi+iczYFzJAy/WXyD9U GBPFKCRF/iiHm/7lK3D7XkUk5gpdZLiUXYdkyWCHCiJADRfIUTIjX8PKLfD+BsTSQXKg5QF qIrA9aX/whaJdUx+pc54Ai0fQrxbrNQNG1hkPQ23vHo64S/VsKexfRcFEaIWAmHI1IYgsyw hv1GICzwubaHDBf/bHz44lxdfKT+mcqn4jTufvQDUVFc6Y1BfrAR5FnExiOhZTst71vmzD+ NvJTYHok8qwlLqZ2VwhJfp02GOSL9vO7vjR71zWPiVg8lPN4Sc= X-QQ-GoodBg: 0 X-BIZMAIL-ID: 6060675510155652480 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Fri, 2 Jun 2023 15:31:07 +0800 Message-Id: <20230602073109.14086-5-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230602073109.14086-1-lq@chinaffmpeg.org> References: <20230602073109.14086-1-lq@chinaffmpeg.org> MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybglogicsvrsz:qybglogicsvrsz3a-3 Subject: [FFmpeg-devel] [PATCH v11 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: 4Dt+v+kVUImK 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 c8e6cadf1c..a0362ff11c 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 && stream_type == FLV_STREAM_TYPE_VIDEO) { 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) {