From patchwork Fri Mar 29 22:23:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: matthew.w.fearnley@gmail.com X-Patchwork-Id: 12535 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 0AB8844786A for ; Sat, 30 Mar 2019 00:24:29 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DD029689D13; Sat, 30 Mar 2019 00:24:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 86E30689CE8 for ; Sat, 30 Mar 2019 00:24:22 +0200 (EET) Received: by mail-wm1-f45.google.com with SMTP id w15so4503570wmc.3 for ; Fri, 29 Mar 2019 15:24:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=Iel5Wmul4rGqGXmGt+wsVZENQSb9m9FkYuQ3IeRgaZA=; b=VypnSqhk0HZ/JkyVONkW+jWc7D6YJtaj8RHAHLlkjiE+iberqB83B6wB/m4ZcaHFbK ExHmRfAGK/lKmy/kBxX8etKKiYdnCxpwG9YYC/u3BRHAJz9f2VeMFzGVJWyXyYa9xyur AEk4HnXSctAAxnXFp3R8G7xxdkCD9Qk0Lv8FJ28rm21tuEBB7MtR0QFyXwtsmCPboFxf i/3Zzsfcyj4MJBbvE27FqZSLYAS99VQ24pw00F+3QzTAHVDqFftlr6VthOSzQQJCmOTV Exurbp++/dO/iQhYr6H+qPBkEIb/Jc9hyRowlMmpZlBFytnQjwOVqfxFXCH1LnL7cqc0 ZL7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=Iel5Wmul4rGqGXmGt+wsVZENQSb9m9FkYuQ3IeRgaZA=; b=YwmiSG/vIlLXGjuLp8819QwEHe+U+CO5XonGz5QNSkGGNjzqgd6ZEceywhipUiK36I ElNA8GkSMxq2buXMAPz1SyDEzx3GAr0nbYpgBbtGzJ/BBpa+XSTSfifjfKrlqmCDl8/L ewpiEr5cFCFrzTCEB0c5vH4MmyxgXRZvH5sM5RM6dyhgDIFl66UP9pQsSJl+ZMcyjBVC XZrVVmkP9Zik9g6VTlN6AuUA+GzwLRB2ROKaSjvXtf3Th5DdvMqQl3uBbVAITmsFx7oT 5z7SJGlvxoPP7WwfL3IWtVuHJbsflC3Ihc3HgF5A+VjwK//IBRwXyrFahjT9svvtoBow HecA== X-Gm-Message-State: APjAAAWs/c3cVija5vq3wlBAAVYT/QTr4dHWmjfmh8jNhwPrFVVg6j9w Bq4KDddIbXyT0uWMzgSM7b3TjH7CW+gqgfnfzLsUvA== X-Google-Smtp-Source: APXvYqwbcFJkWxT+uoUu17Roiua5zyn7RSKxt5IsvcLwvsj4Z9eLk60oloWhaqpdypV1eXNrJ+j1MSxJqjsmRzjuPk8= X-Received: by 2002:a7b:c923:: with SMTP id h3mr4948954wml.34.1553898261750; Fri, 29 Mar 2019 15:24:21 -0700 (PDT) MIME-Version: 1.0 References: <20190326221306.1004-1-matthew.w.fearnley@gmail.com> <1553679724.19307.7.camel@acc.umu.se> In-Reply-To: <1553679724.19307.7.camel@acc.umu.se> From: Matthew Fearnley Date: Fri, 29 Mar 2019 22:23:44 +0000 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: Re: [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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" On Wed, 27 Mar 2019 at 09:42, Tomas Härdin wrote: > tis 2019-03-26 klockan 22:13 +0000 skrev Matthew Fearnley: > > 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. > > I can confirm this > > > 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. > > I think it'd be best to split this off into its own patch, even if it's > trivial > Yeah, I think you're right. I'm attaching two patches here, if that works.. > > /Tomas > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". From 905eb8b403281f180148bef50804af740d411b54 Mon Sep 17 00:00:00 2001 From: Matthew Fearnley Date: Fri, 29 Mar 2019 22:03:03 +0000 Subject: [PATCH 2/3] libavcodec/zmbv: use PTRDIFF_SPECIFIER for `src - c->decomp_buf`. Other bit depths saw this change in ced0d6c14d, but this instance was presumably missed because of the #ifdef block. --- libavcodec/zmbv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c index 71ec2cd424..898b62d065 100644 --- a/libavcodec/zmbv.c +++ b/libavcodec/zmbv.c @@ -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 -- 2.17.1