mirror of
https://github.com/samsonjs/media.git
synced 2026-04-06 11:25:46 +00:00
Change format logged when AudioSink throws InitializationException
Change what format is logged from MediaCodecAudioRenderer when
AudioSink throws InitializationException. We printed the
AudioSink's format, which most of the times is audio/raw (PCM)
and not the renderer's format. With this change both formats are
logged.
#minor-release
Issue: google/ExoPlayer#11066
PiperOrigin-RevId: 523456840
(cherry picked from commit baf1aa1cdb)
This commit is contained in:
parent
0690c9ba67
commit
abc9d8ceda
2 changed files with 7 additions and 2 deletions
|
|
@ -189,6 +189,8 @@ public interface AudioSink {
|
|||
+ audioTrackState
|
||||
+ " "
|
||||
+ ("Config(" + sampleRate + ", " + channelConfig + ", " + bufferSize + ")")
|
||||
+ " "
|
||||
+ format
|
||||
+ (isRecoverable ? " (recoverable)" : ""),
|
||||
audioTrackException);
|
||||
this.audioTrackState = audioTrackState;
|
||||
|
|
|
|||
|
|
@ -105,6 +105,7 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
|
|||
|
||||
private int codecMaxInputSize;
|
||||
private boolean codecNeedsDiscardChannelsWorkaround;
|
||||
@Nullable private Format inputFormat;
|
||||
/** Codec used for DRM decryption only in passthrough and offload. */
|
||||
@Nullable private Format decryptOnlyCodecFormat;
|
||||
|
||||
|
|
@ -500,8 +501,9 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
|
|||
@Nullable
|
||||
protected DecoderReuseEvaluation onInputFormatChanged(FormatHolder formatHolder)
|
||||
throws ExoPlaybackException {
|
||||
inputFormat = checkNotNull(formatHolder.format);
|
||||
@Nullable DecoderReuseEvaluation evaluation = super.onInputFormatChanged(formatHolder);
|
||||
eventDispatcher.inputFormatChanged(formatHolder.format, evaluation);
|
||||
eventDispatcher.inputFormatChanged(inputFormat, evaluation);
|
||||
return evaluation;
|
||||
}
|
||||
|
||||
|
|
@ -604,6 +606,7 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
|
|||
@Override
|
||||
protected void onDisabled() {
|
||||
audioSinkNeedsReset = true;
|
||||
inputFormat = null;
|
||||
try {
|
||||
audioSink.flush();
|
||||
} finally {
|
||||
|
|
@ -711,7 +714,7 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
|
|||
fullyConsumed = audioSink.handleBuffer(buffer, bufferPresentationTimeUs, sampleCount);
|
||||
} catch (InitializationException e) {
|
||||
throw createRendererException(
|
||||
e, e.format, e.isRecoverable, PlaybackException.ERROR_CODE_AUDIO_TRACK_INIT_FAILED);
|
||||
e, inputFormat, e.isRecoverable, PlaybackException.ERROR_CODE_AUDIO_TRACK_INIT_FAILED);
|
||||
} catch (WriteException e) {
|
||||
throw createRendererException(
|
||||
e, format, e.isRecoverable, PlaybackException.ERROR_CODE_AUDIO_TRACK_WRITE_FAILED);
|
||||
|
|
|
|||
Loading…
Reference in a new issue