mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-22 02:13:46 +00:00
Code Issues 1 Projects Releases Wiki Activity

mfc: Only create the MFC context in ::set_format()

Browse source
This commit is contained in:
Sebastian Dröge 2012-12-31 12:33:53 +01:00
parent 9739f58a7f
commit bee7328210
1 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
sys/mfc/gstmfcdec.c
View file

@ -144,14 +144,6 @@ gst_mfc_dec_start (GstVideoDecoder * decoder)
self->dst_stride[2] = 0; self->dst_stride[2] = 0;
self->mmap = TRUE; self->mmap = TRUE;
/* Initialize with H264 here, we chose the correct codec in set_format */
self->context = mfc_dec_create (CODEC_TYPE_H264, 1);
if (!self->context) {
GST_ELEMENT_ERROR (self, LIBRARY, INIT,
("Failed to initialize MFC decoder context"), (NULL));
return FALSE;
}
return TRUE; return TRUE;
} }
@ -190,16 +182,22 @@ gst_mfc_dec_set_format (GstVideoDecoder * decoder, GstVideoCodecState * state)
{ {
GstMFCDec *self = GST_MFC_DEC (decoder); GstMFCDec *self = GST_MFC_DEC (decoder);
GstStructure *s; GstStructure *s;
gint ret;
GST_DEBUG_OBJECT (self, "Setting format: %" GST_PTR_FORMAT, state->caps); GST_DEBUG_OBJECT (self, "Setting format: %" GST_PTR_FORMAT, state->caps);
s = gst_caps_get_structure (state->caps, 0); s = gst_caps_get_structure (state->caps, 0);
if (self->context) {
mfc_dec_destroy (self->context);
self->context = NULL;
}
self->initialized = FALSE;
if (gst_structure_has_name (s, "video/x-h264")) { if (gst_structure_has_name (s, "video/x-h264")) {
if ((ret = mfc_dec_set_codec (self->context, CODEC_TYPE_H264)) < 0) { self->context = mfc_dec_create (CODEC_TYPE_H264, 1);
GST_ELEMENT_ERROR (self, LIBRARY, SETTINGS, if (!self->context) {
("Failed to set codec to H264"), (NULL)); GST_ELEMENT_ERROR (self, LIBRARY, INIT,
("Failed to initialize MFC decoder context"), (NULL));
return FALSE; return FALSE;
} }
} else if (gst_structure_has_name (s, "video/mpeg")) { } else if (gst_structure_has_name (s, "video/mpeg")) {
@ -210,9 +208,10 @@ gst_mfc_dec_set_format (GstVideoDecoder * decoder, GstVideoCodecState * state)
if (mpegversion != 4) if (mpegversion != 4)
return FALSE; return FALSE;
if ((ret = mfc_dec_set_codec (self->context, CODEC_TYPE_MPEG4)) < 0) { self->context = mfc_dec_create (CODEC_TYPE_MPEG4, 1);
GST_ELEMENT_ERROR (self, LIBRARY, SETTINGS, if (!self->context) {
("Failed to set codec to MPEG4"), (NULL)); GST_ELEMENT_ERROR (self, LIBRARY, INIT,
("Failed to initialize MFC decoder context"), (NULL));
return FALSE; return FALSE;
} }
} else { } else {