Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meta-digi: remove packages removed upstream (meta-fsl-arm) 

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2013-12-20 17:26:43 +01:00
parent f21f84127a
commit 0a490894f7
25 changed files with 0 additions and 3132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
meta-digi-arm/conf/machine/include/imx-digi-base.inc
View File

@ -13,9 +13,6 @@ XSERVER = "xserver-xorg \
# Ship kernel modules
MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
# Extra audio support
MACHINE_EXTRA_RRECOMMENDS += "imx-audio"
# Gstreamer plugin
MACHINE_GSTREAMER_PLUGIN ?= "gst-fsl-plugin"

41
meta-digi-arm/recipes-bsp/imx-audio/imx-audio/ccimx51js/imx-audio
View File

@ -1,41 +0,0 @@
#!/bin/sh
### BEGIN INIT INFO
# Provides: imx mixer setup
# Required-Start: $syslog
# Required-Stop: $syslog
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: Initialize the imx audio mixer
# Description: Unmute FRONT and set volume to ~70%.
### END INIT INFO
# Based on /etc/init.d/skeleton
PATH=/sbin:/usr/sbin:/bin:/usr/bin
DESC="Audio mixer settings"
NAME=imx-audio
AMIXER=`which amixer`
SCRIPTNAME=/etc/init.d/$NAME
# Exit if amixer is not installed
[ -x "$AMIXER" ] || exit 0
do_start() {
# Enable the Headset (Audio Out)
$AMIXER sset "Headphone" 120 > /dev/null
$AMIXER sset "Capture" 60 > /dev/null
}
case "$1" in
start)
echo "$NAME: setting default mixer settings."
do_start
;;
stop)
;;
*)
echo "Usage: $SCRIPTNAME {start|stop}" >&2
exit 3
;;
esac
exit 0

44
meta-digi-arm/recipes-bsp/imx-audio/imx-audio/ccimx53js/imx-audio
View File

@ -1,44 +0,0 @@
#!/bin/sh
### BEGIN INIT INFO
# Provides: imx mixer setup
# Required-Start: $syslog
# Required-Stop: $syslog
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: Initialize the imx audio mixer
# Description: Unmute FRONT and set volume to ~70%.
### END INIT INFO
# Based on /etc/init.d/skeleton
PATH=/sbin:/usr/sbin:/bin:/usr/bin
DESC="Audio mixer settings"
NAME=imx-audio
AMIXER=`which amixer`
SCRIPTNAME=/etc/init.d/$NAME
# Exit if amixer is not installed
[ -x "$AMIXER" ] || exit 0
do_start() {
# Enable the Headset (Audio Out)
$AMIXER sset "Headphone" 120 > /dev/null
$AMIXER sset "Speaker Function" on > /dev/null
$AMIXER sset "Playback" 160 > /dev/null
$AMIXER sset "Capture" 15 > /dev/null
$AMIXER sset "Jack Function" on > /dev/null
}
case "$1" in
start)
echo "$NAME: setting default mixer settings."
do_start
;;
stop)
;;
*)
echo "Usage: $SCRIPTNAME {start|stop}" >&2
exit 3
;;
esac
exit 0

7
meta-digi-arm/recipes-bsp/imx-audio/imx-audio_0.1.bbappend
View File

@ -1,7 +0,0 @@
# Copyright (C) 2013 Digi International.
PRINC := "${@int(PRINC) + 1}"
PR_append = "+${DISTRO}"
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${MACHINE}/:"

2095
meta-digi-dey/recipes-multimedia/gst-plugins/gst-fsl-plugin-2.0.3/0001-gst-fsl-plugin-update-to-DEL-revision.patch
View File

File diff suppressed because it is too large Load Diff

43
meta-digi-dey/recipes-multimedia/gst-plugins/gst-fsl-plugin-2.0.3/0002-meta-fsl-arm-fix-segment-fault-in-v4lsink-for-yocto.patch
View File

@ -1,43 +0,0 @@
From: Javier Viguera <javier.viguera@digi.com>
Date: Mon, 25 Nov 2013 10:26:37 +0100
Subject: [PATCH] meta-fsl-arm: fix segment fault in v4lsink for yocto
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
src/misc/v4l_sink/src/mfw_gst_fb.c | 4 +++-
src/misc/v4l_sink/src/mfw_gst_v4lsink.c | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/misc/v4l_sink/src/mfw_gst_fb.c b/src/misc/v4l_sink/src/mfw_gst_fb.c
index 8c251da..291c2a1 100755
--- a/src/misc/v4l_sink/src/mfw_gst_fb.c
+++ b/src/misc/v4l_sink/src/mfw_gst_fb.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009-2011 Freescale Semiconductor, Inc. All rights reserved.
+ * Copyright (c) 2009-2012, Freescale Semiconductor, Inc. All rights reserved.
*
*/
@@ -236,6 +236,8 @@ gboolean mfw_gst_fb0_get_resolution(MFW_GST_V4LSINK_INFO_T *v4l)
ret = ioctl(v4l->fd_fb, FBIOGET_VSCREENINFO, &fb_var);
if (ret < 0) {
g_print("Unable to get resolution value\n");
+ v4l->fullscreen_width = 1024;
+ v4l->fullscreen_height = 768;
return FALSE;
}
v4l->fullscreen_width = fb_var.xres;
diff --git a/src/misc/v4l_sink/src/mfw_gst_v4lsink.c b/src/misc/v4l_sink/src/mfw_gst_v4lsink.c
index c6a6b6c..dfdb926 100755
--- a/src/misc/v4l_sink/src/mfw_gst_v4lsink.c
+++ b/src/misc/v4l_sink/src/mfw_gst_v4lsink.c
@@ -1431,7 +1431,7 @@ mfw_gst_v4lsink_change_state (GstElement * element, GstStateChange transition)
g_mutex_lock (v4l_info->flow_lock);
v4l_info->gstXInfo->running = FALSE;
g_mutex_unlock (v4l_info->flow_lock);
- if (v4l_info->x11enabled) {
+ if ((v4l_info->x11enabled) && (v4l_info->gstXInfo) && (v4l_info->gstXInfo->event_thread)) {
g_thread_join (v4l_info->gstXInfo->event_thread);
}
if (v4l_info->gstXInfo->xwindow) {

26
meta-digi-dey/recipes-multimedia/gst-plugins/gst-fsl-plugin-2.0.3/0003-meta-fsl-arm-fix-missing-sys-types.h.patch
View File

@ -1,26 +0,0 @@
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 22 Nov 2013 17:54:22 +0100
Subject: [PATCH] meta-fsl-arm: fix missing sys/types.h
Fix a build failure due to missing uint definition
Upstream-Status: Pending
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
src/misc/v4l_sink/src/mfw_gst_fb.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/misc/v4l_sink/src/mfw_gst_fb.c b/src/misc/v4l_sink/src/mfw_gst_fb.c
index 291c2a1..18d4f7f 100755
--- a/src/misc/v4l_sink/src/mfw_gst_fb.c
+++ b/src/misc/v4l_sink/src/mfw_gst_fb.c
@@ -39,6 +39,7 @@
#include <fcntl.h>
#include <sys/ioctl.h>
+#include <sys/types.h>
//#if ((!defined (_MX233)) && (!defined (_MX28)) && (!defined (_MX50)))
//#include <linux/mxcfb.h>
//#else

29
meta-digi-dey/recipes-multimedia/gst-plugins/gst-fsl-plugin-2.0.3/0004-meta-fsl-arm-Use-library-s-SONAME-in-dlopen.patch
View File

@ -1,29 +0,0 @@
From: Javier Viguera <javier.viguera@digi.com>
Date: Tue, 21 May 2013 16:52:52 +0200
Subject: [PATCH] meta-fsl-arm: Use library's SONAME in dlopen
The 'libmfwba.so' symbolic link is only installed with the development
package, and without that symlink some gstreamer pipelines (mostly using
mfw_isink) fail with:
Can not open dll, libmfwba.so: cannot open shared object file: No such file or directory.
Caught SIGSEGV accessing address (nil)
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
libs/vss/vss_common.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libs/vss/vss_common.c b/libs/vss/vss_common.c
index 757c2fc..2044051 100755
--- a/libs/vss/vss_common.c
+++ b/libs/vss/vss_common.c
@@ -86,7 +86,7 @@ static void * g_dlhandle = NULL;
void open_allocator_dll()
{
char * errstr;
- g_dlhandle = dlopen("libmfwba.so", RTLD_LAZY);
+ g_dlhandle = dlopen("libmfwba.so.0", RTLD_LAZY);
if (!g_dlhandle) {
printf("Can not open dll, %s.\n", dlerror());

80
meta-digi-dey/recipes-multimedia/gst-plugins/gst-fsl-plugin-2.0.3/0005-gplay_fullscreen.patch
View File

@ -1,80 +0,0 @@
From: Javier Viguera <javier.viguera@digi.com>
Date: Mon, 9 Apr 2012 12:44:06 +0200
Subject: [PATCH] gplay_fullscreen
* At start play the video with it's own resolution (not full-screened)
* Fix 'resize' command to set full-screen flag depending on the display
size.
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
src/misc/v4l_sink/src/mfw_gst_v4l.c | 4 ++--
src/misc/v4l_sink/src/mfw_gst_v4lsink.c | 2 +-
tools/gplay/mfw_gplay_core.c | 16 ++++++++++++++++
3 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/misc/v4l_sink/src/mfw_gst_v4l.c b/src/misc/v4l_sink/src/mfw_gst_v4l.c
index 8c2ed72..b85879a 100755
--- a/src/misc/v4l_sink/src/mfw_gst_v4l.c
+++ b/src/misc/v4l_sink/src/mfw_gst_v4l.c
@@ -1355,11 +1355,11 @@ mfw_gst_v4l2_display_init (MFW_GST_V4LSINK_INFO_T * v4l_info,
height = (disp_height >> 3) << 3;
if (width == 0) {
GST_WARNING("Wrong display width information");
- width = v4l_info->fullscreen_width;
+ width = v4l_info->width;
}
if (height == 0) {
GST_WARNING("Wrong display height information");
- height = v4l_info->fullscreen_height;
+ height = v4l_info->height;
}
return ( mfw_gst_v4l2_set_crop(v4l_info, width, height) );
diff --git a/src/misc/v4l_sink/src/mfw_gst_v4lsink.c b/src/misc/v4l_sink/src/mfw_gst_v4lsink.c
index dfdb926..3598fdb 100755
--- a/src/misc/v4l_sink/src/mfw_gst_v4lsink.c
+++ b/src/misc/v4l_sink/src/mfw_gst_v4lsink.c
@@ -976,7 +976,7 @@ mfw_gst_v4lsink_show_frame (GstBaseSink * basesink, GstBuffer * buf)
v4l_info->disp_height);
if (result != TRUE) {
- g_print ("\nFailed to initalize the display\n");
+ GST_WARNING ("Failed to initalize the display");
g_mutex_unlock (v4l_info->flow_lock);
return GST_FLOW_OK;
}
diff --git a/tools/gplay/mfw_gplay_core.c b/tools/gplay/mfw_gplay_core.c
index 4705cac..e5569fc 100755
--- a/tools/gplay/mfw_gplay_core.c
+++ b/tools/gplay/mfw_gplay_core.c
@@ -1583,6 +1583,9 @@ fsl_player_ret_val fsl_player_resize(fsl_player_handle handle, fsl_player_displa
fsl_player_property* pproperty = (fsl_player_property*)pplayer->property_handle;
GstElement* auto_video_sink = NULL;
GstElement* actual_video_sink = NULL;
+ fsl_player_s32 fullscreen_width = 0;
+ fsl_player_s32 fullscreen_height = 0;
+ fsl_player_s32 fb = 0;
g_object_get(pproperty->playbin, "video-sink", &auto_video_sink, NULL);
if( NULL == auto_video_sink )
@@ -1607,6 +1610,19 @@ fsl_player_ret_val fsl_player_resize(fsl_player_handle handle, fsl_player_displa
g_object_set(G_OBJECT(actual_video_sink), "disp-width", pproperty->display_parameter.disp_width, NULL);
g_object_set(G_OBJECT(actual_video_sink), "disp-height", pproperty->display_parameter.disp_height, NULL);
+ /* Set full-screen flag depending on the new display parameters */
+ fullscreen_fb0_open(&fb);
+ fullscreen_fb0_get_width_height(fb, &(fullscreen_width), &(fullscreen_height));
+ fullscreen_fb0_close(&fb);
+ if ((pproperty->display_parameter.offsetx == 0)
+ && (pproperty->display_parameter.offsety == 0)
+ && (pproperty->display_parameter.disp_width == fullscreen_width)
+ && (pproperty->display_parameter.disp_height == fullscreen_height)) {
+ pproperty->bfullscreen = 1;
+ } else {
+ pproperty->bfullscreen = 0;
+ }
+
update_mfw_v4lsink_parameter(actual_video_sink);
g_object_unref (actual_video_sink);

145
meta-digi-dey/recipes-multimedia/gst-plugins/gst-fsl-plugin-2.0.3/0006-add-fb-dev.patch
View File

@ -1,145 +0,0 @@
From: Alejandro Gonzalez <alex.gonzalez@digi.com>
Date: Tue, 13 Mar 2012 19:20:02 +0100
Subject: [PATCH] add-fb-dev
Add framebuffer select functionality to sink
To support displaying to the second monitor, the mfw_v4lsink sink
element needs to accept a device parameter specifying the framebuffer
device to use as output.
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
src/misc/v4l_sink/src/mfw_gst_fb.c | 5 ++++-
src/misc/v4l_sink/src/mfw_gst_fb.h | 2 +-
src/misc/v4l_sink/src/mfw_gst_v4l.c | 4 ++++
src/misc/v4l_sink/src/mfw_gst_v4lsink.c | 20 +++++++++++++++++++-
src/misc/v4l_sink/src/mfw_gst_v4lsink.h | 1 +
5 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/src/misc/v4l_sink/src/mfw_gst_fb.c b/src/misc/v4l_sink/src/mfw_gst_fb.c
index 18d4f7f..d03a874 100755
--- a/src/misc/v4l_sink/src/mfw_gst_fb.c
+++ b/src/misc/v4l_sink/src/mfw_gst_fb.c
@@ -200,11 +200,14 @@ POST-CONDITIONS: None
IMPORTANT NOTES: None
=============================================================================*/
-gboolean mfw_gst_fb0_open(gint *fb)
+gboolean mfw_gst_fb0_open(gint *fb, gchar *device)
{
gboolean retval = TRUE;
gchar fb_device[100] = FB_DEIVCE;
+ if (device != NULL && device[0] != '\0')
+ strcpy(fb_device, device);
+
if ((*fb =
open(fb_device, O_RDWR, 0)) < 0) {
g_print("Unable to open %s %d\n", fb_device, *fb);
diff --git a/src/misc/v4l_sink/src/mfw_gst_fb.h b/src/misc/v4l_sink/src/mfw_gst_fb.h
index 01321d6..da11ca1 100755
--- a/src/misc/v4l_sink/src/mfw_gst_fb.h
+++ b/src/misc/v4l_sink/src/mfw_gst_fb.h
@@ -50,7 +50,7 @@
gboolean mfw_gst_set_gbl_alpha(gint fb, gint alphaVal);
gboolean mfw_gst_fb0_set_colorkey(gint fb,gulong *colorSrc);
-gboolean mfw_gst_fb0_open(gint *fb);
+gboolean mfw_gst_fb0_open(gint *fb, gchar *device);
gboolean mfw_gst_fb0_close(gint *fb);
#if ((defined (_MX37) || defined (_MX51)) && defined (LOC_ALPHA_SUPPORT))
diff --git a/src/misc/v4l_sink/src/mfw_gst_v4l.c b/src/misc/v4l_sink/src/mfw_gst_v4l.c
index b85879a..d773f6a 100755
--- a/src/misc/v4l_sink/src/mfw_gst_v4l.c
+++ b/src/misc/v4l_sink/src/mfw_gst_v4l.c
@@ -540,6 +540,10 @@ mfw_gst_v4l2_mx37_mx51_tv_close (MFW_GST_V4LSINK_INFO_T * v4l_info)
gint out = 3;
+ if (v4l_info->device && !strcmp(v4l_info->device, "/dev/fb1"))
+ out = 5;
+ g_free(v4l_info->device);
+
// mfw_gst_v4l2_mx37_mx51_tv_setblank (v4l_info);
v4l_info->tv_mode = NV_MODE;
diff --git a/src/misc/v4l_sink/src/mfw_gst_v4lsink.c b/src/misc/v4l_sink/src/mfw_gst_v4lsink.c
index 3598fdb..4a6c642 100755
--- a/src/misc/v4l_sink/src/mfw_gst_v4lsink.c
+++ b/src/misc/v4l_sink/src/mfw_gst_v4lsink.c
@@ -137,6 +137,7 @@ enum
TV_OUT,
TV_MODE,
#endif
+ DEVICE,
DUMP_LOCATION,
ADDITIONAL_BUFFER_DEPTH,
SETPARA,
@@ -741,6 +742,11 @@ mfw_gst_v4lsink_set_property (GObject * object, guint prop_id,
case DUMP_LOCATION:
dumpfile_set_location (v4l_info, g_value_get_string (value));
break;
+
+ case DEVICE:
+ v4l_info->device = g_strdup (g_value_get_string (value));
+ break;
+
case SETPARA:
v4l_info->setpara |= g_value_get_int (value);
break;
@@ -848,6 +854,10 @@ mfw_gst_v4lsink_get_property (GObject * object, guint prop_id,
case DUMP_LOCATION:
g_value_set_string (value, v4l_info->dump_location);
break;
+
+ case DEVICE:
+ g_value_set_string (value, v4l_info->device);
+ break;
case SETPARA:
g_value_set_int (value, v4l_info->setpara);
break;
@@ -1541,6 +1551,7 @@ mfw_gst_v4lsink_init (MFW_GST_V4LSINK_INFO_T * v4l_info,
v4l_info->dump_location = NULL;
v4l_info->dumpfile = NULL;
v4l_info->dump_length = 0;
+ v4l_info->device = NULL;
v4l_info->cr_left_bypixel_orig = 0;
v4l_info->cr_right_bypixel_orig = 0;
v4l_info->cr_top_bypixel_orig = 0;
@@ -1573,7 +1584,7 @@ mfw_gst_v4lsink_init (MFW_GST_V4LSINK_INFO_T * v4l_info,
memset (&v4l_info->crop, 0, sizeof (struct v4l2_crop));
memset (&v4l_info->prevCrop, 0, sizeof (struct v4l2_crop));
- mfw_gst_fb0_open (&v4l_info->fd_fb);
+ mfw_gst_fb0_open (&v4l_info->fd_fb, v4l_info->device);
v4l_info->chipcode = getChipCode();
v4l_info->v4l_id = -1;
@@ -1730,6 +1741,13 @@ mfw_gst_v4lsink_class_init (MFW_GST_V4LSINK_INFO_CLASS_T * klass)
NULL,
G_PARAM_READWRITE));
+ g_object_class_install_property (gobject_class, DEVICE,
+ g_param_spec_string ("device",
+ "Framebuffer device",
+ "Framebuffer device to display output."
+ "/dev/fb0,/dev/fb1",
+ NULL,
+ G_PARAM_READWRITE));
g_object_class_install_property (gobject_class, PROP_FORCE_ASPECT_RATIO,
g_param_spec_boolean
diff --git a/src/misc/v4l_sink/src/mfw_gst_v4lsink.h b/src/misc/v4l_sink/src/mfw_gst_v4lsink.h
index 504e06f..28cd6b7 100755
--- a/src/misc/v4l_sink/src/mfw_gst_v4lsink.h
+++ b/src/misc/v4l_sink/src/mfw_gst_v4lsink.h
@@ -279,6 +279,7 @@ typedef struct MFW_GST_V4LSINK_INFO_S
FILE *dumpfile;
guint64 dump_length;
+ gchar *device;
gint qbuff_count; /* buffer counter, increase when frame queued to v4l device */

56
meta-digi-dey/recipes-multimedia/gst-plugins/gst-fsl-plugin-2.0.3/0007-mfw_v4lsrc_uyvy.patch
View File

@ -1,56 +0,0 @@
From: Alex Gonzalez <alex.gonzalez@digi.com>
Date: Tue, 3 Apr 2012 13:51:45 +0200
Subject: [PATCH] mfw_v4lsrc_uyvy
Change the default pixelformat used by the plugin to uyvy which is
supported by the mt9v111 driver.
Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
---
src/misc/v4l_source/src/mfw_gst_v4lsrc.c | 19 ++++---------------
1 file changed, 4 insertions(+), 15 deletions(-)
diff --git a/src/misc/v4l_source/src/mfw_gst_v4lsrc.c b/src/misc/v4l_source/src/mfw_gst_v4lsrc.c
index 8ff9b6f..d1057e3 100755
--- a/src/misc/v4l_source/src/mfw_gst_v4lsrc.c
+++ b/src/misc/v4l_source/src/mfw_gst_v4lsrc.c
@@ -425,11 +425,8 @@ static gint mfw_gst_v4lsrc_capture_setup(MFWGstV4LSrc *v4l_src)
in_height = v4l_src->capture_height;
}
fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-#ifdef MX51
- fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_NV12;
-#else
- fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_YUV420;
-#endif
+
+ fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_UYVY;
fmt.fmt.pix.width = in_width;
fmt.fmt.pix.height = in_height;
@@ -1225,11 +1222,7 @@ static GstCaps *mfw_gst_v4lsrc_get_caps (GstBaseSrc * src)
GstCaps *capslist;
GstPadTemplate *src_template = NULL;
gint i;
-#ifndef MX51
- guint32 format = GST_MAKE_FOURCC('I', '4', '2', '0');
-#else
- guint32 format = GST_MAKE_FOURCC('N', 'V', '1', '2');
-#endif
+ guint32 format = GST_MAKE_FOURCC('U', 'Y', 'V', 'Y');
capslist = gst_caps_new_empty();
@@ -1273,11 +1266,7 @@ static void mfw_gst_v4lsrc_fixate(GstPad * pad, GstCaps * caps)
GstStructure *structure=NULL;
MFWGstV4LSrc *v4l_src =
MFW_GST_V4LSRC(gst_pad_get_parent (pad));
-#ifndef MX51
- guint32 fourcc = GST_MAKE_FOURCC('I', '4', '2', '0');
-#else
- guint32 fourcc = GST_MAKE_FOURCC('N', 'V', '1', '2');
-#endif
+ guint32 fourcc = GST_MAKE_FOURCC('U', 'Y', 'V', 'Y');
const GValue *v=NULL;
for (i = 0; i < gst_caps_get_size (caps); ++i) {

95
meta-digi-dey/recipes-multimedia/gst-plugins/gst-fsl-plugin-2.0.3/0008-mfw_v4lsec_def_sizes.patch
View File

@ -1,95 +0,0 @@
From: Alex Gonzalez <alex.gonzalez@digi.com>
Date: Tue, 3 Apr 2012 13:52:50 +0200
Subject: [PATCH] mfw_v4lsec_def_sizes
Change the default dimensions to the ones supported by the mt9v111 driver.
Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
---
src/misc/v4l_source/src/mfw_gst_v4lsrc.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/misc/v4l_source/src/mfw_gst_v4lsrc.c b/src/misc/v4l_source/src/mfw_gst_v4lsrc.c
index d1057e3..968deb7 100755
--- a/src/misc/v4l_source/src/mfw_gst_v4lsrc.c
+++ b/src/misc/v4l_source/src/mfw_gst_v4lsrc.c
@@ -1304,8 +1304,8 @@ IMPORTANT NOTES: None
=============================================================================*/
static void mfw_gst_v4lsrc_init(MFWGstV4LSrc * v4l_src, MFWGstV4LSrcClass * klass)
{
- v4l_src->capture_width=176;
- v4l_src->capture_height=144;
+ v4l_src->capture_width=640;
+ v4l_src->capture_height=480;
v4l_src->fps_n=30;
v4l_src->fps_d=1;
v4l_src->fd_v4l=-1;
@@ -1315,12 +1315,12 @@ static void mfw_gst_v4lsrc_init(MFWGstV4LSrc * v4l_src, MFWGstV4LSrcClass * klas
v4l_src->crop_pixel=0;
v4l_src->rotate=0;
v4l_src->preview=FALSE;
- v4l_src->preview_width=160;
- v4l_src->preview_height=128;
+ v4l_src->preview_width=640;
+ v4l_src->preview_height=480;
v4l_src->preview_top=0;
v4l_src->preview_left=0;
- v4l_src->sensor_width=1280;
- v4l_src->sensor_height=1024;
+ v4l_src->sensor_width=640;
+ v4l_src->sensor_height=480;
v4l_src->capture_mode = 0;
v4l_src->bg = FALSE;
#ifdef MX27
@@ -1372,14 +1372,14 @@ static void mfw_gst_v4lsrc_class_init(MFWGstV4LSrcClass * klass)
g_param_spec_int("capture-width",
"capture_width",
"gets the width of the image to be captured",
- 16, 1768, 176,
+ 16, 1768, 640,
G_PARAM_READWRITE));
g_object_class_install_property(gobject_class, MFW_V4L_SRC_HEIGHT,
g_param_spec_int("capture-height",
"capture_height",
"gets the height of the image to be captured",
- 16, 1168, 144,
+ 16, 1168, 480,
G_PARAM_READWRITE));
g_object_class_install_property(gobject_class, MFW_V4L_SRC_PREVIEW_WIDTH,
@@ -1387,7 +1387,7 @@ static void mfw_gst_v4lsrc_class_init(MFWGstV4LSrcClass * klass)
"preview_width",
"gets the width of the image to be displayed for preview. \n"
"\t\t\tNote:property is valid only when preview property is enabled",
- 16, 1768, 176,
+ 16, 1768, 640,
G_PARAM_READWRITE));
g_object_class_install_property(gobject_class, MFW_V4L_SRC_PREVIEW_HEIGHT,
@@ -1395,7 +1395,7 @@ static void mfw_gst_v4lsrc_class_init(MFWGstV4LSrcClass * klass)
"preview_height",
"gets the height of the image to be displayed for preview. \n"
"\t\t\tNote:property is valid only when preview property is enabled",
- 16, 1168, 144,
+ 16, 1168, 480,
G_PARAM_READWRITE));
g_object_class_install_property(gobject_class, MFW_V4L_SRC_PREVIEW_TOP,
@@ -1471,14 +1471,14 @@ static void mfw_gst_v4lsrc_class_init(MFWGstV4LSrcClass * klass)
"sensor_width",
"gets the width of the sensor",
16,
- G_MAXINT, 1280,
+ G_MAXINT, 640,
G_PARAM_READWRITE));
g_object_class_install_property(gobject_class, MFW_V4L_SRC_SENSOR_HEIGHT,
g_param_spec_int("sensor-height",
"sensor_height",
"gets the height of the sensor",
16,
- G_MAXINT, 1024,
+ G_MAXINT, 480,
G_PARAM_READWRITE));
g_object_class_install_property(gobject_class, MFW_V4L_SRC_CAPTURE_MODE,

25
meta-digi-dey/recipes-multimedia/gst-plugins/gst-fsl-plugin-2.0.3/0009-mfw_v4lsrc_create_segfault.patch
View File

@ -1,25 +0,0 @@
From: Alex Gonzalez <alex.gonzalez@digi.com>
Date: Tue, 3 Apr 2012 13:54:50 +0200
Subject: [PATCH] mfw_v4lsrc_create_segfault
Fix a segfault that happend when the create function returns GST_FLOW_OK
but the returned buffer is NULL.
Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
---
src/misc/v4l_source/src/mfw_gst_v4lsrc.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/misc/v4l_source/src/mfw_gst_v4lsrc.c b/src/misc/v4l_source/src/mfw_gst_v4lsrc.c
index 968deb7..9388edd 100755
--- a/src/misc/v4l_source/src/mfw_gst_v4lsrc.c
+++ b/src/misc/v4l_source/src/mfw_gst_v4lsrc.c
@@ -1195,6 +1195,8 @@ static GstFlowReturn mfw_gst_v4lsrc_create (GstPushSrc * src, GstBuffer ** buf)
{
MFWGstV4LSrc *v4l_src = MFW_GST_V4LSRC(src);
*buf = mfw_gst_v4lsrc_buffer_new (v4l_src);
+ if(*buf == NULL)
+ return GST_FLOW_ERROR;
return GST_FLOW_OK;
}

67
meta-digi-dey/recipes-multimedia/gst-plugins/gst-fsl-plugin-2.0.3/0010-gplay_rotate.patch
View File

@ -1,67 +0,0 @@
From: Javier Viguera <javier.viguera@digi.com>
Date: Tue, 13 Mar 2012 19:05:39 +0100
Subject: [PATCH] gplay_rotate
* Fix 'rotate' gplay command
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
src/misc/v4l_sink/src/mfw_gst_v4l.c | 5 ++++-
src/misc/v4l_sink/src/mfw_gst_v4lsink.c | 1 +
src/misc/v4l_sink/src/mfw_gst_v4lsink.h | 1 +
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/misc/v4l_sink/src/mfw_gst_v4l.c b/src/misc/v4l_sink/src/mfw_gst_v4l.c
index d773f6a..cb999d2 100755
--- a/src/misc/v4l_sink/src/mfw_gst_v4l.c
+++ b/src/misc/v4l_sink/src/mfw_gst_v4l.c
@@ -845,6 +845,7 @@ mfw_gst_v4l2_set_rotation (MFW_GST_V4LSINK_INFO_T * v4l_info)
/* Set the rotation */
ctrl.id = V4L2_CID_PRIVATE_BASE;
ctrl.value = v4l_info->rotate;
+ v4l_info->changedRotate = (v4l_info->prevRotate != v4l_info->rotate) ? TRUE : FALSE;
v4l_info->prevRotate = v4l_info->rotate;
if (ioctl (v4l_info->v4l_id, VIDIOC_S_CTRL, &ctrl) < 0) {
GST_ERROR ("set ctrl failed");
@@ -1288,7 +1289,7 @@ mfw_gst_v4l2_set_crop (MFW_GST_V4LSINK_INFO_T * v4l_info,
crop->c.left, crop->c.top, crop->c.width, crop->c.height);
if ((!memcmp (crop, prevCrop, sizeof (struct v4l2_crop)))
- && (v4l_info->rotate == v4l_info->prevRotate)) {
+ && !v4l_info->changedRotate) {
// mfw_gst_v4l2_streamoff(v4l_info);
return FALSE;
@@ -1303,6 +1304,8 @@ mfw_gst_v4l2_set_crop (MFW_GST_V4LSINK_INFO_T * v4l_info,
}
+ /* Reset changedRotate flag */
+ v4l_info->changedRotate = FALSE;
if (ioctl (v4l_info->v4l_id, VIDIOC_S_CROP, crop) < 0) {
GST_ERROR ("set crop failed");
diff --git a/src/misc/v4l_sink/src/mfw_gst_v4lsink.c b/src/misc/v4l_sink/src/mfw_gst_v4lsink.c
index 4a6c642..de55b9d 100755
--- a/src/misc/v4l_sink/src/mfw_gst_v4lsink.c
+++ b/src/misc/v4l_sink/src/mfw_gst_v4lsink.c
@@ -1534,6 +1534,7 @@ mfw_gst_v4lsink_init (MFW_GST_V4LSINK_INFO_T * v4l_info,
v4l_info->axis_left = 0;
v4l_info->rotate = 0;
v4l_info->prevRotate = 0;
+ v4l_info->changedRotate = FALSE;
v4l_info->crop_left = 0;
v4l_info->crop_top = 0;
diff --git a/src/misc/v4l_sink/src/mfw_gst_v4lsink.h b/src/misc/v4l_sink/src/mfw_gst_v4lsink.h
index 28cd6b7..159d3e7 100755
--- a/src/misc/v4l_sink/src/mfw_gst_v4lsink.h
+++ b/src/misc/v4l_sink/src/mfw_gst_v4lsink.h
@@ -255,6 +255,7 @@ typedef struct MFW_GST_V4LSINK_INFO_S
gint axis_left; /* diplay left co-ordinate */
gint rotate; /* display rotate angle */
gint prevRotate; /* Previous display rotate angle */
+ gboolean changedRotate; /* There was a rotation change */
gint v4l_id; /* device ID */
gint cr_left_bypixel; /* crop left offset set by decoder in caps */
gint cr_right_bypixel; /* crop right offset set by decoder in caps */

37
meta-digi-dey/recipes-multimedia/gst-plugins/gst-fsl-plugin-2.0.3/0011-mfw_isink-Set-defaults-if-no-vssconfig-found.patch
View File

@ -1,37 +0,0 @@
From: Alex Gonzalez <alex.gonzalez@digi.com>
Date: Mon, 9 Apr 2012 18:20:01 +0200
Subject: [PATCH] mfw_isink: Set defaults if no vssconfig found.
Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
libs/vss/vss_common.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/libs/vss/vss_common.c b/libs/vss/vss_common.c
index 2044051..a8e8e57 100755
--- a/libs/vss/vss_common.c
+++ b/libs/vss/vss_common.c
@@ -390,6 +390,22 @@ next:
cs = cs->next;
}
+ if (i == 0) {
+ for (i = 0; i < VD_MAX; i++) {
+ VideoDevice *vd;
+
+ VS_MESSAGE("No vssconfig, setting defaults.\n");
+ vd = &control->devices[i];
+ vd->fbidx = i;
+ vd->main_fbidx = i;
+ vd->fmt = fmt_from_str("RGBP");
+ sprintf(vd->name, "DISP%d", i);
+ vd->vsmax = 4;
+ vd->mode_num = 0;
+ _getVideoDeviceInfo(vd);
+ }
+ }
+
sconf_free_cs(css);
}

28
meta-digi-dey/recipes-multimedia/gst-plugins/gst-fsl-plugin-2.0.3/0012-gst-fsl-plugin-Clear-framebuffer-of-spurious-content.patch
View File

@ -1,28 +0,0 @@
From: Alex Gonzalez <alex.gonzalez@digi.com>
Date: Tue, 10 Apr 2012 12:21:29 +0200
Subject: [PATCH] gst-fsl-plugin: Clear framebuffer of spurious content.
When starting a video right after boot, there is some content in the
framebuffer which remains. The blank/unblank operation gets rid of it.
Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
---
libs/vss/vss_common.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/libs/vss/vss_common.c b/libs/vss/vss_common.c
index 52aa508..ee74046 100755
--- a/libs/vss/vss_common.c
+++ b/libs/vss/vss_common.c
@@ -486,6 +486,11 @@ int _initVideoDevice(VideoDevice * vd, int mode_idx)
vd->fbvar = fb_var;
+ // Clear framebuffer from spurious content
+ VS_MESSAGE("Blanking device /dev/fb%d.\n",vd->fbidx);
+ VS_IOCTL(fd, FBIOBLANK, error, FB_BLANK_POWERDOWN);
+ VS_IOCTL(fd, FBIOBLANK, error, FB_BLANK_UNBLANK);
+
if ((vd->resX==0) || (vd->resY==0))
goto error;

56
meta-digi-dey/recipes-multimedia/gst-plugins/gst-fsl-plugin-2.0.3/0013-mfw_v4lsink-Do-not-ignore-cropping-dimensions.patch
View File

@ -1,56 +0,0 @@
From: Alex Gonzalez <alex.gonzalez@digi.com>
Date: Wed, 2 May 2012 10:53:19 +0200
Subject: [PATCH] mfw_v4lsink: Do not ignore cropping dimensions.
When the sink issues a S_CROP followed by a S_OUTPUT, the later resets the
crop dimensions to full screen. In order to keep the cropping dimensions,
a new S_CROP needs to be issued after the S_OUTPUT.
This change reuses an init call that was only called in the case of X11
which reissues the crop. It also needs to make sure that the previous
crop information is erased, otherwise the cropping function will decide
that it won't perform a crop if the dimensions have not changed.
Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
---
src/misc/v4l_sink/src/mfw_gst_v4lsink.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/misc/v4l_sink/src/mfw_gst_v4lsink.c b/src/misc/v4l_sink/src/mfw_gst_v4lsink.c
index de55b9d..ce03ee4 100755
--- a/src/misc/v4l_sink/src/mfw_gst_v4lsink.c
+++ b/src/misc/v4l_sink/src/mfw_gst_v4lsink.c
@@ -1847,6 +1847,7 @@ mfw_gst_v4lsink_buffer_alloc (GstBaseSink * bsink, guint64 offset,
gint frame_buffer_size;
gint max_frames;
gint hwbuffernumforcodec;
+ struct v4l2_crop *prevCrop = &v4l_info->prevCrop;
gboolean result = FALSE;
@@ -1985,7 +1986,6 @@ mfw_gst_v4lsink_buffer_alloc (GstBaseSink * bsink, guint64 offset,
return GST_FLOW_ERROR;
}
-#ifdef USE_X11
/* Two cases:
* 1. VPU will request buffer first, when pipeline enter running state,
* every parameter is ready.
@@ -1994,13 +1994,15 @@ mfw_gst_v4lsink_buffer_alloc (GstBaseSink * bsink, guint64 offset,
*/
if (element->current_state == GST_STATE_PLAYING) {
+#ifdef USE_X11
GST_INFO("element state already switch to PLAYING, create event thread");
mfw_gst_v4lsink_create_event_thread(v4l_info);
+#endif
+ // Digi: Force the crop to take effect by losing the previous crop info
+ memset(prevCrop,0,sizeof(struct v4l2_crop));
mfw_gst_v4l2_display_init(v4l_info, v4l_info->disp_width, v4l_info->disp_height);
-
}
-#endif
/*
* The software H264 decoder need check the "num-buffers-required"

28
meta-digi-dey/recipes-multimedia/gst-plugins/gst-fsl-plugin-2.0.3/0014-gplay_next_file.patch
View File

@ -1,28 +0,0 @@
From: Javier Viguera <javier.viguera@digi.com>
Date: Thu, 10 May 2012 19:54:52 +0200
Subject: [PATCH] gplay_next_file
Add 'send_message_exit' to avoid blocking forever.
This fixes 'gplay' not exiting when you run 'play next file [>]' command
on the last file of the playlist.
CCORE_MX53_EXTENSIONS-142
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
tools/gplay/mfw_gplay.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/gplay/mfw_gplay.c b/tools/gplay/mfw_gplay.c
index ee65100..de11e68 100755
--- a/tools/gplay/mfw_gplay.c
+++ b/tools/gplay/mfw_gplay.c
@@ -876,6 +876,7 @@ int main(int argc,char *argv[])
case '>': // Play next file
printf("next\n");
if (playlist_next(pplayer, opt)==NULL){
+ pplayer->klass->send_message_exit(pplayer);
player_exit(pplayer);
}
break;

47
meta-digi-dey/recipes-multimedia/gst-plugins/gst-fsl-plugin-2.0.3/0015-gplay_repeat.patch
View File

@ -1,47 +0,0 @@
From: Javier Viguera <javier.viguera@digi.com>
Date: Fri, 11 May 2012 13:15:07 +0200
Subject: [PATCH] gplay_repeat
Fix some issues related with 'repeat' command in gplay.
1. repeat_current not working if the item was the last one of the
playlist.
2. Running 'play previous [<]' does not honour 'repeat_current' mode and
jumps to previous item in the playlist anyway.
CCORE_MX53_EXTENSIONS-140
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
tools/gplay/mfw_gplay.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tools/gplay/mfw_gplay.c b/tools/gplay/mfw_gplay.c
index de11e68..5e5a6f1 100755
--- a/tools/gplay/mfw_gplay.c
+++ b/tools/gplay/mfw_gplay.c
@@ -151,6 +151,7 @@ PlayItem * playlist_next(fsl_player_handle handle, options* opt)
}
case FSL_PLAYER_REPEAT_CURRENT:
{
+ next = opt->current;
pplayer->klass->stop(pplayer);
//pplayer->klass->set_media_location(pplayer, opt->current->name, &drm_format);
pplayer->klass->play(pplayer);
@@ -172,6 +173,7 @@ fsl_player_ret_val playlist_previous(fsl_player_handle handle, options* opt)
PlayItem * current = opt->current;
PlayItem * next = getPrevItem(current);
+#if 0
if(next)
{
opt->current = next;
@@ -180,6 +182,7 @@ fsl_player_ret_val playlist_previous(fsl_player_handle handle, options* opt)
pplayer->klass->set_media_location(pplayer, opt->current->name, &drm_format);
pplayer->klass->play(pplayer);
}
+#endif
switch( opt->repeat )
{
case FSL_PLAYER_REPEAT_NONE:

52
meta-digi-dey/recipes-multimedia/gst-plugins/gst-fsl-plugin-2.0.3/0016-gst-fsl-plugin-Only-call-MXCFB_SET_OVERLAY_POS-with-.patch
View File

@ -1,52 +0,0 @@
From: Alex Gonzalez <alex.gonzalez@digi.com>
Date: Thu, 17 May 2012 10:46:39 +0200
Subject: [PATCH] gst-fsl-plugin: Only call MXCFB_SET_OVERLAY_POS with overlay
framebuffer.
This is just to avoid the ioctl to return an error.
Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
---
libs/vss/vss_common.c | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/libs/vss/vss_common.c b/libs/vss/vss_common.c
index ee74046..7452274 100755
--- a/libs/vss/vss_common.c
+++ b/libs/vss/vss_common.c
@@ -686,10 +686,14 @@ _setDeviceConfig(VideoDevice * vd)
int fd = _getDevicefd(vd);
- /* Workaround for ipu hardware, it need set to 0,0 before change another offset */
- pos.x = 0;
- pos.y = 0;
- VS_IOCTL(fd, MXCFB_SET_OVERLAY_POS, here1, &pos);
+
+ VS_IOCTL(fd, FBIOGET_FSCREENINFO, done, &fb_fix);
+ if( !strcmp(fb_fix.id,"DISP3 FG") ){
+ /* Workaround for ipu hardware, it need set to 0,0 before change another offset */
+ pos.x = 0;
+ pos.y = 0;
+ VS_IOCTL(fd, MXCFB_SET_OVERLAY_POS, here1, &pos);
+ }
here1:
VS_IOCTL(fd, FBIOBLANK, done, FB_BLANK_POWERDOWN);
@@ -711,10 +715,12 @@ here1:
VS_IOCTL(fd, FBIOGET_VSCREENINFO, done, &fb_var);
VS_IOCTL(fd, FBIOGET_FSCREENINFO, done, &fb_fix);
-
- pos.x = vd->disp.left;
- pos.y = vd->disp.top;
- VS_IOCTL(fd, MXCFB_SET_OVERLAY_POS, here2, &pos);
+
+ if( !strcmp(fb_fix.id,"DISP3 FG") ){
+ pos.x = vd->disp.left;
+ pos.y = vd->disp.top;
+ VS_IOCTL(fd, MXCFB_SET_OVERLAY_POS, here2, &pos);
+ }
here2:
VS_IOCTL(fd, FBIOBLANK, done, FB_BLANK_UNBLANK);

24
meta-digi-dey/recipes-multimedia/gst-plugins/gst-fsl-plugin-2.0.3/0017-gst-fsl-plugin-Do-not-blank-the-display-on-device-cl.patch
View File

@ -1,24 +0,0 @@
From: Alex Gonzalez <alex.gonzalez@digi.com>
Date: Mon, 21 May 2012 16:17:01 +0200
Subject: [PATCH] gst-fsl-plugin: Do not blank the display on device close.
CCORE_MX53_EXTENSIONS-156
Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
---
libs/vss/vss_common.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libs/vss/vss_common.c b/libs/vss/vss_common.c
index 7452274..52cd126 100755
--- a/libs/vss/vss_common.c
+++ b/libs/vss/vss_common.c
@@ -744,7 +744,7 @@ _closeDevice(VideoDevice * vd)
//if (vd->mode_num){
VS_IOCTL(fd, FBIOPUT_VSCREENINFO, done, &vd->fbvar);
//}
- VS_IOCTL(fd, FBIOBLANK, done, FB_BLANK_POWERDOWN);
+// VS_IOCTL(fd, FBIOBLANK, done, FB_BLANK_POWERDOWN);
close(fd);
gFBDescs[vd->fbidx].fb_fd = 0;

40
meta-digi-dey/recipes-multimedia/gst-plugins/gst-fsl-plugin-2.0.3/0018-undefined-shm_open.patch
View File

@ -1,40 +0,0 @@
From: Javier Viguera <javier.viguera@digi.com>
Date: Thu, 10 Oct 2013 10:16:27 +0200
Subject: [PATCH] undefined shm_open
Explicitly link with 'librt' to fix:
/usr/lib/libmfwvss.so.0: undefined symbol: shm_open
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
libs/vss/Makefile.am | 2 +-
libs/vss/Makefile.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libs/vss/Makefile.am b/libs/vss/Makefile.am
index 76a96ac..e90d715 100755
--- a/libs/vss/Makefile.am
+++ b/libs/vss/Makefile.am
@@ -10,7 +10,7 @@ lib_LTLIBRARIES = libmfwvss.la
libmfwvss_la_SOURCES = vss_common.c video_surface.c
libmfwvss_la_CFLAGS = -O2 -I$(FBHEADER_PATH) $(IPU_CFLAGS) -I../../inc/common -I../sconf
libmfwvss_la_LDFLAGS = -version-info @GSTMXLIBS_VERSION@
-libmfwvss_la_LIBADD = $(GST_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR) $(IPU_LIBS) -lipu -ldl
+libmfwvss_la_LIBADD = $(GST_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR) $(IPU_LIBS) -lipu -ldl -lrt
libmfwvss_la_LIBADD += ../sconf/libmfwsconf.la
diff --git a/libs/vss/Makefile.in b/libs/vss/Makefile.in
index e016da6..0f61804 100755
--- a/libs/vss/Makefile.in
+++ b/libs/vss/Makefile.in
@@ -269,7 +269,7 @@ libmfwvss_la_SOURCES = vss_common.c video_surface.c
libmfwvss_la_CFLAGS = -O2 -I$(FBHEADER_PATH) $(IPU_CFLAGS) -I../../inc/common -I../sconf
libmfwvss_la_LDFLAGS = -version-info @GSTMXLIBS_VERSION@
libmfwvss_la_LIBADD = $(GST_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
- -lgstinterfaces-$(GST_MAJORMINOR) $(IPU_LIBS) -lipu -ldl \
+ -lgstinterfaces-$(GST_MAJORMINOR) $(IPU_LIBS) -lipu -ldl -lrt \
../sconf/libmfwsconf.la
data_DATA = vssconfig vssconfig.dvi_tv vssconfig.dvi_wvga
all: all-am

27
meta-digi-dey/recipes-multimedia/gst-plugins/gst-fsl-plugin-2.0.3/0019-aac-decoder-increase-element-rank.patch
View File

@ -1,27 +0,0 @@
From: Javier Viguera <javier.viguera@digi.com>
Date: Mon, 25 Nov 2013 13:59:00 +0100
Subject: [PATCH] aac decoder: increase element rank
Give priority to FSL AAC decoder over others from the community when
using gstreamer's playbin2 or gplay
This allows to play some videos that fail otherwise.
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
src/audio/aac_dec/src/mfw_gst_aacdec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/audio/aac_dec/src/mfw_gst_aacdec.c b/src/audio/aac_dec/src/mfw_gst_aacdec.c
index 6e8a37b..6103070 100755
--- a/src/audio/aac_dec/src/mfw_gst_aacdec.c
+++ b/src/audio/aac_dec/src/mfw_gst_aacdec.c
@@ -3659,7 +3659,7 @@ IMPORTANT NOTES:
static gboolean plugin_init (GstPlugin * plugin)
{
return gst_element_register (plugin, "mfw_aacdecoder",
- GST_RANK_PRIMARY, MFW_GST_TYPE_AACDEC);
+ GST_RANK_PRIMARY+1, MFW_GST_TYPE_AACDEC);
}
/*=============================================================================

35
meta-digi-dey/recipes-multimedia/gst-plugins/gst-fsl-plugin_2.0.3.bbappend
View File

@ -1,35 +0,0 @@
# Copyright (C) 2013 Digi International.
PRINC := "${@int(PRINC) + 1}"
PR_append = "+${DISTRO}"
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
SRC_URI = " \
${FSL_MIRROR}/${PACKAGE_NAME}-${PV}.tar.gz \
file://0001-gst-fsl-plugin-update-to-DEL-revision.patch \
file://0002-meta-fsl-arm-fix-segment-fault-in-v4lsink-for-yocto.patch \
file://0003-meta-fsl-arm-fix-missing-sys-types.h.patch \
file://0004-meta-fsl-arm-Use-library-s-SONAME-in-dlopen.patch \
file://0005-gplay_fullscreen.patch \
file://0006-add-fb-dev.patch \
file://0007-mfw_v4lsrc_uyvy.patch \
file://0008-mfw_v4lsec_def_sizes.patch \
file://0009-mfw_v4lsrc_create_segfault.patch \
file://0010-gplay_rotate.patch \
file://0011-mfw_isink-Set-defaults-if-no-vssconfig-found.patch \
file://0012-gst-fsl-plugin-Clear-framebuffer-of-spurious-content.patch \
file://0013-mfw_v4lsink-Do-not-ignore-cropping-dimensions.patch \
file://0014-gplay_next_file.patch \
file://0015-gplay_repeat.patch \
file://0016-gst-fsl-plugin-Only-call-MXCFB_SET_OVERLAY_POS-with-.patch \
file://0017-gst-fsl-plugin-Do-not-blank-the-display-on-device-cl.patch \
file://0018-undefined-shm_open.patch \
file://0019-aac-decoder-increase-element-rank.patch \
"
do_install_append() {
# Remove 'vssconfig' config files as we have a patch that configures
# the displays on the fly.
rm -f ${D}${datadir}/vssconfig*
}

2
meta-digi-dey/recipes-multimedia/packagegroups/packagegroup-dey-audio.bb
View File

@ -24,5 +24,3 @@ RDEPENDS_${PN} = "\
alsa-states \
${ALSA_UTILS_PKGS} \
"
RDEPENDS_${PN}_append_mx5 = " imx-audio"