From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 6A7BE4C417 for ; Fri, 7 Feb 2025 03:08:54 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D00A668B874; Fri, 7 Feb 2025 05:08:49 +0200 (EET) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AB95268B646 for ; Fri, 7 Feb 2025 05:08:43 +0200 (EET) Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-21f20666e72so33913185ad.1 for ; Thu, 06 Feb 2025 19:08:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738897721; x=1739502521; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=KOu5J2JOVLaHeJnFu7emB1ARclaPKdNstQDgfcCnlWc=; b=YkZfgdChJruPfjYwo3mnZAn+QeE+N0e9wl1MW9mU5IJsHZWLiaTCJsGMPt9m/66YTR wpp/2Jkion04aiDXFJ6FJUsv3jO3LdvvNLagfw2h2lWWLyQju+BopCkjwCTGOwZ1xJUb lc9psSQcutkMQa/Lik9MFX/ECxcQ3Im8XVRomjjWb5Qr3rzdLTFEA+Jb5ZKpkVF2X3sz iAgHujxVaYnUuSLKZg+2YxZokE7y/HJpY4pUNI+wW3tuKsirDWgepQtAKb8WkvFOwVY1 BZBhJhj4xg3Jl0IQgKhF5mquTTcW9hp3ojU/x1oDW51aQBH1MaTcetEQNmugo4iNQ/UI UDpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738897721; x=1739502521; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=KOu5J2JOVLaHeJnFu7emB1ARclaPKdNstQDgfcCnlWc=; b=kbeEOKnkY//DItKK2s8QAwuWRXJJFLmUZU6Y0O60sFEQNfqhOBxynLlvkviFT40Lbx 5cpeb2QAlZKN5oHL2n/WzByUYcDtLziTdmWl8oj3BO23Y1rCR88moiRTW1gAoafYGinX 0gob90cb8Lob4kP55odK/LWFl7dmo6YJf2tyfdSawDHIK5j/HOE4NPeyhUXojUWG2Ez7 mqcyGIOYY9xLbXT80OthNTqH/WCzgvEH2RwmoGTtxj8tM5nj3kFdVDLPcG2+bVsmLgeO x0qWBiwXYV9/jXVw+yTX0RT3ziW2FZc/aLe8LjnEIf95y2OmOeP17XFw/V4+k4QJeRzn V9Dw== X-Gm-Message-State: AOJu0YxaAZg7ubpYZi2ZJfK1no8IWgW1aVL1nBrBG1/rD4jcW8RYENqw QcKWX4UIoxj+iDyLDq6n68mTGwp5B85EybTm4iSostnEdYlsbQtfpW1Sy8Bh X-Gm-Gg: ASbGnct9L4NLYu8AWtuECkGzttcc0SzRgsUTIt6rbOYUQpQwKpCZRswQUM63l5WPEa5 b1WUDNj37npKuduWcvJW1UKVkXf5zPW+eZyRFul8RVM1oQDhbHi53E7Am29S5BnUoG+VVJJbSsJ kP6+SZc6XuDK8chj+rqFfSxREvnhldAL4ElsCQisayFcPfq3kcxbccE+pxkubFuYwZLYc3ZRsD7 Vi8fgLL4HkY219noWUosXxuymSo+Oy9y2zay2K+XvhS1ObQuvoZzx5631bjkKQ2aF+LVovBuUFE 2CnpJAgeol5veQi2ya0OOXOYQ/Hv7ko= X-Google-Smtp-Source: AGHT+IHVx0x5nzDtcD0TesfBIzjokEeq3CZte4sObVcmwmULC0hqR0DEaLBjX41HcdqX24ZBggJLrA== X-Received: by 2002:a05:6a00:1a93:b0:728:9d19:d2ea with SMTP id d2e1a72fcca58-7305d4adb54mr2358125b3a.13.1738897721220; Thu, 06 Feb 2025 19:08:41 -0800 (PST) Received: from localhost.localdomain ([2800:2121:b040:c:c05d:8929:1e3d:9951]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73048c16841sm2016815b3a.146.2025.02.06.19.08.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Feb 2025 19:08:40 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 Feb 2025 00:08:24 -0300 Message-ID: <20250207030824.24893-1-jamrial@gmail.com> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/libtheora: fix setting keyframe_mask 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: t_info.keyframe_granule_shift is set to the library default of 6, which is ok for gop sizes up to 63. Since there's apparently no way to query the updated value after having forced a gop value with TH_ENCCTL_SET_KEYFRAME_FREQUENCY_FORCE, calculate it manually instead. Fixes ticket #11454. Signed-off-by: James Almer --- libavcodec/libtheoraenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/libtheoraenc.c b/libavcodec/libtheoraenc.c index 8844f4be6a..761cd45d44 100644 --- a/libavcodec/libtheoraenc.c +++ b/libavcodec/libtheoraenc.c @@ -234,7 +234,7 @@ static av_cold int encode_init(AVCodecContext* avc_context) return AVERROR_EXTERNAL; } - h->keyframe_mask = (1 << t_info.keyframe_granule_shift) - 1; + h->keyframe_mask = (1 << av_ceil_log2(avc_context->gop_size)) - 1; /* Clear up theora_info struct */ th_info_clear(&t_info); -- 2.48.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".