virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

avformat/iamf: use the new Binaural channel layout

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2024-10-27 15:22:00 -03:00
parent 20af68b63a
commit edc7b67508
7 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/dump.c
View File

@ -752,12 +752,12 @@ static void dump_stream_group(const AVFormatContext *ic, uint8_t *printed,
for (int k = 0; k < sub_mix->nb_layouts; k++) { for (int k = 0; k < sub_mix->nb_layouts; k++) {
const AVIAMFSubmixLayout *submix_layout = sub_mix->layouts[k]; const AVIAMFSubmixLayout *submix_layout = sub_mix->layouts[k];
av_log(NULL, AV_LOG_INFO, " Layout #%d:", k); av_log(NULL, AV_LOG_INFO, " Layout #%d:", k);
if (submix_layout->layout_type == 2) { if (submix_layout->layout_type == 2 ||
submix_layout->layout_type == 3) {
ret = av_channel_layout_describe(&submix_layout->sound_system, buf, sizeof(buf)); ret = av_channel_layout_describe(&submix_layout->sound_system, buf, sizeof(buf));
if (ret >= 0) if (ret >= 0)
av_log(NULL, AV_LOG_INFO, " %s", buf); av_log(NULL, AV_LOG_INFO, " %s", buf);
} else if (submix_layout->layout_type == 3) }
av_log(NULL, AV_LOG_INFO, " Binaural");
av_log(NULL, AV_LOG_INFO, "\n"); av_log(NULL, AV_LOG_INFO, "\n");
} }
} }

2
libavformat/iamf.c
View File

@ -42,7 +42,7 @@ const AVChannelLayout ff_iamf_scalable_ch_layouts[10] = {
// Front subset of "Loudspeaker configuration for Sound System J" // Front subset of "Loudspeaker configuration for Sound System J"
AV_CHANNEL_LAYOUT_3POINT1POINT2, AV_CHANNEL_LAYOUT_3POINT1POINT2,
// Binaural // Binaural
AV_CHANNEL_LAYOUT_STEREO, AV_CHANNEL_LAYOUT_BINAURAL,
}; };
const struct IAMFSoundSystemMap ff_iamf_sound_system_map[13] = { const struct IAMFSoundSystemMap ff_iamf_sound_system_map[13] = {

3
libavformat/iamf_parse.c
View File

@ -956,7 +956,8 @@ static int mix_presentation_obu(void *s, IAMFContext *c, AVIOContext *pb, int le
goto fail; goto fail;
} }
av_channel_layout_copy(&submix_layout->sound_system, &ff_iamf_sound_system_map[sound_system].layout); av_channel_layout_copy(&submix_layout->sound_system, &ff_iamf_sound_system_map[sound_system].layout);
} } else
submix_layout->sound_system = (AVChannelLayout)AV_CHANNEL_LAYOUT_BINAURAL;
info_type = avio_r8(pbc); info_type = avio_r8(pbc);
submix_layout->integrated_loudness = av_make_q(sign_extend(avio_rb16(pbc), 16), 1 << 8); submix_layout->integrated_loudness = av_make_q(sign_extend(avio_rb16(pbc), 16), 1 << 8);

3
libavformat/iamf_writer.c
View File

@ -817,6 +817,9 @@ static int iamf_write_mixing_presentation(const IAMFContext *iamf,
av_log(log_ctx, AV_LOG_ERROR, "Invalid Sound System value in a submix\n"); av_log(log_ctx, AV_LOG_ERROR, "Invalid Sound System value in a submix\n");
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
} else if (submix_layout->layout_type != AV_IAMF_SUBMIX_LAYOUT_TYPE_BINAURAL) {
av_log(log_ctx, AV_LOG_ERROR, "Unsupported Layout Type value in a submix\n");
return AVERROR(EINVAL);
} }
init_put_bits(&pbc, header, sizeof(header)); init_put_bits(&pbc, header, sizeof(header));
put_bits(&pbc, 2, submix_layout->layout_type); // layout_type put_bits(&pbc, 2, submix_layout->layout_type); // layout_type

10
libavutil/iamf.h
View File

@ -493,10 +493,14 @@ typedef struct AVIAMFSubmixElement {
enum AVIAMFSubmixLayoutType { enum AVIAMFSubmixLayoutType {
/** /**
* The layout follows the loudspeaker sound system convention of ITU-2051-3. * The layout follows the loudspeaker sound system convention of ITU-2051-3.
* @ref AVIAMFSubmixLayout.sound_system must be set.
*/ */
AV_IAMF_SUBMIX_LAYOUT_TYPE_LOUDSPEAKERS = 2, AV_IAMF_SUBMIX_LAYOUT_TYPE_LOUDSPEAKERS = 2,
/** /**
* The layout is binaural. * The layout is binaural.
*
* @note @ref AVIAMFSubmixLayout.sound_system may be set to
* AV_CHANNEL_LAYOUT_BINAURAL to simplify API usage, but it's not mandatory.
*/ */
AV_IAMF_SUBMIX_LAYOUT_TYPE_BINAURAL = 3, AV_IAMF_SUBMIX_LAYOUT_TYPE_BINAURAL = 3,
}; };
@ -514,9 +518,9 @@ typedef struct AVIAMFSubmixLayout {
/** /**
* Channel layout matching one of Sound Systems A to J of ITU-2051-3, plus * Channel layout matching one of Sound Systems A to J of ITU-2051-3, plus
* 7.1.2ch and 3.1.2ch * 7.1.2ch, 3.1.2ch, and binaural.
* If layout_type is not AV_IAMF_SUBMIX_LAYOUT_TYPE_LOUDSPEAKERS, this field * If layout_type is not AV_IAMF_SUBMIX_LAYOUT_TYPE_LOUDSPEAKERS or
* is undefined. * AV_IAMF_SUBMIX_LAYOUT_TYPE_BINAURAL, this field is undefined.
*/ */
AVChannelLayout sound_system; AVChannelLayout sound_system;
/** /**

2
tests/ref/fate/iamf-stereo
View File

@ -135,7 +135,7 @@ duration=0
constant_subblock_duration=0 constant_subblock_duration=0
[/PIECE] [/PIECE]
[PIECE] [PIECE]
sound_system=0 channels sound_system=binaural
integrated_loudness=0/256 integrated_loudness=0/256
digital_peak=0/256 digital_peak=0/256
true_peak=0/1 true_peak=0/1

2
tests/ref/fate/mov-mp4-iamf-stereo
View File

@ -157,7 +157,7 @@ duration=0
constant_subblock_duration=0 constant_subblock_duration=0
[/PIECE] [/PIECE]
[PIECE] [PIECE]
sound_system=0 channels sound_system=binaural
integrated_loudness=0/256 integrated_loudness=0/256
digital_peak=0/256 digital_peak=0/256
true_peak=0/1 true_peak=0/1