From patchwork Mon Sep 19 11:32:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 622 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp949765vsd; Mon, 19 Sep 2016 04:33:03 -0700 (PDT) X-Received: by 10.28.22.138 with SMTP id 132mr8203768wmw.7.1474284783809; Mon, 19 Sep 2016 04:33:03 -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 ze1si22287826wjb.250.2016.09.19.04.33.03; Mon, 19 Sep 2016 04:33:03 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2F274689D85; Mon, 19 Sep 2016 14:32:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-2.mx.upcmail.net (vie01a-dmta-pe03-2.mx.upcmail.net [62.179.121.161]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6C08B689AD5 for ; Mon, 19 Sep 2016 14:32:41 +0300 (EEST) Received: from [172.31.216.44] (helo=vie01a-pemc-psmtp-pe02) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1blwoh-0007Cv-OM for ffmpeg-devel@ffmpeg.org; Mon, 19 Sep 2016 13:32:55 +0200 Received: from [192.168.1.3] ([80.110.110.154]) by vie01a-pemc-psmtp-pe02 with SMTP @ mailcloud.upcmail.net id lPYu1t01T3Kv2M401PYvjU; Mon, 19 Sep 2016 13:32:55 +0200 X-SourceIP: 80.110.110.154 From: Carl Eugen Hoyos To: FFmpeg development discussions and patches Date: Mon, 19 Sep 2016 13:32:54 +0200 User-Agent: KMail/1.9.10 MIME-Version: 1.0 Message-Id: <201609191332.54592.cehoyos@ag.or.at> Subject: [FFmpeg-devel] [PATCH]lavf/mov: Read aspect ratio from ares atom for dnxhd 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi! Attached patch fixes the aspect ratio for the sample from ticket #5325 / #2125. The fate test changes because the fate sample was written by FFmpeg with an incorrect aspect ratio. Please comment, Carl Eugen From 0553b0adfee87401854f0313dbcf386f2fb7ae68 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Mon, 19 Sep 2016 13:30:06 +0200 Subject: [PATCH] lavf/mov: Read aspect ratio from ares atom for dnxhd. Fixes ticket #2125. Fixes ticket #5325. --- libavformat/mov.c | 3 ++- tests/ref/fate/dnxhd-mbaff | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 6e80b93..ce24e2e 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1486,7 +1486,8 @@ static int mov_read_ares(MOVContext *c, AVIOContext *pb, MOVAtom atom) if (cid == 0xd4d || cid == 0xd4e) par->width = 1440; return 0; - } else if (par->codec_tag == MKTAG('A', 'V', 'd', '1') && + } else if ((par->codec_tag == MKTAG('A', 'V', 'd', '1') || + par->codec_tag == MKTAG('A', 'V', 'd', 'n')) && atom.size >= 24) { int num, den; avio_skip(pb, 12); diff --git a/tests/ref/fate/dnxhd-mbaff b/tests/ref/fate/dnxhd-mbaff index d694cfe..8e95227 100644 --- a/tests/ref/fate/dnxhd-mbaff +++ b/tests/ref/fate/dnxhd-mbaff @@ -2,5 +2,5 @@ #media_type 0: video #codec_id 0: rawvideo #dimensions 0: 1440x1080 -#sar 0: 4/3 +#sar 0: 1/1 0, 0, 0, 1, 6220800, 0xe78198c0