662 |
DPRINTF(XVID_DEBUG_HEADER, "load_intra_quant_mat\n"); |
DPRINTF(XVID_DEBUG_HEADER, "load_intra_quant_mat\n"); |
663 |
|
|
664 |
bs_get_matrix(bs, matrix); |
bs_get_matrix(bs, matrix); |
665 |
set_intra_matrix(matrix); |
set_intra_matrix(dec->mpeg_quant_matrices, matrix); |
666 |
} else |
} else |
667 |
set_intra_matrix(get_default_intra_matrix()); |
set_intra_matrix(dec->mpeg_quant_matrices, get_default_intra_matrix()); |
668 |
|
|
669 |
if (BitstreamGetBit(bs)) /* load_inter_quant_mat */ |
if (BitstreamGetBit(bs)) /* load_inter_quant_mat */ |
670 |
{ |
{ |
673 |
DPRINTF(XVID_DEBUG_HEADER, "load_inter_quant_mat\n"); |
DPRINTF(XVID_DEBUG_HEADER, "load_inter_quant_mat\n"); |
674 |
|
|
675 |
bs_get_matrix(bs, matrix); |
bs_get_matrix(bs, matrix); |
676 |
set_inter_matrix(matrix); |
set_inter_matrix(dec->mpeg_quant_matrices, matrix); |
677 |
} else |
} else |
678 |
set_inter_matrix(get_default_inter_matrix()); |
set_inter_matrix(dec->mpeg_quant_matrices, get_default_inter_matrix()); |
679 |
|
|
680 |
if (dec->shape == VIDOBJLAY_SHAPE_GRAYSCALE) { |
if (dec->shape == VIDOBJLAY_SHAPE_GRAYSCALE) { |
681 |
DPRINTF(XVID_DEBUG_ERROR, "greyscale matrix not supported\n"); |
DPRINTF(XVID_DEBUG_ERROR, "greyscale matrix not supported\n"); |
1053 |
|
|
1054 |
static void |
static void |
1055 |
bs_put_matrix(Bitstream * bs, |
bs_put_matrix(Bitstream * bs, |
1056 |
const int16_t * matrix) |
const uint16_t * matrix) |
1057 |
{ |
{ |
1058 |
int i, j; |
int i, j; |
1059 |
const int last = matrix[scan_tables[0][63]]; |
const int last = matrix[scan_tables[0][63]]; |
1081 |
static const unsigned int vol_id = 0; |
static const unsigned int vol_id = 0; |
1082 |
int vol_ver_id = 1; |
int vol_ver_id = 1; |
1083 |
int vol_type_ind = VIDOBJLAY_TYPE_SIMPLE; |
int vol_type_ind = VIDOBJLAY_TYPE_SIMPLE; |
1084 |
|
int vol_profile = pParam->profile; |
1085 |
|
|
1086 |
if ( (pParam->vol_flags & XVID_VOL_QUARTERPEL) || |
if ( (pParam->vol_flags & XVID_VOL_QUARTERPEL) || |
1087 |
(pParam->vol_flags & XVID_VOL_GMC) || |
(pParam->vol_flags & XVID_VOL_GMC) || |
1107 |
* byte aligned, and that always 1-8 padding bits have been written |
* byte aligned, and that always 1-8 padding bits have been written |
1108 |
*/ |
*/ |
1109 |
|
|
1110 |
if (pParam->profile) { |
if (!vol_profile) { |
1111 |
BitstreamPutBits(bs, VISOBJSEQ_START_CODE, 32); |
/* Profile was not set by client app, use the more permissive profile |
1112 |
BitstreamPutBits(bs, pParam->profile, 8); |
* compatible with the vol_type_id */ |
1113 |
|
switch(vol_type_ind) { |
1114 |
|
case VIDOBJLAY_TYPE_ASP: |
1115 |
|
vol_profile = 0xf5; /* ASP level 5 */ |
1116 |
|
break; |
1117 |
|
case VIDOBJLAY_TYPE_ART_SIMPLE: |
1118 |
|
vol_profile = 0x94; /* ARTS level 4 */ |
1119 |
|
break; |
1120 |
|
default: |
1121 |
|
vol_profile = 0x03; /* Simple level 3 */ |
1122 |
|
break; |
1123 |
|
} |
1124 |
} |
} |
1125 |
|
|
1126 |
|
/* Write the VOS header */ |
1127 |
|
BitstreamPutBits(bs, VISOBJSEQ_START_CODE, 32); |
1128 |
|
BitstreamPutBits(bs, vol_profile, 8); /* profile_and_level_indication */ |
1129 |
|
|
1130 |
|
|
1131 |
/* visual_object_start_code */ |
/* visual_object_start_code */ |
1132 |
BitstreamPad(bs); |
BitstreamPad(bs); |
1133 |
BitstreamPutBits(bs, VISOBJ_START_CODE, 32); |
BitstreamPutBits(bs, VISOBJ_START_CODE, 32); |
1228 |
BitstreamPutBit(bs, pParam->vol_flags & XVID_VOL_MPEGQUANT); |
BitstreamPutBit(bs, pParam->vol_flags & XVID_VOL_MPEGQUANT); |
1229 |
|
|
1230 |
if ((pParam->vol_flags & XVID_VOL_MPEGQUANT)) { |
if ((pParam->vol_flags & XVID_VOL_MPEGQUANT)) { |
1231 |
BitstreamPutBit(bs, get_intra_matrix_status()); /* load_intra_quant_mat */ |
BitstreamPutBit(bs, is_custom_intra_matrix(pParam->mpeg_quant_matrices)); /* load_intra_quant_mat */ |
1232 |
if (get_intra_matrix_status()) { |
if(is_custom_intra_matrix(pParam->mpeg_quant_matrices)) |
1233 |
bs_put_matrix(bs, get_intra_matrix()); |
bs_put_matrix(bs, get_intra_matrix(pParam->mpeg_quant_matrices)); |
1234 |
} |
|
1235 |
|
BitstreamPutBit(bs, is_custom_inter_matrix(pParam->mpeg_quant_matrices)); /* load_inter_quant_mat */ |
1236 |
BitstreamPutBit(bs, get_inter_matrix_status()); /* load_inter_quant_mat */ |
if(is_custom_inter_matrix(pParam->mpeg_quant_matrices)) |
1237 |
if (get_inter_matrix_status()) { |
bs_put_matrix(bs, get_inter_matrix(pParam->mpeg_quant_matrices)); |
|
bs_put_matrix(bs, get_inter_matrix()); |
|
|
} |
|
|
|
|
1238 |
} |
} |
1239 |
|
|
1240 |
if (vol_ver_id != 1) { |
if (vol_ver_id != 1) { |