Mirrors/grayjay
1
0
Fork 0
mirror of https://gitlab.futo.org/videostreaming/grayjay.git synced 2025-05-29 13:00:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

More casting fixes.

Browse Source
This commit is contained in:
Koen 2024-01-07 18:18:15 +01:00
parent ec12a06b88
commit 781d0797e7
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/com/futo/platformplayer/casting/FCastCastingDevice.kt
View File

@ -15,6 +15,7 @@ import com.futo.platformplayer.casting.models.FCastSetSpeedMessage
import com.futo.platformplayer.casting.models.FCastSetVolumeMessage import com.futo.platformplayer.casting.models.FCastSetVolumeMessage
import com.futo.platformplayer.casting.models.FCastVersionMessage import com.futo.platformplayer.casting.models.FCastVersionMessage
import com.futo.platformplayer.casting.models.FCastVolumeUpdateMessage import com.futo.platformplayer.casting.models.FCastVolumeUpdateMessage
import com.futo.platformplayer.ensureNotMainThread
import com.futo.platformplayer.getConnectedSocket import com.futo.platformplayer.getConnectedSocket
import com.futo.platformplayer.logging.Logger import com.futo.platformplayer.logging.Logger
import com.futo.platformplayer.models.CastingDeviceInfo import com.futo.platformplayer.models.CastingDeviceInfo
@ -298,6 +299,8 @@ class FCastCastingDevice : CastingDevice {
try { try {
_socket?.close() _socket?.close()
_inputStream?.close()
_outputStream?.close()
if (connectedSocket != null) { if (connectedSocket != null) {
Logger.i(TAG, "Using connected socket."); Logger.i(TAG, "Using connected socket.");
_socket = connectedSocket _socket = connectedSocket
@ -311,7 +314,9 @@ class FCastCastingDevice : CastingDevice {
_outputStream = _socket?.outputStream; _outputStream = _socket?.outputStream;
_inputStream = _socket?.inputStream; _inputStream = _socket?.inputStream;
} catch (e: IOException) { } catch (e: IOException) {
_socket?.close(); _socket?.close()
_inputStream?.close()
_outputStream?.close()
Logger.i(TAG, "Failed to connect to FastCast.", e); Logger.i(TAG, "Failed to connect to FastCast.", e);
connectionState = CastConnectionState.CONNECTING; connectionState = CastConnectionState.CONNECTING;
@ -333,7 +338,10 @@ class FCastCastingDevice : CastingDevice {
var headerBytesRead = 0 var headerBytesRead = 0
while (headerBytesRead < 4) { while (headerBytesRead < 4) {
headerBytesRead += inputStream.read(buffer, headerBytesRead, 4 - headerBytesRead) val read = inputStream.read(buffer, headerBytesRead, 4 - headerBytesRead)
if (read == -1)
throw Exception("Stream closed")
headerBytesRead += read
} }
val size = ((buffer[3].toLong() shl 24) or (buffer[2].toLong() shl 16) or (buffer[1].toLong() shl 8) or buffer[0].toLong()).toInt(); val size = ((buffer[3].toLong() shl 24) or (buffer[2].toLong() shl 16) or (buffer[1].toLong() shl 8) or buffer[0].toLong()).toInt();
@ -345,7 +353,10 @@ class FCastCastingDevice : CastingDevice {
Log.d(TAG, "Received header indicating $size bytes. Waiting for message."); Log.d(TAG, "Received header indicating $size bytes. Waiting for message.");
var bytesRead = 0 var bytesRead = 0
while (bytesRead < size) { while (bytesRead < size) {
bytesRead += inputStream.read(buffer, bytesRead, size - bytesRead) val read = inputStream.read(buffer, bytesRead, size - bytesRead)
if (read == -1)
throw Exception("Stream closed")
bytesRead += read
} }
val messageBytes = buffer.sliceArray(IntRange(0, size)); val messageBytes = buffer.sliceArray(IntRange(0, size));
@ -374,7 +385,8 @@ class FCastCastingDevice : CastingDevice {
try { try {
_socket?.close() _socket?.close()
_socket = null _inputStream?.close()
_outputStream?.close()
Logger.i(TAG, "Socket disconnected."); Logger.i(TAG, "Socket disconnected.");
} catch (e: Throwable) { } catch (e: Throwable) {
Logger.e(TAG, "Failed to close socket.", e) Logger.e(TAG, "Failed to close socket.", e)
@ -399,6 +411,8 @@ class FCastCastingDevice : CastingDevice {
try { try {
_socket?.close() _socket?.close()
_inputStream?.close()
_outputStream?.close()
} catch (e: Throwable) { } catch (e: Throwable) {
Log.w(TAG, "Failed to close socket.", e) Log.w(TAG, "Failed to close socket.", e)
} }
@ -477,6 +491,8 @@ class FCastCastingDevice : CastingDevice {
} }
private fun send(opcode: Opcode, message: String? = null) { private fun send(opcode: Opcode, message: String? = null) {
ensureNotMainThread()
synchronized (_outputStreamLock) { synchronized (_outputStreamLock) {
try { try {
val data: ByteArray = message?.encodeToByteArray() ?: ByteArray(0) val data: ByteArray = message?.encodeToByteArray() ?: ByteArray(0)
@ -536,6 +552,8 @@ class FCastCastingDevice : CastingDevice {
scopeIO.launch { scopeIO.launch {
socket.close(); socket.close();
_inputStream?.close()
_outputStream?.close()
connectionState = CastConnectionState.DISCONNECTED; connectionState = CastConnectionState.DISCONNECTED;
scopeIO.cancel(); scopeIO.cancel();
Logger.i(TAG, "Cancelled scopeIO with open socket.") Logger.i(TAG, "Cancelled scopeIO with open socket.")