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

framesize

Browse Source 
git-svn-id: svn://code.dyne.org/veejay/trunk@1113 eb8d1916-c9e9-0310-b8de-cf0c9472ead5
This commit is contained in:
Niels Elburg
2008-10-24 20:38:33 +00:00
parent a1d548facc
commit cce1d8eb57
1 changed files with 36 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
sandbox/veejay-server/libstream/vj-unicap.c
View File

@@ -727,6 +727,7 @@ int vj_unicap_configure_device( void *ud, int pixel_format, int w, int h, int co
} }
vut->pixfmt = get_ffmpeg_pixfmt( pixel_format ); vut->pixfmt = get_ffmpeg_pixfmt( pixel_format );
vut->shift = get_shift_size(pixel_format); vut->shift = get_shift_size(pixel_format);
vut->frame_size = vut->sizes[0] + vut->sizes[1] + vut->sizes[2];
} }
if( !found_native ) if( !found_native )
@@ -776,6 +777,7 @@ int vj_unicap_configure_device( void *ud, int pixel_format, int w, int h, int co
else else
{ {
veejay_memcpy( &(vut->format), &rgb_format, sizeof( rgb_format )); veejay_memcpy( &(vut->format), &rgb_format, sizeof( rgb_format ));
vut->frame_size = vut->sizes[0];
} }
} }
@@ -819,20 +821,7 @@ int vj_unicap_configure_device( void *ud, int pixel_format, int w, int h, int co
vut->dst_height = h; vut->dst_height = h;
vut->dst_fmt = vut->pixfmt; vut->dst_fmt = vut->pixfmt;
veejay_msg(VEEJAY_MSG_WARNING, if ( vut->format.fourcc == get_fourcc("422P" ) ) {
"Test mode %dx%d in %s to %dx%d in %s",
vut->src_width,vut->src_height,vut->format.identifier,vut->dst_width,
vut->dst_height, unicap_pf_str(vut->dst_fmt) );
if( ( vut->format.fourcc == get_fourcc("RGB3") ) || (vut->format.fourcc == get_fourcc("BGR3") ) ) {
vut->src_sizes[0] = vut->src_width * 3;
vut->src_sizes[1] = 0; vut->src_sizes[2] = 0;
vut->src_fmt = PIX_FMT_RGB24;
if(vut->format.fourcc == get_fourcc("BGR3") )
vut->src_fmt = PIX_FMT_BGR24;
vut->frame_size = vut->src_width * vut->src_height * 3;
} else if ( vut->format.fourcc == get_fourcc("422P" ) ) {
vut->src_sizes[0] = vut->src_width * vut->src_height; vut->src_sizes[0] = vut->src_width * vut->src_height;
vut->src_sizes[1] = vut->src_sizes[0]/2; vut->src_sizes[1] = vut->src_sizes[0]/2;
vut->src_sizes[2] = vut->src_sizes[1]/2; vut->src_sizes[2] = vut->src_sizes[1]/2;
@@ -844,6 +833,22 @@ int vj_unicap_configure_device( void *ud, int pixel_format, int w, int h, int co
vut->src_sizes[2] = vut->src_sizes[1]/4; vut->src_sizes[2] = vut->src_sizes[1]/4;
vut->src_fmt = PIX_FMT_YUV420P; vut->src_fmt = PIX_FMT_YUV420P;
vut->frame_size = vut->src_sizes[0] + vut->src_sizes[1] + vut->src_sizes[2]; vut->frame_size = vut->src_sizes[0] + vut->src_sizes[1] + vut->src_sizes[2];
} else if( ( vut->format.fourcc == get_fourcc("RGB3") )
|| (vut->format.fourcc == get_fourcc("BGR3") ) ) {
vut->src_sizes[0] = vut->src_width * 3;
vut->src_sizes[1] = 0; vut->src_sizes[2] = 0;
vut->src_fmt = PIX_FMT_RGB24;
if(vut->format.fourcc == get_fourcc("BGR3") )
vut->src_fmt = PIX_FMT_BGR24;
vut->frame_size = vut->src_width * vut->src_height * 3;
} else if ( (vut->format.fourcc == get_fourcc("RGB4") ) ||
(vut->format.fourcc == get_fourcc("BGR4") ) ) {
vut->src_sizes[0] = vut->src_width * 4;
vut->src_sizes[1] = 0; vut->src_sizes[2] = 0;
vut->src_fmt = PIX_FMT_RGB32;
if(vut->format.fourcc == get_fourcc("BGR4") )
vut->src_fmt = PIX_FMT_BGR32;
vut->frame_size = vut->src_width * vut->src_height * 4;
} }
#ifdef STRICT_CHECKING #ifdef STRICT_CHECKING
else { else {
@@ -857,6 +862,7 @@ int vj_unicap_configure_device( void *ud, int pixel_format, int w, int h, int co
vut->format.size.height = vut->src_height; vut->format.size.height = vut->src_height;
vut->dst_sizes[0] = vut->dst_width * vut->dst_height; vut->dst_sizes[0] = vut->dst_width * vut->dst_height;
if(vut->composite) { if(vut->composite) {
vut->dst_sizes[1] = vut->dst_sizes[0]; vut->dst_sizes[1] = vut->dst_sizes[0];
vut->dst_sizes[2] = vut->dst_sizes[0]; vut->dst_sizes[2] = vut->dst_sizes[0];
@@ -869,10 +875,25 @@ int vj_unicap_configure_device( void *ud, int pixel_format, int w, int h, int co
vut->dst_sizes[2] = vut->dst_sizes[1]; vut->dst_sizes[2] = vut->dst_sizes[1];
} }
if( SUCCESS( unicap_set_format( vut->handle, &(vut->format)) ) ) { if( SUCCESS( unicap_set_format( vut->handle, &(vut->format)) ) ) {
veejay_msg(VEEJAY_MSG_INFO ,"Camera supports %dx%d in %s", vut->src_width,vut->src_height,vut->format.identifier); veejay_msg(VEEJAY_MSG_WARNING,
"(OK) Source %dx%d in %s , Dest %dx%d in %s (%d bytes framebuffer)",
vut->src_width,vut->src_height,vut->format.identifier,vut->dst_width,
vut->dst_height, unicap_pf_str(vut->dst_fmt),
vut->format.buffer_size );
good = 1; good = 1;
break; break;
} else {
veejay_msg(VEEJAY_MSG_ERROR,
"(FAIL) Source %dx%d in %s , Dest %dx%d in %s (%d bytes framebuffer)",
vut->src_width,vut->src_height,vut->format.identifier,vut->dst_width,
vut->dst_height, unicap_pf_str(vut->dst_fmt),
vut->format.buffer_size );
} }
} }