From patchwork Tue Dec 12 13:56:07 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: 6711 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp4104765jah; Tue, 12 Dec 2017 05:58:14 -0800 (PST) X-Google-Smtp-Source: ACJfBotHqetxG0CbyDQCtUCIrLHhNH8HdpqI7oKvOsOXSGuu+7+dYE8qPUXc1RuXjDykdY4Fq88P X-Received: by 10.28.33.66 with SMTP id h63mr1679687wmh.152.1513087094146; Tue, 12 Dec 2017 05:58:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513087094; cv=none; d=google.com; s=arc-20160816; b=e1ekl0+09kwLFYEvvWRrsVN2wPLO0xavOmLNqF6ESfhyEl5PreOjirnjJxl1xX4p9T cWqEBW7mwXZiEdRkRp9DRtIoq9wLezL4LKMOdzJGM/QNTzVd8RXx34I78T71G2yHdFp/ 5eY/KFzankDMoASy0CGLXpYLffneP0blujqpj269vqeh0qufdXD/5QH7F5gMHv6diFh3 pOjCuSG3T2f9SrOGg1vNq+k5lbv17miic9y7Xu/bvnZBG6fEarut79A/kQQYhvVqnJ5f 6xSOoWdjA6AIF4cQ22TuY4fWBiXG9QAiiXaENEWV1fWnVc75Y1th42zghouYMTWhryVL 3pUA== 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=Wsz3gfJbV+wczsYG1RqhJ0u4Q/zHlQYQslcHVQjfvZk=; b=iD+U48oqYuKkSCKBScDCabddRQHtsBmoogWHc8nU8vMN4iH20e5bT0xRgJ5uTt79LU Blw4qS78mpcYi2Jj1w77e9+/miWwUsv82sA5IPbsqvBIwUGo46auN66RfLEE7Cl//y0r auhIOeDvS38esGwOlzr6p2BanzZwZ0It4l95eNGos/iMooeTc5SBmNa4OJAfFQWB8hxf Yrh3dIeT9OoVCmpjnZTD/ugV4F0sy17sQbkilPBZxjRjJLpZKWahX3zAeyGJ4O1HyL6K Rbsml5BvMl1aVNszaz04/QdgGXty6GxT58IUAaDgdk/40IlZIJW9azWjpSCKh7LRM0WD /ccA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=sVXoHMgJ; 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 s7si12441472wrg.141.2017.12.12.05.58.13; Tue, 12 Dec 2017 05:58:14 -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=sVXoHMgJ; 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 3EB4C68A674; Tue, 12 Dec 2017 15:57:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 44C9068A61E for ; Tue, 12 Dec 2017 15:57:09 +0200 (EET) Received: by mail-wm0-f67.google.com with SMTP id g75so20964038wme.0 for ; Tue, 12 Dec 2017 05:57:17 -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=Qu9EJOpfvk8wUpTTRwh4rPeN8bUjGS3cnFszPYytaYw=; b=sVXoHMgJNzqBKHhzJqDoceYtd/BmB7YEnmpzWmZUgGW6yBh+H5VjMRNSfsCL8OpQZ1 THe0QmG3xcvdl05x64Ms4YXUPz/W2zZ1TJJqn79OamereK4j7QgHw870flJxAy9h0im9 3I2GoaFL0ISq78Yu1x2KFBi1xB2jGh8S16PBKWQihSI7GrcIVc2zde9qEj1W/xfYEKt9 HTul/w34KYfY4qrHUVBZOwQh2gXLdh9z/E/ZiGgC+X2H0wVt3AGTvPG14aoY5NYspqMG N+bWnQa0rUOHyBNpLRLWXUfpvDixHowmn48emC0vFCbd62VvSSLsXqQaf1WIHve3AyZr bBzg== 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=Qu9EJOpfvk8wUpTTRwh4rPeN8bUjGS3cnFszPYytaYw=; b=gWUdJZcYM3PzVSA0xZ60ZJ26nUJrGcJiFRpcj4ztqo1ULMifikUpHTdm7r1GOzTKaV BGRuf2OVDaVRKsJ0fBXgLzouclCGqK2IIh2GWgNbmAWlcRhe1yfYPzmt7WNtkIsv4Cu6 tgmZ4ykKrrFy/wvhlxvPYOgp4+Wz1CUtEfo7rhtplQzckRgLKDSIEWNaUGdtk0SiF3uM c4cZuIzqrpXGjJuAaj5+S2knYU4+WusXyrQb9W4uh6l1cAzl+v+XkmRb88FpVKnZqUTI blCVr7XbVNI2RG5744tKVAEqU3Uc2nQzqyLXY+vEdo6XvDgUv3gm1f1oujrivJrMGL5b TyLw== X-Gm-Message-State: AKGB3mKMBJ1AVSXcu5z4wQ43wcE/+ldAAZ1UreZWHVVu9Ayr9XosaVUO RlToZLv9z/QlseObqR810GFmQQ== X-Received: by 10.28.54.23 with SMTP id d23mr1970648wma.160.1513087036580; Tue, 12 Dec 2017 05:57:16 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id l25sm12628397wmi.35.2017.12.12.05.57.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Dec 2017 05:57:16 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Dec 2017 14:56:07 +0100 Message-Id: <20171212135621.30835-9-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171212135621.30835-1-onemda@gmail.com> References: <20171212135621.30835-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 09/23] avcodec/mjpegdec: replace YUVJ pixel formats 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/tdsc.c | 2 +- tests/fate/vcodec.mak | 4 ++-- tests/ref/fate/api-mjpeg-codec-param | 4 ++-- tests/ref/fate/exif-image-embedded | 2 +- tests/ref/fate/exif-image-jpg | 2 +- 6 files changed, 16 insertions(+), 16 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/tdsc.c b/libavcodec/tdsc.c index 4182404cf0..af92ef6ccc 100644 --- a/libavcodec/tdsc.c +++ b/libavcodec/tdsc.c @@ -357,7 +357,7 @@ static int tdsc_decode_jpeg_tile(AVCodecContext *avctx, int tile_size, } ret = avcodec_receive_frame(ctx->jpeg_avctx, ctx->jpgframe); - if (ret < 0 || ctx->jpgframe->format != AV_PIX_FMT_YUVJ420P) { + if (ret < 0 || ctx->jpgframe->format != AV_PIX_FMT_YUV420P) { av_log(avctx, AV_LOG_ERROR, "JPEG decoding error (%d).\n", ret); diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index bbcf25d72a..72fc46e83b 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -4,8 +4,8 @@ fate-vsynth_lena-%: SRC = tests/data/vsynth_lena.yuv fate-vsynth3-%: SRC = tests/data/vsynth3.yuv fate-vsynth%: CODEC = $(word 3, $(subst -, ,$(@))) fate-vsynth%: FMT = avi -fate-vsynth%: CMD = enc_dec "rawvideo -s 352x288 -pix_fmt yuv420p $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-s 352x288 -pix_fmt yuv420p -vsync 0 $(DECOPTS)" -keep "$(DECINOPTS)" -fate-vsynth3-%: CMD = enc_dec "rawvideo -s $(FATEW)x$(FATEH) -pix_fmt yuv420p $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-s $(FATEW)x$(FATEH) -pix_fmt yuv420p -vsync 0 $(DECOPTS)" -keep "$(DECINOPTS)" +fate-vsynth%: CMD = enc_dec "rawvideo -s 352x288 -color_range tv -pix_fmt yuv420p $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-s 352x288 -pix_fmt yuv420p -color_range tv -vsync 0 $(DECOPTS)" -keep "$(DECINOPTS)" +fate-vsynth3-%: CMD = enc_dec "rawvideo -s $(FATEW)x$(FATEH) -color_range tv -pix_fmt yuv420p $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-s $(FATEW)x$(FATEH) -pix_fmt yuv420p -color_range tv -vsync 0 $(DECOPTS)" -keep "$(DECINOPTS)" fate-vsynth%: CMP_UNIT = 1 fate-vsynth%: REF = $(SRC_PATH)/tests/ref/vsynth/$(@:fate-%=%) diff --git a/tests/ref/fate/api-mjpeg-codec-param b/tests/ref/fate/api-mjpeg-codec-param index 178b7c73cb..0ef9594b40 100644 --- a/tests/ref/fate/api-mjpeg-codec-param +++ b/tests/ref/fate/api-mjpeg-codec-param @@ -133,7 +133,7 @@ stream=0, decode=0 field_order=0 dump_separator= codec_whitelist= - pixel_format=yuvj422p + pixel_format=yuv422p video_size=400x225 max_pixels=2147483647 hwaccel_flags=0x00000001 @@ -272,7 +272,7 @@ stream=0, decode=1 field_order=0 dump_separator= codec_whitelist= - pixel_format=yuvj422p + pixel_format=yuv422p video_size=400x225 max_pixels=2147483647 hwaccel_flags=0x00000001 diff --git a/tests/ref/fate/exif-image-embedded b/tests/ref/fate/exif-image-embedded index 306ae0854b..582f09dfb6 100644 --- a/tests/ref/fate/exif-image-embedded +++ b/tests/ref/fate/exif-image-embedded @@ -14,7 +14,7 @@ pkt_pos=N/A pkt_size=15760 width=263 height=263 -pix_fmt=yuvj420p +pix_fmt=yuv420p sample_aspect_ratio=1:1 pict_type=I coded_picture_number=0 diff --git a/tests/ref/fate/exif-image-jpg b/tests/ref/fate/exif-image-jpg index b266501191..6b3dbb3319 100644 --- a/tests/ref/fate/exif-image-jpg +++ b/tests/ref/fate/exif-image-jpg @@ -14,7 +14,7 @@ pkt_pos=N/A pkt_size=46095 width=400 height=225 -pix_fmt=yuvj422p +pix_fmt=yuv422p sample_aspect_ratio=1:1 pict_type=I coded_picture_number=0