From patchwork Sat Mar 27 23:36:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 26627 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 8CF8444BD86 for ; Sun, 28 Mar 2021 01:37:04 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6B6F568A5B5; Sun, 28 Mar 2021 01:37:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 382AD68804B for ; Sun, 28 Mar 2021 01:36:57 +0200 (EET) Received: by mail-pj1-f41.google.com with SMTP id j6-20020a17090adc86b02900cbfe6f2c96so4184263pjv.1 for ; Sat, 27 Mar 2021 16:36:57 -0700 (PDT) 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=weWN+Yr5Q5RA7Q9dZXoEyrnjpKuDpiwMqJj0MT+YyhE=; b=un/CvSgCAKE+lpN5Z/0evGzwuxOWWFb/lC8k0f19QFCDbk15I49zQeHDcsy41XzQ5o wodUqKsGRTURaiHP8clKaeoq1lQxk1o/4OP9FTf+UNlCilwiORSPBdJIZn7gHIVOWkMl x46WyBMNMjsECVFjFGYC7ysR62EV8LTit5Xz84vEZJKfGt7PA6delvbgqUjZL/srheI4 G761p4pY58EkVt7dJIvR3aq1ITH+oNXxg5v7p3Jn5tcwoZa9fKodJVtMY6LKXoSm0bLP ukOpeAxxGjz9OGfvZsezXQZXnQfIA/uPXixW0+yrcM3UDeXxkOV638+urAvdN4byouAM jMRg== 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=weWN+Yr5Q5RA7Q9dZXoEyrnjpKuDpiwMqJj0MT+YyhE=; b=Mx4MtFnD0y9d6vKZuXKeOPXiwRoDIzQfOYOiCrnWWQkkN6G0BPuTq/7A29WCQXskcB aR9c1cTm1djKzMmrq0u81H4jVxjqQNIBaVg83vnhzrAkRiITF8VVkVXSGhq+cVwGwLO5 bBFNVvPIuirns82UzKHsVSw0vpitZNb39pVuP1KGpcQSlpeo9fCeyEyHnOTPXf5KkUK+ 4QMKDBBSadi25/Et08KVikKQ5elwsXcHaKsArdoIuH7JcT3nUGb7WlhOE7WzeQ3Ig6As 5KGJTvdcn1Ww7exPd40Kt36wBAmUjGe88tf4GKLWrZB7NhnemTZpJfoQ3PHDP7uuMokC RdBA== X-Gm-Message-State: AOAM530hyhVHX0MWeFQ3qfuaDVLCmf/2y3NElD9KrwP3Vhld+SVwfopJ t3gAsrSySd5IEAxMXisu3kg19wVW3zEuBPEBwOCJyh6BFW+2mQ== X-Google-Smtp-Source: ABdhPJwSaV60fqA7Sj3KV2WlazlsCiO8Q74uJ+y5mRWqj7+dDv0g3OIGMWrdqWQpCKWlyMTyfm9N3lXMQhhThzIg0do= X-Received: by 2002:a17:902:d4c2:b029:e7:32bd:6b77 with SMTP id o2-20020a170902d4c2b02900e732bd6b77mr9407008plg.45.1616888215420; Sat, 27 Mar 2021 16:36:55 -0700 (PDT) MIME-Version: 1.0 From: Carl Eugen Hoyos Date: Sun, 28 Mar 2021 00:36:44 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavc/mjpegdec: Support pixel format 0x41211100 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 decoding of a sample mentioned in ticket #8930. Please comment, Carl Eugen Subject: [PATCH] lavc/mjpegdec: Support pixel format 0x41211100. Fixes decoding of Nene421-ycc.jpg --- libavcodec/mjpegdec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 5583d2aa35..0731be7af9 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -624,6 +624,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) break; case 0x22121100: case 0x22111200: + case 0x41211100: if (s->bits <= 8) s->avctx->pix_fmt = s->cs_itu601 ? AV_PIX_FMT_YUV422P : AV_PIX_FMT_YUVJ422P; else goto unk_pixfmt; @@ -2647,6 +2648,8 @@ the_end: avctx->pix_fmt == AV_PIX_FMT_YUVJ440P || avctx->pix_fmt == AV_PIX_FMT_YUV440P || avctx->pix_fmt == AV_PIX_FMT_YUVA444P || + avctx->pix_fmt == AV_PIX_FMT_YUVJ422P || + avctx->pix_fmt == AV_PIX_FMT_YUV422P || avctx->pix_fmt == AV_PIX_FMT_YUVJ420P || avctx->pix_fmt == AV_PIX_FMT_YUV420P || avctx->pix_fmt == AV_PIX_FMT_YUV420P16||