Mercurial > libavcodec.hg

comparison ac3tab.c @ 10191:54b6170a608b libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update AC-3 channel map. 2F/2R layout only has 4 channels. This correction does not change any current channel mapping behavior.
author jbr
date Sat, 19 Sep 2009 04:56:22 +0000
parents ba5d9a97ab2f
children 7dd2a45249a9
comparison
equal deleted inserted replaced
10190:1b1ac77dee05 10191:54b6170a608b
106 * Table to remap channels from SMPTE order to AC-3 order. 106 * Table to remap channels from SMPTE order to AC-3 order.
107 * [channel_mode][lfe][ch] 107 * [channel_mode][lfe][ch]
108 */ 108 */
109 const uint8_t ff_ac3_enc_channel_map[8][2][6] = { 109 const uint8_t ff_ac3_enc_channel_map[8][2][6] = {
110 COMMON_CHANNEL_MAP 110 COMMON_CHANNEL_MAP
111 { { 0, 1, 2, 3, 4, }, { 0, 1, 3, 4, 2, } }, 111 { { 0, 1, 2, 3, }, { 0, 1, 3, 4, 2, } },
112 { { 0, 2, 1, 3, 4, }, { 0, 2, 1, 4, 5, 3 } }, 112 { { 0, 2, 1, 3, 4, }, { 0, 2, 1, 4, 5, 3 } },
113 }; 113 };
114 114
115 /** 115 /**
116 * Table to remap channels from from AC-3 order to SMPTE order. 116 * Table to remap channels from from AC-3 order to SMPTE order.
117 * [channel_mode][lfe][ch] 117 * [channel_mode][lfe][ch]
118 */ 118 */
119 const uint8_t ff_ac3_dec_channel_map[8][2][6] = { 119 const uint8_t ff_ac3_dec_channel_map[8][2][6] = {
120 COMMON_CHANNEL_MAP 120 COMMON_CHANNEL_MAP
121 { { 0, 1, 2, 3, 4, }, { 0, 1, 4, 2, 3, } }, 121 { { 0, 1, 2, 3, }, { 0, 1, 4, 2, 3, } },
122 { { 0, 2, 1, 3, 4, }, { 0, 2, 1, 5, 3, 4 } }, 122 { { 0, 2, 1, 3, 4, }, { 0, 2, 1, 5, 3, 4 } },
123 }; 123 };
124 124
125 /* possible frequencies */ 125 /* possible frequencies */
126 const uint16_t ff_ac3_sample_rate_tab[3] = { 48000, 44100, 32000 }; 126 const uint16_t ff_ac3_sample_rate_tab[3] = { 48000, 44100, 32000 };