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

Make Video Decoding more stable

Browse source
This commit is contained in:
Florian Märkl 2019-08-06 12:41:55 +02:00
commit 55002a4585
No known key found for this signature in database
GPG key ID: 125BC8A5A6A1E857
10 changed files with 116 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/include/chiaki/session.h
View file

@ -119,6 +119,10 @@ typedef struct chiaki_event_t
typedef void (*ChiakiEventCallback)(ChiakiEvent *event, void *user);
typedef void (*ChiakiAudioFrameCallback)(int16_t *buf, size_t samples_count, void *user);
/**
* buf will always have an allocated padding of at least CHIAKI_VIDEO_BUFFER_PADDING_SIZE after buf_size
*/
typedef void (*ChiakiVideoSampleCallback)(uint8_t *buf, size_t buf_size, void *user);

5
lib/include/chiaki/video.h
View file

@ -33,6 +33,11 @@ typedef struct chiaki_video_profile_t
uint8_t *header;
} ChiakiVideoProfile;
/**
* Padding for FFMPEG
*/
#define CHIAKI_VIDEO_BUFFER_PADDING_SIZE 64
#ifdef __cplusplus
}
#endif

5
lib/src/frameprocessor.c
View file

@ -17,6 +17,7 @@
#include <chiaki/frameprocessor.h>
#include <chiaki/fec.h>
#include <chiaki/video.h>
#include <jerasure.h>
@ -117,7 +118,7 @@ CHIAKI_EXPORT ChiakiErrorCode chiaki_frame_processor_alloc_frame(ChiakiFrameProc
if(frame_processor->frame_buf_size < frame_buf_size_required)
{
free(frame_processor->frame_buf);
frame_processor->frame_buf = malloc(frame_buf_size_required);
frame_processor->frame_buf = malloc(frame_buf_size_required + CHIAKI_VIDEO_BUFFER_PADDING_SIZE);
if(!frame_processor->frame_buf)
{
frame_processor->frame_buf_size = 0;
@ -125,7 +126,7 @@ CHIAKI_EXPORT ChiakiErrorCode chiaki_frame_processor_alloc_frame(ChiakiFrameProc
}
frame_processor->frame_buf_size = frame_buf_size_required;
}
memset(frame_processor->frame_buf, 0, frame_buf_size_required);
memset(frame_processor->frame_buf, 0, frame_buf_size_required + CHIAKI_VIDEO_BUFFER_PADDING_SIZE);
return CHIAKI_ERR_SUCCESS;
}

11
lib/src/streamconnection.c
View file

@ -539,6 +539,15 @@ static bool pb_decode_resolution(pb_istream_t *stream, const pb_field_t *field,
return true;
}
uint8_t *header_buf_padded = realloc(header_buf.buf, header_buf.size + CHIAKI_VIDEO_BUFFER_PADDING_SIZE);
if(!header_buf_padded)
{
free(header_buf.buf);
CHIAKI_LOGE(&ctx->stream_connection->session->log, "Failed to realloc video header with padding");
return true;
}
memset(header_buf_padded + header_buf.size, 0, CHIAKI_VIDEO_BUFFER_PADDING_SIZE);
if(ctx->video_profiles_count >= CHIAKI_VIDEO_PROFILES_MAX)
{
CHIAKI_LOGE(&ctx->stream_connection->session->log, "Received more resolutions than the maximum");
@ -549,7 +558,7 @@ static bool pb_decode_resolution(pb_istream_t *stream, const pb_field_t *field,
profile->width = resolution.width;
profile->height = resolution.height;
profile->header_sz = header_buf.size;
profile->header = header_buf.buf;
profile->header = header_buf_padded;
return true;
}

5
lib/src/takion.c
View file

@ -808,8 +808,8 @@ static void takion_handle_packet(ChiakiTakion *takion, uint8_t *buf, size_t buf_
break;
default:
CHIAKI_LOGW(takion->log, "Takion packet with unknown type %#x received", base_type);
chiaki_log_hexdump(takion->log, CHIAKI_LOG_WARNING, buf, buf_size);
free(buf);
//chiaki_log_hexdump(takion->log, CHIAKI_LOG_WARNING, buf, buf_size);
break;
}
}
@ -868,7 +868,10 @@ static void takion_flush_data_queue(ChiakiTakion *takion)
CHIAKI_LOGW(takion->log, "Takion received data with unexpected nonzero %#x at buf+6", zero_a);
if(data_type != CHIAKI_TAKION_MESSAGE_DATA_TYPE_PROTOBUF && data_type != CHIAKI_TAKION_MESSAGE_DATA_TYPE_9)
{
CHIAKI_LOGW(takion->log, "Takion received data with unexpected data type %#x", data_type);
chiaki_log_hexdump(takion->log, CHIAKI_LOG_WARNING, entry->packet_buf, entry->packet_size);
}
else if(takion->cb)
{
ChiakiTakionEvent event = { 0 };