loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-05 22:50:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix decoder selection for E-AC3 JOC streams

Browse Source 
Issue: #6398
PiperOrigin-RevId: 267563795
This commit is contained in:
andrewlewis 2019-09-06 11:15:33 +01:00 committed by Oliver Woodman
parent 72aa150f02
commit b9ffea6831
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RELEASENOTES.md
View File

@ -17,6 +17,8 @@
([#6396](https://github.com/google/ExoPlayer/issues/6396)). ([#6396](https://github.com/google/ExoPlayer/issues/6396)).
* Fix audio selection issue where languages are compared by bit rate * Fix audio selection issue where languages are compared by bit rate
([#6335](https://github.com/google/ExoPlayer/issues/6335)). ([#6335](https://github.com/google/ExoPlayer/issues/6335)).
* Fix decoder selection for E-AC3 JOC streams
([#6398](https://github.com/google/ExoPlayer/issues/6398)).
* Fix `PlayerNotificationManager` to show play icon rather than pause icon when * Fix `PlayerNotificationManager` to show play icon rather than pause icon when
playback is ended ([#6324](https://github.com/google/ExoPlayer/issues/6324)). playback is ended ([#6324](https://github.com/google/ExoPlayer/issues/6324)).
* Upgrade LibRtmp-Client-for-Android to fix RTMP playback issues * Upgrade LibRtmp-Client-for-Android to fix RTMP playback issues

8
library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
View File

@ -45,6 +45,7 @@ import com.google.android.exoplayer2.util.MediaClock;
import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.MimeTypes;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@ -369,10 +370,11 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
format.sampleMimeType, requiresSecureDecoder, /* requiresTunnelingDecoder= */ false); format.sampleMimeType, requiresSecureDecoder, /* requiresTunnelingDecoder= */ false);
if (MimeTypes.AUDIO_E_AC3_JOC.equals(format.sampleMimeType)) { if (MimeTypes.AUDIO_E_AC3_JOC.equals(format.sampleMimeType)) {
// E-AC3 decoders can decode JOC streams, but in 2-D rather than 3-D. // E-AC3 decoders can decode JOC streams, but in 2-D rather than 3-D.
List<MediaCodecInfo> eac3DecoderInfos = List<MediaCodecInfo> decoderInfosWithEac3 = new ArrayList<>(decoderInfos);
decoderInfosWithEac3.addAll(
mediaCodecSelector.getDecoderInfos( mediaCodecSelector.getDecoderInfos(
MimeTypes.AUDIO_E_AC3, requiresSecureDecoder, /* requiresTunnelingDecoder= */ false); MimeTypes.AUDIO_E_AC3, requiresSecureDecoder, /* requiresTunnelingDecoder= */ false));
decoderInfos.addAll(eac3DecoderInfos); decoderInfos = decoderInfosWithEac3;
} }
return Collections.unmodifiableList(decoderInfos); return Collections.unmodifiableList(decoderInfos);
} }

3
library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecSelector.java
View File

@ -51,7 +51,8 @@ public interface MediaCodecSelector {
* @param mimeType The MIME type for which a decoder is required. * @param mimeType The MIME type for which a decoder is required.
* @param requiresSecureDecoder Whether a secure decoder is required. * @param requiresSecureDecoder Whether a secure decoder is required.
* @param requiresTunnelingDecoder Whether a tunneling decoder is required. * @param requiresTunnelingDecoder Whether a tunneling decoder is required.
* @return A list of {@link MediaCodecInfo}s corresponding to decoders. May be empty. * @return An unmodifiable list of {@link MediaCodecInfo}s corresponding to decoders. May be
* empty.
* @throws DecoderQueryException Thrown if there was an error querying decoders. * @throws DecoderQueryException Thrown if there was an error querying decoders.
*/ */
List<MediaCodecInfo> getDecoderInfos( List<MediaCodecInfo> getDecoderInfos(

4
library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
View File

@ -146,8 +146,8 @@ public final class MediaCodecUtil {
* unless secure decryption really is required. * unless secure decryption really is required.
* @param tunneling Whether the decoder is required to support tunneling. Always pass false unless * @param tunneling Whether the decoder is required to support tunneling. Always pass false unless
* tunneling really is required. * tunneling really is required.
* @return A list of all {@link MediaCodecInfo}s for the given mime type, in the order given by * @return An unmodifiable list of all {@link MediaCodecInfo}s for the given mime type, in the
* {@link MediaCodecList}. * order given by {@link MediaCodecList}.
* @throws DecoderQueryException If there was an error querying the available decoders. * @throws DecoderQueryException If there was an error querying the available decoders.
*/ */
public static synchronized List<MediaCodecInfo> getDecoderInfos( public static synchronized List<MediaCodecInfo> getDecoderInfos(