mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-19 12:45:54 +00:00
Code Issues 1 Projects Releases Wiki Activity

encoder: h264: fix PPS header packing with profile < high.

Browse source 
Fix PPS header packing when profile is below High since 8x8 transform
mode and scaling lists are High Profile features.
This commit is contained in:
Gwenole Beauchesne 2014-01-15 15:54:32 +01:00
parent 391ad15ba0
commit 7e6f7f384a
1 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
gst-libs/gst/vaapi/gstvaapiencoder_h264.c
View file

@ -701,7 +701,7 @@ gst_bit_writer_write_sps (GstBitWriter * bitwriter,
static gboolean static gboolean
gst_bit_writer_write_pps (GstBitWriter * bitwriter, gst_bit_writer_write_pps (GstBitWriter * bitwriter,
const VAEncPictureParameterBufferH264 * pic_param) const VAEncPictureParameterBufferH264 * pic_param, GstVaapiProfile profile)
{ {
guint32 num_slice_groups_minus1 = 0; guint32 num_slice_groups_minus1 = 0;
guint32 pic_init_qs_minus26 = 0; guint32 pic_init_qs_minus26 = 0;
@ -743,25 +743,27 @@ gst_bit_writer_write_pps (GstBitWriter * bitwriter,
gst_bit_writer_put_bits_uint32 (bitwriter, redundant_pic_cnt_present_flag, 1); gst_bit_writer_put_bits_uint32 (bitwriter, redundant_pic_cnt_present_flag, 1);
/* more_rbsp_data */ /* more_rbsp_data */
gst_bit_writer_put_bits_uint32 (bitwriter, if (profile == GST_VAAPI_PROFILE_H264_HIGH) {
pic_param->pic_fields.bits.transform_8x8_mode_flag, 1); gst_bit_writer_put_bits_uint32 (bitwriter,
gst_bit_writer_put_bits_uint32 (bitwriter, pic_param->pic_fields.bits.transform_8x8_mode_flag, 1);
pic_param->pic_fields.bits.pic_scaling_matrix_present_flag, 1); gst_bit_writer_put_bits_uint32 (bitwriter,
if (pic_param->pic_fields.bits.pic_scaling_matrix_present_flag) { pic_param->pic_fields.bits.pic_scaling_matrix_present_flag, 1);
g_assert (0); if (pic_param->pic_fields.bits.pic_scaling_matrix_present_flag) {
/* FIXME */ g_assert (0 && "unsupported scaling lists");
/* /* FIXME */
for (i = 0; i < /*
(6+(-( (chroma_format_idc ! = 3) ? 2 : 6) * -pic_param->pic_fields.bits.transform_8x8_mode_flag)); for (i = 0; i <
i++) { (6+(-( (chroma_format_idc ! = 3) ? 2 : 6) * -pic_param->pic_fields.bits.transform_8x8_mode_flag));
gst_bit_writer_put_bits_uint8(bitwriter, pic_param->pic_fields.bits.pic_scaling_list_present_flag, 1); i++) {
} gst_bit_writer_put_bits_uint8(bitwriter, pic_param->pic_fields.bits.pic_scaling_list_present_flag, 1);
*/ }
*/
}
gst_bit_writer_put_se (bitwriter, pic_param->second_chroma_qp_index_offset);
} }
gst_bit_writer_put_se (bitwriter, pic_param->second_chroma_qp_index_offset); /* rbsp_trailing_bits */
gst_bit_writer_write_trailing_bits (bitwriter); gst_bit_writer_write_trailing_bits (bitwriter);
return TRUE; return TRUE;
} }
@ -819,7 +821,7 @@ add_picture_packed_header (GstVaapiEncoderH264 * encoder,
gst_bit_writer_put_bits_uint32 (&writer, 0x00000001, 32); /* start code */ gst_bit_writer_put_bits_uint32 (&writer, 0x00000001, 32); /* start code */
gst_bit_writer_write_nal_header (&writer, gst_bit_writer_write_nal_header (&writer,
GST_VAAPI_ENCODER_H264_NAL_REF_IDC_HIGH, GST_VAAPI_ENCODER_H264_NAL_PPS); GST_VAAPI_ENCODER_H264_NAL_REF_IDC_HIGH, GST_VAAPI_ENCODER_H264_NAL_PPS);
gst_bit_writer_write_pps (&writer, pic_param); gst_bit_writer_write_pps (&writer, pic_param, encoder->profile);
g_assert (GST_BIT_WRITER_BIT_SIZE (&writer) % 8 == 0); g_assert (GST_BIT_WRITER_BIT_SIZE (&writer) % 8 == 0);
data_bit_size = GST_BIT_WRITER_BIT_SIZE (&writer); data_bit_size = GST_BIT_WRITER_BIT_SIZE (&writer);
data = GST_BIT_WRITER_DATA (&writer); data = GST_BIT_WRITER_DATA (&writer);