Skip to content

Commit 4e48063

Browse files
committed
Conformance test script: add support for 7.1.5.4 and 2 codecs
1 parent 2e4d795 commit 4e48063

1 file changed

Lines changed: 7 additions & 6 deletions

File tree

tests/user_metadata_parsing_utils.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ class TestCombinationMetadata:
5050
mix_presentation_pb2.SOUND_SYSTEM_11_2_3_0: '11',
5151
mix_presentation_pb2.SOUND_SYSTEM_12_0_1_0: '12',
5252
mix_presentation_pb2.SOUND_SYSTEM_13_6_9_0: '13',
53+
mix_presentation_pb2.SOUND_SYSTEM_14_5_7_4: '14',
5354
}
5455

5556

@@ -127,12 +128,12 @@ def get_test_combination_metadata(user_metadata_proto, test_file_directory):
127128
# Skip test vectors that are not valid to decode.
128129
return []
129130

130-
assert len(user_metadata_proto.codec_config_metadata) == 1
131-
codec_id = user_metadata_proto.codec_config_metadata[0].codec_config.codec_id
132-
is_lossy = codec_id in [
133-
codec_config_pb2.CODEC_ID_AAC_LC,
134-
codec_config_pb2.CODEC_ID_OPUS,
135-
]
131+
assert 1 <= len(user_metadata_proto.codec_config_metadata) <= 2
132+
is_lossy = any(
133+
codec_config_metadata.codec_config.codec_id
134+
in [codec_config_pb2.CODEC_ID_AAC_LC, codec_config_pb2.CODEC_ID_OPUS]
135+
for codec_config_metadata in user_metadata_proto.codec_config_metadata
136+
)
136137

137138
is_stress_signal = False
138139
for audio_frame_metadata in user_metadata_proto.audio_frame_metadata:

0 commit comments

Comments
 (0)