Re: [FFmpeg-devel] [PATCH 2/2] avcodec: add pcm-bluray encoder

[Michael Niedermayer <michael@niedermayer.cc>]

[-- Attachment #1.1: Type: text/plain, Size: 8291 bytes --]

On Sat, Feb 26, 2022 at 08:31:43PM +0100, Paul B Mahol wrote:
> Signed-off-by: Paul B Mahol <onemda@gmail.com>
> ---
>  libavcodec/Makefile        |   1 +
>  libavcodec/allcodecs.c     |   1 +
>  libavcodec/pcm-blurayenc.c | 291 +++++++++++++++++++++++++++++++++++++
>  3 files changed, 293 insertions(+)
>  create mode 100644 libavcodec/pcm-blurayenc.c
> 
> diff --git a/libavcodec/Makefile b/libavcodec/Makefile
> index 6076b4ad80..e34a9ae862 100644
> --- a/libavcodec/Makefile
> +++ b/libavcodec/Makefile
> @@ -800,6 +800,7 @@ OBJS-$(CONFIG_ZMBV_ENCODER)            += zmbvenc.o
>  # (AD)PCM decoders/encoders
>  OBJS-$(CONFIG_PCM_ALAW_DECODER)           += pcm.o
>  OBJS-$(CONFIG_PCM_ALAW_ENCODER)           += pcm.o
> +OBJS-$(CONFIG_PCM_BLURAY_ENCODER)         += pcm-blurayenc.o
>  OBJS-$(CONFIG_PCM_BLURAY_DECODER)         += pcm-bluray.o
>  OBJS-$(CONFIG_PCM_DVD_DECODER)            += pcm-dvd.o
>  OBJS-$(CONFIG_PCM_DVD_ENCODER)            += pcm-dvdenc.o
> diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
> index d1e10197de..1be67e3ec3 100644
> --- a/libavcodec/allcodecs.c
> +++ b/libavcodec/allcodecs.c
> @@ -531,6 +531,7 @@ extern const AVCodec ff_xma2_decoder;
>  /* PCM codecs */
>  extern const AVCodec ff_pcm_alaw_encoder;
>  extern const AVCodec ff_pcm_alaw_decoder;
> +extern const AVCodec ff_pcm_bluray_encoder;
>  extern const AVCodec ff_pcm_bluray_decoder;
>  extern const AVCodec ff_pcm_dvd_encoder;
>  extern const AVCodec ff_pcm_dvd_decoder;
> diff --git a/libavcodec/pcm-blurayenc.c b/libavcodec/pcm-blurayenc.c
> new file mode 100644
> index 0000000000..9201ad9690
> --- /dev/null
> +++ b/libavcodec/pcm-blurayenc.c
> @@ -0,0 +1,291 @@
> +/*
> + * LPCM codecs for PCM formats found in Blu-ray m2ts streams
> + *
> + * 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 "libavutil/channel_layout.h"
> +#include "avcodec.h"
> +#include "bytestream.h"
> +#include "encode.h"
> +#include "internal.h"
> +
> +typedef struct BlurayPCMEncContext {
> +    uint16_t header;      // Header added to every frame
> +} BlurayPCMEncContext;
> +
> +static av_cold int pcm_bluray_encode_init(AVCodecContext *avctx)
> +{
> +    BlurayPCMEncContext *s = avctx->priv_data;
> +    uint8_t ch_layout;
> +    int quant, freq;
> +
> +    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_S32:
> +        avctx->bits_per_coded_sample = 24;
> +        quant = 3;
> +        break;
> +    }
> +
> +    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_SURROUND:
> +        ch_layout = 4;
> +        break;
> +    case AV_CH_LAYOUT_2_1:
> +        ch_layout = 5;
> +        break;
> +    case AV_CH_LAYOUT_4POINT0:
> +        ch_layout = 6;
> +        break;
> +    case AV_CH_LAYOUT_2_2:
> +        ch_layout = 7;
> +        break;
> +    case AV_CH_LAYOUT_5POINT0:
> +        ch_layout = 8;
> +        break;
> +    case AV_CH_LAYOUT_5POINT1:
> +        ch_layout = 9;
> +        break;
> +    case AV_CH_LAYOUT_7POINT0:
> +        ch_layout = 10;
> +        break;
> +    case AV_CH_LAYOUT_7POINT1:
> +        ch_layout = 11;
> +        break;
> +    default:
> +        return AVERROR_BUG;
> +    }
> +
> +    s->header = (((ch_layout << 4) | freq) << 8) | (quant << 6);
> +
> +    return 0;
> +}
> +
> +static int pcm_bluray_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
> +                                   const AVFrame *frame, int *got_packet_ptr)
> +{
> +    BlurayPCMEncContext *s = avctx->priv_data;
> +    int sample_size, samples, channel, num_dest_channels;
> +    const int16_t *src16;
> +    const int32_t *src32;
> +    unsigned pkt_size;
> +    PutByteContext pb;
> +    int ret;
> +
> +    num_dest_channels = FFALIGN(avctx->channels, 2);
> +    sample_size = (num_dest_channels *
> +                   (avctx->sample_fmt == AV_SAMPLE_FMT_S16 ? 16 : 24)) >> 3;
> +    samples = frame->nb_samples;
> +
> +    pkt_size = sample_size * samples + 4;
> +
> +    if ((ret = ff_get_encode_buffer(avctx, avpkt, pkt_size, 0)) < 0)
> +        return ret;
> +
> +    AV_WB16(avpkt->data, pkt_size - 4);
> +    AV_WB16(avpkt->data + 2, s->header);
> +
> +    src16 = (const int16_t *)frame->data[0];
> +    src32 = (const int32_t *)frame->data[0];
> +
> +    bytestream2_init_writer(&pb, avpkt->data + 4, avpkt->size - 4);
> +
> +    switch (avctx->channel_layout) {
> +    /* cases with same number of source and coded channels */
> +    case AV_CH_LAYOUT_STEREO:
> +    case AV_CH_LAYOUT_4POINT0:
> +    case AV_CH_LAYOUT_2_2:
> +        samples *= num_dest_channels;
> +        if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) {
> +#if HAVE_BIGENDIAN
> +            bytestream2_put_buffer(&pb, src16, buf_size);
> +#else

fails to build for mips

src/libavcodec/pcm-blurayenc.c: In function ‘pcm_bluray_encode_frame’:
src/libavcodec/pcm-blurayenc.c:137:48: error: ‘buf_size’ undeclared (first use in this function); did you mean ‘pkt_size’?
             bytestream2_put_buffer(&pb, src16, buf_size);
                                                ^~~~~~~~
                                                pkt_size
src/libavcodec/pcm-blurayenc.c:137:48: note: each undeclared identifier is reported only once for each function it appears in
src/libavcodec/pcm-blurayenc.c:137:41: warning: passing argument 2 of ‘bytestream2_put_buffer’ from incompatible pointer type [-Wincompatible-pointer-types]
             bytestream2_put_buffer(&pb, src16, buf_size);
                                         ^~~~~
In file included from src/libavcodec/pcm-blurayenc.c:23:0:
src/libavcodec/bytestream.h:286:38: note: expected ‘const uint8_t * {aka const unsigned char *}’ but argument is of type ‘const int16_t * {aka const short int *}’
 static av_always_inline unsigned int bytestream2_put_buffer(PutByteContext *p,
                                      ^~~~~~~~~~~~~~~~~~~~~~
src/libavcodec/pcm-blurayenc.c:157:46: warning: passing argument 2 of ‘bytestream2_put_bufferu’ from incompatible pointer type [-Wincompatible-pointer-types]
                 bytestream2_put_bufferu(&pb, src16, avctx->channels * 2);
                                              ^~~~~
In file included from src/libavcodec/pcm-blurayenc.c:23:0:
src/libavcodec/bytestream.h:301:38: note: expected ‘const uint8_t * {aka const unsigned char *}’ but argument is of type ‘const int16_t * {aka const short int *}’
 static av_always_inline unsigned int bytestream2_put_bufferu(PutByteContext *p,
                                      ^~~~~~~~~~~~~~~~~~~~~~~
src/ffbuild/common.mak:78: recipe for target 'libavcodec/pcm-blurayenc.o' failed
make: *** [libavcodec/pcm-blurayenc.o] Error 1


[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Elect your leaders based on what they did after the last election, not
based on what they say before an election.


[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".