From patchwork Wed Dec 5 20:22:48 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: 11293 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 E4A3B44C7F0 for ; Wed, 5 Dec 2018 22:23:05 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 912AC689C1C; Wed, 5 Dec 2018 22:22:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3745E68839C for ; Wed, 5 Dec 2018 22:22:51 +0200 (EET) Received: by mail-wm1-f67.google.com with SMTP id y1so14536078wmi.3 for ; Wed, 05 Dec 2018 12:23:00 -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=q298VrLT0p6kxQXSlTdg5ungacdqqOr8BgOX7r0mWz4=; b=AjJln3cm37PSCFe2/ndDIE8wkotKA1LPXh08LowkSye0FEENy373fqGhO6+686Rt9U G0r67ivUU8EL6htWDhEwDsoNgCfwojFGECW/kABLOWA23LFGNKG8Fl6SwMqKhHucbh9R 4DsneWEx1hSbjr6hAqI2CZk4XKX2aH1s+0tkS7XprXGnyFQa7vas+kfVsAiniflJcBhJ WIkac1+9vPrBhMjbKDMSvwGwxV9m4xYuJ1wwQI8JKCUZNbtYojdDBPo7zTVICscNY5ou taUlr/cEUysE0fL+LTKH6ZOTsmWOpaG0V4xHoDBGpdwy3JQ+ScpjJ8JjrInOeL4B4/26 d9Dg== 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=q298VrLT0p6kxQXSlTdg5ungacdqqOr8BgOX7r0mWz4=; b=ckEewcnHW3NHt/MU8kANhL2TQHn+h/NARwsQFm4OFV8TWKvL/2GulfNOtselmkki82 7srWAVQOzdN7q178ytLUdXJcrNH2mxKlhvP8iwNEHFk+TrtQTDAYYeXINFa3hlKhkerw 3ROjXIM0154xXxNxB2z1Hpwe4LAfpw38SVrIh7KCXg6cTNqrEotPlDyeMdAUNB0T85y+ yk5UqbL283zUybhlcXwWOUCxyDbW1DkhlpenkRAnH9ibggZEvncjxMEw0KD7yzEe4wpg k6wnd8+5cZFEdjHwoKuJEFQv2VGZHclDuuGSMjEBgJJAWFZgx5FpK0WFSROUn8LfPpFM Cv5Q== X-Gm-Message-State: AA+aEWZtf7bpOGUhFSxOJEuwGVqWUK/JUyyED9Wtht7K4MuhObBLWm5i qiBvHdrRMz1J8FzsC60ZBieA7SvI X-Google-Smtp-Source: AFSGD/UABfSaDIoDZ5Y7PyKTNSgdit/sj2pQp1lXSX7RbWa7He37wvLWbfcO1KZandsj0dKYEYyH7w== X-Received: by 2002:a1c:4c0c:: with SMTP id z12mr13224451wmf.17.1544041379362; Wed, 05 Dec 2018 12:22:59 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id 200sm13878498wmw.31.2018.12.05.12.22.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Dec 2018 12:22:58 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Dec 2018 21:22:48 +0100 Message-Id: <20181205202248.16504-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181205175209.26199-1-onemda@gmail.com> References: <20181205175209.26199-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/proresdec2: change profile only if it is unknown 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/proresdec2.c | 51 ++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/libavcodec/proresdec2.c b/libavcodec/proresdec2.c index 8581d797fb..80a76bbba1 100644 --- a/libavcodec/proresdec2.c +++ b/libavcodec/proresdec2.c @@ -140,32 +140,35 @@ static av_cold int decode_init(AVCodecContext *avctx) avctx->bits_per_raw_sample = 10; - switch (avctx->codec_tag) { - case MKTAG('a','p','c','o'): - avctx->profile = FF_PROFILE_PRORES_PROXY; - break; - case MKTAG('a','p','c','s'): - avctx->profile = FF_PROFILE_PRORES_LT; - break; - case MKTAG('a','p','c','n'): - avctx->profile = FF_PROFILE_PRORES_STANDARD; - break; - case MKTAG('a','p','c','h'): - avctx->profile = FF_PROFILE_PRORES_HQ; - break; - case MKTAG('a','p','4','h'): - avctx->profile = FF_PROFILE_PRORES_4444; - avctx->bits_per_raw_sample = 12; - break; - case MKTAG('a','p','4','x'): - avctx->profile = FF_PROFILE_PRORES_XQ; - avctx->bits_per_raw_sample = 12; - break; - default: - avctx->profile = FF_PROFILE_UNKNOWN; - av_log(avctx, AV_LOG_WARNING, "Unknown prores profile %d\n", avctx->codec_tag); + if (avctx->profile == FF_PROFILE_UNKNOWN) { + switch (avctx->codec_tag) { + case MKTAG('a','p','c','o'): + avctx->profile = FF_PROFILE_PRORES_PROXY; + break; + case MKTAG('a','p','c','s'): + avctx->profile = FF_PROFILE_PRORES_LT; + break; + case MKTAG('a','p','c','n'): + avctx->profile = FF_PROFILE_PRORES_STANDARD; + break; + case MKTAG('a','p','c','h'): + avctx->profile = FF_PROFILE_PRORES_HQ; + break; + case MKTAG('a','p','4','h'): + avctx->profile = FF_PROFILE_PRORES_4444; + break; + case MKTAG('a','p','4','x'): + avctx->profile = FF_PROFILE_PRORES_XQ; + break; + default: + av_log(avctx, AV_LOG_WARNING, "Unknown prores profile %d\n", avctx->codec_tag); + } } + if (avctx->profile == FF_PROFILE_PRORES_XQ || + avctx->profile == FF_PROFILE_PRORES_4444) + avctx->bits_per_raw_sample = 12; + if (avctx->bits_per_raw_sample == 10) { av_log(avctx, AV_LOG_DEBUG, "Auto bitdepth precision. Use 10b decoding based on codec tag"); } else { /* 12b */