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

updates #95

Merged
merged 3 commits into from
Jan 1, 2024
Merged

updates #95

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
ea5a59c
public
zoff99 Jan 1, 2024
cfc66bc
show some toxav stats in the logs again while calling
zoff99 Jan 1, 2024
955eafb
make buttons smaller, add a hackish lower vbitrate button when connec…
zoff99 Jan 1, 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
4 changes: 2 additions & 2 deletions src/main/java/com/zoffcc/applications/trifa/TRIFAGlobals.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ public class TRIFAGlobals
final static int USE_MAX_NUMBER_OF_BOOTSTRAP_TCP_RELAYS = 40;

final static int HIGHER_GLOBAL_VIDEO_BITRATE = 3500;
final static int NORMAL_GLOBAL_VIDEO_BITRATE = 1500;
public final static int NORMAL_GLOBAL_VIDEO_BITRATE = 1500;
public final static int SUPERHIGH_GLOBAL_VIDEO_BITRATE = 8000;
final static int LOWER_GLOBAL_VIDEO_BITRATE = 250;
public final static int LOWER_GLOBAL_VIDEO_BITRATE = 350;

final static int HIGHER_GLOBAL_AUDIO_BITRATE = 128;
final static int NORMAL_GLOBAL_AUDIO_BITRATE = 16; // 64;
Expand Down
42 changes: 38 additions & 4 deletions src/main/kotlin/Main.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ import androidx.compose.material.icons.filled.QrCode2
import androidx.compose.material.icons.filled.RawOff
import androidx.compose.material.icons.filled.Refresh
import androidx.compose.material.icons.filled.Send
import androidx.compose.material.icons.filled.SignalCellular4Bar
import androidx.compose.material.icons.filled.Videocam
import androidx.compose.material.rememberScaffoldState
import androidx.compose.material3.CenterAlignedTopAppBar
Expand Down Expand Up @@ -517,7 +518,7 @@ fun App()
maxLines = 1)
}
Column {
Icon(modifier = Modifier.padding(5.dp)
Icon(modifier = Modifier.padding(start = 5.dp, end = 5.dp, top = 2.dp).size(19.dp)
.combinedClickable(onClick = {
if (video_in_box_small)
{
Expand All @@ -538,7 +539,7 @@ fun App()
contentDescription = "toggle large incoming video size"
)
var audio_filter_current_value by remember { mutableStateOf(PREF__audio_input_filter) }
Icon(modifier = Modifier.padding(5.dp).combinedClickable(
Icon(modifier = Modifier.padding(start = 5.dp, end = 5.dp, top = 2.dp).size(19.dp).combinedClickable(
onClick = {
if (PREF__audio_input_filter == 0)
{
Expand All @@ -554,7 +555,7 @@ fun App()
contentDescription = "enable Noise Suppresion on audio capture",
tint = if (audio_filter_current_value == 1) Color.Red else Color.DarkGray)
var video_force_mjpeg_value by remember { mutableStateOf(PREF__v4l2_capture_force_mjpeg) }
Icon(modifier = Modifier.padding(5.dp).combinedClickable(
Icon(modifier = Modifier.padding(start = 5.dp, end = 5.dp, top = 2.dp).size(19.dp).combinedClickable(
onClick = {
if (PREF__v4l2_capture_force_mjpeg == 0)
{
Expand All @@ -569,8 +570,41 @@ fun App()
contentDescription = "force MJPEG on video capture",
tint = if (video_force_mjpeg_value == 1) Color.Red else Color.DarkGray)

var video_low_bitrate by remember { mutableStateOf(false) }
Icon(modifier = Modifier.padding(start = 5.dp, end = 5.dp, top = 2.dp).size(19.dp).combinedClickable(
onClick = {
try
{
if (!savepathstore.isEnabled())
{
val friendnum = tox_friend_by_public_key(avstatestore.state.call_with_friend_pubkey_get())
if (avstatestore.state.call_with_friend_pubkey_get() != null)
{
video_low_bitrate = !video_low_bitrate
if (video_low_bitrate)
{
MainActivity.toxav_option_set(friendnum,
ToxVars.TOXAV_OPTIONS_OPTION.TOXAV_ENCODER_VIDEO_MAX_BITRATE.value.toLong(),
TRIFAGlobals.LOWER_GLOBAL_VIDEO_BITRATE.toLong())
} else
{
MainActivity.toxav_option_set(friendnum,
ToxVars.TOXAV_OPTIONS_OPTION.TOXAV_ENCODER_VIDEO_MAX_BITRATE.value.toLong(),
TRIFAGlobals.NORMAL_GLOBAL_VIDEO_BITRATE.toLong())
}
}
}
}
catch (_: java.lang.Exception)
{
}
}),
imageVector = Icons.Default.SignalCellular4Bar,
contentDescription = "force lower video bitrate",
tint = if (video_low_bitrate) Color.Red else Color.DarkGray)

var video_super_hq_value by remember { mutableStateOf(PREF__video_super_hq) }
Icon(modifier = Modifier.padding(5.dp).combinedClickable(
Icon(modifier = Modifier.padding(start = 5.dp, end = 5.dp, top = 2.dp).size(19.dp).combinedClickable(
onClick = {
if (PREF__video_super_hq == 0)
{
Expand Down
12 changes: 6 additions & 6 deletions src/main/kotlin/com/zoffcc/applications/trifa/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1341,21 +1341,21 @@ class MainActivity
{
if (a_TOXAV_CALL_COMM_INFO == ToxVars.TOXAV_CALL_COMM_INFO.TOXAV_CALL_COMM_DECODER_CURRENT_BITRATE.value.toLong())
{
// Log.i(TAG, "call_comm_cb: fnum: " + friend_number
// + " DECODER_CURRENT_BITRATE = " + comm_number)
Log.i(TAG, "call_comm_cb: fnum: " + friend_number
+ " DECODER_CURRENT_BITRATE = " + comm_number)
avstatestorevplayfpsstate.updateDecoderVBitrate(comm_number.toInt())
}
else if (a_TOXAV_CALL_COMM_INFO == ToxVars.TOXAV_CALL_COMM_INFO.TOXAV_CALL_COMM_ENCODER_CURRENT_BITRATE.value.toLong())
{
// Log.i(TAG, "call_comm_cb: fnum: " + friend_number
// + " ENCODER_CURRENT_BITRATE = " + comm_number)
Log.i(TAG, "call_comm_cb: fnum: " + friend_number
+ " ENCODER_CURRENT_BITRATE = " + comm_number)
avstatestorevcapfpsstate.updateEncoderVBitrate(comm_number.toInt())

}
else if (a_TOXAV_CALL_COMM_INFO == ToxVars.TOXAV_CALL_COMM_INFO.TOXAV_CALL_COMM_NETWORK_ROUND_TRIP_MS.value.toLong())
{
// Log.i(TAG, "call_comm_cb: fnum: " + friend_number
// + " NETWORK_ROUND_TRIP_MS = " + comm_number)
Log.i(TAG, "call_comm_cb: fnum: " + friend_number
+ " NETWORK_ROUND_TRIP_MS = " + comm_number)
}
else if (a_TOXAV_CALL_COMM_INFO == ToxVars.TOXAV_CALL_COMM_INFO.TOXAV_CALL_COMM_PLAY_DELAY.value.toLong())
{
Expand Down
Loading