mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-22 16:26:39 +00:00
Code Issues 1 Projects Releases Wiki Activity

- UNITS -> DEFAULT

Browse source 
Original commit message from CVS:
- UNITS -> DEFAULT
This commit is contained in:
Wim Taymans 2003-05-24 10:46:31 +00:00
parent 8e7b367524
commit dc34530987
2 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sys/v4l/gstv4lmjpegsrc.c
View file

@ -97,7 +97,7 @@ static GstElementStateReturn gst_v4lmjpegsrc_change_state (GstElement *eleme
/* bufferpool functions */ /* bufferpool functions */
static GstBuffer* gst_v4lmjpegsrc_buffer_new (GstBufferPool *pool, static GstBuffer* gst_v4lmjpegsrc_buffer_new (GstBufferPool *pool,
guint64 location, guint64 offset,
guint size, guint size,
gpointer user_data); gpointer user_data);
static void gst_v4lmjpegsrc_buffer_free (GstBufferPool *pool, static void gst_v4lmjpegsrc_buffer_free (GstBufferPool *pool,
@ -300,9 +300,6 @@ gst_v4lmjpegsrc_srcconvert (GstPad *pad,
case GST_FORMAT_TIME: case GST_FORMAT_TIME:
switch (*dest_format) { switch (*dest_format) {
case GST_FORMAT_DEFAULT: case GST_FORMAT_DEFAULT:
*dest_format = GST_FORMAT_UNITS;
/* fall-through */
case GST_FORMAT_UNITS:
*dest_value = src_value * fps / GST_SECOND; *dest_value = src_value * fps / GST_SECOND;
break; break;
default: default:
@ -310,11 +307,8 @@ gst_v4lmjpegsrc_srcconvert (GstPad *pad,
} }
break; break;
case GST_FORMAT_UNITS:
switch (*dest_format) {
case GST_FORMAT_DEFAULT: case GST_FORMAT_DEFAULT:
*dest_format = GST_FORMAT_TIME; switch (*dest_format) {
/* fall-through */
case GST_FORMAT_TIME: case GST_FORMAT_TIME:
*dest_value = src_value * GST_SECOND / fps; *dest_value = src_value * GST_SECOND / fps;
break; break;
@ -798,7 +792,7 @@ gst_v4lmjpegsrc_set_clock (GstElement *element,
static GstBuffer* static GstBuffer*
gst_v4lmjpegsrc_buffer_new (GstBufferPool *pool, gst_v4lmjpegsrc_buffer_new (GstBufferPool *pool,
guint64 location, guint64 offset,
guint size, guint size,
gpointer user_data) gpointer user_data)
{ {

8
sys/v4l/gstv4lsrc.c
View file

@ -256,9 +256,6 @@ gst_v4lsrc_srcconvert (GstPad *pad,
case GST_FORMAT_TIME: case GST_FORMAT_TIME:
switch (*dest_format) { switch (*dest_format) {
case GST_FORMAT_DEFAULT: case GST_FORMAT_DEFAULT:
*dest_format = GST_FORMAT_UNITS;
/* fall-through */
case GST_FORMAT_UNITS:
*dest_value = src_value * fps / GST_SECOND; *dest_value = src_value * fps / GST_SECOND;
break; break;
default: default:
@ -266,11 +263,8 @@ gst_v4lsrc_srcconvert (GstPad *pad,
} }
break; break;
case GST_FORMAT_UNITS:
switch (*dest_format) {
case GST_FORMAT_DEFAULT: case GST_FORMAT_DEFAULT:
*dest_format = GST_FORMAT_TIME; switch (*dest_format) {
/* fall-through */
case GST_FORMAT_TIME: case GST_FORMAT_TIME:
*dest_value = src_value * GST_SECOND / fps; *dest_value = src_value * GST_SECOND / fps;
break; break;