Re: [FFmpeg-devel] [PATCH 1/8] sbc: implement SBC decoder (low-complexity subband codec)
On Mon, Dec 18, 2017 at 01:05:39AM +, Rostislav Pehlivanov wrote: > On 17 December 2017 at 21:47, Aurelien Jacobs wrote: > > > This was originally based on libsbc, and was fully integrated into ffmpeg. > > --- > > doc/general.texi | 2 + > > libavcodec/Makefile | 2 + > > libavcodec/allcodecs.c | 2 + > > libavcodec/avcodec.h | 2 + > > libavcodec/codec_desc.c | 14 ++ > > libavcodec/sbc.c | 316 > > libavcodec/sbc.h | 118 > > libavcodec/sbcdec.c | 464 ++ > > + > > libavcodec/sbcdec_data.c | 127 + > > libavcodec/sbcdec_data.h | 44 + > > 10 files changed, 1091 insertions(+) > > create mode 100644 libavcodec/sbc.c > > create mode 100644 libavcodec/sbc.h > > create mode 100644 libavcodec/sbcdec.c > > create mode 100644 libavcodec/sbcdec_data.c > > create mode 100644 libavcodec/sbcdec_data.h > > > > > > + > > +/* > > + * Calculates the CRC-8 of the first len bits in data > > + */ > > +static const uint8_t crc_table[256] = { > > +0x00, 0x1D, 0x3A, 0x27, 0x74, 0x69, 0x4E, 0x53, > > +0xE8, 0xF5, 0xD2, 0xCF, 0x9C, 0x81, 0xA6, 0xBB, > > +0xCD, 0xD0, 0xF7, 0xEA, 0xB9, 0xA4, 0x83, 0x9E, > > +0x25, 0x38, 0x1F, 0x02, 0x51, 0x4C, 0x6B, 0x76, > > +0x87, 0x9A, 0xBD, 0xA0, 0xF3, 0xEE, 0xC9, 0xD4, > > +0x6F, 0x72, 0x55, 0x48, 0x1B, 0x06, 0x21, 0x3C, > > +0x4A, 0x57, 0x70, 0x6D, 0x3E, 0x23, 0x04, 0x19, > > +0xA2, 0xBF, 0x98, 0x85, 0xD6, 0xCB, 0xEC, 0xF1, > > +0x13, 0x0E, 0x29, 0x34, 0x67, 0x7A, 0x5D, 0x40, > > +0xFB, 0xE6, 0xC1, 0xDC, 0x8F, 0x92, 0xB5, 0xA8, > > +0xDE, 0xC3, 0xE4, 0xF9, 0xAA, 0xB7, 0x90, 0x8D, > > +0x36, 0x2B, 0x0C, 0x11, 0x42, 0x5F, 0x78, 0x65, > > +0x94, 0x89, 0xAE, 0xB3, 0xE0, 0xFD, 0xDA, 0xC7, > > +0x7C, 0x61, 0x46, 0x5B, 0x08, 0x15, 0x32, 0x2F, > > +0x59, 0x44, 0x63, 0x7E, 0x2D, 0x30, 0x17, 0x0A, > > +0xB1, 0xAC, 0x8B, 0x96, 0xC5, 0xD8, 0xFF, 0xE2, > > +0x26, 0x3B, 0x1C, 0x01, 0x52, 0x4F, 0x68, 0x75, > > +0xCE, 0xD3, 0xF4, 0xE9, 0xBA, 0xA7, 0x80, 0x9D, > > +0xEB, 0xF6, 0xD1, 0xCC, 0x9F, 0x82, 0xA5, 0xB8, > > +0x03, 0x1E, 0x39, 0x24, 0x77, 0x6A, 0x4D, 0x50, > > +0xA1, 0xBC, 0x9B, 0x86, 0xD5, 0xC8, 0xEF, 0xF2, > > +0x49, 0x54, 0x73, 0x6E, 0x3D, 0x20, 0x07, 0x1A, > > +0x6C, 0x71, 0x56, 0x4B, 0x18, 0x05, 0x22, 0x3F, > > +0x84, 0x99, 0xBE, 0xA3, 0xF0, 0xED, 0xCA, 0xD7, > > +0x35, 0x28, 0x0F, 0x12, 0x41, 0x5C, 0x7B, 0x66, > > +0xDD, 0xC0, 0xE7, 0xFA, 0xA9, 0xB4, 0x93, 0x8E, > > +0xF8, 0xE5, 0xC2, 0xDF, 0x8C, 0x91, 0xB6, 0xAB, > > +0x10, 0x0D, 0x2A, 0x37, 0x64, 0x79, 0x5E, 0x43, > > +0xB2, 0xAF, 0x88, 0x95, 0xC6, 0xDB, 0xFC, 0xE1, > > +0x5A, 0x47, 0x60, 0x7D, 0x2E, 0x33, 0x14, 0x09, > > +0x7F, 0x62, 0x45, 0x58, 0x0B, 0x16, 0x31, 0x2C, > > +0x97, 0x8A, 0xAD, 0xB0, 0xE3, 0xFE, 0xD9, 0xC4 > > +}; > > + > > +uint8_t ff_sbc_crc8(const uint8_t *data, size_t len) > > +{ > > +uint8_t crc = 0x0f; > > +size_t i; > > +uint8_t octet; > > + > > +for (i = 0; i < len / 8; i++) > > +crc = crc_table[crc ^ data[i]]; > > + > > +octet = data[i]; > > +for (i = 0; i < len % 8; i++) { > > +char bit = ((octet ^ crc) & 0x80) >> 7; > > + > > +crc = ((crc & 0x7f) << 1) ^ (bit ? 0x1d : 0); > > + > > +octet = octet << 1; > > +} > > + > > +return crc; > > +} > > > > > Yeah, no, I absolutely insist on using av_crc. The init function can handle > any byte-length CRC method as its done here. The issue is that this function is using a non multiple of 8 number of input bits, while av_crc is only working on bytes buffer. Nevertheless, I switched to using av_crc, but I've added an av_crc_bits() function which is not limited to bytes boundaries. New patchset upcoming. ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH 1/8] sbc: implement SBC decoder (low-complexity subband codec)
On 17 December 2017 at 21:47, Aurelien Jacobs wrote: > This was originally based on libsbc, and was fully integrated into ffmpeg. > --- > doc/general.texi | 2 + > libavcodec/Makefile | 2 + > libavcodec/allcodecs.c | 2 + > libavcodec/avcodec.h | 2 + > libavcodec/codec_desc.c | 14 ++ > libavcodec/sbc.c | 316 > libavcodec/sbc.h | 118 > libavcodec/sbcdec.c | 464 ++ > + > libavcodec/sbcdec_data.c | 127 + > libavcodec/sbcdec_data.h | 44 + > 10 files changed, 1091 insertions(+) > create mode 100644 libavcodec/sbc.c > create mode 100644 libavcodec/sbc.h > create mode 100644 libavcodec/sbcdec.c > create mode 100644 libavcodec/sbcdec_data.c > create mode 100644 libavcodec/sbcdec_data.h > > > + > +/* > + * Calculates the CRC-8 of the first len bits in data > + */ > +static const uint8_t crc_table[256] = { > +0x00, 0x1D, 0x3A, 0x27, 0x74, 0x69, 0x4E, 0x53, > +0xE8, 0xF5, 0xD2, 0xCF, 0x9C, 0x81, 0xA6, 0xBB, > +0xCD, 0xD0, 0xF7, 0xEA, 0xB9, 0xA4, 0x83, 0x9E, > +0x25, 0x38, 0x1F, 0x02, 0x51, 0x4C, 0x6B, 0x76, > +0x87, 0x9A, 0xBD, 0xA0, 0xF3, 0xEE, 0xC9, 0xD4, > +0x6F, 0x72, 0x55, 0x48, 0x1B, 0x06, 0x21, 0x3C, > +0x4A, 0x57, 0x70, 0x6D, 0x3E, 0x23, 0x04, 0x19, > +0xA2, 0xBF, 0x98, 0x85, 0xD6, 0xCB, 0xEC, 0xF1, > +0x13, 0x0E, 0x29, 0x34, 0x67, 0x7A, 0x5D, 0x40, > +0xFB, 0xE6, 0xC1, 0xDC, 0x8F, 0x92, 0xB5, 0xA8, > +0xDE, 0xC3, 0xE4, 0xF9, 0xAA, 0xB7, 0x90, 0x8D, > +0x36, 0x2B, 0x0C, 0x11, 0x42, 0x5F, 0x78, 0x65, > +0x94, 0x89, 0xAE, 0xB3, 0xE0, 0xFD, 0xDA, 0xC7, > +0x7C, 0x61, 0x46, 0x5B, 0x08, 0x15, 0x32, 0x2F, > +0x59, 0x44, 0x63, 0x7E, 0x2D, 0x30, 0x17, 0x0A, > +0xB1, 0xAC, 0x8B, 0x96, 0xC5, 0xD8, 0xFF, 0xE2, > +0x26, 0x3B, 0x1C, 0x01, 0x52, 0x4F, 0x68, 0x75, > +0xCE, 0xD3, 0xF4, 0xE9, 0xBA, 0xA7, 0x80, 0x9D, > +0xEB, 0xF6, 0xD1, 0xCC, 0x9F, 0x82, 0xA5, 0xB8, > +0x03, 0x1E, 0x39, 0x24, 0x77, 0x6A, 0x4D, 0x50, > +0xA1, 0xBC, 0x9B, 0x86, 0xD5, 0xC8, 0xEF, 0xF2, > +0x49, 0x54, 0x73, 0x6E, 0x3D, 0x20, 0x07, 0x1A, > +0x6C, 0x71, 0x56, 0x4B, 0x18, 0x05, 0x22, 0x3F, > +0x84, 0x99, 0xBE, 0xA3, 0xF0, 0xED, 0xCA, 0xD7, > +0x35, 0x28, 0x0F, 0x12, 0x41, 0x5C, 0x7B, 0x66, > +0xDD, 0xC0, 0xE7, 0xFA, 0xA9, 0xB4, 0x93, 0x8E, > +0xF8, 0xE5, 0xC2, 0xDF, 0x8C, 0x91, 0xB6, 0xAB, > +0x10, 0x0D, 0x2A, 0x37, 0x64, 0x79, 0x5E, 0x43, > +0xB2, 0xAF, 0x88, 0x95, 0xC6, 0xDB, 0xFC, 0xE1, > +0x5A, 0x47, 0x60, 0x7D, 0x2E, 0x33, 0x14, 0x09, > +0x7F, 0x62, 0x45, 0x58, 0x0B, 0x16, 0x31, 0x2C, > +0x97, 0x8A, 0xAD, 0xB0, 0xE3, 0xFE, 0xD9, 0xC4 > +}; > + > +uint8_t ff_sbc_crc8(const uint8_t *data, size_t len) > +{ > +uint8_t crc = 0x0f; > +size_t i; > +uint8_t octet; > + > +for (i = 0; i < len / 8; i++) > +crc = crc_table[crc ^ data[i]]; > + > +octet = data[i]; > +for (i = 0; i < len % 8; i++) { > +char bit = ((octet ^ crc) & 0x80) >> 7; > + > +crc = ((crc & 0x7f) << 1) ^ (bit ? 0x1d : 0); > + > +octet = octet << 1; > +} > + > +return crc; > +} > Yeah, no, I absolutely insist on using av_crc. The init function can handle any byte-length CRC method as its done here. ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH 1/8] sbc: implement SBC decoder (low-complexity subband codec)
This was originally based on libsbc, and was fully integrated into ffmpeg. --- doc/general.texi | 2 + libavcodec/Makefile | 2 + libavcodec/allcodecs.c | 2 + libavcodec/avcodec.h | 2 + libavcodec/codec_desc.c | 14 ++ libavcodec/sbc.c | 316 libavcodec/sbc.h | 118 libavcodec/sbcdec.c | 464 +++ libavcodec/sbcdec_data.c | 127 + libavcodec/sbcdec_data.h | 44 + 10 files changed, 1091 insertions(+) create mode 100644 libavcodec/sbc.c create mode 100644 libavcodec/sbc.h create mode 100644 libavcodec/sbcdec.c create mode 100644 libavcodec/sbcdec_data.c create mode 100644 libavcodec/sbcdec_data.h diff --git a/doc/general.texi b/doc/general.texi index 26919c9287..ed137f999f 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -1102,6 +1102,8 @@ following image formats are supported: @tab Real low bitrate AC-3 codec @item RealAudio Lossless @tab @tab X @item RealAudio SIPR / ACELP.NET @tab @tab X +@item SBC (low-complexity subband codec) @tab @tab X +@tab Used in Bluetooth A2DP @item Shorten@tab @tab X @item Sierra VMD audio @tab @tab X @tab Used in Sierra VMD files. diff --git a/libavcodec/Makefile b/libavcodec/Makefile index ca72138c02..c46d102227 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -581,6 +581,8 @@ OBJS-$(CONFIG_SUBVIEWER_DECODER) += subviewerdec.o ass.o OBJS-$(CONFIG_SUNRAST_DECODER) += sunrast.o OBJS-$(CONFIG_SUNRAST_ENCODER) += sunrastenc.o OBJS-$(CONFIG_LIBRSVG_DECODER) += librsvgdec.o +OBJS-$(CONFIG_SBC_DECODER) += sbcdec.o sbcdec_data.o sbc.o +OBJS-$(CONFIG_MSBC_DECODER)+= sbcdec.o sbcdec_data.o sbc.o OBJS-$(CONFIG_SVQ1_DECODER)+= svq1dec.o svq1.o svq13.o h263data.o OBJS-$(CONFIG_SVQ1_ENCODER)+= svq1enc.o svq1.o h263data.o \ h263.o ituh263enc.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index ed1e7ab06e..9e2480d2d4 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -379,6 +379,7 @@ static void register_all(void) REGISTER_DECODER(MP3ON4FLOAT, mp3on4float); REGISTER_DECODER(MPC7, mpc7); REGISTER_DECODER(MPC8, mpc8); +REGISTER_DECODER(MSBC, msbc); REGISTER_ENCDEC (NELLYMOSER,nellymoser); REGISTER_DECODER(ON2AVC,on2avc); REGISTER_ENCDEC (OPUS, opus); @@ -392,6 +393,7 @@ static void register_all(void) REGISTER_DECODER(SHORTEN, shorten); REGISTER_DECODER(SIPR, sipr); REGISTER_DECODER(SMACKAUD, smackaud); +REGISTER_DECODER(SBC, sbc); REGISTER_ENCDEC (SONIC, sonic); REGISTER_ENCODER(SONIC_LS, sonic_ls); REGISTER_DECODER(TAK, tak); diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index ce089b7c4a..5b7ec8541d 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -634,6 +634,8 @@ enum AVCodecID { AV_CODEC_ID_ATRAC3PAL, AV_CODEC_ID_DOLBY_E, AV_CODEC_ID_APTX, +AV_CODEC_ID_SBC, +AV_CODEC_ID_MSBC, /* subtitle codecs */ AV_CODEC_ID_FIRST_SUBTITLE = 0x17000, ///< A dummy ID pointing at the start of subtitle codecs. diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index c3688de1d6..a69897d379 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -2866,6 +2866,20 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("aptX (Audio Processing Technology for Bluetooth)"), .props = AV_CODEC_PROP_LOSSY, }, +{ +.id= AV_CODEC_ID_SBC, +.type = AVMEDIA_TYPE_AUDIO, +.name = "sbc", +.long_name = NULL_IF_CONFIG_SMALL("SBC (low-complexity subband codec)"), +.props = AV_CODEC_PROP_LOSSY, +}, +{ +.id= AV_CODEC_ID_MSBC, +.type = AVMEDIA_TYPE_AUDIO, +.name = "msbc", +.long_name = NULL_IF_CONFIG_SMALL("mSBC (wideband speech mono SBC)"), +.props = AV_CODEC_PROP_LOSSY, +}, /* subtitle codecs */ { diff --git a/libavcodec/sbc.c b/libavcodec/sbc.c new file mode 100644 index 00..99d02cc56a --- /dev/null +++ b/libavcodec/sbc.c @@ -0,0 +1,316 @@ +/* + * Bluetooth low-complexity, subband codec (SBC) + * + * Copyright (C) 2017 Aurelien Jacobs + * Copyright (C) 2012-2013 Intel Corporation + * Copyright (C) 2008-2010 Nokia Corporation + * Copyright (C) 2004-2010 Marcel Holtmann + * Copyright (C) 2004-2005 Henryk Ploetz + * Copyright (C) 2005-2008 Brad Midgley + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the ter