From patchwork Fri Dec 8 09:46:25 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: 6604 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp330187jah; Fri, 8 Dec 2017 01:47:23 -0800 (PST) X-Google-Smtp-Source: AGs4zMaJBHUJ/8oOTba+GduhtBkF8pXWGnPVDk835cPdFwFwzKeMuOFiUpn9PXt1jaI0cgLl7m3Q X-Received: by 10.28.169.198 with SMTP id s189mr3788209wme.65.1512726442993; Fri, 08 Dec 2017 01:47:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512726442; cv=none; d=google.com; s=arc-20160816; b=aGqUjNibVGkUznp1E1ySS+DzfIhWzWdDuAM2nWQ/ZiR0SnU4CE2GPrc+n17VuchDT0 mJ7f3wkEVs6lrN1BwrRLeKZ21IwZpUdZULHCzkWJ6KBCI/fQCi3Ea0JN7jKnW0YJxZdq DhZUI08pqI8XdS+zHyf1jOuugQ/lZtzeDIZtEvib/Hqup1Lbl3bSTmhvR+/agdQmroSa 9EttnqnazESxt2MOClq2UURu4ntY20hPwSPKWeR82ucunG4mahO480YT86SqZaxYQVl6 PFGX9XbMdOkbpVDHN604fieyBMbLLkZqn4UO7PNq/fu2jdMCKNuYOuVxGW13QDrSmsoH 0UfQ== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=3iH+iiG7PvyJot0T81vSDrvOSavH+9pvzX4u6dKI7UQ=; b=Mz2gujPH+iA6HPIjYvBJ4aiPVE3XSxLETJkT5SxAqs55SIdZCobdPs6fVXlW3KFuWr w4iBpAvyHiURzIOO/dImDiTfq0lEHsYWlLcLOFsn5SLr8eDMd0tL3FSmmppU6GpPEOJ1 c/kDLcr+d9CQi9VWRKfFHe4ubdSG96yOZZGkvI+5FVRraEnha/0+VkV7ztYS0cWH0w+a gEVnAmM0fLDlpCSVua7s264739WEAkIed4onXBuNE0lRbkIZLWlyL6E3j89LkntoCOKM o8n3NDNRKseJ3vqcBx4TzLx0+2fW52Zu9YJBZKX0xH/is+JQkRaEFE+VDrz24CSS5m8L Pm/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=mhH2jwah; 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 o24si870724wmi.38.2017.12.08.01.47.22; Fri, 08 Dec 2017 01:47:22 -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=mhH2jwah; 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 C46E468A1E3; Fri, 8 Dec 2017 11:47:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B78616818DB for ; Fri, 8 Dec 2017 11:47:03 +0200 (EET) Received: by mail-wm0-f66.google.com with SMTP id f206so2241275wmf.5 for ; Fri, 08 Dec 2017 01:47:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=8bH/ji4XwGD5ZFyvgpJd/zgtsYWeiE1lKUhy8bVzH7o=; b=mhH2jwahLCIMbnXwEAKV32gGMy1ntRHPsm8kA2HOrelQeIFWDQgdU+7X2ZIGIGngHd Wrd5pGgiUgTQRp1Iougl/aqxg4JpXnxdqFhYfiBBDVQTXt2adDR9ZXk2FsPjCbPF1iFi 95DFrJQIGdX8QrIShf+XA6p1u2bwqo4PtNVDhXxvlP09dXaD3+xWfrFUJSHFe8/NE87Y E7KElM9I9FSw06oZoAo36ad3VqIzdmnJO6IhyOCrQgbv93JZ1bluAILmH646k4+J+2a2 ly6jsCiUC/drMV2lNzOKSskbxF33QXANST98Jm+kC5tOXGTXuHg6Rz30z+OxaoHOky+j YFIw== 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:in-reply-to :references; bh=8bH/ji4XwGD5ZFyvgpJd/zgtsYWeiE1lKUhy8bVzH7o=; b=kGcnV8is7s33T496ZvrxthYxti/iZLnIjmZmpxs2XqPTBQhf6F0WS15gpvQnQHZ2zs axQ330xXIyJ7Vhb0+m0njPCfOAdwiWcp9h4il1KY8+56QIiZuqI41aAoz0qTFbR+5wBt sPX/MF9c8bqwo5io5S4xpJWKXO8usbJmiFdUU9FoPvOyyQPI7YnRlR86ieqDdEG5Bz5H 4odUeUGBGl8MzZT78CGQ2VTR35nEvyO1bUAVSY1fX7JoZQi4rjnjc1kW0RkNs5O+Cf3M YCKNF8cQ3gH07V0NGOZtYgMroMDUEpxRdwXwoEntSMbE0rg+g5VbDHsftRpFmlyfRjcw X7aw== X-Gm-Message-State: AKGB3mL7oOMQwKUHuNAs+KmNkxygIJEvPQ/sVMSCNemTHO5iZTXDGgfp vsWkQi0+w+y9G/y4awTtLb/XPg== X-Received: by 10.28.59.133 with SMTP id i127mr3282654wma.30.1512726429375; Fri, 08 Dec 2017 01:47:09 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id f132sm1162961wmf.17.2017.12.08.01.47.08 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Dec 2017 01:47:08 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Dec 2017 10:46:25 +0100 Message-Id: <20171208094625.5245-2-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171208094625.5245-1-onemda@gmail.com> References: <20171208094625.5245-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] libavcodec/mjpeg: 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 | 21 ++++++++++++++------- 4 files changed, 26 insertions(+), 22 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..60a5f33709 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -10,7 +10,8 @@ fate-vsynth%: CMP_UNIT = 1 fate-vsynth%: REF = $(SRC_PATH)/tests/ref/vsynth/$(@:fate-%=%) FATE_VCODEC-$(call ENCDEC, AMV, AVI) += amv -fate-vsynth%-amv: ENCOPTS = -strict -1 +fate-vsynth%-amv: ENCOPTS = -color_range pc -strict -1 +fate-vsynth%-amv: DECOPTS = -color_range tv FATE_VCODEC-$(call ENCDEC, ASV1, AVI) += asv1 fate-vsynth%-asv1: ENCOPTS = -qscale 10 @@ -214,12 +215,18 @@ 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: DECOPTS = -color_range tv +fate-vsynth%-mjpeg-422: ENCOPTS = -qscale 9 -pix_fmt yuv422p -color_range pc +fate-vsynth%-mjpeg-422: DECOPTS = -color_range tv +fate-vsynth%-mjpeg-444: ENCOPTS = -qscale 9 -pix_fmt yuv444p -color_range pc +fate-vsynth%-mjpeg-444: DECOPTS = -color_range tv +fate-vsynth%-mjpeg-trell: ENCOPTS = -qscale 9 -pix_fmt yuv420p -color_range pc -trellis 1 +fate-vsynth%-mjpeg-trell: DECOPTS = -color_range tv +fate-vsynth%-mjpeg-huffman: ENCOPTS = -qscale 9 -pix_fmt yuv420p -color_range pc -huffman optimal +fate-vsynth%-mjpeg-huffman: DECOPTS = -color_range tv +fate-vsynth%-mjpeg-trell-huffman: ENCOPTS = -qscale 9 -pix_fmt yuv420p -color_range pc -trellis 1 -huffman optimal +fate-vsynth%-mjpeg-trell-huffman: DECOPTS = -color_range tv FATE_VCODEC-$(call ENCDEC, MPEG1VIDEO, MPEG1VIDEO MPEGVIDEO) += mpeg1 mpeg1b fate-vsynth%-mpeg1: FMT = mpeg1video