From patchwork Sat Dec 9 15:38:11 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: 6635 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp809915jah; Sat, 9 Dec 2017 07:41:22 -0800 (PST) X-Google-Smtp-Source: AGs4zMaTqhGhrpD8lvjzukiMnjNuq4CrjM9HUMtSco0WewiYslHBszHmMXB/QPqXS/yziObnO7Mn X-Received: by 10.223.155.133 with SMTP id d5mr28516534wrc.132.1512834081976; Sat, 09 Dec 2017 07:41:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512834081; cv=none; d=google.com; s=arc-20160816; b=G0q1zIq3uRb0bsv3xRN/Fw1DBUXTnuhDhqRE5+3gdYYkypf8RI0VFKbW/4slXqTzLf hmmcXqLffI0u65K8QvWZkbpfHo6SKnwfTmoUgebpHZMtFknoeLCZR+9xJURCoFHo34N0 K+6y+U+ijMLTDNTWGhBWMwkKyqXelsue1Pp3MsYVLBaY9reWp0gvu0fY+k4x+KWD4e1X w1X+Nw2Lsfs4la0/40xWCuwOPpGMUNlNoDELt9BQ3AU1PuU+Dgp9odc2mJ1cjWpmS6XP 4ebENCArGl4wwrcYdMtV77rPfT6wPOtPGbWFvofEx95soKIQONbfyLB9qy+i1nU62dvt QrVg== 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=0lvNwNwoO6DySeq6vQgRhZ6L/Mp/ga9DHuF0MOgCnBs=; b=hU7Lbtx7dr66nPEFNGkomvKwfk5hqs4ktZ3IXfeiJAaImOQzu/knLijaWGt/Ay3puq L4auYuv5vTiFDkA73bGoM2fpAsZBxNqh5QNR9jD18Xc7mMO3zH/81QtF2zpSbuFFT1Ga i3bBI6wiUc83UgZTaI28Stfn8WkwIL4Wg0vHtaIcGYii+qrChnmk6zfN1NtoIAJo+ZMI RiARC4TaQoo6CcqNwVcliZjF8HfZWZcX2X/W2znZ3O/VdTepztj1PEL3s1aONCdjA9Mb 1YozRlHoHhyaCiHCvoN8+zki9kQ+CcN89PLM71nyhFVTN/dQhcgT2Gf1DzLLL1MwPg6Y L7Cg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=q45RJUJy; 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 h24si7857501wrf.216.2017.12.09.07.41.21; Sat, 09 Dec 2017 07:41:21 -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=q45RJUJy; 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 06D9168A536; Sat, 9 Dec 2017 17:39:16 +0200 (EET) 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 C0C2168A4DF for ; Sat, 9 Dec 2017 17:39:12 +0200 (EET) Received: by mail-wr0-f194.google.com with SMTP id v22so13442920wrb.0 for ; Sat, 09 Dec 2017 07:39:19 -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=7skTrtaMGmZPKVT4RZCrhrKKcbiaH7DiN+PxdhMSpj0=; b=q45RJUJy9uFFBfn+pHMN2RSJ1heQawtzQdI9NY8LAC/wYAO5iG0fJZx+Hjc7YYXi1r VuV4D1NSusnXWQy1v/CvuTPwrVeV0tXehlqOGERzRC1vawh8wu8scalztc6yZFWkQ8OT iNeVkqpKHJJANPegaZt7MDuUJ+/3H6faNHpti0BSr86tz8gfEp5pfUw7KOCkK7UpwAIp TuAn5gaK02sEChbk2eOYjXG9pBzB/j5PNa1La5yFxBvo9YKLSxpxv3mKgwGH5hbky2kX zNxZg4C0qLqzuOE2kriYTYuIdBefYvPdAyEk/8zmBKztF9ANMTJfX+Of7ylW2W4tZUpF /mrw== 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=7skTrtaMGmZPKVT4RZCrhrKKcbiaH7DiN+PxdhMSpj0=; b=AFRewYYeIeiuZWm0G+8Ly6hwuWeqfzYJF8qNCNkcD4UAMYVuNMnC8M0tfO5kVO8ARd ztwZ+zqfMJTAXPLRRRXorpftViB87AJnt10amtnWf33w1ca6hAPnVIB5CvOBdyNHJI3h wMF76HgOspLQlufXuMIsLWDisDdN8BnXh6aUNS9woRdTHQtyZdjN1nFYsvV1rReHKjvk rvj/SDEXjEKB0ysO012aSBKxF0h3C/JL0AheS2g8EI7FxqW5+Ttwlj0I7CAM/sWm2IsO wClLLQsopZJa07Apzt3a4RtQ2prHvghrHBADzp5ph1B7G80nEeQA/qrEJEnE8Yn545WH Hlrw== X-Gm-Message-State: AJaThX7Y5/zRsyl6HK0wRYNG1j9HnTgFJTvEciM/DgDOTCmTWQCx+4p6 AZ8oonMzTtRTiptW4mbl03kw4A== X-Received: by 10.223.200.65 with SMTP id e1mr27541200wrh.133.1512833959033; Sat, 09 Dec 2017 07:39:19 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id 52sm14654536wrv.8.2017.12.09.07.39.18 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 09 Dec 2017 07:39:18 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sat, 9 Dec 2017 16:38:11 +0100 Message-Id: <20171209153819.19007-19-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171209153819.19007-1-onemda@gmail.com> References: <20171209153819.19007-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 19/27] avcodec/mjpegenc: remove usage of 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/mjpegenc.c | 6 ++++-- libavcodec/mjpegenc_common.c | 2 +- libavcodec/mpegvideo_enc.c | 8 +------- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index d2fcb8e191..9602a6fe64 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -415,8 +415,9 @@ 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 }, + .color_range = AVCOL_RANGE_JPEG, .priv_class = &mjpeg_class, }; #endif @@ -439,8 +440,9 @@ 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 }, + .color_range = AVCOL_RANGE_JPEG, .priv_class = &amv_class, }; #endif diff --git a/libavcodec/mjpegenc_common.c b/libavcodec/mjpegenc_common.c index 31868c9bed..4ecc05bc09 100644 --- a/libavcodec/mjpegenc_common.c +++ b/libavcodec/mjpegenc_common.c @@ -232,7 +232,7 @@ void ff_mjpeg_init_hvsample(AVCodecContext *avctx, int hsample[4], int vsample[4 vsample[1] = hsample[1] = vsample[2] = hsample[2] = vsample[3] = hsample[3] = 1; - } else if (avctx->pix_fmt == AV_PIX_FMT_YUV444P || avctx->pix_fmt == AV_PIX_FMT_YUVJ444P) { + } else if (avctx->pix_fmt == AV_PIX_FMT_YUV444P) { vsample[0] = vsample[1] = vsample[2] = 2; hsample[0] = hsample[1] = hsample[2] = 1; } else { diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index f1f4989231..20830887dc 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -306,10 +306,7 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) case AV_CODEC_ID_AMV: format_supported = 0; /* JPEG color space */ - if (avctx->pix_fmt == AV_PIX_FMT_YUVJ420P || - avctx->pix_fmt == AV_PIX_FMT_YUVJ422P || - avctx->pix_fmt == AV_PIX_FMT_YUVJ444P || - (avctx->color_range == AVCOL_RANGE_JPEG && + if ((avctx->color_range == AVCOL_RANGE_JPEG && (avctx->pix_fmt == AV_PIX_FMT_YUV420P || avctx->pix_fmt == AV_PIX_FMT_YUV422P || avctx->pix_fmt == AV_PIX_FMT_YUV444P))) @@ -334,15 +331,12 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) } switch (avctx->pix_fmt) { - case AV_PIX_FMT_YUVJ444P: case AV_PIX_FMT_YUV444P: s->chroma_format = CHROMA_444; break; - case AV_PIX_FMT_YUVJ422P: case AV_PIX_FMT_YUV422P: s->chroma_format = CHROMA_422; break; - case AV_PIX_FMT_YUVJ420P: case AV_PIX_FMT_YUV420P: default: s->chroma_format = CHROMA_420;