From patchwork Tue Nov 27 11:29:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 11180 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id ABCC644DB71 for ; Tue, 27 Nov 2018 13:29:38 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 30BCA68A1D0; Tue, 27 Nov 2018 13:29:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 96B9D68A1D0 for ; Tue, 27 Nov 2018 13:29:32 +0200 (EET) Received: by mail-wr1-f66.google.com with SMTP id z5so17988863wrt.11 for ; Tue, 27 Nov 2018 03:29:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=lyCXdq+iwV7SzJvR1wPYEmoqDHiOAGVSc1tS3TpON8w=; b=gH1dfb/apM7SWpF3UgSDcRGhn5DyBJqpW8jfG8R9OuPB+IYC66iThAsd8ynezZ/Bh2 gHhUjCDtqreYlAa5bIKfovD/ctfwNkHQzWJ1WfQxfNzsRiCDDCETpGolWHx5VAD0o9HE 3+0OyCmNMZR3lT9KAfADnsRMrhreTURhvxVoVmHb4IonyKoq0pihczo4DacqfgGfi+yU ay+NibS1UN+b7PwskeZKOqlWKTzo2K6fY3Cyg/xqIIItSdGXvKWsSd350kc1WKsfg++b 7OJqGmGdUIXcQUm/ywBVHxVBA+R0LpXLvSBaRjY8h4f8atv49uWI2Kagyvss+MLW7G7o JxNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=lyCXdq+iwV7SzJvR1wPYEmoqDHiOAGVSc1tS3TpON8w=; b=nksi51wC8qPOX05iT0gUKnOV4m5WWkkS80xgCAZBeqGO6b1zlWoDRrwGniLmuDNAA3 niBUAaYM78HQMLJoWd5hRHeM7qgxFa8EWwnHrY49YMOG9o4r0Byzu7jMkVHPg1cHIWCC VcVo/9FQboGEuqcX34Whx1t4GkVKTX6Fb6mPRPNpG2j4uBYgl00AgPGVBYj89wGA2aLJ MARKTTlsZm/NFUZJHLAWolqB723gP6SzQdOEqN4LWoL7FEcgo6XdkJoFcoi4mje4GsMg 6Vv87mMqrIR6XZ5oEODz3Lx/NoMr//RMUo37K0lMN1WvDFRjRsb+t0oPmMJHTQh9VTbn mvmA== X-Gm-Message-State: AA+aEWaHDUF4t0Zzqmwt0Ccv8msaWinlq079r6Uwe5j2PZwPSgssKtEp bqImnk4SVUajIVJYg6iigwmY77qL X-Google-Smtp-Source: AFSGD/XDWGlsg42tS4rJhky9f9oNaMPPml0xEp9aVw8g6ioVn31Ve1/d6UbjqlNMIkR/If0m6cRJmw== X-Received: by 2002:adf:a743:: with SMTP id e3mr26257392wrd.56.1543318177000; Tue, 27 Nov 2018 03:29:37 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id l37sm3041871wre.69.2018.11.27.03.29.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Nov 2018 03:29:36 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Tue, 27 Nov 2018 12:29:26 +0100 Message-Id: <20181127112926.7058-2-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181127112926.7058-1-onemda@gmail.com> References: <20181127112926.7058-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avformat/mpegenc: extend muxing PCM-DVD to other depths 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes #6783. Signed-off-by: Paul B Mahol --- libavformat/mpegenc.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c index 4c6fa67fb8..f2d6a898f2 100644 --- a/libavformat/mpegenc.c +++ b/libavformat/mpegenc.c @@ -364,12 +364,7 @@ static av_cold int mpeg_mux_init(AVFormatContext *ctx) stream->id = ac3_id++; } else if (st->codecpar->codec_id == AV_CODEC_ID_DTS) { stream->id = dts_id++; - } else if (st->codecpar->codec_id == AV_CODEC_ID_PCM_S16BE || - st->codecpar->codec_id == AV_CODEC_ID_PCM_DVD) { - if (st->codecpar->bits_per_coded_sample != 16) { - av_log(ctx, AV_LOG_ERROR, "Only 16 bit LPCM streams can be muxed.\n"); - goto fail; - } + } else if (st->codecpar->codec_id == AV_CODEC_ID_PCM_S16BE) { stream->id = lpcm_id++; for (j = 0; j < 4; j++) { if (lpcm_freq_tab[j] == st->codecpar->sample_rate) @@ -392,6 +387,14 @@ 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_PCM_DVD) { + stream->lpcm_header[0] = 0x0c; + stream->lpcm_header[1] = (((st->codecpar->sample_rate / 48000) - 1) << 4) | + (((st->codecpar->bits_per_coded_sample - 16) / 4) << 6) | + st->codecpar->channels - 1; + stream->lpcm_header[2] = 0x80; + stream->id = lpcm_id++; + stream->lpcm_align = st->codecpar->channels * st->codecpar->bits_per_coded_sample / 8; } else { stream->id = mpa_id++; }