From patchwork Sun Jan 26 17:59:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 17565 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 5A71B449D6B for ; Sun, 26 Jan 2020 20:00:49 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3C0D06891FF; Sun, 26 Jan 2020 20:00:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f195.google.com (mail-qk1-f195.google.com [209.85.222.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6D47D6881E9 for ; Sun, 26 Jan 2020 20:00:42 +0200 (EET) Received: by mail-qk1-f195.google.com with SMTP id d10so7492306qke.1 for ; Sun, 26 Jan 2020 10:00:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=x21QlX7dN+fn++jPPsg9angx3piGlFgbJwtRTmYfamE=; b=r6Kr70MODwRKT1viwspP7xwkTQ5h38VCrR0JDj2Qtrr/Y/wjn1oVv1pTRnJOjeOOdV 2nWEjH4QS7aSKPS1PqT8+rzDj00Tskqqt73dCdMFZk9okVTuZUFK6M8eKfwW/+ytqTlB oj1x7GO3c9HKiQw9/lE1HlgMt8obZ4L6e3Q/Ongaz2T729Je03l5bop1eHh8k0l+51DD mU2iV625AhZ5/ABA0L7adnmLd/xILKTabdLmeGq3Ssmue6Ls6DlrTWGFCVVWXcJaTDAv 5e0oRNoD8LWaYKDD2pOvBeK/auitVtyA6v7tWVSL+HURp2arOmL+pt0FRCZZ8NRUEjmt 4gMQ== 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:mime-version :content-transfer-encoding; bh=x21QlX7dN+fn++jPPsg9angx3piGlFgbJwtRTmYfamE=; b=UuJvI/7lFPhA5UPpNnr1kY7RstD+7TLpfBk+iRCCACHGdQqiX7aU6UIFmfdi68E15E NG0TSePT8REK+WR8OSFF41b/3Ebfs0z05ZOFwyAW37U5qaAO0eA60H8s2nxQ+7frRDl3 ZQDPRNOHABcZOgcf/UZwzpQrYeAv3VjgzAZA9CkE58pYB/Dj18gfbBcmDDewE7FdoNKi eFkAZ1IajUUpkfq35eYMzBrcxxiYMapKyifbq1bpVICPbvi3473r5bFGga68OXWAcaJT trqiKjQ6xbepE90bvHAhiy7o4UQwiVj0f7RkWysclVelOfaJWMuKJfnANLEK2pZv+hTQ N1QA== X-Gm-Message-State: APjAAAVWUxMETQAUgnskA5JGoMrUzh2D5+7MrIrihJgV7ljKfyKd5+IQ u5Z21ZtMNbTPWLeLnR9W69q+U5iA X-Google-Smtp-Source: APXvYqzrpvzwCDdj3P56SIsPrt+OEpJXjdd6q2PSYAa1bqfNsN2WRduT8E46ypcf9R6tWCfnVl2ndA== X-Received: by 2002:a37:6d47:: with SMTP id i68mr13459418qkc.228.1580061640998; Sun, 26 Jan 2020 10:00:40 -0800 (PST) Received: from localhost.localdomain ([191.83.211.22]) by smtp.gmail.com with ESMTPSA id x11sm7878763qkf.50.2020.01.26.10.00.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Jan 2020 10:00:40 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 26 Jan 2020 14:59:42 -0300 Message-Id: <20200126175942.16257-1-jamrial@gmail.com> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/av1_parser: export color 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Should fix fate-lavf-fate-av1.mkv failures on builds without an AV1 decoder. Signed-off-by: James Almer --- libavcodec/av1_parser.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/av1_parser.c b/libavcodec/av1_parser.c index 131a05fd72..68b7a78abe 100644 --- a/libavcodec/av1_parser.c +++ b/libavcodec/av1_parser.c @@ -160,6 +160,11 @@ static int av1_parser_parse(AVCodecParserContext *ctx, } av_assert2(ctx->format != AV_PIX_FMT_NONE); + avctx->colorspace = (enum AVColorSpace) color->matrix_coefficients; + avctx->color_primaries = (enum AVColorPrimaries) color->color_primaries; + avctx->color_trc = (enum AVColorTransferCharacteristic) color->transfer_characteristics; + avctx->color_range = color->color_range ? AVCOL_RANGE_JPEG : AVCOL_RANGE_MPEG; + if (ctx->width != avctx->width || ctx->height != avctx->height) { ret = ff_set_dimensions(avctx, ctx->width, ctx->height); if (ret < 0)