From patchwork Thu Feb 22 09:03:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan X-Patchwork-Id: 7709 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.150.33 with SMTP id c30csp1792589jai; Thu, 22 Feb 2018 01:03:55 -0800 (PST) X-Google-Smtp-Source: AH8x224Xm2lJksC+Xw9xuoNJbrwGoA+V8nEcfZlitnRQDi8PhdHBmUpf/j17MVfQt8uO3J1XmmxG X-Received: by 10.223.193.69 with SMTP id w5mr5182976wre.42.1519290235787; Thu, 22 Feb 2018 01:03:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519290235; cv=none; d=google.com; s=arc-20160816; b=LLHUOSX2Zhs8Ed5M80SBccms8jHyKROuXRhZ86uBT5SqqjWM0rv4RNyiyR62dabHBX ibDLXjiypDOS6mhDY7KIsnnwexKrWnanuXOmR6rJFlpa6PVb2RcgE/G4DkPeS+udn4sm /1pN4jwMIEAqHN275JISFwP4lAX2NsoYStMw6rEGGCstz492v/XvhbAqV2/mKN5AnEcZ lE+RRlPXCURKZerbtXGXhQnAejZANCypP2lqwHftbTNdeDeI414ALjziAL5Tsv3ph17R CtwOkfO2z2TnOujB0FuryeiGTiP+odGqXI1KAiXoS8HGx99PkGQw4XCS4FiRrhljkWNV rntA== 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=jxd1D9qE4HDoxpmsN/7IUToy/BDa7CT727vs3nTPF+Q=; b=K3l0NkqJhWAPnOpSlvmBFUBolgX38GT9UHGDA548zstS1JUucVUJUdTgK7LSfbYXHo NjI8YZRLSw6KqPHkQqiifqOcrpyFPZDvpdk5kVAjH9cxTVWJ/vAfJQIdyt45XNsSxtY2 vhgxuqL15COlq0F5G/+fdOn4CZsUzSuVRAasRHztFKSq02DwLnWWQ1N/AiNzm5eSQj7R Aj0JqYSd2LqUIrGfA3sdtMPtBLFbTsbOKTXGitvzLOjyYV7a48aMxkl0gqe1KtMpRe8J vVu4oQ0Ptm+DW6ZUhyNHLzRrZJvzCv8iQlqABzy+Nifg/mPpI7TJwwfZWz3eCAeSnFWA OSEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=HEAqP2As; 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 b29si14648949wrb.514.2018.02.22.01.03.55; Thu, 22 Feb 2018 01:03:55 -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=HEAqP2As; 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 F152A68A594; Thu, 22 Feb 2018 11:03:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f41.google.com (mail-it0-f41.google.com [209.85.214.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9825768A57E for ; Thu, 22 Feb 2018 11:03:44 +0200 (EET) Received: by mail-it0-f41.google.com with SMTP id a75so5442562itd.0 for ; Thu, 22 Feb 2018 01:03:46 -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=fXDuWn6r1ktM+iNsi1DKN9adHfnJi5bNw5XR5CviMoE=; b=HEAqP2AsU1SHcLwnfH97pcCmC6RZQEcngsMk55TE49VBQPDstcqFE/gnjBBYnVdtuX +ESbOySYU8S0vJyXTD3peG5aU6JxXD9AUhi96iGsfZM+4SXPVgSgGKcoSFMAYG0PXUIZ JgBVLElzCLoKONcIU4Dah+1VbqJdzhMlJWgkdfdbza1E3Bils365aIUjR8clq4gquEYW ew7FGMGPYz9T7BQisb7XtcuFNzhlWfV6zZrG0sQ9qx+s/jUTPWCaynqPtkItYOEhw1Td prxKR+E2FE8/T2GiVKAOE248r3L2draz+Rh6UVzP1jRYMKcSPvSygqUl5WWaMxAoQfuN N3JQ== 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=fXDuWn6r1ktM+iNsi1DKN9adHfnJi5bNw5XR5CviMoE=; b=XbvNJu5NJToE7+8LPjbZSeIJhWjyNIDykSk77UKGKhdKs6iN803+FXQMMy0dqKOAVa MYNUt8YA7737P5rHnN6ND3lOA5qqj9ki+TcFT8fhOBFFNdeVoju0tgNQuTMlgBpm3GvJ LysB2rlvPo/5aegfiGE3uLhMkT6TK9KgI5W/HE0oiNlx3sqDMk1wlIqG/xxT8oIxEhXK zowWKiF67Un+CNkyf+qU9VwK6CkrNAHOTX3g2HeXYd8nvFZbeGOBoJyrNaY/l8BhjRDo elp6S4sRixgE57saegAPdK1w8JhreKXHh1v4gb3gTGHscgZmBUxGqkk6T5dT7qx4IM9k 1zrg== X-Gm-Message-State: APf1xPA1ZA4oJJSjOOUOzyzwv18bqqX00qeF+0DHCzQnm8KqBwbwCjxg yRwOHwH1L1Thw5fxv/afxMlyB2nY X-Received: by 10.36.105.149 with SMTP id e143mr5306170itc.119.1519290224767; Thu, 22 Feb 2018 01:03:44 -0800 (PST) Received: from [192.168.1.215] ([103.206.133.21]) by smtp.gmail.com with ESMTPSA id k66sm26302400itd.8.2018.02.22.01.03.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Feb 2018 01:03:43 -0800 (PST) To: ffmpeg-devel@ffmpeg.org References: <20180221193825.GP23018@michaelspb> From: Gyan Doshi Message-ID: <8aac6f1d-3ebc-22a2-46b3-95fa4b734a8e@gmail.com> Date: Thu, 22 Feb 2018 14:33:39 +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: <20180221193825.GP23018@michaelspb> 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/22/2018 1:08 AM, Michael Niedermayer wrote: > > this looks like its missing AV_CODEC_ID_MP1 at least MP1 exception added. From be49ca276c58b515e7f8e472221203c25efc6c86 Mon Sep 17 00:00:00 2001 From: Gyan Doshi Date: Tue, 20 Feb 2018 20:42:21 +0530 Subject: [PATCH 2/2] avformat/mpegenc - reject unsupported audio streams Only MP2, MP3, 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..bb7e4a6e8a 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 mp2, mp3, pcm_s16be, ac3 or dts.\n"); + goto fail; } else { stream->id = mpa_id++; }