DCA core decoder no longer uses fixed tables for channel reordering. Move them into private encoder header (and drop ff_dca_ prefix).
Showing the changes to libavcodec/dcadata.c (1 of 4 files). Show all
Unified · Split
| @@ -8730,48 +8730,6 @@ const int32_t ff_dca_sampling_freqs[16] = { · 8729 unmodified lines | |||
| 8730 | 176400, 352800, 12000, 24000, 48000, 96000, 192000, 384000, | 8730 | 176400, 352800, 12000, 24000, 48000, 96000, 192000, 384000, |
| 8731 | }; | 8731 | }; |
| 8732 | 8732 | ||
| 8733 | const int8_t ff_dca_lfe_index[16] = { | ||
| 8734 | 1, 2, 2, 2, 2, 3, 2, 3, 2, 3, 2, 3, 1, 3, 2, 3 | ||
| 8735 | }; | ||
| 8736 | |||
| 8737 | const int8_t ff_dca_channel_reorder_lfe[16][9] = { | ||
| 8738 | { 0, -1, -1, -1, -1, -1, -1, -1, -1 }, | ||
| 8739 | { 0, 1, -1, -1, -1, -1, -1, -1, -1 }, | ||
| 8740 | { 0, 1, -1, -1, -1, -1, -1, -1, -1 }, | ||
| 8741 | { 0, 1, -1, -1, -1, -1, -1, -1, -1 }, | ||
| 8742 | { 0, 1, -1, -1, -1, -1, -1, -1, -1 }, | ||
| 8743 | { 2, 0, 1, -1, -1, -1, -1, -1, -1 }, | ||
| 8744 | { 0, 1, 3, -1, -1, -1, -1, -1, -1 }, | ||
| 8745 | { 2, 0, 1, 4, -1, -1, -1, -1, -1 }, | ||
| 8746 | { 0, 1, 3, 4, -1, -1, -1, -1, -1 }, | ||
| 8747 | { 2, 0, 1, 4, 5, -1, -1, -1, -1 }, | ||
| 8748 | { 3, 4, 0, 1, 5, 6, -1, -1, -1 }, | ||
| 8749 | { 2, 0, 1, 4, 5, 6, -1, -1, -1 }, | ||
| 8750 | { 0, 6, 4, 5, 2, 3, -1, -1, -1 }, | ||
| 8751 | { 4, 2, 5, 0, 1, 6, 7, -1, -1 }, | ||
| 8752 | { 5, 6, 0, 1, 7, 3, 8, 4, -1 }, | ||
| 8753 | { 4, 2, 5, 0, 1, 6, 8, 7, -1 }, | ||
| 8754 | }; | ||
| 8755 | |||
| 8756 | const int8_t ff_dca_channel_reorder_nolfe[16][9] = { | ||
| 8757 | { 0, -1, -1, -1, -1, -1, -1, -1, -1 }, | ||
| 8758 | { 0, 1, -1, -1, -1, -1, -1, -1, -1 }, | ||
| 8759 | { 0, 1, -1, -1, -1, -1, -1, -1, -1 }, | ||
| 8760 | { 0, 1, -1, -1, -1, -1, -1, -1, -1 }, | ||
| 8761 | { 0, 1, -1, -1, -1, -1, -1, -1, -1 }, | ||
| 8762 | { 2, 0, 1, -1, -1, -1, -1, -1, -1 }, | ||
| 8763 | { 0, 1, 2, -1, -1, -1, -1, -1, -1 }, | ||
| 8764 | { 2, 0, 1, 3, -1, -1, -1, -1, -1 }, | ||
| 8765 | { 0, 1, 2, 3, -1, -1, -1, -1, -1 }, | ||
| 8766 | { 2, 0, 1, 3, 4, -1, -1, -1, -1 }, | ||
| 8767 | { 2, 3, 0, 1, 4, 5, -1, -1, -1 }, | ||
| 8768 | { 2, 0, 1, 3, 4, 5, -1, -1, -1 }, | ||
| 8769 | { 0, 5, 3, 4, 1, 2, -1, -1, -1 }, | ||
| 8770 | { 3, 2, 4, 0, 1, 5, 6, -1, -1 }, | ||
| 8771 | { 4, 5, 0, 1, 6, 2, 7, 3, -1 }, | ||
| 8772 | { 3, 2, 4, 0, 1, 5, 7, 6, -1 }, | ||
| 8773 | }; | ||
| 8774 | |||
| 8775 | const uint16_t ff_dca_vlc_offs[63] = { | 8733 | const uint16_t ff_dca_vlc_offs[63] = { |
| 8776 | 0, 512, 640, 768, 1282, 1794, 2436, 3080, 3770, 4454, 5364, | 8734 | 0, 512, 640, 768, 1282, 1794, 2436, 3080, 3770, 4454, 5364, |
| 8777 | 5372, 5380, 5388, 5392, 5396, 5412, 5420, 5428, 5460, 5492, 5508, | 8735 | 5372, 5380, 5388, 5392, 5396, 5412, 5420, 5428, 5460, 5492, 5508, |