From patchwork Thu Oct 13 00:01:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 981 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp70485vsd; Wed, 12 Oct 2016 17:03:56 -0700 (PDT) X-Received: by 10.194.20.231 with SMTP id q7mr4911108wje.57.1476317036049; Wed, 12 Oct 2016 17:03:56 -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 fb7si13671437wjb.76.2016.10.12.17.03.52; Wed, 12 Oct 2016 17:03:56 -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 04A28689BA1; Thu, 13 Oct 2016 03:03:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vk0-f66.google.com (mail-vk0-f66.google.com [209.85.213.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 549926898D2 for ; Thu, 13 Oct 2016 03:03:43 +0300 (EEST) Received: by mail-vk0-f66.google.com with SMTP id 130so334697vkg.2 for ; Wed, 12 Oct 2016 17:03:43 -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=ad+VKiolWj1+2VxYayh3u/dXIsxgaNqwQV1qZnUbang=; b=JkrIFtn15lOFd0meANaQfe5QqRne8L1b0KOD9+EPXb2DQ3N8/Pi6bq635BNa8PPJJB S3kjaBsmNkA/7QQYm0i6wcqKeiJZ2E2sB25W307URzcZY9ip1TR3hy+5wqMKMepKZouD PstgT3zjRVip2RErGBnZvUkSHvlbKqNmY4Of4VTmzfDheMjhvOhzmP1N92/WT9edpRhG bCM9Y6sYf0Zyl038ZvNT1xAZ2a1lzSmIijEjq80JUNP3cRarEiJr/FPWKCNUjmid86FF m1u1bOMop6O2tA3RNufbYttUcrD2qFyE3sqJns4/BWZ72i559JmbpSU6j3DhaTBuTK+u 8Gdw== 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=ad+VKiolWj1+2VxYayh3u/dXIsxgaNqwQV1qZnUbang=; b=JUfAeUbZ5dW3uGqlrYRQJY3wzBqSbUTHGUCCW2DIc9P5IAwjqcVjZsWBQbjEYl02xr 2Zxe4QZR2PmkB4AimAOL8q2ych8+RtkI+IhVxrzPFOwFlnYba910TiAOcDuwgIeszqr8 bTtTKV7X/EDg0re958rFGHqG5e+qr9umREpIMjUyPi+OuAN8YzROS91KhdzYMbJ8WfQ0 XpehLS7d99mWPU5CQyToUjfrbXyI8h+88ncvpgZ4UaGzlONcg9/7YoxANGZGSAY5FX+a c++xlLUcGM+k24TbGezhd6sOFwSA1/68XFUGIPmxSj4bwBAlozfejAnTUwF38VFlGSjG 302Q== X-Gm-Message-State: AA6/9Rm3mxLOAVJaUQAelCFCrmfC8203i/ohs/UfPJf6PXvS5vyAR0M5cxsksLHJD26X7g== X-Received: by 10.31.147.138 with SMTP id v132mr2580580vkd.91.1476317022447; Wed, 12 Oct 2016 17:03:42 -0700 (PDT) Received: from localhost.localdomain ([181.22.66.211]) by smtp.gmail.com with ESMTPSA id q10sm4158249vkd.0.2016.10.12.17.03.41 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 12 Oct 2016 17:03:41 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Oct 2016 21:01:50 -0300 Message-Id: <20161013000150.8416-1-jamrial@gmail.com> X-Mailer: git-send-email 2.9.1 In-Reply-To: <20161012223459.GM4602@nb4> References: <20161012223459.GM4602@nb4> Subject: [FFmpeg-devel] [PATCH] avformat/matroskadec: workaround the field_order bug in the Matroska muxer 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 | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index a94398b..0acf6df 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1752,8 +1752,15 @@ static int matroska_parse_flac(AVFormatContext *s, return 0; } -static int mkv_field_order(int64_t field_order) +static int mkv_field_order(MatroskaDemuxContext *matroska, int64_t field_order) { + int major, minor, micro, bttb = 0; + + /* workaround a bug in our Matroska muxer, introduced in version 57.36 alongside + * this function, and fixed in 57.52 */ + if (sscanf(matroska->muxingapp, "Lavf%d.%d.%d", &major, &minor, µ) == 3) + bttb = (major == 57 && minor >= 36 && minor <= 51); + switch (field_order) { case MATROSKA_VIDEO_FIELDORDER_PROGRESSIVE: return AV_FIELD_PROGRESSIVE; @@ -1764,9 +1771,9 @@ static int mkv_field_order(int64_t field_order) case MATROSKA_VIDEO_FIELDORDER_BB: return AV_FIELD_BB; case MATROSKA_VIDEO_FIELDORDER_BT: - return AV_FIELD_BT; + return bttb ? AV_FIELD_TB : AV_FIELD_BT; case MATROSKA_VIDEO_FIELDORDER_TB: - return AV_FIELD_TB; + return bttb ? AV_FIELD_BT : AV_FIELD_TB; default: return AV_FIELD_UNKNOWN; } @@ -2282,7 +2289,7 @@ static int matroska_parse_tracks(AVFormatContext *s) st->codecpar->height = track->video.pixel_height; if (track->video.interlaced == MATROSKA_VIDEO_INTERLACE_FLAG_INTERLACED) - st->codecpar->field_order = mkv_field_order(track->video.field_order); + st->codecpar->field_order = mkv_field_order(matroska, track->video.field_order); else if (track->video.interlaced == MATROSKA_VIDEO_INTERLACE_FLAG_PROGRESSIVE) st->codecpar->field_order = AV_FIELD_PROGRESSIVE;