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 |
446 |
|
|
447 |
|
|
448 |
if (vol_ver_id != 1) { |
if (vol_ver_id != 1) { |
449 |
dec->quarterpel = BitstreamGetBit(bs); // quarter_sampe |
DEBUG("QUARTERPEL BITSTREAM"); |
450 |
if (dec->quarterpel) { |
dec->quarterpel = BitstreamGetBit(bs); // quarter_sample |
|
DPRINTF(DPRINTF_ERROR, "quarter_sample not supported"); |
|
451 |
} |
} |
452 |
} else { |
else |
453 |
dec->quarterpel = 0; |
dec->quarterpel = 0; |
454 |
} |
|
455 |
|
|
456 |
if (!BitstreamGetBit(bs)) // complexity_estimation_disable |
if (!BitstreamGetBit(bs)) // complexity_estimation_disable |
457 |
{ |
{ |
546 |
if (coding_type != B_VOP) { |
if (coding_type != B_VOP) { |
547 |
dec->last_time_base = dec->time_base; |
dec->last_time_base = dec->time_base; |
548 |
dec->time_base += time_incr; |
dec->time_base += time_incr; |
549 |
dec->time = |
dec->time = time_increment; |
550 |
dec->time_base * time_increment_resolution + |
|
551 |
|
/* 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 = time_increment; |
558 |
|
/* |
559 |
(dec->last_time_base + |
(dec->last_time_base + |
560 |
time_incr) * time_increment_resolution + time_increment; |
time_incr) * time_increment_resolution + time_increment; |
561 |
dec->time_bp = (uint32_t) (dec->last_non_b_time - dec->time); |
*/ |
562 |
|
dec->time_bp = (uint32_t) |
563 |
|
(time_increment_resolution + dec->last_non_b_time - dec->time)%time_increment_resolution; |
564 |
} |
} |
565 |
|
|
566 |
READ_MARKER(); |
READ_MARKER(); |
619 |
*intra_dc_threshold = |
*intra_dc_threshold = |
620 |
intra_dc_threshold_table[BitstreamGetBits(bs, 3)]; |
intra_dc_threshold_table[BitstreamGetBits(bs, 3)]; |
621 |
|
|
622 |
|
dec->top_field_first = 0; |
623 |
|
dec->alternate_vertical_scan = 0; |
624 |
|
|
625 |
if (dec->interlacing) { |
if (dec->interlacing) { |
626 |
dec->top_field_first = BitstreamGetBit(bs); |
dec->top_field_first = BitstreamGetBit(bs); |
627 |
DPRINTF(DPRINTF_HEADER, "interlace top_field_first %i", dec->top_field_first); |
DPRINTF(DPRINTF_HEADER, "interlace top_field_first %i", dec->top_field_first); |
717 |
BitstreamPutBit(bs, 0); // is_object_layer_identified (0=not given) |
BitstreamPutBit(bs, 0); // is_object_layer_identified (0=not given) |
718 |
BitstreamPutBits(bs, 1, 4); // aspect_ratio_info (1=1:1) |
BitstreamPutBits(bs, 1, 4); // aspect_ratio_info (1=1:1) |
719 |
|
|
|
#ifdef BFRAMES |
|
|
if (pParam->max_bframes > 0) { |
|
|
//DPRINTF("low_delay=1"); |
|
720 |
BitstreamPutBit(bs, 1); // vol_control_parameters |
BitstreamPutBit(bs, 1); // vol_control_parameters |
721 |
BitstreamPutBits(bs, 1, 2); // chroma_format 1="4:2:0" |
BitstreamPutBits(bs, 1, 2); // chroma_format 1="4:2:0" |
722 |
|
|
723 |
|
#ifdef BFRAMES |
724 |
|
if (pParam->max_bframes > 0) { |
725 |
BitstreamPutBit(bs, 0); // low_delay |
BitstreamPutBit(bs, 0); // low_delay |
|
BitstreamPutBit(bs, 0); // vbv_parameters (0=not given) |
|
726 |
} else |
} else |
727 |
#endif |
#endif |
728 |
{ |
{ |
729 |
BitstreamPutBits(bs, 0, 1); // vol_control_parameters (0=not given) |
BitstreamPutBit(bs, 1); // low_delay |
730 |
} |
} |
731 |
|
BitstreamPutBit(bs, 0); // vbv_parameters (0=not given) |
732 |
|
|
733 |
BitstreamPutBits(bs, 0, 2); // video_object_layer_shape (0=rectangular) |
BitstreamPutBits(bs, 0, 2); // video_object_layer_shape (0=rectangular) |
734 |
|
|
742 |
#ifdef BFRAMES |
#ifdef BFRAMES |
743 |
BitstreamPutBits(bs, pParam->fbase, 16); |
BitstreamPutBits(bs, pParam->fbase, 16); |
744 |
#else |
#else |
745 |
BitstreamPutBits(bs, 2, 16); |
BitstreamPutBits(bs, pParam->fbase, 16); |
746 |
#endif |
#endif |
747 |
|
|
748 |
WRITE_MARKER(); |
WRITE_MARKER(); |
751 |
BitstreamPutBit(bs, 1); // fixed_vop_rate = 1 |
BitstreamPutBit(bs, 1); // fixed_vop_rate = 1 |
752 |
BitstreamPutBits(bs, pParam->fincr, log2bin(pParam->fbase)); // fixed_vop_time_increment |
BitstreamPutBits(bs, pParam->fincr, log2bin(pParam->fbase)); // fixed_vop_time_increment |
753 |
#else |
#else |
754 |
BitstreamPutBit(bs, 0); // fixed_vop_rate = 0 |
BitstreamPutBit(bs, 1); // fixed_vop_rate = 1 |
755 |
|
BitstreamPutBits(bs, pParam->fincr, log2bin(pParam->fbase)); // fixed_vop_time_increment |
756 |
#endif |
#endif |
757 |
|
|
758 |
WRITE_MARKER(); |
WRITE_MARKER(); |
803 |
const FRAMEINFO * frame, |
const FRAMEINFO * frame, |
804 |
int vop_coded) |
int vop_coded) |
805 |
{ |
{ |
|
#ifdef BFRAMES |
|
806 |
uint32_t i; |
uint32_t i; |
807 |
#endif |
|
808 |
BitstreamPad(bs); |
BitstreamPad(bs); |
809 |
BitstreamPutBits(bs, VOP_START_CODE, 32); |
BitstreamPutBits(bs, VOP_START_CODE, 32); |
810 |
|
|
817 |
} |
} |
818 |
BitstreamPutBit(bs, 0); |
BitstreamPutBit(bs, 0); |
819 |
#else |
#else |
820 |
BitstreamPutBits(bs, 0, 1); |
for (i = 0; i < frame->seconds; i++) { |
821 |
|
BitstreamPutBit(bs, 1); |
822 |
|
} |
823 |
|
BitstreamPutBit(bs, 0); |
824 |
|
// BitstreamPutBits(bs, 0, 1); |
825 |
#endif |
#endif |
826 |
|
|
827 |
WRITE_MARKER(); |
WRITE_MARKER(); |
833 |
frame->coding_type == I_VOP ? 'I' : frame->coding_type == |
frame->coding_type == I_VOP ? 'I' : frame->coding_type == |
834 |
P_VOP ? 'P' : 'B');*/ |
P_VOP ? 'P' : 'B');*/ |
835 |
#else |
#else |
836 |
BitstreamPutBits(bs, 1, 1); |
BitstreamPutBits(bs, frame->ticks, log2bin(pParam->fbase)); |
837 |
|
// BitstreamPutBits(bs, 1, 1); |
838 |
#endif |
#endif |
839 |
|
|
840 |
WRITE_MARKER(); |
WRITE_MARKER(); |
852 |
BitstreamPutBits(bs, 0, 3); // intra_dc_vlc_threshold |
BitstreamPutBits(bs, 0, 3); // intra_dc_vlc_threshold |
853 |
|
|
854 |
if (frame->global_flags & XVID_INTERLACING) { |
if (frame->global_flags & XVID_INTERLACING) { |
855 |
BitstreamPutBit(bs, 1); // top field first |
BitstreamPutBit(bs, (frame->global_flags & XVID_TOPFIELDFIRST)); |
856 |
BitstreamPutBit(bs, 0); // alternate vertical scan |
BitstreamPutBit(bs, (frame->global_flags & XVID_ALTERNATESCAN)); |
857 |
} |
} |
858 |
|
|
859 |
BitstreamPutBits(bs, frame->quant, 5); // quantizer |
BitstreamPutBits(bs, frame->quant, 5); // quantizer |