From patchwork Mon Dec 11 19:06:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= X-Patchwork-Id: 45072 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp3137141pzf; Mon, 11 Dec 2023 11:09:43 -0800 (PST) X-Google-Smtp-Source: AGHT+IFBTLZhoeaGUKB1uJWI7tgRf8HJ2JH7ah9lAmQZweJnhAWl2+x5eKdNtawJ/RPIVVijaLa5 X-Received: by 2002:a17:906:d8db:b0:a19:a1ba:8cc2 with SMTP id re27-20020a170906d8db00b00a19a1ba8cc2mr1576070ejb.96.1702321783088; Mon, 11 Dec 2023 11:09:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702321783; cv=none; d=google.com; s=arc-20160816; b=cXyGp07m/Y5aa2K0VKtj0867aLxAqBMmGa7teXZG5tMYsPsBbavWJ8FJQ0gXdwztFC hHMuSEkRPxY5JcyaRkKDZd0RYjeXlxuadmug6tGKDUNZ6UstxuXudfo3H2izOxd613NY iZedqTVuwLwIjigvjwABa7vHey3sVU9XEA5JeXOSspTcZBoQsrpXGFzTDh9VrW21Qi9f Dhl9BQQY62LO4O3KP1EWHbEe2SjxwTXSspHYJYcIFC/uQQx0azPRhy4MNg9cV1UtCtKK iNffyLpKWU21gHZGyHxHjcTILwFP+lH8KNgDXGMpO1ToSCWEm8qo7VMsm4dNWA66/RV3 cTgg== 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 :message-id:date:to:from:dkim-signature:delivered-to; bh=ZkwGlUUY+/QN/nW4KGfmyfE6Z+KQ6rmxNxkF+QO3o6k=; fh=Jgo3TCyoG8OdFLqA8BuM7Wbf1w27210JU6p+E8x39/M=; b=tLS2LXife1SbeAns1jG3KukJUdiIWf8y9qu8fEhiRWTBwiCW0ia8IpOXYawcCZzTa5 9vR9lbPr2xCK+EQM9wFldKjR9Wyc5b4JT6K02tnenwKiY6e1lCfpOYgHkFX1ufCuTDq6 0a9OJx8bA7qRCnaFdBApYjcumzmd97pgcv+zMKUQxUXkQ1xwWYzsLAiJ736ZbORBrfPO aG8SwsJ6YVUpR4o1rjtwziHoZWc1JWyki5WM3l2XheNkIvIAn69Y3E1y29x9A3tfavPW oR0HO4tpDnECmtq/yAcStA/6VRnnUyVgDhg/WfJwDAnyNZj65uG4PSVQOc55ny6DUlbf xYUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b="bd2VHMJ/"; 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=pkh.me Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id lw14-20020a170906bcce00b00a1d040c32b3si3764129ejb.653.2023.12.11.11.09.41; Mon, 11 Dec 2023 11:09:43 -0800 (PST) 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=@pkh.me header.s=selector1 header.b="bd2VHMJ/"; 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=pkh.me Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3EDF568D1EC; Mon, 11 Dec 2023 21:09:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from ssq0.pkh.me (laubervilliers-656-1-228-164.w92-154.abo.wanadoo.fr [92.154.28.164]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 76C5F68D1D2 for ; Mon, 11 Dec 2023 21:09:18 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pkh.me; s=selector1; t=1702321752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=te4kAINmatea7tfsPx8pS4VO5UhE0u/EfDkxDEnaees=; b=bd2VHMJ/4fxG8EzWJTRg15sblaPMGsn7q9xOvcMEpSkidn+uGkYrmheX4G08CQz5/mAn56 waOqwBuUHycE1Bi8vyN1CFbXoJm/abOWr/yiWu/Wwq9dDBhZcJQSKPr4AoLcGbPleEhKU7 VYmQu7z47OSg4AVkpLLnKRWw+KDOGEc= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id e54e3df5; Mon, 11 Dec 2023 19:09:12 +0000 (UTC) From: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Dec 2023 20:06:52 +0100 Message-ID: <20231211190908.1882569-3-u@pkh.me> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231211190908.1882569-1-u@pkh.me> References: <20231211190908.1882569-1-u@pkh.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/5] avcodec/proresenc_kostya: use a compatible bitstream version 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: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: IVLnoESe1Dmn Quoting SMPTE RDD 36:2015: A decoder shall abort if it encounters a bitstream with an unsupported bitstream_version value. If 0, the value of the chroma_format syntax element shall be 2 (4:2:2 sampling) and the value of the alpha_channel_type element shall be 0 (no encoded alpha); if 1, any permissible value may be used for those syntax elements. So if we're not in 4:2:2 or if there is alpha, we are not allowed to use version 0. --- libavcodec/proresenc_kostya.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/proresenc_kostya.c b/libavcodec/proresenc_kostya.c index 05e90bb236..7e660a3708 100644 --- a/libavcodec/proresenc_kostya.c +++ b/libavcodec/proresenc_kostya.c @@ -995,7 +995,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, // frame header tmp = buf; buf += 2; // frame header size will be stored here - bytestream_put_be16 (&buf, 0); // version 1 + bytestream_put_be16 (&buf, ctx->chroma_factor != CFACTOR_Y422 || ctx->alpha_bits ? 1 : 0); bytestream_put_buffer(&buf, ctx->vendor, 4); bytestream_put_be16 (&buf, avctx->width); bytestream_put_be16 (&buf, avctx->height);