X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fsbcenc.c;h=47a136e4e5fd42645584f7997e690e882e7df931;hb=1ab3ae6fd5b1866aa42cfc0c5d79700adb7281d8;hp=a0064c0e8c722bf74000ea0108883220a1e9e864;hpb=0dc11d8bbd470db89fbc17b7434e992c9129b310;p=ffmpeg diff --git a/libavcodec/sbcenc.c b/libavcodec/sbcenc.c index a0064c0e8c7..47a136e4e5f 100644 --- a/libavcodec/sbcenc.c +++ b/libavcodec/sbcenc.c @@ -30,7 +30,6 @@ * SBC encoder implementation */ -#include #include "libavutil/opt.h" #include "avcodec.h" #include "internal.h" @@ -95,7 +94,7 @@ static int sbc_analyze_audio(SBCDSPContext *s, struct sbc_frame *frame) * Returns the length of the packed frame. */ static size_t sbc_pack_frame(AVPacket *avpkt, struct sbc_frame *frame, - int joint, bool msbc) + int joint, int msbc) { PutBitContext pb; @@ -156,7 +155,7 @@ static size_t sbc_pack_frame(AVPacket *avpkt, struct sbc_frame *frame, if (crc_pos % 8) crc_header[crc_pos >> 3] <<= 8 - (crc_pos % 8); - avpkt->data[3] = sbc_crc8(frame->crc_ctx, crc_header, crc_pos); + avpkt->data[3] = ff_sbc_crc8(frame->crc_ctx, crc_header, crc_pos); ff_sbc_calculate_bits(frame, bits); @@ -331,6 +330,7 @@ static const AVOption options[] = { OFFSET(max_delay), AV_OPT_TYPE_DURATION, {.i64 = 13000}, 1000,13000, AE }, { "msbc", "use mSBC mode (wideband speech mono SBC)", OFFSET(msbc), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, AE }, + FF_AVCTX_PROFILE_OPTION("msbc", NULL, AUDIO, FF_PROFILE_SBC_MSBC) { NULL }, };