From e6e92888fbe20bc6cc305a7171fc70811bd82808 Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Sun, 14 Feb 2021 22:32:34 +0100 Subject: Revert "meta-renesas: workaround recipe incompatibilities with YP 3.1.4" Bug-AGL: SPEC-3804 This reverts commit 8b4612385bbf4cdf523c9b731ed73c7887995372. Change-Id: I4a70f1cc57bf2265846b3a208b74c46a786ec622 Signed-off-by: Ronan Le Martret Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26050 Reviewed-by: Harunobu Kurokawa Reviewed-by: Jan-Simon Moeller Tested-by: Jan-Simon Moeller --- .../gstreamer/gstreamer1.0-omx/gstomx.conf | 131 --------------------- .../gstreamer/gstreamer1.0-omx_1.16.%.bbappend | 33 ------ .../gstreamer1.0-plugins-bad_1.16.%.bbappend | 8 -- .../gstreamer1.0-plugins-good_1.16.%.bbappend | 13 -- 4 files changed, 185 deletions(-) delete mode 100644 meta-agl-bsp/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx/gstomx.conf delete mode 100644 meta-agl-bsp/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.16.%.bbappend delete mode 100644 meta-agl-bsp/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.%.bbappend delete mode 100644 meta-agl-bsp/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.%.bbappend (limited to 'meta-agl-bsp/meta-rcar-gen3/recipes-multimedia') diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx/gstomx.conf b/meta-agl-bsp/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx/gstomx.conf deleted file mode 100644 index 5fca3ee89..000000000 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx/gstomx.conf +++ /dev/null @@ -1,131 +0,0 @@ -[omxh264dec] -type-name=GstOMXH264Dec -core-name=@RENESAS_DATADIR@/lib/libomxr_core.so -component-name=OMX.RENESAS.VIDEO.DECODER.H264 -rank=512 -in-port-index=0 -out-port-index=1 -hacks=no-disable-outport;default-pix-aspect-ratio;no-component-reconfigure -sink-template-caps=video/x-h264,alignment=(string)au,stream-format=(string)byte-stream,width=(int)[1, MAX],height=(int)[1, MAX] -src-template-caps=video/x-raw,format=(string){NV12,I420},width=(int)[1, MAX],height=(int)[1, MAX] - -[omxaaclcdec] -type-name=GstOMXAACDec -core-name=@RENESAS_DATADIR@/lib/libomxr_core.so -component-name=OMX.RENESAS.AUDIO.DECODER.AACLC -rank=256 -in-port-index=0 -out-port-index=1 -hacks=no-disable-outport -sink-template-caps=audio/mpeg,mpegversion=(int){2,4},stream-format=(string){raw,adts},rate=(int)[8000,96000],channels=(int)[1,2],framed=(boolean)true -src-template-caps=audio/x-raw,rate=(int)[8000,96000],channels=(int)[1,2],format=(string)S16LE - -[omxmpeg4videodec] -type-name=GstOMXMPEG4VideoDec -core-name=@RENESAS_DATADIR@/lib/libomxr_core.so -component-name=OMX.RENESAS.VIDEO.DECODER.MPEG4 -rank=256 -in-port-index=0 -out-port-index=1 -hacks=no-disable-outport;default-pix-aspect-ratio;no-component-reconfigure -sink-template-caps=video/mpeg,mpegversion=(int)4,systemstream=(boolean)false,parsed=(boolean)true,width=(int)[1, MAX],height=(int)[1, MAX] -src-template-caps=video/x-raw,format=(string){NV12,I420},width=(int)[1, MAX],height=(int)[1, MAX] - -[omxvc1dec] -type-name=GstOMXWMVDec -core-name=@RENESAS_DATADIR@/lib/libomxr_core.so -component-name=OMX.RENESAS.VIDEO.DECODER.VC1 -rank=256 -in-port-index=0 -out-port-index=1 -hacks=no-disable-outport;default-pix-aspect-ratio;no-component-reconfigure -sink-template-caps=video/x-wmv,wmvversion=(int)3,width=(int)[1, MAX],height=(int)[1, MAX] -src-template-caps=video/x-raw,format=(string){NV12,I420},width=(int)[1, MAX],height=(int)[1, MAX] - -[omxh265dec] -type-name=GstOMXH265Dec -core-name=@RENESAS_DATADIR@/lib/libomxr_core.so -component-name=OMX.RENESAS.VIDEO.DECODER.H265 -rank=256 -in-port-index=0 -out-port-index=1 -hacks=no-disable-outport;default-pix-aspect-ratio;no-component-reconfigure -sink-template-caps=video/x-h265,alignment=(string)au,stream-format=(string)byte-stream,width=(int)[1, MAX],height=(int)[1, MAX] -src-template-caps=video/x-raw,format=(string){NV12,I420},width=(int)[1, MAX],height=(int)[1, MAX] - -[omxaacdec] -type-name=GstOMXAACDec -core-name=@RENESAS_DATADIR@/lib/libomxr_core.so -component-name=OMX.RENESAS.AUDIO.DECODER.AAC -rank=256 -in-port-index=0 -out-port-index=1 -hacks=no-disable-outport -sink-template-caps=audio/mpeg,mpegversion=(int){2,4},stream-format=(string){raw,adts},rate=(int)[8000,48000],channels=(int)[1,6],framed=(boolean)true -src-template-caps=audio/x-raw,rate=(int)[8000,48000],channels=(int){1,2,6},format=(string)S16LE - -[omxmp3dec] -type-name=GstOMXMP3Dec -core-name=@RENESAS_DATADIR@/lib/libomxr_core.so -component-name=OMX.RENESAS.AUDIO.DECODER.MP3 -rank=256 -in-port-index=0 -out-port-index=1 -hacks=no-disable-outport -sink-template-caps=audio/mpeg,mpegversion=(int)1,layer=(int)[1,3],mpegaudioversion=(int)[1,3],rate=(int)[8000,48000],channels=(int)[1,2],parsed=(boolean) true -src-template-caps=audio/x-raw,rate=(int)[8000,48000],channels=(int){1,2},format=(string)S16LE - -[omxwmadec] -type-name=GstOMXWMADec -core-name=@RENESAS_DATADIR@/lib/libomxr_core.so -component-name=OMX.RENESAS.AUDIO.DECODER.WMA -rank=256 -in-port-index=0 -out-port-index=1 -hacks=no-disable-outport;skip-handle-codec-data -sink-template-caps=audio/x-wma,wmaversion=(int)2,rate=(int)[8000,48000],channels=(int){1,2},block_align=(int)[0,2147483647],bitrate=(int)[0,2147483647] -src-template-caps=audio/x-raw,rate=(int)[8000,48000],channels=(int){1,2},format=(string)S16LE - -[omxh264enc] -type-name=GstOMXH264Enc -core-name=@RENESAS_DATADIR@/lib/libomxr_core.so -component-name=OMX.RENESAS.VIDEO.ENCODER.H264 -rank=256 -in-port-index=0 -out-port-index=1 -hacks=no-disable-outport;renesas-encmc-stride-align -sink-template-caps=video/x-raw,format=(string){NV12,I420},width=(int)[80,3840],height=(int)[80,2160] -src-template-caps=video/x-h264,stream-format=(string)byte-stream,width=(int)[80,3840],height=(int)[80,2160] - -[omxvp8dec] -type-name=GstOMXVP8Dec -core-name=@RENESAS_DATADIR@/lib/libomxr_core.so -component-name=OMX.RENESAS.VIDEO.DECODER.VP8 -rank=256 -in-port-index=0 -out-port-index=1 -hacks=no-disable-outport;default-pix-aspect-ratio;no-component-reconfigure -sink-template-caps=video/x-vp8,width=(int)[1, MAX],height=(int)[1, MAX] -src-template-caps=video/x-raw,format=(string){NV12,I420},width=(int)[1, MAX],height=(int)[1, MAX] - -[omxvp8enc] -type-name=GstOMXVP8Enc -core-name=@RENESAS_DATADIR@/lib/libomxr_core.so -component-name=OMX.RENESAS.VIDEO.ENCODER.VP8 -rank=256 -in-port-index=0 -out-port-index=1 -hacks=no-disable-outport;renesas-encmc-stride-align -sink-template-caps=video/x-raw,format=(string){NV12,I420},width=(int)[80,1920],height=(int)[80,1080] -src-template-caps=video/x-vp8,width=(int)[80,1920],height=(int)[80,1080] - -[omxvp9dec] -type-name=GstOMXVP9Dec -core-name=@RENESAS_DATADIR@/lib/libomxr_core.so -component-name=OMX.RENESAS.VIDEO.DECODER.VP9 -rank=256 -in-port-index=0 -out-port-index=1 -hacks=no-disable-outport;default-pix-aspect-ratio;no-component-reconfigure -sink-template-caps=video/x-vp9,width=(int)[1, MAX],height=(int)[1, MAX] -src-template-caps=video/x-raw,format=(string){NV12,I420},width=(int)[1, MAX],height=(int)[1, MAX] diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.16.%.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.16.%.bbappend deleted file mode 100644 index 543928ec3..000000000 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.16.%.bbappend +++ /dev/null @@ -1,33 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/:" - -SRC_URI_remove = "http://gstreamer.freedesktop.org/src/gst-omx/gst-omx-${PV}.tar.xz" -SRC_URI_append = " \ - gitsm://github.com/renesas-rcar/gst-omx.git;branch=RCAR-GEN3/1.16.2 \ - file://gstomx.conf \ -" - -require include/rcar-gen3-path-common.inc - -DEPENDS += "omx-user-module mmngrbuf-user-module" - -SRCREV = "d4d1cc35222e8c0cc1b84a3c96a3915e1b0ed199" - -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ - file://omx/gstomx.h;beginline=1;endline=22;md5=e2c6664eda77dc22095adbed9cb6c6e4 \ -" - -S = "${WORKDIR}/git" - -GSTREAMER_1_0_OMX_TARGET = "rcar" -GSTREAMER_1_0_OMX_CORE_NAME = "${libdir}/libomxr_core.so" -EXTRA_OEMESON_append = " -Dheader_path=${STAGING_DIR_TARGET}/usr/local/include" - -do_configure_prepend() { - cd ${S} - install -m 0644 ${WORKDIR}/gstomx.conf ${S}/config/rcar/ - sed -i 's,@RENESAS_DATADIR@,${RENESAS_DATADIR},g' ${S}/config/rcar/gstomx.conf - cd ${B} -} - -RDEPENDS_${PN}_append = " omx-user-module" -RDEPENDS_${PN}_remove = "libomxil" diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.%.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.%.bbappend deleted file mode 100644 index 63df2f408..000000000 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.%.bbappend +++ /dev/null @@ -1,8 +0,0 @@ -SRC_URI_remove = "http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz" -SRC_URI_append = " gitsm://github.com/renesas-rcar/gst-plugins-bad.git;branch=RCAR-GEN3/1.16.2" - -SRCREV = "4459dc7686a2c20ed9097734e11d17631f71105a" - -DEPENDS += "weston" - -S = "${WORKDIR}/git" diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.%.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.%.bbappend deleted file mode 100644 index b6bbf547e..000000000 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.%.bbappend +++ /dev/null @@ -1,13 +0,0 @@ -SRC_URI_remove = "http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz" -SRC_URI_append = " gitsm://github.com/renesas-rcar/gst-plugins-good.git;branch=RCAR-GEN3/1.16.2" - -SRCREV = "72bafddb123541ed1c892a5eb4989591ca4efd49" - -DEPENDS += "mmngrbuf-user-module" - -S = "${WORKDIR}/git" - -EXTRA_OEMESON_append = " \ - -Dcont-frame-capture=true \ - -Dignore-fps-of-video-standard=true \ -" -- cgit 1.2.3-korg