comparison libvo/vo_xvmc.c @ 28643:fcc8d7b273d4

Cosmetics part2. Indent local variable definitions like the rest of the code. Checked for equality by diff -wB .

28642:fd68de39e9f6

return -1;//fail
}

//print all info needed to add new format
static void print_xvimage_format_values(XvImageFormatValues *xifv){
int i;
    printf("Format_ID = 0x%X\n",xifv->id);

    printf("  type = ");
    if(xifv->type == XvRGB) printf("RGB\n");
    else if(xifv->type == XvYUV) printf("YUV\n");

}

// WARNING This function may changes xv_port and surface_info!
static int xvmc_find_surface_by_format(int format,int width,int height,
                                        XvMCSurfaceInfo * surf_info,int query){
int rez;
XvAdaptorInfo * ai;
int num_adaptors,i;
unsigned long p;
int s,mc_surf_num;
XvMCSurfaceInfo * mc_surf_list;

    rez = XvQueryAdaptors(mDisplay,DefaultRootWindow(mDisplay),&num_adaptors,&ai);
    if( rez != Success ) return -1;
    if( mp_msg_test(MSGT_VO,MSGL_DBG3) ) {
        printf("vo_xvmc: Querying %d adaptors\n",num_adaptors); }

    top_field_first = mpi->fields & MP_IMGFIELD_TOP_FIRST;
    return VO_TRUE;
}

static int preinit(const char *arg){
int xv_version,xv_release,xv_request_base,xv_event_base,xv_error_base;
int mc_eventBase,mc_errorBase;
int mc_ver,mc_rev;
strarg_t ck_src_arg = { 0, NULL };
strarg_t ck_method_arg = { 0, NULL };
opt_t subopts [] =
{
        /* name         arg type      arg var           test */
        {  "port",      OPT_ARG_INT,  &xv_port_request, (opt_test_f)int_pos },
        {  "adaptor",   OPT_ARG_INT,  &xv_adaptor,      (opt_test_f)int_non_neg },
        {  "ck",        OPT_ARG_STR,  &ck_src_arg,      xv_test_ck },
        {  "ck-method", OPT_ARG_STR,  &ck_method_arg,   xv_test_ckm },
        {  "benchmark", OPT_ARG_BOOL, &benchmark,       NULL },
        {  "sleep",     OPT_ARG_BOOL, &use_sleep,       NULL },
        {  "queue",     OPT_ARG_BOOL, &use_queue,       NULL },
        {  "bobdeint",  OPT_ARG_BOOL, &bob_deinterlace, NULL },
        {  NULL }
};

    //Obtain display handler
    if (!vo_init()) return -1;//vo_xv

    //XvMC is subdivision of XVideo

}

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){
int i,mode_id,rez;
int numblocks,blocks_per_macroblock;//bpmb we have 6,8,12

//from vo_xv
XVisualInfo vinfo;
XSetWindowAttributes xswa;
XWindowAttributes attribs;
unsigned long xswamask;
int depth;
#ifdef CONFIG_XF86VM
int vm = flags & VOFLAG_MODESWITCHING;
#endif
//end of vo_xv

    if( !IMGFMT_IS_XVMC(format) )
    {

        free(palette);
    }
}

static void clear_osd_subpic(int x0, int y0, int w, int h){
int rez;
    rez=XvMCClearSubpicture(mDisplay, &subpicture,
                            x0, y0, w,h,
                            subpicture_clear_color);
    if(rez != Success)
        printf("vo_xvmc: XvMCClearSubpicture failed!\n");
}

static void OSD_init(void) {
unsigned short osd_height, osd_width;
int rez;

    if(subpicture_alloc){
        if( mp_msg_test(MSGT_VO,MSGL_DBG4) )
            printf("vo_xvmc: destroying subpicture\n");
        XvMCDestroySubpicture(mDisplay,&subpicture);

    allocate_xvimage(subpicture.width, subpicture.height, subpicture_info.id);
    subpicture_alloc = 1;
}

static void draw_osd_IA44(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){
int ox,oy;
int rez;

    if( mp_msg_test(MSGT_VO,MSGL_DBG4) )
        printf("vo_xvmc:composite AI44 subpicture (%d,%d - %d,%d)\n",x0,y0,w,h);

    for(ox=0; ox<w; ox++){

        assert(0);
    }
}

static void draw_osd_AI44(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){
int ox,oy;
int rez;
    if(  mp_msg_test(MSGT_VO,MSGL_DBG4) )
        printf("vo_xvmc:composite AI44 subpicture (%d,%d - %d,%d)\n",x0,y0,w,h);

    for(ox=0; ox<w; ox++){
        for(oy=0; oy<h; oy++){

        assert(0);
    }
}

static void draw_osd(void){
struct xvmc_pix_fmt *osd_rndr;
int osd_has_changed;
int have_osd_to_draw;
int rez;

    if( mp_msg_test(MSGT_VO,MSGL_DBG4) )
        printf("vo_xvmc: draw_osd ,OSD_mode=%d, surface_to_show=%p\n",
                subpicture_mode,p_render_surface_to_show);

    }//if(BLEND||BACKEND)
}

static void xvmc_sync_surface(XvMCSurface * srf){
int status,rez;
    rez = XvMCGetSurfaceStatus(mDisplay,srf,&status);
    assert(rez==Success);
    if((status & XVMC_RENDERING) == 0)
        return;//surface is already complete
    if(use_sleep){

    XvMCSyncSurface(mDisplay, srf);
}

static void put_xvmc_image(struct xvmc_pix_fmt *p_render_surface,
                           int draw_ck){
int rez;
struct vo_rect src_rect, dst_rect;
int i;

    if(p_render_surface == NULL)
        return;

    calc_src_dst_rects(image_width, image_height, &src_rect, &dst_rect, NULL, NULL);

    }
    XFlush(mDisplay);
}

static void flip_page(void){
int i,cfs;


    if( mp_msg_test(MSGT_VO,MSGL_DBG4) )
        printf("vo_xvmc: flip_page  show(rndr=%p)\n\n",p_render_surface_to_show);

    if(p_render_surface_to_show == NULL) return;

    p_render_surface_visible = p_render_surface_to_show;
    p_render_surface_to_show = NULL;
}

static void check_events(void){
int e=vo_x11_check_events(mDisplay);
    if(e&VO_EVENT_RESIZE)
    {
        e |= VO_EVENT_EXPOSE;
    }
    if ( e & VO_EVENT_EXPOSE )

        put_xvmc_image(p_render_surface_visible,1);
    }
}

static void xvmc_free(void){
int i;
    if( subpicture_alloc ){

        XvMCDestroySubpicture(mDisplay,&subpicture);
        deallocate_xvimage();

#endif
    vo_x11_uninit();
}

static int query_format(uint32_t format){
uint32_t flags;
XvMCSurfaceInfo qsurface_info;
int mode_id;

    if( mp_msg_test(MSGT_VO,MSGL_DBG4) )
        printf("vo_xvmc: query_format=%X\n",format);

    if(!IMGFMT_IS_XVMC(format)) return 0;// no caps supported

}


static int draw_slice(uint8_t *image[], int stride[],
                           int w, int h, int x, int y){
struct xvmc_pix_fmt *rndr;
int rez;

    if( mp_msg_test(MSGT_VO,MSGL_DBG4) )
        printf("vo_xvmc: draw_slice y=%d\n",y);

    rndr = (struct xvmc_pix_fmt*)image[2]; //this is copy of priv-ate

}

//XvMCHide hides the surface on next retrace, so
//check if the surface is not still displaying
static void check_osd_source(struct xvmc_pix_fmt *src_rndr) {
struct xvmc_pix_fmt *osd_rndr;
int stat;
    //If this is source surface, check does the OSD rendering is compleate
    if(src_rndr->state & AV_XVMC_STATE_OSD_SOURCE){
        if( mp_msg_test(MSGT_VO,MSGL_DBG4) )
            printf("vo_xvmc: OSD surface=%p quering\n",src_rndr);
        osd_rndr = src_rndr->p_osd_target_surface_render;

        if(!(stat & XVMC_RENDERING))
            src_rndr->state &= ~AV_XVMC_STATE_OSD_SOURCE;
    }
}
static int count_free_surfaces(void) {
int i,num;
    num=0;
    for(i=0; i<number_of_surfaces; i++){
        check_osd_source(&surface_render[i]);
        if(surface_render[i].state == 0)
            num++;
    }
    return num;
}

static struct xvmc_pix_fmt *find_free_surface(void) {
int i,t;
int stat;
struct xvmc_pix_fmt *visible_rndr;

    visible_rndr = NULL;
    for(i=0; i<number_of_surfaces; i++){

        check_osd_source(&surface_render[i]);

        printf("vo_xvmc: surface[%d].state=%d\n",i,surface_render[i].state);
    return NULL;
}

static void xvmc_clean_surfaces(void){
int i;

    for(i=0; i<number_of_surfaces; i++){

        surface_render[i].state&=!( AV_XVMC_STATE_DISPLAY_PENDING |
                                    AV_XVMC_STATE_OSD_SOURCE |

        }
        case VOCTRL_UPDATE_SCREENINFO:
            update_xinerama_info();
            return VO_TRUE;
    }
return VO_NOTIMPL;
}

28643:fcc8d7b273d4

return -1;//fail
}

//print all info needed to add new format
static void print_xvimage_format_values(XvImageFormatValues *xifv){
    int i;

    printf("Format_ID = 0x%X\n",xifv->id);

    printf("  type = ");
    if(xifv->type == XvRGB) printf("RGB\n");
    else if(xifv->type == XvYUV) printf("YUV\n");

}

// WARNING This function may changes xv_port and surface_info!
static int xvmc_find_surface_by_format(int format,int width,int height,
                                        XvMCSurfaceInfo * surf_info,int query){
    int rez;
    XvAdaptorInfo * ai;
    int num_adaptors,i;
    unsigned long p;
    int s,mc_surf_num;
    XvMCSurfaceInfo * mc_surf_list;

    rez = XvQueryAdaptors(mDisplay,DefaultRootWindow(mDisplay),&num_adaptors,&ai);
    if( rez != Success ) return -1;
    if( mp_msg_test(MSGT_VO,MSGL_DBG3) ) {
        printf("vo_xvmc: Querying %d adaptors\n",num_adaptors); }

    top_field_first = mpi->fields & MP_IMGFIELD_TOP_FIRST;
    return VO_TRUE;
}

static int preinit(const char *arg){
    int xv_version,xv_release,xv_request_base,xv_event_base,xv_error_base;
    int mc_eventBase,mc_errorBase;
    int mc_ver,mc_rev;
    strarg_t ck_src_arg = { 0, NULL };
    strarg_t ck_method_arg = { 0, NULL };
    opt_t subopts [] =
    {
        /* name         arg type      arg var           test */
        {  "port",      OPT_ARG_INT,  &xv_port_request, (opt_test_f)int_pos },
        {  "adaptor",   OPT_ARG_INT,  &xv_adaptor,      (opt_test_f)int_non_neg },
        {  "ck",        OPT_ARG_STR,  &ck_src_arg,      xv_test_ck },
        {  "ck-method", OPT_ARG_STR,  &ck_method_arg,   xv_test_ckm },
        {  "benchmark", OPT_ARG_BOOL, &benchmark,       NULL },
        {  "sleep",     OPT_ARG_BOOL, &use_sleep,       NULL },
        {  "queue",     OPT_ARG_BOOL, &use_queue,       NULL },
        {  "bobdeint",  OPT_ARG_BOOL, &bob_deinterlace, NULL },
        {  NULL }
    };

    //Obtain display handler
    if (!vo_init()) return -1;//vo_xv

    //XvMC is subdivision of XVideo

}

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){
    int i,mode_id,rez;
    int numblocks,blocks_per_macroblock;//bpmb we have 6,8,12

//from vo_xv
    XVisualInfo vinfo;
    XSetWindowAttributes xswa;
    XWindowAttributes attribs;
    unsigned long xswamask;
    int depth;
#ifdef CONFIG_XF86VM
    int vm = flags & VOFLAG_MODESWITCHING;
#endif
//end of vo_xv

    if( !IMGFMT_IS_XVMC(format) )
    {

        free(palette);
    }
}

static void clear_osd_subpic(int x0, int y0, int w, int h){
    int rez;

    rez=XvMCClearSubpicture(mDisplay, &subpicture,
                            x0, y0, w,h,
                            subpicture_clear_color);
    if(rez != Success)
        printf("vo_xvmc: XvMCClearSubpicture failed!\n");
}

static void OSD_init(void) {
    unsigned short osd_height, osd_width;
    int rez;

    if(subpicture_alloc){
        if( mp_msg_test(MSGT_VO,MSGL_DBG4) )
            printf("vo_xvmc: destroying subpicture\n");
        XvMCDestroySubpicture(mDisplay,&subpicture);

    allocate_xvimage(subpicture.width, subpicture.height, subpicture_info.id);
    subpicture_alloc = 1;
}

static void draw_osd_IA44(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){
    int ox,oy;
    int rez;

    if( mp_msg_test(MSGT_VO,MSGL_DBG4) )
        printf("vo_xvmc:composite AI44 subpicture (%d,%d - %d,%d)\n",x0,y0,w,h);

    for(ox=0; ox<w; ox++){

        assert(0);
    }
}

static void draw_osd_AI44(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){
    int ox,oy;
    int rez;

    if(  mp_msg_test(MSGT_VO,MSGL_DBG4) )
        printf("vo_xvmc:composite AI44 subpicture (%d,%d - %d,%d)\n",x0,y0,w,h);

    for(ox=0; ox<w; ox++){
        for(oy=0; oy<h; oy++){

        assert(0);
    }
}

static void draw_osd(void){
    struct xvmc_pix_fmt *osd_rndr;
    int osd_has_changed;
    int have_osd_to_draw;
    int rez;

    if( mp_msg_test(MSGT_VO,MSGL_DBG4) )
        printf("vo_xvmc: draw_osd ,OSD_mode=%d, surface_to_show=%p\n",
                subpicture_mode,p_render_surface_to_show);

    }//if(BLEND||BACKEND)
}

static void xvmc_sync_surface(XvMCSurface * srf){
    int status,rez;

    rez = XvMCGetSurfaceStatus(mDisplay,srf,&status);
    assert(rez==Success);
    if((status & XVMC_RENDERING) == 0)
        return;//surface is already complete
    if(use_sleep){

    XvMCSyncSurface(mDisplay, srf);
}

static void put_xvmc_image(struct xvmc_pix_fmt *p_render_surface,
                           int draw_ck){
    int rez;
    struct vo_rect src_rect, dst_rect;
    int i;

    if(p_render_surface == NULL)
        return;

    calc_src_dst_rects(image_width, image_height, &src_rect, &dst_rect, NULL, NULL);

    }
    XFlush(mDisplay);
}

static void flip_page(void){
    int i,cfs;

    if( mp_msg_test(MSGT_VO,MSGL_DBG4) )
        printf("vo_xvmc: flip_page  show(rndr=%p)\n\n",p_render_surface_to_show);

    if(p_render_surface_to_show == NULL) return;

    p_render_surface_visible = p_render_surface_to_show;
    p_render_surface_to_show = NULL;
}

static void check_events(void){
    int e=vo_x11_check_events(mDisplay);

    if(e&VO_EVENT_RESIZE)
    {
        e |= VO_EVENT_EXPOSE;
    }
    if ( e & VO_EVENT_EXPOSE )

        put_xvmc_image(p_render_surface_visible,1);
    }
}

static void xvmc_free(void){
    int i;

    if( subpicture_alloc ){

        XvMCDestroySubpicture(mDisplay,&subpicture);
        deallocate_xvimage();

#endif
    vo_x11_uninit();
}

static int query_format(uint32_t format){
    uint32_t flags;
    XvMCSurfaceInfo qsurface_info;
    int mode_id;

    if( mp_msg_test(MSGT_VO,MSGL_DBG4) )
        printf("vo_xvmc: query_format=%X\n",format);

    if(!IMGFMT_IS_XVMC(format)) return 0;// no caps supported

}


static int draw_slice(uint8_t *image[], int stride[],
                           int w, int h, int x, int y){
    struct xvmc_pix_fmt *rndr;
    int rez;

    if( mp_msg_test(MSGT_VO,MSGL_DBG4) )
        printf("vo_xvmc: draw_slice y=%d\n",y);

    rndr = (struct xvmc_pix_fmt*)image[2]; //this is copy of priv-ate

}

//XvMCHide hides the surface on next retrace, so
//check if the surface is not still displaying
static void check_osd_source(struct xvmc_pix_fmt *src_rndr) {
    struct xvmc_pix_fmt *osd_rndr;
    int stat;

    //If this is source surface, check does the OSD rendering is compleate
    if(src_rndr->state & AV_XVMC_STATE_OSD_SOURCE){
        if( mp_msg_test(MSGT_VO,MSGL_DBG4) )
            printf("vo_xvmc: OSD surface=%p quering\n",src_rndr);
        osd_rndr = src_rndr->p_osd_target_surface_render;

        if(!(stat & XVMC_RENDERING))
            src_rndr->state &= ~AV_XVMC_STATE_OSD_SOURCE;
    }
}
static int count_free_surfaces(void) {
    int i,num;

    num=0;
    for(i=0; i<number_of_surfaces; i++){
        check_osd_source(&surface_render[i]);
        if(surface_render[i].state == 0)
            num++;
    }
    return num;
}

static struct xvmc_pix_fmt *find_free_surface(void) {
    int i,t;
    int stat;
    struct xvmc_pix_fmt *visible_rndr;

    visible_rndr = NULL;
    for(i=0; i<number_of_surfaces; i++){

        check_osd_source(&surface_render[i]);

        printf("vo_xvmc: surface[%d].state=%d\n",i,surface_render[i].state);
    return NULL;
}

static void xvmc_clean_surfaces(void){
    int i;

    for(i=0; i<number_of_surfaces; i++){

        surface_render[i].state&=!( AV_XVMC_STATE_DISPLAY_PENDING |
                                    AV_XVMC_STATE_OSD_SOURCE |

        }
        case VOCTRL_UPDATE_SCREENINFO:
            update_xinerama_info();
            return VO_TRUE;
    }
    return VO_NOTIMPL;
}