Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump exoplayer version to 2.15.1 #1724

Merged
merged 3 commits into from Oct 1, 2021
Merged

Bump exoplayer version to 2.15.1 #1724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37d4451
Bump Exoplayer version to 2.15.1
uvjustin Sep 24, 2021
29a763b
Replace deprecated CronetEngineWrapper with CronetEngine.Builder
uvjustin Sep 24, 2021
9ad1753
Remove unused import
uvjustin Sep 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/build.gradle.kts
View file
Open in desktop
Expand Up @@ -170,10 +170,10 @@ dependencies {
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.5.1")
testImplementation("org.altbeacon:android-beacon-library:2.19.2")

implementation("com.google.android.exoplayer:exoplayer-core:2.14.2")
implementation("com.google.android.exoplayer:exoplayer-hls:2.14.2")
implementation("com.google.android.exoplayer:exoplayer-ui:2.14.2")
implementation("com.google.android.exoplayer:extension-cronet:2.14.2")
implementation("com.google.android.exoplayer:exoplayer-core:2.15.1")
implementation("com.google.android.exoplayer:exoplayer-hls:2.15.1")
implementation("com.google.android.exoplayer:exoplayer-ui:2.15.1")
implementation("com.google.android.exoplayer:extension-cronet:2.15.1")
}

// Disable to fix memory leak and be compatible with the configuration cache.
Expand Down
6 changes: 2 additions & 4 deletions app/src/main/java/io/homeassistant/companion/android/webview/WebViewActivity.kt
View file
Open in desktop
Expand Up @@ -50,7 +50,6 @@ import com.google.android.exoplayer2.MediaItem
import com.google.android.exoplayer2.Player
import com.google.android.exoplayer2.SimpleExoPlayer
import com.google.android.exoplayer2.ext.cronet.CronetDataSource
import com.google.android.exoplayer2.ext.cronet.CronetEngineWrapper
import com.google.android.exoplayer2.source.DefaultMediaSourceFactory
import com.google.android.exoplayer2.ui.AspectRatioFrameLayout
import com.google.android.exoplayer2.ui.PlayerView
Expand Down Expand Up @@ -87,6 +86,7 @@ import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.withContext
import org.chromium.net.CronetEngine
import org.json.JSONObject
import java.util.concurrent.Executors
import javax.inject.Inject
Expand Down Expand Up @@ -641,9 +641,7 @@ class WebViewActivity : BaseActivity(), io.homeassistant.companion.android.webvi
exoPlayer = SimpleExoPlayer.Builder(applicationContext).setMediaSourceFactory(
DefaultMediaSourceFactory(
CronetDataSource.Factory(
CronetEngineWrapper(
applicationContext
),
CronetEngine.Builder(applicationContext).build(),
Executors.newSingleThreadExecutor()
)
)
Expand Down