From patchwork Sun Dec 10 13:14:24 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: 6662 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1677843jah; Sun, 10 Dec 2017 05:17:50 -0800 (PST) X-Google-Smtp-Source: AGs4zMZbjunmGsK9AFR9gjAEzY0DwUd7dZDoTCrVQzFcosVb8uM2XvHQroMOtaCZK2ni8oNHFKY9 X-Received: by 10.223.167.3 with SMTP id c3mr34261859wrd.127.1512911870545; Sun, 10 Dec 2017 05:17:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512911870; cv=none; d=google.com; s=arc-20160816; b=v5gDkxlcvDIO3jx+0hxZQLbpiYLGFeYTVItIndllH1TWltoe5dOaXrVnqEXyy8HcHA UHSnFZykTedx3lGpSgxeH/TnVm5ql4sEPvNAdr19XLlJiUZfEcKKO2L7sjrEWxcrCm/i zW77w4RyPuqQWDEwQuwHz91XMiUcgux7lcjuyOK3woWxDszJVOClJyg6LVO3mUiVCnbg enZHuqU3KrP9NQUGKhBWspDYKnXDjWdcdtBjWSti50dVPV+NjnmRJy0Q7t/EyvfhvC5E kwaBg2s5DAAHC5TpzPnoyBHQjItwPwHRJ5cDfNOI7bFEbHa3b3vbpJX1eC4DL9hQq0kw PAjg== 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=GxWVTVVQi6RJrgscYWYETS7QFV1ESHRiazvFTqcjsB/cV9sBgTVUA8nMhEWrvOtdrb UQeYg7Lp25pg35BppGovTXj2fxOABOilNsw7zUZk+JFpA5OL0pIszZv3yYa0+8eGImtC ghBj20yD4qjJITKZBCEi/Ma77Dy+CEm68MNn5yx/Bn/JbAaipmflymBzAKU8OJ9l1TYw og0dHjCMT5gOa3+xJodpYECYAhARelRFa0NXV7mr/a5UeWLrOQ/ImvArSZ8782njB3rK Q28yW9ymsBoMmS8IuSffmE28oWqeTAKJ2kiEpCeklE7bVPFN3kUUEDkuanVcnKBWCFIz iglA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=hgejHCXL; 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 c15si6912809wrd.527.2017.12.10.05.17.50; Sun, 10 Dec 2017 05:17:50 -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=hgejHCXL; 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 D116F68A657; Sun, 10 Dec 2017 15:15:35 +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 384DE68A4C7 for ; Sun, 10 Dec 2017 15:15:33 +0200 (EET) Received: by mail-wm0-f65.google.com with SMTP id i11so9709673wmf.4 for ; Sun, 10 Dec 2017 05:15:40 -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=hgejHCXL/3BlXdCoSQL6aIQQ8s2yZSk4FvUoJWy6tjwgdqnPyHULKKvu2vqRFqJ34T CN+TIVaUhMuqvnSmls9gkkoeoCBVT+kyu/BPw+PQKmCNjm9UwmVIKuB5freVLJBlJnhg 4JMaeh2b1hQ0JP9Cl/Pn/tK7EbrRVdSoaU9R/1Y4fqRIgGK/iiYUAj5awsBlgaqiyvcy ZlBX4hygfSdv4ApLnH7uVFMSdg1XmPQW/9sVe/+uAWc/aWY3ik11gZsCcICqr0wmeHkG BCo2U6PR3GaRSM2g97Tw41g5lQjtz5QE2FfL+Unk/r1VnPMpZC5kyz7qI+jCXRu2Nx7g ucQw== 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=T6iVn6EK93m4mXFW4VEdNbgAIWS9svsD/YkeUAkbPWSgw2PRwVZi9+IRUy8bL2E3QQ I/NZpc+o49PgneYFepYmcFfnS4sYC/29pH7szlc7sPZ4ZYACnLXi4vguUSps4iDO/n2n qsMKIRE3ojJbhDLzxmG/utEAFaH3O9ph7ahvAw61slnw9otJXAmwqXe+13glBobBSKur RZ1DNJnRoxv+vwLJdjbs0+MubOCIpO7VSw5/PqBX61Jt7gJMywoARwyeJh3JXB8ckErx eYs2wwkEMV2hByewb0sdQ1+hLFBnvsn73gojo/8zkJmuQBHr9pNraYUWVARK7yxxR4V3 zi9A== X-Gm-Message-State: AKGB3mLbKw9nYAK5ODxbAYuMeyGmOTZK81HSSFQZ3PN5i7QB0hgc8dRg 1y5ToxPmKfd5oLQMRvyWI3fC+A== X-Received: by 10.28.35.214 with SMTP id j205mr8608285wmj.72.1512911739750; Sun, 10 Dec 2017 05:15:39 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id g78sm1129877wmc.30.2017.12.10.05.15.38 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Dec 2017 05:15:39 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Dec 2017 14:14:24 +0100 Message-Id: <20171210131436.15791-17-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 17/29] 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))