eessppeelllloo/veejay
1
0
Fork 0
mirror of https://github.com/game-stop/veejay.git synced 2025-12-15 12:20:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

buffer management in network streaming, update lzo to latest version, added error checking

Browse Source
This commit is contained in:
niels
2015-04-24 01:04:30 +02:00
parent 79a2e469a7
commit e099c05f16
9 changed files with 5115 additions and 2208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
veejay-current/veejay-server/libstream/vj-net.c
View File

@@ -327,7 +327,7 @@ int net_thread_get_frame( vj_tag *tag, uint8_t *buffer[3] )
t->in_fmt == PIX_FMT_RGB32_1 ) {
a = yuv_rgb_template( tag->socket_frame, t->in_w, t->in_w, t->in_fmt );
} else {
int b_len = t->in_w * t->in_h;
int buvlen = b_len;
@@ -342,7 +342,7 @@ int net_thread_get_frame( vj_tag *tag, uint8_t *buffer[3] )
buvlen = b_len/2;
break;
}
a =yuv_yuv_template( t->buf, t->buf + b_len, t->buf+ b_len+ buvlen,t->in_w,t->in_h, t->in_fmt);
}
@@ -359,7 +359,8 @@ int net_thread_get_frame( vj_tag *tag, uint8_t *buffer[3] )
t->scaler = yuv_init_swscaler( a,b, &sws_templ, yuv_sws_get_cpu_flags() );
}
yuv_convert_and_scale( t->scaler, a,b );
if( t->scaler )
yuv_convert_and_scale( t->scaler, a,b );
t->have_frame = 0;
if(unlock(t)!=0)
@@ -395,8 +396,8 @@ int net_thread_get_frame_rgb( vj_tag *tag, uint8_t *buffer, int w, int h )
int uv_len = len;
switch(t->f)
{
case FMT_420:
case FMT_420F:
case PIX_FMT_YUV420P:
case PIX_FMT_YUVJ420P:
uv_len=len/4;
break;
default:
@@ -410,8 +411,8 @@ int net_thread_get_frame_rgb( vj_tag *tag, uint8_t *buffer, int w, int h )
int buvlen = b_len;
switch(t->in_fmt)
{
case FMT_420:
case FMT_420F:
case PIX_FMT_YUV420P:
case PIX_FMT_YUVJ420P:
buvlen = b_len/4;
break;
default: