Thanks to Paul (who wrote a lot of ffmpeg code) I hacked this patch against
ffmpeg-4.4.
Can anyone test how it work with 5.1 and stereo sounds (s16, s24 broken
ATM), especially if it remaps 5.1 channels correctly?
I tested like this:
$ ./ffmpeg -i ~/matrixbench_highdivx_ac3.avi -c:v libx264 -s 160x120 -c:a
pcm_bluray -mpegts_m2ts_mode 1 -sample_fmt s16 1.m2ts
mpv 1.m2ts
but my tablet sound definitely not 5.1!
NOTE: this is not yet cinelerra-gg patch, just something I test with our
version of ffmpeg
--- /dev/null 2021-12-05 17:02:04.576000000 +0300
+++ libavcodec/pcm-bluenc.c 2021-12-06 21:20:56.585842101 +0300
@@ -0,0 +1,252 @@
+/*
+ * LPCM codecs for PCM formats found in Blu-ray m2ts streams
+ * Copyright (c) 2018 Paul B Mahol
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "avcodec.h"
+#include "bytestream.h"
+#include "internal.h"
+
+typedef struct PCMBDContext {
+ uint8_t header[4]; // Header added to every frame
+ int block_size; // Size of a block of samples in bytes
+ int samples_per_block; // Number of samples per channel per block
+ int groups_per_block; // Number of 20/24-bit sample groups per block
+ uint8_t *extra_samples; // Pointer to leftover samples from a frame
+ int extra_sample_count; // Number of leftover samples in the buffer
+} PCMBDContext;
+
+static av_cold int pcm_bd_encode_init(AVCodecContext *avctx)
+{
+ PCMBDContext *s = avctx->priv_data;
+ int quant, freq;
+ uint16_t frame_size;
+ uint8_t ch_layout;
+
+ switch (avctx->sample_rate) {
+ case 48000:
+ freq = 1;
+ break;
+ case 96000:
+ freq = 4;
+ break;
+ case 192000:
+ freq = 5;
+ break;
+ }
+
+ switch (avctx->sample_fmt) {
+ case AV_SAMPLE_FMT_S16:
+ avctx->bits_per_coded_sample = 16;
+ quant = 1;
+ break;
+/* case AV_SAMPLE_FMT_S20:
+ avctx->bits_per_coded_sample = 20;
+ quant = 2;
+ break;
+*/
+ case AV_SAMPLE_FMT_S32:
+ avctx->bits_per_coded_sample = 24;
+ quant = 3;
+ break;
+ }
+
+ //avctx->bits_per_coded_sample = 16 + quant * 4;
+ avctx->block_align = avctx->channels * avctx->bits_per_coded_sample / 8;
+ avctx->bit_rate = avctx->block_align * 8LL * avctx->sample_rate;
+ if (avctx->bit_rate > 9800000) {
+ av_log(avctx, AV_LOG_ERROR, "Too big bitrate: reduce sample rate, bitdepth or channels.\n");
+ return AVERROR(EINVAL);
+ }
+
+ if (avctx->sample_fmt == AV_SAMPLE_FMT_S16) {
+ s->samples_per_block = 1;
+ s->block_size = avctx->channels * 2;
+ frame_size = 2008 / s->block_size;
+ } else {
+ switch (avctx->channels) {
+ case 1:
+ case 2:
+ case 4:
+ /* one group has all the samples needed */
+ s->block_size = 4 * avctx->bits_per_coded_sample / 8;
+ s->samples_per_block = 4 / avctx->channels;
+ s->groups_per_block = 1;
+ break;
+ case 8:
+ /* two groups have all the samples needed */
+ s->block_size = 8 * avctx->bits_per_coded_sample / 8;
+ s->samples_per_block = 1;
+ s->groups_per_block = 2;
+ break;
+ default:
+ /* need avctx->channels groups */
+ s->block_size = 4 * avctx->channels *
+ avctx->bits_per_coded_sample / 8;
+ s->samples_per_block = 4;
+ s->groups_per_block = avctx->channels;
+ break;
+ }
+
+ frame_size = FFALIGN(2008 / s->block_size, s->samples_per_block);
+ }
+
+ switch(avctx->channel_layout) {
+ case AV_CH_LAYOUT_MONO:
+ ch_layout = 1;
+ break;
+ case AV_CH_LAYOUT_STEREO:
+ ch_layout = 3;
+ break;
+ case AV_CH_LAYOUT_5POINT1:
+ ch_layout = 9;
+ break;
+ }
+// description on the web:
+/* http://forum.doom9.org/showthread.php?t=152897
+
+It's a header.
+
+size in bytes = 16 bits (big endian)
+channel assignment = 4 bits
+sampling frequency = 4 bits
+bits per sample = 2 bits
+start flag = 1 bit
+reserved = 5 bits
+
+channel assignment
+1 = mono
+3 = stereo
+4 = 3/0
+5 = 2/1
+6 = 3/1
+7 = 2/2
+8 = 3/2
+9 = 3/2+lfe
+10 = 3/4
+11 = 3/4+lfe
+
+sampling frequency
+1 = 48 kHz
+4 = 96 kHz
+5 = 192 kHz
+
+bits per sample
+1 = 16
+2 = 20
+3 = 24
+*/
+
+ s->header[2] = (ch_layout << 4) | (freq);
+ s->header[3] = (quant << 6) | 0x1 ;
+
+
+ avctx->frame_size = frame_size; // in num. of samples
+
+ return 0;
+}
+
+static int pcm_bd_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
+ const AVFrame *frame, int *got_packet_ptr)
+{
+ PCMBDContext *s = avctx->priv_data;
+ int samples;
+ int64_t pkt_size = (frame->nb_samples / s->samples_per_block) * s->block_size + 4;
+ int blocks = (pkt_size - 4) / s->block_size;
+ const int16_t *src16;
+ const int32_t *src32;
+ PutByteContext pb;
+ int ret;
+
+ if ((ret = ff_alloc_packet2(avctx, avpkt, pkt_size, 0)) < 0)
+ return ret;
+
+ AV_WB16(s->header, pkt_size - 4);
+ memcpy(avpkt->data, s->header, 4);
+
+ src16 = (const int16_t *)frame->data[0];
+ src32 = (const int32_t *)frame->data[0];
+
+ bytestream2_init_writer(&pb, avpkt->data + 4, avpkt->size - 4);
+
+ int num_source_channels = FFALIGN(avctx->channels, 2);
+ int sample_size = (num_source_channels *
+ (avctx->sample_fmt == AV_SAMPLE_FMT_S16 ? 16 : 24)) >> 3;
+ samples = frame->nb_samples * num_source_channels;
+
+ switch (avctx->sample_fmt) {
+ case AV_SAMPLE_FMT_S16:
+ switch (avctx->channel_layout) {
+ case AV_CH_LAYOUT_5POINT1:
+ do {
+ bytestream2_put_be16(&pb, src16[0]);
+ bytestream2_put_be16(&pb, src16[1]);
+ bytestream2_put_be16(&pb, src16[2]);
+ bytestream2_put_be16(&pb, src16[4]);
+ bytestream2_put_be16(&pb, src16[5]);
+ bytestream2_put_be16(&pb, src16[3]);
+ src16+=6;
+ } while (--samples);
+ break;
+ default:
+ do {
+ bytestream2_put_be16(&pb, *src16++);
+ } while (--samples);
+ break;
+ }
+ case AV_SAMPLE_FMT_S32:
+ switch (avctx->channel_layout) {
+ case AV_CH_LAYOUT_STEREO:
+ case AV_CH_LAYOUT_4POINT0:
+ case AV_CH_LAYOUT_2_2:
+ do {
+ bytestream2_put_be24(&pb, (*src32++) << 8);
+ } while (--samples);
+ break;
+ }
+ }
+
+ avpkt->pts = frame->pts;
+ avpkt->size = pkt_size;
+ avpkt->duration = ff_samples_to_time_base(avctx, frame->nb_samples);
+ *got_packet_ptr = 1;
+
+ return 0;
+}
+
+AVCodec ff_pcm_bluray_encoder = {
+ .name = "pcm_bluray",
+ .long_name = NULL_IF_CONFIG_SMALL("PCM signed 16|24-bit big-endian for bluray media"),
+ .type = AVMEDIA_TYPE_AUDIO,
+ .id = AV_CODEC_ID_PCM_BLURAY,
+ .priv_data_size = sizeof(PCMBDContext),
+ .init = pcm_bd_encode_init,
+ .encode2 = pcm_bd_encode_frame,
+ .capabilities = AV_CODEC_CAP_SMALL_LAST_FRAME,
+ .supported_samplerates = (const int[]) { 48000, 96000, 192000, 0},
+ .channel_layouts = (const uint64_t[]) { AV_CH_LAYOUT_MONO,
+ AV_CH_LAYOUT_STEREO,
+ AV_CH_LAYOUT_5POINT1,
+ AV_CH_LAYOUT_7POINT1,
+ 0 },
+ .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
+ AV_SAMPLE_FMT_S32,
+ AV_SAMPLE_FMT_NONE },
+ .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
+};
--- libavcodec/allcodecs.orig 2021-04-09 00:28:39.000000000 +0300
+++ libavcodec/allcodecs.c 2021-12-06 15:45:03.333762281 +0300
@@ -523,6 +523,7 @@
/* PCM codecs */
extern AVCodec ff_pcm_alaw_encoder;
extern AVCodec ff_pcm_alaw_decoder;
+extern AVCodec ff_pcm_bluray_encoder;
extern AVCodec ff_pcm_bluray_decoder;
extern AVCodec ff_pcm_dvd_encoder;
extern AVCodec ff_pcm_dvd_decoder;
--- libavcodec/Makefile.orig 2021-04-09 00:28:39.000000000 +0300
+++ libavcodec/Makefile 2021-12-06 21:11:19.365842066 +0300
@@ -789,6 +789,7 @@
OBJS-$(CONFIG_PCM_ALAW_DECODER) += pcm.o
OBJS-$(CONFIG_PCM_ALAW_ENCODER) += pcm.o
OBJS-$(CONFIG_PCM_BLURAY_DECODER) += pcm-bluray.o
+OBJS-$(CONFIG_PCM_BLURAY_ENCODER) += pcm-bluenc.o
OBJS-$(CONFIG_PCM_DVD_DECODER) += pcm-dvd.o
OBJS-$(CONFIG_PCM_DVD_ENCODER) += pcm-dvdenc.o
OBJS-$(CONFIG_PCM_F16LE_DECODER) += pcm.o
--
Cin mailing list
[email protected]
https://lists.cinelerra-gg.org/mailman/listinfo/cin
