morgan/UxPlay
1
0
Fork 0
mirror of https://github.com/morgan9e/UxPlay synced 2026-04-14 00:04:13 +09:00
Code Issues Packages Projects Releases Wiki Activity

set h264 "type" to nal_count

Browse Source
This commit is contained in:
fduncanh
2022-04-16 20:12:30 -04:00
parent 717181a86e
commit c0f3b52b94
5 changed files with 38 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/raop_rtp_mirror.c
View File

@@ -400,26 +400,23 @@ raop_rtp_mirror_thread(void *arg)
if (nalu_size != payload_size) valid_data = false;
if(!valid_data) {
logger_log(raop_rtp_mirror->logger, LOGGER_DEBUG, "nalu marked as invalid");
payload_out[0] = 1; /* mark video data as invalid h264 (failed decryption) */
}
#ifdef DUMP_H264
fwrite(payload_decrypted, payload_size, 1, file);
#endif
payload_decrypted = NULL;
h264_decode_struct h264_data;
h264_data.pts = ntp_timestamp;
h264_data.frame_type = payload_decrypted[4] & 0x1f;
h264_data.nal_count = nalus_count; /*frame_type is set to number of nal units in packet */
h264_data.data_len = payload_size;
h264_data.data = payload_out;
if (prepend_sps_pps) {
h264_data.data = payload_out;
h264_data.data_len = payload_size + sps_pps_len;
h264_data.data_len += sps_pps_len;
h264_data.nal_count += 2;
if (ntp_timestamp_raw != ntp_timestamp_nal) {
logger_log(raop_rtp_mirror->logger, LOGGER_WARNING, "raop_rtp_mirror: prepended sps_pps timestamp does not match that of video payload");
}
} else {
h264_data.data_len = payload_size;
h264_data.data = payload_decrypted;
}
if (!valid_data) {
h264_data.data[0] = 1; /* mark video data as invalid h264 (failed decryption) */
}
raop_rtp_mirror->callbacks.video_process(raop_rtp_mirror->callbacks.cls, raop_rtp_mirror->ntp, &h264_data);
free(payload_out);

5
lib/stream.h
View File

@@ -18,12 +18,9 @@
#include <stdint.h>
typedef struct {
int n_gop_index;
int frame_type;
int n_frame_poc;
int nal_count;
unsigned char *data;
int data_len;
unsigned int n_time_stamp;
uint64_t pts;
} h264_decode_struct;