From patchwork Tue May 1 19:40:06 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: 8730 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp4905089jad; Tue, 1 May 2018 12:43:22 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoL44eTGwkIqqBL3h/tD6j9X5oLL0OOU/riwQUiMe3mD/sJeY1C/aJGT/TNOwXitwEwmgLB X-Received: by 2002:adf:a0b8:: with SMTP id m53-v6mr12739348wrm.269.1525203802677; Tue, 01 May 2018 12:43:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525203802; cv=none; d=google.com; s=arc-20160816; b=0/WiI04Bi8/hSSSCklgNQSduuRm79Pl/Geg2z3AlbUQMV3WYKrm+T4QhY8DRlMKbFV KRVFD/jjOGz3ikL1109+OQEGTAdhvwltEs5cCX066Gksx7L+UpLtfO1boQrehzZLCe2B 5YqVQ3KdkWLy/Wty/zgDS4dm/NFuC560jk0PPLoWrbJUvc2JMgVThg4KTOupjURQH1hV IpYxWT/CpKOGXMIhw9lAigI06mUujmilIO2p4ZWW9bZtcdCGI/kghCm2J5fwAQ0rppRz ja6V8jXUUvFKnOt21C3pXFjK7ARveqbztpLSv2PpcP3yp+SIibR55RYVWyXi97bXdOUd 0XqA== 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=sAR4ZYW+bJJ/zql/xui1NLC0Z/UL/yEXc8fNngsGq2E=; b=id5SDr1bixknF+jIOte2ztIL5fmaTjvhfFWjmM+0WPpMJVFguy3/sayPMp5qU86J1N 4W5OPGA3zFrIIV+YJDYjtvtYNm7hynQsNkmHYBKFzPR2gCYz9kNtX9aOcOGP0ZNOF+6c UZfZYZp/hcmXikTyulJQdxIojmiJilcE2aZqWHsDDZT/ulKPf6V1GS9eMeTz+OzZ3izP nh0QmdxYXft34VVwX6Dp3TJOgVB4zOOyA50IbVh+cfUlIAxniLm61EwqThdSGrCNRWi8 yjtYx1zHRZmLSWDC5nxoyw8G7DK1HmUX9sHzOz68FBEIiISn79aB89zECHH2SMZ7i3ic e+eQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=OZzFYrxC; 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 y18-v6si2051415wrm.276.2018.05.01.12.43.22; Tue, 01 May 2018 12:43:22 -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=OZzFYrxC; 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 172D068A460; Tue, 1 May 2018 22:40:45 +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 CE59768A36E for ; Tue, 1 May 2018 22:40:42 +0300 (EEST) Received: by mail-wr0-f194.google.com with SMTP id p5-v6so11684969wre.12 for ; Tue, 01 May 2018 12:41:15 -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=1GfRqTOqQiFArqyMEHNb3ihfNvswOPGnCFGaQ8QaEFs=; b=OZzFYrxCn6FWiXXtZ4zS2eXXQDjqgNl9ZBzuhVUcLzxRh16iWVcJfR3M/2Rfp79o23 ei08Q3tYnKm8SNvydNegx1641x81NNcLJnalidEcev9wOW0R7sxpvCz8kZXmWT0As9dv l9knWYm7E7beKK46iVpcaJvk8KtTod/+updzUW85wsgOgFwcWiIw8mOpV3MOI/IXNPB1 1lICYLqVWSJf2LmwIoj2iXvCZgqWqOiR8WROJiPbpiXH5ndjgjLV9WN5IpAZ4/9tCOYw CHAYfWn/ddza6OFcvYDpL+GTjNhhC85Koso6Z27CTXBPvEzG/CoZnON3Uc6XlwbBKWH5 vyIA== 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=1GfRqTOqQiFArqyMEHNb3ihfNvswOPGnCFGaQ8QaEFs=; b=b5pcbCVrx39hOuhONh2qhphdxlHeWg/pfWM7b71rt3QpyCq36PBj9h/6kLT2QRUpAM xCnefTjEijRnEvjYzDH8J7/rQBLRrhAeugEchbo+teyj/AYNlHdrYuFVD3NCLsQqX7FM BMmX4/aMLX8McwvjhjDlxY7MlKhzrBckZ76Kl0LuwLJqzhiIRhdLVEcQmnF9WSDhojTn tKuLjwYxNsmatVLJhz+edVH/vCT8zUvqAXZ4DrA33/FqH8bHDAdaQuydefws7/OK3UTt jBWOkgDCz/GLob29CBQ2NbrSxSja2stuiy2b/mTLRP9ZZdr7Z6+F2D9kLApqXHWX0Fle dn6A== X-Gm-Message-State: ALQs6tBbNqBHAZH4tEIsmbowvwr+Z/ihfA3RXNe2NR18fhu/fMfAJFnl JiWq9bybx+u/kYQSkKMTAJpP7g== X-Received: by 2002:adf:99b5:: with SMTP id y50-v6mr11818099wrb.168.1525203674991; Tue, 01 May 2018 12:41:14 -0700 (PDT) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id h12sm11839115wmc.7.2018.05.01.12.41.13 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 May 2018 12:41:14 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 May 2018 21:40:06 +0200 Message-Id: <20180501194013.9552-17-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 17/24] 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 d71ddbe9ba..65e2bae52a 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))