From patchwork Fri Nov 2 19:35:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vittorio Giovara X-Patchwork-Id: 10900 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 14D0C44E1E4 for ; Fri, 2 Nov 2018 21:35:56 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 88C9D68A9F5; Fri, 2 Nov 2018 21:35:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f174.google.com (mail-qk1-f174.google.com [209.85.222.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7C7B068A9C4 for ; Fri, 2 Nov 2018 21:35:19 +0200 (EET) Received: by mail-qk1-f174.google.com with SMTP id q1so4804994qkf.13 for ; Fri, 02 Nov 2018 12:35:52 -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=0NTi+uwE9uxmYV6dfdpB5evmPK2cncVTbgkuc6+4uUg=; b=NBfC2AfH9oj6mZ/hUetMo0xShwu8dHKlYcVNwIDQwlYuFhdc3Gpv3qvpcFmKWgA0Xj qUp8l/eq3amBLGU36ChJTp+NavXPfH2WFHjXZRnlGrmaZq9liE41Lb/iaviN3O/f2abt a3SjU8TFTq+809l1tN9ipK0JMKkW0T1mcjLYqrVDwxbOB3UWjstSCaHbTBUAoJgbC50L 2qlt24N7fdqSbyAUvosxokeR6UtlzckeufXgX2hBZAIZgd1fYSM5IlzAeWPDnq+PvCW6 GBJzaa70TsQ9JsY307niILDSiYSv9nh9xXOLZuCcwngo235XVYGg4XXetMfmAiawl2i+ dgSw== 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=0NTi+uwE9uxmYV6dfdpB5evmPK2cncVTbgkuc6+4uUg=; b=hr6AF5yJ8IMk1ZRty2wpAFb7LLneUrL31Lxf4UsPjCVWVQHRowHh0BySOquZBYCXN1 2Qc5PPj6PUg+VbTCt4hRnl6ktgQGczXJ0c8Pfztlt2D+FRUgallBE66QpX2f4BxXi+/L JnetJoNAbVi/p0pYXREjUtGlwYSr77cn2myV7qurZzAcYjjz0m29b4DokkbYwQBm+eFq 6eW6I956SHZFISMCDJQf7/fY1QNaA6LSyCHsnbclGDiBg/B7ma1CeM0jDrQBeSOc2fb9 wo9Lco02eAP50sFYNLBrglpDyJlelsJLqnkGwZGzRZRJDzG54wcJFGc7YUprOA40Ap/w 6TTg== X-Gm-Message-State: AGRZ1gKQ50nmEDSwSzSjre0AgQ+qscwO/a6NugwlgXXNtaetJi/1ocHw eA8Kv4j8AxoJ6wGzlCQxnrkiWzfu X-Google-Smtp-Source: AJdET5cGiu8AbdeSLmRl07sFok4Xyey9SPvJpaYuFNgDAxu0aBofo/FPHQlZ7OpC+k476YtkKOWJVw== X-Received: by 2002:ad4:5307:: with SMTP id y7mr12385809qvr.9.1541187351142; Fri, 02 Nov 2018 12:35:51 -0700 (PDT) Received: from vimacnew.iac.corp ([8.40.92.161]) by smtp.gmail.com with ESMTPSA id s21-v6sm27318555qth.11.2018.11.02.12.35.50 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Nov 2018 12:35:50 -0700 (PDT) From: Vittorio Giovara To: ffmpeg-devel@ffmpeg.org Date: Fri, 2 Nov 2018 15:35:39 -0400 Message-Id: <20181102193540.64694-3-vittorio.giovara@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20181102193540.64694-1-vittorio.giovara@gmail.com> References: <20181102193540.64694-1-vittorio.giovara@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/4] proresdec2: Parse codec_tag and export profile information 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" --- libavcodec/proresdec2.c | 24 ++++++++++++++++++++++++ libavcodec/version.h | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/libavcodec/proresdec2.c b/libavcodec/proresdec2.c index 6b3021bdfa..130a4e3fe8 100644 --- a/libavcodec/proresdec2.c +++ b/libavcodec/proresdec2.c @@ -62,6 +62,30 @@ static av_cold int decode_init(AVCodecContext *avctx) permute(ctx->progressive_scan, ff_prores_progressive_scan, idct_permutation); permute(ctx->interlaced_scan, ff_prores_interlaced_scan, idct_permutation); + 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: + avctx->profile = FF_PROFILE_UNKNOWN; + av_log(avctx, AV_LOG_WARNING, "Unknown prores profile %d\n", avctx->codec_tag); + } + return 0; } diff --git a/libavcodec/version.h b/libavcodec/version.h index 91809641b4..d2ac30d4a8 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 58 #define LIBAVCODEC_VERSION_MINOR 34 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \