From patchwork Mon Jun 18 20:19:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Buitenhuis X-Patchwork-Id: 9440 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp4218364jad; Mon, 18 Jun 2018 13:27:44 -0700 (PDT) X-Google-Smtp-Source: ADUXVKI+ln+r3gAr5J5Q/jhOiFKBEdY8218xZvmi+8P3ozXrxDGqUXPyv6yOzHuSBaohm3nSn6zP X-Received: by 2002:a1c:b484:: with SMTP id d126-v6mr9805094wmf.0.1529353664513; Mon, 18 Jun 2018 13:27:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529353664; cv=none; d=google.com; s=arc-20160816; b=a6Hrltx2A+l4l5zR0UbRgfYvNvI4NzJgPIOyzHO62lzuhVdJeMAoOLsgK/83GR4GZx t1KuxQK1aYH9YvEOvHSXYzSHuSQKUAlsOM99LGbwJl+OKj776ARlHDXQF9f3lxpIr+xg 23mNS0oGS64kyHwu8gZZ8cSs8StZbkj7P2rI3fWHawCrI7MijnCDJgT7Cbn1SCK9L0mS YY94R+3Xl11Q50bojSQobKe95Z2ge0AHkE6KpPKJfXMK2quEGYOmN7DAXQX1uVTYknn6 2l3OpBr72pYSTcfDrkQBBf/4ojWMfoXVYqnEVF4Kiz7DJnFzKYuvvTH4/L5rb8/60MH/ AZ4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=0rWbU2F4ywzF0v0FmG8DAZC9W02vjEfLHEASgIYjB2w=; b=ZKNS93RwGYRQK4+cbPS1ZTZ4lnskd55q+xke3jlKWmn7Qos+O1U4GGz13HRJoU8Fk7 dHRUQKfs4okaQmvxdgL/pxq+/JEpA+lhg89vKC90O/BNE1xLoNIfBil89nZGfrB33b/n ZkpxJJj52p/y+b8hSseMgs3B+1KHGjmt8u9rfFZ6CLpJ2ZPd42p7To0V7ClEWStWUkhH nBBZaFerHdG8BRWiBfw/FiEYg1FnOUa58iEh3dLzZe9YvkbwUTyByRGaxA9XjDBHzKuq MDBA5yVzZ+gR8gDzM/TsqvCKugF1L/fhqgPh0NoaiH79zLl3X4/nj8nY/vaxYwwtqQBH 81Ww== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ek0tdBbP; 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 n14-v6si5169757wrq.29.2018.06.18.13.27.43; Mon, 18 Jun 2018 13:27:44 -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=20161025 header.b=ek0tdBbP; 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 3FF84689B0D; Mon, 18 Jun 2018 23:26:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 91CB2689AC4 for ; Mon, 18 Jun 2018 23:26:43 +0300 (EEST) Received: by mail-wm0-f65.google.com with SMTP id e16-v6so16201946wmd.0 for ; Mon, 18 Jun 2018 13:27:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=2kCRRCRWcyeeZdGIc/0TxEF4uhS4duPSUIktPznv1E8=; b=ek0tdBbPLLvnHyGQL8PMVw40AzUIRaMzGHIQcHmj3qK/oIl+XoZcwWtbsoMIgQ1IBp SfEZ2eLzhiaCOwa6fueNt6J1AoW/VnCPrRXIurjSf6kO80LayRHzynUCWmeUPJagho+t JNNaveRmW1U1AfZMWTib+i4svJYa9jEg/nlN3FNTAkXQW+V2S2AXE5Smj54SRIeiat6i wLuydhzCwTJK3qSF9Ci7IdcDs4s0JE96N0xL6ZNU89s4ByruZ2RfGWU3HTxnOiLQM/+T asT+8mYeyD4E7DjDXatF1/2grBHSaAnEmSnkRGSqg6NY9oQgyjaYq4jCy5/xf6DQmXbb uLGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=2kCRRCRWcyeeZdGIc/0TxEF4uhS4duPSUIktPznv1E8=; b=EexQ9cvRSPKFozfgDEiLgO8upkU+LqE7679lpzznDhCsxSgd753NMbK5iyW6Lr13WL ImUuh+DpjFEGBsl2dDKrMJXspLcYzZt9vB5DJMBRXeqnK5q6GzTg5205K2BZQ9couyEq POtg3S6ARE2tUrYGLTmhgKifnVGdtmnu2mEXH3mPodcQdnSI+k60BZbY3LiP76nM0+zd ECoCwGSeXAL/FT9pdXJWg7wi/rCRm0JjEkmRky/s7tHr23AjLM+4eeY3ec/p9tWjB0o8 X4NddgLObVBoMcDUu21ycyOrIE5ZmBe7/S6h1Q1hBTCnWHqZUGIpMVAX6ChG3vDnyaVN JRYw== X-Gm-Message-State: APt69E2E+PVskB3ntyRDqkrXD2VbP2IT8pmjT/K8WMGU0w3uZZcpq7/g BJf4proU7Yx4jJDCLRNkINMffQEX X-Received: by 2002:a1c:5f0b:: with SMTP id t11-v6mr9457258wmb.23.1529353200528; Mon, 18 Jun 2018 13:20:00 -0700 (PDT) Received: from localhost.localdomain ([81.2.162.105]) by smtp.gmail.com with ESMTPSA id l15-v6sm16370708wrs.95.2018.06.18.13.19.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Jun 2018 13:19:59 -0700 (PDT) From: Derek Buitenhuis To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 Jun 2018 21:19:30 +0100 Message-Id: <20180618201930.84734-1-derek.buitenhuis@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] mjpegdec: Support 4x1, 2x1, 2x1 notation for 4:2:2 chroma subsampling 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Just one of the many, many ways to store this stuff in the header. Signed-off-by: Derek Buitenhuis --- Related reading, but not exactly the same type: * https://github.com/libjpeg-turbo/libjpeg-turbo/issues/92 * https://github.com/libjpeg-turbo/libjpeg-turbo/commit/8ce2c9119a995ef6280f8bba375aac7effb9b571 --- libavcodec/mjpegdec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index d1dca84d36..e5888ed548 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -568,6 +568,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) } break; case 0x21111100: + case 0x41212100: if (s->component_id[0] == 'Q' && s->component_id[1] == 'F' && s->component_id[2] == 'A') { if (s->bits <= 8) s->avctx->pix_fmt = AV_PIX_FMT_GBRP; else