From patchwork Mon Apr 17 15:00:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ronald S. Bultje" X-Patchwork-Id: 41227 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp2422244pzb; Mon, 17 Apr 2023 08:00:29 -0700 (PDT) X-Google-Smtp-Source: AKy350a6gbPbpMzyj4M4MMAh+Tn9RRTfWCoTjvyH58c6Oe5WnNdZYv1vp7F3ZA9QZIVqmEmibOOL X-Received: by 2002:a17:906:d935:b0:94e:d97e:7a5d with SMTP id rn21-20020a170906d93500b0094ed97e7a5dmr7090008ejb.47.1681743629134; Mon, 17 Apr 2023 08:00:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681743629; cv=none; d=google.com; s=arc-20160816; b=X2N3tcrh2QuA2fCEW1qG7JW3WlGHTi5brgvlLBZ9tgeryZONjjib+0QuB29rBV5LY2 fUeFBonjVUXQGwzEoGU0op2EwAeUAsjBRFtXvem4GN7O/mgwJ/jrjjBDwWNDgWrha/Y8 kht0BJZNTrV9J8VANXx5SNKKeGdcx7MFvjsc+qMg1JJMoAh6vFGGmpChnnZtg1NNF8Pl KWfMn1M+LPX8f1wams6tVQgotxN/ZM1IoEJoJ8aEx9VetZRk0UeRacZFE5s43faezpwm J/JL6QIPptSENVuHKIOYhlQt7Uxg4mtHfex9VQEtv2IY8fIdR9tvgay2cCzClUSHYVdO W1mg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=bnhQvt8tLlLK8HqzhbyOPO7rNkMl0wx1+fp6Yv1vbMg=; b=AelBUP47IrlWSfpTT0bqPiAQnRrId78Wd9t5mRfqeo6XSY3mR2e+Y4cJGrhTMo/1f9 N2FxBbIxuvcijL/weIPvehJP4zq19GBUP+KM+uaLeNT9PjwAIi1MCox6TS8ctN7QL40p rb6vhPMh/R1qOlGkHTEh0tLr41V0PdOhUJz890b3BCSw45PlLo5/adJ7UANFTBDxIaeJ 2TEyN9odMoUryQ6/Tfak/FW39f/Dhn6J4V/pyx3wBTYR3ySuGA8x6zoITpO/APMN+4O+ o3fpeK25F25CgNYaNitYa/1n63iXOL2Mm11XpYNPvaQNEwLg66YQjVpM8hGgAtVthLRz gm8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b="K6H/hRD+"; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ka9-20020a170907920900b0094f39912758si4112179ejb.375.2023.04.17.08.00.28; Mon, 17 Apr 2023 08:00:29 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b="K6H/hRD+"; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2D51F68BE32; Mon, 17 Apr 2023 18:00:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f176.google.com (mail-qt1-f176.google.com [209.85.160.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 20B5268B7D1 for ; Mon, 17 Apr 2023 18:00:18 +0300 (EEST) Received: by mail-qt1-f176.google.com with SMTP id fv6so12085565qtb.9 for ; Mon, 17 Apr 2023 08:00:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681743616; x=1684335616; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=J9cN510tH/irE9FLJHByrDf2zY7BcfFHwZmiqet8ojE=; b=K6H/hRD+L4OqUHf09aV/SfV311DHHuc6RyS8vHul5cN3nUkl76IwOf/I/NWPTNHwy2 kly4BQn/UTm9D+dSwTAUQUOjoFcDWtTee4G0fGmVH0borwn9oEVB4I/cHZuUMzyvXbY1 U3VyI+VcoLKEei190acSqnUG/7UdnPcTGZ0yP1bCIsbDPD7MsBTg6F2ubdXUWA9PZPiV W+4ykF4LNzP+Rpop9fQrntJCHGu1yMpLI/U4M4V7K8GVrXc2xv2yKm0SWxz+rrnteZP+ sjtzB0sfougm3f7lDji0hD78MIdIz/29YCzdV81FJoQSnkBf1YeC54kU5sunTOtP0uQc IYZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681743616; x=1684335616; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=J9cN510tH/irE9FLJHByrDf2zY7BcfFHwZmiqet8ojE=; b=WHc7p2uqRMAmFBTX4/idtVsyfA3ADYm4O0V1ghLuaFawEOkT9xkLFhP+nysPjmhLFp sdhsm47yjK+Nu0PbVLop3Y8Y5FEnKEOEQIGwkYSiqaoLEHfMe6UGYHRnHxxDCV15MJ0+ 4xqahX9i7CDbKNAWgCJ8PLofDYM2JkRQJecFecIpLXdWHkwRa5i8+ncxsQBzjAKwWaFJ WUFE042WlKh3IW7n33J6EPglcAd0aWfztpuVoOPB3XSjugH96Kcd7gl12tU9iboQwg3n rcJsG5MuMomYIzW+0mRe2kHU6uivNpQU0JS8jjC6UrImhgNMFUp8i9QdD3l4+Lb3sIU2 Gy/g== X-Gm-Message-State: AAQBX9fdGPM64euUKLhjOgZoq/9BBQg3O2nGUiThlm/58ImA6bvTl+qa gBQSOwiyGQWqLRPjl403B4VrchARDVQ= X-Received: by 2002:a05:622a:341:b0:3eb:14a2:2fe0 with SMTP id r1-20020a05622a034100b003eb14a22fe0mr15010203qtw.6.1681743615716; Mon, 17 Apr 2023 08:00:15 -0700 (PDT) Received: from Ronalds-MBP.lan.lan (2603-7000-3a00-0b4d-84a5-03fa-90c5-7385.res6.spectrum.com. [2603:7000:3a00:b4d:84a5:3fa:90c5:7385]) by smtp.gmail.com with ESMTPSA id s21-20020a05620a081500b0074abbf22b68sm3160295qks.136.2023.04.17.08.00.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 08:00:15 -0700 (PDT) From: "Ronald S. Bultje" To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Apr 2023 11:00:10 -0400 Message-Id: <20230417150010.64865-1-rsbultje@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] yuv4mpegenc: add bitdepth multiplier after rounding 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 Cc: "Ronald S. Bultje" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: W1u1XNc5+GWu Fixes output of HBD odd-width chroma. --- libavformat/yuv4mpegenc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/yuv4mpegenc.c b/libavformat/yuv4mpegenc.c index fc6b08e0cd..2fa5ee2714 100644 --- a/libavformat/yuv4mpegenc.c +++ b/libavformat/yuv4mpegenc.c @@ -195,13 +195,14 @@ static int yuv4_write_packet(AVFormatContext *s, AVPacket *pkt) /* The following code presumes all planes to be non-interleaved. */ for (int k = 0; k < desc->nb_components; k++) { - int plane_height = height, plane_width = width * desc->comp[k].step; + int plane_height = height, plane_width = width; const uint8_t *ptr = frame->data[k]; if (desc->nb_components >= 3 && (k == 1 || k == 2)) { /* chroma? */ plane_width = AV_CEIL_RSHIFT(plane_width, desc->log2_chroma_w); plane_height = AV_CEIL_RSHIFT(plane_height, desc->log2_chroma_h); } + plane_width *= desc->comp[k].step; for (int i = 0; i < plane_height; i++) { avio_write(pb, ptr, plane_width);