41 |
* * |
* * |
42 |
* Revision history: * |
* Revision history: * |
43 |
* * |
* * |
44 |
* 22.05.2002 bs_put_matrix fix |
* 11.07.2002 add VOP width & height return to dec when dec->width * |
45 |
|
* or dec->height is 0 (for use in examples/ex1.c) * |
46 |
|
* MinChen <chenm001@163.com> * |
47 |
|
* 22.05.2002 bs_put_matrix fix * |
48 |
* 20.05.2002 added BitstreamWriteUserData * |
* 20.05.2002 added BitstreamWriteUserData * |
49 |
* 19.06.2002 Fix a little bug in use custom quant matrix * |
* 19.06.2002 Fix a little bug in use custom quant matrix * |
50 |
* MinChen <chenm001@163.com> * |
* MinChen <chenm001@163.com> * |
330 |
|
|
331 |
DPRINTF(DPRINTF_HEADER,"vop_time_increment_resolution %i", time_increment_resolution); |
DPRINTF(DPRINTF_HEADER,"vop_time_increment_resolution %i", time_increment_resolution); |
332 |
|
|
333 |
time_increment_resolution--; |
// time_increment_resolution--; |
334 |
|
|
335 |
if (time_increment_resolution > 0) { |
if (time_increment_resolution > 0) { |
336 |
dec->time_inc_bits = log2bin(time_increment_resolution); |
dec->time_inc_bits = log2bin(time_increment_resolution-1); |
337 |
} else { |
} else { |
338 |
// dec->time_inc_bits = 0; |
// dec->time_inc_bits = 0; |
339 |
// for "old" xvid compatibility, set time_inc_bits = 1 |
// for "old" xvid compatibility, set time_inc_bits = 1 |
362 |
DPRINTF(DPRINTF_HEADER, "width %i", width); |
DPRINTF(DPRINTF_HEADER, "width %i", width); |
363 |
DPRINTF(DPRINTF_HEADER, "height %i", height); |
DPRINTF(DPRINTF_HEADER, "height %i", height); |
364 |
|
|
365 |
|
// for auto set width & height |
366 |
|
if (dec->width == 0) |
367 |
|
dec->width = width; |
368 |
|
if (dec->height == 0) |
369 |
|
dec->height = height; |
370 |
|
|
371 |
if (width != dec->width || height != dec->height) { |
if (width != dec->width || height != dec->height) { |
372 |
DPRINTF(DPRINTF_ERROR, "XVID_DEC_PARAM width/height does not match bitstream"); |
DPRINTF(DPRINTF_ERROR, "XVID_DEC_PARAM width/height does not match bitstream"); |
373 |
return -1; |
return -1; |
550 |
dec->time = |
dec->time = |
551 |
dec->time_base * time_increment_resolution + |
dec->time_base * time_increment_resolution + |
552 |
time_increment; |
time_increment; |
553 |
dec->time_pp = (uint32_t) (dec->time - dec->last_non_b_time); |
dec->time_pp = (uint32_t) |
554 |
|
(time_increment_resolution + dec->time - dec->last_non_b_time)%time_increment_resolution; |
555 |
dec->last_non_b_time = dec->time; |
dec->last_non_b_time = dec->time; |
556 |
} else { |
} else { |
557 |
dec->time = |
dec->time = |
558 |
(dec->last_time_base + |
(dec->last_time_base + |
559 |
time_incr) * time_increment_resolution + time_increment; |
time_incr) * time_increment_resolution + time_increment; |
560 |
dec->time_bp = (uint32_t) (dec->last_non_b_time - dec->time); |
dec->time_bp = (uint32_t) |
561 |
|
(time_increment_resolution + dec->last_non_b_time - dec->time)%time_increment_resolution; |
562 |
} |
} |
563 |
|
|
564 |
READ_MARKER(); |
READ_MARKER(); |