173 |
|
|
174 |
if (dec->shape != VIDOBJLAY_SHAPE_BINARY_ONLY) |
if (dec->shape != VIDOBJLAY_SHAPE_BINARY_ONLY) |
175 |
{ |
{ |
176 |
*quant = BitstreamGetBits(bs, 5); /* quant_scale */ |
*quant = BitstreamGetBits(bs, dec->quant_bits); /* quant_scale */ |
177 |
DPRINTF(DPRINTF_HEADER, "quant %i", *quant); |
DPRINTF(DPRINTF_HEADER, "quant %i", *quant); |
178 |
} |
} |
179 |
|
|
326 |
{ |
{ |
327 |
ESTIMATION * e = &dec->estimation; |
ESTIMATION * e = &dec->estimation; |
328 |
|
|
329 |
if (e->method == 0) |
if (e->method == 0 || e->method == 1) |
330 |
{ |
{ |
331 |
if (coding_type == I_VOP) { |
if (coding_type == I_VOP) { |
332 |
if (e->opaque) BitstreamSkip(bs, 8); /* dcecs_opaque */ |
if (e->opaque) BitstreamSkip(bs, 8); /* dcecs_opaque */ |
1114 |
const MBParam * pParam, |
const MBParam * pParam, |
1115 |
const FRAMEINFO * const frame) |
const FRAMEINFO * const frame) |
1116 |
{ |
{ |
1117 |
|
static const vo_id = 0; |
1118 |
|
static const vol_id = 0; |
1119 |
int vol_ver_id=1; |
int vol_ver_id=1; |
1120 |
|
|
1121 |
if ( pParam->m_quarterpel || (frame->global_flags & XVID_GMC) || |
if ( pParam->m_quarterpel || (frame->global_flags & XVID_GMC) || |
1124 |
|
|
1125 |
// video object_start_code & vo_id |
// video object_start_code & vo_id |
1126 |
BitstreamPad(bs); |
BitstreamPad(bs); |
1127 |
BitstreamPutBits(bs, VO_START_CODE, 27); |
BitstreamPutBits(bs, VIDOBJ_START_CODE|(vo_id&0x5), 32); |
|
BitstreamPutBits(bs, 0, 5); |
|
1128 |
|
|
1129 |
// video_object_layer_start_code & vol_id |
// video_object_layer_start_code & vol_id |
1130 |
BitstreamPutBits(bs, VOL_START_CODE, 28); |
BitstreamPutBits(bs, VIDOBJLAY_START_CODE|(vol_id&0x4), 32); |
|
BitstreamPutBits(bs, 0, 4); |
|
1131 |
|
|
1132 |
BitstreamPutBit(bs, 0); // random_accessible_vol |
BitstreamPutBit(bs, 0); // random_accessible_vol |
1133 |
BitstreamPutBits(bs, 0, 8); // video_object_type_indication |
BitstreamPutBits(bs, 0, 8); // video_object_type_indication |