2 files changed, 15 insertions, 12 deletions
diff --git a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx/gstomx.conf b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx/gstomx.conf
index 11e5101..5fca3ee 100644
--- a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx/gstomx.conf
+++ b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx/gstomx.conf
@@ -1,6 +1,6 @@
 [omxh264dec]
 type-name=GstOMXH264Dec
-core-name=/usr/local/lib/libomxr_core.so
+core-name=@RENESAS_DATADIR@/lib/libomxr_core.so
 component-name=OMX.RENESAS.VIDEO.DECODER.H264
 rank=512
 in-port-index=0
@@ -11,7 +11,7 @@ src-template-caps=video/x-raw,format=(string){NV12,I420},width=(int)[1, MAX],hei
 
 [omxaaclcdec]
 type-name=GstOMXAACDec
-core-name=/usr/local/lib/libomxr_core.so
+core-name=@RENESAS_DATADIR@/lib/libomxr_core.so
 component-name=OMX.RENESAS.AUDIO.DECODER.AACLC
 rank=256
 in-port-index=0
@@ -22,7 +22,7 @@ src-template-caps=audio/x-raw,rate=(int)[8000,96000],channels=(int)[1,2],format=
 
 [omxmpeg4videodec]
 type-name=GstOMXMPEG4VideoDec
-core-name=/usr/local/lib/libomxr_core.so
+core-name=@RENESAS_DATADIR@/lib/libomxr_core.so
 component-name=OMX.RENESAS.VIDEO.DECODER.MPEG4
 rank=256
 in-port-index=0
@@ -33,7 +33,7 @@ src-template-caps=video/x-raw,format=(string){NV12,I420},width=(int)[1, MAX],hei
 
 [omxvc1dec]
 type-name=GstOMXWMVDec
-core-name=/usr/local/lib/libomxr_core.so
+core-name=@RENESAS_DATADIR@/lib/libomxr_core.so
 component-name=OMX.RENESAS.VIDEO.DECODER.VC1
 rank=256
 in-port-index=0
@@ -44,7 +44,7 @@ src-template-caps=video/x-raw,format=(string){NV12,I420},width=(int)[1, MAX],hei
 
 [omxh265dec]
 type-name=GstOMXH265Dec
-core-name=/usr/local/lib/libomxr_core.so
+core-name=@RENESAS_DATADIR@/lib/libomxr_core.so
 component-name=OMX.RENESAS.VIDEO.DECODER.H265
 rank=256
 in-port-index=0
@@ -55,7 +55,7 @@ src-template-caps=video/x-raw,format=(string){NV12,I420},width=(int)[1, MAX],hei
 
 [omxaacdec]
 type-name=GstOMXAACDec
-core-name=/usr/local/lib/libomxr_core.so
+core-name=@RENESAS_DATADIR@/lib/libomxr_core.so
 component-name=OMX.RENESAS.AUDIO.DECODER.AAC
 rank=256
 in-port-index=0
@@ -66,7 +66,7 @@ src-template-caps=audio/x-raw,rate=(int)[8000,48000],channels=(int){1,2,6},forma
 
 [omxmp3dec]
 type-name=GstOMXMP3Dec
-core-name=/usr/local/lib/libomxr_core.so
+core-name=@RENESAS_DATADIR@/lib/libomxr_core.so
 component-name=OMX.RENESAS.AUDIO.DECODER.MP3
 rank=256
 in-port-index=0
@@ -77,7 +77,7 @@ src-template-caps=audio/x-raw,rate=(int)[8000,48000],channels=(int){1,2},format=
 
 [omxwmadec]
 type-name=GstOMXWMADec
-core-name=/usr/local/lib/libomxr_core.so
+core-name=@RENESAS_DATADIR@/lib/libomxr_core.so
 component-name=OMX.RENESAS.AUDIO.DECODER.WMA
 rank=256
 in-port-index=0
@@ -88,7 +88,7 @@ src-template-caps=audio/x-raw,rate=(int)[8000,48000],channels=(int){1,2},format=
 
 [omxh264enc]
 type-name=GstOMXH264Enc
-core-name=/usr/local/lib/libomxr_core.so
+core-name=@RENESAS_DATADIR@/lib/libomxr_core.so
 component-name=OMX.RENESAS.VIDEO.ENCODER.H264
 rank=256
 in-port-index=0
@@ -99,7 +99,7 @@ src-template-caps=video/x-h264,stream-format=(string)byte-stream,width=(int)[80,
 
 [omxvp8dec]
 type-name=GstOMXVP8Dec
-core-name=/usr/local/lib/libomxr_core.so
+core-name=@RENESAS_DATADIR@/lib/libomxr_core.so
 component-name=OMX.RENESAS.VIDEO.DECODER.VP8
 rank=256
 in-port-index=0
@@ -110,7 +110,7 @@ src-template-caps=video/x-raw,format=(string){NV12,I420},width=(int)[1, MAX],hei
 
 [omxvp8enc]
 type-name=GstOMXVP8Enc
-core-name=/usr/local/lib/libomxr_core.so
+core-name=@RENESAS_DATADIR@/lib/libomxr_core.so
 component-name=OMX.RENESAS.VIDEO.ENCODER.VP8
 rank=256
 in-port-index=0
@@ -121,7 +121,7 @@ src-template-caps=video/x-vp8,width=(int)[80,1920],height=(int)[80,1080]
 
 [omxvp9dec]
 type-name=GstOMXVP9Dec
-core-name=/usr/local/lib/libomxr_core.so
+core-name=@RENESAS_DATADIR@/lib/libomxr_core.so
 component-name=OMX.RENESAS.VIDEO.DECODER.VP9
 rank=256
 in-port-index=0
diff --git a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.12.2.bbappend b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.12.2.bbappend
index ba983ae..08ecbd5 100644
--- a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.12.2.bbappend
+++ b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.12.2.bbappend
@@ -6,6 +6,8 @@ SRC_URI_append = " \
     file://gstomx.conf \
 "
 
+require include/rcar-gen3-path-common.inc
+
 DEPENDS += "omx-user-module mmngrbuf-user-module"
 
 SRCREV = "6813dedbc9a61ea8a80e54fc373fa07d37114d4a"
@@ -27,6 +29,7 @@ do_configure_prepend() {
     export HTTPS_PROXY=${HTTPS_PROXY}
     cd ${S}
     install -m 0644 ${WORKDIR}/gstomx.conf ${S}/config/rcar/
+    sed -i 's,@RENESAS_DATADIR@,${RENESAS_DATADIR},g' ${S}/config/rcar/gstomx.conf
     ./autogen.sh --noconfigure
     cd ${B}
 }