Skip to content

SDK / exoplayer

Go to a project
Commit 14ab4f80 by tonihei
Options

Set LogSessionId on AudioTrack. 

This requires forwarding the PlayerId to the AudioSink.

PiperOrigin-RevId: 410509605
parent 45a5a758
Inline Side-by-side
Showing with 45 additions and 0 deletions
library/core/src/main/java/com/google/android/exoplayer2/audio/AudioSink.java
...@@ -24,6 +24,7 @@ import com.google.android.exoplayer2.Format; ...@@ -24,6 +24,7 @@ import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.PlaybackException; import com.google.android.exoplayer2.PlaybackException;
import com.google.android.exoplayer2.PlaybackParameters; import com.google.android.exoplayer2.PlaybackParameters;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.analytics.PlayerId;
import java.lang.annotation.Documented; import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
...@@ -282,6 +283,13 @@ public interface AudioSink { ...@@ -282,6 +283,13 @@ public interface AudioSink {
void setListener(Listener listener); void setListener(Listener listener);
/** /**
* Sets the {@link PlayerId} of the player using this audio sink.
*
* @param playerId The {@link PlayerId}, or null to clear a previously set id.
*/
default void setPlayerId(@Nullable PlayerId playerId) {}
/**
* Returns whether the sink supports a given {@link Format}. * Returns whether the sink supports a given {@link Format}.
* *
* @param format The format. * @param format The format.
......
library/core/src/main/java/com/google/android/exoplayer2/audio/DecoderAudioRenderer.java
...@@ -530,6 +530,7 @@ public abstract class DecoderAudioRenderer< ...@@ -530,6 +530,7 @@ public abstract class DecoderAudioRenderer<
} else { } else {
audioSink.disableTunneling(); audioSink.disableTunneling();
} }
audioSink.setPlayerId(getPlayerId());
} }
@Override @Override
......
library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
...@@ -23,6 +23,7 @@ import android.media.AudioFormat; ...@@ -23,6 +23,7 @@ import android.media.AudioFormat;
import android.media.AudioManager; import android.media.AudioManager;
import android.media.AudioTrack; import android.media.AudioTrack;
import android.media.PlaybackParams; import android.media.PlaybackParams;
import android.media.metrics.LogSessionId;
import android.os.ConditionVariable; import android.os.ConditionVariable;
import android.os.Handler; import android.os.Handler;
import android.os.SystemClock; import android.os.SystemClock;
...@@ -33,6 +34,7 @@ import androidx.annotation.RequiresApi; ...@@ -33,6 +34,7 @@ import androidx.annotation.RequiresApi;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.PlaybackParameters; import com.google.android.exoplayer2.PlaybackParameters;
import com.google.android.exoplayer2.analytics.PlayerId;
import com.google.android.exoplayer2.audio.AudioProcessor.UnhandledAudioFormatException; import com.google.android.exoplayer2.audio.AudioProcessor.UnhandledAudioFormatException;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.Log; import com.google.android.exoplayer2.util.Log;
...@@ -323,6 +325,7 @@ public final class DefaultAudioSink implements AudioSink { ...@@ -323,6 +325,7 @@ public final class DefaultAudioSink implements AudioSink {
initializationExceptionPendingExceptionHolder; initializationExceptionPendingExceptionHolder;
private final PendingExceptionHolder<WriteException> writeExceptionPendingExceptionHolder; private final PendingExceptionHolder<WriteException> writeExceptionPendingExceptionHolder;
@Nullable private PlayerId playerId;
@Nullable private Listener listener; @Nullable private Listener listener;
@Nullable private Configuration pendingConfiguration; @Nullable private Configuration pendingConfiguration;
@MonotonicNonNull private Configuration configuration; @MonotonicNonNull private Configuration configuration;
...@@ -478,6 +481,11 @@ public final class DefaultAudioSink implements AudioSink { ...@@ -478,6 +481,11 @@ public final class DefaultAudioSink implements AudioSink {
} }
@Override @Override
public void setPlayerId(@Nullable PlayerId playerId) {
this.playerId = playerId;
}
@Override
public boolean supportsFormat(Format format) { public boolean supportsFormat(Format format) {
return getFormatSupport(format) != SINK_FORMAT_UNSUPPORTED; return getFormatSupport(format) != SINK_FORMAT_UNSUPPORTED;
} }
...@@ -665,6 +673,9 @@ public final class DefaultAudioSink implements AudioSink { ...@@ -665,6 +673,9 @@ public final class DefaultAudioSink implements AudioSink {
configuration.inputFormat.encoderDelay, configuration.inputFormat.encoderPadding); configuration.inputFormat.encoderDelay, configuration.inputFormat.encoderPadding);
} }
} }
if (Util.SDK_INT >= 31 && playerId != null) {
Api31.setLogSessionIdOnAudioTrack(audioTrack, playerId);
}
audioSessionId = audioTrack.getAudioSessionId(); audioSessionId = audioTrack.getAudioSessionId();
audioTrackPositionTracker.setAudioTrack( audioTrackPositionTracker.setAudioTrack(
audioTrack, audioTrack,
...@@ -2094,6 +2105,7 @@ public final class DefaultAudioSink implements AudioSink { ...@@ -2094,6 +2105,7 @@ public final class DefaultAudioSink implements AudioSink {
audioSessionId); audioSessionId);
} }
@SuppressWarnings("deprecation") // Using deprecated AudioTrack constructor.
private AudioTrack createAudioTrackV9(AudioAttributes audioAttributes, int audioSessionId) { private AudioTrack createAudioTrackV9(AudioAttributes audioAttributes, int audioSessionId) {
int streamType = Util.getStreamTypeForAudioUsage(audioAttributes.usage); int streamType = Util.getStreamTypeForAudioUsage(audioAttributes.usage);
if (audioSessionId == C.AUDIO_SESSION_ID_UNSET) { if (audioSessionId == C.AUDIO_SESSION_ID_UNSET) {
...@@ -2216,4 +2228,16 @@ public final class DefaultAudioSink implements AudioSink { ...@@ -2216,4 +2228,16 @@ public final class DefaultAudioSink implements AudioSink {
pendingException = null; pendingException = null;
} }
} }
@RequiresApi(31)
private static final class Api31 {
private Api31() {}
public static void setLogSessionIdOnAudioTrack(AudioTrack audioTrack, PlayerId playerId) {
LogSessionId logSessionId = playerId.getLogSessionId();
if (!logSessionId.equals(LogSessionId.LOG_SESSION_ID_NONE)) {
audioTrack.setLogSessionId(logSessionId);
}
}
}
} }
library/core/src/main/java/com/google/android/exoplayer2/audio/ForwardingAudioSink.java
...@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.audio; ...@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.audio;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.PlaybackParameters; import com.google.android.exoplayer2.PlaybackParameters;
import com.google.android.exoplayer2.analytics.PlayerId;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
/** An overridable {@link AudioSink} implementation forwarding all methods to another sink. */ /** An overridable {@link AudioSink} implementation forwarding all methods to another sink. */
...@@ -35,6 +36,11 @@ public class ForwardingAudioSink implements AudioSink { ...@@ -35,6 +36,11 @@ public class ForwardingAudioSink implements AudioSink {
} }
@Override @Override
public void setPlayerId(@Nullable PlayerId playerId) {
sink.setPlayerId(playerId);
}
@Override
public boolean supportsFormat(Format format) { public boolean supportsFormat(Format format) {
return sink.supportsFormat(format); return sink.supportsFormat(format);
} }
......
library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
...@@ -500,6 +500,7 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media ...@@ -500,6 +500,7 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
} else { } else {
audioSink.disableTunneling(); audioSink.disableTunneling();
} }
audioSink.setPlayerId(getPlayerId());
} }
@Override @Override
......
library/core/src/test/java/com/google/android/exoplayer2/audio/DecoderAudioRendererTest.java
...@@ -30,6 +30,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; ...@@ -30,6 +30,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.RendererConfiguration; import com.google.android.exoplayer2.RendererConfiguration;
import com.google.android.exoplayer2.analytics.PlayerId;
import com.google.android.exoplayer2.decoder.CryptoConfig; import com.google.android.exoplayer2.decoder.CryptoConfig;
import com.google.android.exoplayer2.decoder.DecoderException; import com.google.android.exoplayer2.decoder.DecoderException;
import com.google.android.exoplayer2.decoder.DecoderInputBuffer; import com.google.android.exoplayer2.decoder.DecoderInputBuffer;
...@@ -84,6 +85,7 @@ public class DecoderAudioRendererTest { ...@@ -84,6 +85,7 @@ public class DecoderAudioRendererTest {
return FORMAT; return FORMAT;
} }
}; };
audioRenderer.init(/* index= */ 0, PlayerId.UNSET);
} }
@Config(sdk = 19) @Config(sdk = 19)
......
library/core/src/test/java/com/google/android/exoplayer2/audio/MediaCodecAudioRendererTest.java
...@@ -39,6 +39,7 @@ import com.google.android.exoplayer2.ExoPlaybackException; ...@@ -39,6 +39,7 @@ import com.google.android.exoplayer2.ExoPlaybackException;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.PlaybackException; import com.google.android.exoplayer2.PlaybackException;
import com.google.android.exoplayer2.RendererConfiguration; import com.google.android.exoplayer2.RendererConfiguration;
import com.google.android.exoplayer2.analytics.PlayerId;
import com.google.android.exoplayer2.drm.DrmSessionEventListener; import com.google.android.exoplayer2.drm.DrmSessionEventListener;
import com.google.android.exoplayer2.drm.DrmSessionManager; import com.google.android.exoplayer2.drm.DrmSessionManager;
import com.google.android.exoplayer2.mediacodec.MediaCodecInfo; import com.google.android.exoplayer2.mediacodec.MediaCodecInfo;
...@@ -110,6 +111,7 @@ public class MediaCodecAudioRendererTest { ...@@ -110,6 +111,7 @@ public class MediaCodecAudioRendererTest {
eventHandler, eventHandler,
audioRendererEventListener, audioRendererEventListener,
audioSink); audioSink);
mediaCodecAudioRenderer.init(/* index= */ 0, PlayerId.UNSET);
} }
@Test @Test
...@@ -264,6 +266,7 @@ public class MediaCodecAudioRendererTest { ...@@ -264,6 +266,7 @@ public class MediaCodecAudioRendererTest {
oneByteSample(/* timeUs= */ 0, C.BUFFER_FLAG_KEY_FRAME), END_OF_STREAM_ITEM)); oneByteSample(/* timeUs= */ 0, C.BUFFER_FLAG_KEY_FRAME), END_OF_STREAM_ITEM));
fakeSampleStream.writeData(/* startPositionUs= */ 0); fakeSampleStream.writeData(/* startPositionUs= */ 0);
exceptionThrowingRenderer.init(/* index= */ 0, PlayerId.UNSET);
exceptionThrowingRenderer.enable( exceptionThrowingRenderer.enable(
RendererConfiguration.DEFAULT, RendererConfiguration.DEFAULT,
new Format[] {AUDIO_AAC, changedFormat}, new Format[] {AUDIO_AAC, changedFormat},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment