scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-04-07 17:05:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Capture thread: fix

Browse Source
This commit is contained in:
Martin Pulec
2014-02-06 12:23:30 +01:00
parent cbd77e3fcb
commit 64b501abbe
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main.c
View File

@@ -790,8 +790,6 @@ static void *capture_thread(void *arg)
pthread_mutex_unlock(&uv->init_lock);
bool wait_for_cur_uncompressed_frame = false;
while (!should_exit_sender) {
/* Capture and transmit video... */
struct audio_frame *audio;
@@ -801,8 +799,7 @@ static void *capture_thread(void *arg)
audio_sdi_send(uv->audio, audio);
}
//tx_frame = vf_get_copy(tx_frame);
bool should_wait_for_prev_frame =
wait_for_cur_uncompressed_frame;
bool wait_for_cur_uncompressed_frame;
if (!tx_frame->dispose) {
tx_frame->dispose = uncompressed_frame_dispose;
tx_frame->dispose_udata = wait_obj;
@@ -815,9 +812,14 @@ static void *capture_thread(void *arg)
// Sends frame to compression - this passes it to a sender thread
compress_frame(compression, tx_frame);
// wait to frame is processed - eg by compress or sender (uncompressed video)
if (should_wait_for_prev_frame)
// wait for frame frame to be processed, eg. by compress
// or sender (uncompressed video). Grab invalidates previous frame
// (if not defined dispose function).
if (wait_for_cur_uncompressed_frame) {
wait_obj_wait(wait_obj);
tx_frame->dispose = NULL;
tx_frame->dispose_udata = NULL;
}
}
}