From patchwork Mon Dec 17 22:55:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 11453 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 9A56344D340 for ; Tue, 18 Dec 2018 00:56:00 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BF0B568AC4D; Tue, 18 Dec 2018 00:56:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f46.google.com (mail-io1-f46.google.com [209.85.166.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C45C968AC3F for ; Tue, 18 Dec 2018 00:55:54 +0200 (EET) Received: by mail-io1-f46.google.com with SMTP id w21so11363108ioc.1 for ; Mon, 17 Dec 2018 14:55:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=bXaLS6f/9d8oFRagOG50Tge6bY1sEFhne4+X3yokmZY=; b=dm85s3xIX9Bz9zP5DZqIdcRTGcQpcw2zF/PTs8QFuyRyhohdZVsanrvuexwFjtpjQU PsHXkXcd9NVx1kewqji00k//DuGpWrtMSzJ5d5dVfeTyzrzOL5heOmMxY53xqz4f2l4t u8TYS1eewgmDg15Wjn6etcpqHBszoxoTpxPIVvU8cFl3JeDdDK7BKySjouvhTLOUK65e mAjZE5JVoqVEGwDDhs6QONpfHnlHQik+dBQ5MQM8uARUxN8IwZ1XWhaL8RCu0P7skx5T C7IRPcfbw0j6MvsUE7QXtEryZawHPWrlgkEfLr2wU0fU+Drlto06Q8sn3+eBNFbyaaKk 3nBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=bXaLS6f/9d8oFRagOG50Tge6bY1sEFhne4+X3yokmZY=; b=RJ+mCYepct4MHX7i7yDHcIzVvYfC0E1w7ytcXdlUq1ZKAKAu21RSMTSf3/6MOUSTYi jsQ9SP4ibeZ91369bMPyak1cLVi/r/v9pvf6LTbBHGeP5dZ8i49JM/ypP3Ueh16td5sS LoePJc1vlNWGQNsI+4AhDq9W82kQv59qKpBnBzBerWhERebJAABtalKJ88R5vpdCLTsg xAFfhFEeUIPO8Xy0opQo1AqdeXsNmKhMq+v+OsV5s2gyyrf9ShIU9v+26VvDaizKgFbp D+s0gH/8+lbALtEb6HI/8w7Bkom+zWLlX7plY4baaKC7dpzxIUeGsI2KbZfT6qyae47U 6mFQ== X-Gm-Message-State: AA+aEWbwLcWYkGbYdP9Nu90JENJYlAoSt2eOfxpvGZGgJXt+hbz2a4R9 m6dGP74wo2xEpLdx8PHH6Y0r+rVyvQ2pcwuwQQkQ6g== X-Google-Smtp-Source: AFSGD/Wb/IASvWKiOQmhli1JxJ88pmBI46FEctKXGGunR3Dxh2MiEMJGBnNV9aJXIJJHs0oD7KZkh5hLXqXOoroOr6c= X-Received: by 2002:a5d:8347:: with SMTP id q7mr2977552ior.49.1545087354737; Mon, 17 Dec 2018 14:55:54 -0800 (PST) MIME-Version: 1.0 Received: by 2002:a02:5f11:0:0:0:0:0 with HTTP; Mon, 17 Dec 2018 14:55:54 -0800 (PST) From: Carl Eugen Hoyos Date: Mon, 17 Dec 2018 23:55:54 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavc/mjpegdec: Interpret three-component Adobe transform 0 also as RGB 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" Hi! Attached patch fixes ticket #7625 for me. Please comment, Carl Eugen From be83e6c657b8d8e2a158747b58c4dbc6ba3cc516 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Mon, 17 Dec 2018 23:53:29 +0100 Subject: [PATCH] lavc/mjpegdec: Interpret three-component Adobe transform 0 also as RGB. Fixes ticket #7625. --- libavcodec/mjpegdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 2f16358..4cab660 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -488,7 +488,8 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) if (s->rgb) s->avctx->pix_fmt = s->bits <= 9 ? AV_PIX_FMT_BGR24 : AV_PIX_FMT_BGR48; else { - if (s->component_id[0] == 'Q' && s->component_id[1] == 'F' && s->component_id[2] == 'A') { + if ( s->adobe_transform == 0 + || s->component_id[0] == 'R' - 1 && s->component_id[1] == 'G' - 1 && s->component_id[2] == 'B' - 1) { s->avctx->pix_fmt = s->bits <= 8 ? AV_PIX_FMT_GBRP : AV_PIX_FMT_GBRP16; } else { if (s->bits <= 8) s->avctx->pix_fmt = s->cs_itu601 ? AV_PIX_FMT_YUV444P : AV_PIX_FMT_YUVJ444P; -- 1.7.10.4