From patchwork Tue May 1 19:40:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 8724 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp4904461jad; Tue, 1 May 2018 12:42:35 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqHOFs5vNLJVkVyFKAQ7skRgHo5oB5YqdOMFr/V5gq3Yd45MEoph9hdFSO3iCzsQzAy9qX5 X-Received: by 2002:adf:8e27:: with SMTP id n36-v6mr11978648wrb.27.1525203755895; Tue, 01 May 2018 12:42:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525203755; cv=none; d=google.com; s=arc-20160816; b=wTfJkBJWc2eMOYY1a2OXxs79lvVHN4IsKWCLTxZgEBFcEBBKeWcu1ba/mK8K21Svqh wYotg7lnvV2o9RF9aIH4tqtftHnS1ozcPiWJdfNMfw/lSbQlGXZjZWE812JWWgUt8sLM 5PEBIHAajZ24+goiVnfYBtPF5t/uWE/6lrnbbjU38TAfsbraNHLa6tWQ1pMYIRoIbp9x /hLsBLImeMhBPtN2cU6rf8xGrLRfnwoqS/FbFCarngAPNOW53ZGpCh8/2AX34CjJB2BC G0aRYB13rsnyB6OmmSPMwpf73u8fhu71wDg6gnu/HIIvrOAjo2aD2+sbzpPHaprwS/vV Rr3Q== 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=NjLJoP2Vx+ajq0y0PI3pHXBsfnRy+VTKcz46fJu1e5E=; b=DxpUeWNPNN/7M47a/p/kAK7m7BAYW/1lp9TejHVbOVzn6eVIVveiponE4MpCuZZ9nO Klei964s1/RVNIf4I3g5ZGTbAgdzxb9joKKsYFkS9VF3exlGl0/P1GkR4NL962nzVFTf HUaJDzbuI9PK+SnWI9HAIx5LcGZZUltr8caeO6zjrUGpsKZEYhGdl2cz3KfzdKPUA7sT 88tUDHynK/nrdesCA7QLuWJqrHzWmg0oaQI7SEc0khvEmJ5pWvyz4UExFFL6XSJfJaPm YX5uN5ZKBG/yLmei4EcMPqWJSw/4GAedbHVr6tZjpFU3ExgshrDKgLIa+RzdUsNiY8yi yFgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=lg97gfKD; 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 a62si1603281wmi.221.2018.05.01.12.42.35; Tue, 01 May 2018 12:42:35 -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=lg97gfKD; 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 B615268A41E; Tue, 1 May 2018 22:40:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B5C1768A3ED for ; Tue, 1 May 2018 22:40:35 +0300 (EEST) Received: by mail-wr0-f194.google.com with SMTP id o2-v6so8797445wrj.13 for ; Tue, 01 May 2018 12:41:08 -0700 (PDT) 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=0R66e3vDc454AKQ9HyIj3RebdzPSAFYA24xqVaNaQ0E=; b=lg97gfKDUSFIrmh+uPpCNwrJNXUWPvaVbjWeKimhzNxWWi4LSf2VCvlQiWsSp3F8xC YqeS639fR9gHNRLGcu8Jk0LGKS5SJycFF45VSNpDfP3pyaAGjE8OO1EXHWlhZk1pjSLP TLp1+la3cvmLDz8bnEeOi0YXRqeIwCDqtUyliFQlV8yRpP1nN01uJDJmpbseHT+5xVmF 1zMBntWIhazWD5Cz3AR+DaHTuWnAs2aAMBbszPLioZIhqa56r1pBY18DkGPetA7QdBWB R3krPPc1pSF3wkf2ie0+HWxB1Gn/fMVri1tjmrvbijLJ1c/I7ikeIGhONMHNRyzlykF6 a1+Q== 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=0R66e3vDc454AKQ9HyIj3RebdzPSAFYA24xqVaNaQ0E=; b=L26nfLXPM+j2SPJlEQO4dpo1AI1l6NPDgYrHxO29gXdQreVqBaz4Rr8EsYnG1fQF1x WUc+Hey7Yuvei4VO+xh775ZJLepY7c1to8kpYHTWOjH3vAjOvmGwkTX2wUFwYWEsP2WE v60EFmn6a4DNFNx6L3qc9LpgEyTlTDZPh27T1W75GuNCObP7wwBLjc5OpZ5t7/XkQ6FR QehYsjFsToWSmM9+efdiMZEHBrs74fBKFs9lKW7JFIJhmro0Edj80BAjSlpRgmzFSnbG oOr1x+Yt/aspwhnmDoID/hCSqIEXzJA3ZPPyzT5EESZ2eTXXsQI9Ez+2Y9p9QoxUE+dJ Wr5w== X-Gm-Message-State: ALQs6tA1Z112cCK6r7fuysRp/9JUZ0wNkz2fDiZ+PsltoEX2bCbPOpcj iLwNDysiYmXNXdPcQ5ap5TUocw== X-Received: by 2002:adf:8f25:: with SMTP id p34-v6mr12149911wrb.193.1525203667754; Tue, 01 May 2018 12:41:07 -0700 (PDT) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id h12sm11839115wmc.7.2018.05.01.12.41.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 May 2018 12:41:07 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 May 2018 21:40:00 +0200 Message-Id: <20180501194013.9552-11-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180501194013.9552-1-onemda@gmail.com> References: <20180501194013.9552-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 11/24] 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 22ca69f841..656cf44bbb 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -479,7 +479,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; } @@ -521,7 +521,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; @@ -529,7 +529,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; @@ -561,7 +561,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; @@ -574,7 +574,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; } @@ -582,13 +582,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; @@ -596,7 +596,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) { @@ -610,7 +610,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 290f941ff3..26f971d1cb 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 @@ -273,7 +273,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 392c145efb..4a5e10eba3 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 eb18dede21..d55465e119 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