Changeset 45ee8540f9c7ca7525c8baa67fccac3708c9b5db

Show
Ignore:
Timestamp:
04/10/07 00:24:11 (1 year ago)
Author:
Laurent Aimar <fenrir@videolan.org>
git-committer:
Laurent Aimar <fenrir@videolan.org> 1191450251 +0000
git-parent:

[ea06273fe2aa7c09e7dda5329e152d9ae7745285]

git-author:
Laurent Aimar <fenrir@videolan.org> 1191450251 +0000
Message:

Added a "meta-preparsed" input variable. A demuxer can test it by

var_CreateGetBool( p_demux, "meta-preparsed" )

(The demuxer should NOT overwrite it)
subtitle: do not look for p_input when not necessary.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/demux/subtitle.c

    r3f07af6 r45ee854  
    177177    demux_sys_t    *p_sys; 
    178178    es_format_t    fmt; 
    179     input_thread_t *p_input; 
    180179    float          f_fps; 
    181180    char           *psz_type; 
    …… 
    199198 
    200199    /* Get the FPS */ 
    201     p_input = (input_thread_t *)vlc_object_find( p_demux, VLC_OBJECT_INPUT, FIND_PARENT ); 
    202     if( p_input ) 
    203     { 
    204         f_fps = var_GetFloat( p_input, "sub-original-fps" ); 
    205         if( f_fps >= 1.0 ) 
    206             p_sys->i_microsecperframe = (int64_t)( (float)1000000 / f_fps ); 
    207  
    208         msg_Dbg( p_demux, "Movie fps: %f", f_fps ); 
    209         vlc_object_release( p_input ); 
    210     } 
     200    f_fps = var_CreateGetFloat( p_demux, "sub-original-fps" ); 
     201    if( f_fps >= 1.0 ) 
     202        p_sys->i_microsecperframe = (int64_t)( (float)1000000 / f_fps ); 
     203 
     204    msg_Dbg( p_demux, "Movie fps: %f", f_fps ); 
    211205 
    212206    /* Check for override of the fps */ 

  • src/input/input.c

    r5643681 r45ee854  
    196196    /* Create Object Variables for private use only */ 
    197197    input_ConfigVarInit( p_input ); 
     198 
     199    vlc_mutex_lock( &p_item->lock ); 
     200    if( p_item->p_meta && (p_item->p_meta->i_status & ITEM_PREPARSED ) ) 
     201        var_SetBool( p_input, "meta-preparsed", VLC_TRUE ); 
     202    vlc_mutex_unlock( &p_item->lock ); 
     203 
    198204 
    199205    /* Create Objects variables for public Get and Set */ 

  • src/input/var.c

    r5643681 r45ee854  
    464464    var_Create( p_input, "meta-date", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); 
    465465    var_Create( p_input, "meta-url", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); 
     466 
     467    var_Create( p_input, "meta-preparsed", VLC_VAR_BOOL ); 
     468    var_SetBool( p_input, "meta-preparsed", VLC_FALSE ); 
    466469} 
    467470