scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-21 14:40:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

sender fix

Browse Source
This commit is contained in:
Martin Pulec
2013-09-13 13:37:43 +02:00
parent ac28e9eb17
commit f14448e21c
3 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.in
View File

@@ -351,10 +351,6 @@ dxt_compress/dxt_glsl.h:dxt_compress/compress_vp.glsl \
#cat dxt_compress/rgba_to_yuv422_vp.glsl | sed 's/\(.*\)/ \"\1\\n\"/' >> $@
#echo ";" >> $@
gpujpeg/.libs/libgpujpeg.a:
make -j -C gpujpeg/ static
@FASTDXT_PATH@/libdxt.a:
make -j -C @FASTDXT_PATH@/ lib
@@ -420,13 +416,11 @@ clean:
-rm -rf $(REFLECTOR_TARGET) $(REFLECTOR_OBJS)
-rm -rf @LIB_OBJS@ @LIB_TARGETS@ @LIB_HEADERS@ @X_OBJ@ @GL_COMMON_OBJ@ @CUDA_COMMON_OBJ@
-rm -rf bin/import_control_keyboard
[ ! -f gpujpeg/Makefile ] || make -C gpujpeg/ clean
[ -z "@FASTDXT_PATH@" ] || make -C @FASTDXT_PATH@/ clean
if [ -f "gui/QT/Makefile" ]; then make -C gui/QT/ clean; fi
distclean: clean
-rm -f Makefile config.status config.cache config.log src/config.h tags
[ ! -f gpujpeg/Makefile ] || make -C gpujpeg/ distclean
[ -z "@FASTDXT_PATH@" ] || make -C @FASTDXT_PATH@/ distclean
etags:
@@ -650,7 +644,7 @@ install: all
$(INSTALL) -m 755 data/ultragrid-bugreport-collect.sh $(DESTDIR)/$(uv_datadir)
$(INSTALL) -d -m 755 $(DESTDIR)/$(docdir)
$(INSTALL) -m 644 $(DOCS) $(DESTDIR)/$(docdir)
$(INSTALL) -m 644 @DLL_LIBS@ $(DESTDIR)/$(bindir)
if [ -n "@DLL_LIBS@" ]; then $(INSTALL) -m 644 @DLL_LIBS@ $(DESTDIR)/$(bindir); fi
uninstall:
$(RM) $(DESTDIR)/$(bindir)/uv

3
src/main.c
View File

@@ -1529,6 +1529,9 @@ cleanup:
vidcap_done(uv->capture_device);
if(uv->display_device)
display_done(uv->display_device);
if (uv->network_devices) {
destroy_rtp_devices(uv->network_devices);
}
if (uv->participants != NULL) {
pdb_iter_t it;
struct pdb_e *cp = pdb_iter_init(uv->participants, &it);

17
src/sender.c
View File

@@ -187,9 +187,6 @@ static void ultragrid_rtp_done(void *state)
if (data->tx) {
module_done(CAST_MODULE(data->tx));
}
if (data->network_devices) {
destroy_rtp_devices(data->network_devices);
}
}
static void sage_rxtx_send(void *state, struct video_frame *tx_frame)
@@ -252,17 +249,15 @@ static void *sender_thread(void *arg) {
if (!tx_frame)
goto exit;
if(data->priv->paused) {
goto after_send;
}
video_export(data->video_exporter, tx_frame);
data->send_frame(data->tx_module_state, tx_frame);
if (tx_frame->dispose)
tx_frame->dispose(tx_frame);
if (!data->priv->paused) {
data->send_frame(data->tx_module_state, tx_frame);
}
after_send:
if (tx_frame->dispose) {
tx_frame->dispose(tx_frame);
}
if (data->rxtx_protocol == ULTRAGRID_RTP) {
struct ultragrid_rtp_state *rtp_state = data->tx_module_state;