Skip to content

Commit 94e850c

Browse files
committed
Workaround: Put FFmpeg audio codecs first, as some devices fail otherwise
Some devices are failing if the FFMpeg audio rendered isn't first. As a short term workaround, put it first. This will however break 5.1/AC3 passthrough support.
1 parent 1545532 commit 94e850c

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

app/src/main/java/ie/macinnes/tvheadend/player/SimpleTvheadendPlayer.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,17 +60,20 @@ protected void buildAudioRenderers(Context context, Handler mainHandler, DrmSess
6060
SharedPreferences sharedPreferences = context.getSharedPreferences(Constants.PREFERENCE_TVHEADEND, Context.MODE_PRIVATE);
6161
final boolean enablePassthroughDecoder = sharedPreferences.getBoolean(Constants.KEY_AUDIO_PASSTHROUGH_DECODER_ENABLED, true);
6262

63-
// Native Audio Decoders
64-
Log.d(TAG, "Adding MediaCodecAudioRenderer");
65-
MediaCodecSelector mediaCodecSelector = buildMediaCodecSelector(enablePassthroughDecoder);
66-
out.add(new MediaCodecAudioRenderer(mediaCodecSelector, drmSessionManager,
67-
true, mainHandler, eventListener, audioCapabilities));
63+
// Some devices are failing if the FfmpegAudioRenderer isn't listed first. However, this
64+
// breaks AC3/5.1 passthrough. For now, put Ffmpeg first until we resolve the issue.
6865

6966
// FFMpeg Audio Decoder
7067
if (sharedPreferences.getBoolean(Constants.KEY_FFMPEG_AUDIO_ENABLED, true)) {
7168
Log.d(TAG, "Adding FfmpegAudioRenderer");
7269
out.add(new FfmpegAudioRenderer(mainHandler, eventListener, audioCapabilities));
7370
}
71+
72+
// Native Audio Decoders
73+
Log.d(TAG, "Adding MediaCodecAudioRenderer");
74+
MediaCodecSelector mediaCodecSelector = buildMediaCodecSelector(enablePassthroughDecoder);
75+
out.add(new MediaCodecAudioRenderer(mediaCodecSelector, drmSessionManager,
76+
true, mainHandler, eventListener, audioCapabilities));
7477
}
7578

7679
/**

0 commit comments

Comments
 (0)