From patchwork Sat Dec 9 15:38:04 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: 6633 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp809058jah; Sat, 9 Dec 2017 07:40:16 -0800 (PST) X-Google-Smtp-Source: AGs4zMYnbnDUa3BKMB9V8jWTH8azhCL3C0A+iriPb2bL88Wz7eEEb62lTlzRmApqWcIK5GlLjy2s X-Received: by 10.223.172.226 with SMTP id o89mr30468138wrc.197.1512834016768; Sat, 09 Dec 2017 07:40:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512834016; cv=none; d=google.com; s=arc-20160816; b=0vHROgCQi0kDrbr343ZMYmmnjJE0L2NDhTrOteox9ASNFuB9uxRgwOBukIdMgtLHDq ZJuv/fGjP56X7LcsYCm72MNUix2KYLNC6n7ZCenbXq8vffg2sz6SnzeUdAOsxAB9qK4F 4887MLUbaEumR0Hb1RGDJM6FU1E2bCRBs8HlPOmcJaMT7ClevJzF8PESdh4F6Wku0kFG 91GUHgxxvitWW1mciwuA4fAVUKNuKGtWxv/GVeDmv1MLlKTPIeXj8hLTH5QVRn0cFwkq +83NOlq01mFM5VW9a1hmWLt3HHNuSl9/arOpOjI4tY4zn3qBiyJ5rjy6b/+cvEVX+pz/ CnoQ== 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=ta6TeQMB0jfu7EZxf5Bjkfsi3qaq/0+X3yOy+yMSbEQ=; b=amqLP4ukjLzK+uPuLWJo3k57SrJJ5+C2IQmuSgxylyzG3HFLXfAyuEFJQlMDKsPtFJ ib8VvD66Nbij0Y1Yf47/Fj9fWwWZYJSJByf3YhtYIVtOcGpzc/gc5V9CfMjA65FIaxkQ 3dUU6dOl0/dyS/WAxLyuzivFb97y8vTdEum8foveR0EWl8B2Ogw7OPh9wUoSXx3DnlgR jVTXN50IRuKSMIQcUX05G65lV6cq1U4RaOWSlr7cqAHsSuGDWH0W60cpY5bIyqO1qGQT VU73scFCrpFrRtCuQcgGTNfwjyuvoBH+JyOG90IvAsoLuciTZbrhapLXYd3puxIcJewE Fx7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=NqXYns+U; 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 16si2797612wmg.239.2017.12.09.07.40.16; Sat, 09 Dec 2017 07:40:16 -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=NqXYns+U; 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 0FD4C68A4C6; Sat, 9 Dec 2017 17:39:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9E96168A480 for ; Sat, 9 Dec 2017 17:39:06 +0200 (EET) Received: by mail-wm0-f65.google.com with SMTP id g130so7931223wme.0 for ; Sat, 09 Dec 2017 07:39:13 -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=4x0WKkExliqFJ9tVznzEPeZCTTiRVBxSGvbaloy18O0=; b=NqXYns+UCbTYBfV2qlqLeiB3JeFBWyo5uloNCVRa72MB3DdD5UzLIM91uq8wih+Fr0 ARu64vhBcrJ1/8LjaGfj0FdDKHMVu6ZF+QSezLBLRWoMyVqZfCk3ftOqSNYwt9j2UQxv 4iOaOl4QphNtxsZG4P2X2Y1GSFQFhneHPAxFxB/hfZPAcbjknyntlHMc2TbWzDttMUT4 S7zbO12fLXpQR49YkrXfEWVD1oj/tiFi9Z0ClJaQTe/FQFzR3H/QpCIvsqS5gqjXVup+ OgH6Kh3w5IOTTI95b11Qf9ECi1KDWrGbr8QIvjDmB3WpVJv05n6LDvH3ixd5dCcb8kwt LdSA== 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=4x0WKkExliqFJ9tVznzEPeZCTTiRVBxSGvbaloy18O0=; b=rQ51PPTjkg7qINwP8mXmmLycT1dAv4A5Y0gAOR3mGTe/yemirEDKK9DCI/buC+tLeM MG5vevm8kj6HMu/qmjXLQ5z+UrVw5ya93qCMwAv8Z0514NDSK37//3fMpz8RrqWjgqN0 1uUoRgCe+P4dBkIc7j9XIhhleKUXXNjzuOWxdXfXoNzOLVxalIrk9A+vo2M5q1B+I8U9 AEIHNMqGP3/xI0/f8erLudtGQFOzXrabrwPNXsqooz/cnOtFG6cH3nY5fnQw24Ql9d0m FmcOktq4s9IAujevkM6xEEx91JWBbAJwamSGpL2Mvuqs800ayrzx1U+ZihKCX/U7kBay 3n9A== X-Gm-Message-State: AKGB3mKGQuPH1+IgDg3Fd0qezb6h5YRdw7EBu73DroW1ut0bqSpzsjlA wBTx+0Zrl0oScUw5US3kWdgRYw== X-Received: by 10.28.30.213 with SMTP id e204mr6269580wme.40.1512833952697; Sat, 09 Dec 2017 07:39:12 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id 52sm14654536wrv.8.2017.12.09.07.39.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 09 Dec 2017 07:39:12 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sat, 9 Dec 2017 16:38:04 +0100 Message-Id: <20171209153819.19007-12-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 12/27] avcodec/h264_slice: do not use 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/h264_slice.c | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index aad5484588..a75ab08c29 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -820,15 +820,10 @@ static enum AVPixelFormat get_pixel_format(H264Context *h, int force_callback) if (CHROMA444(h)) { if (h->avctx->colorspace == AVCOL_SPC_RGB) *fmt++ = AV_PIX_FMT_GBRP; - else if (h->avctx->color_range == AVCOL_RANGE_JPEG) - *fmt++ = AV_PIX_FMT_YUVJ444P; else *fmt++ = AV_PIX_FMT_YUV444P; } else if (CHROMA422(h)) { - if (h->avctx->color_range == AVCOL_RANGE_JPEG) - *fmt++ = AV_PIX_FMT_YUVJ422P; - else - *fmt++ = AV_PIX_FMT_YUV422P; + *fmt++ = AV_PIX_FMT_YUV422P; } else { #if CONFIG_H264_DXVA2_HWACCEL *fmt++ = AV_PIX_FMT_DXVA2_VLD; @@ -845,8 +840,6 @@ static enum AVPixelFormat get_pixel_format(H264Context *h, int force_callback) #endif if (h->avctx->codec->pix_fmts) choices = h->avctx->codec->pix_fmts; - else if (h->avctx->color_range == AVCOL_RANGE_JPEG) - *fmt++ = AV_PIX_FMT_YUVJ420P; else *fmt++ = AV_PIX_FMT_YUV420P; } @@ -992,17 +985,6 @@ fail: return ret; } -static enum AVPixelFormat non_j_pixfmt(enum AVPixelFormat a) -{ - switch (a) { - case AV_PIX_FMT_YUVJ420P: return AV_PIX_FMT_YUV420P; - case AV_PIX_FMT_YUVJ422P: return AV_PIX_FMT_YUV422P; - case AV_PIX_FMT_YUVJ444P: return AV_PIX_FMT_YUV444P; - default: - return a; - } -} - static int h264_init_ps(H264Context *h, const H264SliceContext *sl, int first_slice) { const SPS *sps; @@ -1047,7 +1029,7 @@ static int h264_init_ps(H264Context *h, const H264SliceContext *sl, int first_sl || h->mb_height != sps->mb_height )); if (h->avctx->pix_fmt == AV_PIX_FMT_NONE - || (non_j_pixfmt(h->avctx->pix_fmt) != non_j_pixfmt(get_pixel_format(h, 0)))) + || (h->avctx->pix_fmt != get_pixel_format(h, 0))) must_reinit = 1; if (first_slice && av_cmp_q(sps->sar, h->avctx->sample_aspect_ratio))