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

Remove global AVPlayer instance #382

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove global AVPlayer instance #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9d771f
implement Android AVPlayer onError callback
rikner Dec 6, 2022
a02c239
remove global avplayer by derefencing AVPlayer instance from a pointe…
rikner Dec 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 44 additions & 18 deletions Sources/AVPlayer+Android.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ import JNI
public class AVPlayer: JNIObject {
public override static var className: String { "org.uikit.AVPlayer" }

public var onLoaded: ((Error?) -> Void)?
public var onError: ((ExoPlaybackError) -> Void)?
public var onVideoReady: (() -> Void)?
public var onVideoEnded: (() -> Void)?
public var onVideoBuffering: (() -> Void)?

public convenience init(playerItem: AVPlayerItem) {
let parentView = JavaSDLView(getSDLView())
try! self.init(arguments: parentView, playerItem.asset)
globalAVPlayer = self
try! self.call(methodName: "setUserContext", arguments: [self.userContext])
}

public func play() {
Expand Down Expand Up @@ -54,31 +54,57 @@ public class AVPlayer: JNIObject {
try? call(methodName: "cleanup")
}

public struct DataSourceError: Error {}
public struct ExoPlaybackError: Error {
let type: Int
let message: String
}
}

private weak var globalAVPlayer: AVPlayer?

@_cdecl("Java_org_uikit_AVPlayer_nativeOnVideoReady")
public func nativeOnVideoReady(env: UnsafeMutablePointer<JNIEnv>, cls: JavaObject) {
globalAVPlayer?.onLoaded?(nil)
globalAVPlayer?.onLoaded = nil

globalAVPlayer?.onVideoReady?()
public func nativeOnVideoReady(env: UnsafeMutablePointer<JNIEnv>, cls: JavaObject, userContext: JavaLong) {
AVPlayer.from(userContext: userContext)?.onVideoReady?()
}

@_cdecl("Java_org_uikit_AVPlayer_nativeOnVideoEnded")
public func nativeOnVideoEnded(env: UnsafeMutablePointer<JNIEnv>, cls: JavaObject) {
globalAVPlayer?.onVideoEnded?()
public func nativeOnVideoEnded(env: UnsafeMutablePointer<JNIEnv>, cls: JavaObject, userContext: JavaLong) {
AVPlayer.from(userContext: userContext)?.onVideoEnded?()
}

@_cdecl("Java_org_uikit_AVPlayer_nativeOnVideoBuffering")
public func nativeOnVideoBuffering(env: UnsafeMutablePointer<JNIEnv>, cls: JavaObject) {
globalAVPlayer?.onVideoBuffering?()
public func nativeOnVideoBuffering(env: UnsafeMutablePointer<JNIEnv>, cls: JavaObject, userContext: JavaLong) {
AVPlayer.from(userContext: userContext)?.onVideoBuffering?()
}

@_cdecl("Java_org_uikit_AVPlayer_nativeOnVideoSourceError")
public func nativeOnVideoSourceError(env: UnsafeMutablePointer<JNIEnv>, cls: JavaObject) {
globalAVPlayer?.onLoaded?(AVPlayer.DataSourceError())
globalAVPlayer?.onLoaded = nil
@_cdecl("Java_org_uikit_AVPlayer_nativeOnVideoError")
public func nativeOnVideoError(
env: UnsafeMutablePointer<JNIEnv>,
cls: JavaObject,
type: JavaInt,
message: JavaString,
userContext: JavaLong
) {
let error = AVPlayer.ExoPlaybackError(
type: Int(type),
message: (try? String(javaString: message)) ?? ""
)
AVPlayer.from(userContext: userContext)?.onError?(error)
}

extension AVPlayer {
static func from(userContext: JavaLong) -> AVPlayer? {
guard let reference = UnsafeRawPointer(bitPattern: Int(userContext)) else {
let msg = "Could not derefence AVPlayer instance from userContext."
print(msg)
assertionFailure(msg)
return nil
}
return Unmanaged<AVPlayer>.fromOpaque(reference).takeUnretainedValue()
}
}

extension JNIObject {
var userContext: JavaLong {
let ptr = Unmanaged.passUnretained(self).toOpaque()
return JavaLong(Int(bitPattern: ptr))
}
}
43 changes: 24 additions & 19 deletions src/main/java/org/uikit/VideoJNI.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import com.google.android.exoplayer2.*
import com.google.android.exoplayer2.database.ExoDatabaseProvider
import com.google.android.exoplayer2.source.ProgressiveMediaSource
import com.google.android.exoplayer2.trackselection.DefaultTrackSelector
import com.google.android.exoplayer2.ui.AspectRatioFrameLayout
import com.google.android.exoplayer2.ui.PlayerView
import com.google.android.exoplayer2.upstream.*
import com.google.android.exoplayer2.upstream.cache.CacheDataSink
Expand Down Expand Up @@ -45,32 +44,33 @@ class AVURLAsset(parent: SDLActivity, url: String) {
class AVPlayer(parent: SDLActivity, asset: AVURLAsset) {
internal val exoPlayer: SimpleExoPlayer
private var listener: Player.EventListener
private var userContext: Long? = null

external fun nativeOnVideoReady()
external fun nativeOnVideoEnded()
external fun nativeOnVideoBuffering()
external fun nativeOnVideoSourceError()
external fun nativeOnVideoReady(userContext: Long)
external fun nativeOnVideoEnded(userContext: Long)
external fun nativeOnVideoBuffering(userContext: Long)
external fun nativeOnVideoError(type: Int, message: String, userContext: Long)

init {
val exoPlayerBuilder = SimpleExoPlayer.Builder(parent.context)

val bandwidthMeter = DefaultBandwidthMeter.Builder(parent.context).build()
exoPlayerBuilder.setBandwidthMeter(bandwidthMeter)

val trackSelector = DefaultTrackSelector(parent.context)
exoPlayerBuilder.setTrackSelector(trackSelector)

exoPlayer = exoPlayerBuilder.build()

exoPlayer = SimpleExoPlayer.Builder(parent.context)
.setBandwidthMeter(bandwidthMeter)
.setTrackSelector(trackSelector)
.build()
exoPlayer.prepare()
exoPlayer.setMediaSource(asset.videoSource)

listener = object: Player.EventListener {
override fun onPlayerStateChanged(playWhenReady: Boolean, playbackState: Int) {
when (playbackState) {
Player.STATE_READY -> nativeOnVideoReady()
Player.STATE_ENDED -> nativeOnVideoEnded()
Player.STATE_BUFFERING -> nativeOnVideoBuffering()
else -> {}
[email protected]?.let { userContext ->
when (playbackState) {
Player.STATE_READY -> nativeOnVideoReady(userContext)
Player.STATE_ENDED -> nativeOnVideoEnded(userContext)
Player.STATE_BUFFERING -> nativeOnVideoBuffering(userContext)
else -> {}
}
}
}

Expand All @@ -82,16 +82,21 @@ class AVPlayer(parent: SDLActivity, asset: AVURLAsset) {
}

override fun onPlayerError(error: ExoPlaybackException) {
if (error.type == ExoPlaybackException.TYPE_SOURCE) {
nativeOnVideoSourceError()
[email protected]?.let { userContext ->
Log.e("SDL", "ExoPlaybackException occurred")
val message = error.message ?: "unknown"
nativeOnVideoError(error.type, message, userContext)
}
}
}

exoPlayer.addListener(listener)
}

fun setUserContext(ctx: Long) {
this.userContext = ctx
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you explain the naming of userContext? If the idea based on C APIs which take a void * userCtx parameter, then I think the naming might be too generic for what it really is.

From my current understanding, I would just call this "pointerToSwiftAVPlayerInstance" or something equally specific. userContext in the C meaning of the word is something very generic that could be anything at all, which is why it's usually defined as void*. That doesn't really fit our use case here 🙏🏼

}

fun play() {
// ExoPlayer API to play the video
exoPlayer.playWhenReady = true
Expand Down