From patchwork Wed Dec 6 20:10:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 6569 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp7407780jah; Wed, 6 Dec 2017 12:17:27 -0800 (PST) X-Google-Smtp-Source: AGs4zMbDkosTEpY32DVsdKKxKQQTpD1IpcwxNZVg8TEbS2Rbyi/ERHAcqH4McUB7MUwJZDqWzHxo X-Received: by 10.223.130.47 with SMTP id 44mr20066102wrb.59.1512591447426; Wed, 06 Dec 2017 12:17:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512591447; cv=none; d=google.com; s=arc-20160816; b=1GwJbZ+V5PsNoCsclcDx2s1KVTWjKwPqi2x61wUw8eGI1XzcCSK+GtWVUS3R2rOo4b 6rgfs0T/sMQb847hCplzXqLghzAwEpAOcM654Z5fo5R6GCKZqCrMMdLfTHKvPyzwE1lo gA0n9uaCgQVQxaWGuOWn7PvuOUfiL+/yL1Tc6qX1LUuyHrp7g3Q6I1gBefMPcgiVR2jy p7sGi0v7J5lNWhHc//gNfGjfUOc4wTgxjqnNv8jA20UlstTu7KF8cx6Tz3qROyNTl9r9 HUUl5oe3JkhVoPAcdTk7jwCrvnzt7laJmTFlWhogaL8EA6c3JUonW3SUubIN2XXK8h+S ICdA== 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=DB7q2GWK35gAK/F7DspoJlAdP76c8UU2MdBrtp8vHNI=; b=YeEyAgz6H3gyV1xPKts6MACGTYGKczWlymdlcHNRigh7gKrE2vj/GfL5izBCXiV6vK O/52DPW8M2wcjeVWv3Xc+b5ESxxfByzmm4rkwC1efxs603oFX/atSmvngFtknSj9RcxC nsQpxibVQpd/sSre6ZBURAFqYuU2KHvF4jjU5T50uleT4495tGCDTlgbsRTQjp0mORoA hX+roq4tqIOoSkyXdUBbhHm9vV5utuHnoX7X8k6RmBXognfR9S2bT4SM7kwAO/GRIrQ9 aSKIk4fOfSnvBjJFb6orIGBxeYDKNj3qQ7tyn6e3DwfhqxhRPv36lnO/i7ELbZblSkoi AoYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=h4IRo263; 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=NONE 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 e7si2665314wrh.436.2017.12.06.12.17.27; Wed, 06 Dec 2017 12:17:27 -0800 (PST) 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=h4IRo263; 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=NONE 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 C602F689FCF; Wed, 6 Dec 2017 22:17:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D7B7F6882A2 for ; Wed, 6 Dec 2017 22:17:14 +0200 (EET) Received: by mail-wr0-f196.google.com with SMTP id z34so5177605wrz.10 for ; Wed, 06 Dec 2017 12:17:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=ppvpuNfg1Ai0UHIgFntmFKH4hXiZBYDmf+lnx2k3r3c=; b=h4IRo263Geaeq4DYOFr3HgZlNCPtx09Ag0RAaoAARSjXOMmhPpYWBaLCNMhkFKPV1+ j/smOQtu6qZLWduRMHl2ziQRMcNT2ywWTvGapwPaWUzkrdgF+j58vuUiMjhCOZr1wD+V eeQNE2wTcqbMvV601VU9D+YwBujdlhtNOVL3n0K/mRUFJMFWQnW3OQDPzC0RIpLQaVBE 9JIn+LKTDs1knjHO9Q5ovuVKR4+PdKqvulOLIZEgHt9Y8ZhWUKCEmVljASrZIXONpFb7 POnGfS1C7K95UtGj4jw7WRzHelyEvPeyTlmv+FeBB3DMr02ptKPh/YiHR6BTg/rSiw6f QvOg== 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=ppvpuNfg1Ai0UHIgFntmFKH4hXiZBYDmf+lnx2k3r3c=; b=afwtU21or/htLnu4BWsZxz1HmIXxMOf6V1gN8KpH4UIc50aQOVNUBdXBBqIoeaFZ08 WUv86uZpVt0XVBVpWDofdKwExdEQR5WJ6mHM62sDOxjguBfZ+KlyrzO56qJgR1TR2Z1I Z4aqYYOgPipwyLR68kQZViXXmmvzbL7F3M9a2KRYorvuag5tRnH3Pp1fjsiL472Ci0Cn bS50Rdu+eZsFnh8FTwVMids7TkPItKvHaWyrB1HGrbnXqO4fI8LE/DG6YWlF1T9kfuZW ++Az965oTQCLC/c0mIQRp1b7OlKjckt46H9XDpuM+sAiffoFBWzb6PYCPoTiDsaAaYe/ HDVw== X-Gm-Message-State: AJaThX7Ho15UC5lvE1znyuLrQ0XDzzp9YPMrqO7IlwJeCr39+aLNvUCD KtmMGdNqmA4lHDwbrYL8gs34pg== X-Received: by 10.223.160.61 with SMTP id k58mr19821155wrk.252.1512591064963; Wed, 06 Dec 2017 12:11:04 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id 52sm4662782wrv.8.2017.12.06.12.11.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Dec 2017 12:11:04 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Dec 2017 21:10:21 +0100 Message-Id: <20171206201022.11073-1-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 Subject: [FFmpeg-devel] [PATCH 1/2] WIP: remove YUVJ mentions 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" Signed-off-by: Paul B Mahol --- libavcodec/mjpegdec.c | 18 +++++++++--------- libavcodec/mjpegenc.c | 4 ++-- libavcodec/mjpegenc_common.c | 5 +---- tests/fate/vcodec.mak | 12 ++++++------ 4 files changed, 18 insertions(+), 21 deletions(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index e005dd0cd3..55676d8576 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -467,7 +467,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) if (s->component_id[0] == 'Q' && s->component_id[1] == 'F' && s->component_id[2] == 'A') { 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; + if (s->bits <= 8) s->avctx->pix_fmt = AV_PIX_FMT_YUV444P; else s->avctx->pix_fmt = AV_PIX_FMT_YUV444P16; s->avctx->color_range = s->cs_itu601 ? AVCOL_RANGE_MPEG : AVCOL_RANGE_JPEG; } @@ -509,7 +509,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) case 0x22122100: case 0x21211100: case 0x22211200: - if (s->bits <= 8) s->avctx->pix_fmt = s->cs_itu601 ? AV_PIX_FMT_YUV444P : AV_PIX_FMT_YUVJ444P; + if (s->bits <= 8) s->avctx->pix_fmt = AV_PIX_FMT_YUV444P; else goto unk_pixfmt; s->avctx->color_range = s->cs_itu601 ? AVCOL_RANGE_MPEG : AVCOL_RANGE_JPEG; @@ -517,7 +517,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) case 0x22221100: case 0x22112200: case 0x11222200: - if (s->bits <= 8) s->avctx->pix_fmt = s->cs_itu601 ? AV_PIX_FMT_YUV444P : AV_PIX_FMT_YUVJ444P; + if (s->bits <= 8) s->avctx->pix_fmt = AV_PIX_FMT_YUV444P; else goto unk_pixfmt; s->avctx->color_range = s->cs_itu601 ? AVCOL_RANGE_MPEG : AVCOL_RANGE_JPEG; @@ -549,7 +549,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) } else { if (pix_fmt_id == 0x14111100) s->upscale_v[1] = s->upscale_v[2] = 1; - if (s->bits <= 8) s->avctx->pix_fmt = s->cs_itu601 ? AV_PIX_FMT_YUV440P : AV_PIX_FMT_YUVJ440P; + if (s->bits <= 8) s->avctx->pix_fmt = AV_PIX_FMT_YUV440P; else goto unk_pixfmt; s->avctx->color_range = s->cs_itu601 ? AVCOL_RANGE_MPEG : AVCOL_RANGE_JPEG; @@ -562,7 +562,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) goto unk_pixfmt; s->upscale_h[0] = s->upscale_h[1] = 1; } else { - if (s->bits <= 8) s->avctx->pix_fmt = s->cs_itu601 ? AV_PIX_FMT_YUV422P : AV_PIX_FMT_YUVJ422P; + if (s->bits <= 8) s->avctx->pix_fmt = AV_PIX_FMT_YUV422P; else s->avctx->pix_fmt = AV_PIX_FMT_YUV422P16; s->avctx->color_range = s->cs_itu601 ? AVCOL_RANGE_MPEG : AVCOL_RANGE_JPEG; } @@ -570,13 +570,13 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) case 0x31111100: if (s->bits > 8) goto unk_pixfmt; - s->avctx->pix_fmt = s->cs_itu601 ? AV_PIX_FMT_YUV444P : AV_PIX_FMT_YUVJ444P; + s->avctx->pix_fmt = AV_PIX_FMT_YUV444P; s->avctx->color_range = s->cs_itu601 ? AVCOL_RANGE_MPEG : AVCOL_RANGE_JPEG; s->upscale_h[1] = s->upscale_h[2] = 2; break; case 0x22121100: case 0x22111200: - if (s->bits <= 8) s->avctx->pix_fmt = s->cs_itu601 ? AV_PIX_FMT_YUV422P : AV_PIX_FMT_YUVJ422P; + if (s->bits <= 8) s->avctx->pix_fmt = AV_PIX_FMT_YUV422P; else goto unk_pixfmt; s->avctx->color_range = s->cs_itu601 ? AVCOL_RANGE_MPEG : AVCOL_RANGE_JPEG; @@ -584,7 +584,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) case 0x22111100: case 0x42111100: case 0x24111100: - if (s->bits <= 8) s->avctx->pix_fmt = s->cs_itu601 ? AV_PIX_FMT_YUV420P : AV_PIX_FMT_YUVJ420P; + if (s->bits <= 8) s->avctx->pix_fmt = AV_PIX_FMT_YUV420P; else s->avctx->pix_fmt = AV_PIX_FMT_YUV420P16; s->avctx->color_range = s->cs_itu601 ? AVCOL_RANGE_MPEG : AVCOL_RANGE_JPEG; if (pix_fmt_id == 0x42111100) { @@ -598,7 +598,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) } break; case 0x41111100: - if (s->bits <= 8) s->avctx->pix_fmt = s->cs_itu601 ? AV_PIX_FMT_YUV411P : AV_PIX_FMT_YUVJ411P; + if (s->bits <= 8) s->avctx->pix_fmt = AV_PIX_FMT_YUV411P; else goto unk_pixfmt; s->avctx->color_range = s->cs_itu601 ? AVCOL_RANGE_MPEG : AVCOL_RANGE_JPEG; diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index d2fcb8e191..5f7b685e56 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -415,7 +415,7 @@ AVCodec ff_mjpeg_encoder = { .close = ff_mpv_encode_end, .capabilities = AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_INTRA_ONLY, .pix_fmts = (const enum AVPixelFormat[]) { - AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_NONE + AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_NONE }, .priv_class = &mjpeg_class, }; @@ -439,7 +439,7 @@ AVCodec ff_amv_encoder = { .encode2 = amv_encode_picture, .close = ff_mpv_encode_end, .pix_fmts = (const enum AVPixelFormat[]) { - AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_NONE + AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, .priv_class = &amv_class, }; diff --git a/libavcodec/mjpegenc_common.c b/libavcodec/mjpegenc_common.c index 31868c9bed..7aa66ee872 100644 --- a/libavcodec/mjpegenc_common.c +++ b/libavcodec/mjpegenc_common.c @@ -204,10 +204,7 @@ static void jpeg_put_comments(AVCodecContext *avctx, PutBitContext *p) AV_WB16(ptr, size); } - if (((avctx->pix_fmt == AV_PIX_FMT_YUV420P || - avctx->pix_fmt == AV_PIX_FMT_YUV422P || - avctx->pix_fmt == AV_PIX_FMT_YUV444P) && avctx->color_range != AVCOL_RANGE_JPEG) - || avctx->color_range == AVCOL_RANGE_MPEG) { + if (avctx->color_range == AVCOL_RANGE_MPEG) { put_marker(p, COM); flush_put_bits(p); ptr = put_bits_ptr(p); diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index bbcf25d72a..8c3ec3ad1e 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -214,12 +214,12 @@ FATE_VCODEC-$(call ENCDEC, LJPEG MJPEG, AVI) += ljpeg fate-vsynth%-ljpeg: ENCOPTS = -strict -1 FATE_VCODEC-$(call ENCDEC, MJPEG, AVI) += mjpeg mjpeg-422 mjpeg-444 mjpeg-trell mjpeg-huffman mjpeg-trell-huffman -fate-vsynth%-mjpeg: ENCOPTS = -qscale 9 -pix_fmt yuvj420p -fate-vsynth%-mjpeg-422: ENCOPTS = -qscale 9 -pix_fmt yuvj422p -fate-vsynth%-mjpeg-444: ENCOPTS = -qscale 9 -pix_fmt yuvj444p -fate-vsynth%-mjpeg-trell: ENCOPTS = -qscale 9 -pix_fmt yuvj420p -trellis 1 -fate-vsynth%-mjpeg-huffman: ENCOPTS = -qscale 9 -pix_fmt yuvj420p -huffman optimal -fate-vsynth%-mjpeg-trell-huffman: ENCOPTS = -qscale 9 -pix_fmt yuvj420p -trellis 1 -huffman optimal +fate-vsynth%-mjpeg: ENCOPTS = -qscale 9 -pix_fmt yuv420p -color_range pc +fate-vsynth%-mjpeg-422: ENCOPTS = -qscale 9 -pix_fmt yuv422p -color_range pc +fate-vsynth%-mjpeg-444: ENCOPTS = -qscale 9 -pix_fmt yuv444p -color_range pc +fate-vsynth%-mjpeg-trell: ENCOPTS = -qscale 9 -pix_fmt yuv420p -color_range pc -trellis 1 +fate-vsynth%-mjpeg-huffman: ENCOPTS = -qscale 9 -pix_fmt yuv420p -color_range pc -huffman optimal +fate-vsynth%-mjpeg-trell-huffman: ENCOPTS = -qscale 9 -pix_fmt yuv420p -color_range pc -trellis 1 -huffman optimal FATE_VCODEC-$(call ENCDEC, MPEG1VIDEO, MPEG1VIDEO MPEGVIDEO) += mpeg1 mpeg1b fate-vsynth%-mpeg1: FMT = mpeg1video