From patchwork Sat Oct 15 15:40:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 1010 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.133 with SMTP id o127csp282375vsd; Sat, 15 Oct 2016 08:42:12 -0700 (PDT) X-Received: by 10.194.148.162 with SMTP id tt2mr6020377wjb.147.1476546132479; Sat, 15 Oct 2016 08:42:12 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id vb6si30125447wjb.80.2016.10.15.08.42.11; Sat, 15 Oct 2016 08:42:12 -0700 (PDT) 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; 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 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 D1A20689AF5; Sat, 15 Oct 2016 18:42:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yb0-f193.google.com (mail-yb0-f193.google.com [209.85.213.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EFB036891EF for ; Sat, 15 Oct 2016 18:42:01 +0300 (EEST) Received: by mail-yb0-f193.google.com with SMTP id 184so2892180yby.3 for ; Sat, 15 Oct 2016 08:42:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=O20SeqqMYj2lE7NmZ/0Aqhwb5+08L79zT7SIhCW8Mu4=; b=u18Xsk/ftzFQWYPfR5Ep9m0Nl9XsZbpCAdXbNa4YzN7gH7ddvI3j+Gdti9ShRpEWvL fMTFlbBMMzP4acnZok46fwB2licCGu7AQHasK86UHvdubSRfLnBfW3SRvwcXfKjFJRgc /pD0E5D76RRne6xz4KiNs9iw6QjWx8EQMg5Sst58fj5M5y35Qu2lZRTHrmsJj1uZC2C1 m3xv68LTFuFStJFwWT3qanINuPCY8xUULjOz8454sqYi+bosQ8t759V1liuqIz1g4pza gXKdIUvh0k0wjRM118ONDqSSZsOc+bhPDEkAljx1qxxqFoiGXVURLjZNn1kPgZJoxRFW mL1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=O20SeqqMYj2lE7NmZ/0Aqhwb5+08L79zT7SIhCW8Mu4=; b=CFi5ecgINfpd/chBuz3oHrr8raO+MhSyaMMUpbSO84lgXZmZtLEHZVLYnYhyDNuwIr eFSQ03x5nmB2C4oRZNiLuizfXpASLOuP3/F63awW+2JSfKV8JBd6Pa3qJWToVPqijuTn YyFoQb1tiP4D3x9C750QUrUznmlrUc95HVhmUeevrLX44qJbkFeVQuLxJ+DWwjbsov6I 7+p3c07FZCAD6ZV6qUk1ktQw8ol+NFnpmiddU93moN/olhTzDsRi2/fcTv5pJ9aecnDC iwOorLu6yxqmZfdakP/XyYeNLAsQjJUUBag869u9nLty6otaKk6i13AbJ88RJffe1eqr 6hSw== X-Gm-Message-State: AA6/9RmkxTkhidN8wtWHbwWv+KTYZMtcH0+ASJLCYHpz0HczM2sM1Fak1YvBklxnJfUfhw== X-Received: by 10.37.207.194 with SMTP id f185mr15559758ybg.33.1476546122185; Sat, 15 Oct 2016 08:42:02 -0700 (PDT) Received: from localhost.localdomain ([181.22.59.227]) by smtp.gmail.com with ESMTPSA id w195sm8425307ywd.46.2016.10.15.08.42.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 15 Oct 2016 08:42:01 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 15 Oct 2016 12:40:55 -0300 Message-Id: <20161015154056.3148-2-jamrial@gmail.com> X-Mailer: git-send-email 2.9.1 In-Reply-To: <20161015154056.3148-1-jamrial@gmail.com> References: <20161015154056.3148-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/3] avformat/matroskadec: support parsing Chroma Location elements 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: James Almer --- libavformat/matroskadec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index acf1ccb..cfe4692 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1826,6 +1826,10 @@ static int mkv_parse_video_color(AVStream *st, const MatroskaTrack *track) { if (track->video.color.range != AVCOL_RANGE_UNSPECIFIED && track->video.color.range <= AVCOL_RANGE_JPEG) st->codecpar->color_range = track->video.color.range; + if (track->video.color.chroma_siting_horz && track->video.color.chroma_siting_vert) + st->codecpar->chroma_location = + avcodec_chroma_pos_to_enum((track->video.color.chroma_siting_horz - 1) << 7, + (track->video.color.chroma_siting_vert - 1) << 7); if (has_mastering_primaries || has_mastering_luminance) { // Use similar rationals as other standards.