This makes it far easier to figure out which AOT belongs to which profile. Also, explicitly highlight the holes.
Unified · Split
| @@ -68,49 +68,51 @@ int avpriv_mpeg4audio_get_config2(MPEG4AudioConfig *c, const uint8_t *buf, · 67 unmodified lines | |||
| 68 | int size, int sync_extension, void *logctx); | 68 | int size, int sync_extension, void *logctx); |
| 69 | 69 | ||
| 70 | enum AudioObjectType { | 70 | enum AudioObjectType { |
| 71 | AOT_NULL, | 71 | AOT_NULL = 0, |
| 72 | // Support? Name | 72 | // Support? Name |
| 73 | AOT_AAC_MAIN, ///< Y Main | 73 | AOT_AAC_MAIN = 1, ///< Y Main |
| 74 | AOT_AAC_LC, ///< Y Low Complexity | 74 | AOT_AAC_LC = 2, ///< Y Low Complexity |
| 75 | AOT_AAC_SSR, ///< N (code in SoC repo) Scalable Sample Rate | 75 | AOT_AAC_SSR = 3, ///< N (code in SoC repo) Scalable Sample Rate |
| 76 | AOT_AAC_LTP, ///< Y Long Term Prediction | 76 | AOT_AAC_LTP = 4, ///< Y Long Term Prediction |
| 77 | AOT_SBR, ///< Y Spectral Band Replication | 77 | AOT_SBR = 5, ///< Y Spectral Band Replication |
| 78 | AOT_AAC_SCALABLE, ///< N Scalable | 78 | AOT_AAC_SCALABLE = 6, ///< N Scalable |
| 79 | AOT_TWINVQ, ///< N Twin Vector Quantizer | 79 | AOT_TWINVQ = 7, ///< N Twin Vector Quantizer |
| 80 | AOT_CELP, ///< N Code Excited Linear Prediction | 80 | AOT_CELP = 8, ///< N Code Excited Linear Prediction |
| 81 | AOT_HVXC, ///< N Harmonic Vector eXcitation Coding | 81 | AOT_HVXC = 9, ///< N Harmonic Vector eXcitation Coding |
| 82 | |||
| 82 | AOT_TTSI = 12, ///< N Text-To-Speech Interface | 83 | AOT_TTSI = 12, ///< N Text-To-Speech Interface |
| 83 | AOT_MAINSYNTH, ///< N Main Synthesis | 84 | AOT_MAINSYNTH = 13, ///< N Main Synthesis |
| 84 | AOT_WAVESYNTH, ///< N Wavetable Synthesis | 85 | AOT_WAVESYNTH = 14, ///< N Wavetable Synthesis |
| 85 | AOT_MIDI, ///< N General MIDI | 86 | AOT_MIDI = 15, ///< N General MIDI |
| 86 | AOT_SAFX, ///< N Algorithmic Synthesis and Audio Effects | 87 | AOT_SAFX = 16, ///< N Algorithmic Synthesis and Audio Effects |
| 87 | AOT_ER_AAC_LC, ///< N Error Resilient Low Complexity | 88 | AOT_ER_AAC_LC = 17, ///< N Error Resilient Low Complexity |
| 89 | |||
| 88 | AOT_ER_AAC_LTP = 19, ///< N Error Resilient Long Term Prediction | 90 | AOT_ER_AAC_LTP = 19, ///< N Error Resilient Long Term Prediction |
| 89 | AOT_ER_AAC_SCALABLE, ///< N Error Resilient Scalable | 91 | AOT_ER_AAC_SCALABLE = 20, ///< N Error Resilient Scalable |
| 90 | AOT_ER_TWINVQ, ///< N Error Resilient Twin Vector Quantizer | 92 | AOT_ER_TWINVQ = 21, ///< N Error Resilient Twin Vector Quantizer |
| 91 | AOT_ER_BSAC, ///< N Error Resilient Bit-Sliced Arithmetic Coding | 93 | AOT_ER_BSAC = 22, ///< N Error Resilient Bit-Sliced Arithmetic Coding |
| 92 | AOT_ER_AAC_LD, ///< N Error Resilient Low Delay | 94 | AOT_ER_AAC_LD = 23, ///< N Error Resilient Low Delay |
| 93 | AOT_ER_CELP, ///< N Error Resilient Code Excited Linear Prediction | 95 | AOT_ER_CELP = 24, ///< N Error Resilient Code Excited Linear Prediction |
| 94 | AOT_ER_HVXC, ///< N Error Resilient Harmonic Vector eXcitation Coding | 96 | AOT_ER_HVXC = 25, ///< N Error Resilient Harmonic Vector eXcitation Coding |
| 95 | AOT_ER_HILN, ///< N Error Resilient Harmonic and Individual Lines plus Noise | 97 | AOT_ER_HILN = 26, ///< N Error Resilient Harmonic and Individual Lines plus Noise |
| 96 | AOT_ER_PARAM, ///< N Error Resilient Parametric | 98 | AOT_ER_PARAM = 27, ///< N Error Resilient Parametric |
| 97 | AOT_SSC, ///< N SinuSoidal Coding | 99 | AOT_SSC = 28, ///< N SinuSoidal Coding |
| 98 | AOT_PS, ///< N Parametric Stereo | 100 | AOT_PS = 29, ///< N Parametric Stereo |
| 99 | AOT_SURROUND, ///< N MPEG Surround | 101 | AOT_SURROUND = 30, ///< N MPEG Surround |
| 100 | AOT_ESCAPE, ///< Y Escape Value | 102 | AOT_ESCAPE = 31, ///< Y Escape Value |
| 101 | AOT_L1, ///< Y Layer 1 | 103 | AOT_L1 = 32, ///< Y Layer 1 |
| 102 | AOT_L2, ///< Y Layer 2 | 104 | AOT_L2 = 33, ///< Y Layer 2 |
| 103 | AOT_L3, ///< Y Layer 3 | 105 | AOT_L3 = 34, ///< Y Layer 3 |
| 104 | AOT_DST, ///< N Direct Stream Transfer | 106 | AOT_DST = 35, ///< N Direct Stream Transfer |
| 105 | AOT_ALS, ///< Y Audio LosslesS | 107 | AOT_ALS = 36, ///< Y Audio LosslesS |
| 106 | AOT_SLS, ///< N Scalable LosslesS | 108 | AOT_SLS = 37, ///< N Scalable LosslesS |
| 107 | AOT_SLS_NON_CORE, ///< N Scalable LosslesS (non core) | 109 | AOT_SLS_NON_CORE = 38, ///< N Scalable LosslesS (non core) |
| 108 | AOT_ER_AAC_ELD, ///< N Error Resilient Enhanced Low Delay | 110 | AOT_ER_AAC_ELD = 39, ///< N Error Resilient Enhanced Low Delay |
| 109 | AOT_SMR_SIMPLE, ///< N Symbolic Music Representation Simple | 111 | AOT_SMR_SIMPLE = 40, ///< N Symbolic Music Representation Simple |
| 110 | AOT_SMR_MAIN, ///< N Symbolic Music Representation Main | 112 | AOT_SMR_MAIN = 41, ///< N Symbolic Music Representation Main |
| 111 | AOT_USAC, ///< Y Unified Speech and Audio Coding | 113 | AOT_USAC = 42, ///< Y Unified Speech and Audio Coding |
| 112 | AOT_SAOC, ///< N Spatial Audio Object Coding | 114 | AOT_SAOC = 43, ///< N Spatial Audio Object Coding |
| 113 | AOT_LD_SURROUND, ///< N Low Delay MPEG Surround | 115 | AOT_LD_SURROUND = 44, ///< N Low Delay MPEG Surround |
| 114 | }; | 116 | }; |
| 115 | 117 | ||
| 116 | #define MAX_PCE_SIZE 320 ///<Maximum size of a PCE including the 3-bit ID_PCE | 118 | #define MAX_PCE_SIZE 320 ///<Maximum size of a PCE including the 3-bit ID_PCE |