From patchwork Fri Dec 2 19:09:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 1659 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp457931vsa; Fri, 2 Dec 2016 11:26:48 -0800 (PST) X-Received: by 10.28.126.11 with SMTP id z11mr4634560wmc.87.1480706808746; Fri, 02 Dec 2016 11:26:48 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id op6si6446203wjc.85.2016.12.02.11.26.47; Fri, 02 Dec 2016 11:26:48 -0800 (PST) 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 28FAE689FF0; Fri, 2 Dec 2016 21:26:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f193.google.com (mail-qk0-f193.google.com [209.85.220.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EAC07689F62 for ; Fri, 2 Dec 2016 21:26:30 +0200 (EET) Received: by mail-qk0-f193.google.com with SMTP id y205so31805576qkb.1 for ; Fri, 02 Dec 2016 11:26:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=u3+AJPj1sE8VRKwN7N8f0wH/OHyYguHmNwAbFlDnyA8=; b=O/d0e3mh1+oZLWOnpm7bhx9I0RDo0QtkUi60fUHe/rchKecMkHJvzYM1yedQpglCjO yI0aSwBwiaMwPpYhHG+wmZQcuq4wK/M3KXHCdzGQ5KsieBSEn1ZFEZtDPyH4WvlFx7fg 34DcBIwrhPWQO/ovHz7lNU058HCwIP5Y5if2kqFtSuXjS26Kmnyrl+BeS4VByV2y+8ED gCgwpymtzAcpr27BjAzW5Jv5nAxRkf6hijUk7qV2coZeUC9VK+Ban4mGu/3rWieR/tsy 7y+0UbQYramd9Fnaq0NsQrUhF8KMJ88uliYYPp3ovkNpO8Vot67FvBbkLIu8lrhVxZB5 RGZw== 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=u3+AJPj1sE8VRKwN7N8f0wH/OHyYguHmNwAbFlDnyA8=; b=gCwdxjWMUeLwM0kz29fPP9HAWxKHLMl4cWiTocHXlc3Di5h+a5NIVdFTtYiTPQLjfb hUq8iOF0n5VJmvHkDlXhH8T+DE7DaHxoI1jbYy3toXT1LYj70evJiLEcM2EcLut+9ozS BoV08zTfZKliZuiaUtx6JVFLzF4zpYToIptfCnSfxI0QVze16VcMzwtCBz4HLNkYzKdZ 71QLrDk9Wu3shMQ28JiFVlvdnUee6cxtGJxl+91+Sddh3L9exnBeHH08aXrBWAKK6LsJ YNi02RdHeriAPOaddhdBftJMtb9J6XDlH4D6IUhXJXhBJDC9sLQgNbOQ2TRoTyEPY9fG q8kQ== X-Gm-Message-State: AKaTC038FG7du280udT5uu0xsA25tuqKAP3vQiOq21hNrTRdCyTqAG6QXdHmgoSEdEl2qA== X-Received: by 10.233.220.71 with SMTP id q68mr43815512qkf.8.1480705784157; Fri, 02 Dec 2016 11:09:44 -0800 (PST) Received: from localhost.localdomain ([181.22.5.158]) by smtp.gmail.com with ESMTPSA id 8sm3268983qkk.2.2016.12.02.11.09.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 02 Dec 2016 11:09:43 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 2 Dec 2016 16:09:25 -0300 Message-Id: <20161202190925.6264-1-jamrial@gmail.com> X-Mailer: git-send-email 2.10.2 Subject: [FFmpeg-devel] [PATCH] avformat/matroskadec: use mastering display metadata's own alloc function 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 | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 017a533..7b070ff 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1841,14 +1841,11 @@ static int mkv_parse_video_color(AVStream *st, const MatroskaTrack *track) { // Use similar rationals as other standards. const int chroma_den = 50000; const int luma_den = 10000; - AVMasteringDisplayMetadata *metadata = - (AVMasteringDisplayMetadata*) av_stream_new_side_data( - st, AV_PKT_DATA_MASTERING_DISPLAY_METADATA, - sizeof(AVMasteringDisplayMetadata)); + int ret; + AVMasteringDisplayMetadata *metadata = av_mastering_display_metadata_alloc(); if (!metadata) { return AVERROR(ENOMEM); } - memset(metadata, 0, sizeof(AVMasteringDisplayMetadata)); if (has_mastering_primaries) { metadata->display_primaries[0][0] = av_make_q( round(mastering_meta->r_x * chroma_den), chroma_den); @@ -1875,6 +1872,13 @@ static int mkv_parse_video_color(AVStream *st, const MatroskaTrack *track) { round(mastering_meta->min_luminance * luma_den), luma_den); metadata->has_luminance = 1; } + + ret = av_stream_add_side_data(st, AV_PKT_DATA_MASTERING_DISPLAY_METADATA, + (uint8_t *)metadata, sizeof(AVMasteringDisplayMetadata)); + if (ret < 0) { + av_freep(&metadata); + return ret; + } } return 0; }