mirror of
https://github.com/mpv-player/mpv
synced 2025-04-11 04:01:31 +00:00
whitespace cosmetics: Remove all tabs and trailing whitespace.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28604 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego
parent
d274cbbbb5
commit
e3638bae19
@ -306,13 +306,13 @@ XvMCSurfaceInfo * mc_surf_list;
|
||||
{
|
||||
if( mp_msg_test(MSGT_VO,MSGL_DBG3) ) {
|
||||
printf("vo_xvmc: probing port #%ld\n",p); }
|
||||
mc_surf_list = XvMCListSurfaceTypes(mDisplay,p,&mc_surf_num);
|
||||
if( mc_surf_list == NULL || mc_surf_num == 0){
|
||||
if( mp_msg_test(MSGT_VO,MSGL_DBG3) ) {
|
||||
mc_surf_list = XvMCListSurfaceTypes(mDisplay,p,&mc_surf_num);
|
||||
if( mc_surf_list == NULL || mc_surf_num == 0){
|
||||
if( mp_msg_test(MSGT_VO,MSGL_DBG3) ) {
|
||||
printf("vo_xvmc: No XvMC supported. \n"); }
|
||||
continue;
|
||||
}
|
||||
if( mp_msg_test(MSGT_VO,MSGL_DBG3) ) {
|
||||
continue;
|
||||
}
|
||||
if( mp_msg_test(MSGT_VO,MSGL_DBG3) ) {
|
||||
printf("vo_xvmc: XvMC list have %d surfaces\n",mc_surf_num); }
|
||||
//we have XvMC list!
|
||||
for(s=0; s<mc_surf_num; s++)
|
||||
@ -329,18 +329,18 @@ XvMCSurfaceInfo * mc_surf_list;
|
||||
|
||||
if(!query){
|
||||
rez = XvGrabPort(mDisplay,p,CurrentTime);
|
||||
if(rez != Success){
|
||||
if ( mp_msg_test(MSGT_VO,MSGL_DBG3) ) {
|
||||
if(rez != Success){
|
||||
if ( mp_msg_test(MSGT_VO,MSGL_DBG3) ) {
|
||||
printf("vo_xvmc: Fail to grab port %ld\n",p); }
|
||||
continue;
|
||||
}
|
||||
printf("vo_xvmc: Using Xv Adaptor #%d (%s)\n", i, ai[i].name);
|
||||
printf("vo_xvmc: Port %ld grabed\n",p);
|
||||
xv_port = p;
|
||||
}
|
||||
goto surface_found;
|
||||
}//for mc surf
|
||||
XFree(mc_surf_list);//if mc_surf_num==0 is list==NULL ?
|
||||
continue;
|
||||
}
|
||||
printf("vo_xvmc: Using Xv Adaptor #%d (%s)\n", i, ai[i].name);
|
||||
printf("vo_xvmc: Port %ld grabed\n",p);
|
||||
xv_port = p;
|
||||
}
|
||||
goto surface_found;
|
||||
}//for mc surf
|
||||
XFree(mc_surf_list);//if mc_surf_num==0 is list==NULL ?
|
||||
}//for ports
|
||||
}//for adaptors
|
||||
XvFreeAdaptorInfo(ai);
|
||||
@ -403,7 +403,7 @@ opt_t subopts [] =
|
||||
|
||||
//XvMC is subdivision of XVideo
|
||||
if (Success != XvQueryExtension(mDisplay,&xv_version,&xv_release,&xv_request_base,
|
||||
&xv_event_base,&xv_error_base) ){
|
||||
&xv_event_base,&xv_error_base) ){
|
||||
mp_msg(MSGT_VO,MSGL_ERR,"Sorry, Xv(MC) not supported by this X11 version/driver\n");
|
||||
mp_msg(MSGT_VO,MSGL_ERR,"********** Try with -vo x11 or -vo sdl ***********\n");
|
||||
return -1;
|
||||
@ -412,13 +412,13 @@ opt_t subopts [] =
|
||||
|
||||
if( True != XvMCQueryExtension(mDisplay,&mc_eventBase,&mc_errorBase) ){
|
||||
printf("vo_xvmc: No X-Video MotionCompensation Extension on %s\n",
|
||||
XDisplayName(NULL));
|
||||
XDisplayName(NULL));
|
||||
return -1;
|
||||
}
|
||||
|
||||
if(Success == XvMCQueryVersion(mDisplay, &mc_ver, &mc_rev) ){
|
||||
printf("vo_xvmc: X-Video MotionCompensation Extension version %i.%i\n",
|
||||
mc_ver,mc_rev);
|
||||
mc_ver,mc_rev);
|
||||
}
|
||||
else{
|
||||
printf("vo_xvmc: Error querying version info!\n");
|
||||
@ -446,8 +446,8 @@ opt_t subopts [] =
|
||||
}
|
||||
|
||||
static int config(uint32_t width, uint32_t height,
|
||||
uint32_t d_width, uint32_t d_height,
|
||||
uint32_t flags, char *title, uint32_t format){
|
||||
uint32_t d_width, uint32_t d_height,
|
||||
uint32_t flags, char *title, uint32_t format){
|
||||
int i,mode_id,rez;
|
||||
int numblocks,blocks_per_macroblock;//bpmb we have 6,8,12
|
||||
|
||||
@ -524,7 +524,7 @@ int vm = flags & VOFLAG_MODESWITCHING;
|
||||
for(i=0; i<MAX_SURFACES; i++){
|
||||
rez=XvMCCreateSurface(mDisplay,&ctx,&surface_array[i]);
|
||||
if( rez != Success )
|
||||
break;
|
||||
break;
|
||||
surface_render[i].unique_id = AV_XVMC_RENDER_MAGIC;
|
||||
surface_render[i].data_blocks = data_blocks.blocks;
|
||||
surface_render[i].mv_blocks = mv_blocks.macro_blocks;
|
||||
@ -548,7 +548,7 @@ int vm = flags & VOFLAG_MODESWITCHING;
|
||||
//debug
|
||||
printf("vo_xvmc: idct=%d unsigned_intra=%d\n",
|
||||
(surface_info.mc_type & XVMC_IDCT) == XVMC_IDCT,
|
||||
(surface_info.flags & XVMC_INTRA_UNSIGNED) == XVMC_INTRA_UNSIGNED);
|
||||
(surface_info.flags & XVMC_INTRA_UNSIGNED) == XVMC_INTRA_UNSIGNED);
|
||||
|
||||
// Find way to display OSD & subtitle
|
||||
printf("vo_xvmc: looking for OSD support\n");
|
||||
@ -637,7 +637,7 @@ skip_surface_allocation:
|
||||
#ifdef CONFIG_XF86VM
|
||||
if ( vm )
|
||||
{
|
||||
vo_vm_switch();
|
||||
vo_vm_switch();
|
||||
}
|
||||
else
|
||||
#endif
|
||||
@ -935,7 +935,7 @@ int status,rez;
|
||||
}
|
||||
|
||||
static void put_xvmc_image(struct xvmc_pix_fmt *p_render_surface,
|
||||
int draw_ck){
|
||||
int draw_ck){
|
||||
int rez;
|
||||
struct vo_rect src_rect, dst_rect;
|
||||
int i;
|
||||
@ -1100,7 +1100,7 @@ int mode_id;
|
||||
|
||||
flags = VFCAP_CSP_SUPPORTED |
|
||||
VFCAP_CSP_SUPPORTED_BY_HW |
|
||||
VFCAP_ACCEPT_STRIDE;
|
||||
VFCAP_ACCEPT_STRIDE;
|
||||
|
||||
if( (qsurface_info.subpicture_max_width != 0) &&
|
||||
(qsurface_info.subpicture_max_height != 0) )
|
||||
@ -1110,7 +1110,7 @@ int mode_id;
|
||||
|
||||
|
||||
static int draw_slice(uint8_t *image[], int stride[],
|
||||
int w, int h, int x, int y){
|
||||
int w, int h, int x, int y){
|
||||
struct xvmc_pix_fmt *rndr;
|
||||
int rez;
|
||||
|
||||
@ -1122,7 +1122,7 @@ int rez;
|
||||
assert( rndr->unique_id == AV_XVMC_RENDER_MAGIC );
|
||||
|
||||
rez = XvMCRenderSurface(mDisplay,&ctx,rndr->picture_structure,
|
||||
rndr->p_surface,
|
||||
rndr->p_surface,
|
||||
rndr->p_past_surface,
|
||||
rndr->p_future_surface,
|
||||
rndr->flags,
|
||||
@ -1144,14 +1144,14 @@ int rez;
|
||||
XvMCMacroBlock* testblock;
|
||||
testblock = &mv_blocks.macro_blocks[i];
|
||||
|
||||
printf("vo_xvmc::slice: mv_block - x=%d,y=%d,mb_type=0x%x,mv_type=0x%x,mv_field_select=%d\n",
|
||||
testblock->x,testblock->y,testblock->macroblock_type,
|
||||
testblock->motion_type,testblock->motion_vertical_field_select);
|
||||
printf("vo_xvmc::slice: mv_block - x=%d,y=%d,mb_type=0x%x,mv_type=0x%x,mv_field_select=%d\n",
|
||||
testblock->x,testblock->y,testblock->macroblock_type,
|
||||
testblock->motion_type,testblock->motion_vertical_field_select);
|
||||
printf("vo_xvmc::slice: dct_type=%d,data_index=0x%x,cbp=%d,pad0=%d\n",
|
||||
testblock->dct_type,testblock->index,testblock->coded_block_pattern,
|
||||
testblock->pad0);
|
||||
testblock->dct_type,testblock->index,testblock->coded_block_pattern,
|
||||
testblock->pad0);
|
||||
printf("vo_xvmc::slice: PMV[0][0][0/1]=(%d,%d)\n",
|
||||
testblock->PMV[0][0][0],testblock->PMV[0][0][1]);
|
||||
testblock->PMV[0][0][0],testblock->PMV[0][0][1]);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
@ -1301,13 +1301,13 @@ static int control(uint32_t request, void *data, ... )
|
||||
case VOCTRL_DRAW_IMAGE:
|
||||
return xvmc_draw_image((mp_image_t *)data);
|
||||
case VOCTRL_GET_IMAGE:
|
||||
return get_image((mp_image_t *)data);
|
||||
return get_image((mp_image_t *)data);
|
||||
//vo_xv
|
||||
case VOCTRL_GUISUPPORT:
|
||||
return VO_TRUE;
|
||||
case VOCTRL_ONTOP:
|
||||
vo_x11_ontop();
|
||||
return VO_TRUE;
|
||||
return VO_TRUE;
|
||||
case VOCTRL_FULLSCREEN:
|
||||
vo_x11_fullscreen();
|
||||
// indended, fallthrough to update panscan on fullscreen/windowed switch
|
||||
@ -1319,7 +1319,7 @@ static int control(uint32_t request, void *data, ... )
|
||||
|
||||
if(old_y != vo_panscan_y)
|
||||
{
|
||||
//this also draws the colorkey
|
||||
//this also draws the colorkey
|
||||
put_xvmc_image(p_render_surface_visible,1);
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user