Changeset 5da32d65883f8b1b6a4e1c1f52f05665414206e0

Show
Ignore:
Timestamp:
10/19/07 00:26:27 (10 months ago)
Author:
Laurent Aimar <fenrir@videolan.org>
git-committer:
Laurent Aimar <fenrir@videolan.org> 1192746387 +0000
git-parent:

[22ec91db9f385ed13353459506d8e54f699374f0]

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

DVD CC are not reordered.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/packetizer/mpegvideo.c

    r85b124f r5da32d6  
    131131    uint32_t i_cc_flags; 
    132132    mtime_t i_cc_pts; 
     133    mtime_t i_cc_dts; 
    133134    cc_data_t cc; 
    134135}; 
    …… 
    201202    p_sys->b_cc_reset = VLC_FALSE; 
    202203    p_sys->i_cc_pts = 0; 
     204    p_sys->i_cc_dts = 0; 
    203205    p_sys->i_cc_flags = 0; 
    204206    cc_Init( &p_sys->cc ); 
    …… 
    402404        memcpy( p_cc->p_buffer, p_sys->cc.p_data, p_sys->cc.i_data ); 
    403405        p_cc->i_dts =  
    404         p_cc->i_pts = p_sys->i_cc_pts; 
    405         p_cc->i_flags = p_sys->i_cc_flags & ( BLOCK_FLAG_TYPE_I|BLOCK_FLAG_TYPE_P|BLOCK_FLAG_TYPE_B); 
     406        p_cc->i_pts = p_sys->cc.b_reorder ? p_sys->i_cc_pts : p_sys->i_cc_dts; 
     407        p_cc->i_flags = ( p_sys->cc.b_reorder  ? p_sys->i_cc_flags : BLOCK_FLAG_TYPE_P ) & ( BLOCK_FLAG_TYPE_I|BLOCK_FLAG_TYPE_P|BLOCK_FLAG_TYPE_B); 
    406408    } 
    407409    cc_Flush( &p_sys->cc ); 
    …… 
    544546        p_sys->b_cc_reset = VLC_TRUE; 
    545547        p_sys->i_cc_pts = p_pic->i_pts; 
     548        p_sys->i_cc_dts = p_pic->i_dts; 
    546549        p_sys->i_cc_flags = p_pic->i_flags; 
    547550    }