diff options
-rwxr-xr-x | jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package_21.7.0.bb (renamed from jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package_21.6.0.bb) | 8 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-toradex_3.10.40.bb | 4 | ||||
-rw-r--r-- | recipes-multimedia/libgstomx-1.0/files/r21.7.0-sources-gstomx1_src.patch | 71 | ||||
-rw-r--r-- | recipes-multimedia/libgstomx-1.0/libgstomx-1.0_21.7.0.bb (renamed from recipes-multimedia/libgstomx-1.0/libgstomx-1.0_21.6.0.bb) | 1 |
4 files changed, 78 insertions, 6 deletions
diff --git a/jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package_21.6.0.bb b/jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package_21.7.0.bb index b04b53b..847d6b0 100755 --- a/jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package_21.6.0.bb +++ b/jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package_21.7.0.bb @@ -2,7 +2,7 @@ DESCRIPTION = "NVIDIA Linux Driver Packages" HOMEPAGE = "https://developer.nvidia.com/" LICENSE = "Proprietary" -SRC_URI = "http://developer.download.nvidia.com/embedded/L4T/r21_Release_v6.0/Tegra124_Linux_R21.6.0_armhf.tbz2 \ +SRC_URI = "http://developer.download.nvidia.com/embedded/L4T/r21_Release_v7.0/Tegra124_Linux_R21.7.0_armhf.tbz2 \ file://xorg.conf.add \ file://nv \ file://nvfb \ @@ -10,10 +10,10 @@ SRC_URI = "http://developer.download.nvidia.com/embedded/L4T/r21_Release_v6.0/Te LIC_FILES_CHKSUM = "file://nv_tegra/LICENSE;md5=60ad17cc726658e8cf73578bea47b85f" -SRC_URI[md5sum] = "e82193b117171243ea21c908fbd347ed" -SRC_URI[sha256sum] = "b9dfbdd0d21d6454e5e9668673a3494e7567698764673938d4c1ef83f42ee72d" +SRC_URI[md5sum] = "2139c0c7ecff94da68aef8a6ad0df20b" +SRC_URI[sha256sum] = "676add1e8e6b2fcf76d97f22f38c9d0cbbe8a92342039a85c8a4c87e8c1ce824" -PR = "r6" +PR = "r7" inherit update-rc.d diff --git a/recipes-kernel/linux/linux-toradex_3.10.40.bb b/recipes-kernel/linux/linux-toradex_3.10.40.bb index 1522617..a5d3e2b 100644 --- a/recipes-kernel/linux/linux-toradex_3.10.40.bb +++ b/recipes-kernel/linux/linux-toradex_3.10.40.bb @@ -17,8 +17,8 @@ SRCREV_use-head-next = "${AUTOREV}" PV = "${LINUX_VERSION}+gitr${SRCPV}" S = "${WORKDIR}/git" -SRCBRANCH = "toradex_tk1_l4t_r21.6" -SRCBRANCH_use-head-next = "toradex_tk1_l4t_r21.6-next" +SRCBRANCH = "toradex_tk1_l4t_r21.7" +SRCBRANCH_use-head-next = "toradex_tk1_l4t_r21.7-next" SRC_URI = "git://git.toradex.com/linux-toradex.git;protocol=git;branch=${SRCBRANCH}" COMPATIBLE_MACHINE = "apalis-tk1" diff --git a/recipes-multimedia/libgstomx-1.0/files/r21.7.0-sources-gstomx1_src.patch b/recipes-multimedia/libgstomx-1.0/files/r21.7.0-sources-gstomx1_src.patch new file mode 100644 index 0000000..aa4c6d5 --- /dev/null +++ b/recipes-multimedia/libgstomx-1.0/files/r21.7.0-sources-gstomx1_src.patch @@ -0,0 +1,71 @@ +diff -Naur r21.6.0-sources-gstomx1_src-gst-omx1/omx/gstomxvideosink.c r21.7.0-sources-gstomx1_src-gst-omx1/omx/gstomxvideosink.c +--- r21.6.0-sources-gstomx1_src-gst-omx1/omx/gstomxvideosink.c 2017-10-14 03:23:25.000000000 +0200 ++++ r21.7.0-sources-gstomx1_src-gst-omx1/omx/gstomxvideosink.c 2018-05-29 22:13:29.000000000 +0200 +@@ -942,6 +942,32 @@ + return TRUE; + } + ++static OMX_ERRORTYPE ++gst_omx_set_stride_alignment (GstOmxVideoSink * self, ++ guint32 align) ++{ ++ OMX_INDEXTYPE eIndex; ++ OMX_ERRORTYPE eError; ++ ++ eError = gst_omx_component_get_index (self->sink, ++ (char *) NVX_INDEX_CONFIG_VIDEOSTRIDEALIGN, ++ &eIndex); ++ ++ if (eError == OMX_ErrorNone) { ++ NVX_CONFIG_VIDEO_STRIDEALIGN oStride; ++ ++ GST_OMX_INIT_STRUCT (&oStride); ++ ++ eError = gst_omx_component_get_config (self->sink, eIndex, &oStride); ++ ++ if (eError == OMX_ErrorNone) { ++ oStride.nAlign = (unsigned long) align; ++ eError = gst_omx_component_set_config (self->sink, eIndex, &oStride); ++ } ++ } ++ return eError; ++} ++ + static void + gst_omx_video_sink_check_nvfeatures (GstOmxVideoSink * self, GstCaps * caps) + { +@@ -950,6 +976,13 @@ + if (gst_caps_features_contains (feature, "memory:NVMM")) { + self->hw_path = TRUE; + } ++ ++ if (!self->hw_path) { ++ if (gst_omx_set_stride_alignment (self, 4) ++ != OMX_ErrorNone) { ++ g_warning ("Failed to set stride alignment.\n"); ++ } ++ } + } + + static OMX_ERRORTYPE +@@ -1087,6 +1120,20 @@ + min = MAX (port_def.nBufferCountMin, 4); + port_def.nBufferCountActual = min; + ++ switch (info.finfo->format) { ++ case GST_VIDEO_FORMAT_I420: ++ port_def.format.video.eColorFormat = OMX_COLOR_FormatYUV420Planar; ++ break; ++ case GST_VIDEO_FORMAT_NV12: ++ port_def.format.video.eColorFormat = OMX_COLOR_FormatYUV420SemiPlanar; ++ break; ++ default: ++ GST_ERROR_OBJECT (self, "Unsupported format %s", ++ gst_video_format_to_string (info.finfo->format)); ++ return FALSE; ++ break; ++ } ++ + GST_DEBUG_OBJECT (self, "Setting inport port definition"); + + if (gst_omx_port_update_port_definition (self->sink_in_port, diff --git a/recipes-multimedia/libgstomx-1.0/libgstomx-1.0_21.6.0.bb b/recipes-multimedia/libgstomx-1.0/libgstomx-1.0_21.7.0.bb index 41056f1..0e57dd4 100644 --- a/recipes-multimedia/libgstomx-1.0/libgstomx-1.0_21.6.0.bb +++ b/recipes-multimedia/libgstomx-1.0/libgstomx-1.0_21.7.0.bb @@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = " \ http://developer.download.nvidia.com/embedded/L4T/r21_Release_v5.0/source/gstomx1_src.tbz2 \ file://r21.6.0-sources-gstomx1_src.patch \ + file://r21.7.0-sources-gstomx1_src.patch \ file://gstomx-1.0.patch \ " |