From patchwork Sun Nov 12 00:41:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ross X-Patchwork-Id: 44618 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:92a5:b0:181:818d:5e7f with SMTP id q37csp560436pzg; Sat, 11 Nov 2023 16:41:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IGz0GvaYV1j2HBb32eCCE5sNecXGRriFrwilUM91ZUzT0mede66IDYTVGRifpL0pufyj/ga X-Received: by 2002:a50:c050:0:b0:540:9d0c:75fc with SMTP id u16-20020a50c050000000b005409d0c75fcmr1967170edd.26.1699749701359; Sat, 11 Nov 2023 16:41:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699749701; cv=none; d=google.com; s=arc-20160816; b=i/t49dmsmeI1PpaiKpxcw8Lsg5k6styZ7VIggRrRo8diCIXIssci/JGPlo5gTuBQs9 ngetmqP8aZamt76CfWTwdhqjFbzkxqn6/tPBPNIkjVXqMlUIr0lw+thyTUqN7QWK+LOo EjVaThvYrzPkXFR+vo6ofHy6OACqmE/uIRnVaxb9AqEUAmRnkYyfvUxWOrIzfpv3nmbY 9wlweC4CJwRhCWy6SpgywyKEZk3QsvfzKh4371tznnI2QW9XvVdRTLAUpk46egjaGreK pblzMbqxhmGx1TnX/6MDJqRVhoSIMfdw0ioKzlTx7wzbm9wG33RlVAKgKacIbHtUfJcV Fhwg== 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=QHSwffkmJ5ojxXLjBJiRFNxlJSZ6z758H+hlcoDQPqg=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=VzZ7Rb65+gJ0tkhSMaa5Sggz0CKQ3nVZ7jsy6OfUNDo0Ehsi7Nwrl5m1pYf+oB7IHQ +HIgYqzsQTNLkxaJTIQ/YTxLRs80M8TuFRvacmCNYqc5maHol+PZeet4QAB/6kJl2VJi BoFENBIhsagqnkcxANAnmoP/mocx3F6DmwcaVGpChVbrvrJas5yifn1tLlro/cz0c8Gx U2b/PtZ2cedkrClifFyAEM5qs9YouV0tBnBzhl40gYbB82msoaaDg0zPAScBFJs543D3 hzuO2rbdH91G0jo7sJmrvMTLWLj+doQrMV+nGGKWcqY7ycBSmhNtT7BoULlv0ypvjp9r vMlw== 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 k25-20020a508ad9000000b0054364fcf97bsi1233901edk.184.2023.11.11.16.41.41; Sat, 11 Nov 2023 16:41: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 21EFE68CBA8; Sun, 12 Nov 2023 02:41:39 +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 C302068CBA8 for ; Sun, 12 Nov 2023 02:41:32 +0200 (EET) Received: from b08755e23d758cbff113049ad395b92b ([1.152.210.249]) (authenticated (0 bits)) by mx.sdf.org (8.16.1/8.14.5) with ESMTPSA id 3AC0fRce027695 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits) verified NO) for ; Sun, 12 Nov 2023 00:41:30 GMT Date: Sun, 12 Nov 2023 11:41:23 +1100 From: Peter Ross To: ffmpeg-devel@ffmpeg.org Message-ID: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lead: support format 0x0 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: wUmVBuAUSHxc Fixes ticket #10660. --- thanks to the mysterious 'ami_stuff'. libavcodec/leaddec.c | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/libavcodec/leaddec.c b/libavcodec/leaddec.c index fd2018256d..4f2cc03e65 100644 --- a/libavcodec/leaddec.c +++ b/libavcodec/leaddec.c @@ -139,7 +139,7 @@ static int lead_decode_frame(AVCodecContext *avctx, AVFrame * frame, { LeadContext *s = avctx->priv_data; const uint8_t * buf = avpkt->data; - int ret, format, yuv20p_half = 0, fields = 1, q, size; + int ret, format, yuv420p_div = 1, yuv20p_half = 0, fields = 1, q, size; GetBitContext gb; int16_t dc_pred[3] = {0, 0, 0}; uint16_t dequant[2][64]; @@ -149,6 +149,10 @@ static int lead_decode_frame(AVCodecContext *avctx, AVFrame * frame, format = AV_RL16(buf + 4); switch(format) { + case 0x0: + yuv420p_div = 2; + avctx->pix_fmt = AV_PIX_FMT_YUV420P; + break; case 0x8000: yuv20p_half = 1; // fall-through @@ -192,29 +196,39 @@ 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 + 15) / 16; mb_y++) + for (int mb_y = 0; mb_y < (avctx->height + (16 / yuv420p_div - 1)) / (16 / yuv420p_div); 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; + for (int b = 0; b < ((yuv420p_div == 2 || yuv20p_half) ? 4 : 6); b++) { + int luma_block = (yuv420p_div == 2 || yuv20p_half) ? 2 : 4; const VLCElem * dc_vlc = b < luma_block ? luma_dc_vlc.table : chroma_dc_vlc.table; int dc_bits = b < luma_block ? LUMA_DC_BITS : CHROMA_DC_BITS; const VLCElem * ac_vlc = b < luma_block ? luma_ac_vlc.table : chroma_ac_vlc.table; int ac_bits = b < luma_block ? LUMA_AC_BITS : CHROMA_AC_BITS; - int plane = b < luma_block ? 0 : b - (yuv20p_half ? 1 : 3); - int x, y; + int plane = b < luma_block ? 0 : b - (luma_block - 1); + int x, y, yclip; if (b < luma_block) { - y = 16*mb_y + 8*(b >> 1); + y = (16 / yuv420p_div)*mb_y + 8*(b >> 1); x = 16*mb_x + 8*(b & 1); + yclip = 0; } else { - y = 8*mb_y; + y = (8 / yuv420p_div)*mb_y; x = 8*mb_x; + yclip = (yuv420p_div == 2) && y + 8 >= avctx->height / 2; } - ret = decode_block(s, &gb, dc_vlc, dc_bits, ac_vlc, ac_bits, - dc_pred + plane, dequant[!(b < 4)], - frame->data[plane] + y*frame->linesize[plane] + x, - (yuv20p_half && b < 2 ? 2 : 1) * frame->linesize[plane]); + if (!yclip) { + ret = decode_block(s, &gb, dc_vlc, dc_bits, ac_vlc, ac_bits, + dc_pred + plane, dequant[!(b < 4)], + frame->data[plane] + y*frame->linesize[plane] + x, + (yuv20p_half && b < 2 ? 2 : 1) * frame->linesize[plane]); + } else { + uint8_t tmp[64]; + ret = decode_block(s, &gb, dc_vlc, dc_bits, ac_vlc, ac_bits, + dc_pred + plane, dequant[!(b < 4)], tmp, 8); + for (int yy = 0; yy < 8 && y + yy < avctx->height / 2; yy++) + memcpy(frame->data[plane] + (y+yy)*frame->linesize[plane] + x, tmp + yy, 8); + } if (ret < 0) return ret;