* [FFmpeg-devel] [PATCH 1/3] avformat/mov_chan: use the newly added channel ids for more exact mapping
@ 2024-06-03 21:31 Marton Balint
2024-06-03 21:31 ` [FFmpeg-devel] [PATCH 2/3] avformat/mov_chan: make iso_channel_position table more compact Marton Balint
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Marton Balint @ 2024-06-03 21:31 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Marton Balint
Also make the iso_channel_position table consistent with what the AAC decoder
uses in avcodec/aac/aacdec_usac.c.
Fate changes are caused by the change of how 7.1 layout is mapped, previously
it included Side Surround channels, now it includes the Surround channels.
Signed-off-by: Marton Balint <cus@passwd.hu>
---
libavformat/mov_chan.c | 22 ++++++++--------------
tests/ref/fate/mov-mp4-pcm | 2 +-
2 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c
index 5ffacf64b5..53805c6a35 100644
--- a/libavformat/mov_chan.c
+++ b/libavformat/mov_chan.c
@@ -85,12 +85,8 @@ enum {
iso_Lc = AV_CHAN_FRONT_LEFT_OF_CENTER,
iso_Rc = AV_CHAN_FRONT_RIGHT_OF_CENTER,
iso_Cs = AV_CHAN_BACK_CENTER,
- /* Side and surround are not exactly the same, but in order to have
- * consistent 5.1/7.1 layouts we map them to the side channels. */
iso_Ls = AV_CHAN_SIDE_LEFT,
- iso_Lss = AV_CHAN_SIDE_LEFT,
iso_Rs = AV_CHAN_SIDE_RIGHT,
- iso_Rss = AV_CHAN_SIDE_RIGHT,
iso_Ts = AV_CHAN_TOP_CENTER,
iso_Lv = AV_CHAN_TOP_FRONT_LEFT,
iso_Cv = AV_CHAN_TOP_FRONT_CENTER,
@@ -110,6 +106,8 @@ enum {
iso_Cb = AV_CHAN_BOTTOM_FRONT_CENTER,
iso_Lb = AV_CHAN_BOTTOM_FRONT_LEFT,
iso_Rb = AV_CHAN_BOTTOM_FRONT_RIGHT,
+ iso_Lss = AV_CHAN_SIDE_SURROUND_LEFT,
+ iso_Rss = AV_CHAN_SIDE_SURROUND_RIGHT,
/* The following have no exact counterparts */
iso_Lvs = AV_CHAN_NONE,
iso_Rvs = AV_CHAN_NONE,
@@ -622,12 +620,10 @@ static const enum AVChannel iso_channel_position[] = {
AV_CHAN_LOW_FREQUENCY,
// 4: left surround
- // TODO
- AV_CHAN_NONE,
+ AV_CHAN_SIDE_LEFT,
// 5: right surround
- // TODO
- AV_CHAN_NONE,
+ AV_CHAN_SIDE_RIGHT,
// 6: left front centre
AV_CHAN_FRONT_LEFT_OF_CENTER,
@@ -651,10 +647,10 @@ static const enum AVChannel iso_channel_position[] = {
AV_CHAN_SURROUND_DIRECT_RIGHT,
// 13: left side surround
- AV_CHAN_SIDE_LEFT,
+ AV_CHAN_SIDE_SURROUND_LEFT,
// 14: right side surround
- AV_CHAN_SIDE_RIGHT,
+ AV_CHAN_SIDE_SURROUND_RIGHT,
// 15: left wide front
AV_CHAN_WIDE_LEFT,
@@ -702,12 +698,10 @@ static const enum AVChannel iso_channel_position[] = {
AV_CHAN_BOTTOM_FRONT_CENTER,
// 30: left vertical height surround
- // TODO
- AV_CHAN_NONE,
+ AV_CHAN_TOP_SURROUND_LEFT,
// 31: right vertical height surround
- // TODO
- AV_CHAN_NONE,
+ AV_CHAN_TOP_SURROUND_RIGHT,
// 32, 33, 34, 35, reserved
AV_CHAN_NONE,
diff --git a/tests/ref/fate/mov-mp4-pcm b/tests/ref/fate/mov-mp4-pcm
index 19a978df95..7cdca8629f 100644
--- a/tests/ref/fate/mov-mp4-pcm
+++ b/tests/ref/fate/mov-mp4-pcm
@@ -1,4 +1,4 @@
-462668dd69e7ce4fde4934d1d5978531 *tests/data/fate/mov-mp4-pcm.mp4
+0c6802135e9eb442201c0c1b001259d6 *tests/data/fate/mov-mp4-pcm.mp4
10587977 tests/data/fate/mov-mp4-pcm.mp4
#tb 0: 1/44100
#media_type 0: audio
--
2.35.3
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 4+ messages in thread
* [FFmpeg-devel] [PATCH 2/3] avformat/mov_chan: make iso_channel_position table more compact
2024-06-03 21:31 [FFmpeg-devel] [PATCH 1/3] avformat/mov_chan: use the newly added channel ids for more exact mapping Marton Balint
@ 2024-06-03 21:31 ` Marton Balint
2024-06-03 21:31 ` [FFmpeg-devel] [PATCH 3/3] avformat/mxfdec: use the newly added channel ids for more exact mapping Marton Balint
2024-06-10 19:23 ` [FFmpeg-devel] [PATCH 1/3] avformat/mov_chan: " Marton Balint
2 siblings, 0 replies; 4+ messages in thread
From: Marton Balint @ 2024-06-03 21:31 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Marton Balint
Signed-off-by: Marton Balint <cus@passwd.hu>
---
libavformat/mov_chan.c | 164 +++++++++++------------------------------
1 file changed, 45 insertions(+), 119 deletions(-)
diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c
index 53805c6a35..cc5b333129 100644
--- a/libavformat/mov_chan.c
+++ b/libavformat/mov_chan.c
@@ -607,125 +607,51 @@ out:
/* ISO/IEC 23001-8, table 8 */
static const enum AVChannel iso_channel_position[] = {
- // 0: left front
- AV_CHAN_FRONT_LEFT,
-
- // 1: right front
- AV_CHAN_FRONT_RIGHT,
-
- // 2: centre front
- AV_CHAN_FRONT_CENTER,
-
- // 3: low frequence enhancement
- AV_CHAN_LOW_FREQUENCY,
-
- // 4: left surround
- AV_CHAN_SIDE_LEFT,
-
- // 5: right surround
- AV_CHAN_SIDE_RIGHT,
-
- // 6: left front centre
- AV_CHAN_FRONT_LEFT_OF_CENTER,
-
- // 7: right front centre
- AV_CHAN_FRONT_RIGHT_OF_CENTER,
-
- // 8: rear surround left
- AV_CHAN_BACK_LEFT,
-
- // 9: rear surround right
- AV_CHAN_BACK_RIGHT,
-
- // 10: rear centre
- AV_CHAN_BACK_CENTER,
-
- // 11: left surround direct
- AV_CHAN_SURROUND_DIRECT_LEFT,
-
- // 12: right surround direct
- AV_CHAN_SURROUND_DIRECT_RIGHT,
-
- // 13: left side surround
- AV_CHAN_SIDE_SURROUND_LEFT,
-
- // 14: right side surround
- AV_CHAN_SIDE_SURROUND_RIGHT,
-
- // 15: left wide front
- AV_CHAN_WIDE_LEFT,
-
- // 16: right wide front
- AV_CHAN_WIDE_RIGHT,
-
- // 17: left front vertical height
- AV_CHAN_TOP_FRONT_LEFT,
-
- // 18: right front vertical height
- AV_CHAN_TOP_FRONT_RIGHT,
-
- // 19: centre front vertical height
- AV_CHAN_TOP_FRONT_CENTER,
-
- // 20: left surround vertical height rear
- AV_CHAN_TOP_BACK_LEFT,
-
- // 21: right surround vertical height rear
- AV_CHAN_TOP_BACK_RIGHT,
-
- // 22: centre vertical height rear
- AV_CHAN_TOP_BACK_CENTER,
-
- // 23: left vertical height side surround
- AV_CHAN_TOP_SIDE_LEFT,
-
- // 24: right vertical height side surround
- AV_CHAN_TOP_SIDE_RIGHT,
-
- // 25: top centre surround
- AV_CHAN_TOP_CENTER,
-
- // 26: low frequency enhancement 2
- AV_CHAN_LOW_FREQUENCY_2,
-
- // 27: left front vertical bottom
- AV_CHAN_BOTTOM_FRONT_LEFT,
-
- // 28: right front vertical bottom
- AV_CHAN_BOTTOM_FRONT_RIGHT,
-
- // 29: centre front vertical bottom
- AV_CHAN_BOTTOM_FRONT_CENTER,
-
- // 30: left vertical height surround
- AV_CHAN_TOP_SURROUND_LEFT,
-
- // 31: right vertical height surround
- AV_CHAN_TOP_SURROUND_RIGHT,
-
- // 32, 33, 34, 35, reserved
- AV_CHAN_NONE,
- AV_CHAN_NONE,
- AV_CHAN_NONE,
- AV_CHAN_NONE,
-
- // 36: low frequency enhancement 3
- AV_CHAN_NONE,
-
- // 37: left edge of screen
- AV_CHAN_NONE,
- // 38: right edge of screen
- AV_CHAN_NONE,
- // 39: half-way between centre of screen and left edge of screen
- AV_CHAN_NONE,
- // 40: half-way between centre of screen and right edge of screen
- AV_CHAN_NONE,
-
- // 41: left back surround
- AV_CHAN_NONE,
-
- // 42: right back surround
- AV_CHAN_NONE,
+ [0] = AV_CHAN_FRONT_LEFT, // left front
+ [1] = AV_CHAN_FRONT_RIGHT, // right front
+ [2] = AV_CHAN_FRONT_CENTER, // centre front
+ [3] = AV_CHAN_LOW_FREQUENCY, // low frequency enhancement
+ [4] = AV_CHAN_SIDE_LEFT, // left surround
+ [5] = AV_CHAN_SIDE_RIGHT, // right surround
+ [6] = AV_CHAN_FRONT_LEFT_OF_CENTER, // left front centre
+ [7] = AV_CHAN_FRONT_RIGHT_OF_CENTER, // right front centre
+ [8] = AV_CHAN_BACK_LEFT, // rear surround left
+ [9] = AV_CHAN_BACK_RIGHT, // rear surround right
+ [10] = AV_CHAN_BACK_CENTER, // rear centre
+ [11] = AV_CHAN_SURROUND_DIRECT_LEFT, // left surround direct
+ [12] = AV_CHAN_SURROUND_DIRECT_RIGHT, // right surround direct
+ [13] = AV_CHAN_SIDE_SURROUND_LEFT, // left side surround
+ [14] = AV_CHAN_SIDE_SURROUND_RIGHT, // right side surround
+ [15] = AV_CHAN_WIDE_LEFT, // left wide front
+ [16] = AV_CHAN_WIDE_RIGHT, // right wide front
+ [17] = AV_CHAN_TOP_FRONT_LEFT, // left front vertical height
+ [18] = AV_CHAN_TOP_FRONT_RIGHT, // right front vertical height
+ [19] = AV_CHAN_TOP_FRONT_CENTER, // centre front vertical height
+ [20] = AV_CHAN_TOP_BACK_LEFT, // left surround vertical height rear
+ [21] = AV_CHAN_TOP_BACK_RIGHT, // right surround vertical height rear
+ [22] = AV_CHAN_TOP_BACK_CENTER, // centre vertical height rear
+ [23] = AV_CHAN_TOP_SIDE_LEFT, // left vertical height side surround
+ [24] = AV_CHAN_TOP_SIDE_RIGHT, // right vertical height side surround
+ [25] = AV_CHAN_TOP_CENTER, // top centre surround
+ [26] = AV_CHAN_LOW_FREQUENCY_2, // low frequency enhancement 2
+ [27] = AV_CHAN_BOTTOM_FRONT_LEFT, // left front vertical bottom
+ [28] = AV_CHAN_BOTTOM_FRONT_RIGHT, // right front vertical bottom
+ [29] = AV_CHAN_BOTTOM_FRONT_CENTER, // centre front vertical bottom
+ [30] = AV_CHAN_TOP_SURROUND_LEFT, // left vertical height surround
+ [31] = AV_CHAN_TOP_SURROUND_RIGHT, // right vertical height surround
+
+ [32] = AV_CHAN_NONE, // reserved
+ [33] = AV_CHAN_NONE, // reserved
+ [34] = AV_CHAN_NONE, // reserved
+ [35] = AV_CHAN_NONE, // reserved
+
+ [36] = AV_CHAN_NONE, // low frequency enhancement 3
+ [37] = AV_CHAN_NONE, // left edge of screen
+ [38] = AV_CHAN_NONE, // right edge of screen
+ [39] = AV_CHAN_NONE, // half-way between centre of screen and left edge of screen
+ [40] = AV_CHAN_NONE, // half-way between centre of screen and right edge of screen
+ [41] = AV_CHAN_NONE, // left back surround
+ [42] = AV_CHAN_NONE, // right back surround
// 43 - 125: reserved
// 126: explicit position
--
2.35.3
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 4+ messages in thread
* [FFmpeg-devel] [PATCH 3/3] avformat/mxfdec: use the newly added channel ids for more exact mapping
2024-06-03 21:31 [FFmpeg-devel] [PATCH 1/3] avformat/mov_chan: use the newly added channel ids for more exact mapping Marton Balint
2024-06-03 21:31 ` [FFmpeg-devel] [PATCH 2/3] avformat/mov_chan: make iso_channel_position table more compact Marton Balint
@ 2024-06-03 21:31 ` Marton Balint
2024-06-10 19:23 ` [FFmpeg-devel] [PATCH 1/3] avformat/mov_chan: " Marton Balint
2 siblings, 0 replies; 4+ messages in thread
From: Marton Balint @ 2024-06-03 21:31 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Marton Balint
Signed-off-by: Marton Balint <cus@passwd.hu>
---
libavformat/mxfdec.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index e65cec74c2..78a3ec6b06 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -1668,8 +1668,8 @@ static const MXFChannelOrderingUL mxf_channel_ordering[] = {
{ { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0d,0x03,0x02,0x01,0x04,0x00,0x00,0x00,0x00 }, AV_CHAN_LOW_FREQUENCY, AV_AUDIO_SERVICE_TYPE_MAIN }, // Low Frequency Effects
{ { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0d,0x03,0x02,0x01,0x05,0x00,0x00,0x00,0x00 }, AV_CHAN_SIDE_LEFT, AV_AUDIO_SERVICE_TYPE_MAIN }, // Left Surround
{ { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0d,0x03,0x02,0x01,0x06,0x00,0x00,0x00,0x00 }, AV_CHAN_SIDE_RIGHT, AV_AUDIO_SERVICE_TYPE_MAIN }, // Right Surround
- { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0d,0x03,0x02,0x01,0x07,0x00,0x00,0x00,0x00 }, AV_CHAN_SIDE_LEFT, AV_AUDIO_SERVICE_TYPE_MAIN }, // Left Side Surround
- { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0d,0x03,0x02,0x01,0x08,0x00,0x00,0x00,0x00 }, AV_CHAN_SIDE_RIGHT, AV_AUDIO_SERVICE_TYPE_MAIN }, // Right Side Surround
+ { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0d,0x03,0x02,0x01,0x07,0x00,0x00,0x00,0x00 }, AV_CHAN_SIDE_SURROUND_LEFT, AV_AUDIO_SERVICE_TYPE_MAIN }, // Left Side Surround
+ { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0d,0x03,0x02,0x01,0x08,0x00,0x00,0x00,0x00 }, AV_CHAN_SIDE_SURROUND_RIGHT, AV_AUDIO_SERVICE_TYPE_MAIN }, // Right Side Surround
{ { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0d,0x03,0x02,0x01,0x09,0x00,0x00,0x00,0x00 }, AV_CHAN_BACK_LEFT, AV_AUDIO_SERVICE_TYPE_MAIN }, // Left Rear Surround
{ { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0d,0x03,0x02,0x01,0x0a,0x00,0x00,0x00,0x00 }, AV_CHAN_BACK_RIGHT, AV_AUDIO_SERVICE_TYPE_MAIN }, // Right Rear Surround
{ { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0d,0x03,0x02,0x01,0x0b,0x00,0x00,0x00,0x00 }, AV_CHAN_FRONT_LEFT_OF_CENTER, AV_AUDIO_SERVICE_TYPE_MAIN }, // Left Center
@@ -1682,8 +1682,8 @@ static const MXFChannelOrderingUL mxf_channel_ordering[] = {
{ { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0d,0x03,0x02,0x01,0x30,0x01,0x01,0x00,0x00 }, AV_CHAN_TOP_FRONT_LEFT, AV_AUDIO_SERVICE_TYPE_MAIN }, // Left Height
{ { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0d,0x03,0x02,0x01,0x30,0x01,0x02,0x00,0x00 }, AV_CHAN_TOP_FRONT_RIGHT, AV_AUDIO_SERVICE_TYPE_MAIN }, // Right Height
{ { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0d,0x03,0x02,0x01,0x30,0x01,0x03,0x00,0x00 }, AV_CHAN_TOP_FRONT_CENTER, AV_AUDIO_SERVICE_TYPE_MAIN }, // Center Height
- { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0d,0x03,0x02,0x01,0x30,0x01,0x04,0x00,0x00 }, AV_CHAN_TOP_SIDE_LEFT, AV_AUDIO_SERVICE_TYPE_MAIN }, // Left Surround Height
- { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0d,0x03,0x02,0x01,0x30,0x01,0x05,0x00,0x00 }, AV_CHAN_TOP_SIDE_RIGHT, AV_AUDIO_SERVICE_TYPE_MAIN }, // Right Surround Height
+ { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0d,0x03,0x02,0x01,0x30,0x01,0x04,0x00,0x00 }, AV_CHAN_TOP_SURROUND_LEFT, AV_AUDIO_SERVICE_TYPE_MAIN }, // Left Surround Height
+ { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0d,0x03,0x02,0x01,0x30,0x01,0x05,0x00,0x00 }, AV_CHAN_TOP_SURROUND_RIGHT, AV_AUDIO_SERVICE_TYPE_MAIN }, // Right Surround Height
{ { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0d,0x03,0x02,0x01,0x30,0x01,0x06,0x00,0x00 }, AV_CHAN_TOP_SIDE_LEFT, AV_AUDIO_SERVICE_TYPE_MAIN }, // Left Side Surround Height
{ { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0d,0x03,0x02,0x01,0x30,0x01,0x07,0x00,0x00 }, AV_CHAN_TOP_SIDE_RIGHT, AV_AUDIO_SERVICE_TYPE_MAIN }, // Right Side Surround Height
{ { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0d,0x03,0x02,0x01,0x30,0x01,0x08,0x00,0x00 }, AV_CHAN_TOP_BACK_LEFT, AV_AUDIO_SERVICE_TYPE_MAIN }, // Left Rear Surround Height
--
2.35.3
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [FFmpeg-devel] [PATCH 1/3] avformat/mov_chan: use the newly added channel ids for more exact mapping
2024-06-03 21:31 [FFmpeg-devel] [PATCH 1/3] avformat/mov_chan: use the newly added channel ids for more exact mapping Marton Balint
2024-06-03 21:31 ` [FFmpeg-devel] [PATCH 2/3] avformat/mov_chan: make iso_channel_position table more compact Marton Balint
2024-06-03 21:31 ` [FFmpeg-devel] [PATCH 3/3] avformat/mxfdec: use the newly added channel ids for more exact mapping Marton Balint
@ 2024-06-10 19:23 ` Marton Balint
2 siblings, 0 replies; 4+ messages in thread
From: Marton Balint @ 2024-06-10 19:23 UTC (permalink / raw)
To: FFmpeg development discussions and patches
On Mon, 3 Jun 2024, Marton Balint wrote:
> Also make the iso_channel_position table consistent with what the AAC decoder
> uses in avcodec/aac/aacdec_usac.c.
>
> Fate changes are caused by the change of how 7.1 layout is mapped, previously
> it included Side Surround channels, now it includes the Surround channels.
Willa apply the series.
Regards,
Marton
>
> Signed-off-by: Marton Balint <cus@passwd.hu>
> ---
> libavformat/mov_chan.c | 22 ++++++++--------------
> tests/ref/fate/mov-mp4-pcm | 2 +-
> 2 files changed, 9 insertions(+), 15 deletions(-)
>
> diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c
> index 5ffacf64b5..53805c6a35 100644
> --- a/libavformat/mov_chan.c
> +++ b/libavformat/mov_chan.c
> @@ -85,12 +85,8 @@ enum {
> iso_Lc = AV_CHAN_FRONT_LEFT_OF_CENTER,
> iso_Rc = AV_CHAN_FRONT_RIGHT_OF_CENTER,
> iso_Cs = AV_CHAN_BACK_CENTER,
> - /* Side and surround are not exactly the same, but in order to have
> - * consistent 5.1/7.1 layouts we map them to the side channels. */
> iso_Ls = AV_CHAN_SIDE_LEFT,
> - iso_Lss = AV_CHAN_SIDE_LEFT,
> iso_Rs = AV_CHAN_SIDE_RIGHT,
> - iso_Rss = AV_CHAN_SIDE_RIGHT,
> iso_Ts = AV_CHAN_TOP_CENTER,
> iso_Lv = AV_CHAN_TOP_FRONT_LEFT,
> iso_Cv = AV_CHAN_TOP_FRONT_CENTER,
> @@ -110,6 +106,8 @@ enum {
> iso_Cb = AV_CHAN_BOTTOM_FRONT_CENTER,
> iso_Lb = AV_CHAN_BOTTOM_FRONT_LEFT,
> iso_Rb = AV_CHAN_BOTTOM_FRONT_RIGHT,
> + iso_Lss = AV_CHAN_SIDE_SURROUND_LEFT,
> + iso_Rss = AV_CHAN_SIDE_SURROUND_RIGHT,
> /* The following have no exact counterparts */
> iso_Lvs = AV_CHAN_NONE,
> iso_Rvs = AV_CHAN_NONE,
> @@ -622,12 +620,10 @@ static const enum AVChannel iso_channel_position[] = {
> AV_CHAN_LOW_FREQUENCY,
>
> // 4: left surround
> - // TODO
> - AV_CHAN_NONE,
> + AV_CHAN_SIDE_LEFT,
>
> // 5: right surround
> - // TODO
> - AV_CHAN_NONE,
> + AV_CHAN_SIDE_RIGHT,
>
> // 6: left front centre
> AV_CHAN_FRONT_LEFT_OF_CENTER,
> @@ -651,10 +647,10 @@ static const enum AVChannel iso_channel_position[] = {
> AV_CHAN_SURROUND_DIRECT_RIGHT,
>
> // 13: left side surround
> - AV_CHAN_SIDE_LEFT,
> + AV_CHAN_SIDE_SURROUND_LEFT,
>
> // 14: right side surround
> - AV_CHAN_SIDE_RIGHT,
> + AV_CHAN_SIDE_SURROUND_RIGHT,
>
> // 15: left wide front
> AV_CHAN_WIDE_LEFT,
> @@ -702,12 +698,10 @@ static const enum AVChannel iso_channel_position[] = {
> AV_CHAN_BOTTOM_FRONT_CENTER,
>
> // 30: left vertical height surround
> - // TODO
> - AV_CHAN_NONE,
> + AV_CHAN_TOP_SURROUND_LEFT,
>
> // 31: right vertical height surround
> - // TODO
> - AV_CHAN_NONE,
> + AV_CHAN_TOP_SURROUND_RIGHT,
>
> // 32, 33, 34, 35, reserved
> AV_CHAN_NONE,
> diff --git a/tests/ref/fate/mov-mp4-pcm b/tests/ref/fate/mov-mp4-pcm
> index 19a978df95..7cdca8629f 100644
> --- a/tests/ref/fate/mov-mp4-pcm
> +++ b/tests/ref/fate/mov-mp4-pcm
> @@ -1,4 +1,4 @@
> -462668dd69e7ce4fde4934d1d5978531 *tests/data/fate/mov-mp4-pcm.mp4
> +0c6802135e9eb442201c0c1b001259d6 *tests/data/fate/mov-mp4-pcm.mp4
> 10587977 tests/data/fate/mov-mp4-pcm.mp4
> #tb 0: 1/44100
> #media_type 0: audio
> --
> 2.35.3
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
>
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-06-10 19:23 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-06-03 21:31 [FFmpeg-devel] [PATCH 1/3] avformat/mov_chan: use the newly added channel ids for more exact mapping Marton Balint
2024-06-03 21:31 ` [FFmpeg-devel] [PATCH 2/3] avformat/mov_chan: make iso_channel_position table more compact Marton Balint
2024-06-03 21:31 ` [FFmpeg-devel] [PATCH 3/3] avformat/mxfdec: use the newly added channel ids for more exact mapping Marton Balint
2024-06-10 19:23 ` [FFmpeg-devel] [PATCH 1/3] avformat/mov_chan: " Marton Balint
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git