From patchwork Thu Nov 29 11:39:10 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: 11231 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 5213244D528 for ; Thu, 29 Nov 2018 13:45:42 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EB92868A737; Thu, 29 Nov 2018 13:45:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1C75568A727 for ; Thu, 29 Nov 2018 13:45:37 +0200 (EET) Received: by mail-wm1-f67.google.com with SMTP id k198so1908365wmd.3 for ; Thu, 29 Nov 2018 03:45:43 -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=EaOs69euVmfMI9j/6bphnU/xmoq/J8Y9gUREP6r+xX8=; b=Ch0P4a1EXWaftrkc2A9R4gGRk36pWMX1R9rUs27hsEyoOeB944cgaLVhLtWQi5KCJc QYQbE6yZQxFreoueqkeMlz/qwA2GTyl0GkLmXXBJLVI+QQ7xziuNgE1kz2oUPs13c5kp h9hmoOtRvnODm4FbgFHVVNyPjIJvY5dAiiUtMAgMpTSjr1BbxGNCs9t34sbfkzI8NTAM VZ8j6LvFTvZhBwjomodX9TrXJAQJw9idWzj4joZ/oD/iaPalSwbaA44UwzpJIHMIoBPt FnWC659GR0cNzkba7caqS+lwA7RCIWkNs35E81XS2lKZ2VQS95oAjat3Ns8aBJ/XLTid XEWA== 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=EaOs69euVmfMI9j/6bphnU/xmoq/J8Y9gUREP6r+xX8=; b=dz1fOLlr+YRyL9EONIGqnC2mEjIWRPHuAcK90TtPGbxuKNGQiGakr3YUV5OFCb/7b3 PBVNz2JZMNQhJC4F3Yta7lZ9VZ6hfm6ypc8zpZyNQwJHcmDl2rql2VRh60LTznWywBZb AkFQxJS0HGFMWIeP+OxovxrAKrTBfFH4Gzv2viacnZENM+8i/4Q3/keNThq5bWkb2Trn EApWpcEbYG5Aw8luJvq4Qet3ygPXcjhuC+Pgih+OLptVldCbVTbaC7I/9x7R4K6MJJhN D+KxXnrLr9X/HMcofvJAkrARcQhvy9QIQ+3Vo6w4OI0G57XCQKGPZLQBeOl87hOBdzuK Ctrg== X-Gm-Message-State: AA+aEWaQlvKPQ6642qu0A6SL5RbjmvgmWCEHqCJPH+qs8Bslwp20mIan Ym4pMS28C1CBDsaI47amnqQal8wr X-Google-Smtp-Source: AFSGD/V4qhy5japwG/P9H2hI1ZGR2unJNEglHfYYArU34yp/O3YWxrkKPMjYLaFAlbvIfObujUeYCA== X-Received: by 2002:a1c:e90d:: with SMTP id q13mr1500344wmc.106.1543491561287; Thu, 29 Nov 2018 03:39:21 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id c3-v6sm1549720wmb.46.2018.11.29.03.39.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Nov 2018 03:39:20 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Thu, 29 Nov 2018 12:39:10 +0100 Message-Id: <20181129113910.4570-2-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181129113910.4570-1-onemda@gmail.com> References: <20181129113910.4570-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 | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c index 4c6fa67fb8..1389288b7f 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,26 @@ 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) { + int freq; + + switch (st->codecpar->sample_rate) { + case 48000: freq = 0; break; + case 96000: freq = 1; break; + case 44100: freq = 2; break; + case 32000: freq = 3; break; + default: + av_log(ctx, AV_LOG_ERROR, "Unsupported sample rate.\n"); + return AVERROR(EINVAL); + } + + stream->lpcm_header[0] = 0x0c; + stream->lpcm_header[1] = (freq << 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++; }