From patchwork Mon Aug 20 16:44:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kagami Hiiragi X-Patchwork-Id: 10034 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp2724145jap; Mon, 20 Aug 2018 09:52:56 -0700 (PDT) X-Google-Smtp-Source: AA+uWPyuK4L1bQVQpqm737uURXG+xNv8HXcISiDkC6ua+My2TH10PCuOeRAVsP28ryrvFxwF9kNR X-Received: by 2002:a1c:889:: with SMTP id 131-v6mr24866756wmi.142.1534783975952; Mon, 20 Aug 2018 09:52:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534783975; cv=none; d=google.com; s=arc-20160816; b=iaZAqOlMRXTYwOJfV7/+Jn66JxFVDWxIe9Z34liIlbpLSYPVwVpzBSCdxcz57wUlEr Dw5GHWnb/18+7Mp5HohgN29BP1UkPjonFNX1hz+3e3REIUTbAehZSQQPdpyysHp31Cjx gQ6ujYIxpbYaADHMmq96NUiRj9st/7N/2KbkvROfbSAwnsiG2bV0WRTgWjXbO/QRlJX/ CFk0KUDI6vW7uOKeXfco8bikWkENqeQubUb1ndnjxOchKKV+N6ltOOq0OAIe6ozvLV1n YWsDnqwzWcsR++UM2OwH4E0PifMkeBWnMbtUSwe7+DocFlIkadoIwi5m1sttCuMAXTe8 y8Gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:content-language:mime-version:date:message-id :autocrypt:openpgp:from:to:dkim-signature:delivered-to :arc-authentication-results; bh=cGGZObhoiba5hAQdo0MUYldjpgAOZEun8Itl89Af0Qc=; b=SmUyk5sUB+JUbpiermruS+j7MbPhKHJWpx7Pmqvyo3xCcibN/NIDwzO/ddfS6iOr0G F4S2VnHiejWs1kceJsg0EP4vLFaE39qNDjK8tUa1yTO3QWMfWromq5hnKXUHuboQIw02 xIz5VQE8KAm19fH7/uItK1o2VkEqZOiJIEO6VzuQBqfzbASdmYY47Xcl7jdmKWv3fQmc zcTTP/ixZORdzC5r0c54T6sVCAt15fuToBm2gHISfSSpJsJqGQVNkFqoCoODRRZlvCay Q+9apfusP1TJ2AbbZLq89PCRDJlDSta8C36i5CZEAyWGtrSSASCBZmZtlO5Kf1TFOsy+ 685g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@genshiken-org.20150623.gappssmtp.com header.s=20150623 header.b=FtxgtI1y; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l65-v6si69582wmf.200.2018.08.20.09.52.53; Mon, 20 Aug 2018 09:52:55 -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=@genshiken-org.20150623.gappssmtp.com header.s=20150623 header.b=FtxgtI1y; 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 C3375689B85; Mon, 20 Aug 2018 19:52:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f193.google.com (mail-lj1-f193.google.com [209.85.208.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CDA3A68077B for ; Mon, 20 Aug 2018 19:52:18 +0300 (EEST) Received: by mail-lj1-f193.google.com with SMTP id u7-v6so12140523lji.3 for ; Mon, 20 Aug 2018 09:52:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=genshiken-org.20150623.gappssmtp.com; s=20150623; h=to:from:subject:openpgp:autocrypt:message-id:date:mime-version :content-language:content-transfer-encoding; bh=+seMOSOSv+Kxgh0LIA/8S2Vta8laDDCvsYbLRMFGjbY=; b=FtxgtI1yua9qi+d9J5fV4Vim9hmUcNAGp87anUgShKHoQ0ooD+FjkrmRnNvTJ7t0Hz Mt4uYOyr+bQdP5P7+EVLQhq/sk6lM3NXm6KKsdcIqaHPXQlr+rHjAS73vfFkA/nQbimj MZX4l0YRlav33bIGWek8yrqsRMtolHqSgn6sKSCVsXv2CzLv1/zxaZlIVyb7YLjCJcCf gvkdz7y4/v9xjlsszE1dLE8Qj+wppbbQWpURPZxEn48NVBAVk+sMWsIogXb2TC2svpAK rV14IA4t/WMBbRiddBJ3yhYIUVkn0jgu1M8vLa/3oOMcuNRSjiIN5BI45fkQJV6V+gjz su9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:openpgp:autocrypt:message-id :date:mime-version:content-language:content-transfer-encoding; bh=+seMOSOSv+Kxgh0LIA/8S2Vta8laDDCvsYbLRMFGjbY=; b=feIjAfJulGHTmlf5FGBsds+ptdTTlAig79iSAQJuQHITlAq8hM9vfPTqnSkAaiZMPX vGr5Aj/TW4gmMCIuA1LpwkbFo7ZOulhHTxMT9JAMwpTbnMJQZYBvyKN+gR+0oVjF+BHN b4hBSDP2DVSg19HmPn1MVWtWlV6CRsbyMWo5ySJhGc+UkOb4B5ti6BLsZtivd8Hk3hz6 0zh3Ttj5nlTlpQ3EitgJnSgP7002uEC233tGoo3rDB1H7KVhTSOL4s2uiyL2wwLLcO5O +XmdzAvpQNgWqMXRNU1rvZQgMfBuJGjNQj/3iwQljx36KUy5tSryFQI9pkdbnj9oYvkr s4/g== X-Gm-Message-State: AOUpUlFCaVAPJ0kVCoRCyuTUGidDNd9xPSVklPKLj63Yga4FlMh/U8UZ UX31/29EdVzvT0s6xe+g27ryPk0FyJA= X-Received: by 2002:a2e:498:: with SMTP id a24-v6mr33202612ljf.27.1534783481110; Mon, 20 Aug 2018 09:44:41 -0700 (PDT) Received: from [172.17.0.3] ([188.143.216.159]) by smtp.googlemail.com with ESMTPSA id h90-v6sm1715505lji.66.2018.08.20.09.44.40 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Aug 2018 09:44:40 -0700 (PDT) To: FFmpeg development discussions and patches From: Kagami Hiiragi Openpgp: preference=signencrypt Autocrypt: addr=kagami@genshiken.org; prefer-encrypt=mutual; keydata= xsBNBE+323kBCADGA1qoZLvwJiVWPvpqN0ebGDlgZhQ7gk94zkn667IS+oczB9NXDjwCrR2j y33jy/RLOmKJjk3Uk1kSq7G6ObMWSvMBgIkgXxB7X4/R1qlqCyGyWJKVewzULONZzVQXxpol +GUmsAwrvBiSxj4W2B+YMWo7GcQYBrpgACvQKv9EpVvP4CUkZ7rc/E6VSOX54rsQoL1j88AM Edv1fQ/8lGymw4tsr+8NNhjqwuJGB3WKLlWrXELZwOXJAC/KkitzbNePC3lYIq05e8Q/Djpu +1nVjLHk9cEN/Pju/yyW8oOijXcatV5gTbrreZ9wWv2Tg3WwcbbeZ0Axi8AUjKy9K/rjABEB AAHNJUthZ2FtaSBIaWlyYWdpIDxrYWdhbWlAZ2Vuc2hpa2VuLm9yZz7CwHcEEwEKACECGwMC HgECF4AFAlUFecwFCwkIBwMFFQoJCAsFFgIDAQAACgkQ5A87PUs8d4GuWAgAibXDrGzo0SlJ paK/+Ns0q9E2CZKRsZeZ7KaWLhTyeZNbZtQ8yu5b1d5RUhLPZ4f5u7gubfcY2zoygg+Je8Hk +FI6CxoSQd17ErkMTNLRduRgrpORldGx4pxNNTH7+Yr7WnEtBUzee1UjXmA6luXPoluGq5D1 satnkRJgt91H0XeyzTUA+gPeKBA3yRrwfO7W7wP5VB5uaFnWpOk6JXidyovm5VwNU4f3OJ+8 2cUG6yGD6+NIw03OkXfZ3SpTlXPtYR0HAxc0CPnnDqKfqrWgDmqZitB6httiSURoEqOaaEh8 UfOPLjVFjVIlOIFfXX5IZOIiKjCArGZxfrXUQdiPZs7ATQRPt9t5AQgAngQtfdAkaG+CYFJY 8DdQhz6QZpLJPagE+Wage290QBEexnb/EHaXBKWf3VlUnzi+2BDOeAeve9U9Ee+ZvSU9VC8G koFvdIwvchHYfHtf9nr2N+GJ5asUfpEtZWIQVp8TrJsK0izVhOyikdh4s+IPnjpNKygnClKK zWhe4TNrOTN2q/jj0TDbhXOUCM9GIfx41Ur5dvHI+TdBXyBD8fmyQg3sXOthvblcak/1n/pe gyDy98fPVeg/mUXJzZx0tNMqQ4hMjNyqWay6RlSby+hZs93nRDK2Ecwlhs/rhSGNULeiT2Jb L3Yq+nmUMSANPjd4xqzs3FtQYbLCO9rRoIoWQwARAQABwsBfBBgBAgAJBQJPt9t5AhsMAAoJ EOQPOz1LPHeBV1MH/0cwtZleUHQ7/sbW3+xqG/v2ImDAYrfHYtOXTofaxa/8aIiq9DGWizZq iPk9IvEV0c1Ce0onipR6LxnHGoNZFZ3tb5lpo5FRv1DU438ntIB5U7vr0jCmSr9r3Agks4Of PNVKXjod6Sx3nD9HisSlV1+VSyhHgHeAQK0IRsHWamw32q68YQtjiDo4ATBHAaqNW/8/4zeG 0bVGsSVK6mow2T5qSyW7CsG6clEUgcwZmEQJctXaP616Cmj68AGutp776WOs5GV0pjEDu75q LKRdJVD6HOLWFvu8bLS9Oi+qMAJNtXyKBhQ44QaC2DPjoRdVIlCTAttWvQFUN6JL/RkP7Kw= Message-ID: <73f13fac-b954-2154-7cb2-881ab90915d0@genshiken.org> Date: Mon, 20 Aug 2018 19:44:40 +0300 MIME-Version: 1.0 Content-Language: tl Subject: [FFmpeg-devel] [PATCH] lavf/matroska: Allow AV1 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Nothing prevents it to work except this check. AV1 is already supported by Matroska muxer and aomenc produces WebM/AV1 files as well. Signed-off-by: Kagami Hiiragi diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 09a62e1922..76cb124221 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1296,11 +1296,12 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, if (mkv->mode == MODE_WEBM && !(par->codec_id == AV_CODEC_ID_VP8 || par->codec_id == AV_CODEC_ID_VP9 || + par->codec_id == AV_CODEC_ID_AV1 || par->codec_id == AV_CODEC_ID_OPUS || par->codec_id == AV_CODEC_ID_VORBIS || par->codec_id == AV_CODEC_ID_WEBVTT)) { av_log(s, AV_LOG_ERROR, - "Only VP8 or VP9 video and Vorbis or Opus audio and WebVTT subtitles are supported for WebM.\n"); + "Only VP8 or VP9 or AV1 video and Vorbis or Opus audio and WebVTT subtitles are supported for WebM.\n"); return AVERROR(EINVAL); }