loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ignore channelCount and sampleRate values read from iamf box

Browse Source 
As per the IAMF spec (https://aomediacodec.github.io/iamf/#iasampleentry-section), `channelCount` and `sampleRate` SHALL be set to `0` and ignored.

#cherrypick

PiperOrigin-RevId: 683648991
This commit is contained in:
rohks 2024-10-08 09:15:37 -07:00 committed by Copybara-Service
parent 8f82a15e48
commit 72ab282c0d
21 changed files with 8 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/extractor/src/main/java/androidx/media3/extractor/mp4/BoxParser.java
View File

@ -1759,6 +1759,14 @@ public final class BoxParser {
return;
}
// As per the IAMF spec (https://aomediacodec.github.io/iamf/#iasampleentry-section),
// channelCount and sampleRate SHALL be set to 0 and ignored. We ignore it by using
// Format.NO_VALUE instead of 0.
if (atomType == Mp4Box.TYPE_iamf) {
channelCount = Format.NO_VALUE;
sampleRate = Format.NO_VALUE;
}
int childPosition = parent.getPosition();
if (atomType == Mp4Box.TYPE_enca) {
@Nullable

2
libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.0.dump
View File

@ -12,8 +12,6 @@ track 0:
format 0:
id = 1
sampleMimeType = audio/iamf
channelCount = 0
sampleRate = 0
language = und
initializationData:
data = length 119, hash 99A80807

2
libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.1.dump
View File

@ -12,8 +12,6 @@ track 0:
format 0:
id = 1
sampleMimeType = audio/iamf
channelCount = 0
sampleRate = 0
language = und
initializationData:
data = length 119, hash 99A80807

2
libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.2.dump
View File

@ -12,8 +12,6 @@ track 0:
format 0:
id = 1
sampleMimeType = audio/iamf
channelCount = 0
sampleRate = 0
language = und
initializationData:
data = length 119, hash 99A80807

2
libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.3.dump
View File

@ -12,8 +12,6 @@ track 0:
format 0:
id = 1
sampleMimeType = audio/iamf
channelCount = 0
sampleRate = 0
language = und
initializationData:
data = length 119, hash 99A80807

2
libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.reading_within_gop_sample_dependencies.0.dump
View File

@ -12,8 +12,6 @@ track 0:
format 0:
id = 1
sampleMimeType = audio/iamf
channelCount = 0
sampleRate = 0
language = und
initializationData:
data = length 119, hash 99A80807

2
libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.reading_within_gop_sample_dependencies.1.dump
View File

@ -12,8 +12,6 @@ track 0:
format 0:
id = 1
sampleMimeType = audio/iamf
channelCount = 0
sampleRate = 0
language = und
initializationData:
data = length 119, hash 99A80807

2
libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.reading_within_gop_sample_dependencies.2.dump
View File

@ -12,8 +12,6 @@ track 0:
format 0:
id = 1
sampleMimeType = audio/iamf
channelCount = 0
sampleRate = 0
language = und
initializationData:
data = length 119, hash 99A80807

2
libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.reading_within_gop_sample_dependencies.3.dump
View File

@ -12,8 +12,6 @@ track 0:
format 0:
id = 1
sampleMimeType = audio/iamf
channelCount = 0
sampleRate = 0
language = und
initializationData:
data = length 119, hash 99A80807

2
libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
View File

@ -12,8 +12,6 @@ track 0:
format 0:
id = 1
sampleMimeType = audio/iamf
channelCount = 0
sampleRate = 0
language = und
initializationData:
data = length 119, hash 99A80807

2
libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.unknown_length.dump
View File

@ -12,8 +12,6 @@ track 0:
format 0:
id = 1
sampleMimeType = audio/iamf
channelCount = 0
sampleRate = 0
language = und
initializationData:
data = length 119, hash 99A80807

2
libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.0.dump
View File

@ -13,8 +13,6 @@ track 0:
id = 1
sampleMimeType = audio/iamf
maxInputSize = 299
channelCount = 0
sampleRate = 0
language = und
metadata = entries=[Mp4Timestamp: creation time=3764707200, modification time=3764707200, timescale=16000]
initializationData:

2
libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.1.dump
View File

@ -13,8 +13,6 @@ track 0:
id = 1
sampleMimeType = audio/iamf
maxInputSize = 299
channelCount = 0
sampleRate = 0
language = und
metadata = entries=[Mp4Timestamp: creation time=3764707200, modification time=3764707200, timescale=16000]
initializationData:

2
libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.2.dump
View File

@ -13,8 +13,6 @@ track 0:
id = 1
sampleMimeType = audio/iamf
maxInputSize = 299
channelCount = 0
sampleRate = 0
language = und
metadata = entries=[Mp4Timestamp: creation time=3764707200, modification time=3764707200, timescale=16000]
initializationData:

2
libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.3.dump
View File

@ -13,8 +13,6 @@ track 0:
id = 1
sampleMimeType = audio/iamf
maxInputSize = 299
channelCount = 0
sampleRate = 0
language = und
metadata = entries=[Mp4Timestamp: creation time=3764707200, modification time=3764707200, timescale=16000]
initializationData:

2
libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.reading_within_gop_sample_dependencies.0.dump
View File

@ -13,8 +13,6 @@ track 0:
id = 1
sampleMimeType = audio/iamf
maxInputSize = 299
channelCount = 0
sampleRate = 0
language = und
metadata = entries=[Mp4Timestamp: creation time=3764707200, modification time=3764707200, timescale=16000]
initializationData:

2
libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.reading_within_gop_sample_dependencies.1.dump
View File

@ -13,8 +13,6 @@ track 0:
id = 1
sampleMimeType = audio/iamf
maxInputSize = 299
channelCount = 0
sampleRate = 0
language = und
metadata = entries=[Mp4Timestamp: creation time=3764707200, modification time=3764707200, timescale=16000]
initializationData:

2
libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.reading_within_gop_sample_dependencies.2.dump
View File

@ -13,8 +13,6 @@ track 0:
id = 1
sampleMimeType = audio/iamf
maxInputSize = 299
channelCount = 0
sampleRate = 0
language = und
metadata = entries=[Mp4Timestamp: creation time=3764707200, modification time=3764707200, timescale=16000]
initializationData:

2
libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.reading_within_gop_sample_dependencies.3.dump
View File

@ -13,8 +13,6 @@ track 0:
id = 1
sampleMimeType = audio/iamf
maxInputSize = 299
channelCount = 0
sampleRate = 0
language = und
metadata = entries=[Mp4Timestamp: creation time=3764707200, modification time=3764707200, timescale=16000]
initializationData:

2
libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
View File

@ -13,8 +13,6 @@ track 0:
id = 1
sampleMimeType = audio/iamf
maxInputSize = 299
channelCount = 0
sampleRate = 0
language = und
metadata = entries=[Mp4Timestamp: creation time=3764707200, modification time=3764707200, timescale=16000]
initializationData:

2
libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.unknown_length.dump
View File

@ -13,8 +13,6 @@ track 0:
id = 1
sampleMimeType = audio/iamf
maxInputSize = 299
channelCount = 0
sampleRate = 0
language = und
metadata = entries=[Mp4Timestamp: creation time=3764707200, modification time=3764707200, timescale=16000]
initializationData: