X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fsbcenc.c;h=33de8edab4f9913d675e7703f26a6251b57e98e0;hb=6e30b35b85b81c802e52a1078ec7a3097e353c6d;hp=e2929e22ac52e91fc42458cbf2fd7df3a455ed1a;hpb=4dc1f06f0c84ebbd8b26cd77679450903244a3e8;p=ffmpeg diff --git a/libavcodec/sbcenc.c b/libavcodec/sbcenc.c index e2929e22ac5..33de8edab4f 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; @@ -189,7 +188,7 @@ static size_t sbc_pack_frame(AVPacket *avpkt, struct sbc_frame *frame, flush_put_bits(&pb); - return (put_bits_count(&pb) + 7) / 8; + return put_bytes_output(&pb); } static int sbc_encode_init(AVCodecContext *avctx) @@ -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 }, };