FaSTTUBe/GST-Tensordecoder-ov_ep
61
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

basevideodecoder: fix copy-and-paste variable misnomer

Browse Source
This commit is contained in:
Mark Nauwelaerts 2011-03-28 09:14:57 +02:00
parent 7862d9ed35
commit 4311909a53
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gst-libs/gst/video/gstbasevideodecoder.c
View File

@ -406,18 +406,18 @@ gst_base_video_decoder_src_convert (GstPad * pad,
GstFormat * dest_format, gint64 * dest_value) GstFormat * dest_format, gint64 * dest_value)
{ {
gboolean res = TRUE; gboolean res = TRUE;
GstBaseVideoDecoder *enc; GstBaseVideoDecoder *dec;
if (src_format == *dest_format) { if (src_format == *dest_format) {
*dest_value = src_value; *dest_value = src_value;
return TRUE; return TRUE;
} }
enc = GST_BASE_VIDEO_DECODER (gst_pad_get_parent (pad)); dec = GST_BASE_VIDEO_DECODER (gst_pad_get_parent (pad));
/* FIXME: check if we are in a encoding state */ /* FIXME: check if we are in a encoding state */
GST_DEBUG_OBJECT (enc, "src convert"); GST_DEBUG_OBJECT (dec, "src convert");
switch (src_format) { switch (src_format) {
#if 0 #if 0
case GST_FORMAT_DEFAULT: case GST_FORMAT_DEFAULT:
@ -449,7 +449,7 @@ gst_base_video_decoder_src_convert (GstPad * pad,
break; break;
} }
gst_object_unref (enc); gst_object_unref (dec);
return res; return res;
} }
@ -470,10 +470,10 @@ gst_base_video_decoder_get_query_types (GstPad * pad)
static gboolean static gboolean
gst_base_video_decoder_src_query (GstPad * pad, GstQuery * query) gst_base_video_decoder_src_query (GstPad * pad, GstQuery * query)
{ {
GstBaseVideoDecoder *enc; GstBaseVideoDecoder *dec;
gboolean res = TRUE; gboolean res = TRUE;
enc = GST_BASE_VIDEO_DECODER (gst_pad_get_parent (pad)); dec = GST_BASE_VIDEO_DECODER (gst_pad_get_parent (pad));
switch GST_QUERY_TYPE switch GST_QUERY_TYPE
(query) { (query) {
@ -483,15 +483,15 @@ gst_base_video_decoder_src_query (GstPad * pad, GstQuery * query)
gint64 time; gint64 time;
gst_query_parse_position (query, &format, NULL); gst_query_parse_position (query, &format, NULL);
GST_DEBUG_OBJECT (enc, "query in format %d", format); GST_DEBUG_OBJECT (dec, "query in format %d", format);
if (format != GST_FORMAT_TIME) { if (format != GST_FORMAT_TIME) {
goto error; goto error;
} }
time = enc->last_timestamp; time = dec->last_timestamp;
time = time =
gst_segment_to_stream_time (&GST_BASE_VIDEO_CODEC (enc)->segment, gst_segment_to_stream_time (&GST_BASE_VIDEO_CODEC (dec)->segment,
GST_FORMAT_TIME, time); GST_FORMAT_TIME, time);
gst_query_set_position (query, format, time); gst_query_set_position (query, format, time);
@ -502,7 +502,7 @@ gst_base_video_decoder_src_query (GstPad * pad, GstQuery * query)
} }
case GST_QUERY_DURATION: case GST_QUERY_DURATION:
{ {
res = gst_pad_peer_query (enc->base_video_codec.sinkpad, query); res = gst_pad_peer_query (dec->base_video_codec.sinkpad, query);
break; break;
} }
case GST_QUERY_CONVERT: case GST_QUERY_CONVERT:
@ -510,7 +510,7 @@ gst_base_video_decoder_src_query (GstPad * pad, GstQuery * query)
GstFormat src_fmt, dest_fmt; GstFormat src_fmt, dest_fmt;
gint64 src_val, dest_val; gint64 src_val, dest_val;
GST_DEBUG_OBJECT (enc, "convert query"); GST_DEBUG_OBJECT (dec, "convert query");
gst_query_parse_convert (query, &src_fmt, &src_val, &dest_fmt, &dest_val); gst_query_parse_convert (query, &src_fmt, &src_val, &dest_fmt, &dest_val);
res = res =
@ -524,12 +524,12 @@ gst_base_video_decoder_src_query (GstPad * pad, GstQuery * query)
default: default:
res = gst_pad_query_default (pad, query); res = gst_pad_query_default (pad, query);
} }
gst_object_unref (enc); gst_object_unref (dec);
return res; return res;
error: error:
GST_ERROR_OBJECT (enc, "query failed"); GST_ERROR_OBJECT (dec, "query failed");
gst_object_unref (enc); gst_object_unref (dec);
return res; return res;
} }