From patchwork Wed Mar 1 22:43:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 2720 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.149 with SMTP id x21csp10349vsf; Wed, 1 Mar 2017 14:43:47 -0800 (PST) X-Received: by 10.223.162.133 with SMTP id s5mr10065135wra.157.1488408226954; Wed, 01 Mar 2017 14:43:46 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x7si8708911wmf.1.2017.03.01.14.43.46; Wed, 01 Mar 2017 14:43:46 -0800 (PST) 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 sp=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 095B168825A; Thu, 2 Mar 2017 00:43:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f181.google.com (mail-qk0-f181.google.com [209.85.220.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2D673687ECB for ; Thu, 2 Mar 2017 00:43:27 +0200 (EET) Received: by mail-qk0-f181.google.com with SMTP id u188so96082384qkc.2 for ; Wed, 01 Mar 2017 14:43:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to; bh=6yHBAazFDGzdjALQozYUsfW2MUj31Ima0GlZe6gNl6w=; b=iebCYuN0N6Bd2siyUJzT1C/FtHqh5OtMHVxfzrXKiQfElCpbNQgydoaW3Xyekg3+l8 NQAVpSZ0561yvtA/xO4tYQQhTDbUf5wTEZDcoujTAB1JsRE2wc0TeuKrhnfOAOs5P43s oFmGpaXNsijqQEQF8vRM228CrLNyLrcPUoPUUPz9s1VkusY3+gOPBMwZ4spEydCp3SGZ tmv02DT6zdcnwmy5i1/5wqsQNY2lXaCVbGsfCW/ZUIXX3JLLyqAvx7wUMTwMXYTKByRx FATv3Fw7yODJ54Fo5w9qKAgdwIhD403VuszbruqigCQjs+tpiPKIbTV6x0cpWTkAfGWG L0AA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to; bh=6yHBAazFDGzdjALQozYUsfW2MUj31Ima0GlZe6gNl6w=; b=K4iTx5dldgZ0vDx8pcXnpalbtCtJuVHmYVyHxfywqv4BYhyMPZgpmUBiFkfEKzY8GO uc2n1fIIgVk7QzL5BFvDm5IddJ9EGyW9zGHdNkNpfdWFB4/RQdrY116JOWYTWfXqzUFp +hzu8eVThVRSIalhVbmIWrAcfT42WqtR86OgWNZIhZ6Yl4CD5k6UZ1miLjCXJNvnf0aJ hwWOi5AaMnifbbP/HZmgrtG9Z5/DdeYi5U4921bb340TAxmT0lzzsXx6v42TBMMhT+8V C8DioMgbOsaE74s+YyiAM+tVSa6G3LzAskokOf442yHHYaBMWiIVhh6ufXO/ze+zsK7L DcHw== X-Gm-Message-State: AMke39mEfnj1EAm5LPZfFuSkKaUBCHDJDE3nmSNFmgPcHA2qkyDts8nD5Q5Ps91ZQ/ihB5CM9D6Kxij5cDKzDQ== X-Received: by 10.200.46.123 with SMTP id s56mr14546063qta.8.1488408216522; Wed, 01 Mar 2017 14:43:36 -0800 (PST) MIME-Version: 1.0 Received: by 10.12.172.221 with HTTP; Wed, 1 Mar 2017 14:43:15 -0800 (PST) In-Reply-To: <20170301120712.GO5776@nb4> References: <201702282045.44470.cehoyos@ag.or.at> <20170301034034.GL5776@nb4> <20170301120712.GO5776@nb4> From: Carl Eugen Hoyos Date: Wed, 1 Mar 2017 23:43:15 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: Re: [FFmpeg-devel] [PATCH]lavf/matroska: Support codec id V_FFV1 for FFV1. 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" 2017-03-01 13:07 GMT+01:00 Michael Niedermayer : > On Wed, Mar 01, 2017 at 09:43:57AM +0100, Carl Eugen Hoyos wrote: >> 2017-03-01 4:40 GMT+01:00 Michael Niedermayer : >> > On Tue, Feb 28, 2017 at 08:45:44PM +0100, Carl Eugen Hoyos wrote: >> >> Hi! >> >> >> >> Attached patch fixes ticket #6206 here. >> >> >> >> Please comment, Carl Eugen >> > >> > previous ffmpeg versions dont play these files >> >> What do you suggest? > > support this at the demuxer side, backport such support then > wait till its supported widely before switching the default in the > muxer Agree, new patch attached. Thank you, Carl Eugen From 5b50e8409463b746e38b35f7ca82c6b54b3be9ee Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Wed, 1 Mar 2017 23:40:35 +0100 Subject: [PATCH] lavf/matroska: Support codec ID V_FFV1 for demuxing. Fixes ticket #6206. --- libavformat/matroska.c | 1 + libavformat/matroskaenc.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/matroska.c b/libavformat/matroska.c index fda96fb..7905fd1 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -77,6 +77,7 @@ const CodecTags ff_mkv_codec_tags[]={ {"S_HDMV/TEXTST" , AV_CODEC_ID_HDMV_TEXT_SUBTITLE}, {"V_DIRAC" , AV_CODEC_ID_DIRAC}, + {"V_FFV1" , AV_CODEC_ID_FFV1}, {"V_MJPEG" , AV_CODEC_ID_MJPEG}, {"V_MPEG1" , AV_CODEC_ID_MPEG1VIDEO}, {"V_MPEG2" , AV_CODEC_ID_MPEG2VIDEO}, diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 7cb8893..1622b44 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1138,7 +1138,7 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, // if none are found, use AVI codes if (par->codec_id != AV_CODEC_ID_RAWVIDEO || par->codec_tag) { for (j = 0; ff_mkv_codec_tags[j].id != AV_CODEC_ID_NONE; j++) { - if (ff_mkv_codec_tags[j].id == par->codec_id) { + if (ff_mkv_codec_tags[j].id == par->codec_id && par->codec_id != AV_CODEC_ID_FFV1) { put_ebml_string(pb, MATROSKA_ID_CODECID, ff_mkv_codec_tags[j].str); native_id = 1; break; -- 1.7.10.4