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

Updates for API changes

Browse Source 
Original commit message from CVS:
* ext/libvisual/visual.c: (gst_visual_src_setcaps), (get_buffer),
(gst_visual_chain):
* ext/theora/theoraenc.c: (theora_enc_sink_setcaps):
* gst/videorate/gstvideorate.c: (gst_videorate_setcaps),
(gst_videorate_chain):
* gst/videotestsrc/gstvideotestsrc.c:
(gst_videotestsrc_src_fixate), (gst_videotestsrc_create):
* sys/v4l/gstv4lmjpegsrc.c: (gst_v4lmjpegsrc_get_fps),
(gst_v4lmjpegsrc_src_convert), (gst_v4lmjpegsrc_src_query),
(gst_v4lmjpegsrc_get), (gst_v4lmjpegsrc_getcaps):
* sys/v4l/v4lsrc_calls.c: (gst_v4lsrc_get_fps),
(gst_v4lsrc_get_fps_list), (gst_v4lsrc_buffer_new):
Updates for API changes
This commit is contained in:
Jan Schmidt 2005-11-23 13:25:54 +00:00
parent 67b21a9033
commit be23dbd7d9
7 changed files with 38 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -1,3 +1,19 @@
2005-11-23 Jan Schmidt <thaytan@mad.scientist.com>
* ext/libvisual/visual.c: (gst_visual_src_setcaps), (get_buffer),
(gst_visual_chain):
* ext/theora/theoraenc.c: (theora_enc_sink_setcaps):
* gst/videorate/gstvideorate.c: (gst_videorate_setcaps),
(gst_videorate_chain):
* gst/videotestsrc/gstvideotestsrc.c:
(gst_videotestsrc_src_fixate), (gst_videotestsrc_create):
* sys/v4l/gstv4lmjpegsrc.c: (gst_v4lmjpegsrc_get_fps),
(gst_v4lmjpegsrc_src_convert), (gst_v4lmjpegsrc_src_query),
(gst_v4lmjpegsrc_get), (gst_v4lmjpegsrc_getcaps):
* sys/v4l/v4lsrc_calls.c: (gst_v4lsrc_get_fps),
(gst_v4lsrc_get_fps_list), (gst_v4lsrc_buffer_new):
Updates for API changes
2005-11-23 Wim Taymans <wim@fluendo.com> 2005-11-23 Wim Taymans <wim@fluendo.com>
* gst-libs/gst/audio/gstbaseaudiosink.c: * gst-libs/gst/audio/gstbaseaudiosink.c:

15
ext/libvisual/visual.c
View File

@ -271,7 +271,6 @@ gst_visual_src_setcaps (GstPad * pad, GstCaps * caps)
GstVisual *visual = GST_VISUAL (gst_pad_get_parent (pad)); GstVisual *visual = GST_VISUAL (gst_pad_get_parent (pad));
GstStructure *structure; GstStructure *structure;
gint depth; gint depth;
const GValue *fps;
structure = gst_caps_get_structure (caps, 0); structure = gst_caps_get_structure (caps, 0);
@ -281,13 +280,10 @@ gst_visual_src_setcaps (GstPad * pad, GstCaps * caps)
return FALSE; return FALSE;
if (!gst_structure_get_int (structure, "bpp", &depth)) if (!gst_structure_get_int (structure, "bpp", &depth))
return FALSE; return FALSE;
fps = gst_structure_get_value (structure, "framerate"); if (!gst_structure_get_fraction (structure, "framerate", &visual->fps_n,
if (fps == NULL || !GST_VALUE_HOLDS_FRACTION (fps)) &visual->fps_d))
return FALSE; return FALSE;
visual->fps_n = gst_value_get_fraction_numerator (fps);
visual->fps_d = gst_value_get_fraction_denominator (fps);
visual_video_set_depth (visual->video, visual_video_set_depth (visual->video,
visual_video_depth_enum_from_value (depth)); visual_video_depth_enum_from_value (depth));
visual_video_set_dimension (visual->video, visual->width, visual->height); visual_video_set_dimension (visual->video, visual->width, visual->height);
@ -318,7 +314,6 @@ get_buffer (GstVisual * visual, GstBuffer ** outbuf)
gint width, height, bpp; gint width, height, bpp;
GstStructure *s; GstStructure *s;
GstCaps *caps; GstCaps *caps;
GValue target_fps = { 0 };
/* No output caps current set up. Try and pick some */ /* No output caps current set up. Try and pick some */
caps = gst_pad_get_allowed_caps (visual->srcpad); caps = gst_pad_get_allowed_caps (visual->srcpad);
@ -337,9 +332,7 @@ get_buffer (GstVisual * visual, GstBuffer ** outbuf)
gst_structure_fixate_field_nearest_int (s, "width", 320); gst_structure_fixate_field_nearest_int (s, "width", 320);
gst_structure_fixate_field_nearest_int (s, "height", 240); gst_structure_fixate_field_nearest_int (s, "height", 240);
g_value_init (&target_fps, GST_TYPE_FRACTION); gst_structure_fixate_field_nearest_fraction (s, "framerate", 25, 1);
gst_value_set_fraction (&target_fps, 25, 1);
gst_structure_fixate_field_nearest_fraction (s, "framerate", &target_fps);
gst_pad_fixate_caps (visual->srcpad, caps); gst_pad_fixate_caps (visual->srcpad, caps);
} else } else
@ -423,7 +416,7 @@ gst_visual_chain (GstPad * pad, GstBuffer * buffer)
visual_actor_run (visual->actor, &visual->audio); visual_actor_run (visual->actor, &visual->audio);
GST_BUFFER_TIMESTAMP (outbuf) = visual->next_ts; GST_BUFFER_TIMESTAMP (outbuf) = visual->next_ts;
GST_BUFFER_DURATION (outbuf) = gst_util_clock_time_scale (GST_SECOND, GST_BUFFER_DURATION (outbuf) = gst_util_uint64_scale_int (GST_SECOND,
visual->fps_d, visual->fps_n); visual->fps_d, visual->fps_n);
visual->next_ts += GST_BUFFER_DURATION (outbuf); visual->next_ts += GST_BUFFER_DURATION (outbuf);
ret = gst_pad_push (visual->srcpad, outbuf); ret = gst_pad_push (visual->srcpad, outbuf);

9
ext/theora/theoraenc.c
View File

@ -244,11 +244,11 @@ theora_enc_sink_setcaps (GstPad * pad, GstCaps * caps)
GstStructure *structure = gst_caps_get_structure (caps, 0); GstStructure *structure = gst_caps_get_structure (caps, 0);
GstTheoraEnc *enc = GST_THEORA_ENC (gst_pad_get_parent (pad)); GstTheoraEnc *enc = GST_THEORA_ENC (gst_pad_get_parent (pad));
const GValue *par; const GValue *par;
const GValue *framerate; gint fps_n, fps_d;
gst_structure_get_int (structure, "width", &enc->width); gst_structure_get_int (structure, "width", &enc->width);
gst_structure_get_int (structure, "height", &enc->height); gst_structure_get_int (structure, "height", &enc->height);
framerate = gst_structure_get_value (structure, "framerate"); gst_structure_get_fraction (structure, "framerate", &fps_n, &fps_d);
par = gst_structure_get_value (structure, "pixel-aspect-ratio"); par = gst_structure_get_value (structure, "pixel-aspect-ratio");
theora_info_init (&enc->info); theora_info_init (&enc->info);
@ -271,9 +271,8 @@ theora_enc_sink_setcaps (GstPad * pad, GstCaps * caps)
enc->info.offset_x = enc->offset_x; enc->info.offset_x = enc->offset_x;
enc->info.offset_y = enc->offset_y; enc->info.offset_y = enc->offset_y;
enc->info.fps_numerator = gst_value_get_fraction_numerator (framerate); enc->info.fps_numerator = fps_n;
enc->info.fps_denominator = gst_value_get_fraction_denominator (framerate); enc->info.fps_denominator = fps_d;
if (par) { if (par) {
enc->info.aspect_numerator = gst_value_get_fraction_numerator (par); enc->info.aspect_numerator = gst_value_get_fraction_numerator (par);
enc->info.aspect_denominator = gst_value_get_fraction_denominator (par); enc->info.aspect_denominator = gst_value_get_fraction_denominator (par);

18
gst/videorate/gstvideorate.c
View File

@ -263,19 +263,15 @@ gst_videorate_setcaps (GstPad * pad, GstCaps * caps)
GstStructure *structure; GstStructure *structure;
gboolean ret = TRUE; gboolean ret = TRUE;
GstPad *otherpad, *opeer; GstPad *otherpad, *opeer;
const GValue *rate;
gint rate_numerator, rate_denominator; gint rate_numerator, rate_denominator;
videorate = GST_VIDEORATE (GST_PAD_PARENT (pad)); videorate = GST_VIDEORATE (GST_PAD_PARENT (pad));
structure = gst_caps_get_structure (caps, 0); structure = gst_caps_get_structure (caps, 0);
rate = gst_structure_get_value (structure, "framerate"); if (!gst_structure_get_fraction (structure, "framerate",
if (!rate) &rate_numerator, &rate_denominator))
goto done; goto done;
rate_numerator = gst_value_get_fraction_numerator (rate);
rate_denominator = gst_value_get_fraction_denominator (rate);
if (pad == videorate->srcpad) { if (pad == videorate->srcpad) {
videorate->to_rate_numerator = rate_numerator; videorate->to_rate_numerator = rate_numerator;
videorate->to_rate_denominator = rate_denominator; videorate->to_rate_denominator = rate_denominator;
@ -324,12 +320,10 @@ gst_videorate_setcaps (GstPad * pad, GstCaps * caps)
/* and fixate */ /* and fixate */
gst_structure_fixate_field_nearest_fraction (structure, "framerate", gst_structure_fixate_field_nearest_fraction (structure, "framerate",
rate); rate_numerator, rate_denominator);
rate = gst_structure_get_value (structure, "framerate"); gst_structure_get_fraction (structure, "framerate",
&rate_numerator, &rate_denominator);
rate_numerator = gst_value_get_fraction_numerator (rate);
rate_denominator = gst_value_get_fraction_denominator (rate);
if (otherpad == videorate->srcpad) { if (otherpad == videorate->srcpad) {
videorate->to_rate_numerator = rate_numerator; videorate->to_rate_numerator = rate_numerator;
@ -510,7 +504,7 @@ gst_videorate_chain (GstPad * pad, GstBuffer * buffer)
if (videorate->to_rate_numerator) { if (videorate->to_rate_numerator) {
videorate->next_ts = videorate->next_ts =
videorate->first_ts + videorate->first_ts +
gst_util_clock_time_scale (videorate->out * GST_SECOND, gst_util_uint64_scale_int (videorate->out * GST_SECOND,
videorate->to_rate_denominator, videorate->to_rate_numerator); videorate->to_rate_denominator, videorate->to_rate_numerator);
GST_BUFFER_DURATION (outbuf) = GST_BUFFER_DURATION (outbuf) =
videorate->next_ts - GST_BUFFER_TIMESTAMP (outbuf); videorate->next_ts - GST_BUFFER_TIMESTAMP (outbuf);

10
gst/videotestsrc/gstvideotestsrc.c
View File

@ -173,16 +173,12 @@ static void
gst_videotestsrc_src_fixate (GstPad * pad, GstCaps * caps) gst_videotestsrc_src_fixate (GstPad * pad, GstCaps * caps)
{ {
GstStructure *structure; GstStructure *structure;
GValue value = { 0 };
g_value_init (&value, GST_TYPE_FRACTION);
gst_value_set_fraction (&value, 30, 1);
structure = gst_caps_get_structure (caps, 0); structure = gst_caps_get_structure (caps, 0);
gst_structure_fixate_field_nearest_int (structure, "width", 320); gst_structure_fixate_field_nearest_int (structure, "width", 320);
gst_structure_fixate_field_nearest_int (structure, "height", 240); gst_structure_fixate_field_nearest_int (structure, "height", 240);
gst_structure_fixate_field_nearest_fraction (structure, "framerate", &value); gst_structure_fixate_field_nearest_fraction (structure, "framerate", 30, 1);
} }
static void static void
@ -459,13 +455,13 @@ gst_videotestsrc_create (GstPushSrc * psrc, GstBuffer ** buffer)
GST_BUFFER_TIMESTAMP (outbuf) = src->timestamp_offset + src->running_time; GST_BUFFER_TIMESTAMP (outbuf) = src->timestamp_offset + src->running_time;
if (src->rate_numerator != 0) { if (src->rate_numerator != 0) {
GST_BUFFER_DURATION (outbuf) = gst_util_clock_time_scale (GST_SECOND, GST_BUFFER_DURATION (outbuf) = gst_util_uint64_scale_int (GST_SECOND,
src->rate_denominator, src->rate_numerator); src->rate_denominator, src->rate_numerator);
} }
src->n_frames++; src->n_frames++;
if (src->rate_numerator != 0) { if (src->rate_numerator != 0) {
src->running_time = gst_util_clock_time_scale (src->n_frames * GST_SECOND, src->running_time = gst_util_uint64_scale_int (src->n_frames * GST_SECOND,
src->rate_denominator, src->rate_numerator); src->rate_denominator, src->rate_numerator);
} }

8
sys/v4l/gstv4lmjpegsrc.c
View File

@ -330,7 +330,7 @@ gst_v4lmjpegsrc_src_convert (GstPad * pad,
case GST_FORMAT_DEFAULT: case GST_FORMAT_DEFAULT:
switch (*dest_format) { switch (*dest_format) {
case GST_FORMAT_TIME: case GST_FORMAT_TIME:
*dest_value = src_value * gst_util_clock_time_scale (GST_SECOND, *dest_value = src_value * gst_util_uint64_scale_int (GST_SECOND,
gst_value_get_fraction_denominator (&fps), gst_value_get_fraction_denominator (&fps),
gst_value_get_fraction_numerator (&fps)); gst_value_get_fraction_numerator (&fps));
break; break;
@ -363,7 +363,7 @@ gst_v4lmjpegsrc_src_query (GstPad * pad,
case GST_QUERY_POSITION: case GST_QUERY_POSITION:
switch (*format) { switch (*format) {
case GST_FORMAT_TIME: case GST_FORMAT_TIME:
*value = v4lmjpegsrc->handled * gst_util_clock_time_scale (GST_SECOND, *value = v4lmjpegsrc->handled * gst_util_uint64_scale_int (GST_SECOND,
gst_value_get_fraction_denominator (&fps), gst_value_get_fraction_denominator (&fps),
gst_value_get_fraction_numerator (&fps)); gst_value_get_fraction_numerator (&fps));
break; break;
@ -519,11 +519,11 @@ gst_v4lmjpegsrc_get (GstPad * pad)
if (v4lmjpegsrc->use_fixed_fps) { if (v4lmjpegsrc->use_fixed_fps) {
g_value_init (&fps, GST_VALUE_FRACTION); g_value_init (&fps, GST_VALUE_FRACTION);
duration = gst_util_clock_time_scale (GST_SECOND, duration = gst_util_uint64_scale_int (GST_SECOND,
gst_value_get_fraction_denominator (&fps), gst_value_get_fraction_denominator (&fps),
gst_value_get_fraction_numerator (&fps)); gst_value_get_fraction_numerator (&fps));
cur_frame_time = cur_frame_time =
gst_util_clock_time_scale (v4lmjpegsrc->handled * GST_SECOND, gst_util_uint64_scale_int (v4lmjpegsrc->handled * GST_SECOND,
gst_value_get_fraction_denominator (&fps), gst_value_get_fraction_denominator (&fps),
gst_value_get_fraction_numerator (&fps)); gst_value_get_fraction_numerator (&fps));

2
sys/v4l/v4lsrc_calls.c
View File

@ -713,7 +713,7 @@ gst_v4lsrc_buffer_new (GstV4lSrc * v4lsrc, gint num)
GST_BUFFER_TIMESTAMP (buf) -= GST_ELEMENT (v4lsrc)->base_time; GST_BUFFER_TIMESTAMP (buf) -= GST_ELEMENT (v4lsrc)->base_time;
/* FIXME: this is a most ghetto timestamp/duration */ /* FIXME: this is a most ghetto timestamp/duration */
GST_BUFFER_DURATION (buf) = gst_util_clock_time_scale (GST_SECOND, GST_BUFFER_DURATION (buf) = gst_util_uint64_scale_int (GST_SECOND,
fps_n, fps_d); fps_n, fps_d);
/* the negotiate() method already set caps on the source pad */ /* the negotiate() method already set caps on the source pad */