From patchwork Tue Jun 13 07:37:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 42060 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c526:b0:117:ac03:c9de with SMTP id gm38csp3504421pzb; Tue, 13 Jun 2023 00:38:13 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7vpZ3nq6ZADk6a5N0NG2MsJxkXwT06x0PPfzA+zPh1qld6Y+TyGuOb3oZB8sNCS3ez7J2V X-Received: by 2002:a17:907:728a:b0:974:183a:54b6 with SMTP id dt10-20020a170907728a00b00974183a54b6mr11708254ejc.33.1686641892949; Tue, 13 Jun 2023 00:38:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686641892; cv=none; d=google.com; s=arc-20160816; b=EkTp3gTKHudRH74/F7bx+3dmj3u6hQJIKwR//a7jJETlYOLCJ0FCKUhReOWL32sjTA lNrAmGyRR0GTNUkhsVNvs8truFrSr0MQLXdC6eUlb+8FRBb5QKhTxQcV6Gx2egfEUQO3 mkItFBUjoX9ecSa0tdluMjzfNpLXBW0IFYIHMNU5uDUvVTyPvGy+8o+GtWUD3Kq4eubG RyGnWosemUgw4gPChWl88Qo88N8gKH0937zXe4oyyuTWiT0lVsAqRmEnRtX3sG4cO/2C RovMIicyJipY0BvVmbVncRsbxrhqClIyL31/uVmxkMKfrs937cwjlxxDfkoeS2UQ0UF8 4Tqg== 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:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=/eTMw45dWK+x/P27SuXsvYefP+5GOViAkSHWb0Y7arw=; b=Y9wc5fITddiphKdknxl5w9SZu8hEpKtTWeNdN7j8Tzaohm0k/Kvz1ik20O01f8wWGw O7+fZbe8NszvPfeBp1Vga69T/jJi0aIiova5KYFt/AI7UYgG/0LrtVb3ZJVwWBAqoTa+ 8gE0Jssig+LuVlAaHRzyppB7X86F5/Dky0y1t+7yd/Ezs8eS/qbys54cyyhWuDhf/Jf0 v1K2hUF50dCUBJ/IaAAs+Fzls36yyhrMA6w/l1/hiuDz46jxlSmhT1xTPydWTJF0xVZ9 FiIA0Cqqxu4OlWLBsXWasX5AnXnwdVbpElBoV2iwjyUZi5hOKBx3iiswQkJBvKslz9CG CE9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=na0svrNf; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d21-20020a170906345500b0097886880ff2si6107271ejb.959.2023.06.13.00.38.09; Tue, 13 Jun 2023 00:38:12 -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; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=na0svrNf; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ED0A868C405; Tue, 13 Jun 2023 10:37:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-60.mail.qq.com (out203-205-251-60.mail.qq.com [203.205.251.60]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1E55968C1D5 for ; Tue, 13 Jun 2023 10:37:26 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1686641838; bh=npU9Z7Q+jwH+bbsUPzScSekTvdkPZxF/YIAO6Vpj/es=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=na0svrNfS0E9LkpCJNo3wms1FLh6J1ZVKEjD+mAd8S5xHjAXY7QGmM2SycJ/5ICHr y8Yfc+icqNzemtNhznk+e7M+D6N5RQt1vi7knWLlBr1EgzLviWRVS1R36o2/JAJ3Yd OnMvEh0ai1welTJJ+kY34mUQKxV/YlwIEGGGTAAs= Received: from localhost.localdomain ([113.108.77.65]) by newxmesmtplogicsvrszb1-0.qq.com (NewEsmtp) with SMTP id 9501FE5D; Tue, 13 Jun 2023 15:37:16 +0800 X-QQ-mid: xmsmtpt1686641837tyz9o6xfr Message-ID: X-QQ-XMAILINFO: MmpliBmRb3iC/bYKth+LbL3PDDQf1ck/zUCB/XvzombZ2dMgTz0U8dnXTHSuy/ oSL5gm3wa0WmXdXFxjVY0TRn9+Hf/QIqvEWPsOzMdAWV/GRebDp2yKb5gArEuKKF+mIg98ORbTk/ xJWSb9+8rQGeLPXSE61jhRSBbRd8XUsQyPY/MCJQjgA2XgCmPNN8derdJkIgZLRHzrFJsv2xdYi+ VQlwwANUUOLc8ahniV5GXtXVqb2+5KqLVrZodIVWY+vdjXqofrWYu343MXJrQhS3RIzjBcURd32/ mXzwyQ57Oiap+A4f3R2E34hpXm1ZYzqBP22yZWCUS3BVeChSFCQgyn0k/DSF1NXzbaMuOBsrMurP PZe/29GFu9a+wvQWnjzeFjpg36m9eAk2AyhNRfUsjD6ABdemq5xNDlSL7cOUNdNRMfdhQOFf6XfS SYPljUUkxw00tlQlsfYTLdfvpZQn1J/mC1jd3cHycRulnAb5Rq1m5lHu9m318m5mz4mC44oYDmLQ sc09rod3vZkv7T/82UuH8W2dZ81zz+UE8lWz9gwZNuiEN4bsFYGpsSQG6wJTcNkEqXLHeqOlnIvP NKM6NkxERNbG+rm8+BPIfEcfIaQZkFjQ5CU+d9+0CK6ZPeDf6cY7NXjfKVivECQj7tkMLkON13l5 TGXHYtEZ82ACnPi2zdc2yvrRxHXEjWrocOeakUrBHsQ2f93SgMzqz+9PPjWLCKfBogSSZOSPRv1o 8NZFsSk0er2PHANxvg2iQpyi1/4fOqCQXH2rphFFiX2Z/odNgJqDqJAioIQ5h0Fdb6yDey9SPTJb lyfXCycIxxZIBhNpnRzF8/60Wb9rSxDAhF0ILzVxtIk1rpZUd3jX31Vc1iD6woNtQqKBa2xZ04sw VejfJlbXRR9Ws1PYOjqK7t/R2zkX6gwmas2QbC7t9h+rXQtYFQIFx3EbKW2B7jyqvPy50wuDtYb1 Q/Zo5Vled4ZgKx3j4YE1skOkYOwEYhqLXsBgW1lMw7kQK157LS7g== X-QQ-XMAILREADINFO: MFSZYyQdPxvloIttF8cZzD8= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Tue, 13 Jun 2023 15:37:17 +0800 X-OQ-MSGID: <20230613073718.675388-3-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230613073718.675388-1-quinkblack@foxmail.com> References: <20230613073718.675388-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] avformat/asfdec_f: support bmp_tags_unofficial 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: OAj9P/ETVHmH From: Zhao Zhili Signed-off-by: Zhao Zhili --- libavformat/asfdec_f.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/asfdec_f.c b/libavformat/asfdec_f.c index bdbd4271c8..1e3eb33fd6 100644 --- a/libavformat/asfdec_f.c +++ b/libavformat/asfdec_f.c @@ -445,6 +445,8 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size) st->codecpar->codec_tag = tag1; st->codecpar->codec_id = ff_codec_get_id(ff_codec_bmp_tags, tag1); + if (!st->codecpar->codec_id) + st->codecpar->codec_id = ff_codec_get_id(ff_codec_bmp_tags_unofficial, tag1); if (tag1 == MKTAG('D', 'V', 'R', ' ')) { sti->need_parsing = AVSTREAM_PARSE_FULL; /* issue658 contains wrong w/h and MS even puts a fake seq header @@ -459,6 +461,8 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size) sti->need_parsing = AVSTREAM_PARSE_FULL_ONCE; if (st->codecpar->codec_id == AV_CODEC_ID_MPEG4) sti->need_parsing = AVSTREAM_PARSE_FULL_ONCE; + if (st->codecpar->codec_id == AV_CODEC_ID_HEVC) + sti->need_parsing = AVSTREAM_PARSE_FULL; } pos2 = avio_tell(pb); avio_skip(pb, size - (pos2 - pos1 + 24));