547 |
#endif |
#endif |
548 |
|
|
549 |
if (dec->time_inc_resolution > 0) { |
if (dec->time_inc_resolution > 0) { |
550 |
dec->time_inc_bits = log2bin(dec->time_inc_resolution-1); |
dec->time_inc_bits = MAX(log2bin(dec->time_inc_resolution-1), 1); |
551 |
} else { |
} else { |
552 |
#if 0 |
#if 0 |
553 |
dec->time_inc_bits = 0; |
dec->time_inc_bits = 0; |
814 |
if (coding_type != B_VOP) { |
if (coding_type != B_VOP) { |
815 |
dec->last_time_base = dec->time_base; |
dec->last_time_base = dec->time_base; |
816 |
dec->time_base += time_incr; |
dec->time_base += time_incr; |
817 |
dec->time = time_increment; |
dec->time = dec->time_base*dec->time_inc_resolution + time_increment; |
818 |
|
dec->time_pp = (int32_t)(dec->time - dec->last_non_b_time); |
|
#if 0 |
|
|
dec->time_base * dec->time_inc_resolution + |
|
|
time_increment; |
|
|
#endif |
|
|
dec->time_pp = (uint32_t) |
|
|
(dec->time_inc_resolution + dec->time - dec->last_non_b_time)%dec->time_inc_resolution; |
|
819 |
dec->last_non_b_time = dec->time; |
dec->last_non_b_time = dec->time; |
820 |
} else { |
} else { |
821 |
dec->time = time_increment; |
dec->time = (dec->last_time_base + time_incr)*dec->time_inc_resolution + time_increment; |
822 |
#if 0 |
dec->time_bp = dec->time_pp - (int32_t)(dec->last_non_b_time - dec->time); |
|
(dec->last_time_base + |
|
|
time_incr) * dec->time_inc_resolution + time_increment; |
|
|
#endif |
|
|
dec->time_bp = (uint32_t) |
|
|
(dec->time_inc_resolution + dec->last_non_b_time - dec->time)%dec->time_inc_resolution; |
|
823 |
} |
} |
824 |
DPRINTF(XVID_DEBUG_HEADER,"time_pp=%i\n", dec->time_pp); |
DPRINTF(XVID_DEBUG_HEADER,"time_pp=%i\n", dec->time_pp); |
825 |
DPRINTF(XVID_DEBUG_HEADER,"time_bp=%i\n", dec->time_bp); |
DPRINTF(XVID_DEBUG_HEADER,"time_bp=%i\n", dec->time_bp); |
1012 |
else |
else |
1013 |
sscanf(tmp, "XviD%d", &dec->bs_version); |
sscanf(tmp, "XviD%d", &dec->bs_version); |
1014 |
|
|
1015 |
DPRINTF(XVID_DEBUG_HEADER, "xvid bitstream version=%i", dec->bs_version); |
DPRINTF(XVID_DEBUG_HEADER, "xvid bitstream version=%i\n", dec->bs_version); |
1016 |
} |
} |
1017 |
|
|
1018 |
/* divx detection */ |
/* divx detection */ |