From patchwork Fri Jun 2 07:31:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 41947 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51c:b0:10c:5e6f:955f with SMTP id gm28csp1037221pzb; Fri, 2 Jun 2023 00:32:35 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6vcp0ImuMY8qXl5XGUY3zGlPCzIdeoVLWriwY6HyKVe6BaNsa36Votq45JA1PXoDfKSlju X-Received: by 2002:a05:651c:101:b0:2ad:8380:770d with SMTP id a1-20020a05651c010100b002ad8380770dmr1068142ljb.21.1685691154988; Fri, 02 Jun 2023 00:32:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685691154; cv=none; d=google.com; s=arc-20160816; b=mMf5hf1PsdsDw2iU+XkHRfRots3T8LelVEQo4TemXbghpsf9zTDhyNMSYHw5ZRlmwG Ff6TePeKTaxQDSvhE37BVgHmCmIiNZDpQMflQGq18jdm0ZVY246SZ0gtogb/gNj1L9FJ dSrgzwPHEACHawbI786JO7sc2e9WUsFzExUYkDcH9+maxdh+VaqOlBnW/0rZmahdp9jg DIrfVS20mAIZtLYPdxLmSOOXcsoj4wrMJOqek4V/Fe4mW9iiN602WBjZ+GCf0Au5JAkc IgdfPtAxDaoNGTVkJPeEQfFTjtFESQ920BrNpYyAksb53VV4qLSbJ1hIfThI2h/AwYEx DJWA== 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=JCKfqtynP85UyN4OG5PQuC2GOM45EC75rPa/TN9Pkis=; b=ckCN3j6Sf91IRAkaDdn1TtroZLQIvIR2Fg7RKaE23kUn73iTxw8s2le3vveT0YG2JK Qjm/0OvYUnHxFmzIxEAzWraWFXk1PNZxr89KB3omc6K+kkToDe5WAxUTsldDnK+hEzR9 JJ0PkMIJwzCQvXS8sqwFzxrjnNYyE8Xx5LOZVhPkkyHuel1rWumkZhrzOMlBSjfzQ9hz TCkWwCLyLPIzSeSQnix0NY1mybU3iGQtKdgCzq0pXr1ZxZHv6b2tgH6WCjvyfrAjKKyF k4lsnyRepI7rfWwOXqiKq7DpYsNfUnMOWAXKusUak6vZs2vQjl83Uw9uVB964aAPJPqT 0+sg== 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 h13-20020aa7c60d000000b0050bc45d5813si424305edq.237.2023.06.02.00.32.34; Fri, 02 Jun 2023 00:32:34 -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 21C6A68C2E2; Fri, 2 Jun 2023 10:31:53 +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.65.254]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 36F6768C2DA for ; Fri, 2 Jun 2023 10:31:50 +0300 (EEST) X-QQ-mid: bizesmtp76t1685691106tn8f4l2w Received: from localhost ( [103.102.203.204]) by bizesmtp.qq.com (ESMTP) with id ; Fri, 02 Jun 2023 15:31:45 +0800 (CST) X-QQ-SSF: 01100000000000Z0Z000000A0000000 X-QQ-FEAT: 4lisvO5/zj9hdnVJeNqvypPoR39Rraih2Z0eQ7+iHOIJjZZDFY/07p4aeNAb/ 1N5qgfZRpO9MiTwfBbNHHOioIST0LjDfwbQ2Ln/Z5JMKfgQDdKwIZRBRyHzeX601PHpJnW2 Ds6ePRjulL+cJr4YBTzMrkSgpnpd4BPOugBFZBHqXHq1IO3PUGD7IS+dGSmVZzs6ZqwVo2S 5XxvLPnvTgy6EFjD8z1V0QUBfQwcTlgBbgKaiCEABMPuAkeJ1tEK94ThTOwdZ0kQd6XS7oK q2l1/kekNl1VuqhVqeHSwMlaBdvGVz8IpG2TiPJpZLGSmRj1OQXQCZvCt4S4VQ+IhnpqFeG NGCbjPm8+Pp/OxsxxgZUBwFGzMITGbtihCqatAHmWl9/8t4eQo= X-QQ-GoodBg: 0 X-BIZMAIL-ID: 12211815477442076290 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Fri, 2 Jun 2023 15:31:09 +0800 Message-Id: <20230602073109.14086-7-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 6/6] avformat/flvdec: support demux 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: LWTavEz+AZz8 Signed-off-by: Steven Liu --- libavformat/flvdec.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index a0362ff11c..a6a94a4021 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -320,6 +320,8 @@ static int flv_same_video_codec(AVFormatContext *s, AVCodecParameters *vpar, int return vpar->codec_id == AV_CODEC_ID_HEVC; case MKBETAG('a', 'v', '0', '1'): return vpar->codec_id == AV_CODEC_ID_AV1; + case MKBETAG('v', 'p', '0', '9'): + return vpar->codec_id == AV_CODEC_ID_VP9; default: break; } @@ -365,6 +367,10 @@ static int flv_set_video_codec(AVFormatContext *s, AVStream *vstream, par->codec_id = AV_CODEC_ID_AV1; vstreami->need_parsing = AVSTREAM_PARSE_HEADERS; return 4; + case MKBETAG('v', 'p', '0', '9'): + par->codec_id = AV_CODEC_ID_VP9; + vstreami->need_parsing = AVSTREAM_PARSE_HEADERS; + return 4; default: break; } @@ -1285,7 +1291,8 @@ retry_duration: 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_AV1) { + st->codecpar->codec_id == AV_CODEC_ID_AV1 || + st->codecpar->codec_id == AV_CODEC_ID_VP9) { int type = 0; if (flv->exheader && stream_type == FLV_STREAM_TYPE_VIDEO) { type = flags & 0x0F; @@ -1317,7 +1324,7 @@ 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_AV1)) { + st->codecpar->codec_id == AV_CODEC_ID_AV1 || st->codecpar->codec_id == AV_CODEC_ID_VP9)) { AVDictionaryEntry *t; if (st->codecpar->extradata) {