diff --git a/library/common/src/main/java/com/google/android/exoplayer2/Format.java b/library/common/src/main/java/com/google/android/exoplayer2/Format.java index 3027bce528..749dea28a7 100644 --- a/library/common/src/main/java/com/google/android/exoplayer2/Format.java +++ b/library/common/src/main/java/com/google/android/exoplayer2/Format.java @@ -767,8 +767,8 @@ public final class Format implements Parcelable { * The audio sampling rate in Hz, or {@link #NO_VALUE} if unknown or not applicable. */ public final int sampleRate; - /** @deprecated Use {@link #encoding}. */ - @Deprecated @C.PcmEncoding public final int pcmEncoding; + /** The {@link C.PcmEncoding} for PCM audio. Set to {@link #NO_VALUE} for other media types. */ + @C.PcmEncoding public final int pcmEncoding; /** The {@link C.Encoding} for audio. Set to {@link #NO_VALUE} for other media types. */ @C.Encoding public final int encoding; /** @@ -1214,7 +1214,6 @@ public final class Format implements Parcelable { } // Some fields are deprecated but they're still assigned below. - @SuppressWarnings("deprecation") /* package */ Format( @Nullable String id, @Nullable String label, @@ -1301,7 +1300,7 @@ public final class Format implements Parcelable { } // Some fields are deprecated but they're still assigned below. - @SuppressWarnings({"ResourceType", "deprecation"}) + @SuppressWarnings({"ResourceType"}) /* package */ Format(Parcel in) { id = in.readString(); label = in.readString(); diff --git a/testdata/src/test/assets/flac/bear_no_min_max_frame_size_raw.0.dump b/testdata/src/test/assets/flac/bear_no_min_max_frame_size_raw.0.dump index 0f8c382b50..37eee44b2e 100644 --- a/testdata/src/test/assets/flac/bear_no_min_max_frame_size_raw.0.dump +++ b/testdata/src/test/assets/flac/bear_no_min_max_frame_size_raw.0.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 16384 channelCount = 2 sampleRate = 48000 - encoding = 2 + pcmEncoding = 2 sample 0: time = 0 flags = 1 diff --git a/testdata/src/test/assets/flac/bear_no_min_max_frame_size_raw.1.dump b/testdata/src/test/assets/flac/bear_no_min_max_frame_size_raw.1.dump index 9abc1c3a87..2c299253e3 100644 --- a/testdata/src/test/assets/flac/bear_no_min_max_frame_size_raw.1.dump +++ b/testdata/src/test/assets/flac/bear_no_min_max_frame_size_raw.1.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 16384 channelCount = 2 sampleRate = 48000 - encoding = 2 + pcmEncoding = 2 sample 0: time = 853333 flags = 1 diff --git a/testdata/src/test/assets/flac/bear_no_min_max_frame_size_raw.2.dump b/testdata/src/test/assets/flac/bear_no_min_max_frame_size_raw.2.dump index 49bce9c197..86d36c9e24 100644 --- a/testdata/src/test/assets/flac/bear_no_min_max_frame_size_raw.2.dump +++ b/testdata/src/test/assets/flac/bear_no_min_max_frame_size_raw.2.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 16384 channelCount = 2 sampleRate = 48000 - encoding = 2 + pcmEncoding = 2 sample 0: time = 1792000 flags = 1 diff --git a/testdata/src/test/assets/flac/bear_no_min_max_frame_size_raw.3.dump b/testdata/src/test/assets/flac/bear_no_min_max_frame_size_raw.3.dump index e266f35ea5..2ad86792ff 100644 --- a/testdata/src/test/assets/flac/bear_no_min_max_frame_size_raw.3.dump +++ b/testdata/src/test/assets/flac/bear_no_min_max_frame_size_raw.3.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 16384 channelCount = 2 sampleRate = 48000 - encoding = 2 + pcmEncoding = 2 sample 0: time = 2645333 flags = 1 diff --git a/testdata/src/test/assets/flac/bear_no_min_max_frame_size_raw.unknown_length.dump b/testdata/src/test/assets/flac/bear_no_min_max_frame_size_raw.unknown_length.dump index 0f8c382b50..37eee44b2e 100644 --- a/testdata/src/test/assets/flac/bear_no_min_max_frame_size_raw.unknown_length.dump +++ b/testdata/src/test/assets/flac/bear_no_min_max_frame_size_raw.unknown_length.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 16384 channelCount = 2 sampleRate = 48000 - encoding = 2 + pcmEncoding = 2 sample 0: time = 0 flags = 1 diff --git a/testdata/src/test/assets/flac/bear_no_num_samples_raw.0.dump b/testdata/src/test/assets/flac/bear_no_num_samples_raw.0.dump index 9086949bdb..9615182d68 100644 --- a/testdata/src/test/assets/flac/bear_no_num_samples_raw.0.dump +++ b/testdata/src/test/assets/flac/bear_no_num_samples_raw.0.dump @@ -14,7 +14,7 @@ track 0: maxInputSize = 16384 channelCount = 2 sampleRate = 48000 - encoding = 2 + pcmEncoding = 2 sample 0: time = 0 flags = 1 diff --git a/testdata/src/test/assets/flac/bear_no_num_samples_raw.unknown_length.dump b/testdata/src/test/assets/flac/bear_no_num_samples_raw.unknown_length.dump index 9086949bdb..9615182d68 100644 --- a/testdata/src/test/assets/flac/bear_no_num_samples_raw.unknown_length.dump +++ b/testdata/src/test/assets/flac/bear_no_num_samples_raw.unknown_length.dump @@ -14,7 +14,7 @@ track 0: maxInputSize = 16384 channelCount = 2 sampleRate = 48000 - encoding = 2 + pcmEncoding = 2 sample 0: time = 0 flags = 1 diff --git a/testdata/src/test/assets/flac/bear_no_seek_table_no_num_samples_raw.0.dump b/testdata/src/test/assets/flac/bear_no_seek_table_no_num_samples_raw.0.dump index 7a16cd10d9..34a2535c7a 100644 --- a/testdata/src/test/assets/flac/bear_no_seek_table_no_num_samples_raw.0.dump +++ b/testdata/src/test/assets/flac/bear_no_seek_table_no_num_samples_raw.0.dump @@ -13,7 +13,7 @@ track 0: maxInputSize = 16384 channelCount = 2 sampleRate = 48000 - encoding = 2 + pcmEncoding = 2 sample 0: time = 0 flags = 1 diff --git a/testdata/src/test/assets/flac/bear_no_seek_table_no_num_samples_raw.unknown_length.dump b/testdata/src/test/assets/flac/bear_no_seek_table_no_num_samples_raw.unknown_length.dump index 7a16cd10d9..34a2535c7a 100644 --- a/testdata/src/test/assets/flac/bear_no_seek_table_no_num_samples_raw.unknown_length.dump +++ b/testdata/src/test/assets/flac/bear_no_seek_table_no_num_samples_raw.unknown_length.dump @@ -13,7 +13,7 @@ track 0: maxInputSize = 16384 channelCount = 2 sampleRate = 48000 - encoding = 2 + pcmEncoding = 2 sample 0: time = 0 flags = 1 diff --git a/testdata/src/test/assets/flac/bear_one_metadata_block_raw.0.dump b/testdata/src/test/assets/flac/bear_one_metadata_block_raw.0.dump index b33ddb2766..172f9e44ec 100644 --- a/testdata/src/test/assets/flac/bear_one_metadata_block_raw.0.dump +++ b/testdata/src/test/assets/flac/bear_one_metadata_block_raw.0.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 16384 channelCount = 2 sampleRate = 48000 - encoding = 2 + pcmEncoding = 2 sample 0: time = 0 flags = 1 diff --git a/testdata/src/test/assets/flac/bear_one_metadata_block_raw.1.dump b/testdata/src/test/assets/flac/bear_one_metadata_block_raw.1.dump index bd59e70938..cacb89d8d1 100644 --- a/testdata/src/test/assets/flac/bear_one_metadata_block_raw.1.dump +++ b/testdata/src/test/assets/flac/bear_one_metadata_block_raw.1.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 16384 channelCount = 2 sampleRate = 48000 - encoding = 2 + pcmEncoding = 2 sample 0: time = 853333 flags = 1 diff --git a/testdata/src/test/assets/flac/bear_one_metadata_block_raw.2.dump b/testdata/src/test/assets/flac/bear_one_metadata_block_raw.2.dump index 5f2899a4f4..8285b73eca 100644 --- a/testdata/src/test/assets/flac/bear_one_metadata_block_raw.2.dump +++ b/testdata/src/test/assets/flac/bear_one_metadata_block_raw.2.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 16384 channelCount = 2 sampleRate = 48000 - encoding = 2 + pcmEncoding = 2 sample 0: time = 1792000 flags = 1 diff --git a/testdata/src/test/assets/flac/bear_one_metadata_block_raw.3.dump b/testdata/src/test/assets/flac/bear_one_metadata_block_raw.3.dump index 7819815e34..3223ab2a34 100644 --- a/testdata/src/test/assets/flac/bear_one_metadata_block_raw.3.dump +++ b/testdata/src/test/assets/flac/bear_one_metadata_block_raw.3.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 16384 channelCount = 2 sampleRate = 48000 - encoding = 2 + pcmEncoding = 2 sample 0: time = 2730666 flags = 1 diff --git a/testdata/src/test/assets/flac/bear_one_metadata_block_raw.unknown_length.dump b/testdata/src/test/assets/flac/bear_one_metadata_block_raw.unknown_length.dump index 9cd861ac8f..0c9b3e7eb2 100644 --- a/testdata/src/test/assets/flac/bear_one_metadata_block_raw.unknown_length.dump +++ b/testdata/src/test/assets/flac/bear_one_metadata_block_raw.unknown_length.dump @@ -13,7 +13,7 @@ track 0: maxInputSize = 16384 channelCount = 2 sampleRate = 48000 - encoding = 2 + pcmEncoding = 2 sample 0: time = 0 flags = 1 diff --git a/testdata/src/test/assets/flac/bear_raw.0.dump b/testdata/src/test/assets/flac/bear_raw.0.dump index 0f8c382b50..37eee44b2e 100644 --- a/testdata/src/test/assets/flac/bear_raw.0.dump +++ b/testdata/src/test/assets/flac/bear_raw.0.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 16384 channelCount = 2 sampleRate = 48000 - encoding = 2 + pcmEncoding = 2 sample 0: time = 0 flags = 1 diff --git a/testdata/src/test/assets/flac/bear_raw.1.dump b/testdata/src/test/assets/flac/bear_raw.1.dump index 9abc1c3a87..2c299253e3 100644 --- a/testdata/src/test/assets/flac/bear_raw.1.dump +++ b/testdata/src/test/assets/flac/bear_raw.1.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 16384 channelCount = 2 sampleRate = 48000 - encoding = 2 + pcmEncoding = 2 sample 0: time = 853333 flags = 1 diff --git a/testdata/src/test/assets/flac/bear_raw.2.dump b/testdata/src/test/assets/flac/bear_raw.2.dump index 49bce9c197..86d36c9e24 100644 --- a/testdata/src/test/assets/flac/bear_raw.2.dump +++ b/testdata/src/test/assets/flac/bear_raw.2.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 16384 channelCount = 2 sampleRate = 48000 - encoding = 2 + pcmEncoding = 2 sample 0: time = 1792000 flags = 1 diff --git a/testdata/src/test/assets/flac/bear_raw.3.dump b/testdata/src/test/assets/flac/bear_raw.3.dump index e266f35ea5..2ad86792ff 100644 --- a/testdata/src/test/assets/flac/bear_raw.3.dump +++ b/testdata/src/test/assets/flac/bear_raw.3.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 16384 channelCount = 2 sampleRate = 48000 - encoding = 2 + pcmEncoding = 2 sample 0: time = 2645333 flags = 1 diff --git a/testdata/src/test/assets/flac/bear_raw.unknown_length.dump b/testdata/src/test/assets/flac/bear_raw.unknown_length.dump index 0f8c382b50..37eee44b2e 100644 --- a/testdata/src/test/assets/flac/bear_raw.unknown_length.dump +++ b/testdata/src/test/assets/flac/bear_raw.unknown_length.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 16384 channelCount = 2 sampleRate = 48000 - encoding = 2 + pcmEncoding = 2 sample 0: time = 0 flags = 1 diff --git a/testdata/src/test/assets/flac/bear_uncommon_sample_rate_raw.0.dump b/testdata/src/test/assets/flac/bear_uncommon_sample_rate_raw.0.dump index 04e47bb833..7c72df42b5 100644 --- a/testdata/src/test/assets/flac/bear_uncommon_sample_rate_raw.0.dump +++ b/testdata/src/test/assets/flac/bear_uncommon_sample_rate_raw.0.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 18432 channelCount = 2 sampleRate = 44000 - encoding = 2 + pcmEncoding = 2 sample 0: time = 0 flags = 1 diff --git a/testdata/src/test/assets/flac/bear_uncommon_sample_rate_raw.1.dump b/testdata/src/test/assets/flac/bear_uncommon_sample_rate_raw.1.dump index 786ffc5cad..7da240be3d 100644 --- a/testdata/src/test/assets/flac/bear_uncommon_sample_rate_raw.1.dump +++ b/testdata/src/test/assets/flac/bear_uncommon_sample_rate_raw.1.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 18432 channelCount = 2 sampleRate = 44000 - encoding = 2 + pcmEncoding = 2 sample 0: time = 837818 flags = 1 diff --git a/testdata/src/test/assets/flac/bear_uncommon_sample_rate_raw.2.dump b/testdata/src/test/assets/flac/bear_uncommon_sample_rate_raw.2.dump index 84d043ca85..3943c77600 100644 --- a/testdata/src/test/assets/flac/bear_uncommon_sample_rate_raw.2.dump +++ b/testdata/src/test/assets/flac/bear_uncommon_sample_rate_raw.2.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 18432 channelCount = 2 sampleRate = 44000 - encoding = 2 + pcmEncoding = 2 sample 0: time = 1780363 flags = 1 diff --git a/testdata/src/test/assets/flac/bear_uncommon_sample_rate_raw.3.dump b/testdata/src/test/assets/flac/bear_uncommon_sample_rate_raw.3.dump index 79586bb1e8..18231418b9 100644 --- a/testdata/src/test/assets/flac/bear_uncommon_sample_rate_raw.3.dump +++ b/testdata/src/test/assets/flac/bear_uncommon_sample_rate_raw.3.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 18432 channelCount = 2 sampleRate = 44000 - encoding = 2 + pcmEncoding = 2 sample 0: time = 2618181 flags = 1 diff --git a/testdata/src/test/assets/flac/bear_uncommon_sample_rate_raw.unknown_length.dump b/testdata/src/test/assets/flac/bear_uncommon_sample_rate_raw.unknown_length.dump index 04e47bb833..7c72df42b5 100644 --- a/testdata/src/test/assets/flac/bear_uncommon_sample_rate_raw.unknown_length.dump +++ b/testdata/src/test/assets/flac/bear_uncommon_sample_rate_raw.unknown_length.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 18432 channelCount = 2 sampleRate = 44000 - encoding = 2 + pcmEncoding = 2 sample 0: time = 0 flags = 1 diff --git a/testdata/src/test/assets/flac/bear_with_id3_disabled_raw.0.dump b/testdata/src/test/assets/flac/bear_with_id3_disabled_raw.0.dump index e5b9a095bf..fcfa917208 100644 --- a/testdata/src/test/assets/flac/bear_with_id3_disabled_raw.0.dump +++ b/testdata/src/test/assets/flac/bear_with_id3_disabled_raw.0.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 16384 channelCount = 2 sampleRate = 48000 - encoding = 2 + pcmEncoding = 2 sample 0: time = 0 flags = 1 diff --git a/testdata/src/test/assets/flac/bear_with_id3_disabled_raw.1.dump b/testdata/src/test/assets/flac/bear_with_id3_disabled_raw.1.dump index a6a6ee7b06..ad1c171a9a 100644 --- a/testdata/src/test/assets/flac/bear_with_id3_disabled_raw.1.dump +++ b/testdata/src/test/assets/flac/bear_with_id3_disabled_raw.1.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 16384 channelCount = 2 sampleRate = 48000 - encoding = 2 + pcmEncoding = 2 sample 0: time = 853333 flags = 1 diff --git a/testdata/src/test/assets/flac/bear_with_id3_disabled_raw.2.dump b/testdata/src/test/assets/flac/bear_with_id3_disabled_raw.2.dump index b65edd3f13..e5f625e576 100644 --- a/testdata/src/test/assets/flac/bear_with_id3_disabled_raw.2.dump +++ b/testdata/src/test/assets/flac/bear_with_id3_disabled_raw.2.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 16384 channelCount = 2 sampleRate = 48000 - encoding = 2 + pcmEncoding = 2 sample 0: time = 1792000 flags = 1 diff --git a/testdata/src/test/assets/flac/bear_with_id3_disabled_raw.3.dump b/testdata/src/test/assets/flac/bear_with_id3_disabled_raw.3.dump index face737d1b..1625462f01 100644 --- a/testdata/src/test/assets/flac/bear_with_id3_disabled_raw.3.dump +++ b/testdata/src/test/assets/flac/bear_with_id3_disabled_raw.3.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 16384 channelCount = 2 sampleRate = 48000 - encoding = 2 + pcmEncoding = 2 sample 0: time = 2645333 flags = 1 diff --git a/testdata/src/test/assets/flac/bear_with_id3_disabled_raw.unknown_length.dump b/testdata/src/test/assets/flac/bear_with_id3_disabled_raw.unknown_length.dump index e5b9a095bf..fcfa917208 100644 --- a/testdata/src/test/assets/flac/bear_with_id3_disabled_raw.unknown_length.dump +++ b/testdata/src/test/assets/flac/bear_with_id3_disabled_raw.unknown_length.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 16384 channelCount = 2 sampleRate = 48000 - encoding = 2 + pcmEncoding = 2 sample 0: time = 0 flags = 1 diff --git a/testdata/src/test/assets/flac/bear_with_id3_enabled_raw.0.dump b/testdata/src/test/assets/flac/bear_with_id3_enabled_raw.0.dump index 932e3437ed..ca9f1a74a1 100644 --- a/testdata/src/test/assets/flac/bear_with_id3_enabled_raw.0.dump +++ b/testdata/src/test/assets/flac/bear_with_id3_enabled_raw.0.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 16384 channelCount = 2 sampleRate = 48000 - encoding = 2 + pcmEncoding = 2 metadata = entries=[TXXX: description=ID: value=105519843, TIT2: description=null: value=那么爱你为什么, TPE1: description=null: value=阿强, TALB: description=null: value=华丽的外衣, TXXX: description=ID: value=105519843, APIC: mimeType=image/jpeg, description=] sample 0: time = 0 diff --git a/testdata/src/test/assets/flac/bear_with_id3_enabled_raw.1.dump b/testdata/src/test/assets/flac/bear_with_id3_enabled_raw.1.dump index 184fe1ba42..36314d9433 100644 --- a/testdata/src/test/assets/flac/bear_with_id3_enabled_raw.1.dump +++ b/testdata/src/test/assets/flac/bear_with_id3_enabled_raw.1.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 16384 channelCount = 2 sampleRate = 48000 - encoding = 2 + pcmEncoding = 2 metadata = entries=[TXXX: description=ID: value=105519843, TIT2: description=null: value=那么爱你为什么, TPE1: description=null: value=阿强, TALB: description=null: value=华丽的外衣, TXXX: description=ID: value=105519843, APIC: mimeType=image/jpeg, description=] sample 0: time = 853333 diff --git a/testdata/src/test/assets/flac/bear_with_id3_enabled_raw.2.dump b/testdata/src/test/assets/flac/bear_with_id3_enabled_raw.2.dump index b2b9a31068..0e8cc73341 100644 --- a/testdata/src/test/assets/flac/bear_with_id3_enabled_raw.2.dump +++ b/testdata/src/test/assets/flac/bear_with_id3_enabled_raw.2.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 16384 channelCount = 2 sampleRate = 48000 - encoding = 2 + pcmEncoding = 2 metadata = entries=[TXXX: description=ID: value=105519843, TIT2: description=null: value=那么爱你为什么, TPE1: description=null: value=阿强, TALB: description=null: value=华丽的外衣, TXXX: description=ID: value=105519843, APIC: mimeType=image/jpeg, description=] sample 0: time = 1792000 diff --git a/testdata/src/test/assets/flac/bear_with_id3_enabled_raw.3.dump b/testdata/src/test/assets/flac/bear_with_id3_enabled_raw.3.dump index c495780873..8ef6f9cb33 100644 --- a/testdata/src/test/assets/flac/bear_with_id3_enabled_raw.3.dump +++ b/testdata/src/test/assets/flac/bear_with_id3_enabled_raw.3.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 16384 channelCount = 2 sampleRate = 48000 - encoding = 2 + pcmEncoding = 2 metadata = entries=[TXXX: description=ID: value=105519843, TIT2: description=null: value=那么爱你为什么, TPE1: description=null: value=阿强, TALB: description=null: value=华丽的外衣, TXXX: description=ID: value=105519843, APIC: mimeType=image/jpeg, description=] sample 0: time = 2645333 diff --git a/testdata/src/test/assets/flac/bear_with_id3_enabled_raw.unknown_length.dump b/testdata/src/test/assets/flac/bear_with_id3_enabled_raw.unknown_length.dump index 932e3437ed..ca9f1a74a1 100644 --- a/testdata/src/test/assets/flac/bear_with_id3_enabled_raw.unknown_length.dump +++ b/testdata/src/test/assets/flac/bear_with_id3_enabled_raw.unknown_length.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 16384 channelCount = 2 sampleRate = 48000 - encoding = 2 + pcmEncoding = 2 metadata = entries=[TXXX: description=ID: value=105519843, TIT2: description=null: value=那么爱你为什么, TPE1: description=null: value=阿强, TALB: description=null: value=华丽的外衣, TXXX: description=ID: value=105519843, APIC: mimeType=image/jpeg, description=] sample 0: time = 0 diff --git a/testdata/src/test/assets/flac/bear_with_picture_raw.0.dump b/testdata/src/test/assets/flac/bear_with_picture_raw.0.dump index 15269ee2cb..0ca949ec09 100644 --- a/testdata/src/test/assets/flac/bear_with_picture_raw.0.dump +++ b/testdata/src/test/assets/flac/bear_with_picture_raw.0.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 16384 channelCount = 2 sampleRate = 48000 - encoding = 2 + pcmEncoding = 2 metadata = entries=[Picture: mimeType=image/png, description=] sample 0: time = 0 diff --git a/testdata/src/test/assets/flac/bear_with_picture_raw.1.dump b/testdata/src/test/assets/flac/bear_with_picture_raw.1.dump index c37f27c7df..075fcec267 100644 --- a/testdata/src/test/assets/flac/bear_with_picture_raw.1.dump +++ b/testdata/src/test/assets/flac/bear_with_picture_raw.1.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 16384 channelCount = 2 sampleRate = 48000 - encoding = 2 + pcmEncoding = 2 metadata = entries=[Picture: mimeType=image/png, description=] sample 0: time = 853333 diff --git a/testdata/src/test/assets/flac/bear_with_picture_raw.2.dump b/testdata/src/test/assets/flac/bear_with_picture_raw.2.dump index 6876396bd5..a49beeed80 100644 --- a/testdata/src/test/assets/flac/bear_with_picture_raw.2.dump +++ b/testdata/src/test/assets/flac/bear_with_picture_raw.2.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 16384 channelCount = 2 sampleRate = 48000 - encoding = 2 + pcmEncoding = 2 metadata = entries=[Picture: mimeType=image/png, description=] sample 0: time = 1792000 diff --git a/testdata/src/test/assets/flac/bear_with_picture_raw.3.dump b/testdata/src/test/assets/flac/bear_with_picture_raw.3.dump index 863e5282b4..22330e462a 100644 --- a/testdata/src/test/assets/flac/bear_with_picture_raw.3.dump +++ b/testdata/src/test/assets/flac/bear_with_picture_raw.3.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 16384 channelCount = 2 sampleRate = 48000 - encoding = 2 + pcmEncoding = 2 metadata = entries=[Picture: mimeType=image/png, description=] sample 0: time = 2645333 diff --git a/testdata/src/test/assets/flac/bear_with_picture_raw.unknown_length.dump b/testdata/src/test/assets/flac/bear_with_picture_raw.unknown_length.dump index 15269ee2cb..0ca949ec09 100644 --- a/testdata/src/test/assets/flac/bear_with_picture_raw.unknown_length.dump +++ b/testdata/src/test/assets/flac/bear_with_picture_raw.unknown_length.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 16384 channelCount = 2 sampleRate = 48000 - encoding = 2 + pcmEncoding = 2 metadata = entries=[Picture: mimeType=image/png, description=] sample 0: time = 0 diff --git a/testdata/src/test/assets/flac/bear_with_vorbis_comments_raw.0.dump b/testdata/src/test/assets/flac/bear_with_vorbis_comments_raw.0.dump index 267c7f0663..d6faa106c6 100644 --- a/testdata/src/test/assets/flac/bear_with_vorbis_comments_raw.0.dump +++ b/testdata/src/test/assets/flac/bear_with_vorbis_comments_raw.0.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 16384 channelCount = 2 sampleRate = 48000 - encoding = 2 + pcmEncoding = 2 metadata = entries=[VC: TITLE=test title, VC: ARTIST=test artist] sample 0: time = 0 diff --git a/testdata/src/test/assets/flac/bear_with_vorbis_comments_raw.1.dump b/testdata/src/test/assets/flac/bear_with_vorbis_comments_raw.1.dump index 8f032da3fc..7e2bac3904 100644 --- a/testdata/src/test/assets/flac/bear_with_vorbis_comments_raw.1.dump +++ b/testdata/src/test/assets/flac/bear_with_vorbis_comments_raw.1.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 16384 channelCount = 2 sampleRate = 48000 - encoding = 2 + pcmEncoding = 2 metadata = entries=[VC: TITLE=test title, VC: ARTIST=test artist] sample 0: time = 853333 diff --git a/testdata/src/test/assets/flac/bear_with_vorbis_comments_raw.2.dump b/testdata/src/test/assets/flac/bear_with_vorbis_comments_raw.2.dump index 663b45a631..642a7a973a 100644 --- a/testdata/src/test/assets/flac/bear_with_vorbis_comments_raw.2.dump +++ b/testdata/src/test/assets/flac/bear_with_vorbis_comments_raw.2.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 16384 channelCount = 2 sampleRate = 48000 - encoding = 2 + pcmEncoding = 2 metadata = entries=[VC: TITLE=test title, VC: ARTIST=test artist] sample 0: time = 1792000 diff --git a/testdata/src/test/assets/flac/bear_with_vorbis_comments_raw.3.dump b/testdata/src/test/assets/flac/bear_with_vorbis_comments_raw.3.dump index 7a27bb4e4b..262c5dde56 100644 --- a/testdata/src/test/assets/flac/bear_with_vorbis_comments_raw.3.dump +++ b/testdata/src/test/assets/flac/bear_with_vorbis_comments_raw.3.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 16384 channelCount = 2 sampleRate = 48000 - encoding = 2 + pcmEncoding = 2 metadata = entries=[VC: TITLE=test title, VC: ARTIST=test artist] sample 0: time = 2645333 diff --git a/testdata/src/test/assets/flac/bear_with_vorbis_comments_raw.unknown_length.dump b/testdata/src/test/assets/flac/bear_with_vorbis_comments_raw.unknown_length.dump index 267c7f0663..d6faa106c6 100644 --- a/testdata/src/test/assets/flac/bear_with_vorbis_comments_raw.unknown_length.dump +++ b/testdata/src/test/assets/flac/bear_with_vorbis_comments_raw.unknown_length.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 16384 channelCount = 2 sampleRate = 48000 - encoding = 2 + pcmEncoding = 2 metadata = entries=[VC: TITLE=test title, VC: ARTIST=test artist] sample 0: time = 0 diff --git a/testdata/src/test/assets/mka/bear-flac-16bit.mka.audiosink.dump b/testdata/src/test/assets/mka/bear-flac-16bit.mka.audiosink.dump index 9615ff0a6e..044cde306c 100644 --- a/testdata/src/test/assets/mka/bear-flac-16bit.mka.audiosink.dump +++ b/testdata/src/test/assets/mka/bear-flac-16bit.mka.audiosink.dump @@ -1,7 +1,7 @@ config: - encoding = 2 (16 bit) - channel count = 2 - sample rate = 48000 + pcmEncoding = 2 + channelCount = 2 + sampleRate = 48000 buffer: time = 1000 data = 1217833679 diff --git a/testdata/src/test/assets/mka/bear-flac-24bit.mka.audiosink.dump b/testdata/src/test/assets/mka/bear-flac-24bit.mka.audiosink.dump index efc3e0e9d0..319ee311f0 100644 --- a/testdata/src/test/assets/mka/bear-flac-24bit.mka.audiosink.dump +++ b/testdata/src/test/assets/mka/bear-flac-24bit.mka.audiosink.dump @@ -1,7 +1,7 @@ config: - encoding = 536870912 (24 bit) - channel count = 2 - sample rate = 48000 + pcmEncoding = 536870912 + channelCount = 2 + sampleRate = 48000 buffer: time = 0 data = 225023649 diff --git a/testdata/src/test/assets/wav/sample.wav.0.dump b/testdata/src/test/assets/wav/sample.wav.0.dump index 12efc0ae24..8b6c4a5c60 100644 --- a/testdata/src/test/assets/wav/sample.wav.0.dump +++ b/testdata/src/test/assets/wav/sample.wav.0.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 8820 channelCount = 1 sampleRate = 44100 - encoding = 2 + pcmEncoding = 2 sample 0: time = 0 flags = 1 diff --git a/testdata/src/test/assets/wav/sample.wav.1.dump b/testdata/src/test/assets/wav/sample.wav.1.dump index fb0f8202ef..65d3586462 100644 --- a/testdata/src/test/assets/wav/sample.wav.1.dump +++ b/testdata/src/test/assets/wav/sample.wav.1.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 8820 channelCount = 1 sampleRate = 44100 - encoding = 2 + pcmEncoding = 2 sample 0: time = 333333 flags = 1 diff --git a/testdata/src/test/assets/wav/sample.wav.2.dump b/testdata/src/test/assets/wav/sample.wav.2.dump index bdae910f97..bd9c8629e2 100644 --- a/testdata/src/test/assets/wav/sample.wav.2.dump +++ b/testdata/src/test/assets/wav/sample.wav.2.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 8820 channelCount = 1 sampleRate = 44100 - encoding = 2 + pcmEncoding = 2 sample 0: time = 666666 flags = 1 diff --git a/testdata/src/test/assets/wav/sample.wav.3.dump b/testdata/src/test/assets/wav/sample.wav.3.dump index f30bd85a83..ecf7512edc 100644 --- a/testdata/src/test/assets/wav/sample.wav.3.dump +++ b/testdata/src/test/assets/wav/sample.wav.3.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 8820 channelCount = 1 sampleRate = 44100 - encoding = 2 + pcmEncoding = 2 sample 0: time = 1000000 flags = 1 diff --git a/testdata/src/test/assets/wav/sample.wav.unknown_length.dump b/testdata/src/test/assets/wav/sample.wav.unknown_length.dump index 12efc0ae24..8b6c4a5c60 100644 --- a/testdata/src/test/assets/wav/sample.wav.unknown_length.dump +++ b/testdata/src/test/assets/wav/sample.wav.unknown_length.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 8820 channelCount = 1 sampleRate = 44100 - encoding = 2 + pcmEncoding = 2 sample 0: time = 0 flags = 1 diff --git a/testdata/src/test/assets/wav/sample_ima_adpcm.wav.0.dump b/testdata/src/test/assets/wav/sample_ima_adpcm.wav.0.dump index 8b6df6dfbb..992e8d06c2 100644 --- a/testdata/src/test/assets/wav/sample_ima_adpcm.wav.0.dump +++ b/testdata/src/test/assets/wav/sample_ima_adpcm.wav.0.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 8820 channelCount = 1 sampleRate = 44100 - encoding = 2 + pcmEncoding = 2 sample 0: time = 0 flags = 1 diff --git a/testdata/src/test/assets/wav/sample_ima_adpcm.wav.1.dump b/testdata/src/test/assets/wav/sample_ima_adpcm.wav.1.dump index 48dc91dc20..b21964fcd6 100644 --- a/testdata/src/test/assets/wav/sample_ima_adpcm.wav.1.dump +++ b/testdata/src/test/assets/wav/sample_ima_adpcm.wav.1.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 8820 channelCount = 1 sampleRate = 44100 - encoding = 2 + pcmEncoding = 2 sample 0: time = 339395 flags = 1 diff --git a/testdata/src/test/assets/wav/sample_ima_adpcm.wav.2.dump b/testdata/src/test/assets/wav/sample_ima_adpcm.wav.2.dump index 8b15562381..d478a25fe7 100644 --- a/testdata/src/test/assets/wav/sample_ima_adpcm.wav.2.dump +++ b/testdata/src/test/assets/wav/sample_ima_adpcm.wav.2.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 8820 channelCount = 1 sampleRate = 44100 - encoding = 2 + pcmEncoding = 2 sample 0: time = 678790 flags = 1 diff --git a/testdata/src/test/assets/wav/sample_ima_adpcm.wav.3.dump b/testdata/src/test/assets/wav/sample_ima_adpcm.wav.3.dump index 805133bb5b..6512731b9e 100644 --- a/testdata/src/test/assets/wav/sample_ima_adpcm.wav.3.dump +++ b/testdata/src/test/assets/wav/sample_ima_adpcm.wav.3.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 8820 channelCount = 1 sampleRate = 44100 - encoding = 2 + pcmEncoding = 2 sample 0: time = 1018185 flags = 1 diff --git a/testdata/src/test/assets/wav/sample_ima_adpcm.wav.unknown_length.dump b/testdata/src/test/assets/wav/sample_ima_adpcm.wav.unknown_length.dump index 8b6df6dfbb..992e8d06c2 100644 --- a/testdata/src/test/assets/wav/sample_ima_adpcm.wav.unknown_length.dump +++ b/testdata/src/test/assets/wav/sample_ima_adpcm.wav.unknown_length.dump @@ -16,7 +16,7 @@ track 0: maxInputSize = 8820 channelCount = 1 sampleRate = 44100 - encoding = 2 + pcmEncoding = 2 sample 0: time = 0 flags = 1 diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/CapturingAudioSink.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/CapturingAudioSink.java index 0982340b85..3ea2211ac2 100644 --- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/CapturingAudioSink.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/CapturingAudioSink.java @@ -19,11 +19,11 @@ import static com.google.common.truth.Truth.assertWithMessage; import android.content.Context; import androidx.annotation.Nullable; +import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.audio.AudioSink; import com.google.android.exoplayer2.audio.ForwardingAudioSink; import com.google.android.exoplayer2.util.Assertions; -import com.google.android.exoplayer2.util.Util; import java.io.File; import java.io.IOException; import java.io.PrintWriter; @@ -131,24 +131,24 @@ public final class CapturingAudioSink extends ForwardingAudioSink implements Dum private static final class DumpableConfiguration implements Dumper.Dumpable { - private final int inputEncoding; + @C.PcmEncoding private final int inputPcmEncoding; private final int inputChannelCount; private final int inputSampleRate; - public DumpableConfiguration(int inputEncoding, int inputChannelCount, int inputSampleRate) { - this.inputEncoding = inputEncoding; + public DumpableConfiguration( + @C.PcmEncoding int inputPcmEncoding, int inputChannelCount, int inputSampleRate) { + this.inputPcmEncoding = inputPcmEncoding; this.inputChannelCount = inputChannelCount; this.inputSampleRate = inputSampleRate; } @Override public void dump(Dumper dumper) { - int bitDepth = (Util.getPcmFrameSize(inputEncoding, /* channelCount= */ 1) * 8); dumper .startBlock("config") - .add("encoding", inputEncoding + " (" + bitDepth + " bit)") - .add("channel count", inputChannelCount) - .add("sample rate", inputSampleRate) + .add("pcmEncoding", inputPcmEncoding) + .add("channelCount", inputChannelCount) + .add("sampleRate", inputSampleRate) .endBlock(); } } diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackOutput.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackOutput.java index 5c225c8aeb..236eef0b60 100644 --- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackOutput.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackOutput.java @@ -312,7 +312,7 @@ public final class FakeTrackOutput implements TrackOutput, Dumper.Dumpable { addIfNonDefault(dumper, "pixelWidthHeightRatio", format -> format.pixelWidthHeightRatio); addIfNonDefault(dumper, "channelCount", format -> format.channelCount); addIfNonDefault(dumper, "sampleRate", format -> format.sampleRate); - addIfNonDefault(dumper, "encoding", format -> format.encoding); + addIfNonDefault(dumper, "pcmEncoding", format -> format.pcmEncoding); addIfNonDefault(dumper, "encoderDelay", format -> format.encoderDelay); addIfNonDefault(dumper, "encoderPadding", format -> format.encoderPadding); addIfNonDefault(dumper, "subsampleOffsetUs", format -> format.subsampleOffsetUs);