ff_swb_offset_* tables should be const.

[ffmpeg] / libavcodec / mpeg4audio.h

diff --git a/libavcodec/mpeg4audio.h b/libavcodec/mpeg4audio.h
index b149362f0e478143e9d80d31370e735bdace32aa..98cddad2b100ba6501425339aac8793cf98bc8c4 100644 (file)
--- a/libavcodec/mpeg4audio.h
+++ b/libavcodec/mpeg4audio.h
@@ -23,6 +23,8 @@
 #define AVCODEC_MPEG4AUDIO_H
 
 #include <stdint.h>
+#include "get_bits.h"
+#include "put_bits.h"
 
 typedef struct {
     int object_type;
@@ -77,7 +79,7 @@ enum AudioObjectType {
     AOT_SSC,                   ///< N                       SinuSoidal Coding
     AOT_PS,                    ///< N                       Parametric Stereo
     AOT_SURROUND,              ///< N                       MPEG Surround
-    AOT_ESCAPE,                ///< N                       Escape Value
+    AOT_ESCAPE,                ///< Y                       Escape Value
     AOT_L1,                    ///< Y                       Layer 1
     AOT_L2,                    ///< Y                       Layer 2
     AOT_L3,                    ///< Y                       Layer 3
@@ -88,6 +90,14 @@ enum AudioObjectType {
     AOT_ER_AAC_ELD,            ///< N                       Error Resilient Enhanced Low Delay
     AOT_SMR_SIMPLE,            ///< N                       Symbolic Music Representation Simple
     AOT_SMR_MAIN,              ///< N                       Symbolic Music Representation Main
+    AOT_USAC_NOSBR,            ///< N                       Unified Speech and Audio Coding (no SBR)
+    AOT_SAOC,                  ///< N                       Spatial Audio Object Coding
+    AOT_USAC             = 45, ///< N                       Unified Speech and Audio Coding
 };
 
+#define MAX_PCE_SIZE 304 ///<Maximum size of a PCE including the 3-bit ID_PCE
+                         ///<marker and the comment
+
+int ff_copy_pce_data(PutBitContext *pb, GetBitContext *gb);
+
 #endif /* AVCODEC_MPEG4AUDIO_H */