mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 09:40:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

vdpau: small improvement to mpeg decoder

Browse source
This commit is contained in:
Carl-Anton Ingmarsson 2009-04-13 21:11:54 +02:00 committed by Jan Schmidt
parent 91ff1579f3
commit 1234267cb5
3 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
sys/vdpau/gstvdpaumpegdecoder.c
View file

@ -112,6 +112,7 @@ gst_vdpau_mpeg_decoder_set_caps (GstVdpauDecoder * dec, GstCaps * caps)
break; break;
} }
} }
memcpy (&mpeg_dec->vdp_info.intra_quantizer_matrix, memcpy (&mpeg_dec->vdp_info.intra_quantizer_matrix,
&hdr.intra_quantizer_matrix, 64); &hdr.intra_quantizer_matrix, 64);
memcpy (&mpeg_dec->vdp_info.non_intra_quantizer_matrix, memcpy (&mpeg_dec->vdp_info.non_intra_quantizer_matrix,
@ -210,12 +211,15 @@ gst_vdpau_mpeg_decoder_parse_picture_coding (GstVdpauMpegDecoder * mpeg_dec,
info->intra_dc_precision = pic_ext.intra_dc_precision; info->intra_dc_precision = pic_ext.intra_dc_precision;
info->picture_structure = pic_ext.picture_structure; info->picture_structure = pic_ext.picture_structure;
GST_DEBUG ("Picture structure %d", info->picture_structure);
info->top_field_first = pic_ext.top_field_first; info->top_field_first = pic_ext.top_field_first;
info->frame_pred_frame_dct = pic_ext.frame_pred_frame_dct; info->frame_pred_frame_dct = pic_ext.frame_pred_frame_dct;
info->concealment_motion_vectors = pic_ext.concealment_motion_vectors; info->concealment_motion_vectors = pic_ext.concealment_motion_vectors;
info->q_scale_type = pic_ext.q_scale_type; info->q_scale_type = pic_ext.q_scale_type;
info->intra_vlc_format = pic_ext.intra_vlc_format; info->intra_vlc_format = pic_ext.intra_vlc_format;
mpeg_dec->want_slice = TRUE;
return TRUE; return TRUE;
} }
@ -266,7 +270,10 @@ gst_vdpau_mpeg_decoder_parse_picture (GstVdpauMpegDecoder * mpeg_dec,
mpeg_dec->vdp_info.full_pel_backward_vector = mpeg_dec->vdp_info.full_pel_backward_vector =
pic_hdr.full_pel_backward_vector; pic_hdr.full_pel_backward_vector;
memcpy (&mpeg_dec->vdp_info.f_code, &pic_hdr.f_code, 4); memcpy (&mpeg_dec->vdp_info.f_code, &pic_hdr.f_code, 4);
}
mpeg_dec->want_slice = TRUE;
} else
mpeg_dec->want_slice = FALSE;
return TRUE; return TRUE;
} }
@ -326,12 +333,14 @@ gst_vdpau_mpeg_decoder_chain (GstPad * pad, GstBuffer * buffer)
GstBuffer *subbuf; GstBuffer *subbuf;
GST_DEBUG_OBJECT (mpeg_dec, "MPEG_PACKET_SLICE"); GST_DEBUG_OBJECT (mpeg_dec, "MPEG_PACKET_SLICE");
if (mpeg_dec->want_slice) {
subbuf = subbuf =
gst_buffer_create_sub (buffer, gst_buffer_create_sub (buffer,
packet_start - GST_BUFFER_DATA (buffer), packet_end - packet_start); packet_start - GST_BUFFER_DATA (buffer), packet_end - packet_start);
gst_adapter_push (mpeg_dec->adapter, subbuf); gst_adapter_push (mpeg_dec->adapter, subbuf);
mpeg_dec->vdp_info.slice_count++; mpeg_dec->vdp_info.slice_count++;
} else if (mpeg_dec->vdp_info.slice_count > 0) { }
} else if (mpeg_dec->vdp_info.slice_count > 0 && mpeg_dec->want_slice) {
if (gst_vdpau_mpeg_decoder_decode (mpeg_dec) != GST_FLOW_OK) if (gst_vdpau_mpeg_decoder_decode (mpeg_dec) != GST_FLOW_OK)
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
} }
@ -344,7 +353,8 @@ gst_vdpau_mpeg_decoder_chain (GstPad * pad, GstBuffer * buffer)
break; break;
case MPEG_PACKET_SEQUENCE: case MPEG_PACKET_SEQUENCE:
GST_DEBUG_OBJECT (mpeg_dec, "MPEG_PACKET_SEQUENCE"); GST_DEBUG_OBJECT (mpeg_dec, "MPEG_PACKET_SEQUENCE");
gst_vdpau_mpeg_decoder_parse_sequence (mpeg_dec, data, end); gst_vdpau_mpeg_decoder_parse_sequence (mpeg_dec, packet_start,
packet_end);
break; break;
case MPEG_PACKET_EXTENSION: case MPEG_PACKET_EXTENSION:
GST_DEBUG_OBJECT (mpeg_dec, "MPEG_PACKET_EXTENSION"); GST_DEBUG_OBJECT (mpeg_dec, "MPEG_PACKET_EXTENSION");
@ -436,6 +446,8 @@ gst_vdpau_mpeg_decoder_init (GstVdpauMpegDecoder * mpeg_dec,
mpeg_dec->adapter = gst_adapter_new (); mpeg_dec->adapter = gst_adapter_new ();
mpeg_dec->want_slice = FALSE;
gst_pad_set_chain_function (dec->sink, gst_vdpau_mpeg_decoder_chain); gst_pad_set_chain_function (dec->sink, gst_vdpau_mpeg_decoder_chain);
} }

2
sys/vdpau/gstvdpaumpegdecoder.h
View file

@ -47,6 +47,8 @@ struct _GstVdpauMpegDecoder
VdpPictureInfoMPEG1Or2 vdp_info; VdpPictureInfoMPEG1Or2 vdp_info;
GstBuffer *f_buffer; GstBuffer *f_buffer;
gboolean want_slice;
GstAdapter *adapter; GstAdapter *adapter;
gint slices; gint slices;
}; };

2
sys/vdpau/mpegutil.c
View file

@ -314,7 +314,7 @@ mpeg_util_parse_picture_coding_extension (MPEGPictureExt * ext, guint8 * data,
{ {
guint32 code; guint32 code;
if (G_UNLIKELY ((end - data) < 10)) if (G_UNLIKELY ((end - data) < 9))
return FALSE; /* Packet too small */ return FALSE; /* Packet too small */
code = GST_READ_UINT32_BE (data); code = GST_READ_UINT32_BE (data);