Remove all files and functions which are not going to be reused, and disable all functions and FATE tests temporarily which will be.
Showing the changes to libavcodec/dcadata.c (1 of 29 files). Show all
Unified · Split
| @@ -22,7 +22,6 @@ · 21 unmodified lines | ||
| 22 | 22 | |
| 23 | 23 | #include <stdint.h> |
| 24 | 24 | |
| 25 | −#include "libavutil/channel_layout.h" | |
| 26 | 25 | #include "libavutil/mem.h" |
| 27 | 26 | |
| 28 | 27 | #include "dca.h" |
| @@ -7509,76 +7508,6 @@ DECLARE_ALIGNED(16, const float, ff_dca_lfe_fir_128)[256] = { · 7480 unmodified lines | ||
| 7509 | 7508 | }; |
| 7510 | 7509 | #undef SCALE |
| 7511 | 7510 | |
| 7512 | − | |
| 7513 | −#define SCALE(c) ((float)(c) / (256.0f * 32768.0f * 8388608.0f)) | |
| 7514 | −DECLARE_ALIGNED(16, const float, ff_dca_lfe_xll_fir_64)[256] = { | |
| 7515 | − SCALE( 6103), SCALE( 52170), SCALE(-558064), SCALE(1592440), | |
| 7516 | − SCALE(6290049), SCALE(1502534), SCALE(-546669), SCALE( 53047), | |
| 7517 | − SCALE( 1930), SCALE( 51089), SCALE(-568920), SCALE(1683709), | |
| 7518 | − SCALE(6286575), SCALE(1414057), SCALE(-534782), SCALE( 53729), | |
| 7519 | − SCALE( 2228), SCALE( 49794), SCALE(-579194), SCALE(1776276), | |
| 7520 | − SCALE(6279634), SCALE(1327070), SCALE(-522445), SCALE( 54228), | |
| 7521 | − SCALE( 2552), SCALE( 48275), SCALE(-588839), SCALE(1870070), | |
| 7522 | − SCALE(6269231), SCALE(1241632), SCALE(-509702), SCALE( 54550), | |
| 7523 | − SCALE( 2904), SCALE( 46523), SCALE(-597808), SCALE(1965017), | |
| 7524 | − SCALE(6255380), SCALE(1157798), SCALE(-496595), SCALE( 54708), | |
| 7525 | − SCALE( 3287), SCALE( 44529), SCALE(-606054), SCALE(2061044), | |
| 7526 | − SCALE(6238099), SCALE(1075621), SCALE(-483164), SCALE( 54710), | |
| 7527 | − SCALE( 3704), SCALE( 42282), SCALE(-613529), SCALE(2158071), | |
| 7528 | − SCALE(6217408), SCALE( 995149), SCALE(-469451), SCALE( 54566), | |
| 7529 | − SCALE( 4152), SCALE( 39774), SCALE(-620186), SCALE(2256019), | |
| 7530 | − SCALE(6193332), SCALE( 916430), SCALE(-455494), SCALE( 54285), | |
| 7531 | − SCALE( 4631), SCALE( 36995), SCALE(-625976), SCALE(2354805), | |
| 7532 | − SCALE(6165900), SCALE( 839507), SCALE(-441330), SCALE( 53876), | |
| 7533 | − SCALE( 5139), SCALE( 33937), SCALE(-630850), SCALE(2454343), | |
| 7534 | − SCALE(6135146), SCALE( 764419), SCALE(-426998), SCALE( 53348), | |
| 7535 | − SCALE( 5682), SCALE( 30591), SCALE(-634759), SCALE(2554547), | |
| 7536 | − SCALE(6101107), SCALE( 691203), SCALE(-412531), SCALE( 52711), | |
| 7537 | − SCALE( 6264), SCALE( 26948), SCALE(-637655), SCALE(2655326), | |
| 7538 | − SCALE(6063824), SCALE( 619894), SCALE(-397966), SCALE( 51972), | |
| 7539 | − SCALE( 6886), SCALE( 23001), SCALE(-639488), SCALE(2756591), | |
| 7540 | − SCALE(6023343), SCALE( 550521), SCALE(-383335), SCALE( 51140), | |
| 7541 | − SCALE( 7531), SCALE( 18741), SCALE(-640210), SCALE(2858248), | |
| 7542 | − SCALE(5979711), SCALE( 483113), SCALE(-368671), SCALE( 50224), | |
| 7543 | − SCALE( 8230), SCALE( 14162), SCALE(-639772), SCALE(2960201), | |
| 7544 | − SCALE(5932981), SCALE( 417692), SCALE(-354003), SCALE( 49231), | |
| 7545 | − SCALE( 8959), SCALE( 9257), SCALE(-638125), SCALE(3062355), | |
| 7546 | − SCALE(5883210), SCALE( 354281), SCALE(-339362), SCALE( 48168), | |
| 7547 | − SCALE( 9727), SCALE( 4018), SCALE(-635222), SCALE(3164612), | |
| 7548 | − SCALE(5830457), SCALE( 292897), SCALE(-324777), SCALE( 47044), | |
| 7549 | − SCALE( 10535), SCALE( -1558), SCALE(-631014), SCALE(3266872), | |
| 7550 | − SCALE(5774785), SCALE( 233555), SCALE(-310273), SCALE( 45866), | |
| 7551 | − SCALE( 11381), SCALE( -7480), SCALE(-625455), SCALE(3369035), | |
| 7552 | − SCALE(5716260), SCALE( 176267), SCALE(-295877), SCALE( 44640), | |
| 7553 | − SCALE( 12267), SCALE( -13750), SCALE(-618499), SCALE(3471000), | |
| 7554 | − SCALE(5654952), SCALE( 121042), SCALE(-281613), SCALE( 43373), | |
| 7555 | − SCALE( 13190), SCALE( -20372), SCALE(-610098), SCALE(3572664), | |
| 7556 | − SCALE(5590933), SCALE( 67886), SCALE(-267505), SCALE( 42072), | |
| 7557 | − SCALE( 14152), SCALE( -27352), SCALE(-600209), SCALE(3673924), | |
| 7558 | − SCALE(5524280), SCALE( 16800), SCALE(-253574), SCALE( 40743), | |
| 7559 | − SCALE( 15153), SCALE( -34691), SCALE(-588788), SCALE(3774676), | |
| 7560 | − SCALE(5455069), SCALE( -32214), SCALE(-239840), SCALE( 39391), | |
| 7561 | − SCALE( 16192), SCALE( -42390), SCALE(-575791), SCALE(3874816), | |
| 7562 | − SCALE(5383383), SCALE( -79159), SCALE(-226323), SCALE( 38022), | |
| 7563 | − SCALE( 17267), SCALE( -50453), SCALE(-561178), SCALE(3974239), | |
| 7564 | − SCALE(5309305), SCALE(-124041), SCALE(-213041), SCALE( 36642), | |
| 7565 | − SCALE( 18377), SCALE( -58879), SCALE(-544906), SCALE(4072841), | |
| 7566 | − SCALE(5232922), SCALE(-166869), SCALE(-200010), SCALE( 35256), | |
| 7567 | − SCALE( 19525), SCALE( -67667), SCALE(-526937), SCALE(4170517), | |
| 7568 | − SCALE(5154321), SCALE(-207653), SCALE(-187246), SCALE( 33866), | |
| 7569 | − SCALE( 20704), SCALE( -76817), SCALE(-507233), SCALE(4267162), | |
| 7570 | − SCALE(5073593), SCALE(-246406), SCALE(-174764), SCALE( 32480), | |
| 7571 | − SCALE( 21915), SCALE( -86327), SCALE(-485757), SCALE(4362672), | |
| 7572 | − SCALE(4990831), SCALE(-283146), SCALE(-162575), SCALE( 31101), | |
| 7573 | − SCALE( 23157), SCALE( -96193), SCALE(-462476), SCALE(4456942), | |
| 7574 | − SCALE(4906129), SCALE(-317890), SCALE(-150692), SCALE( 29732), | |
| 7575 | − SCALE( 24426), SCALE(-106412), SCALE(-437356), SCALE(4549871), | |
| 7576 | − SCALE(4819584), SCALE(-350658), SCALE(-139125), SCALE( 28376), | |
| 7577 | − SCALE( 25721), SCALE(-116977), SCALE(-410365), SCALE(4641355), | |
| 7578 | − SCALE(4731293), SCALE(-381475), SCALE(-127884), SCALE( 27038), | |
| 7579 | −}; | |
| 7580 | −#undef SCALE | |
| 7581 | − | |
| 7582 | 7511 | DECLARE_ALIGNED(16, const float, ff_dca_fir_64bands)[1024] = { |
| 7583 | 7512 | /* Bank 0 */ |
| 7584 | 7513 | -7.1279389866041690e-8, -7.0950903150874990e-8, |
| @@ -8178,220 +8107,11 @@ const uint32_t ff_dca_inv_dmixtable[FF_DCA_INV_DMIXTABLE_SIZE] = { · 593 unmodified lines | ||
| 8178 | 8107 | 65536, |
| 8179 | 8108 | }; |
| 8180 | 8109 | |
| 8181 | −const float ff_dca_default_coeffs[10][6][2] = { | |
| 8182 | − { { 0.707107, 0.707107 }, { 0.000000, 0.000000 }, }, // A [LFE] | |
| 8183 | − { { 1.000000, 0.000000 }, { 0.000000, 1.000000 }, { 0.000000, 0.000000 }, }, // A + B (dual mono) [LFE] | |
| 8184 | − { { 1.000000, 0.000000 }, { 0.000000, 1.000000 }, { 0.000000, 0.000000 }, }, // L + R (stereo) [LFE] | |
| 8185 | − { { 1.000000, 0.000000 }, { 0.000000, 1.000000 }, { 0.000000, 0.000000 }, }, // (L+R) + (L-R) (sum-difference) [LFE] | |
| 8186 | − { { 1.000000, 0.000000 }, { 0.000000, 1.000000 }, { 0.000000, 0.000000 }, }, // LT + RT (left and right total) [LFE] | |
| 8187 | − { { 0.501187, 0.501187 }, { 0.707107, 0.000000 }, { 0.000000, 0.707107 }, { 0.000000, 0.000000 }, }, // C + L + R [LFE] | |
| 8188 | − { { 0.707107, 0.000000 }, { 0.000000, 0.707107 }, { 0.501187, 0.501187 }, { 0.000000, 0.000000 }, }, // L + R + S [LFE] | |
| 8189 | − { { 0.501187, 0.501187 }, { 0.707107, 0.000000 }, { 0.000000, 0.707107 }, { 0.501187, 0.501187 }, { 0.000000, 0.000000 }, }, // C + L + R + S [LFE] | |
| 8190 | − { { 0.707107, 0.000000 }, { 0.000000, 0.707107 }, { 0.501187, 0.000000 }, { 0.000000, 0.501187 }, { 0.000000, 0.000000 }, }, // L + R + SL + SR [LFE] | |
| 8191 | − { { 0.501187, 0.501187 }, { 0.707107, 0.000000 }, { 0.000000, 0.707107 }, { 0.501187, 0.000000 }, { 0.000000, 0.501187 }, { 0.000000, 0.000000 }, }, // C + L + R + SL + SR [LFE] | |
| 8192 | −}; | |
| 8193 | − | |
| 8194 | 8110 | const int32_t ff_dca_sampling_freqs[16] = { |
| 8195 | 8111 | 8000, 16000, 32000, 64000, 128000, 22050, 44100, 88200, |
| 8196 | 8112 | 176400, 352800, 12000, 24000, 48000, 96000, 192000, 384000, |
| 8197 | 8113 | }; |
| 8198 | 8114 | |
| 8199 | −/* downmix coeffs | |
| 8200 | − * | |
| 8201 | − * TABLE 9 | |
| 8202 | − * ______________________________________ | |
| 8203 | − * Down-mix coefficients for 8-channel source | |
| 8204 | − * audio (5 + 3 format) | |
| 8205 | − * lt | |
| 8206 | − * cen- rt lt ctr rt | |
| 8207 | − * lt ter ctr center | |
| 8208 | − * rt srd srd srd | |
| 8209 | − * ______________________________________ | |
| 8210 | − * 1 0.71 0.74 1.0 0.71 0.71 0.58 0.58 0.58 | |
| 8211 | − * 2 left 1.0 0.89 0.71 0.46 0.71 0.50 | |
| 8212 | − * rt 0.45 0.71 0.89 1.0 0.50 0.71 | |
| 8213 | − * 3 lt 1.0 0.89 0.71 0.45 | |
| 8214 | − * rt 0.45 0.71 0.89 1.0 | |
| 8215 | − * srd 0.71 0.71 0.71 | |
| 8216 | − * 4 lt 1.0 0.89 0.71 0.45 | |
| 8217 | − * rt 0.45 0.71 0.89 1.0 | |
| 8218 | − * lt srd 1.0 0.71 | |
| 8219 | − * rt srd 0.71 0.71 | |
| 8220 | − * 4 lt 1.0 0.5 | |
| 8221 | − * ctr 0.87 1.0 0.87 | |
| 8222 | − * rt 0.5 1.0 | |
| 8223 | − * srd 0.71 0.71 0.71 | |
| 8224 | − * 5 lt 1.0 0.5 | |
| 8225 | − * ctr 0.87 1.0 0.87 | |
| 8226 | − * rt 0.5 1.0 | |
| 8227 | − * lt srd 1.0 0.71 | |
| 8228 | − * rt srd 0.71 1.0 | |
| 8229 | − * 6 lt 1.0 0.5 | |
| 8230 | − * lt ctr 0.87 0.71 | |
| 8231 | − * rt ctr 0.71 0.87 | |
| 8232 | − * rt 0.5 1.0 | |
| 8233 | − * lt srd 1.0 0.71 | |
| 8234 | − * rt srd 0.71 1.0 | |
| 8235 | − * 6 lt 1.0 0.5 | |
| 8236 | − * ctr 0.86 1.0 0.86 | |
| 8237 | − * rt 0.5 1.0 | |
| 8238 | − * lt srd 1.0 | |
| 8239 | − * ctr srd 1.0 | |
| 8240 | − * rt srd 1.0 | |
| 8241 | − * 7 lt 1.0 | |
| 8242 | − * lt ctr 1.0 | |
| 8243 | − * ctr 1.0 | |
| 8244 | − * rt ctr 1.0 | |
| 8245 | − * rt 1.0 | |
| 8246 | − * lt srd 1.0 0.71 | |
| 8247 | − * rt srd 0.71 1.0 | |
| 8248 | − * 7 lt 1.0 0.5 | |
| 8249 | − * lt ctr 0.87 0.71 | |
| 8250 | − * rt ctr 0.71 0.87 | |
| 8251 | − * rt 0.5 1.0 | |
| 8252 | − * lt srd 1.0 | |
| 8253 | − * ctr srd 1.0 | |
| 8254 | − * rt srd 1.0 | |
| 8255 | − * 8 lt 1.0 0.5 | |
| 8256 | − * lt ctr 0.87 0.71 | |
| 8257 | − * rt ctr 0.71 0.87 | |
| 8258 | − * rt 0.5 1.0 | |
| 8259 | − * lt 1 srd 0.87 0.35 | |
| 8260 | − * lt 2 srd 0.5 0.61 | |
| 8261 | − * rt 2 srd 0.61 0.50 | |
| 8262 | − * rt 2 srd 0.35 0.87 | |
| 8263 | − * | |
| 8264 | − * Generation of Lt Rt | |
| 8265 | − * | |
| 8266 | − * In the case when the playback system has analog or digital surround | |
| 8267 | − * multi-channel capability, a down matrix from 5, 4, or 3 channel to | |
| 8268 | − * Lt Rt may be desirable. In the case when the number of decoded audio | |
| 8269 | − * channels exceeds 5, 4 or 3 respectively a first stage down mix to 5, | |
| 8270 | − * 4 or 3 chs should be used as described above. | |
| 8271 | − * | |
| 8272 | − * The down matrixing equations for 5-channel source audio to a | |
| 8273 | − * two-channel Lt Rt playback system are given by: | |
| 8274 | − * | |
| 8275 | − * Left = left + 0.7 * center - 0.7 * (lt surround + rt surround) | |
| 8276 | − * | |
| 8277 | − * Right = right + 0.7 * center + 0.7 * (lt surround + rt surround) | |
| 8278 | − * | |
| 8279 | − * Embedded mixing to 2-channel | |
| 8280 | − * | |
| 8281 | − * One concern arising from the proliferation of multi-channel audio | |
| 8282 | − * systems is that most home systems presently have only two channel | |
| 8283 | − * playback capability. To accommodate this a fixed 2-channel down | |
| 8284 | − * matrix processes is commonly used following the multi-channel | |
| 8285 | − * decoding stage. However, for music only applications the image | |
| 8286 | − * quality etc. of the down matrixed signal may not match that of an | |
| 8287 | − * equivalent stereo recording found on CD. | |
| 8288 | − * | |
| 8289 | − * The concept of embedded mixing is to allow the producer to | |
| 8290 | − * dynamically specify the matrixing coefficients within the audio | |
| 8291 | − * frame itself. In this way the stereo down mix at the decoder may be | |
| 8292 | − * better matched to a 2-channel playback environment. | |
| 8293 | − * | |
| 8294 | − * CHS*2, 7-bit down mix indexes (MCOEFFS) are transmitted along with | |
| 8295 | − * the multi-channel audio once in every frame. The indexes are | |
| 8296 | − * converted to attenuation factors using a 7 bit LUT. The 2-ch down | |
| 8297 | − * mix equations are as follows, | |
| 8298 | − * | |
| 8299 | − * Left Ch = sum (MCOEFF[n] * Ch[n]) for n=1, CHS | |
| 8300 | − * | |
| 8301 | − * Right Ch = sum (MCOEFF[n + CHS] * Ch[n]) for n=1, CHS | |
| 8302 | − * | |
| 8303 | − * where Ch(n) represents the subband samples in the (n)th audio channel. | |
| 8304 | − */ | |
| 8305 | − | |
| 8306 | −const uint32_t ff_dca_map_xxch_to_native[28] = { | |
| 8307 | − AV_CH_FRONT_CENTER, | |
| 8308 | − AV_CH_FRONT_LEFT, | |
| 8309 | − AV_CH_FRONT_RIGHT, | |
| 8310 | − AV_CH_SIDE_LEFT, | |
| 8311 | − AV_CH_SIDE_RIGHT, | |
| 8312 | − AV_CH_LOW_FREQUENCY, | |
| 8313 | − AV_CH_BACK_CENTER, | |
| 8314 | − AV_CH_BACK_LEFT, | |
| 8315 | − AV_CH_BACK_RIGHT, | |
| 8316 | − AV_CH_SIDE_LEFT, /* side surround left -- dup sur side L */ | |
| 8317 | − AV_CH_SIDE_RIGHT, /* side surround right -- dup sur side R */ | |
| 8318 | − AV_CH_FRONT_LEFT_OF_CENTER, | |
| 8319 | − AV_CH_FRONT_RIGHT_OF_CENTER, | |
| 8320 | − AV_CH_TOP_FRONT_LEFT, | |
| 8321 | − AV_CH_TOP_FRONT_CENTER, | |
| 8322 | − AV_CH_TOP_FRONT_RIGHT, | |
| 8323 | − AV_CH_LOW_FREQUENCY, /* lfe2 -- duplicate lfe1 position */ | |
| 8324 | − AV_CH_FRONT_LEFT_OF_CENTER, /* side front left -- dup front cntr L */ | |
| 8325 | − AV_CH_FRONT_RIGHT_OF_CENTER,/* side front right -- dup front cntr R */ | |
| 8326 | − AV_CH_TOP_CENTER, /* overhead */ | |
| 8327 | − AV_CH_TOP_FRONT_LEFT, /* side high left -- dup */ | |
| 8328 | − AV_CH_TOP_FRONT_RIGHT, /* side high right -- dup */ | |
| 8329 | − AV_CH_TOP_BACK_CENTER, | |
| 8330 | − AV_CH_TOP_BACK_LEFT, | |
| 8331 | − AV_CH_TOP_BACK_RIGHT, | |
| 8332 | − AV_CH_BACK_CENTER, /* rear low center -- dup */ | |
| 8333 | − AV_CH_BACK_LEFT, /* rear low left -- dup */ | |
| 8334 | − AV_CH_BACK_RIGHT /* read low right -- dup */ | |
| 8335 | −}; | |
| 8336 | − | |
| 8337 | −/* -1 are reserved or unknown */ | |
| 8338 | −const int ff_dca_ext_audio_descr_mask[8] = { | |
| 8339 | − DCA_EXT_XCH, | |
| 8340 | − -1, | |
| 8341 | − DCA_EXT_X96, | |
| 8342 | − DCA_EXT_XCH | DCA_EXT_X96, | |
| 8343 | − -1, | |
| 8344 | − -1, | |
| 8345 | − DCA_EXT_XXCH, | |
| 8346 | − -1, | |
| 8347 | −}; | |
| 8348 | − | |
| 8349 | −/* Tables for mapping dts channel configurations to libavcodec multichannel api. | |
| 8350 | − * Some compromises have been made for special configurations. Most configurations | |
| 8351 | − * are never used so complete accuracy is not needed. | |
| 8352 | − * | |
| 8353 | − * L = left, R = right, C = center, S = surround, F = front, R = rear, T = total, OV = overhead. | |
| 8354 | − * S -> side, when both rear and back are configured move one of them to the side channel | |
| 8355 | − * OV -> center back | |
| 8356 | − * All 2 channel configurations -> AV_CH_LAYOUT_STEREO | |
| 8357 | − */ | |
| 8358 | −const uint64_t ff_dca_core_channel_layout[16] = { | |
| 8359 | − AV_CH_FRONT_CENTER, ///< 1, A | |
| 8360 | − AV_CH_LAYOUT_STEREO, ///< 2, A + B (dual mono) | |
| 8361 | − AV_CH_LAYOUT_STEREO, ///< 2, L + R (stereo) | |
| 8362 | − AV_CH_LAYOUT_STEREO, ///< 2, (L + R) + (L - R) (sum-difference) | |
| 8363 | − AV_CH_LAYOUT_STEREO, ///< 2, LT + RT (left and right total) | |
| 8364 | − AV_CH_LAYOUT_STEREO | AV_CH_FRONT_CENTER, ///< 3, C + L + R | |
| 8365 | − AV_CH_LAYOUT_STEREO | AV_CH_BACK_CENTER, ///< 3, L + R + S | |
| 8366 | − AV_CH_LAYOUT_STEREO | AV_CH_FRONT_CENTER | AV_CH_BACK_CENTER, ///< 4, C + L + R + S | |
| 8367 | − AV_CH_LAYOUT_STEREO | AV_CH_SIDE_LEFT | AV_CH_SIDE_RIGHT, ///< 4, L + R + SL + SR | |
| 8368 | − | |
| 8369 | − AV_CH_LAYOUT_STEREO | AV_CH_FRONT_CENTER | AV_CH_SIDE_LEFT | | |
| 8370 | − AV_CH_SIDE_RIGHT, ///< 5, C + L + R + SL + SR | |
| 8371 | − | |
| 8372 | − AV_CH_LAYOUT_STEREO | AV_CH_SIDE_LEFT | AV_CH_SIDE_RIGHT | | |
| 8373 | − AV_CH_FRONT_LEFT_OF_CENTER | AV_CH_FRONT_RIGHT_OF_CENTER, ///< 6, CL + CR + L + R + SL + SR | |
| 8374 | − | |
| 8375 | − AV_CH_LAYOUT_STEREO | AV_CH_BACK_LEFT | AV_CH_BACK_RIGHT | | |
| 8376 | − AV_CH_FRONT_CENTER | AV_CH_BACK_CENTER, ///< 6, C + L + R + LR + RR + OV | |
| 8377 | − | |
| 8378 | − AV_CH_FRONT_CENTER | AV_CH_FRONT_RIGHT_OF_CENTER | | |
| 8379 | − AV_CH_FRONT_LEFT_OF_CENTER | AV_CH_BACK_CENTER | | |
| 8380 | − AV_CH_BACK_LEFT | AV_CH_BACK_RIGHT, ///< 6, CF + CR + LF + RF + LR + RR | |
| 8381 | − | |
| 8382 | − AV_CH_FRONT_LEFT_OF_CENTER | AV_CH_FRONT_CENTER | | |
| 8383 | − AV_CH_FRONT_RIGHT_OF_CENTER | AV_CH_LAYOUT_STEREO | | |
| 8384 | − AV_CH_SIDE_LEFT | AV_CH_SIDE_RIGHT, ///< 7, CL + C + CR + L + R + SL + SR | |
| 8385 | − | |
| 8386 | − AV_CH_FRONT_LEFT_OF_CENTER | AV_CH_FRONT_RIGHT_OF_CENTER | | |
| 8387 | − AV_CH_LAYOUT_STEREO | AV_CH_SIDE_LEFT | AV_CH_SIDE_RIGHT | | |
| 8388 | − AV_CH_BACK_LEFT | AV_CH_BACK_RIGHT, ///< 8, CL + CR + L + R + SL1 + SL2 + SR1 + SR2 | |
| 8389 | − | |
| 8390 | − AV_CH_FRONT_LEFT_OF_CENTER | AV_CH_FRONT_CENTER | | |
| 8391 | − AV_CH_FRONT_RIGHT_OF_CENTER | AV_CH_LAYOUT_STEREO | | |
| 8392 | − AV_CH_SIDE_LEFT | AV_CH_BACK_CENTER | AV_CH_SIDE_RIGHT, ///< 8, CL + C + CR + L + R + SL + S + SR | |
| 8393 | −}; | |
| 8394 | − | |
| 8395 | 8115 | const int8_t ff_dca_lfe_index[16] = { |
| 8396 | 8116 | 1, 2, 2, 2, 2, 3, 2, 3, 2, 3, 2, 3, 1, 3, 2, 3 |
| 8397 | 8117 | }; |
| @@ -8415,25 +8135,6 @@ const int8_t ff_dca_channel_reorder_lfe[16][9] = { · 17 unmodified lines | ||
| 8415 | 8135 | { 4, 2, 5, 0, 1, 6, 8, 7, -1 }, |
| 8416 | 8136 | }; |
| 8417 | 8137 | |
| 8418 | −const int8_t ff_dca_channel_reorder_lfe_xch[16][9] = { | |
| 8419 | − { 0, 2, -1, -1, -1, -1, -1, -1, -1 }, | |
| 8420 | − { 0, 1, 3, -1, -1, -1, -1, -1, -1 }, | |
| 8421 | − { 0, 1, 3, -1, -1, -1, -1, -1, -1 }, | |
| 8422 | − { 0, 1, 3, -1, -1, -1, -1, -1, -1 }, | |
| 8423 | − { 0, 1, 3, -1, -1, -1, -1, -1, -1 }, | |
| 8424 | − { 2, 0, 1, 4, -1, -1, -1, -1, -1 }, | |
| 8425 | − { 0, 1, 3, 4, -1, -1, -1, -1, -1 }, | |
| 8426 | − { 2, 0, 1, 4, 5, -1, -1, -1, -1 }, | |
| 8427 | − { 0, 1, 4, 5, 3, -1, -1, -1, -1 }, | |
| 8428 | − { 2, 0, 1, 5, 6, 4, -1, -1, -1 }, | |
| 8429 | − { 3, 4, 0, 1, 6, 7, 5, -1, -1 }, | |
| 8430 | − { 2, 0, 1, 4, 5, 6, 7, -1, -1 }, | |
| 8431 | − { 0, 6, 4, 5, 2, 3, 7, -1, -1 }, | |
| 8432 | − { 4, 2, 5, 0, 1, 7, 8, 6, -1 }, | |
| 8433 | − { 5, 6, 0, 1, 8, 3, 9, 4, 7 }, | |
| 8434 | − { 4, 2, 5, 0, 1, 6, 9, 8, 7 }, | |
| 8435 | −}; | |
| 8436 | − | |
| 8437 | 8138 | const int8_t ff_dca_channel_reorder_nolfe[16][9] = { |
| 8438 | 8139 | { 0, -1, -1, -1, -1, -1, -1, -1, -1 }, |
| 8439 | 8140 | { 0, 1, -1, -1, -1, -1, -1, -1, -1 }, |
| @@ -8453,25 +8154,6 @@ const int8_t ff_dca_channel_reorder_nolfe[16][9] = { · 13 unmodified lines | ||
| 8453 | 8154 | { 3, 2, 4, 0, 1, 5, 7, 6, -1 }, |
| 8454 | 8155 | }; |
| 8455 | 8156 | |
| 8456 | −const int8_t ff_dca_channel_reorder_nolfe_xch[16][9] = { | |
| 8457 | − { 0, 1, -1, -1, -1, -1, -1, -1, -1 }, | |
| 8458 | − { 0, 1, 2, -1, -1, -1, -1, -1, -1 }, | |
| 8459 | − { 0, 1, 2, -1, -1, -1, -1, -1, -1 }, | |
| 8460 | − { 0, 1, 2, -1, -1, -1, -1, -1, -1 }, | |
| 8461 | − { 0, 1, 2, -1, -1, -1, -1, -1, -1 }, | |
| 8462 | − { 2, 0, 1, 3, -1, -1, -1, -1, -1 }, | |
| 8463 | − { 0, 1, 2, 3, -1, -1, -1, -1, -1 }, | |
| 8464 | − { 2, 0, 1, 3, 4, -1, -1, -1, -1 }, | |
| 8465 | − { 0, 1, 3, 4, 2, -1, -1, -1, -1 }, | |
| 8466 | − { 2, 0, 1, 4, 5, 3, -1, -1, -1 }, | |
| 8467 | − { 2, 3, 0, 1, 5, 6, 4, -1, -1 }, | |
| 8468 | − { 2, 0, 1, 3, 4, 5, 6, -1, -1 }, | |
| 8469 | − { 0, 5, 3, 4, 1, 2, 6, -1, -1 }, | |
| 8470 | − { 3, 2, 4, 0, 1, 6, 7, 5, -1 }, | |
| 8471 | − { 4, 5, 0, 1, 7, 2, 8, 3, 6 }, | |
| 8472 | − { 3, 2, 4, 0, 1, 5, 8, 7, 6 }, | |
| 8473 | −}; | |
| 8474 | − | |
| 8475 | 8157 | const uint16_t ff_dca_vlc_offs[63] = { |
| 8476 | 8158 | 0, 512, 640, 768, 1282, 1794, 2436, 3080, 3770, 4454, 5364, |
| 8477 | 8159 | 5372, 5380, 5388, 5392, 5396, 5412, 5420, 5428, 5460, 5492, 5508, |