From patchwork Tue Dec 12 13:56:14 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: 6710 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp4105067jah; Tue, 12 Dec 2017 05:58:31 -0800 (PST) X-Google-Smtp-Source: ACJfBot3oy76iJOUSpLF25Emzj15jXu3CSzlG5JLVUtmUC1j4/Ap83bWo/a0usqxI4jH3Q1IfLO5 X-Received: by 10.28.148.195 with SMTP id w186mr1958476wmd.33.1513087111545; Tue, 12 Dec 2017 05:58:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513087111; cv=none; d=google.com; s=arc-20160816; b=ycIew+DGBo7AAci2f4LeF2vsxrG/zoFvr3hR7Rpa1Y10ZAnvwljXiuajgJNR7tcyZ+ HDUg4/psp3FCc7TuEbMlJoz873fIQnMbjelG6dZPnnomdQ84buy/HetnG2EjXKF2jNWz kxH+UUoCk33im/RqVF67e9Ay9BSvKII0R5+jgN3of3gLumC23wZ1LCVGqJ3Aaf6RpzuY D9G+oujyOYJhCu3rrbSiHzLPb92L+tMeMCjHRKv05LeAEQLwHXzp4/Pj5vJFl+EFKdsT sCpgCHcbo8H1o80y/Dt8N8gQJopU8TBtIWIyQpskgfWOlarTDIm2+onVql8L3xQp4S3z TEAQ== 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=GNX3C52gEi8uOn5ZOtWV/xjN3liqBkLTXton6o1lAzM17roNzDvzHgrvZcjIp3evLk Bard+um6BzgjTUKORhHqtiJkrkNg37pNJqnz0+L1bA7LOqGND/KMh0sF1ksgWeIeDTv5 m/42fmdLePcS850PeRDYEStBTocPnuLHAsr67sc0j4SHmbt535/bpR9HzNOJzXFpF4pE 3KDv2nfLBhNrnHxuTkv81en5qRYLS/z7o1AuU5wKuLq4GiweWQ+duC9azeSKApmDQG8g CGg28q0qoQFRcjJmwx/pO5ATa0vVHq8nut8XWVOzivcZ9eUGz908+3odBBPmOLIi+Y+1 DTXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=QL95etsW; 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 5si6975989wmh.144.2017.12.12.05.58.31; Tue, 12 Dec 2017 05:58:31 -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=QL95etsW; 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 0261768A68E; Tue, 12 Dec 2017 15:57:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E63B668A664 for ; Tue, 12 Dec 2017 15:57:15 +0200 (EET) Received: by mail-wr0-f193.google.com with SMTP id o2so21235370wro.5 for ; Tue, 12 Dec 2017 05:57:23 -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=QL95etsWVJK5O6DNff9tjeE85Dh6KVDRFyLZlIDAFdjh85IsjGvj4QRi+T8aJUTXuj swXxba5Yg1ojSWIU4Nve3NVwT2rq0U71Qs/wIzmmEQUZ5ZXT3JW1KaGmM70i0sDgYgvP CnThVTVZSli6AkFl2AdZNEQiy80ij3Wtqbgr6vVVHURIOYpIM7041CWSqoE6gn9GtkdB m8jQYlqptpMIqC7+g1OOGrOPgkWab74ZModtQyghE3qlfRF+kzPtGm+CoG8jPgfr9nQP HjJB+APmLlHqRqpBH6MguCMlmEaEtF20KKisZUrmA4egmp0l39grORXm0WK3CTMdDVYx CVLw== 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=WiRO1sD37jICpwaU5sUQ/16DjcSu+65r9vZteTpGQ3MytsxYhlteCdsSKBarg3JJdY WWmU8ZX7nXsvprSbht8lSOm+ye7xgm8ks5EbeA8NDE2Fx1I4Navs8MaxziviIKpUmGQu 0EC2xxdgYOiDw9wwN15/FP5KxKK+yxUldkIATniXE8pYdCnn1M0EWb7OeCEt3Hg3xigw cWzAgICZ5+HN9xqH2dQGWxn1ybM54v1j99ouiO2p/W3ytRpIqX7ikvsqBa7JOlpCV7JL 1ua1hDU3i7BASC2E4nkizxVhUPEta3neOJff9BygOkREbYx8buVpPaFdxZxVnDdee27k 12jg== X-Gm-Message-State: AKGB3mK2O9VV+xmCV+dGX4NLTXlD+LGrcB4iMc2bDTuOhItUg49RahkR f8l6wLN/wbmqcSgvB6oa2Tgm1Q== X-Received: by 10.223.132.194 with SMTP id 60mr4122619wrg.249.1513087043332; Tue, 12 Dec 2017 05:57:23 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id l25sm12628397wmi.35.2017.12.12.05.57.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Dec 2017 05:57:22 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Dec 2017 14:56:14 +0100 Message-Id: <20171212135621.30835-16-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171212135621.30835-1-onemda@gmail.com> References: <20171212135621.30835-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 16/23] 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))