From patchwork Wed Dec 23 11:35:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 24633 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 01CB944A7B2 for ; Wed, 23 Dec 2020 13:35:55 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D716568AAEB; Wed, 23 Dec 2020 13:35:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 454A568A613 for ; Wed, 23 Dec 2020 13:35:49 +0200 (EET) Received: by mail-ed1-f44.google.com with SMTP id c7so15902066edv.6 for ; Wed, 23 Dec 2020 03:35:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=Uyae4dBT5Z0vvG75av7PtUoxNlXmPf6kU7cRynjPmhc=; b=B9b7GH9NAmN1XRZ+CHrnJzLbHEuT+fSiw9btRreC2Rs0NDpIKcqKdSXcsmrKF9TR2b Jg4+m0e85qq2Df2cdzOI1thC53whCRaBAtAnGJdtixfvwwp+xOe+ZC3QMVmnJh+Z2poE rkNbFcTxhAFDmgimr/JRrEBzcoIJ0W1eVIiB565w/hVkaM4cjGjFp5ZSt2Ai6ll81C9j ZCkriXaaicyuF4rt6IkdltqUfnlvtCFmS3iJbSpTOAqYA5A5BJuwHYS/D6UNysK7NiSR trkkTUQi4ax/ganogwFj/e/P6d/W01FRitFbH3hz2fdGnC168UPhuLqMwNc5JB2TOlPb iAcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=Uyae4dBT5Z0vvG75av7PtUoxNlXmPf6kU7cRynjPmhc=; b=lX5QM3KDcj2TcL4XIHLTNKedVo56GRZn46Nad8ILHcfnZc4T9rc2CDqXig7nvulEiS 6pJ27py5Pjv35sdmFw6fjfCPeMyQb1hdvuM2NeaRKMvknr9hyp28F4c8b9BMkxqRT2/u w6ndDN67RJcmqLqZIhN1k0lkAPZRG+KFPoQySwiUY2a/UYXwEwRWSTK2yXIjzk9/+bOS jWmh2RmwSDXQXrNatoaEMLdzHkaM7+6NYGg7UFveS4gDEWsQj4QWhTUyvwYAlWpCEVwK 4kZSjqxABa+exndKRNHPzLgigdbEMw5VIBovZWxRlWcowusMXu68nlqB5j/6zVRI3g6r 9Mfg== X-Gm-Message-State: AOAM533dMLpVMeNj7sk5d9HkUjGff/2QLxRJKsqrqSkySLaHuBp74ldj BiOHRD9SU9LyMoa9D1eejDHLrZVmzrN9WQ== X-Google-Smtp-Source: ABdhPJziA6FEFjs3uhwm+/zqmV4tqPAPDWLMBWlrYWx7nWJVPJBp64kk/aU9/L/DLPwoICLTQT6n1w== X-Received: by 2002:a05:6402:8cc:: with SMTP id d12mr24047452edz.0.1608723348772; Wed, 23 Dec 2020 03:35:48 -0800 (PST) Received: from localhost.localdomain ([31.45.254.141]) by smtp.gmail.com with ESMTPSA id ld2sm11496574ejb.73.2020.12.23.03.35.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Dec 2020 03:35:48 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Dec 2020 12:35:38 +0100 Message-Id: <20201223113539.19880-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/cfhd: only increase s->level if transform is known X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- libavcodec/cfhd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/cfhd.c b/libavcodec/cfhd.c index a2b9c7c76a..a4f4cb4b3c 100644 --- a/libavcodec/cfhd.c +++ b/libavcodec/cfhd.c @@ -436,7 +436,7 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame, } init_plane_defaults(s); } else if (tag == SubbandNumber) { - if (s->subband_num != 0 && data == 1) // hack + if (s->subband_num != 0 && data == 1 && s->transform_type >= 0) // hack s->level++; av_log(avctx, AV_LOG_DEBUG, "Subband number %"PRIu16"\n", data); s->subband_num = data; From patchwork Wed Dec 23 11:35:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 24634 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 16A0C44A7B2 for ; Wed, 23 Dec 2020 13:35:58 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 03E2268AB0D; Wed, 23 Dec 2020 13:35:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1215968AB03 for ; Wed, 23 Dec 2020 13:35:50 +0200 (EET) Received: by mail-ej1-f44.google.com with SMTP id x16so22396890ejj.7 for ; Wed, 23 Dec 2020 03:35:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=lxkVmWXlpmtg+WWYRihls/LwgDnNIlpl78AIrjqtb9E=; b=DUIh4P1CqmwavCZ2HIbhohU3P4S7c7tvDIYCerRbH5IR82s6mWnqZFont6ozh5iw2A 92YbjU9mto+arALLZPIY9vtliln55A0D10vSxwn59FadhCjtUwRixQCSL/wC1SyM5Rwr mobZDWpaXCYuq7i5SZ1YYfLoM8IwrTL41BPftuikstInoXwqIwO+RyghamxQ36tceIiN Nb07Cr4KdB17eaM5AtJ09Ml0LpQFIUa9sUU14b070txGkhYA8493ql6XCSvCxzfNZPPY nlt4VfXl1J3O4mhxtDZ9CCmqEeY55Kv7zKhVCA9OxUsuBHSek7OAvUDZbuWlvLX7/F2S 49pQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=lxkVmWXlpmtg+WWYRihls/LwgDnNIlpl78AIrjqtb9E=; b=J2C8CtZBDjgEb6Mgw4ST6Lm2z74tzC/gCF108G6w1StTlInjRWt/yYTV609eCRsrKd yyqmz2iuA+0AZltm4UNIRcZJjVJmfyNKaX3xK0B2q9baNs7cTZ8nyfq9vNlEm1W6taVE ye/L+P0PQ1O8noc//Ti+bQmlmbsq+lRmTYyGAjG+k4WRYXl0P4ojn+nXAjWUgRw/Aaaf 3SPy7A7njECgqkQQJZA3gu+Sm38rhoHOhE8JkanMyICXigc6WLqxrvk1mOc4trPglgZl 1rAUBzam5/UloMRee/k/tkX5aU67OVlh4/hCshB+xr98sqAFg0CXI947LDFLn52QWpya WB6w== X-Gm-Message-State: AOAM530gN+6F/8Sq/AwcgiV9wQj2RDDQ5JxQ26/UQu5HTUoaSZbdv/sR SFVDFm2UcLgCNu8qOg0w1w2WHkSEz3jfIg== X-Google-Smtp-Source: ABdhPJwqkIswyvYMi1TJAnfRU0/3VmPelpzobZQajCbkvtgne0Yz5MLhhvSTM7vTM7e4wXz0x3hkMA== X-Received: by 2002:a17:906:229a:: with SMTP id p26mr23570992eja.291.1608723349614; Wed, 23 Dec 2020 03:35:49 -0800 (PST) Received: from localhost.localdomain ([31.45.254.141]) by smtp.gmail.com with ESMTPSA id ld2sm11496574ejb.73.2020.12.23.03.35.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Dec 2020 03:35:49 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Dec 2020 12:35:39 +0100 Message-Id: <20201223113539.19880-2-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201223113539.19880-1-onemda@gmail.com> References: <20201223113539.19880-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/cfhd: properly handle midstream size changes for transform type 2 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- libavcodec/cfhd.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/cfhd.c b/libavcodec/cfhd.c index a4f4cb4b3c..ae0d4b9496 100644 --- a/libavcodec/cfhd.c +++ b/libavcodec/cfhd.c @@ -1372,6 +1372,9 @@ static int update_thread_context(AVCodecContext *dst, const AVCodecContext *src) if (dst == src || psrc->transform_type == 0) return 0; + if (pdst->plane[0].idwt_size != psrc->plane[0].idwt_size) + free_buffers(pdst); + pdst->a_format = psrc->a_format; pdst->a_width = psrc->a_width; pdst->a_height = psrc->a_height;