Changeset b3f60010735de9fde544710fcf9c04e0b9aec7c4

Show
Ignore:
Timestamp:
04/22/08 18:09:20 (4 months ago)
Author:
Rafaël Carré <funman@videolan.org>
git-committer:
Rafaël Carré <funman@videolan.org> 1208880560 +0200
git-parent:

[94532842606e485782be10c09f1e1500995feb77]

git-author:
Rafaël Carré <funman@videolan.org> 1208880560 +0200
Message:

Revert play & send durations, read preroll as 64 bits

The "unknown, always 0" field looks very much like it is the not used 32
msb of preroll
Thanks to Juho Vähä-Herttua

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/demux/asf/libasf.c

    rbcddfd6 rb3f6001  
    280280    p_fp->i_creation_date = GetQWLE( p_peek + 48 ); 
    281281    p_fp->i_data_packets_count = GetQWLE( p_peek + 56 ); 
    282     p_fp->i_send_duration = GetQWLE( p_peek + 64 ); 
    283     p_fp->i_play_duration = GetQWLE( p_peek + 72 ); 
    284     p_fp->i_preroll = GetDWLE( p_peek + 80 ); 
    285     p_fp->i_unknown = GetDWLE( p_peek + 84 ); 
     282    p_fp->i_play_duration = GetQWLE( p_peek + 64 ); 
     283    p_fp->i_send_duration = GetQWLE( p_peek + 72 ); 
     284    p_fp->i_preroll = GetQWLE( p_peek + 80 ); 
    286285    p_fp->i_flags = GetDWLE( p_peek + 88 ); 
    287286    p_fp->i_min_data_packet_size = GetDWLE( p_peek + 92 ); 
    …… 
    293292            "read \"file properties object\" file_id:" GUID_FMT 
    294293            " file_size:"I64Fd" creation_date:"I64Fd" data_packets_count:" 
    295             I64Fd" send_duration:"I64Fd" play_duration:"I64Fd" preroll:%d" 
    296             "unknown:%d flags:%d min_data_packet_size:%d " 
    297             "max_data_packet_size:%d max_bitrate:%d", 
     294            I64Fd" play_duration:"I64Fd" send_duration:"I64Fd" preroll:"I64Fd 
     295            " flags:%d min_data_packet_size:%d " 
     296            " max_data_packet_size:%d max_bitrate:%d", 
    298297            GUID_PRINT( p_fp->i_file_id ), p_fp->i_file_size, 
    299298            p_fp->i_creation_date, p_fp->i_data_packets_count, 
    300             p_fp->i_send_duration, p_fp->i_play_duration, 
    301             p_fp->i_preroll, p_fp->i_unknown, p_fp->i_flags, 
     299            p_fp->i_play_duration, p_fp->i_send_duration, 
     300            p_fp->i_preroll, p_fp->i_flags, 
    302301            p_fp->i_min_data_packet_size, p_fp->i_max_data_packet_size, 
    303302            p_fp->i_max_bitrate ); 

  • modules/demux/asf/libasf.h

    r9d349e1 rb3f6001  
    199199    uint64_t     i_creation_date; 
    200200    uint64_t     i_data_packets_count; 
     201    uint64_t     i_play_duration; 
    201202    uint64_t     i_send_duration; 
    202     uint64_t     i_play_duration; 
    203     uint32_t     i_preroll; 
    204     uint32_t     i_unknown; /* ignored, usually 0 */ 
     203    uint64_t     i_preroll; 
    205204    uint32_t     i_flags; 
    206205    uint32_t     i_min_data_packet_size;