From patchwork Tue Sep 27 18:03:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 748 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp2611306vsd; Tue, 27 Sep 2016 11:04:17 -0700 (PDT) X-Received: by 10.194.203.38 with SMTP id kn6mr9935180wjc.151.1474999457822; Tue, 27 Sep 2016 11:04:17 -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 e189si14949082wmg.45.2016.09.27.11.04.09; Tue, 27 Sep 2016 11:04:17 -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 1CC44689C34; Tue, 27 Sep 2016 21:03:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi0-f65.google.com (mail-oi0-f65.google.com [209.85.218.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 27526689BEA for ; Tue, 27 Sep 2016 21:03:48 +0300 (EEST) Received: by mail-oi0-f65.google.com with SMTP id i193so1364073oib.3 for ; Tue, 27 Sep 2016 11:04:00 -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=tB4Rr+Eh8/fljn+llHZrCOc9qb7+IGFx8oR8lkZcQxU=; b=cAyOvr0RtRAPcuf/B68Rp66rw3Cdo1JFzquu3eKLsgmplG4A5iaZzXxmmr6decZ+kY mi6pVOG6HpG5cOHx0vVBoHlIIEu3C9RrrwN9uqPzKubz5oK3SlhJAUvmr4lFjsuTOPwV kaTu9w1K2MibK58UGLwPF3NSW4RMYEwQuOIoPhNqAWaxjmLJrQVHNlwyBCfO02Pg6kZt jdTHZFlOySeYWeNpFXipGHeSF4WLRZFV5gB+Yzv0Ss1N1/97jYFjXrAEaj18UdluECU4 yno7CnmGvPykOTVvkq6XheRMfViGDRkznUtGrH66KcDesSDEiqDWfwGne8jE81a/9cnQ nt0Q== 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=tB4Rr+Eh8/fljn+llHZrCOc9qb7+IGFx8oR8lkZcQxU=; b=eAJddQAafMiJMEe0b9wXQf0y4BW6natny7DFb29TJMPmI2+pIlKB4bP7ap2EQPlK1k 97z5zD6YFSAt2N8WKJ3qwzOXXwdZkS3NI0sAkrMbBu7blY2UtikTiDb85Gg8NwauxpOM JoceHfG6PESnCe+ZWrC1YtD5Kbsf0XLLIeA7/JIpwDUrjfCUdwOBl/SZdpUF2Uicw4t9 b6aQDOee3Qucz9w7F8c0dGIE3iiSEMy5qdQC3yjQViWsOz0Ta8VJQT2vHgd9W9vGOOAA ecDjuJSbaB9yMJTpXKkuGxlE6A9C7V+/vuTtB0IA2ynplIIkSg+rA9tMTgso/i1xjbpj xpvw== X-Gm-Message-State: AE9vXwNKwvBEYo9jJpkaab302Yvwn3wYVU8BCptml3K/x189tgf13PPa60CmJf9ZNToUuA== X-Received: by 10.202.75.151 with SMTP id y145mr36657939oia.74.1474999438245; Tue, 27 Sep 2016 11:03:58 -0700 (PDT) Received: from localhost.localdomain ([181.22.0.151]) by smtp.gmail.com with ESMTPSA id k23sm1027101otd.30.2016.09.27.11.03.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 27 Sep 2016 11:03:57 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 27 Sep 2016 15:03:03 -0300 Message-Id: <20160927180305.6132-1-jamrial@gmail.com> X-Mailer: git-send-email 2.9.1 Subject: [FFmpeg-devel] [PATCH 1/3] avformat/matroska: write FlagInterlaced element in WebM 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" It's listed as supported in both https://www.webmproject.org/docs/container/ and https://matroska.org/technical/specs/index.html Signed-off-by: James Almer --- libavformat/matroskaenc.c | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 3eeb09b..6cb0376 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -791,7 +791,7 @@ static int mkv_write_video_color(AVIOContext *pb, AVCodecParameters *par, AVStre return 0; } -static void mkv_write_field_order(AVIOContext *pb, +static void mkv_write_field_order(AVIOContext *pb, int mode, enum AVFieldOrder field_order) { switch (field_order) { @@ -809,23 +809,25 @@ static void mkv_write_field_order(AVIOContext *pb, case AV_FIELD_BT: put_ebml_uint(pb, MATROSKA_ID_VIDEOFLAGINTERLACED, MATROSKA_VIDEO_INTERLACE_FLAG_INTERLACED); - switch (field_order) { - case AV_FIELD_TT: - put_ebml_uint(pb, MATROSKA_ID_VIDEOFIELDORDER, - MATROSKA_VIDEO_FIELDORDER_TT); - break; - case AV_FIELD_BB: - put_ebml_uint(pb, MATROSKA_ID_VIDEOFIELDORDER, - MATROSKA_VIDEO_FIELDORDER_BB); - break; - case AV_FIELD_TB: - put_ebml_uint(pb, MATROSKA_ID_VIDEOFIELDORDER, - MATROSKA_VIDEO_FIELDORDER_TB); - break; - case AV_FIELD_BT: - put_ebml_uint(pb, MATROSKA_ID_VIDEOFIELDORDER, - MATROSKA_VIDEO_FIELDORDER_BT); - break; + if (mode != MODE_WEBM) { + switch (field_order) { + case AV_FIELD_TT: + put_ebml_uint(pb, MATROSKA_ID_VIDEOFIELDORDER, + MATROSKA_VIDEO_FIELDORDER_TT); + break; + case AV_FIELD_BB: + put_ebml_uint(pb, MATROSKA_ID_VIDEOFIELDORDER, + MATROSKA_VIDEO_FIELDORDER_BB); + break; + case AV_FIELD_TB: + put_ebml_uint(pb, MATROSKA_ID_VIDEOFIELDORDER, + MATROSKA_VIDEO_FIELDORDER_TB); + break; + case AV_FIELD_BT: + put_ebml_uint(pb, MATROSKA_ID_VIDEOFIELDORDER, + MATROSKA_VIDEO_FIELDORDER_BT); + break; + } } } } @@ -1088,8 +1090,7 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, put_ebml_uint (pb, MATROSKA_ID_VIDEOPIXELWIDTH , par->width); put_ebml_uint (pb, MATROSKA_ID_VIDEOPIXELHEIGHT, par->height); - if (mkv->mode != MODE_WEBM) - mkv_write_field_order(pb, par->field_order); + mkv_write_field_order(pb, mkv->mode, par->field_order); // check both side data and metadata for stereo information, // write the result to the bitstream if any is found