-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
## Improvements * Add support for ExoPlayer 2.19 (#327) * Clean out code for old ExoPlayer support (#328) Co-authored-by: Emily Dixon <edixon@mux.com> Co-authored-by: GitHub <noreply@github.com>
- Loading branch information
1 parent
520ccc2
commit 56425ad
Showing
182 changed files
with
1,308 additions
and
34,351 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
97 changes: 97 additions & 0 deletions
97
...Adapter/src/exo-analytics-2_19-now/java/com/mux/stats/sdk/muxstats/SessionDataBindings.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| package com.mux.stats.sdk.muxstats | ||
|
|
||
| import com.google.android.exoplayer2.ExoPlayer | ||
| import com.google.android.exoplayer2.analytics.AnalyticsListener | ||
| import com.google.android.exoplayer2.source.hls.HlsManifest | ||
| import com.mux.stats.sdk.core.model.SessionTag | ||
| import com.mux.stats.sdk.core.util.MuxLogger | ||
| import com.mux.stats.sdk.muxstats.internal.isHlsExtensionAvailable | ||
| import com.mux.stats.sdk.muxstats.internal.weak | ||
| import java.util.regex.Matcher | ||
| import java.util.regex.Pattern | ||
|
|
||
| private class SessionDataPlayerBinding : MuxPlayerAdapter.PlayerBinding<ExoPlayer> { | ||
|
|
||
| private var listener: AnalyticsListener? by weak(null) | ||
|
|
||
| override fun bindPlayer(player: ExoPlayer, collector: MuxStateCollector) { | ||
| if (isHlsExtensionAvailable()) { | ||
| listener = SessionDataListener(player, collector).also { player.addAnalyticsListener(it) } | ||
| } | ||
| } | ||
|
|
||
| override fun unbindPlayer(player: ExoPlayer, collector: MuxStateCollector) { | ||
| listener?.let { player.removeAnalyticsListener(it) } | ||
| } | ||
|
|
||
| /** | ||
| * Listens for timeline changes and updates HLS session data if we're on an HLS stream. | ||
| * This class should only be instantiated if ExoPlayer's HLS extension is available at runtime | ||
| * @see [.isHlsExtensionAvailable] | ||
| */ | ||
| private class SessionDataListener(player: ExoPlayer, val collector: MuxStateCollector) : | ||
| AnalyticsListener { | ||
|
|
||
| private val player by weak(player) | ||
|
|
||
| companion object { | ||
| val RX_SESSION_TAG_DATA_ID by lazy { Pattern.compile("DATA-ID=\"(.*)\",") } | ||
| val RX_SESSION_TAG_VALUES by lazy { Pattern.compile("VALUE=\"(.*)\"") } | ||
|
|
||
| /** HLS session data tags with this Data ID will be sent to Mux Data */ | ||
| const val HLS_SESSION_LITIX_PREFIX = "io.litix.data." | ||
| const val LOG_TAG = "SessionDataListener" | ||
| } | ||
|
|
||
| override fun onTimelineChanged(eventTime: AnalyticsListener.EventTime, reason: Int) { | ||
| player?.let { safePlayer -> | ||
| val manifest = safePlayer.currentManifest | ||
| if (manifest is HlsManifest) { | ||
| collector.onMainPlaylistTags(parseHlsSessionData(manifest.multivariantPlaylist.tags)) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private fun parseHlsSessionData(hlsTags: List<String>): List<SessionTag> { | ||
| val data: MutableList<SessionTag> = ArrayList() | ||
| for (tag in filterHlsSessionTags(hlsTags)) { | ||
| val st: SessionTag = parseHlsSessionTag(tag) | ||
| if (st.key != null && st.key.contains(HLS_SESSION_LITIX_PREFIX)) { | ||
| data.add(parseHlsSessionTag(tag)) | ||
| } | ||
| } | ||
| return data | ||
| } | ||
|
|
||
| private fun filterHlsSessionTags(rawTags: List<String>) = | ||
| rawTags.filter { it.substring(1).startsWith("EXT-X-SESSION-DATA") } | ||
|
|
||
| private fun parseHlsSessionTag(line: String): SessionTag { | ||
| val dataId: Matcher = RX_SESSION_TAG_DATA_ID.matcher(line) | ||
| val value: Matcher = RX_SESSION_TAG_VALUES.matcher(line) | ||
| var parsedDataId: String? = "" | ||
| var parsedValue: String? = "" | ||
| if (dataId.find()) { | ||
| parsedDataId = dataId.group(1)?.replace(HLS_SESSION_LITIX_PREFIX, "") | ||
| } else { | ||
| MuxLogger.d(LOG_TAG, "Data-ID not found in session data: $line") | ||
| } | ||
| if (value.find()) { | ||
| parsedValue = value.group(1) | ||
| } else { | ||
| MuxLogger.d(LOG_TAG, "Value not found in session data: $line") | ||
| } | ||
| return SessionTag(parsedDataId, parsedValue) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Creates a listener that listens for timeline changes and updates HLS session data if we're on an | ||
| * HLS stream. | ||
| * This class should only be instantiated if ExoPlayer's HLS extension is available at runtime | ||
| * @see [.isHlsExtensionAvailable] | ||
| */ | ||
| @Suppress("unused") // using the receiver to avoid polluting customers' namespace | ||
| fun MuxStateCollector.createExoSessionDataBinding(): MuxPlayerAdapter.PlayerBinding<ExoPlayer> = | ||
| SessionDataPlayerBinding() |
38 changes: 38 additions & 0 deletions
38
...er/src/exo-analytics-just2_16/java/com/mux/stats/sdk/muxstats/AnalyticsListenerMetrics.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| package com.mux.stats.sdk.muxstats | ||
|
|
||
| import com.google.android.exoplayer2.ExoPlayer | ||
| import com.google.android.exoplayer2.analytics.AnalyticsListener | ||
| import com.mux.stats.sdk.core.util.MuxLogger | ||
| import com.mux.stats.sdk.muxstats.internal.exoAnalyticsListener | ||
| import com.mux.stats.sdk.muxstats.internal.logTag | ||
| import com.mux.stats.sdk.muxstats.internal.watchContentPosition | ||
|
|
||
| /** | ||
| * Binding to an ExoPlayer using AnalyticsListener | ||
| */ | ||
| private class AnalyticsListenerBinding216ToNow : MuxPlayerAdapter.PlayerBinding<ExoPlayer> { | ||
|
|
||
| private var listener: AnalyticsListener? = null//by weak(null) | ||
|
|
||
| init { | ||
| MuxLogger.d(logTag(), "created"); | ||
| } | ||
|
|
||
| override fun bindPlayer(player: ExoPlayer, collector: MuxStateCollector) { | ||
| listener = exoAnalyticsListener(player, collector).also { | ||
| player.addAnalyticsListener(it) | ||
| player.watchContentPosition(collector) | ||
| } | ||
| } | ||
|
|
||
| override fun unbindPlayer(player: ExoPlayer, collector: MuxStateCollector) { | ||
| listener?.let { player.removeAnalyticsListener(it) } | ||
| collector.positionWatcher?.stop("unbound") | ||
| } | ||
|
|
||
| } | ||
|
|
||
|
|
||
| @JvmSynthetic // Hides from java callers outside the module | ||
| internal fun analyticsListenerMetrics() | ||
| : MuxPlayerAdapter.PlayerBinding<ExoPlayer> = AnalyticsListenerBinding216ToNow() |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 0 additions & 19 deletions
19
...rAdapter/src/exo-collector-upto-2_10/java/com/mux/stats/sdk/muxstats/MuxStateCollector.kt
This file was deleted.
Oops, something went wrong.
49 changes: 0 additions & 49 deletions
49
...Adapter/src/exo-error-upto-2_13/java/com/mux/stats/sdk/muxstats/ExoErrorMetricsUpTo214.kt
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.