From patchwork Sun Nov 12 00:40:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ross X-Patchwork-Id: 44617 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:92a5:b0:181:818d:5e7f with SMTP id q37csp560214pzg; Sat, 11 Nov 2023 16:40:46 -0800 (PST) X-Google-Smtp-Source: AGHT+IGZuMzq+pq8kSvrLd6+M0cp0VeQ5FAd6QY1Uw5d95y8aDTUBkcW78nTlYteQ81ObhFxw1os X-Received: by 2002:a17:906:1e17:b0:9d2:5cf8:e61 with SMTP id g23-20020a1709061e1700b009d25cf80e61mr1867815ejj.35.1699749646157; Sat, 11 Nov 2023 16:40:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699749646; cv=none; d=google.com; s=arc-20160816; b=tyg8O4e4bXor/neFkAJ7ayzmVB/ffZCRAFHFRhJ0IWHTLZdo8HXLiy/JmFIteJIM/u S97txCA8a7pdoOeZTlsneOKq0DbxbGZDZQPgSiLnoR85kBWaMcQSDgjkxC/3Obsnr6f2 kxPTvw0m2NLKlJFY0CULZa2g10Ae538dwyYr7pjsJJW073NVgsFhmwpCVslRxpeWNGMX 5aU+scV9C06Dpw4+hPJIKxbWWB8Lz0F5OAw+bu63CCvfUZNWQXv/0GFcKr5HevV0VPmB WDC3iicz/z2rWD6P0o60qONh+EU1vVlYZBC4UGG843KcKPqb3XmxK7fPg1evpusJenED ABww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:to:from:date:delivered-to; bh=uUxhPRtlTVt+1gbBOZ1nY7RMNrdg+/x0Y8yI9jCcTT8=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=bgrosxq+VZbtPQfy8TWbyrKmOox9QP03SNnOIwXIfZfIc81JLl4+IpMnHurZSbmzEA C+hh5tfXB1P4GZyEuiDR6l4YWimrDhv7IjyezYCaJ/5U6u4GmckMwbU6BsiIO6jtv+ot N6QQI87Qe2YgiG4h3Agk3pOeyUyzBo8F2dE7A/GpDrT5PLdVUGBGOo9lNjLQcBm5knFt z87v9eyuw8IC/lqdIHoVUPLiWMmjyZDKxUxY5RRGobZ24TRrvaJkiYzCT6Vs/zjk87Wi RiBjoyZ4LUA+pXxlIw3TY/CtWSMixFBEu+DdklikwPsqBxqNyuLKWrv24VM4HbLzGJlA I/jA== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id j18-20020a170906279200b0099bcd27b459si1204133ejc.20.2023.11.11.16.40.45; Sat, 11 Nov 2023 16:40:46 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0E66868CBF2; Sun, 12 Nov 2023 02:40:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mx.sdf.org (mx.sdf.org [205.166.94.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9304A68CA46 for ; Sun, 12 Nov 2023 02:40:36 +0200 (EET) Received: from d5ab65435edfd8f9f61ded3900a4d560 ([1.152.212.128]) (authenticated (0 bits)) by mx.sdf.org (8.16.1/8.14.5) with ESMTPSA id 3AC0eTCY019302 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits) verified NO) for ; Sun, 12 Nov 2023 00:40:33 GMT Date: Sun, 12 Nov 2023 11:40:26 +1100 From: Peter Ross To: ffmpeg-devel@ffmpeg.org Message-ID: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lead: support unaligned blocks 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: hGhb6IL3pypd Fixed ticket #10656. --- libavcodec/leaddec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/leaddec.c b/libavcodec/leaddec.c index ede52fba5a..fd2018256d 100644 --- a/libavcodec/leaddec.c +++ b/libavcodec/leaddec.c @@ -192,8 +192,8 @@ static int lead_decode_frame(AVCodecContext *avctx, AVFrame * frame, init_get_bits8(&gb, s->bitstream_buf, size); if (avctx->pix_fmt == AV_PIX_FMT_YUV420P) { - for (int mb_y = 0; mb_y < avctx->height / 16; mb_y++) - for (int mb_x = 0; mb_x < avctx->width / 16; mb_x++) + for (int mb_y = 0; mb_y < (avctx->height + 15) / 16; mb_y++) + for (int mb_x = 0; mb_x < (avctx->width + 15) / 16; mb_x++) for (int b = 0; b < (yuv20p_half ? 4 : 6); b++) { int luma_block = yuv20p_half ? 2 : 4; const VLCElem * dc_vlc = b < luma_block ? luma_dc_vlc.table : chroma_dc_vlc.table; @@ -225,8 +225,8 @@ static int lead_decode_frame(AVCodecContext *avctx, AVFrame * frame, } } else { for (int f = 0; f < fields; f++) - for (int j = 0; j < avctx->height / fields / 8; j++) - for (int i = 0; i < avctx->width / 8; i++) + for (int j = 0; j < (avctx->height + 7) / fields / 8; j++) + for (int i = 0; i < (avctx->width + 7) / 8; i++) for (int plane = 0; plane < 3; plane++) { const VLCElem * dc_vlc = !plane ? luma_dc_vlc.table : chroma_dc_vlc.table; int dc_bits = !plane ? LUMA_DC_BITS : CHROMA_DC_BITS;