From patchwork Tue Feb 20 15:17:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan X-Patchwork-Id: 7679 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.150.33 with SMTP id c30csp2839459jai; Tue, 20 Feb 2018 07:23:06 -0800 (PST) X-Google-Smtp-Source: AH8x226Sx102nXxiSqpx3PyOo0VZdtN9vuYwMGO8I1sLEEbR1CRXhgzGZA5KCc90Y3NSBjt0gP/N X-Received: by 10.223.163.85 with SMTP id d21mr16531387wrb.105.1519140185932; Tue, 20 Feb 2018 07:23:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519140185; cv=none; d=google.com; s=arc-20160816; b=lIryRh49W/zH3Penra/4STSk5jVDwdnUtCdAWt61yQj/8p++wCbJ4PQRNSbbXdcSAU 4LwuAcCOLUHAK0Yvo5ObXbPuof9AlrRFhGKOJ7MBBtbq2qhObBHvdnjPPtJ+DH5fdaxT cHVKiIAYyDHZ2sN3dyGvhMezfWe3djZtK6rvMKPjjutSVg0kvaY1itbAPyvn0/dnGLj/ aPXdnFaC2n3XeeVjjJqFzRD1N4Pl/880FXHtUoIPGRHBDZDvDRsSOYabOCCHE3H4/Jzu AnZq2nEh+yRiRLjEq3athdTD+g5JilxmT4smxyEJIIPE0qWiyYZFlodi6Ch3lef5m+ST IRHQ== 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-disposition:content-language :mime-version:user-agent:date:message-id:from:to:dkim-signature :delivered-to:arc-authentication-results; bh=+JqK0u3M/4w9r1h8bI7Py04onBq5KVksOp8D2fVRi/c=; b=MebqBfW4qz+wMFr8ZctcpIY0L9BbWySHeWrE60KL7iEN4gbIpta0OjglJXawwbEbbd 4U5ndHfokgtvIS9tCT9sSiN63dUxpof6TlhML7lr9UuEaRGSx2lXN4zdnpecXsEFZ1vn bc5AB34iIj98OcSWOc6hnSm8S7C+dkN9Uk/xOWp0Aq2gSem4WPLyDghbYmTLnIUd3L1M eFpbF5qZvSpZpQqsvr85ZlZYJYB5bsiuK/XypTeO8J1gpSOWCjn3AulaJshMRxyWk6iP Hzbf7bPJ3jUYvD+MQ/dqJBssN0luLKVrEXw1wF575ISDAj8VStNC8B2BRc9iXdQq/0ea m4fw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=fEIlqW11; 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 w184si6628884wme.18.2018.02.20.07.23.04; Tue, 20 Feb 2018 07:23:05 -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=fEIlqW11; 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 E2D6968A338; Tue, 20 Feb 2018 17:23:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl0-f48.google.com (mail-pl0-f48.google.com [209.85.160.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AC0A468A2CA for ; Tue, 20 Feb 2018 17:22:55 +0200 (EET) Received: by mail-pl0-f48.google.com with SMTP id bb3so7589012plb.2 for ; Tue, 20 Feb 2018 07:22:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=0PGQMMWjwZXw0OSwg17qM0Va57NuEwFOVY1/IK8XfVQ=; b=fEIlqW11ZDL2L3yP+20grdD8CHzJ2kqgjIoN05RF1UVcqxw4ynukeOtWLzxlNXmRF+ E9po1S9kVfuU7A0p7TEZIdDvZN8X3xHFSHV74TNM+Tqu8YvNHAM2C1+9prrJI+/wnCVo qYnazpffvkiSE1m1w/ipEEiC5PY7r40m5OfQbeZmEbnGzTWREPtzK3XxRhCH/1tzUCts AtiqRERBIro5WnxaSPwOpdQaBtg3T03bxyBWZaQ+Qng1/5zWbXvMHi6KY97ToJYcURNg XAbdrNVVtao10oktZL3egn3xS8G2f4WGB9+ROPZYvRT0KXC6RdkZNndaynaxXb+O1xXz RooQ== 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:message-id:date:user-agent :mime-version:content-language; bh=0PGQMMWjwZXw0OSwg17qM0Va57NuEwFOVY1/IK8XfVQ=; b=uUH+ZZQ9YHnXOFlB6JpbfX2wFOO4obYg7geq+T1SWuNT1kH4FIlwk9KlzWS/7aZw8P +hRcUjiefgRhGT4HQncDtnrGXNuEBMdaVCxtHsTt1iiHEOVVPYsR7rjyNK/DgSAfaNQx k6luaR9SfGSiWYbCLV3jQMSg0wGHr/nvEARVYCM9DYyoiBhEI0N6/Vg1DIVqp5duTtSq zpNvendzfNq8fLq2c4Sp7avOkwd1ZIFXG5GocZTTnPt6aEdfKLMaN3mO1RSA4wQXm99D Lurln6Tcf/q+YS59/UZuPfe8+5I7uMSj4UU3A/b2qHQumBcQw/imtk1LdAEj/Vu6KSUF 7/kQ== X-Gm-Message-State: APf1xPBzKgvhIBNsKZRRnFCc4KBjzIYaoUdoF28sz51OtanNHCF37iZK xQWDdUNTKKlEQ4K4gQMk/05Wqdbc X-Received: by 2002:a17:902:7c11:: with SMTP id x17-v6mr4223810pll.59.1519139838753; Tue, 20 Feb 2018 07:17:18 -0800 (PST) Received: from [192.168.1.215] ([103.206.133.21]) by smtp.gmail.com with ESMTPSA id s89sm63738199pfk.35.2018.02.20.07.17.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Feb 2018 07:17:17 -0800 (PST) To: ffmpeg-devel@ffmpeg.org From: Gyan Doshi Message-ID: <4a8acc62-9dc1-f5d3-f652-f2811ef958b6@gmail.com> Date: Tue, 20 Feb 2018 20:47:14 +0530 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 Content-Language: en-US Content-Disposition: attachment; filename*0="0001-avformat-mpegenc-log-error-msgs-for-unsupported-LPCM.pa"; filename*1="tch" X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/mpegenc - log error msgs 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" From 5f5cc12ff449fecfe668ec4537b8f2bb16d896d7 Mon Sep 17 00:00:00 2001 From: Gyan Doshi Date: Tue, 20 Feb 2018 20:31:28 +0530 Subject: [PATCH 1/2] avformat/mpegenc - log error msgs for unsupported LPCM streams The MPEG-PS muxer only accepts PCM streams having up to 8 channels and the following sampling rates: 32/44.1/48/96 kHz. --- libavformat/mpegenc.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c index c84dc52eb9..4c6fa67fb8 100644 --- a/libavformat/mpegenc.c +++ b/libavformat/mpegenc.c @@ -375,10 +375,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"); + goto fail; + } stream->lpcm_header[0] = 0x0c; stream->lpcm_header[1] = (st->codecpar->channels - 1) | (j << 4); stream->lpcm_header[2] = 0x80;