Skip to content

Commit 829f1d8

Browse files
committed
show incoming H265 codec video in top status
1 parent 40869dc commit 829f1d8

File tree

4 files changed

+15
-1
lines changed

4 files changed

+15
-1
lines changed

android-refimpl-app/app/src/main/java/com/zoffcc/applications/trifa/Callstate.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import static com.zoffcc.applications.trifa.CallingActivity.set_debug_text;
2727
import static com.zoffcc.applications.trifa.TRIFAGlobals.GLOBAL_AUDIO_BITRATE;
2828
import static com.zoffcc.applications.trifa.TRIFAGlobals.GLOBAL_VIDEO_BITRATE;
29+
import static com.zoffcc.applications.trifa.TRIFAGlobals.VIDEO_CODEC_H265;
2930
import static com.zoffcc.applications.trifa.TRIFAGlobals.VIDEO_CODEC_VP8;
3031

3132
public class Callstate
@@ -112,6 +113,10 @@ public static String codec_to_str(long v)
112113
{
113114
return "VP8";
114115
}
116+
else if (v == VIDEO_CODEC_H265)
117+
{
118+
return "HEVC";
119+
}
115120
else
116121
{
117122
return "H264";

android-refimpl-app/app/src/main/java/com/zoffcc/applications/trifa/MainActivity.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,7 @@
253253
import static com.zoffcc.applications.trifa.TRIFAGlobals.VFS_PREFIX;
254254
import static com.zoffcc.applications.trifa.TRIFAGlobals.VFS_TMP_FILE_DIR;
255255
import static com.zoffcc.applications.trifa.TRIFAGlobals.VIDEO_CODEC_H264;
256+
import static com.zoffcc.applications.trifa.TRIFAGlobals.VIDEO_CODEC_H265;
256257
import static com.zoffcc.applications.trifa.TRIFAGlobals.VIDEO_CODEC_VP8;
257258
import static com.zoffcc.applications.trifa.TRIFAGlobals.VIDEO_FRAME_RATE_INCOMING;
258259
import static com.zoffcc.applications.trifa.TRIFAGlobals.VIDEO_FRAME_RATE_OUTGOING;
@@ -272,6 +273,7 @@
272273
import static com.zoffcc.applications.trifa.TRIFAGlobals.orbot_is_really_running;
273274
import static com.zoffcc.applications.trifa.ToxVars.TOXAV_CALL_COMM_INFO.TOXAV_CALL_COMM_DECODER_CURRENT_BITRATE;
274275
import static com.zoffcc.applications.trifa.ToxVars.TOXAV_CALL_COMM_INFO.TOXAV_CALL_COMM_DECODER_IN_USE_H264;
276+
import static com.zoffcc.applications.trifa.ToxVars.TOXAV_CALL_COMM_INFO.TOXAV_CALL_COMM_DECODER_IN_USE_H265;
275277
import static com.zoffcc.applications.trifa.ToxVars.TOXAV_CALL_COMM_INFO.TOXAV_CALL_COMM_DECODER_IN_USE_VP8;
276278
import static com.zoffcc.applications.trifa.ToxVars.TOXAV_CALL_COMM_INFO.TOXAV_CALL_COMM_ENCODER_CURRENT_BITRATE;
277279
import static com.zoffcc.applications.trifa.ToxVars.TOXAV_CALL_COMM_INFO.TOXAV_CALL_COMM_ENCODER_IN_USE_H264;
@@ -4082,6 +4084,11 @@ else if (a_TOXAV_CALL_COMM_INFO == TOXAV_CALL_COMM_DECODER_IN_USE_H264.value)
40824084
// Log.i(TAG, "android_toxav_callback_call_comm_cb_method:4:" + a_TOXAV_CALL_COMM_INFO + ":" + comm_number);
40834085
Callstate.video_in_codec = VIDEO_CODEC_H264;
40844086
}
4087+
else if (a_TOXAV_CALL_COMM_INFO == TOXAV_CALL_COMM_DECODER_IN_USE_H265.value)
4088+
{
4089+
// Log.i(TAG, "android_toxav_callback_call_comm_cb_method:4:" + a_TOXAV_CALL_COMM_INFO + ":" + comm_number);
4090+
Callstate.video_in_codec = VIDEO_CODEC_H265;
4091+
}
40854092
else if (a_TOXAV_CALL_COMM_INFO == TOXAV_CALL_COMM_ENCODER_IN_USE_VP8.value)
40864093
{
40874094
Callstate.video_out_codec = VIDEO_CODEC_VP8;

android-refimpl-app/app/src/main/java/com/zoffcc/applications/trifa/TRIFAGlobals.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,7 @@ public class TRIFAGlobals
239239

240240
static final int VIDEO_CODEC_VP8 = 0;
241241
static final int VIDEO_CODEC_H264 = 1;
242+
static final int VIDEO_CODEC_H265 = 2;
242243

243244
static final int MAX_LEN_TOXENCRYPTSAVE_PASSPHRASE = 256;
244245
static final int LEN_TRIFA_AUTOGEN_PASSWORD = 32;

android-refimpl-app/app/src/main/java/com/zoffcc/applications/trifa/ToxVars.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1589,7 +1589,8 @@ public static enum TOXAV_CALL_COMM_INFO
15891589
3), TOXAV_CALL_COMM_ENCODER_IN_USE_H264_OMX_PI(6), TOXAV_CALL_COMM_DECODER_CURRENT_BITRATE(
15901590
4), TOXAV_CALL_COMM_ENCODER_CURRENT_BITRATE(5), TOXAV_CALL_COMM_NETWORK_ROUND_TRIP_MS(
15911591
7), TOXAV_CALL_COMM_PLAY_DELAY(8), TOXAV_CALL_COMM_PLAY_BUFFER_ENTRIES(9), TOXAV_CALL_COMM_INCOMING_FPS(
1592-
10), TOXAV_CALL_COMM_REMOTE_RECORD_DELAY(11);
1592+
10), TOXAV_CALL_COMM_REMOTE_RECORD_DELAY(11), TOXAV_CALL_COMM_ENCODER_IN_USE_H265(15),
1593+
TOXAV_CALL_COMM_DECODER_IN_USE_H265(16);
15931594

15941595
public int value;
15951596

0 commit comments

Comments
 (0)