From patchwork Thu Oct 13 00:20:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 982 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp73637vsd; Wed, 12 Oct 2016 17:21:24 -0700 (PDT) X-Received: by 10.28.170.204 with SMTP id t195mr18512wme.113.1476318084041; Wed, 12 Oct 2016 17:21:24 -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 wt1si13719635wjc.140.2016.10.12.17.21.23; Wed, 12 Oct 2016 17:21:24 -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 E29FA689BAF; Thu, 13 Oct 2016 03:21:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yw0-f195.google.com (mail-yw0-f195.google.com [209.85.161.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8C947689B0B for ; Thu, 13 Oct 2016 03:21:13 +0300 (EEST) Received: by mail-yw0-f195.google.com with SMTP id e5so2436786ywc.3 for ; Wed, 12 Oct 2016 17:21:14 -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=ud5hOHMc96fa1yNdMxJSC4yvDs1HBRFOaZnQuvZsuaI=; b=WX2cxwGWy9tXg6qxxdKA+cjytEmSk6TRYZ4++zF1GkkMoyfA+pZSJOXsBH3LNizrZN aWuW1/iyrAcyDlQjEq5GykumfCfsH3RgK3HJsf8LEMkEYdGQmLX01rXGtuYLqxshm7Km WTdt+IaYMtAFV3R2u8YL/7dKlo23X6Taot5jZiUWudapiqTmZjhJoW/7wcsj5BSnngl2 VMU1STotNUHpms0J1t8P/tubnVD+R90fV6iWpDwxX46QWiaJPREY/LKz8UF3tV+h74Tq 1oUQZVB7T5uTZpKf/8pdXfvFy6lRnEN1Qw+mTPhZG8vEX8OKLy525oh76RduA3bxrHeL CZXA== 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=ud5hOHMc96fa1yNdMxJSC4yvDs1HBRFOaZnQuvZsuaI=; b=JCqAmMaOvDncTwUOtImm7Mgne4hhkbbws0PXRIDXCPmFgOHLdkMpTugBY2R76bco4e i5uKB8CmnbYX1QHgh4xmA2ESyHnRg/Kt8TNxGOkTD7xVrTOg38cLeGy+QIceuwQW201e W5IrMY4fX3Sxho0LLPvuxVBvtNjXSz3OXXcvhRqCtQcE7WQTNL2NUvWFjachHOUomEPq +8gs7pbhBkyf9xcu1IIYNRtPF+kKn68xXmfCoWpqZGdmD1Rj4KNE1GBR9NSMy/zX5+0f xkcVYDJRxmyZk9dwN4qrryLFoRD7vQ5PrQBZOjRiMmCI+K5n3A6XILMJqqjp3EW0tM7M 3Akg== X-Gm-Message-State: AA6/9RnoRsFWqUvugnEQrrrzkgHSXbMs58F8yqG8Fqissto87sLLs9sqFA1i9pjhRAtftg== X-Received: by 10.129.97.69 with SMTP id v66mr3586019ywb.216.1476318072535; Wed, 12 Oct 2016 17:21:12 -0700 (PDT) Received: from localhost.localdomain ([181.22.66.211]) by smtp.gmail.com with ESMTPSA id v6sm3744809ywd.32.2016.10.12.17.21.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 12 Oct 2016 17:21:12 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Oct 2016 21:20:06 -0300 Message-Id: <20161013002006.8324-1-jamrial@gmail.com> X-Mailer: git-send-email 2.9.1 In-Reply-To: <20161013000150.8416-1-jamrial@gmail.com> References: <20161013000150.8416-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH v2] 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 --- Now also checks for micro version. libavformat/matroskadec.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index a94398b..acf1ccb 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 && micro >= 100); + 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;