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

Takion Audio/Video Packet Types

Browse source
This commit is contained in:
Florian Märkl 2019-05-31 22:02:53 +02:00
commit 46743a6af7
No known key found for this signature in database
GPG key ID: 125BC8A5A6A1E857
3 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -74,7 +74,7 @@ typedef struct chiaki_takion_av_packet_t
uint16_t packet_index; uint16_t packet_index;
uint16_t frame_index; uint16_t frame_index;
bool byte_at_0x1a; bool byte_at_0x1a;
bool is_2; bool is_video;
uint16_t word_at_0xa; uint16_t word_at_0xa;
uint16_t word_at_0xc; uint16_t word_at_0xc;
uint16_t word_at_0xe; uint16_t word_at_0xe;

4
lib/src/nagare.c
View file

@ -508,8 +508,8 @@ static void nagare_takion_av(ChiakiTakionAVPacket *header, uint8_t *buf, size_t
chiaki_gkcrypt_decrypt(nagare->gkcrypt_remote, key_pos + CHIAKI_GKCRYPT_BLOCK_SIZE, buf, buf_size); chiaki_gkcrypt_decrypt(nagare->gkcrypt_remote, key_pos + CHIAKI_GKCRYPT_BLOCK_SIZE, buf, buf_size);
//CHIAKI_LOGD(nagare->log, "AV: index: %u,%u; b@0x1a: %d; is_2: %d; 0xa: %u; 0xc: %u; 0xe: %u; codec: %u; 0x18: %u; adaptive_stream: %u, 0x2c: %u\n", //CHIAKI_LOGD(nagare->log, "AV: index: %u,%u; b@0x1a: %d; is_video: %d; 0xa: %u; 0xc: %u; 0xe: %u; codec: %u; 0x18: %u; adaptive_stream: %u, 0x2c: %u\n",
// header->packet_index, header->frame_index, header->byte_at_0x1a, header->is_2 ? 1 : 0, header->word_at_0xa, header->word_at_0xc, header->word_at_0xe, header->codec, // header->packet_index, header->frame_index, header->byte_at_0x1a, header->is_video ? 1 : 0, header->word_at_0xa, header->word_at_0xc, header->word_at_0xe, header->codec,
// header->word_at_0x18, header->adaptive_stream_index, header->byte_at_0x2c); // header->word_at_0x18, header->adaptive_stream_index, header->byte_at_0x2c);
if(header->codec == 5/*buf[0] == 0xf4 && buf_size >= 0x50*/) if(header->codec == 5/*buf[0] == 0xf4 && buf_size >= 0x50*/)

28
lib/src/takion.c
View file

@ -28,8 +28,8 @@
typedef enum takion_packet_type_t { typedef enum takion_packet_type_t {
TAKION_PACKET_TYPE_MESSAGE = 0, TAKION_PACKET_TYPE_MESSAGE = 0,
TAKION_PACKET_TYPE_2 = 2, TAKION_PACKET_TYPE_VIDEO = 2,
TAKION_PACKET_TYPE_3 = 3, TAKION_PACKET_TYPE_AUDIO = 3,
} TakionPacketType; } TakionPacketType;
@ -384,8 +384,8 @@ static ChiakiErrorCode takion_handle_packet_mac(ChiakiTakion *takion, uint8_t ba
mac_offset = 5; mac_offset = 5;
key_pos_offset = 0x9; key_pos_offset = 0x9;
break; break;
case TAKION_PACKET_TYPE_2: case TAKION_PACKET_TYPE_VIDEO:
case TAKION_PACKET_TYPE_3: case TAKION_PACKET_TYPE_AUDIO:
mac_offset = 0xa; mac_offset = 0xa;
key_pos_offset = 0xe; key_pos_offset = 0xe;
break; break;
@ -448,8 +448,8 @@ static void takion_handle_packet(ChiakiTakion *takion, uint8_t *buf, size_t buf_
case TAKION_PACKET_TYPE_MESSAGE: case TAKION_PACKET_TYPE_MESSAGE:
takion_handle_packet_message(takion, buf, buf_size); takion_handle_packet_message(takion, buf, buf_size);
break; break;
case TAKION_PACKET_TYPE_2: case TAKION_PACKET_TYPE_VIDEO:
case TAKION_PACKET_TYPE_3: case TAKION_PACKET_TYPE_AUDIO:
takion_handle_packet_av(takion, base_type, buf, buf_size); takion_handle_packet_av(takion, base_type, buf, buf_size);
break; break;
default: default:
@ -713,23 +713,23 @@ static ChiakiErrorCode takion_recv_message_cookie_ack(ChiakiTakion *takion)
} }
#define AV_HEADER_SIZE_2 0x17 #define AV_HEADER_SIZE_VIDEO 0x17
#define AV_HEADER_SIZE_3 0x12 #define AV_HEADER_SIZE_AUDIO 0x12
static void takion_handle_packet_av(ChiakiTakion *takion, uint8_t base_type, uint8_t *buf, size_t buf_size) static void takion_handle_packet_av(ChiakiTakion *takion, uint8_t base_type, uint8_t *buf, size_t buf_size)
{ {
// HHIxIIx // HHIxIIx
assert(base_type == 2 || base_type == 3); assert(base_type == TAKION_PACKET_TYPE_VIDEO || base_type == TAKION_PACKET_TYPE_AUDIO);
size_t av_size = buf_size-1; size_t av_size = buf_size-1;
ChiakiTakionAVPacket packet = {0}; ChiakiTakionAVPacket packet = {0};
packet.is_2 = base_type == 2; packet.is_video = base_type == TAKION_PACKET_TYPE_VIDEO;
packet.byte_at_0x1a = ((buf[0] >> 4) & 1) != 0; packet.byte_at_0x1a = ((buf[0] >> 4) & 1) != 0;
size_t av_header_size = packet.is_2 ? AV_HEADER_SIZE_2 : AV_HEADER_SIZE_3; size_t av_header_size = packet.is_video ? AV_HEADER_SIZE_VIDEO : AV_HEADER_SIZE_AUDIO;
if(av_size < av_header_size + 1) // TODO: compare av_size or buf_size? if(av_size < av_header_size + 1) // TODO: compare av_size or buf_size?
{ {
CHIAKI_LOGE(takion->log, "Takion received AV packet smaller than av header size + 1\n"); CHIAKI_LOGE(takion->log, "Takion received AV packet smaller than av header size + 1\n");
@ -742,7 +742,7 @@ static void takion_handle_packet_av(ChiakiTakion *takion, uint8_t base_type, uin
packet.frame_index = ntohs(*((uint16_t *)(av + 2))); packet.frame_index = ntohs(*((uint16_t *)(av + 2)));
uint32_t dword_2 = ntohl(*((uint32_t *)(av + 4))); uint32_t dword_2 = ntohl(*((uint32_t *)(av + 4)));
if(packet.is_2) if(packet.is_video)
{ {
packet.word_at_0xa = (uint16_t)((dword_2 >> 0x15) & 0x7ff); packet.word_at_0xa = (uint16_t)((dword_2 >> 0x15) & 0x7ff);
packet.word_at_0xc = (uint16_t)(((dword_2 >> 0xa) & 0x7ff) + 1); packet.word_at_0xc = (uint16_t)(((dword_2 >> 0xa) & 0x7ff) + 1);
@ -766,7 +766,7 @@ static void takion_handle_packet_av(ChiakiTakion *takion, uint8_t base_type, uin
av += 0x12; av += 0x12;
av_size -= 12; av_size -= 12;
if(packet.is_2) if(packet.is_video)
{ {
packet.word_at_0x18 = ntohs(*((uint16_t *)(av + 0))); packet.word_at_0x18 = ntohs(*((uint16_t *)(av + 0)));
packet.adaptive_stream_index = av[2] >> 5; packet.adaptive_stream_index = av[2] >> 5;
@ -776,7 +776,7 @@ static void takion_handle_packet_av(ChiakiTakion *takion, uint8_t base_type, uin
// TODO: parsing for packet.byte_at_0x1a // TODO: parsing for packet.byte_at_0x1a
if(packet.is_2) if(packet.is_video)
{ {
packet.byte_at_0x2c = av[0]; packet.byte_at_0x2c = av[0];
av += 2; av += 2;