From patchwork Wed Nov 1 01:17:06 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: 5802 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp161337jah; Tue, 31 Oct 2017 18:17:36 -0700 (PDT) X-Google-Smtp-Source: ABhQp+Tj79kS6Oe5u+J8a3TZrUqmHI7mEoeBJ2Qm0xxsHn8xt0Ge9bhxxZdaeFRMUVZxM5172uSr X-Received: by 10.223.179.20 with SMTP id j20mr3624491wrd.116.1509499056755; Tue, 31 Oct 2017 18:17:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509499056; cv=none; d=google.com; s=arc-20160816; b=aIm66WQxFMoDLT2ZB3i6D4wvDK42Bcxq6gjeDxohai7gv4KBQO6b8MAv4wa4FHOD4S w2EsEfzcrmMVx2RkMOF4JWCTMo5cUanlSCd9346FdKkixcSjTDvysBJ5tiVATdoHD/Ly w0Ty7VGk4HkGrzP7vRglZTo1LQ1lvtT1Bdu3bQuebFLFyZzlSlaviKEQtLMLjwmE1Vua RfJNCMvuo5TsKJrVuMf/0rH1iZMJpGW+mxVb9sxG1wtX0ePmzarrNyVcw8DsZ4YBJTiZ UXJNZzplK4oDKyRcV+Ep2WtaG4LvP2qk8lOzExG+ThKgXF2OhByHmlubYZ01StyhgQgN mElQ== 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:to :message-id:date:from:references:in-reply-to:mime-version :dkim-signature:delivered-to:arc-authentication-results; bh=khF3GbVFhU9mHOSzP0yJR81jBUTriDFdUpZYBZnuwXI=; b=dul8re7cAECO3bYn00MkDCakw5vzmGAG56/Wk8ReZqErnFy1Z66c8Oz4JQqmSEy9mI OQMVh8KserOAHAD/0GUJamo+qne5xzzUHRvxjNJpptpQbYxbm573TWxQVLnb++Q9FIXS IXvvAHbneea6sV8+MVXZ1Sc8jewxtDN4mSTShOFQ6AvSRpzrFY833C+7bgBBOFjKY/vH +zELBBOCTB6yq9qWVv6QguJVfgcBpjDRVHOudLZ/NW6Dn2ucLcoh9nEHsvrVsSjc2ITK 5nI41rZUAe0vf6qeX9sHrSTDwitpQQrfo6oMOmp1ogYXiTKGcAbc7iqnfWXVEDJwVP/7 EYxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=OlEnaZlS; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l43si2981887wrl.519.2017.10.31.18.17.36; Tue, 31 Oct 2017 18:17:36 -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 header.s=20161025 header.b=OlEnaZlS; 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 15229689EA2; Wed, 1 Nov 2017 03:17:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f179.google.com (mail-io0-f179.google.com [209.85.223.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 21A39689DC6 for ; Wed, 1 Nov 2017 03:17:18 +0200 (EET) Received: by mail-io0-f179.google.com with SMTP id m81so2837457ioi.13 for ; Tue, 31 Oct 2017 18:17:28 -0700 (PDT) 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=Zna1skpahJmsdWzKh3QBrcdUR4G1ZWEpvLjG4sEsics=; b=OlEnaZlSzqkcP4fTgIZlSoJ1IChVXizVtsc4Yjyy2vhd7VL2D7n7inatBy1w6Li1A1 3+lO20r1kJz80ocEGT260iDq31EpdUpup6DApYmxcMYzBKX8tpKQAPJV9ZmkeYVoRhr0 9hkltZpwNUckqHlfYsV0UWW6HgC83MBgeOxQFTbfqpu4/kO5n6Rd7+gDWKnVWSzD5weX wxI7BtNkla8QMpSwhQEuRKB2y+v6lTI/cz89FIoyBIwqFY3AlYc6F5zWXfx3X7Lkoz8H uAds8ExZMREXLCkgHGCLgjfutvH1Oz/GOV0LT7MtWtJq/KO8yJi5KuBJhPxmotk4QO8b IZRw== 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=Zna1skpahJmsdWzKh3QBrcdUR4G1ZWEpvLjG4sEsics=; b=kxO8Ar+SL1DMNX8NQ4cKvHh56v6+xvReyvP1N2gnegFAJ/UgykrUfA5tgnsHpQM0nn PZaU1AC52JOt24tRR/0FpVX8S8uW6MPxtcRIQOyHxWRT7Y8b51EQluPIBIrhN+Gj7YJX jjiEPTn0oMtYl36HvnN3J/IOCEPGw6SzWqR0fE4/spc6l8fx+eFD/irvtuRErPAmKfm8 hgqWsdgXI/zTgxvb9qVUskaSiWOMDeNnmvjYSYZMJMt8Yb8cPYBgkq8+ozTC43a03Eom gJkpClRo3JQb0M9Db07VVyCIRySEg4j+zh+xyRDKkOeeNQ0ltAJcphmeS0UtJpwtxvG6 jSVQ== X-Gm-Message-State: AMCzsaVUSNL8OIku2pR8tpqbaXbNnPruRgvKb6+FJIGXU2HAgy3F4Mjv Hg1QcgATcSoFosEG7WUH0l4tqavN//NM5eP2YOk= X-Received: by 10.107.63.67 with SMTP id m64mr5037912ioa.272.1509499046684; Tue, 31 Oct 2017 18:17:26 -0700 (PDT) MIME-Version: 1.0 Received: by 10.2.63.101 with HTTP; Tue, 31 Oct 2017 18:17:06 -0700 (PDT) In-Reply-To: <20171031163822.GP6009@nb4> References: <20171031163822.GP6009@nb4> From: Carl Eugen Hoyos Date: Wed, 1 Nov 2017 02:17:06 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: Re: [FFmpeg-devel] [PATCH]lavf/latmenc: Error out for invalid codecs 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-10-31 17:38 GMT+01:00 Michael Niedermayer : > On Mon, Oct 30, 2017 at 11:51:30PM +0100, Carl Eugen Hoyos wrote: >> Hi! >> >> Attached patch makes sure the loas muxer does not try to write >> anything but aac and latm. >> >> Please comment, Carl Eugen > >> latmenc.c | 4 ++++ >> 1 file changed, 4 insertions(+) >> 2b64f3d5ecb189e77b85dbab7a6cbfe9657701f2 0001-lavf-latmenc-Error-out-for-invalid-codecs.patch >> From 9f8f39b402f77b53613a395129f96feee5e873ba Mon Sep 17 00:00:00 2001 >> From: Carl Eugen Hoyos >> Date: Mon, 30 Oct 2017 23:49:29 +0100 >> Subject: [PATCH] lavf/latmenc: Error out for invalid codecs. > > isnt AV_CODEC_ID_MP4ALS supported too ? (i see ALS > related code in latmenc.c) New patch attached. Thank you, Carl Eugen From d31193d8d2702b0c340b0b4fd2f1682f09b3035c Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Wed, 1 Nov 2017 02:15:10 +0100 Subject: [PATCH] lavf/latmenc: Error out for unsupported codecs. --- libavformat/latmenc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/latmenc.c b/libavformat/latmenc.c index 273197b..3b2d7af 100644 --- a/libavformat/latmenc.c +++ b/libavformat/latmenc.c @@ -89,6 +89,10 @@ static int latm_write_header(AVFormatContext *s) if (par->codec_id == AV_CODEC_ID_AAC_LATM) return 0; + if (par->codec_id != AV_CODEC_ID_AAC && par->codec_id != AV_CODEC_ID_MP4ALS) { + av_log(ctx, AV_LOG_ERROR, "Only AAC, LATM and ALS are supported\n"); + return AVERROR_INVALIDDATA; + } if (par->extradata_size > 0 && latm_decode_extradata(ctx, par->extradata, par->extradata_size) < 0) -- 1.7.10.4