Changeset 8d0689823c4a3f12ec66bd9e00faeedf719e3159

Show
Ignore:
Timestamp:
02/28/08 03:32:23 (6 months ago)
Author:
Jean-Baptiste Kempf <jb@videolan.org>
git-committer:
Jean-Baptiste Kempf <jb@videolan.org> 1204165943 +0000
git-parent:

[eb88f342e8e4c54a15f47b08569e5be130a5e237]

git-author:
Jean-Baptiste Kempf <jb@videolan.org> 1204165943 +0000
Message:

Compile XvMC. Disabled the subtitles part for that. Commented a few things. This can't be good, but at least it compiles (not link yet).

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/video_output/x11/xcommon.c

    r0d0f59a r8d06898  
    431431        return VLC_EGENERIC; 
    432432    } 
     433    subpicture_t sub_pic; 
    433434    sub_pic.p_sys = NULL; 
    434435    p_vout->p_sys->last_date = 0; 
    …… 
    598599    } 
    599600 
     601#if 0 
    600602    vlc_mutex_lock( &p_vout->lastsubtitle_lock ); 
    601  
    602     if (p_vout->p_last_subtitle != NULL) 
    603     { 
    604         if( p_vout->p_sys->p_last_subtitle_save != p_vout->p_last_subtitle ) 
     603    if (p_vout->p_sys->p_last_subtitle != NULL) 
     604    { 
     605        if( p_vout->p_sys->p_last_subtitle_save != p_vout->p_sys->p_last_subtitle ) 
    605606        { 
    606607            p_vout->p_sys->new_subpic = 
    …… 
    756757 
    757758    vlc_mutex_unlock( &p_vout->lastsubtitle_lock ); 
     759#endif 
    758760    xvmc_context_reader_unlock( &p_vout->p_sys->xvmc_lock ); 
    759761 
    …… 
    966968    xvmc_context_reader_lock( &p_vout->p_sys->xvmc_lock ); 
    967969 
    968     vlc_xxmc_t *xxmc = &p_picture->p_sys->xxmc_data; 
     970    vlc_xxmc_t *xxmc = &p_pic->p_sys->xxmc_data; 
    969971    if( !xxmc->decoded || 
    970         !xxmc_xvmc_surface_valid( p_vout, p_picture->p_sys->xvmc_surf ) ) 
     972        !xxmc_xvmc_surface_valid( p_vout, p_pic->p_sys->xvmc_surf ) ) 
    971973    { 
    972974      msg_Dbg( p_vout, "DisplayVideo decoded=%d\tsurfacevalid=%d", 
    973975               xxmc->decoded, 
    974                xxmc_xvmc_surface_valid( p_vout, p_picture->p_sys->xvmc_surf ) ); 
     976               xxmc_xvmc_surface_valid( p_vout, p_pic->p_sys->xvmc_surf ) ); 
    975977      vlc_mutex_unlock( &p_vout->p_sys->lock ); 
    976978      xvmc_context_reader_unlock( &p_vout->p_sys->xvmc_lock ); 
    …… 
    978980    } 
    979981 
    980     src_width = p_vout->output.i_width; 
    981     src_height = p_vout->output.i_height; 
     982    int src_width = p_vout->output.i_width; 
     983    int src_height = p_vout->output.i_height; 
     984    int src_x, src_y; 
    982985 
    983986    if( p_vout->p_sys->xvmc_crop_style == 1 ) 
    …… 
    10081011    } 
    10091012 
     1013    int first_field; 
    10101014    if( p_vout->p_sys->xvmc_deinterlace_method > 0 ) 
    10111015    {   /* BOB DEINTERLACE */ 
    1012         if( (p_picture->p_sys->nb_display == 0) || 
     1016        if( (p_pic->p_sys->nb_display == 0) || 
    10131017            (p_vout->p_sys->xvmc_deinterlace_method == 1) ) 
    10141018        { 
    1015             first_field = (p_picture->b_top_field_first) ? 
     1019            first_field = (p_pic->b_top_field_first) ? 
    10161020                                XVMC_BOTTOM_FIELD : XVMC_TOP_FIELD; 
    10171021        } 
    10181022        else 
    10191023        { 
    1020             first_field = (p_picture->b_top_field_first) ? 
     1024            first_field = (p_pic->b_top_field_first) ? 
    10211025                                XVMC_TOP_FIELD : XVMC_BOTTOM_FIELD; 
    10221026        } 
    …… 
    10281032 
    10291033    XVMCLOCKDISPLAY( p_vout->p_sys->p_display ); 
    1030     XvMCFlushSurface( p_vout->p_sys->p_display, p_picture->p_sys->xvmc_surf ); 
     1034    XvMCFlushSurface( p_vout->p_sys->p_display, p_pic->p_sys->xvmc_surf ); 
    10311035    /* XvMCSyncSurface(p_vout->p_sys->p_display, p_picture->p_sys->xvmc_surf); */ 
    10321036    XvMCPutSurface( p_vout->p_sys->p_display, 
    1033                     p_picture->p_sys->xvmc_surf, 
     1037                    p_pic->p_sys->xvmc_surf, 
    10341038                    p_vout->p_sys->p_win->video_window, 
    10351039                    src_x, 
    …… 
    10461050    if( p_vout->p_sys->xvmc_deinterlace_method == 2 ) 
    10471051    {   /* BOB DEINTERLACE */ 
    1048         if( p_picture->p_sys->nb_display == 0 )/* && ((t2-t1) < 15000)) */ 
    1049         { 
    1050             mtime_t last_date = p_picture->date; 
     1052        if( p_pic->p_sys->nb_display == 0 )/* && ((t2-t1) < 15000)) */ 
     1053        { 
     1054            mtime_t last_date = p_pic->date; 
    10511055 
    10521056            vlc_mutex_lock( &p_vout->picture_lock ); 
    10531057            if( !p_vout->p_sys->last_date ) 
    10541058            { 
    1055                 p_picture->date += 20000; 
     1059                p_pic->date += 20000; 
    10561060            } 
    10571061            else 
    10581062            { 
    1059                 p_picture->date = ((3 * p_picture->date - 
     1063                p_pic->date = ((3 * p_pic->date - 
    10601064                                    p_vout->p_sys->last_date) / 2 ); 
    10611065            } 
    10621066            p_vout->p_sys->last_date = last_date; 
    1063             p_picture->b_force = 1; 
    1064             p_picture->p_sys->nb_display = 1; 
     1067            p_pic->b_force = 1; 
     1068            p_pic->p_sys->nb_display = 1; 
    10651069            vlc_mutex_unlock( &p_vout->picture_lock ); 
    10661070        } 
    10671071        else 
    10681072        { 
    1069             p_picture->p_sys->nb_display = 0; 
    1070             p_picture->b_force = 0; 
     1073            p_pic->p_sys->nb_display = 0; 
     1074            p_pic->b_force = 0; 
    10711075        } 
    10721076    } 
    …… 
    19031907    p_pic->p_sys->xxmc_data.decoded = 0; 
    19041908    p_pic->p_sys->xxmc_data.proc_xxmc_update_frame = xxmc_do_update_frame; 
    1905     p_pic->p_accel_data = &p_pic->p_sys->xxmc_data; 
     1909    //    p_pic->p_accel_data = &p_pic->p_sys->xxmc_data; 
    19061910    p_pic->p_sys->nb_display = 0; 
    19071911#endif 
    …… 
    30823086            if( i_query == VOUT_REPARENT ) d = (Drawable)va_arg( args, int ); 
    30833087            if( !d ) 
     3088            { 
    30843089#ifdef MODULE_NAME_IS_xvmc 
    30853090            xvmc_context_reader_lock( &p_vout->p_sys->xvmc_lock ); 
    …… 
    30893094                             DefaultRootWindow( p_vout->p_sys->p_display ), 
    30903095                             0, 0 ); 
     3096            } 
    30913097            else 
    30923098            XReparentWindow( p_vout->p_sys->p_display, 

  • modules/video_output/x11/xvmc.c

    rd2d8554 r8d06898  
    340340    int i_len, i_color; 
    341341    uint16_t *p_source = NULL; 
    342  
     342#if 0 
    343343    if (!sub_img) 
    344344        return; 
    …… 
    469469        dst_y += dst_pitch; 
    470470    } 
     471#endif 
    471472} 
    472473