From patchwork Mon Jan 29 07:12:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan X-Patchwork-Id: 7441 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.156.27 with SMTP id q27csp3628904jak; Sun, 28 Jan 2018 23:12:21 -0800 (PST) X-Google-Smtp-Source: AH8x227ZS6PMQ02NB+r/I4IWf309rj5xJey95aYDo9Y+sBwQVao1SxrBYqVFIM+4isSn1EwSckn4 X-Received: by 10.28.10.6 with SMTP id 6mr16077234wmk.1.1517209941853; Sun, 28 Jan 2018 23:12:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517209941; cv=none; d=google.com; s=arc-20160816; b=neVbZGeDrVD1moIY0Yj4fSQW0ou3r0aaF6Ut50HZGdr7SFmCSJp8kSNOkaB1nLgzhj ludmh5QxQrUcBrNpA8lexyzRX7cMhHcvgoVrt8hoZUHBHPXeeRnQXywAVD7L2ZyiM2QI lZSp9WQrP+tRRncwBuwAAiY+hdItg3Jv0rRHsiEHY3kZ6VkHOnD9/kic1ROy8+Vno6nY hhYOaiALwlOErheyew7ku9uZdXOAQm+X+zvzRZyYwDAmcbUkTtEgeg6oWPdMLDV1wLXf 2r7tgAEoIvk+ptm26Udzc/qEhOJQz2V3kbvdyo3dix/O6sR+dhEOOncKj7vXelP+SSnP JlKA== 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:references:to:from:dkim-signature:delivered-to :arc-authentication-results; bh=GvF2pB+6F+XiS7FlQYfRrO+9cZ/RQCN9aB8VnCZvVR4=; b=tyiL8WoLh10CN2jRMNkdlx4jXPyqCeX/Fm+9wNp/MnGhplGbkrEawGt7HBqx9Ist4t Zyq2M8NW2Iqjhcf7X3KnCo5BcJfFDY8BmpOaqWz69qwb1i5h+BVapZR2ayLBIdpyeXBZ zw6ot/OtYypMBQmUMIsvmqKafbQToD7Z8bF02Ez618+E+Sg5GhK1ZUM44AwgdMzRoWKG 2rh6aS+g2DxPDkdp4iVqbjMnJaNutB/Nt7j3l8YX990bPfUtbYnT6vC03rzkk6/9+Flk OvwbIowYVdyusa5dqrwcC2KGOcp2xim6iv75VFuH48IvrTcNUQ7c2TUnz9ojOQ/rNY08 RChA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=PQYq2I6P; 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 i5si4430010wrf.525.2018.01.28.23.12.20; Sun, 28 Jan 2018 23:12:21 -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=PQYq2I6P; 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 35A6168824F; Mon, 29 Jan 2018 09:12:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f54.google.com (mail-it0-f54.google.com [209.85.214.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1661B6805BF for ; Mon, 29 Jan 2018 09:12:09 +0200 (EET) Received: by mail-it0-f54.google.com with SMTP id k131so7103761ith.4 for ; Sun, 28 Jan 2018 23:12:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:references:message-id:date:user-agent:mime-version :in-reply-to:content-language; bh=QaSkh0vz6w9POp49Q4PLfXyWkNHbkysDmph7OCdcwuw=; b=PQYq2I6PeyrAQyD7Cj7SBP+O75E2zGYgr6CKmfHuqUC2gxInZPhRzUQq9mLx8nJhqX /qq7ygCMqyTzkhwHYym2eO40q8N5NkKw9DBY6XmcR+46PzXoDOChkblfeG2cFQF9qqhB 073BSYAmuN7p2D/l3hdXn8FcBj2v0ApSStPRRFB7FTT3AEAMm6WYPqzQME3UukD40+Vf j4Ch4aBqVd/5/oOrqutFu18MeonFsPGv33P5NXDWv9XJ9HRVuJudLLeTtuHlVUqyhFxg NaFW6C4aWFSgQf9ZJTK692cjGEXQ1A5f0HeMLc32UoLbkOSEPvvoF83JLckTT+no8me8 C02Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:references:message-id:date :user-agent:mime-version:in-reply-to:content-language; bh=QaSkh0vz6w9POp49Q4PLfXyWkNHbkysDmph7OCdcwuw=; b=LUif3j1cC2PFr/3acvNntpGwFUpzZoc7CdjLOLy0RwoHhah6EmFiqMcdo38vHr5YG+ 7lJ/imSRAMldk+ur+oAdJ/girNGNhAXfNfIPwNvHfkT5QnHZ3Rq8A3mUzWpfKiXgVwMC MjlrDuZe5OEgXvaaoxfXnFIWxiXAa5L9BCIt+9swfZVhPCJrr9FCk2+QT/vcp4pabxHP cM1ARvLAwB+k8rcqAqnS74/uEMj4r0afRdXmH8bfMPAZfeOO/GnX+IbQ2ml+NmWsob22 hMEy3uYNIWkb+i+Fj6ZyCoGcv44HTC5UYqyFMeWjcmI6boz0hW2CoZdDqvH1yllejzWa qZ0g== X-Gm-Message-State: AKwxytcFJJiae/YrXJBzsE287SX1v940do6AyodSPbxsvwhCDudSC8OR yTawdBdNOyAd3jO9UX+2nTrrmzTc X-Received: by 10.36.60.140 with SMTP id m134mr25295599ita.146.1517209932181; Sun, 28 Jan 2018 23:12:12 -0800 (PST) Received: from [192.168.1.15] ([45.126.171.38]) by smtp.gmail.com with ESMTPSA id o137sm5468370ito.5.2018.01.28.23.12.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Jan 2018 23:12:11 -0800 (PST) From: Gyan Doshi To: ffmpeg-devel@ffmpeg.org References: <294338e6-be38-88aa-7add-1b2f7ce84eab@gmail.com> Message-ID: <34f7902b-177b-8394-9df9-2c237be2826b@gmail.com> Date: Mon, 29 Jan 2018 12:42:09 +0530 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.5.2 MIME-Version: 1.0 In-Reply-To: <294338e6-be38-88aa-7add-1b2f7ce84eab@gmail.com> Content-Language: en-US Subject: [FFmpeg-devel] [PATCH 2/4] avformat/mpegenc - log error messages for unsupported LPCM 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" Forgot to attach patch. Changes to MPEG-PS muxer factored as requested in http://www.ffmpeg.org/pipermail/ffmpeg-devel/2018-January/224642.html. From 344bd0981693a345aebb907d825cb3eb5f93b402 Mon Sep 17 00:00:00 2001 From: Gyan Doshi Date: Mon, 29 Jan 2018 12:11:41 +0530 Subject: [PATCH 2/4] avformat/mpegenc - log error messages for unsupported LPCM streams The MPEG-PS muxer only accepts PCM S16BE streams having up to 8 channels and one of the following sampling rates: 32 kHz 44.1kHz 48 kHz 96 kHz. --- libavformat/mpegenc.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c index 695de3f081..1be0cd56a3 100644 --- a/libavformat/mpegenc.c +++ b/libavformat/mpegenc.c @@ -369,10 +369,19 @@ static av_cold int mpeg_mux_init(AVFormatContext *ctx) if (lpcm_freq_tab[j] == st->codecpar->sample_rate) break; } - if (j == 4) + if (j == 4) { + int sr; + av_log(ctx, AV_LOG_ERROR, "Invalid sampling rate for PCM stream.\n"); + av_log(ctx, AV_LOG_INFO, "Allowed sampling rates:"); + for (sr = 0; sr < 4; sr++) + av_log(ctx, AV_LOG_INFO, " %d", lpcm_freq_tab[sr]); + av_log(ctx, AV_LOG_INFO, "\n"); goto fail; - if (st->codecpar->channels > 8) - return -1; + } + if (st->codecpar->channels > 8) { + av_log(ctx, AV_LOG_ERROR, "At most 8 channels allowed for LPCM streams.\n"); + return AVERROR(EINVAL); + } stream->lpcm_header[0] = 0x0c; stream->lpcm_header[1] = (st->codecpar->channels - 1) | (j << 4); stream->lpcm_header[2] = 0x80;