@@ -908,41 +908,50 @@ static void *status_thread(void *data)
908908
909909
910910 if (status .type == FTL_STATUS_EVENT && status .msg .event .type == FTL_STATUS_EVENT_TYPE_DISCONNECTED ) {
911- blog (LOG_INFO , "Disconnected from ingest with reason: %s\n " , ftl_status_code_to_string (status .msg .event .error_code ));
911+ blog (LOG_INFO , "Disconnected from ingest with reason: %s" , ftl_status_code_to_string (status .msg .event .error_code ));
912912
913913 if (status .msg .event .reason == FTL_STATUS_EVENT_REASON_API_REQUEST ) {
914914 break ;
915915 }
916916
917917 //tell OBS and it will trigger a reconnection
918- blog (LOG_WARNING , "Reconnecting to Ingest\n " );
918+ blog (LOG_WARNING , "Reconnecting to Ingest" );
919919 obs_output_signal_stop (stream -> output , OBS_OUTPUT_DISCONNECTED );
920920 return 0 ;
921921
922922 }
923923 else if (status .type == FTL_STATUS_LOG )
924924 {
925- blog (LOG_INFO , "[%d] %s\n " , status .msg .log .log_level , status .msg .log .string );
925+ blog (LOG_INFO , "[%d] %s" , status .msg .log .log_level , status .msg .log .string );
926926 }
927- else if (status .type == FTL_STATUS_VIDEO_PACKETS ) {
927+ else if (status .type == FTL_STATUS_VIDEO_PACKETS )
928+ {
928929 ftl_packet_stats_msg_t * p = & status .msg .pkt_stats ;
929930
930- blog (LOG_INFO , "Avg packet send per second %3.1f, nack requests %d, avg transmit delay %d (min: %d, max: %d)\n " ,
931+ blog (LOG_INFO , "Avg packet send per second %3.1f, total nack requests %d" ,
931932 (float )p -> sent * 1000.f / p -> period ,
932- p -> nack_reqs , p -> avg_xmit_delay , p -> min_xmit_delay , p -> max_xmit_delay );
933+ p -> nack_reqs );
934+ }
935+ else if (status .type == FTL_STATUS_VIDEO_PACKETS_INSTANT )
936+ {
937+ ftl_packet_stats_instant_msg_t * p = & status .msg .ipkt_stats ;
938+
939+ blog (LOG_INFO , "avg transmit delay %dms (min: %d, max: %d), avg rtt %dms (min: %d, max: %d)" ,
940+ p -> avg_xmit_delay , p -> min_xmit_delay , p -> max_xmit_delay ,
941+ p -> avg_rtt , p -> min_rtt , p -> max_rtt );
933942 }
934943 else if (status .type == FTL_STATUS_VIDEO ) {
935944 ftl_video_frame_stats_msg_t * v = & status .msg .video_stats ;
936945
937- blog (LOG_INFO , "Queue an average of %3.2f fps (%3.1f kbps), sent an average of %3.2f fps (%3.1f kbps), queue fullness %d, max frame size %d\n " ,
946+ blog (LOG_INFO , "Queue an average of %3.2f fps (%3.1f kbps), sent an average of %3.2f fps (%3.1f kbps), queue fullness %d, max frame size %d" ,
938947 (float )v -> frames_queued * 1000.f / v -> period ,
939948 (float )v -> bytes_queued / v -> period * 8 ,
940949 (float )v -> frames_sent * 1000.f / v -> period ,
941950 (float )v -> bytes_sent / v -> period * 8 ,
942951 v -> queue_fullness , v -> max_frame_size );
943952 }
944953 else {
945- blog (LOG_INFO , "Status: Got Status message of type %d\n " , status .type );
954+ blog (LOG_INFO , "Status: Got Status message of type %d" , status .type );
946955 }
947956 }
948957
0 commit comments