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

Add support for extracting 32-bit float WAVE

Browse Source 
Issue: #3379

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=179925320
This commit is contained in:
andrewlewis 2017-12-22 07:35:30 -08:00 committed by Oliver Woodman
parent f8c76f62e4
commit 42a3e2e9d2
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RELEASENOTES.md
View File

@ -23,6 +23,8 @@
* Audio: * Audio:
* Support 32-bit PCM float output from `DefaultAudioSink`, and add an option * Support 32-bit PCM float output from `DefaultAudioSink`, and add an option
to use this with `FfmpegAudioRenderer`. to use this with `FfmpegAudioRenderer`.
* Add support for extracting 32-bit WAVE files
([#3379](https://github.com/google/ExoPlayer/issues/3379)).
* Support extraction and decoding of Dolby Atmos * Support extraction and decoding of Dolby Atmos
([#2465](https://github.com/google/ExoPlayer/issues/2465)). ([#2465](https://github.com/google/ExoPlayer/issues/2465)).
* Fix handling of playback parameter changes while paused when followed by a * Fix handling of playback parameter changes while paused when followed by a

22
library/core/src/main/java/com/google/android/exoplayer2/extractor/wav/WavHeaderReader.java
View File

@ -31,6 +31,8 @@ import java.io.IOException;
/** Integer PCM audio data. */ /** Integer PCM audio data. */
private static final int TYPE_PCM = 0x0001; private static final int TYPE_PCM = 0x0001;
/** Float PCM audio data. */
private static final int TYPE_FLOAT = 0x0003;
/** Extended WAVE format. */ /** Extended WAVE format. */
private static final int TYPE_WAVE_FORMAT_EXTENSIBLE = 0xFFFE; private static final int TYPE_WAVE_FORMAT_EXTENSIBLE = 0xFFFE;
@ -87,14 +89,22 @@ import java.io.IOException;
+ blockAlignment); + blockAlignment);
} }
@C.PcmEncoding int encoding = Util.getPcmEncoding(bitsPerSample); @C.PcmEncoding int encoding;
if (encoding == C.ENCODING_INVALID) { switch (type) {
Log.e(TAG, "Unsupported WAV bit depth: " + bitsPerSample); case TYPE_PCM:
return null; case TYPE_WAVE_FORMAT_EXTENSIBLE:
encoding = Util.getPcmEncoding(bitsPerSample);
break;
case TYPE_FLOAT:
encoding = bitsPerSample == 32 ? C.ENCODING_PCM_FLOAT : C.ENCODING_INVALID;
break;
default:
Log.e(TAG, "Unsupported WAV format type: " + type);
return null;
} }
if (type != TYPE_PCM && type != TYPE_WAVE_FORMAT_EXTENSIBLE) { if (encoding == C.ENCODING_INVALID) {
Log.e(TAG, "Unsupported WAV format type: " + type); Log.e(TAG, "Unsupported WAV bit depth " + bitsPerSample + " for type " + type);
return null; return null;
} }