From patchwork Sat Aug 1 11:22:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 21420 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id AAAE6449E6B for ; Sat, 1 Aug 2020 14:29:41 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7D42468B952; Sat, 1 Aug 2020 14:29:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9E76368B8AA for ; Sat, 1 Aug 2020 14:29:34 +0300 (EEST) Received: by mail-pl1-f194.google.com with SMTP id g19so5983410plq.0 for ; Sat, 01 Aug 2020 04:29:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=DvnORY+jyzhm/rdxyLQtXx1JSaUvipaSClL/XfRNd2Y=; b=NuJ1jaDWvONvbREAgl1UzCGhZlpIK0Dv2v17jCKfIWxSY7e3I84ukjWrZs+1Gs5aOq Vznu1K6RDO2FbjWbta3SB0RuZpZa5yKRfHIXbChPYK/8DjS8c7oKkmQh2If7JIZ09ODp mZyj8ci9jQA+Eu12hhLofTqgTE9XfQk/MChHan6+AD32mHZUILmkZ7DAp+669P+JB6GE 0iUXkl8+kwCExy9u6Ozo1lYIWsvem2bEJEmr+ocUgA5Ffy/08jFdZ0/QlaHjd+iD1BFI psUk1o8WqGAPmQ19jJtRSwhY9/QnzbCK3G4lAD0JjvYB702NJNniBJ00tZhcROrpkf8V jcHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=DvnORY+jyzhm/rdxyLQtXx1JSaUvipaSClL/XfRNd2Y=; b=IrMq9gJwxtDVBD6fhe+s+DIRy7RpvdupRt5SfCYm0yBiJRMdK1BeANaN5Q4/wYdWqB n4lP37VY1O8Uoi2wtZxXqJDJ2oChpaCIhNOP1/eu530aLWdJt1Ga+G5RgxyrKN2P8xES Idt78iF0Lxr9t1OtW+ZiyEEZ9LWpuA8ItdTIwV8+j/tJUcvLVjbhJ1/laeCYPUb0ny0n iaPqjMrEooKDcPBLJxEZCsjAzi6NQqLr/VzojBx+Is4eFlGDUS6FEgdqnozyGuBQoYzc wI+KACm6h5fcVw3dNkGi8KDLpYQrYVzRF1B9zL69rpeCoPqhMvyRDIji0FSdxz80lyYn ZFkQ== X-Gm-Message-State: AOAM5338P867yZw0Iblpay1ku1ZS/uW6WefoX/CPxH/i3vJvWNTSN8M0 TIZ5400vYxaIWxnnvWzUwEkoRN1+ X-Google-Smtp-Source: ABdhPJxpQe1yUQuKXJWa7iEJwsAvoJeCkmFrqn8kf4dtekJ1K5OZcMVyNpZTFKxEJZEfUvTNn7aoEg== X-Received: by 2002:a17:902:a610:: with SMTP id u16mr5461266plq.197.1596280987779; Sat, 01 Aug 2020 04:23:07 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id 21sm13046925pfa.4.2020.08.01.04.23.06 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 01 Aug 2020 04:23:07 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 1 Aug 2020 19:22:41 +0800 Message-Id: <1596280963-15526-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1596280963-15526-1-git-send-email-lance.lmwang@gmail.com> References: <1596280963-15526-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/5] avcodec/libsvtav1: remove the unsupported color format and profile 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 Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang If you enable YUV422 or YUV444, SVT-AV1 library will report "only support 420 now" error, so it's better to remove the unsupported code. Signed-off-by: Limin Wang --- libavcodec/libsvtav1.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c index eb6043b..3e3b907 100644 --- a/libavcodec/libsvtav1.c +++ b/libavcodec/libsvtav1.c @@ -160,10 +160,6 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param, if (desc->log2_chroma_w == 1 && desc->log2_chroma_h == 1) param->encoder_color_format = EB_YUV420; - else if (desc->log2_chroma_w == 1 && desc->log2_chroma_h == 0) - param->encoder_color_format = EB_YUV422; - else if (!desc->log2_chroma_w && !desc->log2_chroma_h) - param->encoder_color_format = EB_YUV444; else { av_log(avctx, AV_LOG_ERROR , "Unsupported pixel format\n"); return AVERROR(EINVAL); @@ -175,15 +171,6 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param, if (avctx->level != FF_LEVEL_UNKNOWN) param->level = avctx->level; - if ((param->encoder_color_format == EB_YUV422 || param->encoder_bit_depth > 10) - && param->profile != FF_PROFILE_AV1_PROFESSIONAL ) { - av_log(avctx, AV_LOG_WARNING, "Forcing Professional profile\n"); - param->profile = FF_PROFILE_AV1_PROFESSIONAL; - } else if (param->encoder_color_format == EB_YUV444 && param->profile != FF_PROFILE_AV1_HIGH) { - av_log(avctx, AV_LOG_WARNING, "Forcing High profile\n"); - param->profile = FF_PROFILE_AV1_HIGH; - } - // Update param from options param->hierarchical_levels = svt_enc->hierarchical_level; param->enc_mode = svt_enc->enc_mode;