| OLD | NEW |
|---|
| 1 /* | 1 /* |
| 2 * MPEG-4 Audio common header | 2 * MPEG-4 Audio common header |
| 3 * Copyright (c) 2008 Baptiste Coudurier <baptiste.coudurier@free.fr> | 3 * Copyright (c) 2008 Baptiste Coudurier <baptiste.coudurier@free.fr> |
| 4 * | 4 * |
| 5 * This file is part of FFmpeg. | 5 * This file is part of FFmpeg. |
| 6 * | 6 * |
| 7 * FFmpeg is free software; you can redistribute it and/or | 7 * FFmpeg is free software; you can redistribute it and/or |
| 8 * modify it under the terms of the GNU Lesser General Public | 8 * modify it under the terms of the GNU Lesser General Public |
| 9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
| 10 * version 2.1 of the License, or (at your option) any later version. | 10 * version 2.1 of the License, or (at your option) any later version. |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 */ | 50 */ |
| 51 int ff_mpeg4audio_get_config(MPEG4AudioConfig *c, const uint8_t *buf, int buf_si
ze); | 51 int ff_mpeg4audio_get_config(MPEG4AudioConfig *c, const uint8_t *buf, int buf_si
ze); |
| 52 | 52 |
| 53 enum AudioObjectType { | 53 enum AudioObjectType { |
| 54 AOT_NULL, | 54 AOT_NULL, |
| 55 // Support? Name | 55 // Support? Name |
| 56 AOT_AAC_MAIN, ///< Y Main | 56 AOT_AAC_MAIN, ///< Y Main |
| 57 AOT_AAC_LC, ///< Y Low Complexity | 57 AOT_AAC_LC, ///< Y Low Complexity |
| 58 AOT_AAC_SSR, ///< N (code in SoC repo) Scalable Sample Rate | 58 AOT_AAC_SSR, ///< N (code in SoC repo) Scalable Sample Rate |
| 59 AOT_AAC_LTP, ///< N (code in SoC repo) Long Term Prediction | 59 AOT_AAC_LTP, ///< N (code in SoC repo) Long Term Prediction |
| 60 AOT_SBR, ///< N (in progress) Spectral Band Replic
ation | 60 AOT_SBR, ///< Y Spectral Band Replic
ation |
| 61 AOT_AAC_SCALABLE, ///< N Scalable | 61 AOT_AAC_SCALABLE, ///< N Scalable |
| 62 AOT_TWINVQ, ///< N Twin Vector Quantize
r | 62 AOT_TWINVQ, ///< N Twin Vector Quantize
r |
| 63 AOT_CELP, ///< N Code Excited Linear
Prediction | 63 AOT_CELP, ///< N Code Excited Linear
Prediction |
| 64 AOT_HVXC, ///< N Harmonic Vector eXci
tation Coding | 64 AOT_HVXC, ///< N Harmonic Vector eXci
tation Coding |
| 65 AOT_TTSI = 12, ///< N Text-To-Speech Inter
face | 65 AOT_TTSI = 12, ///< N Text-To-Speech Inter
face |
| 66 AOT_MAINSYNTH, ///< N Main Synthesis | 66 AOT_MAINSYNTH, ///< N Main Synthesis |
| 67 AOT_WAVESYNTH, ///< N Wavetable Synthesis | 67 AOT_WAVESYNTH, ///< N Wavetable Synthesis |
| 68 AOT_MIDI, ///< N General MIDI | 68 AOT_MIDI, ///< N General MIDI |
| 69 AOT_SAFX, ///< N Algorithmic Synthesi
s and Audio Effects | 69 AOT_SAFX, ///< N Algorithmic Synthesi
s and Audio Effects |
| 70 AOT_ER_AAC_LC, ///< N Error Resilient Low
Complexity | 70 AOT_ER_AAC_LC, ///< N Error Resilient Low
Complexity |
| (...skipping 25 matching lines...) Expand all Loading... |
| 96 AOT_LD_SURROUND, ///< N Low Delay MPEG Surro
und | 96 AOT_LD_SURROUND, ///< N Low Delay MPEG Surro
und |
| 97 AOT_USAC, ///< N Unified Speech and A
udio Coding | 97 AOT_USAC, ///< N Unified Speech and A
udio Coding |
| 98 }; | 98 }; |
| 99 | 99 |
| 100 #define MAX_PCE_SIZE 304 ///<Maximum size of a PCE including the 3-bit ID_PCE | 100 #define MAX_PCE_SIZE 304 ///<Maximum size of a PCE including the 3-bit ID_PCE |
| 101 ///<marker and the comment | 101 ///<marker and the comment |
| 102 | 102 |
| 103 int ff_copy_pce_data(PutBitContext *pb, GetBitContext *gb); | 103 int ff_copy_pce_data(PutBitContext *pb, GetBitContext *gb); |
| 104 | 104 |
| 105 #endif /* AVCODEC_MPEG4AUDIO_H */ | 105 #endif /* AVCODEC_MPEG4AUDIO_H */ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 789004:
ffmpeg roll of source to mar 9 version... (Closed)
Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/