From patchwork Tue Mar 26 22:13:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: matthew.w.fearnley@gmail.com X-Patchwork-Id: 12457 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 3227C448CA0 for ; Wed, 27 Mar 2019 00:14:41 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0C34168A889; Wed, 27 Mar 2019 00:14:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0D94268A7F4 for ; Wed, 27 Mar 2019 00:14:34 +0200 (EET) Received: by mail-wm1-f53.google.com with SMTP id z11so14391622wmi.0 for ; Tue, 26 Mar 2019 15:14:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=kqdgKHiUupGmves+s+xgE5+ZonqnKjo33vgo3lnn4W8=; b=jWSP9jDeFx7W2Cq49qTUZ9Zr92QMqXVg8FsSzFg+rMEyatpO7w616mwZXjOv7zbtgX TlKdJkxGkvLZIYgek8/u/0T44HGMnTaQguRezvDkkMVKqDxJ/JmIR2oG45nNJu/Oajvc wKm7kPO3RVi4i5aj4hgLIWBAB8Bc8/V0Yttd2nQXvf58zIGK+/eez4zZujz7eG6s1VJ/ NUthKUcNURF9UCL99QnFxOKtTuez839aVk+sS+HCA8ydJB1HnqmjPkcd2w69VU/WXuoO 0H8hA43Uhbmp+GAlGB+U+uMbz+o2r2xKOKG2dVebmIXfieJz0wVslq3DXAvXh1/z9G1K MiBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=kqdgKHiUupGmves+s+xgE5+ZonqnKjo33vgo3lnn4W8=; b=TFGAzez9oNyefu0Zch3PtAqQSUj4hOD1CwWy72SDarbLUZ/7HdPNwbqJs26VU89V6j ljY1f6TxZvkG/eT0TqRqJRSRil78IW2S9EXFjGwTpnMGpi5RFYyujbA5QJRe7brtvZnt oZ8P61KPtD7eS18RxTkqFrvTUILqGe2nU2rOF4z/duNPTIHcGctbQe4j/LUXGESYwX86 sJxbfuUveWERwc/PadPzk899Ni0TbEoTyFgm0e5hVuRMjimUg40ihg6ZxQHvu6Y91QR2 INcurfkWEjgRlnj7JrARJUy2JVf0sqGA+W8fOXt1TYzXD1WxeC2pfnKZgjsixeTcOEJw gKmw== X-Gm-Message-State: APjAAAUFew0CDJy2CszH12tuZGXXMe5vkV9p/dtZyIPFip9Rm0B2QOw2 M7QkE1JYdCURO9RW+orsXqVIutih X-Google-Smtp-Source: APXvYqzlJa8O4/j+g+kiNZPUSH7DN1PtOfmAgEbYmQqtzKJY9hRSKsMX9CoXtKRSN3EWmq380pjfoA== X-Received: by 2002:a7b:c099:: with SMTP id r25mr7236270wmh.143.1553638473171; Tue, 26 Mar 2019 15:14:33 -0700 (PDT) Received: from localhost.localdomain (cpc131498-bagu18-2-0-cust88.know.cable.virginm.net. [86.9.33.89]) by smtp.gmail.com with ESMTPSA id g12sm17162853wrw.40.2019.03.26.15.14.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2019 15:14:32 -0700 (PDT) From: Matthew Fearnley To: ffmpeg-devel@ffmpeg.org Date: Tue, 26 Mar 2019 22:13:05 +0000 Message-Id: <20190326221306.1004-1-matthew.w.fearnley@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/2] libavcodec/zmbv: change 24-bit decoder channel order, from RGB24 to BGR24 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Matthew Fearnley MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This brings the channel order in line with that used in 32-bit mode (BGR0). 24-bit decoding is disabled by default (#ifdef ZMBV_ENABLE_24BPP), and no prior encoders or sample videos are known to exist for this bit depth, so I consider this change in implementation is unlikely to affect anyone. The decision has been made in agreement with the DOSBox Development Team (dosbox.crew@gmail.com), specifically with harekiet, who wrote the original codec. Additional minor fix: use PTRDIFF_SPECIFIER for `src - c->decomp_buf`. Other bit depths saw this change in ced0d6c14d, but this instance was missed, presumably because of the #ifdef block. --- libavcodec/zmbv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c index e07009d0fb..898b62d065 100644 --- a/libavcodec/zmbv.c +++ b/libavcodec/zmbv.c @@ -303,7 +303,7 @@ static int zmbv_decode_xor_24(ZmbvContext *c) prev += stride * c->bh; } if (src - c->decomp_buf != c->decomp_len) - av_log(c->avctx, AV_LOG_ERROR, "Used %i of %i bytes\n", + av_log(c->avctx, AV_LOG_ERROR, "Used %"PTRDIFF_SPECIFIER" of %i bytes\n", src-c->decomp_buf, c->decomp_len); return 0; } @@ -473,7 +473,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac c->bpp = 24; decode_intra = zmbv_decode_intra; c->decode_xor = zmbv_decode_xor_24; - avctx->pix_fmt = AV_PIX_FMT_RGB24; + avctx->pix_fmt = AV_PIX_FMT_BGR24; c->stride = c->width * 3; break; #endif //ZMBV_ENABLE_24BPP