From patchwork Sat Oct 15 22:09: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: 1015 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.133 with SMTP id o127csp357222vsd; Sat, 15 Oct 2016 15:22:54 -0700 (PDT) X-Received: by 10.28.181.65 with SMTP id e62mr2992510wmf.126.1476570174716; Sat, 15 Oct 2016 15:22:54 -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 z22si4707819wmc.80.2016.10.15.15.22.54; Sat, 15 Oct 2016 15:22:54 -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 90BE468972D; Sun, 16 Oct 2016 01:22:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yw0-f196.google.com (mail-yw0-f196.google.com [209.85.161.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D4D0D68920A for ; Sun, 16 Oct 2016 01:22:44 +0300 (EEST) Received: by mail-yw0-f196.google.com with SMTP id e5so5428634ywc.3 for ; Sat, 15 Oct 2016 15:22:46 -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=TmakC+17isopqrxu+JbKlsa1SSJP0SOGd7sl7tWYt+o=; b=S9F5qUph8hlrRzol08hvncppnpgckKwihrVX1oxAoyCItHqan+mybMoHOe6UiI0ieJ wWNYN7BtL9B5SDPziFm3Rz2EVOABhS6Xju/D+kN05dQkS4AEvN5kL+ESlop5TFZ6OQiK osWr36pFq3R6TXeJjIQM5rF9ruw3qMBSZ6loWyr97beqb2r91hMas2DNSdnevPu6VGX7 ebeEcmUWEnNlKvP5jiwD7u3WRYnYQdecKPzVoc/KkzBKkOYRI4UFJK8zGbZDvsOwwx8x oe3xLMsm0IFJO07dpxi64rK9x+T3Z70AYi4MKfpE2bdx3b3LTIFcCiNg/6Wg78w+WcKf IzqA== 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=TmakC+17isopqrxu+JbKlsa1SSJP0SOGd7sl7tWYt+o=; b=P+Db+sMEkSJ3+achzr07nB4Bn2qAgTbLfmuSntyfcl5iJ5Lqt1uDXa9Yqyqra9VTRO lhBWuxRK+PajqYsAQsGfn1heVwC/qJYRiYjDMVoIlmWyiMcHVvZClWIq1Ulv7U1QGTXZ WqeUELXfZMnDQYUGaCtgdPzIAbOB3+h2yh4c4J0g9/4Vv2q6+lu+UpILD7lsR8nvDN45 hXdH4bau01xtFEZ7bhDjlcIclRokpBGU23VDek4sbhJ5M8HMrYPqg6nONykU1XY6L4HB dbM7lWphpilgOOyMpZ5xa5lD2Ld5VWAery6mfOMMCa4Gj5Uprv8Sg4jkMgWwoK1q15Fy qyjg== X-Gm-Message-State: AA6/9RlcF0/OoLzKI75svcJv6MiuCBate213hL4Mga9PlnPvgDCDnnzzgdxLDTVYwz6eCA== X-Received: by 10.13.205.70 with SMTP id p67mr17307193ywd.112.1476569400093; Sat, 15 Oct 2016 15:10:00 -0700 (PDT) Received: from localhost.localdomain ([181.22.59.227]) by smtp.gmail.com with ESMTPSA id i63sm8964498ywg.5.2016.10.15.15.09.57 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 15 Oct 2016 15:09:59 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 15 Oct 2016 19:09:43 -0300 Message-Id: <20161015220943.660-2-jamrial@gmail.com> X-Mailer: git-send-email 2.9.1 In-Reply-To: <20161015220943.660-1-jamrial@gmail.com> References: <20161015220943.660-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avformat/matroskaenc: write a DisplayUnit element when aspect ratio is unknown 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" We don't currently support values 1 (centimeters), 2 (inches) or 3 (DAR), only the default value 0 (pixels) which doesn't need to be written. The fate refs are updated as unknown SAR is now correctly propagated by the matroska demuxer. Signed-off-by: James Almer --- See the relevant discussion in https://mailarchive.ietf.org/arch/msg/cellar/x1F00MwqytPjrcNru6Kk2CWQ474 and https://github.com/Matroska-Org/matroska-specification/pull/34 libavformat/matroskaenc.c | 3 ++- tests/ref/fate/rgb24-mkv | 6 +++--- tests/ref/lavf/mkv | 8 ++++---- tests/ref/seek/lavf-mkv | 44 ++++++++++++++++++++++---------------------- 4 files changed, 31 insertions(+), 30 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index d6557a1..d57f231 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1205,7 +1205,8 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, } 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); - } + } else + put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYUNIT, MATROSKA_VIDEO_DISPLAYUNIT_UNKNOWN); if (par->codec_id == AV_CODEC_ID_RAWVIDEO) { uint32_t color_space = av_le2ne32(par->codec_tag); diff --git a/tests/ref/fate/rgb24-mkv b/tests/ref/fate/rgb24-mkv index bf89ebb..19fd0e6 100644 --- a/tests/ref/fate/rgb24-mkv +++ b/tests/ref/fate/rgb24-mkv @@ -1,8 +1,8 @@ -5f43d628c76d97e30791bf30674ee485 *tests/data/fate/rgb24-mkv.matroska -58357 tests/data/fate/rgb24-mkv.matroska +7b8662e001bfb32a4bf709f4fe620138 *tests/data/fate/rgb24-mkv.matroska +58361 tests/data/fate/rgb24-mkv.matroska #tb 0: 1/10 #media_type 0: video #codec_id 0: rawvideo #dimensions 0: 160x120 -#sar 0: 1/1 +#sar 0: 0/1 0, 0, 0, 1, 57600, 0x3718ad00 diff --git a/tests/ref/lavf/mkv b/tests/ref/lavf/mkv index 5f57083..de161bf 100644 --- a/tests/ref/lavf/mkv +++ b/tests/ref/lavf/mkv @@ -1,6 +1,6 @@ -a06683a6eb4af6fe8ffe5603c1942a97 *./tests/data/lavf/lavf.mkv -472755 ./tests/data/lavf/lavf.mkv +d23ff6ba071001256fa5073a0a528337 *./tests/data/lavf/lavf.mkv +472759 ./tests/data/lavf/lavf.mkv ./tests/data/lavf/lavf.mkv CRC=0xec6c3c68 -c1009a6b9b4ef7e0eb0775d227131415 *./tests/data/lavf/lavf.mkv -320599 ./tests/data/lavf/lavf.mkv +e33c89229c7d5014137c7217f4547467 *./tests/data/lavf/lavf.mkv +320603 ./tests/data/lavf/lavf.mkv ./tests/data/lavf/lavf.mkv CRC=0xec6c3c68 diff --git a/tests/ref/seek/lavf-mkv b/tests/ref/seek/lavf-mkv index 4bb26ef..cea34e9 100644 --- a/tests/ref/seek/lavf-mkv +++ b/tests/ref/seek/lavf-mkv @@ -1,48 +1,48 @@ -ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 830 size: 208 +ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 834 size: 208 ret: 0 st:-1 flags:0 ts:-1.000000 -ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 1046 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 1050 size: 27837 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292472 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292476 size: 27834 ret: 0 st: 0 flags:0 ts: 0.788000 -ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292472 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292476 size: 27834 ret: 0 st: 0 flags:1 ts:-0.317000 -ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 1046 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 1050 size: 27837 ret:-1 st: 1 flags:0 ts: 2.577000 ret: 0 st: 1 flags:1 ts: 1.471000 -ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320313 size: 209 +ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320317 size: 209 ret: 0 st:-1 flags:0 ts: 0.365002 -ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 147019 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 147023 size: 27925 ret: 0 st:-1 flags:1 ts:-0.740831 -ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 1046 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 1050 size: 27837 ret:-1 st: 0 flags:0 ts: 2.153000 ret: 0 st: 0 flags:1 ts: 1.048000 -ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292472 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292476 size: 27834 ret: 0 st: 1 flags:0 ts:-0.058000 -ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 830 size: 208 +ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 834 size: 208 ret: 0 st: 1 flags:1 ts: 2.836000 -ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320313 size: 209 +ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320317 size: 209 ret:-1 st:-1 flags:0 ts: 1.730004 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 147019 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 147023 size: 27925 ret: 0 st: 0 flags:0 ts:-0.482000 -ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 1046 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 1050 size: 27837 ret: 0 st: 0 flags:1 ts: 2.413000 -ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292472 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292476 size: 27834 ret:-1 st: 1 flags:0 ts: 1.307000 ret: 0 st: 1 flags:1 ts: 0.201000 -ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 830 size: 208 +ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 834 size: 208 ret: 0 st:-1 flags:0 ts:-0.904994 -ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 1046 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 1050 size: 27837 ret: 0 st:-1 flags:1 ts: 1.989173 -ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292472 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292476 size: 27834 ret: 0 st: 0 flags:0 ts: 0.883000 -ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292472 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292476 size: 27834 ret: 0 st: 0 flags:1 ts:-0.222000 -ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 1046 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 1050 size: 27837 ret:-1 st: 1 flags:0 ts: 2.672000 ret: 0 st: 1 flags:1 ts: 1.566000 -ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320313 size: 209 +ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320317 size: 209 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 147019 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 147023 size: 27925 ret: 0 st:-1 flags:1 ts:-0.645825 -ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 1046 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 1050 size: 27837