This repository has been archived by the owner on Aug 19, 2023. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
33 changed files
with
1,488 additions
and
211 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
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
48 changes: 0 additions & 48 deletions
48
app/src/main/java/eu/darken/fpv/dvca/gear/goggles/DjiFpvGogglesV1.kt
This file was deleted.
Oops, something went wrong.
20 changes: 20 additions & 0 deletions
20
app/src/main/java/eu/darken/fpv/dvca/gear/goggles/Goggles.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,20 @@ | ||
| package eu.darken.fpv.dvca.gear.goggles | ||
|
|
||
| import com.google.android.exoplayer2.upstream.DataSource | ||
| import eu.darken.fpv.dvca.gear.Gear | ||
| import kotlinx.coroutines.flow.Flow | ||
|
|
||
| interface Goggles : Gear { | ||
|
|
||
| val videoFeed: Flow<VideoFeed?> | ||
|
|
||
| suspend fun startVideoFeed(): VideoFeed | ||
|
|
||
| suspend fun stopVideoFeed() | ||
|
|
||
| interface VideoFeed { | ||
| val exoDataSource: DataSource | ||
|
|
||
| fun close() | ||
| } | ||
| } |
110 changes: 110 additions & 0 deletions
110
app/src/main/java/eu/darken/fpv/dvca/gear/goggles/djifpv/FpvGogglesV1.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,110 @@ | ||
| package eu.darken.fpv.dvca.gear.goggles.djifpv | ||
|
|
||
| import eu.darken.fpv.dvca.App | ||
| import eu.darken.fpv.dvca.gear.Gear | ||
| import eu.darken.fpv.dvca.gear.GearManager | ||
| import eu.darken.fpv.dvca.gear.goggles.Goggles | ||
| import eu.darken.fpv.dvca.usb.DVCADevice | ||
| import eu.darken.fpv.dvca.usb.connection.DVCAConnection | ||
| import kotlinx.coroutines.flow.Flow | ||
| import kotlinx.coroutines.flow.MutableStateFlow | ||
| import kotlinx.coroutines.flow.filterNotNull | ||
| import timber.log.Timber | ||
| import javax.inject.Inject | ||
|
|
||
| class FpvGogglesV1( | ||
| private val gearManager: GearManager, | ||
| private val initialDevice: DVCADevice, | ||
| ) : Goggles { | ||
| private var currentDevice: DVCADevice? = initialDevice | ||
|
|
||
| override val device: DVCADevice | ||
| get() = currentDevice ?: initialDevice | ||
|
|
||
| override val isGearConnected: Boolean | ||
| get() = currentDevice != null | ||
|
|
||
| private val eventsInternal = MutableStateFlow<Gear.Event?>(null) | ||
| override val events: Flow<Gear.Event> | ||
| get() = eventsInternal.filterNotNull() | ||
|
|
||
| private var wasVideoActive: Boolean = false | ||
|
|
||
| override suspend fun updateDevice(device: DVCADevice?) { | ||
| Timber.tag(TAG).d("updateDevice(device=%s)", device) | ||
|
|
||
| val reconnect = device != null && currentDevice == null | ||
|
|
||
| if (device == null) { | ||
| Timber.tag(TAG).w("Device disconnected!") | ||
|
|
||
| if (videoFeedInternal.value != null) { | ||
| wasVideoActive = true | ||
| Timber.tag(TAG).d("Video feed was active on disconnect, will restart after reconnect.") | ||
| } | ||
|
|
||
| stopVideoFeed() | ||
| eventsInternal.value = Gear.Event.GearDetached(this) | ||
| } else if (reconnect) { | ||
| Timber.tag(TAG).w("Device reconnected!") | ||
|
|
||
| eventsInternal.value = Gear.Event.GearAttached(this) | ||
| if (wasVideoActive) { | ||
| Timber.tag(TAG).i("Video feed was previously active, starting again.") | ||
| startVideoFeed() | ||
| } | ||
| } | ||
|
|
||
| currentDevice = device | ||
| } | ||
|
|
||
| private val videoFeedInternal = MutableStateFlow<Goggles.VideoFeed?>(null) | ||
| override val videoFeed: Flow<Goggles.VideoFeed?> = videoFeedInternal | ||
|
|
||
| private var connection: DVCAConnection? = null | ||
|
|
||
| override suspend fun startVideoFeed(): Goggles.VideoFeed { | ||
| Timber.tag(TAG).i("startVideoFeed()") | ||
| videoFeedInternal.value?.let { | ||
| Timber.tag(TAG).w("Feed is already active!") | ||
| return it | ||
| } | ||
|
|
||
| connection = device.openConnection() | ||
| return FpvGogglesV1VideoFeed(connection!!).also { feed -> | ||
| videoFeedInternal.value = feed | ||
| } | ||
| } | ||
|
|
||
| override suspend fun stopVideoFeed() { | ||
| Timber.tag(TAG).i("stopVideoFeed()") | ||
| videoFeedInternal.value?.close() | ||
| videoFeedInternal.value = null | ||
|
|
||
| connection?.close() | ||
| connection = null | ||
|
|
||
| wasVideoActive = true | ||
| } | ||
|
|
||
| companion object { | ||
| private val TAG = App.logTag("Gear", "FpvGogglesV1") | ||
| private const val VENDOR_ID = 11427 | ||
| private const val PRODUCT_ID = 31 | ||
| } | ||
|
|
||
| class Factory @Inject constructor() : Gear.Factory { | ||
|
|
||
| override fun canHandle(device: DVCADevice): Boolean = device.rawDevice.run { | ||
| vendorId == VENDOR_ID && productId == PRODUCT_ID | ||
| } | ||
|
|
||
| override fun create( | ||
| gearManager: GearManager, | ||
| device: DVCADevice | ||
| ): Goggles = FpvGogglesV1( | ||
| gearManager = gearManager, | ||
| initialDevice = device, | ||
| ) | ||
| } | ||
| } |
Oops, something went wrong.