| @@ -45,7 +45,66 @@ const AVChannelLayout ff_iamf_scalable_ch_layouts[10] = { · 44 unmodified lines |
| 45 | 45 | AV_CHANNEL_LAYOUT_BINAURAL, |
| 46 | 46 | }; |
| 47 | 47 | |
| 48 | | −const struct IAMFSoundSystemMap ff_iamf_sound_system_map[13] = { |
| 48 | +const AVChannelLayout ff_iamf_expanded_scalable_ch_layouts[13] = { |
| 49 | + { |
| 50 | + .nb_channels = 1, |
| 51 | + .order = AV_CHANNEL_ORDER_NATIVE, |
| 52 | + .u.mask = AV_CH_LOW_FREQUENCY, |
| 53 | + }, |
| 54 | + { |
| 55 | + .nb_channels = 2, |
| 56 | + .order = AV_CHANNEL_ORDER_NATIVE, |
| 57 | + .u.mask = AV_CH_SIDE_LEFT | AV_CH_SIDE_RIGHT, |
| 58 | + }, |
| 59 | + { |
| 60 | + .nb_channels = 2, |
| 61 | + .order = AV_CHANNEL_ORDER_NATIVE, |
| 62 | + .u.mask = AV_CH_SIDE_LEFT | AV_CH_SIDE_RIGHT, |
| 63 | + }, |
| 64 | + { |
| 65 | + .nb_channels = 2, |
| 66 | + .order = AV_CHANNEL_ORDER_NATIVE, |
| 67 | + .u.mask = AV_CH_BACK_LEFT | AV_CH_BACK_RIGHT, |
| 68 | + }, |
| 69 | + { |
| 70 | + .nb_channels = 2, |
| 71 | + .order = AV_CHANNEL_ORDER_NATIVE, |
| 72 | + .u.mask = AV_CH_TOP_FRONT_LEFT | AV_CH_TOP_FRONT_RIGHT, |
| 73 | + }, |
| 74 | + { |
| 75 | + .nb_channels = 2, |
| 76 | + .order = AV_CHANNEL_ORDER_NATIVE, |
| 77 | + .u.mask = AV_CH_TOP_BACK_LEFT | AV_CH_TOP_BACK_RIGHT, |
| 78 | + }, |
| 79 | + { |
| 80 | + .nb_channels = 4, |
| 81 | + .order = AV_CHANNEL_ORDER_NATIVE, |
| 82 | + .u.mask = AV_CH_TOP_FRONT_LEFT | AV_CH_TOP_FRONT_RIGHT | |
| 83 | + AV_CH_TOP_BACK_LEFT | AV_CH_TOP_BACK_RIGHT, |
| 84 | + }, |
| 85 | + AV_CHANNEL_LAYOUT_SURROUND, |
| 86 | + AV_CHANNEL_LAYOUT_9POINT1POINT6, |
| 87 | + AV_CHANNEL_LAYOUT_STEREO, |
| 88 | + { |
| 89 | + .nb_channels = 2, |
| 90 | + .order = AV_CHANNEL_ORDER_NATIVE, |
| 91 | + .u.mask = AV_CH_SIDE_LEFT | AV_CH_SIDE_RIGHT, |
| 92 | + }, |
| 93 | + { |
| 94 | + .nb_channels = 2, |
| 95 | + .order = AV_CHANNEL_ORDER_NATIVE, |
| 96 | + .u.mask = AV_CH_TOP_SIDE_LEFT | AV_CH_TOP_SIDE_RIGHT, |
| 97 | + }, |
| 98 | + { |
| 99 | + .nb_channels = 6, |
| 100 | + .order = AV_CHANNEL_ORDER_NATIVE, |
| 101 | + .u.mask = AV_CH_TOP_FRONT_LEFT | AV_CH_TOP_FRONT_RIGHT | |
| 102 | + AV_CH_TOP_BACK_LEFT | AV_CH_TOP_BACK_RIGHT | |
| 103 | + AV_CH_TOP_SIDE_LEFT | AV_CH_TOP_SIDE_RIGHT, |
| 104 | + }, |
| 105 | +}; |
| 106 | + |
| 107 | +const struct IAMFSoundSystemMap ff_iamf_sound_system_map[14] = { |
| 49 | 108 | { SOUND_SYSTEM_A_0_2_0, AV_CHANNEL_LAYOUT_STEREO }, |
| 50 | 109 | { SOUND_SYSTEM_B_0_5_0, AV_CHANNEL_LAYOUT_5POINT1_BACK }, |
| 51 | 110 | { SOUND_SYSTEM_C_2_5_0, AV_CHANNEL_LAYOUT_5POINT1POINT2_BACK }, |
| @@ -65,6 +124,7 @@ const struct IAMFSoundSystemMap ff_iamf_sound_system_map[13] = { · 13 unmodified lines |
| 65 | 124 | { SOUND_SYSTEM_10_2_7_0, AV_CHANNEL_LAYOUT_7POINT1POINT2 }, |
| 66 | 125 | { SOUND_SYSTEM_11_2_3_0, AV_CHANNEL_LAYOUT_3POINT1POINT2 }, |
| 67 | 126 | { SOUND_SYSTEM_12_0_1_0, AV_CHANNEL_LAYOUT_MONO }, |
| 127 | + { SOUND_SYSTEM_13_9_1_6, AV_CHANNEL_LAYOUT_9POINT1POINT6 }, |
| 68 | 128 | }; |
| 69 | 129 | |
| 70 | 130 | void ff_iamf_free_audio_element(IAMFAudioElement **paudio_element) |