From patchwork Sat Oct 15 15:40:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 1011 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.133 with SMTP id o127csp284941vsd; Sat, 15 Oct 2016 08:55:52 -0700 (PDT) X-Received: by 10.28.7.134 with SMTP id 128mr2638716wmh.42.1476546952726; Sat, 15 Oct 2016 08:55:52 -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 u10si30198684wjs.103.2016.10.15.08.55.52; Sat, 15 Oct 2016 08:55:52 -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 C7ADA689B0E; Sat, 15 Oct 2016 18:55:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yb0-f194.google.com (mail-yb0-f194.google.com [209.85.213.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7EE0D687EB9 for ; Sat, 15 Oct 2016 18:55:42 +0300 (EEST) Received: by mail-yb0-f194.google.com with SMTP id 184so2897183yby.3 for ; Sat, 15 Oct 2016 08:55:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=+GifQOwpdDBTk3QPQ+K8Hvum+sDmmOPegennv/fBwq4=; b=MxN8nXYmvB/NRnX1b9Eu1TdQ69IOEXxpVCSOKopw6HqI45KKOE4hn4yMlKNi+fyYni snUtBR2YQ665BDX3T8yPvO/qceb5sAC6gTQ89rIRtJ4aMqXZEZexO4W7+du8w2FYvgTn Ex2NlqIuQehNSSCqCImV2an28Vok5nqE//8OCxC74vpOrY0IBkQT91LlFCflcgZTVkB5 9AihVMayXz1gMcs4XjWlPIyq3pQMs2p12gRQX80/RnzCOc9AYmIZHKLDpLNTs3cPLevq IBEk1CJ6yWCGzBLyX3/1pOVnTCUx6pVUmfmULu1CqFKEgVa07mVdh/rI7BEnK6IWa3+S k/Pg== 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; bh=+GifQOwpdDBTk3QPQ+K8Hvum+sDmmOPegennv/fBwq4=; b=bwPMGVhJE7cjU3aijF+WpJuIGHVnOILkdy9UGvdKznBoyjSa8JfuEUBGAwnxJotrRq sGKHpC5py5p7LE2X6+wAs5WlXVZ0SyCyACR2z9NWNNYEdB41IhZ7jz1GRl7qma3jnkFW aR9dENoA8c6rMpe1HLe8fGToCA4OakhVxFAhOKRspnrYE/Eh0NXR/Uy7FNTgP0JeQRJ+ +ZBqsInGRzfnudve/yWkViL6v0zIQIBVy+Z8q4Rs0TNmC13po2s0Oe2J5RjBXdf1pSOS Q/vsqz4LakiegPVyMwEQ9NX8hZuZRS3+8iZS1gZ1MrCRjNFLtVzqfF463YUrHXfmoRox y6tA== X-Gm-Message-State: AA6/9RmWqUyrhp089TfKUVapo8dneR8vyDuRh3jpKv1CvS+jiZKh/8BEuvk/3arbhKzzCA== X-Received: by 10.37.3.142 with SMTP id 136mr16186520ybd.198.1476546120723; Sat, 15 Oct 2016 08:42:00 -0700 (PDT) Received: from localhost.localdomain ([181.22.59.227]) by smtp.gmail.com with ESMTPSA id w195sm8425307ywd.46.2016.10.15.08.41.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 15 Oct 2016 08:42:00 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 15 Oct 2016 12:40:54 -0300 Message-Id: <20161015154056.3148-1-jamrial@gmail.com> X-Mailer: git-send-email 2.9.1 Subject: [FFmpeg-devel] [PATCH 1/3] avformat/matroskaenc: support writting 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/matroskaenc.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index a48f5bb..d6557a1 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -829,6 +829,14 @@ static int mkv_write_video_color(AVIOContext *pb, AVCodecParameters *par, AVStre par->color_range < AVCOL_RANGE_NB) { put_ebml_uint(dyn_cp, MATROSKA_ID_VIDEOCOLORRANGE, par->color_range); } + if (par->chroma_location != AVCHROMA_LOC_UNSPECIFIED && + par->chroma_location <= AVCHROMA_LOC_TOP) { + int xpos, ypos; + + avcodec_enum_to_chroma_pos(&xpos, &ypos, par->chroma_location); + put_ebml_uint(dyn_cp, MATROSKA_ID_VIDEOCOLORCHROMASITINGHORZ, (xpos >> 7) + 1); + put_ebml_uint(dyn_cp, MATROSKA_ID_VIDEOCOLORCHROMASITINGVERT, (ypos >> 7) + 1); + } if (side_data_size == sizeof(AVMasteringDisplayMetadata)) { ebml_master meta_element = start_ebml_master( dyn_cp, MATROSKA_ID_VIDEOCOLORMASTERINGMETA, 0);