mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-22 00:06:36 +00:00
- UNITS -> DEFAULT
Original commit message from CVS: - UNITS -> DEFAULT
This commit is contained in:
parent
8e7b367524
commit
dc34530987
2 changed files with 4 additions and 16 deletions
|
@ -97,7 +97,7 @@ static GstElementStateReturn gst_v4lmjpegsrc_change_state (GstElement *eleme
|
|||
|
||||
/* bufferpool functions */
|
||||
static GstBuffer* gst_v4lmjpegsrc_buffer_new (GstBufferPool *pool,
|
||||
guint64 location,
|
||||
guint64 offset,
|
||||
guint size,
|
||||
gpointer user_data);
|
||||
static void gst_v4lmjpegsrc_buffer_free (GstBufferPool *pool,
|
||||
|
@ -300,9 +300,6 @@ gst_v4lmjpegsrc_srcconvert (GstPad *pad,
|
|||
case GST_FORMAT_TIME:
|
||||
switch (*dest_format) {
|
||||
case GST_FORMAT_DEFAULT:
|
||||
*dest_format = GST_FORMAT_UNITS;
|
||||
/* fall-through */
|
||||
case GST_FORMAT_UNITS:
|
||||
*dest_value = src_value * fps / GST_SECOND;
|
||||
break;
|
||||
default:
|
||||
|
@ -310,11 +307,8 @@ gst_v4lmjpegsrc_srcconvert (GstPad *pad,
|
|||
}
|
||||
break;
|
||||
|
||||
case GST_FORMAT_UNITS:
|
||||
case GST_FORMAT_DEFAULT:
|
||||
switch (*dest_format) {
|
||||
case GST_FORMAT_DEFAULT:
|
||||
*dest_format = GST_FORMAT_TIME;
|
||||
/* fall-through */
|
||||
case GST_FORMAT_TIME:
|
||||
*dest_value = src_value * GST_SECOND / fps;
|
||||
break;
|
||||
|
@ -798,7 +792,7 @@ gst_v4lmjpegsrc_set_clock (GstElement *element,
|
|||
|
||||
static GstBuffer*
|
||||
gst_v4lmjpegsrc_buffer_new (GstBufferPool *pool,
|
||||
guint64 location,
|
||||
guint64 offset,
|
||||
guint size,
|
||||
gpointer user_data)
|
||||
{
|
||||
|
|
|
@ -256,9 +256,6 @@ gst_v4lsrc_srcconvert (GstPad *pad,
|
|||
case GST_FORMAT_TIME:
|
||||
switch (*dest_format) {
|
||||
case GST_FORMAT_DEFAULT:
|
||||
*dest_format = GST_FORMAT_UNITS;
|
||||
/* fall-through */
|
||||
case GST_FORMAT_UNITS:
|
||||
*dest_value = src_value * fps / GST_SECOND;
|
||||
break;
|
||||
default:
|
||||
|
@ -266,11 +263,8 @@ gst_v4lsrc_srcconvert (GstPad *pad,
|
|||
}
|
||||
break;
|
||||
|
||||
case GST_FORMAT_UNITS:
|
||||
case GST_FORMAT_DEFAULT:
|
||||
switch (*dest_format) {
|
||||
case GST_FORMAT_DEFAULT:
|
||||
*dest_format = GST_FORMAT_TIME;
|
||||
/* fall-through */
|
||||
case GST_FORMAT_TIME:
|
||||
*dest_value = src_value * GST_SECOND / fps;
|
||||
break;
|
||||
|
|
Loading…
Reference in a new issue