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

show placeholder for in and out video boxes if no video is active #166

Merged
merged 3 commits into from
Feb 23, 2024
Merged

show placeholder for in and out video boxes if no video is active #166

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
0e21dbe
add image from
zoff99 Feb 22, 2024
3457ca7
WIP: ngc video status in case we need it later
zoff99 Feb 22, 2024
fada934
show placeholder for in and out video boxes if no video is active
zoff99 Feb 22, 2024
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
129 changes: 86 additions & 43 deletions src/main/kotlin/Main.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.wrapContentHeight
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.material.Button
import androidx.compose.material.ButtonDefaults
Expand Down Expand Up @@ -66,6 +67,7 @@ import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.Modifier
import androidx.compose.ui.awt.SwingPanel
import androidx.compose.ui.composed
import androidx.compose.ui.draw.clip
import androidx.compose.ui.draw.drawWithCache
import androidx.compose.ui.draw.scale
import androidx.compose.ui.focus.FocusRequester
Expand Down Expand Up @@ -186,6 +188,7 @@ import com.vanniktech.emoji.search.SearchEmojiManager
import com.zoffcc.applications.ffmpegav.AVActivity.JAVA_AUDIO_IN_DEVICE_NAME
import com.zoffcc.applications.trifa.EmojiStrAndName
import com.zoffcc.applications.trifa.FriendSettingDetails
import com.zoffcc.applications.trifa.HelperGeneric.ngc_video_frame_last_incoming_ts
import com.zoffcc.applications.trifa.MainActivity.Companion.DEBUG_COMPOSE_UI_UPDATES
import com.zoffcc.applications.trifa.MainActivity.Companion.PREF__do_not_sync_av
import org.briarproject.briar.desktop.ui.Tooltip
Expand Down Expand Up @@ -214,6 +217,7 @@ val SPACE_AFTER_LAST_MESSAGE = 2.dp
val SPACE_BEFORE_FIRST_MESSAGE = 10.dp
const val CAPTURE_VIDEO_FPS = 15
const val CAPTURE_VIDEO_HIGH_FPS = 30
const val VIDEO_PLACEHOLDER_ALPHA = 0.2f
val VIDEO_IN_BOX_WIDTH_SMALL = 80.dp
val VIDEO_IN_BOX_HEIGHT_SMALL = 80.dp
const val VIDEO_IN_BOX_WIDTH_FRACTION_SMALL = 0.3f
Expand Down Expand Up @@ -481,29 +485,50 @@ fun App()
var video_in_box_small by remember { mutableStateOf(true) }
var video_in_box_width_fraction by remember { mutableStateOf(VIDEO_IN_BOX_WIDTH_FRACTION_SMALL) }
Column(modifier = Modifier.fillMaxHeight(1.0f)) {
SwingPanel(
background = Color.Green,
modifier = Modifier.fillMaxWidth(video_in_box_width_fraction)
.padding(5.dp)
.weight(80.0f)
.combinedClickable(onClick = {
if (video_in_box_small)
{
video_in_box_width = VIDEO_IN_BOX_WIDTH_BIG
video_in_box_height = VIDEO_IN_BOX_HEIGHT_BIG
} else
{
video_in_box_width = VIDEO_IN_BOX_WIDTH_SMALL
video_in_box_height = VIDEO_IN_BOX_HEIGHT_SMALL
if ((current_callstate2.call_state == AVState.CALL_STATUS.CALL_STATUS_NONE) &&
((ngc_video_frame_last_incoming_ts + 2000) < System.currentTimeMillis()))
{
val painter = painterResource("Tv-test-pattern-146649_640.png")
Tooltip(text = "incoming Video") {
Image(
modifier = Modifier.fillMaxWidth(video_in_box_width_fraction)
.padding(5.dp)
.weight(80.0f)
.clip(RoundedCornerShape(10.dp))
.border(1.dp, color = Color.Gray, RoundedCornerShape(10.dp)),
alpha = VIDEO_PLACEHOLDER_ALPHA,
contentScale = ContentScale.Crop,
painter = painter,
contentDescription = "incoming Video"
)
}
}
else
{
SwingPanel(
background = Color.Green,
modifier = Modifier.fillMaxWidth(video_in_box_width_fraction)
.padding(5.dp)
.weight(80.0f)
.combinedClickable(onClick = {
if (video_in_box_small)
{
video_in_box_width = VIDEO_IN_BOX_WIDTH_BIG
video_in_box_height = VIDEO_IN_BOX_HEIGHT_BIG
} else
{
video_in_box_width = VIDEO_IN_BOX_WIDTH_SMALL
video_in_box_height = VIDEO_IN_BOX_HEIGHT_SMALL
}
video_in_box_small != video_in_box_small
}),
factory = {
JPanel(SingleComponentAspectRatioKeeperLayout(), true).apply {
add(JPictureBox.videoinbox)
}
video_in_box_small != video_in_box_small
}),
factory = {
JPanel(SingleComponentAspectRatioKeeperLayout(), true).apply {
add(JPictureBox.videoinbox)
}
}
)
)
}
val current_vplayfps_state by avstatestorevplayfpsstate.stateFlow.collectAsState()
/*
Text(if (current_vplayfps_state.videoplayfps_state == 0) "" else (" fps: " + current_vplayfps_state.videoplayfps_state),
Expand Down Expand Up @@ -660,29 +685,47 @@ fun App()
var video_out_box_width by remember { mutableStateOf(VIDEO_OUT_BOX_WIDTH_SMALL) }
var video_out_box_height by remember { mutableStateOf(VIDEO_OUT_BOX_HEIGHT_SMALL) }
var video_out_box_small by remember { mutableStateOf(true) }
SwingPanel(
background = Color.Green,
modifier = Modifier.size(video_out_box_width, video_out_box_height)
.combinedClickable(onClick = {
if (video_out_box_small)
{
video_out_box_width = VIDEO_OUT_BOX_WIDTH_BIG
video_out_box_height = VIDEO_OUT_BOX_HEIGHT_BIG
} else
{
video_out_box_width = VIDEO_OUT_BOX_WIDTH_SMALL
video_out_box_height = VIDEO_OUT_BOX_HEIGHT_SMALL
if (current_callstate2.call_state == AVState.CALL_STATUS.CALL_STATUS_NONE)
{
val painter = painterResource("Tv-test-pattern-146649_640.png")
Tooltip(text = "own Video") {
Image(
modifier = Modifier.size(video_out_box_width, video_out_box_height)
.clip(RoundedCornerShape(10.dp))
.border(1.dp, color = Color.Gray, RoundedCornerShape(10.dp)),
alpha = VIDEO_PLACEHOLDER_ALPHA,
contentScale = ContentScale.Crop,
painter = painter,
contentDescription = "own Video"
)
}
}
else
{
SwingPanel(
background = Color.Green,
modifier = Modifier.size(video_out_box_width, video_out_box_height)
.combinedClickable(onClick = {
if (video_out_box_small)
{
video_out_box_width = VIDEO_OUT_BOX_WIDTH_BIG
video_out_box_height = VIDEO_OUT_BOX_HEIGHT_BIG
} else
{
video_out_box_width = VIDEO_OUT_BOX_WIDTH_SMALL
video_out_box_height = VIDEO_OUT_BOX_HEIGHT_SMALL
}
video_out_box_small = !video_out_box_small
Log.i(TAG, "update1: " + video_out_box_small)
}),
factory = {
JPanel(SingleComponentAspectRatioKeeperLayout(), true).apply {
add(JPictureBoxOut.videooutbox)
}
video_out_box_small = !video_out_box_small
Log.i(TAG, "update1: " + video_out_box_small)
}),
factory = {
JPanel(SingleComponentAspectRatioKeeperLayout(), true).apply {
add(JPictureBoxOut.videooutbox)
}
},
update = { Log.i(TAG, "update2: " + video_out_box_small) }
)
},
update = { Log.i(TAG, "update2: " + video_out_box_small) }
)
}
val current_vicfps_state by avstatestorevcapfpsstate.stateFlow.collectAsState()

/*
Expand Down
10 changes: 10 additions & 0 deletions src/main/kotlin/com/zoffcc/applications/trifa/AVState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,16 @@ data class AVState(val a: Int)
CALL_STATUS_CALLING,
CALL_STATUS_ENDING
}

/*
enum class NGC_CALL_STATUS {
CALL_STATUS_NONE,
CALL_STATUS_INCOMING,
CALL_STATUS_CALLING,
CALL_STATUS_ENDING
}
*/

enum class CALLVIDEO {
CALLVIDEO_NONE,
CALLVIDEO_INCOMING,
Expand Down
Binary file added src/main/resources/Tv-test-pattern-146649_640.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading