github/chiaki
1
0
Fork 0
mirror of https://git.sr.ht/~thestr4ng3r/chiaki synced 2025-08-20 05:23:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Audio Parsing for PS5

Browse source
This commit is contained in:
Florian Märkl 2020-12-21 17:24:37 +01:00
commit d4e1aa3b60
No known key found for this signature in database
GPG key ID: 125BC8A5A6A1E857
3 changed files with 34 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/include/chiaki/takion.h
View file

@ -45,6 +45,8 @@ typedef struct chiaki_takion_av_packet_t
uint64_t key_pos; uint64_t key_pos;
uint8_t byte_before_audio_data;
uint8_t *data; // not owned uint8_t *data; // not owned
size_t data_size; size_t data_size;
} ChiakiTakionAVPacket; } ChiakiTakionAVPacket;
@ -226,6 +228,11 @@ CHIAKI_EXPORT ChiakiErrorCode chiaki_takion_send_feedback_history(ChiakiTakion *
CHIAKI_EXPORT ChiakiErrorCode chiaki_takion_v9_av_packet_parse(ChiakiTakionAVPacket *packet, ChiakiKeyState *key_state, uint8_t *buf, size_t buf_size); CHIAKI_EXPORT ChiakiErrorCode chiaki_takion_v9_av_packet_parse(ChiakiTakionAVPacket *packet, ChiakiKeyState *key_state, uint8_t *buf, size_t buf_size);
#define CHIAKI_TAKION_V12_AV_HEADER_SIZE_VIDEO 0x17
#define CHIAKI_TAKION_V12_AV_HEADER_SIZE_AUDIO 0x13
CHIAKI_EXPORT ChiakiErrorCode chiaki_takion_v12_av_packet_parse(ChiakiTakionAVPacket *packet, ChiakiKeyState *key_state, uint8_t *buf, size_t buf_size);
#define CHIAKI_TAKION_V7_AV_HEADER_SIZE_BASE 0x12 #define CHIAKI_TAKION_V7_AV_HEADER_SIZE_BASE 0x12
#define CHIAKI_TAKION_V7_AV_HEADER_SIZE_VIDEO_ADD 0x3 #define CHIAKI_TAKION_V7_AV_HEADER_SIZE_VIDEO_ADD 0x3
#define CHIAKI_TAKION_V7_AV_HEADER_SIZE_NALU_INFO_STRUCTS_ADD 0x3 #define CHIAKI_TAKION_V7_AV_HEADER_SIZE_NALU_INFO_STRUCTS_ADD 0x3

4
lib/src/audioreceiver.c
View file

@ -78,7 +78,9 @@ CHIAKI_EXPORT void chiaki_audio_receiver_av_packet(ChiakiAudioReceiver *audio_re
if(packet->data_size != (size_t)unit_size * (size_t)packet->units_in_frame_total) if(packet->data_size != (size_t)unit_size * (size_t)packet->units_in_frame_total)
{ {
CHIAKI_LOGE(audio_receiver->log, "Audio AV Packet size mismatch"); CHIAKI_LOGE(audio_receiver->log, "Audio AV Packet size mismatch %#llx vs %#llx",
(unsigned long long)packet->data_size,
(unsigned long long)(unit_size * packet->units_in_frame_total));
return; return;
} }

27
lib/src/takion.c
View file

@ -189,9 +189,11 @@ CHIAKI_EXPORT ChiakiErrorCode chiaki_takion_connect(ChiakiTakion *takion, Chiaki
takion->av_packet_parse = chiaki_takion_v7_av_packet_parse; takion->av_packet_parse = chiaki_takion_v7_av_packet_parse;
break; break;
case 9: case 9:
case 12:
takion->av_packet_parse = chiaki_takion_v9_av_packet_parse; takion->av_packet_parse = chiaki_takion_v9_av_packet_parse;
break; break;
case 12:
takion->av_packet_parse = chiaki_takion_v12_av_packet_parse;
break;
default: default:
CHIAKI_LOGE(takion->log, "Unknown Takion Protocol Version %u", (unsigned int)takion->version); CHIAKI_LOGE(takion->log, "Unknown Takion Protocol Version %u", (unsigned int)takion->version);
return CHIAKI_ERR_INVALID_DATA; return CHIAKI_ERR_INVALID_DATA;
@ -1243,7 +1245,7 @@ static void takion_handle_packet_av(ChiakiTakion *takion, uint8_t base_type, uin
} }
} }
CHIAKI_EXPORT ChiakiErrorCode chiaki_takion_v9_av_packet_parse(ChiakiTakionAVPacket *packet, ChiakiKeyState *key_state, uint8_t *buf, size_t buf_size) static ChiakiErrorCode av_packet_parse(bool v12, ChiakiTakionAVPacket *packet, ChiakiKeyState *key_state, uint8_t *buf, size_t buf_size)
{ {
memset(packet, 0, sizeof(ChiakiTakionAVPacket)); memset(packet, 0, sizeof(ChiakiTakionAVPacket));
@ -1261,7 +1263,9 @@ CHIAKI_EXPORT ChiakiErrorCode chiaki_takion_v9_av_packet_parse(ChiakiTakionAVPac
uint8_t *av = buf+1; uint8_t *av = buf+1;
size_t av_size = buf_size-1; size_t av_size = buf_size-1;
size_t av_header_size = packet->is_video ? CHIAKI_TAKION_V9_AV_HEADER_SIZE_VIDEO : CHIAKI_TAKION_V9_AV_HEADER_SIZE_AUDIO; size_t av_header_size = v12
? (packet->is_video ? CHIAKI_TAKION_V12_AV_HEADER_SIZE_VIDEO : CHIAKI_TAKION_V12_AV_HEADER_SIZE_AUDIO)
: (packet->is_video ? CHIAKI_TAKION_V9_AV_HEADER_SIZE_VIDEO : CHIAKI_TAKION_V9_AV_HEADER_SIZE_AUDIO);
if(av_size < av_header_size + 1) if(av_size < av_header_size + 1)
return CHIAKI_ERR_BUF_TOO_SMALL; return CHIAKI_ERR_BUF_TOO_SMALL;
@ -1320,12 +1324,29 @@ CHIAKI_EXPORT ChiakiErrorCode chiaki_takion_v9_av_packet_parse(ChiakiTakionAVPac
av_size -= 3; av_size -= 3;
} }
if(v12 && !packet->is_video)
{
packet->byte_before_audio_data = *av;
av += 1;
av_size -= 1;
}
packet->data = av; packet->data = av;
packet->data_size = av_size; packet->data_size = av_size;
return CHIAKI_ERR_SUCCESS; return CHIAKI_ERR_SUCCESS;
} }
CHIAKI_EXPORT ChiakiErrorCode chiaki_takion_v9_av_packet_parse(ChiakiTakionAVPacket *packet, ChiakiKeyState *key_state, uint8_t *buf, size_t buf_size)
{
return av_packet_parse(false, packet, key_state, buf, buf_size);
}
CHIAKI_EXPORT ChiakiErrorCode chiaki_takion_v12_av_packet_parse(ChiakiTakionAVPacket *packet, ChiakiKeyState *key_state, uint8_t *buf, size_t buf_size)
{
return av_packet_parse(true, packet, key_state, buf, buf_size);
}
CHIAKI_EXPORT ChiakiErrorCode chiaki_takion_v7_av_packet_format_header(uint8_t *buf, size_t buf_size, size_t *header_size_out, ChiakiTakionAVPacket *packet) CHIAKI_EXPORT ChiakiErrorCode chiaki_takion_v7_av_packet_format_header(uint8_t *buf, size_t buf_size, size_t *header_size_out, ChiakiTakionAVPacket *packet)
{ {
size_t header_size = CHIAKI_TAKION_V7_AV_HEADER_SIZE_BASE; size_t header_size = CHIAKI_TAKION_V7_AV_HEADER_SIZE_BASE;