Commit 2e01e66b authored by Simon Morlat's avatar Simon Morlat

fix crash in x11 video

parent 983babc1
mediastreamer-2.7.0:
* add android video capture filter
* add android video display filters: one for 2.1 and one for 2.2+
* tune video encoder parameters for android
* new scaler/colorspace conversion abstraction, with native ARM-optimized implementation
* new X11+XvXshm display filter, deprecating SDL display filter.
mediastreamer-2.6.0: July 1st, 2010
* android sound capture optimisations
* optional "threaded" v4l2 capture
......
......@@ -445,17 +445,28 @@ int ms_connection_helper_unlink(MSConnectionHelper *h, MSFilter *f, int inpin, i
/**
* \brief Enable time measurements statistics for filters.
* \brief Enable processing time measurements statistics for filters.
*
**/
void ms_filter_enable_statistics(bool_t enabled);
/**
* \brief Reset processing time statistics for filters.
*
**/
void ms_filter_reset_statistics(void);
/**
* \brief Retrieves statistics for running filters.
* Returns a list of MSFilterStats
**/
const MSList * ms_filter_get_statistics(void);
/**
* \brief Logs runtime statistics for running filters.
*
**/
void ms_filter_log_statistics(void);
......
......@@ -891,6 +891,7 @@ static void *v4l_thread(void *ptr){
v4l_do_munmap(s);
ms_message("v4l_thread exited.");
ms_thread_exit(NULL);
return NULL;
}
......
......@@ -427,6 +427,7 @@ exit:
ms_message("msv4l2_thread exited.");
s->fd = -1;
ms_thread_exit(NULL);
return NULL;
}
static void msv4l2_preprocess(MSFilter *f){
......
......@@ -413,7 +413,7 @@ static void x11video_process(MSFilter *f){
wsize.height=obj->fbuf.h;
ms_layout_compute(wsize, obj->vsize,obj->lsize,obj->corner,obj->scale_factor,&mainrect,&localrect);
if (lsrc.w!=0){
if (lsrc.w!=0 && obj->corner!=-1){
/* first reduce the local preview image into a temporary image*/
if (obj->local_msg==NULL){
obj->local_msg=ms_yuv_buf_alloc(&obj->local_pic,localrect.w,localrect.h);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment