From patchwork Thu Mar 9 12:57:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 40622 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp306811pzb; Thu, 9 Mar 2023 04:57:41 -0800 (PST) X-Google-Smtp-Source: AK7set/4i/JZ3TY7//suYcLXpoSf6WVCTpBQ51zbObo6zPwzh+HONPFjmheZt8VkykQsyeVzEMuL X-Received: by 2002:a05:6402:204a:b0:4c1:d49:3ecc with SMTP id bc10-20020a056402204a00b004c10d493eccmr20487634edb.29.1678366661139; Thu, 09 Mar 2023 04:57:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678366661; cv=none; d=google.com; s=arc-20160816; b=KcD4zO5sNFq8HC4IikoaKJpxIETMyXd7Ut/V+rDiB/D7evVbPWgMRtfbzFoXYC8yBN /fKHbgCiWDjo7WKmHZZR/O9OGlxI+uIVTDiUC37U3kAE35DbhxzAeF+SxQHXavm0Myou XSVIfANRp06hRNsTfSNY+MntnhioHMX5cpdzkrkXF6kJuL854fnhoho4v9fUKJDvb5CX U7D+JJW60d/pR7HtKiosVT8TtVJMGRtgCIZb+fO5cbdREYbYO0IP5BCNEMUAudPytLsD 9DwLbv5/3/vE54X1um/lNDjhwxEYRlU925DJi0s/Z9VCdrL8iCnWzaXAtfo77uhTfQdB ppgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=uImDpQS0p8PejSfSu7YEYxneF+RcHvE6eruQ+KMM1cE=; b=y573Tv+btWAHbHj9i2imoyHBAd0H6UAASE6fRM6fLsKqgLnnPgDGXdWPNIB8UbdMKA qCgwhGynyULvyDH+JXWI0Ljv9fQ+2ESw8PojJO896+eXGTK0wyJmsFMdCkI3iEcHT+XF sCqOBZzuVY+cWf7ufio6ZfepiN/ksfGrw2UgVp6ISVWGOJGJzLVVbRDcloOBZ1j2o/Ms XFR86IeqFWn+TgxMOAWZITWhUAR6nf8kpBhQ2IG8vsYebvv+9eklxLqtBHp6S2dTAPgO gb/hb6BriBQVM1qoT0V/QId0reseztZGYV7Iv+mqKzSAwhgU7isn4ua0j1xnlcAzLOX0 a1Cg== 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 x9-20020aa7d389000000b004ac8e64198fsi292184edq.35.2023.03.09.04.57.40; Thu, 09 Mar 2023 04:57:41 -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 E31AE68BCFB; Thu, 9 Mar 2023 14:57:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7A18668B09D for ; Thu, 9 Mar 2023 14:57:20 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id A215DFF807 for ; Thu, 9 Mar 2023 12:57:19 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 9 Mar 2023 13:57:15 +0100 Message-Id: <20230309125717.29821-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230309125717.29821-1-michael@niedermayer.cc> References: <20230309125717.29821-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/lcldec: Support 4:1:1 and 4:2:2 with odd width 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 1Fd0DtKDPJgY Fixes: Ticket10240 Fixes: zlib_306_306_yuv422.avi Fixes: zlib_306_306_yuv411.avi Signed-off-by: Michael Niedermayer --- libavcodec/lcldec.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c index 95206eeb69..0196460eb2 100644 --- a/libavcodec/lcldec.c +++ b/libavcodec/lcldec.c @@ -403,6 +403,11 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, v_out[ col >> 1 ] = *encoded++ + 128; v_out[(col >> 1) + 1] = *encoded++ + 128; } + if (col && col < width) { + u_out[ col >> 1 ] = u_out[(col>>1) - 1]; + v_out[ col >> 1 ] = v_out[(col>>1) - 1]; + } + y_out -= frame->linesize[0]; u_out -= frame->linesize[1]; v_out -= frame->linesize[2]; @@ -424,6 +429,10 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, u_out[col >> 2] = *encoded++ + 128; v_out[col >> 2] = *encoded++ + 128; } + if (col && col < width) { + u_out[col >> 2] = u_out[(col>>2) - 1]; + v_out[col >> 2] = v_out[(col>>2) - 1]; + } y_out -= frame->linesize[0]; u_out -= frame->linesize[1]; v_out -= frame->linesize[2]; @@ -481,6 +490,7 @@ static av_cold int decode_init(AVCodecContext *avctx) FFALIGN(avctx->height, 4); unsigned int max_decomp_size; int subsample_h, subsample_v; + int partial_h_supported = 0; if (avctx->extradata_size < 8) { av_log(avctx, AV_LOG_ERROR, "Extradata size too small.\n"); @@ -502,14 +512,11 @@ static av_cold int decode_init(AVCodecContext *avctx) av_log(avctx, AV_LOG_DEBUG, "Image type is YUV 1:1:1.\n"); break; case IMGTYPE_YUV422: - c->decomp_size = basesize * 2; + c->decomp_size = (avctx->width & ~3) * avctx->height * 2; max_decomp_size = max_basesize * 2; avctx->pix_fmt = AV_PIX_FMT_YUV422P; av_log(avctx, AV_LOG_DEBUG, "Image type is YUV 4:2:2.\n"); - if (avctx->width % 4) { - avpriv_request_sample(avctx, "Unsupported dimensions"); - return AVERROR_INVALIDDATA; - } + partial_h_supported = 1; break; case IMGTYPE_RGB24: c->decomp_size = basesize * 3; @@ -518,10 +525,11 @@ static av_cold int decode_init(AVCodecContext *avctx) av_log(avctx, AV_LOG_DEBUG, "Image type is RGB 24.\n"); break; case IMGTYPE_YUV411: - c->decomp_size = basesize / 2 * 3; + c->decomp_size = (avctx->width & ~3) * avctx->height / 2 * 3; max_decomp_size = max_basesize / 2 * 3; avctx->pix_fmt = AV_PIX_FMT_YUV411P; av_log(avctx, AV_LOG_DEBUG, "Image type is YUV 4:1:1.\n"); + partial_h_supported = 1; break; case IMGTYPE_YUV211: c->decomp_size = basesize * 2; @@ -541,7 +549,7 @@ static av_cold int decode_init(AVCodecContext *avctx) } av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt, &subsample_h, &subsample_v); - if (avctx->width % (1<height % (1<width % (1<height % (1<