diff options
7 files changed, 0 insertions, 126 deletions
diff --git a/recipes-graphics/omapfbplay/files/0001-omapfbplay-switch-CODEC_TYPE_VIDEO-to-AVMEDIA_TYPE_V.patch b/recipes-graphics/omapfbplay/files/0001-omapfbplay-switch-CODEC_TYPE_VIDEO-to-AVMEDIA_TYPE_V.patch deleted file mode 100644 index e01fddbf..00000000 --- a/recipes-graphics/omapfbplay/files/0001-omapfbplay-switch-CODEC_TYPE_VIDEO-to-AVMEDIA_TYPE_V.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 71670f4a067efc169018a9ec9321ccc9af3bbd59 Mon Sep 17 00:00:00 2001 -From: Roger Monk <r-monk@ti.com> -Date: Thu, 10 May 2012 14:50:11 +0100 -Subject: [PATCH] omapfbplay: switch CODEC_TYPE_VIDEO to AVMEDIA_TYPE_VIDEO - -Signed-off-by: Roger Monk <r-monk@ti.com> ---- - omapfbplay.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/omapfbplay.c b/omapfbplay.c -index ad35bd5..818cf2c 100644 ---- a/omapfbplay.c -+++ b/omapfbplay.c -@@ -74,7 +74,7 @@ find_stream(AVFormatContext *afc) - int i; - - for (i = 0; i < afc->nb_streams; i++) { -- if (afc->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO && !st) -+ if (afc->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO && !st) - st = afc->streams[i]; - else - afc->streams[i]->discard = AVDISCARD_ALL; --- -1.7.0.4 - diff --git a/recipes-graphics/omapfbplay/files/omapfbplay-errorhandling.patch b/recipes-graphics/omapfbplay/files/omapfbplay-errorhandling.patch deleted file mode 100644 index 7dd544f8..00000000 --- a/recipes-graphics/omapfbplay/files/omapfbplay-errorhandling.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e321ae7df57ada9ecc8c155fa4e5511c96ef5db3 Mon Sep 17 00:00:00 2001 -From: Rob Clark <rob@ti.com> -Date: Fri, 18 Mar 2011 12:40:51 -0500 -Subject: [PATCH] dce: differentiate between fatal and non-fatal errors - -For streams with errors, the codec will throw back an error. But not -all errors are fatal. ---- - dce.c | 10 ++++++++-- - 1 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/dce.c b/dce.c -index ab7ad0a..88f175e 100644 ---- a/dce.c -+++ b/dce.c -@@ -270,8 +270,14 @@ static int dce_decode(AVPacket *p) - - err = VIDDEC3_process(codec, inbufs, outbufs, in_args, out_args); - if (err) { -- fprintf(stderr, "VIDDEC3_process() error %d\n", err); -- return -1; -+ fprintf(stderr, "VIDDEC3_process() error %d %08x\n", err, -+ out_args->extendedError); -+ /* for non-fatal errors, keep going.. a non-fatal error could -+ * just indicate an error in the input stream which the codec -+ * was able to conceal -+ */ -+ if (XDM_ISFATALERROR(out_args->extendedError)) -+ return -1; - } - - for (i = 0; i < out_args->outputID[i]; i++) { --- -1.7.1 diff --git a/recipes-graphics/omapfbplay/omapfbplay-cmem_git.bb b/recipes-graphics/omapfbplay/omapfbplay-cmem_git.bb deleted file mode 100644 index a0392f6c..00000000 --- a/recipes-graphics/omapfbplay/omapfbplay-cmem_git.bb +++ /dev/null @@ -1,16 +0,0 @@ -require omapfbplay.inc - -DEPENDS += "ti-linuxutils" - -require recipes-ti/includes/ti-paths.inc - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -SDMA_CFLAGS = " -I${LINUXUTILS_INSTALL_DIR}/packages/ti/sdo/linuxutils/sdma/include/" -CMEM_CFLAGS = " -I${LINUXUTILS_INSTALL_DIR}/packages/ti/sdo/linuxutils/cmem/include/" -CFLAGS += " -I. -I${STAGING_KERNEL_DIR}/include ${SDMA_CFLAGS} ${CMEM_CFLAGS}" - -export SDMA_LIBS = "-L${LINUXUTILS_INSTALL_DIR}/packages/ti/sdo/linuxutils/sdma/lib -l:sdma.a470MV" -export CMEM_LIBS = "-L${LINUXUTILS_INSTALL_DIR}/packages/ti/sdo/linuxutils/cmem/lib -l:cmem.a470MV" - -OMAPFBPLAYOPTS = "V4L2=y OMAPFB=y NETSYNC=y CMEM=y SDMA=y" diff --git a/recipes-graphics/omapfbplay/omapfbplay-dce_git.bb b/recipes-graphics/omapfbplay/omapfbplay-dce_git.bb deleted file mode 100644 index e70ac729..00000000 --- a/recipes-graphics/omapfbplay/omapfbplay-dce_git.bb +++ /dev/null @@ -1,7 +0,0 @@ -require omapfbplay.inc - -DEPENDS += "libdce" - -CFLAGS += " -I. -I${STAGING_INCDIR}/dce -I${STAGING_KERNEL_DIR}/include " - -OMAPFBPLAYOPTS = "V4L2=y OMAPFB=y NETSYNC=y DCE=y" diff --git a/recipes-graphics/omapfbplay/omapfbplay-xv_git.bb b/recipes-graphics/omapfbplay/omapfbplay-xv_git.bb deleted file mode 100644 index cadf6d8e..00000000 --- a/recipes-graphics/omapfbplay/omapfbplay-xv_git.bb +++ /dev/null @@ -1,3 +0,0 @@ -require omapfbplay.inc - -OMAPFBPLAYOPTS = "V4L2=y NETSYNC=y XV=y" diff --git a/recipes-graphics/omapfbplay/omapfbplay.inc b/recipes-graphics/omapfbplay/omapfbplay.inc deleted file mode 100644 index 744eb8f7..00000000 --- a/recipes-graphics/omapfbplay/omapfbplay.inc +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION = "Simple libav-based player that uses the omapfb overlays" -DEPENDS = "bzip2 lame libav virtual/kernel" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://omapfbplay.c;beginline=2;endline=22;md5=05d3789ab362e6f4a9682e98100ea0fa" - -PV = "0.0+${PR}+gitr${SRCREV}" - -SRCREV = "34293052c5a2ae328eac6903512e6b4ce19b5639" -SRC_URI = "git://git.mansr.com/omapfbplay;protocol=git \ - file://omapfbplay-errorhandling.patch \ - file://0001-omapfbplay-switch-CODEC_TYPE_VIDEO-to-AVMEDIA_TYPE_V.patch \ - " - -S = "${WORKDIR}/git" - -PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_HOST ?= "null" -COMPATIBLE_HOST_ti-soc = "(.*)" - -# We want a kernel header for armv7a, but we don't want to make mplayer machine specific for that -STAGING_KERNEL_DIR = "${STAGING_DIR}/${MACHINE_ARCH}${TARGET_VENDOR}-${TARGET_OS}/kernel" -CFLAGS += " -I. -I${STAGING_KERNEL_DIR}/include " - -OMAPFBPLAYVARIANT ?= "${PN}" -OMAPFBPLAYOPTS ?= "V4L2=y NETSYNC=y" - -do_compile() { - cp ${STAGING_KERNEL_DIR}/arch/arm/plat-omap/include/mach/omapfb.h ${S} || true - cp ${STAGING_KERNEL_DIR}/include/asm-arm/arch-omap/omapfb.h ${S} || true - cp ${STAGING_KERNEL_DIR}/include/linux/omapfb.h ${S} || true - oe_runmake ${TARGET_ARCH}=y ${OMAPFBPLAYOPTS} -e -} - -do_install() { - install -d ${D}/${bindir} - install -m 0755 ${S}/omapfbplay ${D}/${bindir}/${OMAPFBPLAYVARIANT} -} diff --git a/recipes-graphics/omapfbplay/omapfbplay_git.bb b/recipes-graphics/omapfbplay/omapfbplay_git.bb deleted file mode 100644 index 0d3956f1..00000000 --- a/recipes-graphics/omapfbplay/omapfbplay_git.bb +++ /dev/null @@ -1,3 +0,0 @@ -require omapfbplay.inc - -OMAPFBPLAYOPTS = "V4L2=y OMAPFB=y NETSYNC=y" |