X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=libavcodec%2Fcodec2utils.h;h=37f0693dc7705e2b85f2516c0403d898f7a6ffb2;hb=159bcb19b9482a98652ded9eee2751e9de0e9d0f;hp=6def4d4aa3958508997b8d9c6458e21b5f6668ee;hpb=a2ae381b5a6f50669bcbd37001c110567a61f446;p=ffmpeg

diff --git a/libavcodec/codec2utils.h b/libavcodec/codec2utils.h
index 6def4d4aa39..37f0693dc77 100644
--- a/libavcodec/codec2utils.h
+++ b/libavcodec/codec2utils.h
@@ -24,17 +24,19 @@
 
 #include <stdint.h>
 
+#include "version.h"
+
 //Highest mode we're willing to use.
 //Don't want to let users accidentally produce files that can't be decoded in the future.
 //CODEC2_MODE_WB (9) is experimental/unstable as of 2017-11-23.
-#define AVPRIV_CODEC2_MODE_MAX 8 //CODEC2_MODE_700C
+#define CODEC2_MODE_MAX 8 //CODEC2_MODE_700C
 
 //Used by both codec2raw demuxer and libcodec2 encoder.
 //The integers match the values in codec2.h, so "3200" -> CODEC2_MODE_3000 = 0 and so on.
 //It is possible that we're linked to a version of libcodec2 that lacks some of these modes.
 //For example Debian stretch ships with libcodec2.so.0.4 which lacks CODEC2_MODE_700C.
-#define AVPRIV_CODEC2_AVOPTIONS(desc, classname, min_val, default_val, option_flags) \
-    { "mode", desc, offsetof(classname, mode), AV_OPT_TYPE_INT, {.i64 = default_val}, min_val, AVPRIV_CODEC2_MODE_MAX, .flags=option_flags, .unit="codec2_mode"},\
+#define CODEC2_AVOPTIONS(desc, classname, min_val, default_val, option_flags) \
+    { "mode", desc, offsetof(classname, mode), AV_OPT_TYPE_INT, {.i64 = default_val}, min_val, CODEC2_MODE_MAX, .flags=option_flags, .unit="codec2_mode"},\
     { "3200", "3200", 0, AV_OPT_TYPE_CONST, {.i64 = 0}, .flags=option_flags, .unit="codec2_mode"},\
     { "2400", "2400", 0, AV_OPT_TYPE_CONST, {.i64 = 1}, .flags=option_flags, .unit="codec2_mode"},\
     { "1600", "1600", 0, AV_OPT_TYPE_CONST, {.i64 = 2}, .flags=option_flags, .unit="codec2_mode"},\
@@ -45,6 +47,7 @@
     { "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"}
 
+#if LIBAVCODEC_VERSION_MAJOR < 59
 //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.
@@ -58,11 +61,12 @@ 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);
+#endif
 
-#define AVPRIV_CODEC2_EXTRADATA_SIZE 4
+#define CODEC2_EXTRADATA_SIZE 4
 
 //Used in codec2raw demuxer and libcodec2 encoder
-static inline void avpriv_codec2_make_extradata(uint8_t *ptr, int mode) {
+static inline void codec2_make_extradata(uint8_t *ptr, int mode) {
     //version 0.8 as of 2017-12-23 (r3386)
     ptr[0] = 0;     //major
     ptr[1] = 8;     //minor
@@ -70,12 +74,7 @@ static inline void avpriv_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 avpriv_codec2_version_from_extradata(uint8_t *ptr) {
-    return (ptr[0] << 8) + ptr[1];
-}
-
-static inline uint8_t avpriv_codec2_mode_from_extradata(uint8_t *ptr) {
+static inline uint8_t codec2_mode_from_extradata(uint8_t *ptr) {
     return ptr[2];
 }