X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fcodec2utils.h;h=6812ae895ca25459608f6c45938fd84ec1d74681;hb=6e30b35b85b81c802e52a1078ec7a3097e353c6d;hp=e9b1f84d84d9df49e91910553a0b2b4bff2990bf;hpb=3916af4d95835d74d347ca640c7b7ee17b38f529;p=ffmpeg diff --git a/libavcodec/codec2utils.h b/libavcodec/codec2utils.h index e9b1f84d84d..6812ae895ca 100644 --- a/libavcodec/codec2utils.h +++ b/libavcodec/codec2utils.h @@ -45,20 +45,6 @@ { "700B", "700B", 0, AV_OPT_TYPE_CONST, {.i64 = 7}, .flags=option_flags, .unit="codec2_mode"},\ { "700C", "700C", 0, AV_OPT_TYPE_CONST, {.i64 = 8}, .flags=option_flags, .unit="codec2_mode"} -//The three following functions are here to avoid needing libavformat/codec2.c to depend on libcodec2 - -//Computes bitrate from mode, with frames rounded up to the nearest octet. -//So 700 bit/s (28 bits/frame) becomes 800 bits/s (32 bits/frame). -//logctx is used for av_log() -//Returns <0 if mode is invalid -int avpriv_codec2_mode_bit_rate(void *logctx, int mode); - -//Mimics codec2_samples_per_frame() -int avpriv_codec2_mode_frame_size(void *logctx, int mode); - -//Mimics (codec2_bits_per_frame()+7)/8 -int avpriv_codec2_mode_block_align(void *logctx, int mode); - #define CODEC2_EXTRADATA_SIZE 4 //Used in codec2raw demuxer and libcodec2 encoder @@ -70,11 +56,6 @@ static inline void codec2_make_extradata(uint8_t *ptr, int mode) { ptr[3] = 0; //flags } -//Returns version as a 16-bit value. 0.8 -> 0x0008 -static inline uint16_t codec2_version_from_extradata(uint8_t *ptr) { - return (ptr[0] << 8) + ptr[1]; -} - static inline uint8_t codec2_mode_from_extradata(uint8_t *ptr) { return ptr[2]; }