From patchwork Wed Oct 19 03:20:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 1065 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.133 with SMTP id o127csp42355vsd; Tue, 18 Oct 2016 20:21:11 -0700 (PDT) X-Received: by 10.28.51.11 with SMTP id z11mr642017wmz.32.1476847271332; Tue, 18 Oct 2016 20:21:11 -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 10si51920491wjf.6.2016.10.18.20.21.10; Tue, 18 Oct 2016 20:21:11 -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 139706898F6; Wed, 19 Oct 2016 06:21:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vk0-f67.google.com (mail-vk0-f67.google.com [209.85.213.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9EB9C689751 for ; Wed, 19 Oct 2016 06:20:59 +0300 (EEST) Received: by mail-vk0-f67.google.com with SMTP id 83so725605vkd.0 for ; Tue, 18 Oct 2016 20:21:02 -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=qhepMONTCSOKA/h4dY3OnwksktwwPkblLKfqz65nzPE=; b=ztS+P7IE0KhHYDgu1/xPj37+Szze2FCpOn3pyYT96hU8C526ULGkhxrPw6fnwNYgrr ULG5uS7wKn0zdzIBHauYrn0BRyic1X0+72amlSPQueD+R07fsn8+2OBvjZuit3FFHUh4 jHx0sLAIU2P6DQxDkJs8xKZIaHtkzyvz2tNXxKqUpzMGeVIGbzWArhXs5JigVFMze+rR YhevukShQNehp4+nnIh6pWt6rMx2cY/flG+2o2S8mH9cD6F7RXgq+mgWkwMA9YvIKVF2 AWCdJb1RUwdEwAxHnGlAshSKVOQjaz9ZALqnSu1/rB52fydyZNaE22Fdjy5RVJ2SWnvo VooQ== 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=qhepMONTCSOKA/h4dY3OnwksktwwPkblLKfqz65nzPE=; b=hcgIBYygghDF5rX1GcsLL4pDDjluCwelsrWMQhYY2AEqUOsCPeZxsUQ13idQZQY2tJ OUWc2Jj584HOx5t5oJ5sgnLO/hC7Jdj2jaikPdeplch+Yc/tbTaowfzAMmvynpmY8EOD Dx2NRd340TwdUdDnhpCarGfU4kVtjSUNpy352glZFTB6qG8gZjCcEtIdm848QkCytSNE RAecqruymcR46PJfHJ10q+Kf0DAOLJdDyA9lKVvy204tQAqeoJ9G7wc5fST0N0B2lSYg KqgGvcTgLw8A6EuDE1L4GOeXJknvM39HHd7FOWOCBiq+35RgskDcgsijLKHOTX+GWizO QyFw== X-Gm-Message-State: AA6/9RnA9UpiZS6IWm0QM0U/fMTNPtmGSG4HTZFlgaTnpeC2wCamxkVXobvWtZeEw+Orxw== X-Received: by 10.31.9.74 with SMTP id 71mr3371784vkj.75.1476847261003; Tue, 18 Oct 2016 20:21:01 -0700 (PDT) Received: from localhost.localdomain ([181.22.15.127]) by smtp.gmail.com with ESMTPSA id 108sm229404uau.19.2016.10.18.20.20.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 18 Oct 2016 20:21:00 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 19 Oct 2016 00:20:43 -0300 Message-Id: <20161019032043.4912-1-jamrial@gmail.com> X-Mailer: git-send-email 2.9.1 Subject: [FFmpeg-devel] [PATCH] avformat/matroskaenc: write DisplayWidth and DisplayHeight elements only if they differ from PixelWidth and PixelHeight 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 | 6 ++++-- tests/fate/matroska.mak | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 6f2957c..03d5326 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1192,8 +1192,10 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, av_log(s, AV_LOG_ERROR, "Overflow in display width\n"); return AVERROR(EINVAL); } - put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYWIDTH , d_width / display_width_div); - put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYHEIGHT, par->height / display_height_div); + if (d_width != par->width || display_width_div != 1 || display_height_div != 1) { + put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYWIDTH , d_width / display_width_div); + put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYHEIGHT, par->height / display_height_div); + } } else if (display_width_div != 1 || display_height_div != 1) { put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYWIDTH , par->width / display_width_div); put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYHEIGHT, par->height / display_height_div); diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak index 63a4252..35ed41f 100644 --- a/tests/fate/matroska.mak +++ b/tests/fate/matroska.mak @@ -4,6 +4,6 @@ FATE_MATROSKA-$(call DEMMUX, MATROSKA, MATROSKA) += fate-matroska-remux fate-matroska-remux: CMD = md5 -i $(TARGET_SAMPLES)/vp9-test-vectors/vp90-2-2pass-akiyo.webm -color_trc 4 -c:v copy -fflags +bitexact -strict -2 -f matroska fate-matroska-remux: CMP = oneline -fate-matroska-remux: REF = 84e950f59677e306f944fca484888c5d +fate-matroska-remux: REF = 9b8398b42804ba12c39d2f47299a0996 FATE_SAMPLES_AVCONV += $(FATE_MATROSKA-yes)