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 ESMTP id 26360426E7 for ; Tue, 22 Mar 2022 19:11:27 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B3B5068B177; Tue, 22 Mar 2022 21:11:25 +0200 (EET) Received: from mail-oo1-f47.google.com (mail-oo1-f47.google.com [209.85.161.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 95DF468049F for ; Tue, 22 Mar 2022 21:11:18 +0200 (EET) Received: by mail-oo1-f47.google.com with SMTP id i8-20020a4a6f48000000b00324ada4b9d9so7188oof.11 for ; Tue, 22 Mar 2022 12:11:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=mjy1phbPWM3ifEmrsJM373sTGO39uPbdf4rPKh22oAE=; b=FHT0jdRVsO4f9QHOcQg7K+MFm+8VfkZD6vzD8PBYFuSLIqChYvmykSL9mL5vlIOQdL cXcTgEvEm6NbxDEUhY9qrgdr1XWBamjX4UyuWRRbk/mzFJBKxgBkx9T+xUGsUf4DGZaP bLSgtpwQG0yMiaG60RiliodMFTfDjgjZ/9TdpLRTmTDdHWo89El02Q0e+4j8Qh7bPHiQ 63Lqc2ysFQiVIGDj6HZTLrz1t4lO4KwHqYy6rUZD1+GSoUo5OZOTkepfoUYCL3u8dopb sN99NiLxcl3wVIwkGSv0acHX50Pq5B111gTBFrSDUiW3mgMx2SaiI/Mrb7QpSehf1ew9 9zjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=mjy1phbPWM3ifEmrsJM373sTGO39uPbdf4rPKh22oAE=; b=cgv79gPWQmswmDr+yCsrccQSb8gk0/pSHK17S0yLE5AYk8lqVabLjBOGf80T22fs1i HTxgQUzzzxtTTwrWXXolXv2bT+bX+bii/TbBgZ6/9w0CUFo+Y5wsVf4z9OSfg0MYJed5 yefzTUd1zhJH969Ybwe2gRP0f0kkTkAL/g7+uy0YWXk0L53QRk+MPUTyBf5lvUmTBrOL cNk+XGki3XPF4Mdovxw13XwXqyvR8HQJ/1q9XfbUR3xRyG3nls/nbinltkwJWBpRxZpq 5RhAQiXSUNeLcOTs1XQVBGWa/8ndIZb1ZVKW+2O8gsoFPb8eiiDuWNepcqdHvq7xCK0R SrJg== X-Gm-Message-State: AOAM532AAgkmBDNdwuOKf0rWVQ9+GhRNakULLs1Yq+bx0OTX6ongkkUO Y+7qrU6bubVVs5x/alGPsmxbSAn/Ne9sNA== X-Google-Smtp-Source: ABdhPJwcJfvjqGJFuOlMGDFlq9VjEUJxwlaJpER5hUgoX9++KMwzVrMei7XhH1/W6cC76VY8+1RFMg== X-Received: by 2002:a4a:b5c5:0:b0:321:248:bd50 with SMTP id u5-20020a4ab5c5000000b003210248bd50mr8751718ooo.50.1647976276659; Tue, 22 Mar 2022 12:11:16 -0700 (PDT) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id 37-20020a9d0328000000b005b2265711fcsm9053129otv.16.2022.03.22.12.11.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Mar 2022 12:11:16 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 22 Mar 2022 16:10:59 -0300 Message-Id: <20220322191100.3071-1-jamrial@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/av1: only set the private context pix_fmt field if get_pixel_format() succeeds 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: Otherwise get_pixel_format() will not be called when parsing a subsequent Sequence Header in non hwaccel enabled scenarios, allowing frame parsing when it shouldn't. This prevents the scenario seqhdr -> frame_hdr/redundant_frame_hdr -> seqhdr -> redundant_frame_hdr from having the latter redundant frame header parsed as if it was a frame header by the decoder because the former was discarded. Since CBS did not discard it, the latter redundant frame header is output with a zeroed AV1RawFrameHeader struct, which can have undesired results, like division by zero with fields normally guaranteed to be anything else. Signed-off-by: James Almer --- libavcodec/av1dec.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index 613efc5d11..727d829e5b 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -506,9 +506,8 @@ static int get_pixel_format(AVCodecContext *avctx) if (pix_fmt == AV_PIX_FMT_NONE) return -1; - s->pix_fmt = pix_fmt; - switch (s->pix_fmt) { + switch (pix_fmt) { case AV_PIX_FMT_YUV420P: #if CONFIG_AV1_DXVA2_HWACCEL *fmtp++ = AV_PIX_FMT_DXVA2_VLD; @@ -551,7 +550,7 @@ static int get_pixel_format(AVCodecContext *avctx) break; } - *fmtp++ = s->pix_fmt; + *fmtp++ = pix_fmt; *fmtp = AV_PIX_FMT_NONE; ret = ff_thread_get_format(avctx, pix_fmts); @@ -569,7 +568,7 @@ static int get_pixel_format(AVCodecContext *avctx) return AVERROR(ENOSYS); } - avctx->pix_fmt = ret; + avctx->pix_fmt = s->pix_fmt = ret; return 0; } -- 2.35.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".