vlc | branch: master | Francois Cartegnie <[email protected]> | Wed Feb 20 14:30:44 2019 +0100| [631306e469a4671dff24834ca07ebfe0bb1f6f0a] | committer: Francois Cartegnie
packetizer: mpeg4audio: update AOT defines > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=631306e469a4671dff24834ca07ebfe0bb1f6f0a --- modules/packetizer/mpeg4audio.h | 55 +++++++++++++++++++++++++++++++---------- 1 file changed, 42 insertions(+), 13 deletions(-) diff --git a/modules/packetizer/mpeg4audio.h b/modules/packetizer/mpeg4audio.h index 361c4e516f..f97c0d5eea 100644 --- a/modules/packetizer/mpeg4audio.h +++ b/modules/packetizer/mpeg4audio.h @@ -17,20 +17,49 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -enum +enum mpeg4_audioObjectType /* ISO/IEC 14496-3:2009 1.5.1 */ { - AOT_AAC_MAIN = 1, - AOT_AAC_LC, - AOT_AAC_SSR, - AOT_AAC_LTP, - AOT_AAC_SBR, - AOT_AAC_SC, - AOT_ER_AAC_LC = 17, - AOT_ER_AAC_LTP = 19, - AOT_ER_AAC_SC = 20, - AOT_ER_AAC_LD = 23, - AOT_AAC_PS = 29, - AOT_ER_AAC_ELD = 39, + AOT_AAC_MAIN = 1, + AOT_AAC_LC = 2, + AOT_AAC_SSR = 3, + AOT_AAC_LTP = 4, + AOT_AAC_SBR = 5, + AOT_AAC_SC = 6, + AOT_TWINVQ = 7, + AOT_CELP = 8, + AOT_HVXC = 9, + AOT_RESERVED10 = 10, + AOT_RESERVED11 = 11, + AOT_TTSI = 12, + AOT_MAIN_SYNTHETIC = 13, + AOT_WAVETABLES = 14, + AOT_GENERAL_MIDI = 15, + AOT_ALGORITHMIC = 16, + AOT_ER_AAC_LC = 17, + AOT_RESERVED18 = 18, + AOT_ER_AAC_LTP = 19, + AOT_ER_AAC_SC = 20, + AOT_ER_TWINVQ = 21, + AOT_ER_BSAC = 22, + AOT_ER_AAC_LD = 23, + AOT_ER_CELP = 24, + AOT_ER_HXVC = 25, + AOT_ER_HILN = 26, + AOT_ER_Parametric = 27, + AOT_SSC = 28, + AOT_AAC_PS = 29, + AOT_MPEG_SURROUND = 30, + AOT_ESCAPE = 31, + AOT_LAYER1 = 32, + AOT_LAYER2 = 33, + AOT_LAYER3 = 34, + AOT_DST = 35, + AOT_ALS = 36, + AOT_SLS = 37, + AOT_SLS_NON_CORE = 38, + AOT_ER_AAC_ELD = 39, + AOT_SMR_SIMPLE = 40, + AOT_SMR_MAIN = 41, }; enum _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
