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

Handle unsupported format xHE-AAC in FfmpegAudioRenderer

Browse Source 
Issue: androidx/media#803
PiperOrigin-RevId: 584333812
This commit is contained in:
rohks 2023-11-21 08:31:15 -08:00 committed by Copybara-Service
parent 0b22a7a0d8
commit 1360548649
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RELEASENOTES.md
View File

@ -93,6 +93,8 @@
([#710](https://github.com/androidx/media/pull/710)). ([#710](https://github.com/androidx/media/pull/710)).
* MIDI: Fix issue where seeking forward skips the Program Change events * MIDI: Fix issue where seeking forward skips the Program Change events
([#704](https://github.com/androidx/media/issues/704). ([#704](https://github.com/androidx/media/issues/704).
* Handle unsupported format `xHE-AAC` in `FfmpegAudioRenderer`
([#803](https://github.com/androidx/media/issues/803)).
* Leanback extension: * Leanback extension:
* Cast Extension: * Cast Extension:
* Sanitize creation of a `Timeline` to not crash the app when loading * Sanitize creation of a `Timeline` to not crash the app when loading

4
libraries/decoder_ffmpeg/src/main/java/androidx/media3/decoder/ffmpeg/FfmpegAudioRenderer.java
View File

@ -97,7 +97,9 @@ public final class FfmpegAudioRenderer extends DecoderAudioRenderer<FfmpegAudioD
return C.FORMAT_UNSUPPORTED_TYPE; return C.FORMAT_UNSUPPORTED_TYPE;
} else if (!FfmpegLibrary.supportsFormat(mimeType) } else if (!FfmpegLibrary.supportsFormat(mimeType)
|| (!sinkSupportsFormat(format, C.ENCODING_PCM_16BIT) || (!sinkSupportsFormat(format, C.ENCODING_PCM_16BIT)
&& !sinkSupportsFormat(format, C.ENCODING_PCM_FLOAT))) { && !sinkSupportsFormat(format, C.ENCODING_PCM_FLOAT))
|| (mimeType.equals(MimeTypes.AUDIO_AAC)
&& MimeTypes.getEncoding(mimeType, format.codecs) == C.ENCODING_AAC_XHE)) {
return C.FORMAT_UNSUPPORTED_SUBTYPE; return C.FORMAT_UNSUPPORTED_SUBTYPE;
} else if (format.cryptoType != C.CRYPTO_TYPE_NONE) { } else if (format.cryptoType != C.CRYPTO_TYPE_NONE) {
return C.FORMAT_UNSUPPORTED_DRM; return C.FORMAT_UNSUPPORTED_DRM;