mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 06:58:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

d3d11h265dec: Fix scaling list parsing

Browse source 
Scaling list can be signalled via sps or pps. Decoder should check
both of them.
This commit is contained in:
Seungha Yang 2020-02-26 20:24:14 +09:00
parent cfb6283613
commit 7c153b6e93
1 changed files with 24 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
sys/d3d11/gstd3d11h265dec.c
View file

@ -1240,15 +1240,18 @@ gst_d3d11_h265_dec_decode_slice (GstH265Decoder * decoder,
GstH265Picture * picture, GstH265Slice * slice) GstH265Picture * picture, GstH265Slice * slice)
{ {
GstD3D11H265Dec *self = GST_D3D11_H265_DEC (decoder); GstD3D11H265Dec *self = GST_D3D11_H265_DEC (decoder);
GstH265SPS *sps;
GstH265PPS *pps; GstH265PPS *pps;
DXVA_PicParams_HEVC pic_params = { 0, }; DXVA_PicParams_HEVC pic_params = { 0, };
DXVA_Qmatrix_HEVC iq_matrix = { 0, }; DXVA_Qmatrix_HEVC iq_matrix = { 0, };
guint d3d11_buffer_size = 0; guint d3d11_buffer_size = 0;
gpointer d3d11_buffer = NULL; gpointer d3d11_buffer = NULL;
gint i, j; gint i;
GstD3D11DecoderOutputView *view; GstD3D11DecoderOutputView *view;
GstH265ScalingList *scaling_list = NULL;
pps = slice->header.pps; pps = slice->header.pps;
sps = pps->sps;
view = gst_d3d11_h265_dec_get_output_view_from_picture (self, picture); view = gst_d3d11_h265_dec_get_output_view_from_picture (self, picture);
@ -1300,39 +1303,34 @@ gst_d3d11_h265_dec_decode_slice (GstH265Decoder * decoder,
return FALSE; return FALSE;
} }
if (pps->scaling_list_data_present_flag) { if (pps->scaling_list_data_present_flag ||
(sps->scaling_list_enabled_flag
&& !sps->scaling_list_data_present_flag)) {
scaling_list = &pps->scaling_list;
} else if (sps->scaling_list_enabled_flag &&
sps->scaling_list_data_present_flag) {
scaling_list = &sps->scaling_list;
}
if (scaling_list) {
self->submit_iq_data = TRUE; self->submit_iq_data = TRUE;
for (i = 0; i < 6; i++) { memcpy (iq_matrix.ucScalingLists0, scaling_list->scaling_lists_4x4,
for (j = 0; j < 16; j++) { sizeof (iq_matrix.ucScalingLists0));
iq_matrix.ucScalingLists0[i][j] = memcpy (iq_matrix.ucScalingLists1, scaling_list->scaling_lists_8x8,
pps->scaling_list.scaling_lists_4x4[i][j]; sizeof (iq_matrix.ucScalingLists1));
} memcpy (iq_matrix.ucScalingLists2, scaling_list->scaling_lists_16x16,
} sizeof (iq_matrix.ucScalingLists2));
memcpy (iq_matrix.ucScalingLists3, scaling_list->scaling_lists_32x32,
for (i = 0; i < 6; i++) { sizeof (iq_matrix.ucScalingLists3));
for (j = 0; j < 64; j++) {
iq_matrix.ucScalingLists1[i][j] =
pps->scaling_list.scaling_lists_8x8[i][j];
iq_matrix.ucScalingLists2[i][j] =
pps->scaling_list.scaling_lists_16x16[i][j];
}
}
for (i = 0; i < 2; i++) {
for (j = 0; j < 64; j++) {
iq_matrix.ucScalingLists3[i][j] =
pps->scaling_list.scaling_lists_32x32[i][j];
}
}
for (i = 0; i < 6; i++) for (i = 0; i < 6; i++)
iq_matrix.ucScalingListDCCoefSizeID2[i] = iq_matrix.ucScalingListDCCoefSizeID2[i] =
pps->scaling_list.scaling_list_dc_coef_minus8_16x16[i]; scaling_list->scaling_list_dc_coef_minus8_16x16[i] + 8;
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++)
iq_matrix.ucScalingListDCCoefSizeID3[i] = iq_matrix.ucScalingListDCCoefSizeID3[i] =
pps->scaling_list.scaling_list_dc_coef_minus8_32x32[i]; scaling_list->scaling_list_dc_coef_minus8_32x32[i] + 8;
GST_TRACE_OBJECT (self, "Getting inverse quantization maxtirx buffer"); GST_TRACE_OBJECT (self, "Getting inverse quantization maxtirx buffer");