From 60f6a1f4bebdccf33935f446e4519ab6ad8e6181 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Sun, 5 Jan 2020 13:24:19 +0100 Subject: [PATCH] lib cleanup and sync for mips vu support --- Makefile.am | 14 ++- acinclude.m4 | 36 ++++++-- autogen.sh | 11 ++- common/Makefile.am | 11 ++- common/ca_ci.cpp | 90 +++++++++++++++---- configure.ac | 7 +- include/audio_hal.h | 2 + include/ca_ci.h | 12 ++- include/ca_hal.h | 2 +- include/cs_api.h | 2 +- include/dmx_hal.h | 6 +- include/playback_hal.h | 2 + include/record_hal.h | 2 + include/video_hal.h | 3 + libarmbox/Makefile.am | 2 +- libarmbox/audio.cpp | 2 +- libarmbox/dmx.cpp | 36 ++++++-- libarmbox/hardware_caps.c | 6 +- libarmbox/video.cpp | 2 +- libazbox/video.cpp | 4 +- libdvbci/descrambler.cpp | 2 +- libdvbci/dvbci_ccmgr.cpp | 2 +- {libeplayer3-arm => libeplayer3}/Makefile.am | 8 +- {libeplayer3-arm => libeplayer3}/README.md | 0 .../container/buff_ffmpeg.c | 0 .../container/container.c | 0 .../container/container_ffmpeg.c | 4 +- .../container/flv2mpeg4_ffmpeg.c | 0 .../container/mpeg4p2_ffmpeg.c | 0 .../container/wrapped_ffmpeg.c | 0 .../external/ffmpeg/get_bits.h | 0 .../external/ffmpeg/latmenc.h | 0 .../external/ffmpeg/mathops.h | 0 .../external/ffmpeg/mpeg4audio.h | 0 .../external/ffmpeg/put_bits.h | 0 .../external/ffmpeg/src/bitstream.c | 0 .../external/ffmpeg/src/latmenc.c | 0 .../external/ffmpeg/src/mpeg4audio.c | 0 .../external/flv2mpeg4/doc/COPYING | 0 .../external/flv2mpeg4/doc/CREDITS | 0 .../external/flv2mpeg4/doc/FFMPEG_CREDITS | 0 .../external/flv2mpeg4/doc/FFMPEG_IMPORTS | 0 .../external/flv2mpeg4/doc/INSTALL | 0 .../external/flv2mpeg4/doc/README | 0 .../external/flv2mpeg4/flv2mpeg4.h | 0 .../external/flv2mpeg4/src/bitreader.h | 0 .../external/flv2mpeg4/src/bitwriter.h | 0 .../external/flv2mpeg4/src/dcprediction.c | 0 .../external/flv2mpeg4/src/dcprediction.h | 0 .../external/flv2mpeg4/src/flv.h | 0 .../external/flv2mpeg4/src/flv2mpeg4.c | 0 .../external/flv2mpeg4/src/flvdecoder.c | 0 .../external/flv2mpeg4/src/m4v.h | 0 .../external/flv2mpeg4/src/m4vencode.c | 0 .../external/flv2mpeg4/src/m4vencode.h | 0 .../external/flv2mpeg4/src/m4vencode_tables.h | 0 .../external/flv2mpeg4/src/type.h | 0 .../include/aac.h | 0 .../include/bcm_ioctls.h | 0 .../include/common.h | 0 .../include/container.h | 0 .../include/debug.h | 0 .../include/ffmpeg_metadata.h | 0 .../include/manager.h | 0 .../include/misc.h | 0 .../include/output.h | 0 .../include/pcm.h | 0 .../include/pes.h | 0 .../include/playback.h | 0 .../include/stm_ioctls.h | 0 .../include/writer.h | 0 .../main/exteplayer.c | 1 + .../manager/audio.c | 0 .../manager/chapter.c | 0 .../manager/manager.c | 0 .../manager/subtitle.c | 0 .../manager/video.c | 0 .../output/linuxdvb_buffering.c | 0 .../output/linuxdvb_fake.c | 0 .../output/linuxdvb_mipsel.c | 0 .../output/linuxdvb_sh4.c | 0 .../output/output.c | 0 .../output/output_subtitle.c | 0 .../output/writer/common/misc.c | 0 .../output/writer/common/pes.c | 0 .../output/writer/common/writer.c | 0 .../output/writer/mipsel/aac.c | 0 .../output/writer/mipsel/ac3.c | 0 .../output/writer/mipsel/amr.c | 0 .../output/writer/mipsel/divx3.c | 0 .../output/writer/mipsel/dts.c | 0 .../output/writer/mipsel/h264.c | 0 .../output/writer/mipsel/h265.c | 0 .../output/writer/mipsel/lpcm.c | 0 .../output/writer/mipsel/mjpeg.c | 1 + .../output/writer/mipsel/mp3.c | 0 .../output/writer/mipsel/mpeg2.c | 0 .../output/writer/mipsel/mpeg4.c | 0 .../output/writer/mipsel/pcm.c | 0 .../output/writer/mipsel/vc1.c | 0 .../output/writer/mipsel/vp.c | 0 .../output/writer/mipsel/wma.c | 0 .../output/writer/mipsel/wmv.c | 0 .../output/writer/mipsel/writer.c | 0 .../output/writer/sh4/aac.c | 0 .../output/writer/sh4/ac3.c | 0 .../output/writer/sh4/divx.c | 0 .../output/writer/sh4/divx2.c | 0 .../output/writer/sh4/dts.c | 0 .../output/writer/sh4/h263.c | 0 .../output/writer/sh4/h264.c | 0 .../output/writer/sh4/mp3.c | 0 .../output/writer/sh4/mpeg2.c | 0 .../output/writer/sh4/pcm.c | 0 .../output/writer/sh4/pes.c | 0 .../output/writer/sh4/vc1.c | 0 .../output/writer/sh4/vorbis.c | 0 .../output/writer/sh4/wma.c | 0 .../output/writer/sh4/wmv.c | 0 .../output/writer/sh4/writer.c | 0 .../playback/playback.c | 0 libmipsbox/Makefile.am | 35 ++++++++ libmipsbox/audio.cpp | 1 + libmipsbox/audio_lib.h | 1 + libmipsbox/dmx.cpp | 1 + libmipsbox/hardware_caps.c | 50 +++++++++++ libmipsbox/hdmi_cec.cpp | 1 + libmipsbox/hdmi_cec.h | 1 + libmipsbox/hdmi_cec_types.h | 1 + libmipsbox/init.cpp | 1 + libmipsbox/linux-uapi-cec.h | 1 + libmipsbox/playback_libeplayer3.cpp | 1 + libmipsbox/playback_libeplayer3.h | 1 + libmipsbox/record.cpp | 1 + libmipsbox/record_lib.h | 1 + libmipsbox/video.cpp | 1 + libmipsbox/video_lib.h | 1 + 137 files changed, 311 insertions(+), 58 deletions(-) rename {libeplayer3-arm => libeplayer3}/Makefile.am (90%) rename {libeplayer3-arm => libeplayer3}/README.md (100%) rename {libeplayer3-arm => libeplayer3}/container/buff_ffmpeg.c (100%) rename {libeplayer3-arm => libeplayer3}/container/container.c (100%) rename {libeplayer3-arm => libeplayer3}/container/container_ffmpeg.c (99%) rename {libeplayer3-arm => libeplayer3}/container/flv2mpeg4_ffmpeg.c (100%) rename {libeplayer3-arm => libeplayer3}/container/mpeg4p2_ffmpeg.c (100%) rename {libeplayer3-arm => libeplayer3}/container/wrapped_ffmpeg.c (100%) rename {libeplayer3-arm => libeplayer3}/external/ffmpeg/get_bits.h (100%) rename {libeplayer3-arm => libeplayer3}/external/ffmpeg/latmenc.h (100%) rename {libeplayer3-arm => libeplayer3}/external/ffmpeg/mathops.h (100%) rename {libeplayer3-arm => libeplayer3}/external/ffmpeg/mpeg4audio.h (100%) rename {libeplayer3-arm => libeplayer3}/external/ffmpeg/put_bits.h (100%) rename {libeplayer3-arm => libeplayer3}/external/ffmpeg/src/bitstream.c (100%) rename {libeplayer3-arm => libeplayer3}/external/ffmpeg/src/latmenc.c (100%) rename {libeplayer3-arm => libeplayer3}/external/ffmpeg/src/mpeg4audio.c (100%) rename {libeplayer3-arm => libeplayer3}/external/flv2mpeg4/doc/COPYING (100%) rename {libeplayer3-arm => libeplayer3}/external/flv2mpeg4/doc/CREDITS (100%) rename {libeplayer3-arm => libeplayer3}/external/flv2mpeg4/doc/FFMPEG_CREDITS (100%) rename {libeplayer3-arm => libeplayer3}/external/flv2mpeg4/doc/FFMPEG_IMPORTS (100%) rename {libeplayer3-arm => libeplayer3}/external/flv2mpeg4/doc/INSTALL (100%) rename {libeplayer3-arm => libeplayer3}/external/flv2mpeg4/doc/README (100%) rename {libeplayer3-arm => libeplayer3}/external/flv2mpeg4/flv2mpeg4.h (100%) rename {libeplayer3-arm => libeplayer3}/external/flv2mpeg4/src/bitreader.h (100%) rename {libeplayer3-arm => libeplayer3}/external/flv2mpeg4/src/bitwriter.h (100%) rename {libeplayer3-arm => libeplayer3}/external/flv2mpeg4/src/dcprediction.c (100%) rename {libeplayer3-arm => libeplayer3}/external/flv2mpeg4/src/dcprediction.h (100%) rename {libeplayer3-arm => libeplayer3}/external/flv2mpeg4/src/flv.h (100%) rename {libeplayer3-arm => libeplayer3}/external/flv2mpeg4/src/flv2mpeg4.c (100%) rename {libeplayer3-arm => libeplayer3}/external/flv2mpeg4/src/flvdecoder.c (100%) rename {libeplayer3-arm => libeplayer3}/external/flv2mpeg4/src/m4v.h (100%) rename {libeplayer3-arm => libeplayer3}/external/flv2mpeg4/src/m4vencode.c (100%) rename {libeplayer3-arm => libeplayer3}/external/flv2mpeg4/src/m4vencode.h (100%) rename {libeplayer3-arm => libeplayer3}/external/flv2mpeg4/src/m4vencode_tables.h (100%) rename {libeplayer3-arm => libeplayer3}/external/flv2mpeg4/src/type.h (100%) rename {libeplayer3-arm => libeplayer3}/include/aac.h (100%) rename {libeplayer3-arm => libeplayer3}/include/bcm_ioctls.h (100%) rename {libeplayer3-arm => libeplayer3}/include/common.h (100%) rename {libeplayer3-arm => libeplayer3}/include/container.h (100%) rename {libeplayer3-arm => libeplayer3}/include/debug.h (100%) rename {libeplayer3-arm => libeplayer3}/include/ffmpeg_metadata.h (100%) rename {libeplayer3-arm => libeplayer3}/include/manager.h (100%) rename {libeplayer3-arm => libeplayer3}/include/misc.h (100%) rename {libeplayer3-arm => libeplayer3}/include/output.h (100%) rename {libeplayer3-arm => libeplayer3}/include/pcm.h (100%) rename {libeplayer3-arm => libeplayer3}/include/pes.h (100%) rename {libeplayer3-arm => libeplayer3}/include/playback.h (100%) rename {libeplayer3-arm => libeplayer3}/include/stm_ioctls.h (100%) rename {libeplayer3-arm => libeplayer3}/include/writer.h (100%) rename {libeplayer3-arm => libeplayer3}/main/exteplayer.c (99%) rename {libeplayer3-arm => libeplayer3}/manager/audio.c (100%) rename {libeplayer3-arm => libeplayer3}/manager/chapter.c (100%) rename {libeplayer3-arm => libeplayer3}/manager/manager.c (100%) rename {libeplayer3-arm => libeplayer3}/manager/subtitle.c (100%) rename {libeplayer3-arm => libeplayer3}/manager/video.c (100%) rename {libeplayer3-arm => libeplayer3}/output/linuxdvb_buffering.c (100%) rename {libeplayer3-arm => libeplayer3}/output/linuxdvb_fake.c (100%) rename {libeplayer3-arm => libeplayer3}/output/linuxdvb_mipsel.c (100%) rename {libeplayer3-arm => libeplayer3}/output/linuxdvb_sh4.c (100%) rename {libeplayer3-arm => libeplayer3}/output/output.c (100%) rename {libeplayer3-arm => libeplayer3}/output/output_subtitle.c (100%) rename {libeplayer3-arm => libeplayer3}/output/writer/common/misc.c (100%) rename {libeplayer3-arm => libeplayer3}/output/writer/common/pes.c (100%) rename {libeplayer3-arm => libeplayer3}/output/writer/common/writer.c (100%) rename {libeplayer3-arm => libeplayer3}/output/writer/mipsel/aac.c (100%) rename {libeplayer3-arm => libeplayer3}/output/writer/mipsel/ac3.c (100%) rename {libeplayer3-arm => libeplayer3}/output/writer/mipsel/amr.c (100%) rename {libeplayer3-arm => libeplayer3}/output/writer/mipsel/divx3.c (100%) rename {libeplayer3-arm => libeplayer3}/output/writer/mipsel/dts.c (100%) rename {libeplayer3-arm => libeplayer3}/output/writer/mipsel/h264.c (100%) rename {libeplayer3-arm => libeplayer3}/output/writer/mipsel/h265.c (100%) rename {libeplayer3-arm => libeplayer3}/output/writer/mipsel/lpcm.c (100%) rename {libeplayer3-arm => libeplayer3}/output/writer/mipsel/mjpeg.c (99%) rename {libeplayer3-arm => libeplayer3}/output/writer/mipsel/mp3.c (100%) rename {libeplayer3-arm => libeplayer3}/output/writer/mipsel/mpeg2.c (100%) rename {libeplayer3-arm => libeplayer3}/output/writer/mipsel/mpeg4.c (100%) rename {libeplayer3-arm => libeplayer3}/output/writer/mipsel/pcm.c (100%) rename {libeplayer3-arm => libeplayer3}/output/writer/mipsel/vc1.c (100%) rename {libeplayer3-arm => libeplayer3}/output/writer/mipsel/vp.c (100%) rename {libeplayer3-arm => libeplayer3}/output/writer/mipsel/wma.c (100%) rename {libeplayer3-arm => libeplayer3}/output/writer/mipsel/wmv.c (100%) rename {libeplayer3-arm => libeplayer3}/output/writer/mipsel/writer.c (100%) rename {libeplayer3-arm => libeplayer3}/output/writer/sh4/aac.c (100%) rename {libeplayer3-arm => libeplayer3}/output/writer/sh4/ac3.c (100%) rename {libeplayer3-arm => libeplayer3}/output/writer/sh4/divx.c (100%) rename {libeplayer3-arm => libeplayer3}/output/writer/sh4/divx2.c (100%) rename {libeplayer3-arm => libeplayer3}/output/writer/sh4/dts.c (100%) rename {libeplayer3-arm => libeplayer3}/output/writer/sh4/h263.c (100%) rename {libeplayer3-arm => libeplayer3}/output/writer/sh4/h264.c (100%) rename {libeplayer3-arm => libeplayer3}/output/writer/sh4/mp3.c (100%) rename {libeplayer3-arm => libeplayer3}/output/writer/sh4/mpeg2.c (100%) rename {libeplayer3-arm => libeplayer3}/output/writer/sh4/pcm.c (100%) rename {libeplayer3-arm => libeplayer3}/output/writer/sh4/pes.c (100%) rename {libeplayer3-arm => libeplayer3}/output/writer/sh4/vc1.c (100%) rename {libeplayer3-arm => libeplayer3}/output/writer/sh4/vorbis.c (100%) rename {libeplayer3-arm => libeplayer3}/output/writer/sh4/wma.c (100%) rename {libeplayer3-arm => libeplayer3}/output/writer/sh4/wmv.c (100%) rename {libeplayer3-arm => libeplayer3}/output/writer/sh4/writer.c (100%) rename {libeplayer3-arm => libeplayer3}/playback/playback.c (100%) create mode 100644 libmipsbox/Makefile.am create mode 120000 libmipsbox/audio.cpp create mode 120000 libmipsbox/audio_lib.h create mode 120000 libmipsbox/dmx.cpp create mode 100644 libmipsbox/hardware_caps.c create mode 120000 libmipsbox/hdmi_cec.cpp create mode 120000 libmipsbox/hdmi_cec.h create mode 120000 libmipsbox/hdmi_cec_types.h create mode 120000 libmipsbox/init.cpp create mode 120000 libmipsbox/linux-uapi-cec.h create mode 120000 libmipsbox/playback_libeplayer3.cpp create mode 120000 libmipsbox/playback_libeplayer3.h create mode 120000 libmipsbox/record.cpp create mode 120000 libmipsbox/record_lib.h create mode 120000 libmipsbox/video.cpp create mode 120000 libmipsbox/video_lib.h diff --git a/Makefile.am b/Makefile.am index 41084be..3519962 100644 --- a/Makefile.am +++ b/Makefile.am @@ -65,9 +65,19 @@ libstb_hal_la_LIBADD += \ libarmbox/libarmbox.la \ libdvbci/libdvbci.la if !ENABLE_GSTREAMER_10 -SUBDIRS += libeplayer3-arm +SUBDIRS += libeplayer3 libstb_hal_la_LIBADD += \ - libeplayer3-arm/libeplayer3_arm.la + libeplayer3/libeplayer3.la endif endif endif + +if BOXTYPE_MIPSBOX +SUBDIRS += libmipsbox libdvbci +libstb_hal_la_LIBADD += \ + libmipsbox/libmipsbox.la \ + libdvbci/libdvbci.la +SUBDIRS += libeplayer3 +libstb_hal_la_LIBADD += \ + libeplayer3/libeplayer3.la +endif diff --git a/acinclude.m4 b/acinclude.m4 index 4ea828b..1a7a4db 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -284,17 +284,41 @@ elif test "$BOXMODEL" = "vusolo4k"; then AC_DEFINE(BOXMODEL_VUSOLO4K, 1, [vusolo4k]) elif test "$BOXMODEL" = "vuduo4k"; then AC_DEFINE(BOXMODEL_VUDUO4K, 1, [vuduo4k]) +elif test "$BOXMODEL" = "vuultimo4k"; then + AC_DEFINE(BOXMODEL_VUULTIMO4K, 1, [vuultimo4k]) +elif test "$BOXMODEL" = "vuuno4k"; then + AC_DEFINE(BOXMODEL_VUUNO4K, 1, [vuuno4k]) +elif test "$BOXMODEL" = "vuuno4kse"; then + AC_DEFINE(BOXMODEL_VUUNO4KSE, 1, [vuuno4kse]) elif test "$BOXMODEL" = "vuzero4k"; then AC_DEFINE(BOXMODEL_VUZERO4K, 1, [vuzero4k]) elif test "$BOXMODEL" = "vuduo"; then AC_DEFINE(BOXMODEL_VUDUO, 1, [vuduo]) -elif test "$BOXMODEL" = "h7"; then - AC_DEFINE(BOXMODEL_H7, 1, [h7]) -elif test "$BOXMODEL" = "generic"; then - AC_DEFINE(BOXMODEL_GENERIC, 1, [generic pc]) -elif test "$BOXMODEL" = "raspi"; then - AC_DEFINE(BOXMODEL_RASPI, 1, [raspberry pi]) fi + +# all vuplus BOXMODELs +case "$BOXMODEL" in + vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|vuduo) + AC_DEFINE(BOXMODEL_VUPLUS, 1, [vuplus]) + vuplus=true + ;; + *) + vuplus=false + ;; +esac +AM_CONDITIONAL(BOXMODEL_VUPLUS, test "$vuplus" = "true") + +# all vuplus4k BOXMODELs +case "$BOXMODEL" in + vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k) + AC_DEFINE(BOXMODEL_VUPLUS4K, 1, [vuplus4k]) + vuplus4k=true + ;; + *) + vuplus4k=false + ;; +esac +AM_CONDITIONAL(BOXMODEL_VUPLUS4K, test "$vuplus4k" = "true") ]) dnl backward compatiblity diff --git a/autogen.sh b/autogen.sh index 97752be..ea93f30 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,6 +1,13 @@ -#!/bin/bash +#!/bin/sh + +package="ni-libstb-hal" + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +cd "$srcdir" +echo "Generating configuration files for $package, please wait ..." -cd $(dirname $0) aclocal --force libtoolize --force autoconf --force diff --git a/common/Makefile.am b/common/Makefile.am index cb932ea..33c23e4 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -17,6 +17,15 @@ AM_CXXFLAGS += \ -I $(top_srcdir)/libdvbci endif +if BOXTYPE_MIPSBOX +AM_CXXFLAGS += \ + -I $(top_srcdir)/libdvbci +endif + +if BOXTYPE_MIPSBOX +libcommon_la_SOURCES = \ + ca_ci.cpp +else if BOXTYPE_DUCKBOX libcommon_la_SOURCES = \ ca_ci.cpp @@ -33,7 +42,7 @@ else libcommon_la_SOURCES = \ ca.cpp endif - +endif endif libcommon_la_SOURCES += \ diff --git a/common/ca_ci.cpp b/common/ca_ci.cpp index 6ee5f16..1c5a4a1 100644 --- a/common/ca_ci.cpp +++ b/common/ca_ci.cpp @@ -41,7 +41,7 @@ static const char * FILENAME = "[ca_ci]"; const char ci_path[] = "/dev/dvb/adapter0/ci%d"; ca_slot_info_t info; #endif -#if HAVE_ARM_HARDWARE +#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE const char ci_path[] = "/dev/ci%d"; static int last_source = -1; #endif @@ -234,7 +234,7 @@ static bool transmitData(eDVBCISlot* slot, unsigned char* d, int len) { printf("%s -> %s len(%d)\n", FILENAME, __func__, len); -#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUZERO4K +#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUZERO4K #if y_debug for (int i = 0; i < len; i++) printf("%02x ", d[i]); @@ -263,7 +263,7 @@ static bool transmitData(eDVBCISlot* slot, unsigned char* d, int len) //send some data on an fd, for a special slot and connection_id eData sendData(eDVBCISlot* slot, unsigned char* data, int len) { -#if HAVE_ARM_HARDWARE +#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE unsigned char *d = (unsigned char*) malloc(len); memcpy(d, data, len); transmitData(slot, d, len); @@ -878,7 +878,7 @@ bool cCA::SendCAPMT(u64 tpid, u8 source, u8 camask, const unsigned char * cabuf, (*It)->SID[0] = SID; (*It)->ci_use_count = 1; (*It)->TP = TP; -#if HAVE_ARM_HARDWARE +#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE if(!checkLiveSlot && mode && (*It)->source != source) setInputSource((eDVBCISlot*)(*It), false); #endif @@ -889,7 +889,7 @@ bool cCA::SendCAPMT(u64 tpid, u8 source, u8 camask, const unsigned char * cabuf, (*It)->newCapmt = true; } -#if HAVE_ARM_HARDWARE +#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE if ((*It)->newCapmt) extractPids((eDVBCISlot*)(*It)); #endif @@ -917,7 +917,7 @@ bool cCA::SendCAPMT(u64 tpid, u8 source, u8 camask, const unsigned char * cabuf, } else { -#if HAVE_ARM_HARDWARE +#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE std::list::iterator it; recordUse_found = false; for (it = slot_data.begin(); it != slot_data.end(); ++it) @@ -958,7 +958,7 @@ bool cCA::SendCAPMT(u64 tpid, u8 source, u8 camask, const unsigned char * cabuf, return true; } -#if HAVE_ARM_HARDWARE +#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE void cCA::extractPids(eDVBCISlot* slot) { u32 prg_info_len; @@ -1017,7 +1017,7 @@ void cCA::setSource(eDVBCISlot* slot) case TUNER_D: fprintf(ci, "D"); break; -#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K +#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K case TUNER_E: fprintf(ci, "E"); break; @@ -1054,13 +1054,39 @@ void cCA::setSource(eDVBCISlot* slot) case TUNER_P: fprintf(ci, "P"); break; +#if BOXMODEL_VUULTIMO4K + case TUNER_Q: + fprintf(ci, "Q"); + break; + case TUNER_R: + fprintf(ci, "R"); + break; + case TUNER_S: + fprintf(ci, "S"); + break; + case TUNER_T: + fprintf(ci, "T"); + break; + case TUNER_U: + fprintf(ci, "U"); + break; + case TUNER_V: + fprintf(ci, "V"); + break; + case TUNER_W: + fprintf(ci, "W"); + break; + case TUNER_X: + fprintf(ci, "X"); + break; +#endif #endif } fclose(ci); } } -#if HAVE_ARM_HARDWARE +#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE static std::string getTunerLetter(int number) { return std::string(1, char(65 + number)); } void cCA::setInputs() @@ -1069,10 +1095,14 @@ void cCA::setInputs() char choices[64]; FILE * fd = 0; -#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K +#if BOXMODEL_VUULTIMO4K + for (int number = 0; number < 24; number++) // tuner A to X, input 0 to 23 +#else +#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUUNO4KSE for (int number = 0; number < 16; number++) // tuner A to P, input 0 to 15 #else for (int number = 0; number < 4; number++) // tuner A to D, input 0 to 3 +#endif #endif { snprintf(choices, 64, "/proc/stb/tsmux/input%d_choices", number); @@ -1134,7 +1164,7 @@ void cCA::setInputSource(eDVBCISlot* slot, bool ci) case TUNER_D: fprintf(input, "D"); break; -#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K +#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K case TUNER_E: fprintf(input, "E"); break; @@ -1171,6 +1201,32 @@ void cCA::setInputSource(eDVBCISlot* slot, bool ci) case TUNER_P: fprintf(input, "P"); break; +#if BOXMODEL_VUULTIMO4K + case TUNER_Q: + fprintf(input, "Q"); + break; + case TUNER_R: + fprintf(input, "R"); + break; + case TUNER_S: + fprintf(input, "S"); + break; + case TUNER_T: + fprintf(input, "T"); + break; + case TUNER_U: + fprintf(input, "U"); + break; + case TUNER_V: + fprintf(input, "V"); + break; + case TUNER_W: + fprintf(input, "W"); + break; + case TUNER_X: + fprintf(input, "X"); + break; +#endif #endif } } @@ -1184,7 +1240,7 @@ cCA::cCA(int Slots) printf("%s -> %s %d\n", FILENAME, __func__, Slots); num_slots = Slots; -#if HAVE_ARM_HARDWARE +#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE setInputs(); #endif @@ -1280,7 +1336,7 @@ void cCA::ModuleReset(enum CA_SLOT_TYPE, uint32_t slot) { (*it)->status = eStatusReset; usleep(200000); -#if HAVE_ARM_HARDWARE +#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE last_source = (int)(*it)->source; setInputSource((eDVBCISlot*)(*it), false); #endif @@ -1373,7 +1429,7 @@ void cCA::ci_inserted(eDVBCISlot* slot) void cCA::ci_removed(eDVBCISlot* slot) { printf("cam (%d) status changed ->cam now _not_ present\n", slot->slot); -#if HAVE_ARM_HARDWARE +#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE last_source = (int)slot->source; setInputSource(slot, false); #endif @@ -1444,7 +1500,7 @@ void cCA::slot_pollthread(void *c) while (1) { -#if HAVE_ARM_HARDWARE /* Armbox */ +#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE /* Armbox/Mipsbox */ int len = 1024 *4; eData status; @@ -1685,7 +1741,7 @@ FROM_FIRST: break; } /* switch(slot->status) */ #endif /* end Duckbox */ -#if HAVE_ARM_HARDWARE +#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE if (!slot->init && slot->camIsReady && last_source > -1) { slot->source = (u8)last_source; @@ -1740,7 +1796,7 @@ bool cCA::SendCaPMT(eDVBCISlot* slot) printf("%s -> %s\n", FILENAME, __func__); if (slot->fd > 0) { -#if HAVE_ARM_HARDWARE +#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE setInputSource(slot, true); #endif setSource(slot); diff --git a/configure.ac b/configure.ac index 13b0364..5cf7560 100644 --- a/configure.ac +++ b/configure.ac @@ -95,22 +95,23 @@ if test x$BOXTYPE = xgeneric -a x$BOXMODEL != xraspi; then fi AC_ARG_ENABLE(flv2mpeg4, - AS_HELP_STRING(--enable-flv2mpeg4, use flv2mpeg4 libeplayer3-arm), + AS_HELP_STRING(--enable-flv2mpeg4, use flv2mpeg4 libeplayer3), ,[enable_flv2mpeg4=no]) AM_CONDITIONAL(ENABLE_FLV2MPEG4, test "$enable_flv2mpeg4" = "yes") if test "$enable_flv2mpeg4" = "yes"; then - AC_DEFINE(ENABLE_FLV2MPEG4, 1, [use flv2mpeg4 libeplayer3-arm]) + AC_DEFINE(ENABLE_FLV2MPEG4, 1, [use flv2mpeg4 libeplayer3]) fi AC_CONFIG_FILES([ Makefile common/Makefile +libmipsbox/Makefile libarmbox/Makefile libazbox/Makefile libduckbox/Makefile libdvbci/Makefile -libeplayer3-arm/Makefile +libeplayer3/Makefile libeplayer3-sh4/Makefile libgeneric-pc/Makefile libraspi/Makefile diff --git a/include/audio_hal.h b/include/audio_hal.h index ed0a8b3..c2fc55b 100644 --- a/include/audio_hal.h +++ b/include/audio_hal.h @@ -9,6 +9,8 @@ #include "../libspark/audio_mixer.h" #elif HAVE_ARM_HARDWARE #include "../libarmbox/audio_lib.h" +#elif HAVE_MIPS_HARDWARE +#include "../libmipsbox/audio_lib.h" #elif HAVE_AZBOX_HARDWARE #include "../libazbox/audio_lib.h" #elif HAVE_GENERIC_HARDWARE diff --git a/include/ca_ci.h b/include/ca_ci.h index 4fc90c6..e47dd8d 100644 --- a/include/ca_ci.h +++ b/include/ca_ci.h @@ -127,7 +127,7 @@ typedef enum { TUNER_B, TUNER_C, TUNER_D -#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K +#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K , TUNER_E , TUNER_F , TUNER_G @@ -140,6 +140,16 @@ typedef enum { , TUNER_N , TUNER_O , TUNER_P +#if BOXMODEL_VUULTIMO4K + , TUNER_Q + , TUNER_R + , TUNER_S + , TUNER_T + , TUNER_U + , TUNER_V + , TUNER_W + , TUNER_X +#endif #endif } source_t; diff --git a/include/ca_hal.h b/include/ca_hal.h index eb4ce36..856d99a 100644 --- a/include/ca_hal.h +++ b/include/ca_hal.h @@ -1,4 +1,4 @@ -#if HAVE_DUCKBOX_HARDWARE || (HAVE_ARM_HARDWARE && !BOXMODEL_HD60) +#if HAVE_DUCKBOX_HARDWARE || (HAVE_ARM_HARDWARE && !BOXMODEL_HD60) || HAVE_MIPS_HARDWARE #include "ca_ci.h" #else #include "ca.h" diff --git a/include/cs_api.h b/include/cs_api.h index 42fff37..bfce94c 100644 --- a/include/cs_api.h +++ b/include/cs_api.h @@ -23,7 +23,7 @@ inline void cs_api_exit() #define cs_free_uncached free // Callback function helpers -#if HAVE_DUCKBOX_HARDWARE || (HAVE_ARM_HARDWARE && !BOXMODEL_HD60) +#if HAVE_DUCKBOX_HARDWARE || (HAVE_ARM_HARDWARE && !BOXMODEL_HD60) || HAVE_MIPS_HARDWARE void cs_register_messenger(cs_messenger messenger); #else static inline void cs_register_messenger(cs_messenger) { return; }; diff --git a/include/dmx_hal.h b/include/dmx_hal.h index e9ad643..a68051c 100644 --- a/include/dmx_hal.h +++ b/include/dmx_hal.h @@ -37,11 +37,15 @@ extern "C" { #include -#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K +#if BOXMODEL_VUULTIMO4K +#define MAX_DMX_UNITS 24 +#else +#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K #define MAX_DMX_UNITS 16 #else #define MAX_DMX_UNITS 4 #endif +#endif typedef enum { diff --git a/include/playback_hal.h b/include/playback_hal.h index 9827e06..9e98392 100644 --- a/include/playback_hal.h +++ b/include/playback_hal.h @@ -15,6 +15,8 @@ #include "../libarmbox/playback_libeplayer3.h" #endif #endif +#elif HAVE_MIPS_HARDWARE +#include "../libmipsbox/playback_libeplayer3.h" #elif HAVE_AZBOX_HARDWARE #include "../libazbox/playback_lib.h" #elif HAVE_GENERIC_HARDWARE diff --git a/include/record_hal.h b/include/record_hal.h index 6225730..c0efc3f 100644 --- a/include/record_hal.h +++ b/include/record_hal.h @@ -7,6 +7,8 @@ #include "../libspark/record_lib.h" #elif HAVE_ARM_HARDWARE #include "../libarmbox/record_lib.h" +#elif HAVE_MIPS_HARDWARE +#include "../libmipsbox/record_lib.h" #elif HAVE_AZBOX_HARDWARE #include "../libazbox/record_lib.h" #elif HAVE_GENERIC_HARDWARE diff --git a/include/video_hal.h b/include/video_hal.h index 1ff401a..448b800 100644 --- a/include/video_hal.h +++ b/include/video_hal.h @@ -8,6 +8,9 @@ #elif HAVE_ARM_HARDWARE #include "../libarmbox/video_lib.h" #include "../libarmbox/hdmi_cec.h" +#elif HAVE_MIPS_HARDWARE +#include "../libmipsbox/video_lib.h" +#include "../libmipsbox/hdmi_cec.h" #elif HAVE_AZBOX_HARDWARE #include "../libazbox/video_lib.h" #elif HAVE_GENERIC_HARDWARE diff --git a/libarmbox/Makefile.am b/libarmbox/Makefile.am index 2143a42..a16e9cd 100644 --- a/libarmbox/Makefile.am +++ b/libarmbox/Makefile.am @@ -40,7 +40,7 @@ libarmbox_la_SOURCES += \ playback_libeplayer3.cpp AM_CPPFLAGS += \ - -I$(top_srcdir)/libeplayer3-arm/include + -I$(top_srcdir)/libeplayer3/include endif AM_LDFLAGS += \ diff --git a/libarmbox/audio.cpp b/libarmbox/audio.cpp index 196a03c..91408ce 100644 --- a/libarmbox/audio.cpp +++ b/libarmbox/audio.cpp @@ -343,7 +343,7 @@ int cAudio::StopClip() hal_info("%s: clipfd not yet opened\n", __FUNCTION__); return -1; } -#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUZERO4K +#if BOXMODEL_VUPLUS4K ioctl(clipfd, SNDCTL_DSP_RESET); #endif close(clipfd); diff --git a/libarmbox/dmx.cpp b/libarmbox/dmx.cpp index a4c00bb..cceb90c 100644 --- a/libarmbox/dmx.cpp +++ b/libarmbox/dmx.cpp @@ -71,24 +71,36 @@ static const char *DMX_T[] = { /* this is the number of different cDemux() units, not the number of * /dev/dvb/.../demuxX devices! */ -#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K +#if BOXMODEL_VUULTIMO4K +#define NUM_DEMUX 24 +#else +#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K #define NUM_DEMUX 16 #else #define NUM_DEMUX 4 #endif +#endif /* the current source of each cDemux unit */ -#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K +#if BOXMODEL_VUULTIMO4K +static int dmx_source[NUM_DEMUX] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; +#else +#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K static int dmx_source[NUM_DEMUX] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; #else static int dmx_source[NUM_DEMUX] = { 0, 0, 0, 0 }; #endif +#endif /* map the device numbers. */ -#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K +#if BOXMODEL_VUULTIMO4K +#define NUM_DEMUXDEV 24 +#else +#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K #define NUM_DEMUXDEV 16 #else #define NUM_DEMUXDEV 8 #endif +#endif static const char *devname[NUM_DEMUXDEV] = { "/dev/dvb/adapter0/demux0", "/dev/dvb/adapter0/demux1", @@ -98,7 +110,7 @@ static const char *devname[NUM_DEMUXDEV] = { "/dev/dvb/adapter0/demux5", "/dev/dvb/adapter0/demux6", "/dev/dvb/adapter0/demux7" -#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K +#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K , "/dev/dvb/adapter0/demux8" , "/dev/dvb/adapter0/demux9" , "/dev/dvb/adapter0/demux10" @@ -107,14 +119,28 @@ static const char *devname[NUM_DEMUXDEV] = { , "/dev/dvb/adapter0/demux13" , "/dev/dvb/adapter0/demux14" , "/dev/dvb/adapter0/demux15" +#if BOXMODEL_VUULTIMO4K + , "/dev/dvb/adapter0/demux16" + , "/dev/dvb/adapter0/demux17" + , "/dev/dvb/adapter0/demux18" + , "/dev/dvb/adapter0/demux19" + , "/dev/dvb/adapter0/demux20" + , "/dev/dvb/adapter0/demux21" + , "/dev/dvb/adapter0/demux22" + , "/dev/dvb/adapter0/demux23" +#endif #endif }; /* did we already DMX_SET_SOURCE on that demux device? */ -#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K +#if BOXMODEL_VUULTIMO4K +static bool init[NUM_DEMUXDEV] = { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false }; +#else +#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K static bool init[NUM_DEMUXDEV] = { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false }; #else static bool init[NUM_DEMUXDEV] = { false, false, false, false, false, false, false, false }; #endif +#endif typedef struct dmx_pdata { int last_source; diff --git a/libarmbox/hardware_caps.c b/libarmbox/hardware_caps.c index 546af84..b666305 100644 --- a/libarmbox/hardware_caps.c +++ b/libarmbox/hardware_caps.c @@ -60,7 +60,7 @@ hw_caps_t *get_hwcaps(void) caps.display_has_statusline = 0; // 0 because we use graphlcd/lcd4linux caps.has_button_timer = 1; caps.has_button_vformat = 0; - caps.has_HDMI = 1; + caps.has_HDMI = 2; strcpy(caps.boxvendor, "VU+"); strcpy(caps.boxname, "DUO4K"); strcpy(caps.boxarch, "BCM7278"); @@ -195,10 +195,6 @@ hw_caps_t *get_hwcaps(void) caps.display_can_set_brightness = 1; caps.display_has_statusline = 0; caps.has_button_timer = 1; - caps.has_button_vformat = 1; - caps.has_HDMI = 1; - strcpy(caps.boxvendor, "ZGEMMA"); - strcpy(caps.boxname, "H7"); caps.has_button_vformat = 0; caps.has_HDMI = 1; strcpy(caps.boxvendor, "AirDigital"); diff --git a/libarmbox/video.cpp b/libarmbox/video.cpp index 174828f..b6ca620 100644 --- a/libarmbox/video.cpp +++ b/libarmbox/video.cpp @@ -654,7 +654,7 @@ void cVideo::SetVideoMode(analog_mode_t mode) bool cVideo::ShowPicture(const char * fname) { bool ret = false; - hal_info("%s(%s)\n", __func__, fname); + hal_debug("%s(%s)\n", __func__, fname); if (video_standby) { /* does not work and the driver does not seem to like it */ diff --git a/libazbox/video.cpp b/libazbox/video.cpp index 9f9f9cf..99b249e 100644 --- a/libazbox/video.cpp +++ b/libazbox/video.cpp @@ -496,13 +496,13 @@ static inline int rate2csapi(int rate) return 1; case 25: return 2; - case 29976: + case 29970: return 3; case 30: return 4; case 50: return 5; - case 50940: + case 59940: return 6; case 60: return 7; diff --git a/libdvbci/descrambler.cpp b/libdvbci/descrambler.cpp index 414cff0..6345f0a 100644 --- a/libdvbci/descrambler.cpp +++ b/libdvbci/descrambler.cpp @@ -142,7 +142,7 @@ int descrambler_set_key(int index, int parity, unsigned char *data) int descrambler_set_pid(int index, int enable, int pid) { struct ca_pid p; -#if HAVE_ARM_HARDWARE +#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE unsigned int flags = 0x80; if (index) diff --git a/libdvbci/dvbci_ccmgr.cpp b/libdvbci/dvbci_ccmgr.cpp index e3bdff2..464aa51 100644 --- a/libdvbci/dvbci_ccmgr.cpp +++ b/libdvbci/dvbci_ccmgr.cpp @@ -1354,7 +1354,7 @@ void eDVBCIContentControlManagerSession::resendKey(eDVBCISlot *tslot) if (!tslot->SidBlackListed && (tslot->recordUse[0] || tslot->liveUse[0])) { -#if HAVE_ARM_HARDWARE +#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE if (slot->newPids) { if (slot->pids.size()) diff --git a/libeplayer3-arm/Makefile.am b/libeplayer3/Makefile.am similarity index 90% rename from libeplayer3-arm/Makefile.am rename to libeplayer3/Makefile.am index b29e212..04e808c 100644 --- a/libeplayer3-arm/Makefile.am +++ b/libeplayer3/Makefile.am @@ -3,7 +3,7 @@ AM_CFLAGS = -Wall -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOUR CXXFLAGS = -Wall -noinst_LTLIBRARIES = libeplayer3_arm.la +noinst_LTLIBRARIES = libeplayer3.la AM_CPPFLAGS = -I$(srcdir)/include AM_CPPFLAGS += -I$(top_srcdir)/include @@ -59,11 +59,11 @@ SOURCE_FILES += \ output/writer/mipsel/wmv.c \ output/writer/mipsel/vc1.c -libeplayer3_arm_la_SOURCES = $(SOURCE_FILES) +libeplayer3_la_SOURCES = $(SOURCE_FILES) -LIBEPLAYER3_LIBS = libeplayer3_arm.la -lpthread -lavformat -lavcodec -lavutil -lswresample +LIBEPLAYER3_LIBS = libeplayer3.la -lpthread -lavformat -lavcodec -lavutil -lswresample bin_PROGRAMS = eplayer3 eplayer3_SOURCES = main/exteplayer.c eplayer3_LDADD = $(LIBEPLAYER3_LIBS) -eplayer3_DEPENDENCIES = libeplayer3_arm.la +eplayer3_DEPENDENCIES = libeplayer3.la diff --git a/libeplayer3-arm/README.md b/libeplayer3/README.md similarity index 100% rename from libeplayer3-arm/README.md rename to libeplayer3/README.md diff --git a/libeplayer3-arm/container/buff_ffmpeg.c b/libeplayer3/container/buff_ffmpeg.c similarity index 100% rename from libeplayer3-arm/container/buff_ffmpeg.c rename to libeplayer3/container/buff_ffmpeg.c diff --git a/libeplayer3-arm/container/container.c b/libeplayer3/container/container.c similarity index 100% rename from libeplayer3-arm/container/container.c rename to libeplayer3/container/container.c diff --git a/libeplayer3-arm/container/container_ffmpeg.c b/libeplayer3/container/container_ffmpeg.c similarity index 99% rename from libeplayer3-arm/container/container_ffmpeg.c rename to libeplayer3/container/container_ffmpeg.c index 038b11e..c84be1d 100644 --- a/libeplayer3-arm/container/container_ffmpeg.c +++ b/libeplayer3/container/container_ffmpeg.c @@ -125,8 +125,8 @@ static int32_t container_ffmpeg_seek(Context_t *context, int64_t sec, uint8_t ab //static int32_t container_ffmpeg_seek_rel(Context_t *context, off_t pos, int64_t pts, int64_t sec); static int32_t container_ffmpeg_get_length(Context_t *context, int64_t *length); static int64_t calcPts(uint32_t avContextIdx, AVStream *stream, int64_t pts); -static int32_t container_ffmpeg_stop(Context_t *context); static int64_t doCalcPts(int64_t start_time, const AVRational time_base, int64_t pts); +static int32_t container_ffmpeg_stop(Context_t *context); /* Progressive playback means that we play local file * but this local file can grows up, for example @@ -2003,7 +2003,7 @@ int32_t container_ffmpeg_update_tracks(Context_t *context, char *filename, int32 #endif ffmpeg_printf(20, "dump format\n"); - if((avContextTab[0] != NULL) && (FFMPEG_DEBUG_LEVEL > 0)) + if ((avContextTab[0] != NULL) && (FFMPEG_DEBUG_LEVEL > 0)) av_dump_format(avContextTab[0], 0, filename, 0); diff --git a/libeplayer3-arm/container/flv2mpeg4_ffmpeg.c b/libeplayer3/container/flv2mpeg4_ffmpeg.c similarity index 100% rename from libeplayer3-arm/container/flv2mpeg4_ffmpeg.c rename to libeplayer3/container/flv2mpeg4_ffmpeg.c diff --git a/libeplayer3-arm/container/mpeg4p2_ffmpeg.c b/libeplayer3/container/mpeg4p2_ffmpeg.c similarity index 100% rename from libeplayer3-arm/container/mpeg4p2_ffmpeg.c rename to libeplayer3/container/mpeg4p2_ffmpeg.c diff --git a/libeplayer3-arm/container/wrapped_ffmpeg.c b/libeplayer3/container/wrapped_ffmpeg.c similarity index 100% rename from libeplayer3-arm/container/wrapped_ffmpeg.c rename to libeplayer3/container/wrapped_ffmpeg.c diff --git a/libeplayer3-arm/external/ffmpeg/get_bits.h b/libeplayer3/external/ffmpeg/get_bits.h similarity index 100% rename from libeplayer3-arm/external/ffmpeg/get_bits.h rename to libeplayer3/external/ffmpeg/get_bits.h diff --git a/libeplayer3-arm/external/ffmpeg/latmenc.h b/libeplayer3/external/ffmpeg/latmenc.h similarity index 100% rename from libeplayer3-arm/external/ffmpeg/latmenc.h rename to libeplayer3/external/ffmpeg/latmenc.h diff --git a/libeplayer3-arm/external/ffmpeg/mathops.h b/libeplayer3/external/ffmpeg/mathops.h similarity index 100% rename from libeplayer3-arm/external/ffmpeg/mathops.h rename to libeplayer3/external/ffmpeg/mathops.h diff --git a/libeplayer3-arm/external/ffmpeg/mpeg4audio.h b/libeplayer3/external/ffmpeg/mpeg4audio.h similarity index 100% rename from libeplayer3-arm/external/ffmpeg/mpeg4audio.h rename to libeplayer3/external/ffmpeg/mpeg4audio.h diff --git a/libeplayer3-arm/external/ffmpeg/put_bits.h b/libeplayer3/external/ffmpeg/put_bits.h similarity index 100% rename from libeplayer3-arm/external/ffmpeg/put_bits.h rename to libeplayer3/external/ffmpeg/put_bits.h diff --git a/libeplayer3-arm/external/ffmpeg/src/bitstream.c b/libeplayer3/external/ffmpeg/src/bitstream.c similarity index 100% rename from libeplayer3-arm/external/ffmpeg/src/bitstream.c rename to libeplayer3/external/ffmpeg/src/bitstream.c diff --git a/libeplayer3-arm/external/ffmpeg/src/latmenc.c b/libeplayer3/external/ffmpeg/src/latmenc.c similarity index 100% rename from libeplayer3-arm/external/ffmpeg/src/latmenc.c rename to libeplayer3/external/ffmpeg/src/latmenc.c diff --git a/libeplayer3-arm/external/ffmpeg/src/mpeg4audio.c b/libeplayer3/external/ffmpeg/src/mpeg4audio.c similarity index 100% rename from libeplayer3-arm/external/ffmpeg/src/mpeg4audio.c rename to libeplayer3/external/ffmpeg/src/mpeg4audio.c diff --git a/libeplayer3-arm/external/flv2mpeg4/doc/COPYING b/libeplayer3/external/flv2mpeg4/doc/COPYING similarity index 100% rename from libeplayer3-arm/external/flv2mpeg4/doc/COPYING rename to libeplayer3/external/flv2mpeg4/doc/COPYING diff --git a/libeplayer3-arm/external/flv2mpeg4/doc/CREDITS b/libeplayer3/external/flv2mpeg4/doc/CREDITS similarity index 100% rename from libeplayer3-arm/external/flv2mpeg4/doc/CREDITS rename to libeplayer3/external/flv2mpeg4/doc/CREDITS diff --git a/libeplayer3-arm/external/flv2mpeg4/doc/FFMPEG_CREDITS b/libeplayer3/external/flv2mpeg4/doc/FFMPEG_CREDITS similarity index 100% rename from libeplayer3-arm/external/flv2mpeg4/doc/FFMPEG_CREDITS rename to libeplayer3/external/flv2mpeg4/doc/FFMPEG_CREDITS diff --git a/libeplayer3-arm/external/flv2mpeg4/doc/FFMPEG_IMPORTS b/libeplayer3/external/flv2mpeg4/doc/FFMPEG_IMPORTS similarity index 100% rename from libeplayer3-arm/external/flv2mpeg4/doc/FFMPEG_IMPORTS rename to libeplayer3/external/flv2mpeg4/doc/FFMPEG_IMPORTS diff --git a/libeplayer3-arm/external/flv2mpeg4/doc/INSTALL b/libeplayer3/external/flv2mpeg4/doc/INSTALL similarity index 100% rename from libeplayer3-arm/external/flv2mpeg4/doc/INSTALL rename to libeplayer3/external/flv2mpeg4/doc/INSTALL diff --git a/libeplayer3-arm/external/flv2mpeg4/doc/README b/libeplayer3/external/flv2mpeg4/doc/README similarity index 100% rename from libeplayer3-arm/external/flv2mpeg4/doc/README rename to libeplayer3/external/flv2mpeg4/doc/README diff --git a/libeplayer3-arm/external/flv2mpeg4/flv2mpeg4.h b/libeplayer3/external/flv2mpeg4/flv2mpeg4.h similarity index 100% rename from libeplayer3-arm/external/flv2mpeg4/flv2mpeg4.h rename to libeplayer3/external/flv2mpeg4/flv2mpeg4.h diff --git a/libeplayer3-arm/external/flv2mpeg4/src/bitreader.h b/libeplayer3/external/flv2mpeg4/src/bitreader.h similarity index 100% rename from libeplayer3-arm/external/flv2mpeg4/src/bitreader.h rename to libeplayer3/external/flv2mpeg4/src/bitreader.h diff --git a/libeplayer3-arm/external/flv2mpeg4/src/bitwriter.h b/libeplayer3/external/flv2mpeg4/src/bitwriter.h similarity index 100% rename from libeplayer3-arm/external/flv2mpeg4/src/bitwriter.h rename to libeplayer3/external/flv2mpeg4/src/bitwriter.h diff --git a/libeplayer3-arm/external/flv2mpeg4/src/dcprediction.c b/libeplayer3/external/flv2mpeg4/src/dcprediction.c similarity index 100% rename from libeplayer3-arm/external/flv2mpeg4/src/dcprediction.c rename to libeplayer3/external/flv2mpeg4/src/dcprediction.c diff --git a/libeplayer3-arm/external/flv2mpeg4/src/dcprediction.h b/libeplayer3/external/flv2mpeg4/src/dcprediction.h similarity index 100% rename from libeplayer3-arm/external/flv2mpeg4/src/dcprediction.h rename to libeplayer3/external/flv2mpeg4/src/dcprediction.h diff --git a/libeplayer3-arm/external/flv2mpeg4/src/flv.h b/libeplayer3/external/flv2mpeg4/src/flv.h similarity index 100% rename from libeplayer3-arm/external/flv2mpeg4/src/flv.h rename to libeplayer3/external/flv2mpeg4/src/flv.h diff --git a/libeplayer3-arm/external/flv2mpeg4/src/flv2mpeg4.c b/libeplayer3/external/flv2mpeg4/src/flv2mpeg4.c similarity index 100% rename from libeplayer3-arm/external/flv2mpeg4/src/flv2mpeg4.c rename to libeplayer3/external/flv2mpeg4/src/flv2mpeg4.c diff --git a/libeplayer3-arm/external/flv2mpeg4/src/flvdecoder.c b/libeplayer3/external/flv2mpeg4/src/flvdecoder.c similarity index 100% rename from libeplayer3-arm/external/flv2mpeg4/src/flvdecoder.c rename to libeplayer3/external/flv2mpeg4/src/flvdecoder.c diff --git a/libeplayer3-arm/external/flv2mpeg4/src/m4v.h b/libeplayer3/external/flv2mpeg4/src/m4v.h similarity index 100% rename from libeplayer3-arm/external/flv2mpeg4/src/m4v.h rename to libeplayer3/external/flv2mpeg4/src/m4v.h diff --git a/libeplayer3-arm/external/flv2mpeg4/src/m4vencode.c b/libeplayer3/external/flv2mpeg4/src/m4vencode.c similarity index 100% rename from libeplayer3-arm/external/flv2mpeg4/src/m4vencode.c rename to libeplayer3/external/flv2mpeg4/src/m4vencode.c diff --git a/libeplayer3-arm/external/flv2mpeg4/src/m4vencode.h b/libeplayer3/external/flv2mpeg4/src/m4vencode.h similarity index 100% rename from libeplayer3-arm/external/flv2mpeg4/src/m4vencode.h rename to libeplayer3/external/flv2mpeg4/src/m4vencode.h diff --git a/libeplayer3-arm/external/flv2mpeg4/src/m4vencode_tables.h b/libeplayer3/external/flv2mpeg4/src/m4vencode_tables.h similarity index 100% rename from libeplayer3-arm/external/flv2mpeg4/src/m4vencode_tables.h rename to libeplayer3/external/flv2mpeg4/src/m4vencode_tables.h diff --git a/libeplayer3-arm/external/flv2mpeg4/src/type.h b/libeplayer3/external/flv2mpeg4/src/type.h similarity index 100% rename from libeplayer3-arm/external/flv2mpeg4/src/type.h rename to libeplayer3/external/flv2mpeg4/src/type.h diff --git a/libeplayer3-arm/include/aac.h b/libeplayer3/include/aac.h similarity index 100% rename from libeplayer3-arm/include/aac.h rename to libeplayer3/include/aac.h diff --git a/libeplayer3-arm/include/bcm_ioctls.h b/libeplayer3/include/bcm_ioctls.h similarity index 100% rename from libeplayer3-arm/include/bcm_ioctls.h rename to libeplayer3/include/bcm_ioctls.h diff --git a/libeplayer3-arm/include/common.h b/libeplayer3/include/common.h similarity index 100% rename from libeplayer3-arm/include/common.h rename to libeplayer3/include/common.h diff --git a/libeplayer3-arm/include/container.h b/libeplayer3/include/container.h similarity index 100% rename from libeplayer3-arm/include/container.h rename to libeplayer3/include/container.h diff --git a/libeplayer3-arm/include/debug.h b/libeplayer3/include/debug.h similarity index 100% rename from libeplayer3-arm/include/debug.h rename to libeplayer3/include/debug.h diff --git a/libeplayer3-arm/include/ffmpeg_metadata.h b/libeplayer3/include/ffmpeg_metadata.h similarity index 100% rename from libeplayer3-arm/include/ffmpeg_metadata.h rename to libeplayer3/include/ffmpeg_metadata.h diff --git a/libeplayer3-arm/include/manager.h b/libeplayer3/include/manager.h similarity index 100% rename from libeplayer3-arm/include/manager.h rename to libeplayer3/include/manager.h diff --git a/libeplayer3-arm/include/misc.h b/libeplayer3/include/misc.h similarity index 100% rename from libeplayer3-arm/include/misc.h rename to libeplayer3/include/misc.h diff --git a/libeplayer3-arm/include/output.h b/libeplayer3/include/output.h similarity index 100% rename from libeplayer3-arm/include/output.h rename to libeplayer3/include/output.h diff --git a/libeplayer3-arm/include/pcm.h b/libeplayer3/include/pcm.h similarity index 100% rename from libeplayer3-arm/include/pcm.h rename to libeplayer3/include/pcm.h diff --git a/libeplayer3-arm/include/pes.h b/libeplayer3/include/pes.h similarity index 100% rename from libeplayer3-arm/include/pes.h rename to libeplayer3/include/pes.h diff --git a/libeplayer3-arm/include/playback.h b/libeplayer3/include/playback.h similarity index 100% rename from libeplayer3-arm/include/playback.h rename to libeplayer3/include/playback.h diff --git a/libeplayer3-arm/include/stm_ioctls.h b/libeplayer3/include/stm_ioctls.h similarity index 100% rename from libeplayer3-arm/include/stm_ioctls.h rename to libeplayer3/include/stm_ioctls.h diff --git a/libeplayer3-arm/include/writer.h b/libeplayer3/include/writer.h similarity index 100% rename from libeplayer3-arm/include/writer.h rename to libeplayer3/include/writer.h diff --git a/libeplayer3-arm/main/exteplayer.c b/libeplayer3/main/exteplayer.c similarity index 99% rename from libeplayer3-arm/main/exteplayer.c rename to libeplayer3/main/exteplayer.c index 467867d..4c00c00 100644 --- a/libeplayer3-arm/main/exteplayer.c +++ b/libeplayer3/main/exteplayer.c @@ -686,6 +686,7 @@ static int ParseParams(int argc, char *argv[], PlayFiles_t *playbackFiles, int * int main(int argc, char *argv[]) { system("echo 'encoder' > /proc/stb/avs/0/input"); + pthread_t termThread; int isTermThreadStarted = 0; diff --git a/libeplayer3-arm/manager/audio.c b/libeplayer3/manager/audio.c similarity index 100% rename from libeplayer3-arm/manager/audio.c rename to libeplayer3/manager/audio.c diff --git a/libeplayer3-arm/manager/chapter.c b/libeplayer3/manager/chapter.c similarity index 100% rename from libeplayer3-arm/manager/chapter.c rename to libeplayer3/manager/chapter.c diff --git a/libeplayer3-arm/manager/manager.c b/libeplayer3/manager/manager.c similarity index 100% rename from libeplayer3-arm/manager/manager.c rename to libeplayer3/manager/manager.c diff --git a/libeplayer3-arm/manager/subtitle.c b/libeplayer3/manager/subtitle.c similarity index 100% rename from libeplayer3-arm/manager/subtitle.c rename to libeplayer3/manager/subtitle.c diff --git a/libeplayer3-arm/manager/video.c b/libeplayer3/manager/video.c similarity index 100% rename from libeplayer3-arm/manager/video.c rename to libeplayer3/manager/video.c diff --git a/libeplayer3-arm/output/linuxdvb_buffering.c b/libeplayer3/output/linuxdvb_buffering.c similarity index 100% rename from libeplayer3-arm/output/linuxdvb_buffering.c rename to libeplayer3/output/linuxdvb_buffering.c diff --git a/libeplayer3-arm/output/linuxdvb_fake.c b/libeplayer3/output/linuxdvb_fake.c similarity index 100% rename from libeplayer3-arm/output/linuxdvb_fake.c rename to libeplayer3/output/linuxdvb_fake.c diff --git a/libeplayer3-arm/output/linuxdvb_mipsel.c b/libeplayer3/output/linuxdvb_mipsel.c similarity index 100% rename from libeplayer3-arm/output/linuxdvb_mipsel.c rename to libeplayer3/output/linuxdvb_mipsel.c diff --git a/libeplayer3-arm/output/linuxdvb_sh4.c b/libeplayer3/output/linuxdvb_sh4.c similarity index 100% rename from libeplayer3-arm/output/linuxdvb_sh4.c rename to libeplayer3/output/linuxdvb_sh4.c diff --git a/libeplayer3-arm/output/output.c b/libeplayer3/output/output.c similarity index 100% rename from libeplayer3-arm/output/output.c rename to libeplayer3/output/output.c diff --git a/libeplayer3-arm/output/output_subtitle.c b/libeplayer3/output/output_subtitle.c similarity index 100% rename from libeplayer3-arm/output/output_subtitle.c rename to libeplayer3/output/output_subtitle.c diff --git a/libeplayer3-arm/output/writer/common/misc.c b/libeplayer3/output/writer/common/misc.c similarity index 100% rename from libeplayer3-arm/output/writer/common/misc.c rename to libeplayer3/output/writer/common/misc.c diff --git a/libeplayer3-arm/output/writer/common/pes.c b/libeplayer3/output/writer/common/pes.c similarity index 100% rename from libeplayer3-arm/output/writer/common/pes.c rename to libeplayer3/output/writer/common/pes.c diff --git a/libeplayer3-arm/output/writer/common/writer.c b/libeplayer3/output/writer/common/writer.c similarity index 100% rename from libeplayer3-arm/output/writer/common/writer.c rename to libeplayer3/output/writer/common/writer.c diff --git a/libeplayer3-arm/output/writer/mipsel/aac.c b/libeplayer3/output/writer/mipsel/aac.c similarity index 100% rename from libeplayer3-arm/output/writer/mipsel/aac.c rename to libeplayer3/output/writer/mipsel/aac.c diff --git a/libeplayer3-arm/output/writer/mipsel/ac3.c b/libeplayer3/output/writer/mipsel/ac3.c similarity index 100% rename from libeplayer3-arm/output/writer/mipsel/ac3.c rename to libeplayer3/output/writer/mipsel/ac3.c diff --git a/libeplayer3-arm/output/writer/mipsel/amr.c b/libeplayer3/output/writer/mipsel/amr.c similarity index 100% rename from libeplayer3-arm/output/writer/mipsel/amr.c rename to libeplayer3/output/writer/mipsel/amr.c diff --git a/libeplayer3-arm/output/writer/mipsel/divx3.c b/libeplayer3/output/writer/mipsel/divx3.c similarity index 100% rename from libeplayer3-arm/output/writer/mipsel/divx3.c rename to libeplayer3/output/writer/mipsel/divx3.c diff --git a/libeplayer3-arm/output/writer/mipsel/dts.c b/libeplayer3/output/writer/mipsel/dts.c similarity index 100% rename from libeplayer3-arm/output/writer/mipsel/dts.c rename to libeplayer3/output/writer/mipsel/dts.c diff --git a/libeplayer3-arm/output/writer/mipsel/h264.c b/libeplayer3/output/writer/mipsel/h264.c similarity index 100% rename from libeplayer3-arm/output/writer/mipsel/h264.c rename to libeplayer3/output/writer/mipsel/h264.c diff --git a/libeplayer3-arm/output/writer/mipsel/h265.c b/libeplayer3/output/writer/mipsel/h265.c similarity index 100% rename from libeplayer3-arm/output/writer/mipsel/h265.c rename to libeplayer3/output/writer/mipsel/h265.c diff --git a/libeplayer3-arm/output/writer/mipsel/lpcm.c b/libeplayer3/output/writer/mipsel/lpcm.c similarity index 100% rename from libeplayer3-arm/output/writer/mipsel/lpcm.c rename to libeplayer3/output/writer/mipsel/lpcm.c diff --git a/libeplayer3-arm/output/writer/mipsel/mjpeg.c b/libeplayer3/output/writer/mipsel/mjpeg.c similarity index 99% rename from libeplayer3-arm/output/writer/mipsel/mjpeg.c rename to libeplayer3/output/writer/mipsel/mjpeg.c index afd522f..2bd2765 100755 --- a/libeplayer3-arm/output/writer/mipsel/mjpeg.c +++ b/libeplayer3/output/writer/mipsel/mjpeg.c @@ -42,6 +42,7 @@ #include "stm_ioctls.h" #include "bcm_ioctls.h" +#include "debug.h" #include "common.h" #include "output.h" #include "debug.h" diff --git a/libeplayer3-arm/output/writer/mipsel/mp3.c b/libeplayer3/output/writer/mipsel/mp3.c similarity index 100% rename from libeplayer3-arm/output/writer/mipsel/mp3.c rename to libeplayer3/output/writer/mipsel/mp3.c diff --git a/libeplayer3-arm/output/writer/mipsel/mpeg2.c b/libeplayer3/output/writer/mipsel/mpeg2.c similarity index 100% rename from libeplayer3-arm/output/writer/mipsel/mpeg2.c rename to libeplayer3/output/writer/mipsel/mpeg2.c diff --git a/libeplayer3-arm/output/writer/mipsel/mpeg4.c b/libeplayer3/output/writer/mipsel/mpeg4.c similarity index 100% rename from libeplayer3-arm/output/writer/mipsel/mpeg4.c rename to libeplayer3/output/writer/mipsel/mpeg4.c diff --git a/libeplayer3-arm/output/writer/mipsel/pcm.c b/libeplayer3/output/writer/mipsel/pcm.c similarity index 100% rename from libeplayer3-arm/output/writer/mipsel/pcm.c rename to libeplayer3/output/writer/mipsel/pcm.c diff --git a/libeplayer3-arm/output/writer/mipsel/vc1.c b/libeplayer3/output/writer/mipsel/vc1.c similarity index 100% rename from libeplayer3-arm/output/writer/mipsel/vc1.c rename to libeplayer3/output/writer/mipsel/vc1.c diff --git a/libeplayer3-arm/output/writer/mipsel/vp.c b/libeplayer3/output/writer/mipsel/vp.c similarity index 100% rename from libeplayer3-arm/output/writer/mipsel/vp.c rename to libeplayer3/output/writer/mipsel/vp.c diff --git a/libeplayer3-arm/output/writer/mipsel/wma.c b/libeplayer3/output/writer/mipsel/wma.c similarity index 100% rename from libeplayer3-arm/output/writer/mipsel/wma.c rename to libeplayer3/output/writer/mipsel/wma.c diff --git a/libeplayer3-arm/output/writer/mipsel/wmv.c b/libeplayer3/output/writer/mipsel/wmv.c similarity index 100% rename from libeplayer3-arm/output/writer/mipsel/wmv.c rename to libeplayer3/output/writer/mipsel/wmv.c diff --git a/libeplayer3-arm/output/writer/mipsel/writer.c b/libeplayer3/output/writer/mipsel/writer.c similarity index 100% rename from libeplayer3-arm/output/writer/mipsel/writer.c rename to libeplayer3/output/writer/mipsel/writer.c diff --git a/libeplayer3-arm/output/writer/sh4/aac.c b/libeplayer3/output/writer/sh4/aac.c similarity index 100% rename from libeplayer3-arm/output/writer/sh4/aac.c rename to libeplayer3/output/writer/sh4/aac.c diff --git a/libeplayer3-arm/output/writer/sh4/ac3.c b/libeplayer3/output/writer/sh4/ac3.c similarity index 100% rename from libeplayer3-arm/output/writer/sh4/ac3.c rename to libeplayer3/output/writer/sh4/ac3.c diff --git a/libeplayer3-arm/output/writer/sh4/divx.c b/libeplayer3/output/writer/sh4/divx.c similarity index 100% rename from libeplayer3-arm/output/writer/sh4/divx.c rename to libeplayer3/output/writer/sh4/divx.c diff --git a/libeplayer3-arm/output/writer/sh4/divx2.c b/libeplayer3/output/writer/sh4/divx2.c similarity index 100% rename from libeplayer3-arm/output/writer/sh4/divx2.c rename to libeplayer3/output/writer/sh4/divx2.c diff --git a/libeplayer3-arm/output/writer/sh4/dts.c b/libeplayer3/output/writer/sh4/dts.c similarity index 100% rename from libeplayer3-arm/output/writer/sh4/dts.c rename to libeplayer3/output/writer/sh4/dts.c diff --git a/libeplayer3-arm/output/writer/sh4/h263.c b/libeplayer3/output/writer/sh4/h263.c similarity index 100% rename from libeplayer3-arm/output/writer/sh4/h263.c rename to libeplayer3/output/writer/sh4/h263.c diff --git a/libeplayer3-arm/output/writer/sh4/h264.c b/libeplayer3/output/writer/sh4/h264.c similarity index 100% rename from libeplayer3-arm/output/writer/sh4/h264.c rename to libeplayer3/output/writer/sh4/h264.c diff --git a/libeplayer3-arm/output/writer/sh4/mp3.c b/libeplayer3/output/writer/sh4/mp3.c similarity index 100% rename from libeplayer3-arm/output/writer/sh4/mp3.c rename to libeplayer3/output/writer/sh4/mp3.c diff --git a/libeplayer3-arm/output/writer/sh4/mpeg2.c b/libeplayer3/output/writer/sh4/mpeg2.c similarity index 100% rename from libeplayer3-arm/output/writer/sh4/mpeg2.c rename to libeplayer3/output/writer/sh4/mpeg2.c diff --git a/libeplayer3-arm/output/writer/sh4/pcm.c b/libeplayer3/output/writer/sh4/pcm.c similarity index 100% rename from libeplayer3-arm/output/writer/sh4/pcm.c rename to libeplayer3/output/writer/sh4/pcm.c diff --git a/libeplayer3-arm/output/writer/sh4/pes.c b/libeplayer3/output/writer/sh4/pes.c similarity index 100% rename from libeplayer3-arm/output/writer/sh4/pes.c rename to libeplayer3/output/writer/sh4/pes.c diff --git a/libeplayer3-arm/output/writer/sh4/vc1.c b/libeplayer3/output/writer/sh4/vc1.c similarity index 100% rename from libeplayer3-arm/output/writer/sh4/vc1.c rename to libeplayer3/output/writer/sh4/vc1.c diff --git a/libeplayer3-arm/output/writer/sh4/vorbis.c b/libeplayer3/output/writer/sh4/vorbis.c similarity index 100% rename from libeplayer3-arm/output/writer/sh4/vorbis.c rename to libeplayer3/output/writer/sh4/vorbis.c diff --git a/libeplayer3-arm/output/writer/sh4/wma.c b/libeplayer3/output/writer/sh4/wma.c similarity index 100% rename from libeplayer3-arm/output/writer/sh4/wma.c rename to libeplayer3/output/writer/sh4/wma.c diff --git a/libeplayer3-arm/output/writer/sh4/wmv.c b/libeplayer3/output/writer/sh4/wmv.c similarity index 100% rename from libeplayer3-arm/output/writer/sh4/wmv.c rename to libeplayer3/output/writer/sh4/wmv.c diff --git a/libeplayer3-arm/output/writer/sh4/writer.c b/libeplayer3/output/writer/sh4/writer.c similarity index 100% rename from libeplayer3-arm/output/writer/sh4/writer.c rename to libeplayer3/output/writer/sh4/writer.c diff --git a/libeplayer3-arm/playback/playback.c b/libeplayer3/playback/playback.c similarity index 100% rename from libeplayer3-arm/playback/playback.c rename to libeplayer3/playback/playback.c diff --git a/libmipsbox/Makefile.am b/libmipsbox/Makefile.am new file mode 100644 index 0000000..53b544d --- /dev/null +++ b/libmipsbox/Makefile.am @@ -0,0 +1,35 @@ +noinst_LTLIBRARIES = libmipsbox.la + +AM_CPPFLAGS = \ + -I$(top_srcdir)/common \ + -I$(top_srcdir)/include + +AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing + +AM_LDFLAGS = \ + -lOpenThreads \ + @AVFORMAT_LIBS@ \ + @AVUTIL_LIBS@ \ + @AVCODEC_LIBS@ \ + @SWRESAMPLE_LIBS@ \ + -lpthread -lass -lrt + +libmipsbox_la_SOURCES = \ + hardware_caps.c \ + dmx.cpp \ + video.cpp \ + audio.cpp \ + init.cpp \ + record.cpp \ + hdmi_cec.cpp + +libmipsbox_la_SOURCES += \ + playback_libeplayer3.cpp + +AM_CPPFLAGS += \ + -I$(top_srcdir)/libeplayer3/include + +AM_LDFLAGS += \ + -lass + +AM_CPPFLAGS += -D__STDC_FORMAT_MACROS -D__STDC_CONSTANT_MACROS diff --git a/libmipsbox/audio.cpp b/libmipsbox/audio.cpp new file mode 120000 index 0000000..a5bac70 --- /dev/null +++ b/libmipsbox/audio.cpp @@ -0,0 +1 @@ +../libarmbox/audio.cpp \ No newline at end of file diff --git a/libmipsbox/audio_lib.h b/libmipsbox/audio_lib.h new file mode 120000 index 0000000..f12d7d5 --- /dev/null +++ b/libmipsbox/audio_lib.h @@ -0,0 +1 @@ +../libarmbox/audio_lib.h \ No newline at end of file diff --git a/libmipsbox/dmx.cpp b/libmipsbox/dmx.cpp new file mode 120000 index 0000000..a8e7f08 --- /dev/null +++ b/libmipsbox/dmx.cpp @@ -0,0 +1 @@ +../libarmbox/dmx.cpp \ No newline at end of file diff --git a/libmipsbox/hardware_caps.c b/libmipsbox/hardware_caps.c new file mode 100644 index 0000000..bb81877 --- /dev/null +++ b/libmipsbox/hardware_caps.c @@ -0,0 +1,50 @@ +/* + * determine the capabilities of the hardware. + * part of libstb-hal + * + * (C) 2010-2012 Stefan Seyfried + * + * License: GPL v2 or later + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#define FP_DEV "/dev/dbox/oled0" +static int initialized = 0; +static hw_caps_t caps; + +hw_caps_t *get_hwcaps(void) +{ + if (initialized) + return ∩︀ + + memset(&caps, 0, sizeof(hw_caps_t)); + +#if BOXMODEL_VUDUO + initialized = 1; + caps.has_CI = 2; + caps.can_cec = 1; + caps.can_shutdown = 1; + caps.display_xres = 16; + caps.display_type = HW_DISPLAY_LINE_TEXT; + caps.display_can_deepstandby = 1; + caps.display_can_set_brightness = 1; + caps.display_has_statusline = 0; + caps.has_button_timer = 1; + caps.has_HDMI = 1; + caps.has_SCART = 1; + strcpy(caps.boxvendor, "VU+"); + strcpy(caps.boxname, "DUO"); + strcpy(caps.boxarch, "BCM7335"); +#endif + return ∩︀ +} diff --git a/libmipsbox/hdmi_cec.cpp b/libmipsbox/hdmi_cec.cpp new file mode 120000 index 0000000..7cf1426 --- /dev/null +++ b/libmipsbox/hdmi_cec.cpp @@ -0,0 +1 @@ +../libarmbox/hdmi_cec.cpp \ No newline at end of file diff --git a/libmipsbox/hdmi_cec.h b/libmipsbox/hdmi_cec.h new file mode 120000 index 0000000..20ec29c --- /dev/null +++ b/libmipsbox/hdmi_cec.h @@ -0,0 +1 @@ +../libarmbox/hdmi_cec.h \ No newline at end of file diff --git a/libmipsbox/hdmi_cec_types.h b/libmipsbox/hdmi_cec_types.h new file mode 120000 index 0000000..3481cbf --- /dev/null +++ b/libmipsbox/hdmi_cec_types.h @@ -0,0 +1 @@ +../libarmbox/hdmi_cec_types.h \ No newline at end of file diff --git a/libmipsbox/init.cpp b/libmipsbox/init.cpp new file mode 120000 index 0000000..7de8db4 --- /dev/null +++ b/libmipsbox/init.cpp @@ -0,0 +1 @@ +../libarmbox/init.cpp \ No newline at end of file diff --git a/libmipsbox/linux-uapi-cec.h b/libmipsbox/linux-uapi-cec.h new file mode 120000 index 0000000..993e23b --- /dev/null +++ b/libmipsbox/linux-uapi-cec.h @@ -0,0 +1 @@ +../libarmbox/linux-uapi-cec.h \ No newline at end of file diff --git a/libmipsbox/playback_libeplayer3.cpp b/libmipsbox/playback_libeplayer3.cpp new file mode 120000 index 0000000..a9ecfad --- /dev/null +++ b/libmipsbox/playback_libeplayer3.cpp @@ -0,0 +1 @@ +../libarmbox/playback_libeplayer3.cpp \ No newline at end of file diff --git a/libmipsbox/playback_libeplayer3.h b/libmipsbox/playback_libeplayer3.h new file mode 120000 index 0000000..7eac198 --- /dev/null +++ b/libmipsbox/playback_libeplayer3.h @@ -0,0 +1 @@ +../libarmbox/playback_libeplayer3.h \ No newline at end of file diff --git a/libmipsbox/record.cpp b/libmipsbox/record.cpp new file mode 120000 index 0000000..bd5779b --- /dev/null +++ b/libmipsbox/record.cpp @@ -0,0 +1 @@ +../libarmbox/record.cpp \ No newline at end of file diff --git a/libmipsbox/record_lib.h b/libmipsbox/record_lib.h new file mode 120000 index 0000000..8104a0c --- /dev/null +++ b/libmipsbox/record_lib.h @@ -0,0 +1 @@ +../libarmbox/record_lib.h \ No newline at end of file diff --git a/libmipsbox/video.cpp b/libmipsbox/video.cpp new file mode 120000 index 0000000..5ee7b52 --- /dev/null +++ b/libmipsbox/video.cpp @@ -0,0 +1 @@ +../libarmbox/video.cpp \ No newline at end of file diff --git a/libmipsbox/video_lib.h b/libmipsbox/video_lib.h new file mode 120000 index 0000000..21a9fa2 --- /dev/null +++ b/libmipsbox/video_lib.h @@ -0,0 +1 @@ +../libarmbox/video_lib.h \ No newline at end of file