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

revert previous 3 commits

Browse Source
This commit is contained in:
fduncanh
2022-04-28 23:10:28 -04:00
parent 89ffc41b30
commit 81d3c721b0
1 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/raop_rtp_mirror.c
View File

@@ -87,16 +87,8 @@ struct raop_rtp_mirror_s {
int sps_pps_len;
unsigned char* sps_pps;
bool sps_pps_waiting;
uint64_t ntp_timestamp_raw;
};
uint64_t raop_rtp_mirror_timestamp_raw(raop_rtp_mirror_t *raop_rtp_mirror) {
if(raop_rtp_mirror) {
return raop_rtp_mirror->ntp_timestamp_raw;
} else {
return 0;
}
}
};
static int
raop_rtp_parse_remote(raop_rtp_mirror_t *raop_rtp_mirror, const unsigned char *remote, int remotelen)
@@ -143,7 +135,6 @@ raop_rtp_mirror_t *raop_rtp_mirror_init(logger_t *logger, raop_callbacks_t *call
raop_rtp_mirror->sps_pps_len = 0;
raop_rtp_mirror->sps_pps = NULL;
raop_rtp_mirror->sps_pps_waiting = false;
raop_rtp_mirror->ntp_timestamp_raw = 0;
memcpy(&raop_rtp_mirror->callbacks, callbacks, sizeof(raop_callbacks_t));
raop_rtp_mirror->buffer = mirror_buffer_init(logger, aeskey);
@@ -187,7 +178,8 @@ raop_rtp_mirror_thread(void *arg)
unsigned char* payload = NULL;
unsigned int readstart = 0;
bool conn_reset = false;
uint64_t ntp_timestamp_raw = 0, ntp_timestamp_nal = 0;
uint64_t ntp_timestamp_nal = 0;
uint64_t ntp_timestamp_raw = 0;
unsigned char nal_start_code[4] = { 0x00, 0x00, 0x00, 0x01 };
#ifdef DUMP_H264
@@ -429,10 +421,6 @@ raop_rtp_mirror_thread(void *arg)
// The information in the payload contains an SPS and a PPS NAL
// The sps_pps is not encrypted
ntp_timestamp_nal = byteutils_get_long(packet, 8);
/* use the initial raw video timestamp for setting audio timing offset */
if (raop_rtp_mirror->ntp_timestamp_raw == 0) {
raop_rtp_mirror->ntp_timestamp_raw = ntp_timestamp_nal;
}
float width = byteutils_get_float(packet, 16);
float height = byteutils_get_float(packet, 20);
float width_source = byteutils_get_float(packet, 40);