Author: alexc
Date: Fri Jun 12 21:24:59 2009
New Revision: 4439
Log:
Sync aac.h with trunk
Modified:
aacenc/aac.h
Modified: aacenc/aac.h
==============================================================================
--- aacenc/aac.h Fri Jun 12 12:52:01 2009 (r4438)
+++ aacenc/aac.h Fri Jun 12 21:24:59 2009 (r4439)
@@ -21,7 +21,7 @@
*/
/**
- * @file aac.h
+ * @file libavcodec/aac.h
* AAC definitions and structures
* @author Oded Shimon ( ods15 ods15 dyndns org )
* @author Maxim Gavrilov ( maxim.gavrilov gmail com )
@@ -47,36 +47,6 @@
#define TNS_MAX_ORDER 20
-enum AudioObjectType {
- AOT_NULL,
- // Support? Name
- AOT_AAC_MAIN, ///< Y Main
- AOT_AAC_LC, ///< Y Low Complexity
- AOT_AAC_SSR, ///< N (code in SoC repo) Scalable Sample
Rate
- AOT_AAC_LTP, ///< N (code in SoC repo) Long Term
Prediction
- AOT_SBR, ///< N (in progress) Spectral Band
Replication
- AOT_AAC_SCALABLE, ///< N Scalable
- AOT_TWINVQ, ///< N Twin Vector
Quantizer
- AOT_CELP, ///< N Code Excited
Linear Prediction
- AOT_HVXC, ///< N Harmonic Vector
eXcitation Coding
- AOT_TTSI = 12, ///< N Text-To-Speech
Interface
- AOT_MAINSYNTH, ///< N Main Synthesis
- AOT_WAVESYNTH, ///< N Wavetable Synthesis
- AOT_MIDI, ///< N General MIDI
- AOT_SAFX, ///< N Algorithmic
Synthesis and Audio Effects
- AOT_ER_AAC_LC, ///< N Error Resilient
Low Complexity
- AOT_ER_AAC_LTP = 19, ///< N Error Resilient
Long Term Prediction
- AOT_ER_AAC_SCALABLE, ///< N Error Resilient
Scalable
- AOT_ER_TWINVQ, ///< N Error Resilient
Twin Vector Quantizer
- AOT_ER_BSAC, ///< N Error Resilient
Bit-Sliced Arithmetic Coding
- AOT_ER_AAC_LD, ///< N Error Resilient
Low Delay
- AOT_ER_CELP, ///< N Error Resilient
Code Excited Linear Prediction
- AOT_ER_HVXC, ///< N Error Resilient
Harmonic Vector eXcitation Coding
- AOT_ER_HILN, ///< N Error Resilient
Harmonic and Individual Lines plus Noise
- AOT_ER_PARAM, ///< N Error Resilient
Parametric
- AOT_SSC, ///< N SinuSoidal Coding
-};
-
enum RawDataBlockType {
TYPE_SCE,
TYPE_CPE,
@@ -266,13 +236,15 @@ typedef struct {
DynamicRangeControl che_drc;
/**
- * @defgroup elements
+ * @defgroup elements Channel element related data.
* @{
*/
enum ChannelPosition che_pos[4][MAX_ELEM_ID]; /**< channel element channel
mapping with the
* first index as the
first 4 raw data block types
*/
ChannelElement * che[4][MAX_ELEM_ID];
+ ChannelElement * tag_che_map[4][MAX_ELEM_ID];
+ int tags_mapped;
/** @} */
/**
_______________________________________________
FFmpeg-soc mailing list
[email protected]
https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-soc
