From patchwork Fri Feb 23 05:05:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan X-Patchwork-Id: 7717 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.150.33 with SMTP id c30csp237118jai; Thu, 22 Feb 2018 21:05:38 -0800 (PST) X-Google-Smtp-Source: AH8x224PXfGqBwMZ4ytOIle2GfljDG5b2ab4LQfgMehnc1pYGn+hmlsLVk3Tpon2GR8SnBJFW2aR X-Received: by 10.223.186.206 with SMTP id w14mr331456wrg.251.1519362338673; Thu, 22 Feb 2018 21:05:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519362338; cv=none; d=google.com; s=arc-20160816; b=v5Hdswoutf3Cnhnjkhy/jKt1vRao6ZYAy6pqL2MgvgJ5NjJ9VJ8x7nqiOf4FyoBaZY Tojt/uB2M1KpKFCRwSYMVCS55lrolczSH1vLb7bO8kfUZH7wmnhRGTtBPh+EN5IgcVxf UN2W7qq+C1Ljinikz+WHtMGom5zXqVabqrWlGYQ3Cq7imrdwr6mxVbE+exUEaK4wAzOA 2c/9Jg+V1gfORwc9jBYMyOLdjcMefvoO4jeGi3tv4lXytMtMgFnl1SPnuWd5w/vgfLU1 V9hnOGKRcH5DsP9qJqjkUTacYUxvc5FmX53wboUWYPWCzauu8+eB6qS1Jsr4/PT08Uxu ypvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:to:dkim-signature:delivered-to :arc-authentication-results; bh=8mYx3YcaIh1nIO9QC14CgoZD6B7ViSS6R3QVKHGG1c4=; b=eJgOFLoKoOVOoR2wcDdsGIVx/Vy7ytEtuKsdPh8UW5A5fjcHR6TjC8AJBM3yoPkIjQ 2+VtG2nT3eUpqsLwiIQAIBitJt2nyXd6Wkqcy+KRYLAylkhhlwkSkggHYHeEEH08UmQW 9rVBsc1HgJRNZADq8GJ1hlYoQwqz405BsS3t8osYqUq5aKvfEuvsar7WZR1f1CA46yIc 7vvNK0jHOS6ndZeq6JFMIh6Y52UiU+QGJbacAk/mszK5XF4Jk03A19amWqFC1M4G6MIA AysBYqPnj2wQMZPCABtg8aNfmw0TbbNA/Lpb0YYUViTVAcytn7QpvXeWlQqSgP0fL2Sm RxdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=MYxIft0E; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g13si1315213wrb.133.2018.02.22.21.05.37; Thu, 22 Feb 2018 21:05:38 -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 header.s=20161025 header.b=MYxIft0E; 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=QUARANTINE 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 0D0D068A4BB; Fri, 23 Feb 2018 07:05:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f47.google.com (mail-it0-f47.google.com [209.85.214.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 731BF68A42F for ; Fri, 23 Feb 2018 07:05:27 +0200 (EET) Received: by mail-it0-f47.google.com with SMTP id u5so1772123itc.1 for ; Thu, 22 Feb 2018 21:05:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-language; bh=wbLadPPetK7QyM+6nJOYaHQqMYlf51kq4FBehi1m2Ro=; b=MYxIft0EwW1yF1jwOJ45eGC/n73vs1cUCTsYa5Zohnxvk7N25ofS5jEY9TjxMsfKh9 +P3ZV1NaSXLmVCwcpz0Q2C8WK7d28Te0fa/jgsIHljdkLoH3LeKlGLhsLHioFxNj2Atu kTQofeRaFhm9Ibfw+lpJbkqORb6H+vwulwqaC87HoDShKSsprpJ09R9duvORwAzbTY7u yFFdgEeLZ3/VbXF/HBFjEbAf/MSnTUhzOdlxkd0fBSHWvfh+MOJU/Ti6XinxJjqZUVyE qzN6jAXpWLrFujjF2ilW+wbslvskNxesYdhHvlUGF5pV7UytiYhPzrOnPjMEWF/IAaXk 3nRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language; bh=wbLadPPetK7QyM+6nJOYaHQqMYlf51kq4FBehi1m2Ro=; b=Ly6kovVxsCLB5uZiMPQZ69lTUAMX8vraByUUHB9eyTXBVxEb0fawQ+n//mbSwblG0F 4Ju/zStUiZQVxhSf8qdYZi3Bkgr+eiK+J8r8fxMjqXOsfWbx1uMy/4sPuyx5b9U2bCNK BbvFDA3OF/Omfs4fheanyMglpvLTV7d8L1y8zTgA3S87n27hvuXM4baNnSxAbKMRqFyP gqomWrJtasQxeY2V1ySr4GRq6VHFwdod9K1siIHT4q3vrhWM/xTUUn96YbiSKcAMhTEJ aSJH8kZ/J1Hu4wUUs2O1HGy4DSv4sME+IuGAmfTkj0bP1KvffJcAHZRkzj95QKgApc7Y 2Lhw== X-Gm-Message-State: APf1xPBxvKiE1HsWH0t0+QYrS+lhoko5wkoMWyPpULpp91d0fvxO0Ezv zi9fxvcjQ5v/cQKxGXCoyDM8lRIR X-Received: by 10.36.46.21 with SMTP id i21mr931361ita.11.1519362327884; Thu, 22 Feb 2018 21:05:27 -0800 (PST) Received: from [192.168.1.215] ([103.206.133.21]) by smtp.gmail.com with ESMTPSA id p192sm660431itc.29.2018.02.22.21.05.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Feb 2018 21:05:26 -0800 (PST) To: ffmpeg-devel@ffmpeg.org References: <3eb8e679-6573-194c-02d8-ffa2c3cd718e@gmail.com> From: Gyan Doshi Message-ID: <78c58058-a363-4f79-c3e2-31f90ba0c8ec@gmail.com> Date: Fri, 23 Feb 2018 10:35:24 +0530 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Subject: Re: [FFmpeg-devel] [PATCH 2/2] avformat/mpegenc - reject unsupported audio streams 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" On 2/23/2018 3:50 AM, Carl Eugen Hoyos wrote: > > Please also mention "mp1" and "pcm_dvd" in the log message. Revised patch attached. From 0bb6debc91c59a10fd43dc4670bd513adab1f1e0 Mon Sep 17 00:00:00 2001 From: Gyan Doshi Date: Tue, 20 Feb 2018 20:42:21 +0530 Subject: [PATCH] avformat/mpegenc - reject unsupported audio streams Only MP1, MP2, MP3, 16-bit PCM_DVD, PCM S16BE, AC3 and DTS audio codecs are supported by the muxer. --- libavformat/mpegenc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c index 4c6fa67fb8..8b33468dff 100644 --- a/libavformat/mpegenc.c +++ b/libavformat/mpegenc.c @@ -392,6 +392,11 @@ static av_cold int mpeg_mux_init(AVFormatContext *ctx) stream->lpcm_header[1] = (st->codecpar->channels - 1) | (j << 4); stream->lpcm_header[2] = 0x80; stream->lpcm_align = st->codecpar->channels * 2; + } else if (st->codecpar->codec_id != AV_CODEC_ID_MP1 && + st->codecpar->codec_id != AV_CODEC_ID_MP2 && + st->codecpar->codec_id != AV_CODEC_ID_MP3) { + av_log(ctx, AV_LOG_ERROR, "Unsupported audio codec. Must be one of mp1, mp2, mp3, 16-bit pcm_dvd, pcm_s16be, ac3 or dts.\n"); + goto fail; } else { stream->id = mpa_id++; }