From patchwork Sun Dec 10 13:14:19 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: 6664 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1677205jah; Sun, 10 Dec 2017 05:17:07 -0800 (PST) X-Google-Smtp-Source: AGs4zMaD+1mClCk/z9Qeqq8lEBXX5qkpJbKib9ghao9mUyB6CBf1G/cBHt9o8UesC2qd4dOU4HuI X-Received: by 10.223.174.147 with SMTP id y19mr30463607wrc.97.1512911827912; Sun, 10 Dec 2017 05:17:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512911827; cv=none; d=google.com; s=arc-20160816; b=dW/w7UUx+hKtEDroJFHNCFTcY1YIJmvVkqrCV8+SCThaF46lKd7Bmj9SzC3EC1X2C2 n9byCOye1eTgDF1ihFFLJ3AvyS7FfNw2aaatnGM1pi8reh5XACajIHNoUX0lMs+DPZPv q+9lkjlWQKS+jzGK7BRpBnRElYksy97ALZwyYGLl/y/dghJdQXp0Y5ca3avQGgmNmnTw aqSZCM6FoESCPTM217p9r8qNrKTf/5BumSeekdW6/tYsR0JCqG4YWsUOvisaK+/vYlsP CwREMBCO54hZJQ3xoAR6dnY6hYPFTQQGokyUhInSgj6BhSmAT8oZ9sONxXy9FdLEE2lY TRhg== 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=Z40KZ7VkLi2YLgcIJY86O0N9r4FeTifUDYzxTiaBadg=; b=TXPrXCAScw6MZ+Nd53TlUwDEp9UpzLMLrdy78Wex3FT6hzADbmsligMyXmPm1kvi3y qPh6HXasZ9bShypcvSY6ekLf3aHYcZ/zXOVFf+CqlhsNY07FZkml5oRI4UlRQBN8Me63 p87hAa5nFxcedwVczu0QhYJLOTeaQHVDi2TFJgANZhcPcl9kkXEBb7h/n4p5625hOMYf 0pQ+blrvxttNcNQQo4rVOhDwiH2THQ25GLbMoAqbGg+CxdxQinXmjowNmdabyYvodLy7 BTOdHEtOwA/UtCCmiJyokG9dqcHVFNemu9k88SLQoRP7jYVdJyX/fLV0W+X9GuEIsTth ljpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=vc9t1YJC; 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 j10si9076818wrc.446.2017.12.10.05.17.07; Sun, 10 Dec 2017 05:17:07 -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=vc9t1YJC; 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 E806368A659; Sun, 10 Dec 2017 15:15:30 +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 7A02968A62E for ; Sun, 10 Dec 2017 15:15:28 +0200 (EET) Received: by mail-wm0-f67.google.com with SMTP id f140so9739213wmd.2 for ; Sun, 10 Dec 2017 05:15:35 -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=2u4gFMrGoMR2AnjMlcmql8+w7Op8FmvTlFH/Ud6NJ3I=; b=vc9t1YJCvrSbEpsn8w3gr7azlaRcy2dDuK8/Muh056hZwJIRNUWpgQhZTKI5WGlu7V /aqfTMUqQgdRpf3eDSL0yhWUYPd2ovknSEetPIYJEkw88Ua+PE1a1GQa9LaAv0F2Na+p 9lr+3B0OcwCl2fUXogfKcjG5hBJxEc9tldtsXVOCvwmrZ8Q/qy5L7P7dpJlKREblAV1C hXVjnS8y1i97XgAv6ESdYvFqszMrmKkGZD4gEW1PHSZrcoD1K3OBWTk1OPPQ2rRq/8Le VZVSdMwdaf3t8+PQbSpTFK65gLp4SEqy9MJyF13RLuBznDyF2cn7SXn1bbJEMd7uTUNY cBhg== 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=2u4gFMrGoMR2AnjMlcmql8+w7Op8FmvTlFH/Ud6NJ3I=; b=L+DVWzJlNzl8IhJ21pbgJP4CXymxHomEdgaLhaAlEMde6bhVFAEl9KWJ33Ko//iEut sVtAVuwzXXvXb1TDBKzZnGTV5aL5dnvEAuBGn6aIVw4k+S76ccs4QjXCkQ9E0zuWqwwH 4ni7LsW7SENbnX4j+jgR7qcohYPTiM6D//EKSQPghYzFw0NtxSTk+ZZvqoe+kgvTHGqZ mcHP0VWVp7bkvz71HNQzRUtvYxE95HAhfuVnPYhmBUFXRQD/kPHR+bPxUC1XpFZP5WoK wkRXc7MebTQmsFeVOzttqTCZIYeS+G29rKjA9wRclDkJ90UdsSwTVdKAUIaSbTtudrZD mDwg== X-Gm-Message-State: AKGB3mJsLJ3eKa44AxJMEkoap1nZ9TbcK514weaDU2wX/+0s7UvQR/OG u6YnZj/Szs1q7Do4gbOpWPx8sQ== X-Received: by 10.28.52.207 with SMTP id b198mr9244645wma.154.1512911735102; Sun, 10 Dec 2017 05:15:35 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id g78sm1129877wmc.30.2017.12.10.05.15.34 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Dec 2017 05:15:34 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Dec 2017 14:14:19 +0100 Message-Id: <20171210131436.15791-12-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171210131436.15791-1-onemda@gmail.com> References: <20171210131436.15791-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 12/29] 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 f8cfd1e2a0..50382ede99 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;