From 74d35205ea1fb110a24811baec8604b42071e5ff Mon Sep 17 00:00:00 2001 From: max_10 Date: Fri, 5 Apr 2019 10:03:49 +0200 Subject: [PATCH 01/29] fix build vuduo - done, working Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/5c6ad4adae6b3f674e4f9ecedcd3201edcc3ae90 Author: max_10 Date: 2019-04-05 (Fri, 05 Apr 2019) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- acinclude.m4 | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 26bf1e1..993f5df 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -154,9 +154,9 @@ dnl end workaround AC_DEFUN([TUXBOX_BOXTYPE], [ AC_ARG_WITH(boxtype, - AS_HELP_STRING([--with-boxtype], [valid values: tripledragon, spark, azbox, generic, armbox, duckbox]), + AS_HELP_STRING([--with-boxtype], [valid values: tripledragon, spark, azbox, generic, armbox, duckbox, mipsbox]), [case "${withval}" in - tripledragon|spark|azbox|generic|armbox|duckbox) + tripledragon|spark|azbox|generic|armbox|duckbox|mipsbox) BOXTYPE="$withval" ;; *) @@ -169,7 +169,8 @@ AC_ARG_WITH(boxmodel, AS_HELP_STRING([--with-boxmodel], [valid for generic: raspi]) AS_HELP_STRING([], [valid for duckbox: ufs910, ufs912, ufs913, ufs922, atevio7500, fortis_hdbox, octagon1008, hs7110, hs7810a, hs7119, hs7819, dp7000, cuberevo, cuberevo_mini, cuberevo_mini2, cuberevo_250hd, cuberevo_2000hd, cuberevo_3000hd, ipbox9900, ipbox99, ipbox55, arivalink200, tf7700, hl101]) AS_HELP_STRING([], [valid for spark: spark, spark7162]) -AS_HELP_STRING([], [valid for armbox: hd51, hd60, vusolo4k, bre2ze4k]), +AS_HELP_STRING([], [valid for armbox: hd51, hd60, vusolo4k, bre2ze4k]) +AS_HELP_STRING([], [valid for mipsbox: vuduo]), [case "${withval}" in ufs910|ufs912|ufs913|ufs922|atevio7500|fortis_hdbox|octagon1008|hs7110|hs7810a|hs7119|hs7819|dp7000|cuberevo|cuberevo_mini|cuberevo_mini2|cuberevo_250hd|cuberevo_2000hd|cuberevo_3000hd|ipbox9900|ipbox99|ipbox55|arivalink200|tf7700|hl101) if test "$BOXTYPE" = "duckbox"; then @@ -192,6 +193,13 @@ AS_HELP_STRING([], [valid for armbox: hd51, hd60, vusolo4k, bre2ze4k]), AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE]) fi ;; + vuduo) + if test "$BOXTYPE" = "mipsbox"; then + BOXMODEL="$withval" + else + AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE]) + fi + ;; raspi) if test "$BOXTYPE" = "generic"; then BOXMODEL="$withval" @@ -213,6 +221,7 @@ AM_CONDITIONAL(BOXTYPE_SPARK, test "$BOXTYPE" = "spark") AM_CONDITIONAL(BOXTYPE_GENERIC, test "$BOXTYPE" = "generic") AM_CONDITIONAL(BOXTYPE_DUCKBOX, test "$BOXTYPE" = "duckbox") AM_CONDITIONAL(BOXTYPE_ARMBOX, test "$BOXTYPE" = "armbox") +AM_CONDITIONAL(BOXTYPE_MIPSBOX, test "$BOXTYPE" = "mipsbox") AM_CONDITIONAL(BOXMODEL_UFS910, test "$BOXMODEL" = "ufs910") AM_CONDITIONAL(BOXMODEL_UFS912, test "$BOXMODEL" = "ufs912") @@ -246,6 +255,7 @@ AM_CONDITIONAL(BOXMODEL_HD51, test "$BOXMODEL" = "hd51") AM_CONDITIONAL(BOXMODEL_HD60, test "$BOXMODEL" = "hd60") AM_CONDITIONAL(BOXMODEL_VUSOLO4K, test "$BOXMODEL" = "vusolo4k") AM_CONDITIONAL(BOXMODEL_BRE2ZE4K, test "$BOXMODEL" = "bre2ze4k") +AM_CONDITIONAL(BOXMODEL_VUDUO, test "$BOXMODEL" = "vuduo") AM_CONDITIONAL(BOXMODEL_RASPI, test "$BOXMODEL" = "raspi") @@ -263,6 +273,8 @@ elif test "$BOXTYPE" = "generic"; then AC_DEFINE(HAVE_GENERIC_HARDWARE, 1, [building for a generic device like a standard PC]) elif test "$BOXTYPE" = "armbox"; then AC_DEFINE(HAVE_ARM_HARDWARE, 1, [building for an armbox]) +elif test "$BOXTYPE" = "mipsbox"; then + AC_DEFINE(HAVE_MIPS_HARDWARE, 1, [building for an mipsbox]) fi # TODO: do we need more defines? @@ -326,6 +338,8 @@ elif test "$BOXMODEL" = "vusolo4k"; then AC_DEFINE(BOXMODEL_VUSOLO4K, 1, [vusolo4k]) elif test "$BOXMODEL" = "bre2ze4k"; then AC_DEFINE(BOXMODEL_BRE2ZE4K, 1, [bre2ze4k]) +elif test "$BOXMODEL" = "vuduo"; then + AC_DEFINE(BOXMODEL_VUDUO, 1, [vuduo]) elif test "$BOXMODEL" = "raspi"; then AC_DEFINE(BOXMODEL_RASPI, 1, [raspberry pi]) fi From 8a439cdc959a82641195d1f8a9e8fa3fea66400c Mon Sep 17 00:00:00 2001 From: BPanther Date: Fri, 5 Apr 2019 02:23:57 +0200 Subject: [PATCH 02/29] fix build vuduo - not yet ready Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/e9c79288bc0403e4ff867c572a63ae3eb6a0c6ac Author: BPanther Date: 2019-04-05 (Fri, 05 Apr 2019) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- Makefile.am | 11 ++++- common/ca_ci.cpp | 26 +++++------ configure.ac | 3 +- include/audio_hal.h | 2 + include/ca_hal.h | 2 +- include/cs_api.h | 2 +- include/playback_hal.h | 2 + include/record_hal.h | 2 + include/video_hal.h | 3 ++ libdvbci/descrambler.cpp | 4 +- libdvbci/dvbci_ccmgr.cpp | 2 +- libeplayer3-mips/Makefile.am | 69 +++++++++++++++++++++++++++++ libeplayer3-mips/README.md | 1 + libeplayer3-mips/container | 1 + libeplayer3-mips/external | 1 + libeplayer3-mips/include | 1 + libeplayer3-mips/main | 1 + libeplayer3-mips/manager | 1 + libeplayer3-mips/output | 1 + libeplayer3-mips/playback | 1 + 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 + 36 files changed, 214 insertions(+), 21 deletions(-) create mode 100644 libeplayer3-mips/Makefile.am create mode 120000 libeplayer3-mips/README.md create mode 120000 libeplayer3-mips/container create mode 120000 libeplayer3-mips/external create mode 120000 libeplayer3-mips/include create mode 120000 libeplayer3-mips/main create mode 120000 libeplayer3-mips/manager create mode 120000 libeplayer3-mips/output create mode 120000 libeplayer3-mips/playback 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 6861392..10b45bb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -66,9 +66,16 @@ SUBDIRS += libeplayer3-arm libstb_hal_la_LIBADD += \ libeplayer3-arm/libeplayer3_arm.la endif - endif - +endif +if BOXTYPE_MIPSBOX +SUBDIRS += libmipsbox libdvbci +libstb_hal_la_LIBADD += \ + libmipsbox/libmipsbox.la \ + libdvbci/libdvbci.la +SUBDIRS += libeplayer3-mips +libstb_hal_la_LIBADD += \ + libeplayer3-mips/libeplayer3_mips.la endif pkginclude_HEADERS = \ diff --git a/common/ca_ci.cpp b/common/ca_ci.cpp index c46e028..3f2d956 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 @@ -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; @@ -1060,7 +1060,7 @@ void cCA::setSource(eDVBCISlot* slot) } } -#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() @@ -1184,7 +1184,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 +1280,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 +1373,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 +1444,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 +1685,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 +1740,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 e0af117..533ce4b 100644 --- a/configure.ac +++ b/configure.ac @@ -108,10 +108,12 @@ fi AC_OUTPUT([ Makefile common/Makefile +libmipsbox/Makefile libarmbox/Makefile libazbox/Makefile libduckbox/Makefile libdvbci/Makefile +libeplayer3-mips/Makefile libeplayer3-arm/Makefile libeplayer3-sh4/Makefile libgeneric-pc/Makefile @@ -120,4 +122,3 @@ libspark/Makefile libtriple/Makefile tools/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_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/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/libdvbci/descrambler.cpp b/libdvbci/descrambler.cpp index 2d18585..48e2243 100644 --- a/libdvbci/descrambler.cpp +++ b/libdvbci/descrambler.cpp @@ -18,7 +18,7 @@ static const char * FILENAME = "[descrambler]"; static int desc_fd = -1; static int desc_user_count = 0; -#if HAVE_ARM_HARDWARE +#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE static const char *descrambler_filename = "/dev/ciplus_ca0"; @@ -131,7 +131,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 932e6b1..055bb8c 100644 --- a/libdvbci/dvbci_ccmgr.cpp +++ b/libdvbci/dvbci_ccmgr.cpp @@ -1353,7 +1353,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-mips/Makefile.am b/libeplayer3-mips/Makefile.am new file mode 100644 index 0000000..8cd8487 --- /dev/null +++ b/libeplayer3-mips/Makefile.am @@ -0,0 +1,69 @@ +AUTOMAKE_OPTIONS = subdir-objects +AM_CFLAGS = -Wall -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE + +CXXFLAGS = -Wall + +noinst_LTLIBRARIES = libeplayer3_mips.la + +AM_CPPFLAGS = -I$(srcdir)/include +AM_CPPFLAGS += -I$(top_srcdir)/include +AM_CPPFLAGS += -I$(srcdir)/external + +AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing + +SOURCE_FILES = container/container.c +SOURCE_FILES += container/container_ffmpeg.c +SOURCE_FILES += manager/manager.c +SOURCE_FILES += manager/audio.c +SOURCE_FILES += manager/video.c +SOURCE_FILES += manager/chapter.c +SOURCE_FILES += manager/subtitle.c +SOURCE_FILES += output/output_subtitle.c +SOURCE_FILES += output/output.c +SOURCE_FILES += output/writer/common/pes.c +SOURCE_FILES += output/writer/common/misc.c +SOURCE_FILES += output/writer/common/writer.c +SOURCE_FILES += output/linuxdvb_buffering.c +SOURCE_FILES += playback/playback.c +SOURCE_FILES += external/ffmpeg/src/bitstream.c +SOURCE_FILES += external/ffmpeg/src/latmenc.c +SOURCE_FILES += external/ffmpeg/src/mpeg4audio.c + +if ENABLE_FLV2MPEG4 +AM_CFLAGS += -DHAVE_FLV2MPEG4_CONVERTER +AM_CPPFLAGS += -I$(srcdir)/external/flv2mpeg4 +SOURCE_FILES += external/flv2mpeg4/src/m4vencode.c +SOURCE_FILES += external/flv2mpeg4/src/flvdecoder.c +SOURCE_FILES += external/flv2mpeg4/src/dcprediction.c +SOURCE_FILES += external/flv2mpeg4/src/flv2mpeg4.c +endif + +SOURCE_FILES += \ + output/linuxdvb_mipsel.c \ + output/writer/mipsel/writer.c \ + output/writer/mipsel/aac.c \ + output/writer/mipsel/ac3.c \ + output/writer/mipsel/mp3.c \ + output/writer/mipsel/pcm.c \ + output/writer/mipsel/lpcm.c \ + output/writer/mipsel/dts.c \ + output/writer/mipsel/amr.c \ + output/writer/mipsel/wma.c \ + output/writer/mipsel/h265.c \ + output/writer/mipsel/h264.c \ + output/writer/mipsel/mjpeg.c \ + output/writer/mipsel/mpeg2.c \ + output/writer/mipsel/mpeg4.c \ + output/writer/mipsel/divx3.c \ + output/writer/mipsel/vp.c \ + output/writer/mipsel/wmv.c \ + output/writer/mipsel/vc1.c + +libeplayer3_mips_la_SOURCES = $(SOURCE_FILES) + +LIBEPLAYER3_LIBS = libeplayer3_mips.la -lpthread -lavformat -lavcodec -lavutil -lswresample + +bin_PROGRAMS = eplayer3 +eplayer3_SOURCES = main/exteplayer.c +eplayer3_LDADD = $(LIBEPLAYER3_LIBS) +eplayer3_DEPENDENCIES = libeplayer3_mips.la diff --git a/libeplayer3-mips/README.md b/libeplayer3-mips/README.md new file mode 120000 index 0000000..ff408ad --- /dev/null +++ b/libeplayer3-mips/README.md @@ -0,0 +1 @@ +../libeplayer3-arm/README.md \ No newline at end of file diff --git a/libeplayer3-mips/container b/libeplayer3-mips/container new file mode 120000 index 0000000..2453de4 --- /dev/null +++ b/libeplayer3-mips/container @@ -0,0 +1 @@ +../libeplayer3-arm/container \ No newline at end of file diff --git a/libeplayer3-mips/external b/libeplayer3-mips/external new file mode 120000 index 0000000..2971e46 --- /dev/null +++ b/libeplayer3-mips/external @@ -0,0 +1 @@ +../libeplayer3-arm/external \ No newline at end of file diff --git a/libeplayer3-mips/include b/libeplayer3-mips/include new file mode 120000 index 0000000..df1d8f8 --- /dev/null +++ b/libeplayer3-mips/include @@ -0,0 +1 @@ +../libeplayer3-arm/include \ No newline at end of file diff --git a/libeplayer3-mips/main b/libeplayer3-mips/main new file mode 120000 index 0000000..2a8b5e2 --- /dev/null +++ b/libeplayer3-mips/main @@ -0,0 +1 @@ +../libeplayer3-arm/main \ No newline at end of file diff --git a/libeplayer3-mips/manager b/libeplayer3-mips/manager new file mode 120000 index 0000000..950094e --- /dev/null +++ b/libeplayer3-mips/manager @@ -0,0 +1 @@ +../libeplayer3-arm/manager \ No newline at end of file diff --git a/libeplayer3-mips/output b/libeplayer3-mips/output new file mode 120000 index 0000000..618f49c --- /dev/null +++ b/libeplayer3-mips/output @@ -0,0 +1 @@ +../libeplayer3-arm/output \ No newline at end of file diff --git a/libeplayer3-mips/playback b/libeplayer3-mips/playback new file mode 120000 index 0000000..7a8298e --- /dev/null +++ b/libeplayer3-mips/playback @@ -0,0 +1 @@ +../libeplayer3-arm/playback \ No newline at end of file diff --git a/libmipsbox/Makefile.am b/libmipsbox/Makefile.am new file mode 100644 index 0000000..df2e807 --- /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-mips/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 From 7e2c8fa98d9509543ff8b8144ebd1a64aceeb657 Mon Sep 17 00:00:00 2001 From: BPanther Date: Fri, 5 Apr 2019 04:05:28 +0200 Subject: [PATCH 03/29] fix build vuduo - done, working Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/3465b96a4bfe4fda4143b009a1b7f4cce082b4dc Author: BPanther Date: 2019-04-05 (Fri, 05 Apr 2019) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- common/Makefile.am | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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 += \ From 15ed957c39978ded4c63bbfd042644123f611bb3 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Wed, 10 Apr 2019 12:46:09 +0200 Subject: [PATCH 04/29] libeplayer3-arm/container/container_ffmpeg.c fix possible segfault Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/7ddec075b6a3c6e3d94396e642c1929c9c7a4d16 Author: Jacek Jendrzej Date: 2019-04-10 (Wed, 10 Apr 2019) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libeplayer3-arm/container/container_ffmpeg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libeplayer3-arm/container/container_ffmpeg.c b/libeplayer3-arm/container/container_ffmpeg.c index e2bd388..9467513 100644 --- a/libeplayer3-arm/container/container_ffmpeg.c +++ b/libeplayer3-arm/container/container_ffmpeg.c @@ -1990,7 +1990,8 @@ int32_t container_ffmpeg_update_tracks(Context_t *context, char *filename, int32 #endif ffmpeg_printf(20, "dump format\n"); - av_dump_format(avContextTab[0], 0, filename, 0); + if(avContextTab[0] != NULL) + av_dump_format(avContextTab[0], 0, filename, 0); uint32_t cAVIdx = 0; From fc61b8d980c41132323a5c951711c1ae331a8fad Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Sun, 13 Jan 2019 20:13:55 +0100 Subject: [PATCH 05/29] fix check mmap error, avoid possible segment fault Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/a3805658efb75181bd64cc6b5200aff5c4af7583 Author: Jacek Jendrzej Date: 2019-01-13 (Sun, 13 Jan 2019) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libarmbox/video.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libarmbox/video.cpp b/libarmbox/video.cpp index 0cf60bb..068ac81 100644 --- a/libarmbox/video.cpp +++ b/libarmbox/video.cpp @@ -1066,7 +1066,6 @@ void get_osd_size(int &xres, int &yres, int &bits_per_pixel) } void get_osd_buf(unsigned char *osd_data) { - unsigned char *lfb = NULL; struct fb_fix_screeninfo fix_screeninfo; struct fb_var_screeninfo var_screeninfo; @@ -1091,7 +1090,8 @@ void get_osd_buf(unsigned char *osd_data) return; } - if(!(lfb = (unsigned char*)mmap(0, fix_screeninfo.smem_len, PROT_READ | PROT_WRITE, MAP_SHARED, fb, 0))) + void *lfb = (unsigned char*)mmap(0, fix_screeninfo.smem_len, PROT_READ | PROT_WRITE, MAP_SHARED, fb, 0); + if(lfb == MAP_FAILED) { fprintf(stderr, "Framebuffer: \n"); close(fb); From 073cc1a866c127405853989adf3329872323b5d6 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Mon, 14 Jan 2019 10:44:13 +0100 Subject: [PATCH 06/29] try to fix unmap error,automatically unmapped don't work ? Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/a5b78f24ed046ebab01263679b9821fc53ebe23b Author: Jacek Jendrzej Date: 2019-01-14 (Mon, 14 Jan 2019) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libarmbox/video.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libarmbox/video.cpp b/libarmbox/video.cpp index 068ac81..fecec73 100644 --- a/libarmbox/video.cpp +++ b/libarmbox/video.cpp @@ -1069,7 +1069,7 @@ void get_osd_buf(unsigned char *osd_data) struct fb_fix_screeninfo fix_screeninfo; struct fb_var_screeninfo var_screeninfo; - int fb=open("/dev/fb/0", O_RDWR); + int fb=open("/dev/fb/0", O_RDONLY); if (fb == -1) { fprintf(stderr, "Framebuffer failed\n"); @@ -1090,7 +1090,7 @@ void get_osd_buf(unsigned char *osd_data) return; } - void *lfb = (unsigned char*)mmap(0, fix_screeninfo.smem_len, PROT_READ | PROT_WRITE, MAP_SHARED, fb, 0); + void *lfb = (unsigned char*)mmap(0, fix_screeninfo.smem_len, PROT_READ , MAP_SHARED, fb, 0); if(lfb == MAP_FAILED) { fprintf(stderr, "Framebuffer: \n"); @@ -1104,6 +1104,12 @@ void get_osd_buf(unsigned char *osd_data) // get 32bit framebuffer memcpy(osd_data,lfb,fix_screeninfo.line_length*var_screeninfo.yres); } + + if (munmap(lfb, fix_screeninfo.smem_len) == -1) + { + perror("Error un-mmapping"); + } + close(fb); } From 2729a7868427d6fb34a6b19e753c5ad28c4813ef Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 16 Apr 2019 23:15:58 +0200 Subject: [PATCH 07/29] fix indentation Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/1bc4ba58f7ba417e369c1486cfefc8a251d6b2b8 Author: vanhofen Date: 2019-04-16 (Tue, 16 Apr 2019) Origin message was: ------------------ - fix indentation ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libarmbox/video.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libarmbox/video.cpp b/libarmbox/video.cpp index fecec73..d21b0d7 100644 --- a/libarmbox/video.cpp +++ b/libarmbox/video.cpp @@ -1105,10 +1105,10 @@ void get_osd_buf(unsigned char *osd_data) memcpy(osd_data,lfb,fix_screeninfo.line_length*var_screeninfo.yres); } - if (munmap(lfb, fix_screeninfo.smem_len) == -1) + if (munmap(lfb, fix_screeninfo.smem_len) == -1) { perror("Error un-mmapping"); - } + } close(fb); } From 14ef710ab415df16dd6c365524b24dd246606565 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 16 Apr 2019 23:21:39 +0200 Subject: [PATCH 08/29] acinclude.m4: align to neutrino's acinclude.m4; fix exec_prefix variable in cdk-mode too Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/2315b8a9853808b3955358c1b6c40a2f947f4468 Author: vanhofen Date: 2019-04-16 (Tue, 16 Apr 2019) Origin message was: ------------------ - acinclude.m4: align to neutrino's acinclude.m4; fix exec_prefix variable in cdk-mode too ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- acinclude.m4 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 993f5df..be1cc74 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -36,11 +36,9 @@ if test "$TARGET" = "native"; then if test "$prefix" = "NONE"; then prefix=/usr/local fi - TARGET_PREFIX=$prefix - if test "$exec_prefix" = "NONE"; then - exec_prefix=$prefix - fi targetprefix=$prefix + TARGET_PREFIX=$prefix + AC_DEFINE_UNQUOTED(TARGET_PREFIX, "$TARGET_PREFIX", [The targets prefix]) elif test "$TARGET" = "cdk"; then AC_MSG_RESULT(cdk) @@ -65,6 +63,10 @@ else AC_MSG_ERROR([invalid target $TARGET, choose on from native,cdk]); fi +if test "$exec_prefix" = "NONE"; then + exec_prefix=$prefix +fi + AC_CANONICAL_BUILD AC_CANONICAL_HOST AC_SYS_LARGEFILE From 19a6b5fd2d7b6310384788e6ebaa8a85117e70c7 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 16 Apr 2019 23:36:33 +0200 Subject: [PATCH 09/29] acinclude.m4: remove obsolete TUXBOX_APPS_DIRECTORY macro Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/b5ff37cdc58a62cc336a9118b1eb62539b3a12d9 Author: vanhofen Date: 2019-04-16 (Tue, 16 Apr 2019) Origin message was: ------------------ - acinclude.m4: remove obsolete TUXBOX_APPS_DIRECTORY macro ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- acinclude.m4 | 81 ---------------------------------------------------- 1 file changed, 81 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index be1cc74..8edb8f3 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -73,87 +73,6 @@ AC_SYS_LARGEFILE ]) -dnl expand nested ${foo}/bar -AC_DEFUN([TUXBOX_EXPAND_VARIABLE], [ - __$1="$2" - for __CNT in false false false false true; do dnl max 5 levels of indirection - $1=`eval echo "$__$1"` - echo ${$1} | grep -q '\$' || break # 'grep -q' is POSIX, exit if no $ in variable - __$1="${$1}" - done - $__CNT && AC_MSG_ERROR([can't expand variable $1=$2]) dnl bail out if we did not expand -]) - -AC_DEFUN([TUXBOX_APPS_DIRECTORY_ONE], [ -AC_ARG_WITH($1, AS_HELP_STRING([$6], [$7 [[PREFIX$4$5]]], [32], [79]), [ - _$2=$withval - if test "$TARGET" = "cdk"; then - $2=`eval echo "$TARGET_PREFIX$withval"` # no indirection possible IMNSHO - else - $2=$withval - fi - TARGET_$2=${$2} -], [ - # RFC 1925: "you can always add another level of indirection..." - TUXBOX_EXPAND_VARIABLE($2,"${$3}$5") - if test "$TARGET" = "cdk"; then - TUXBOX_EXPAND_VARIABLE(_$2,"${target$3}$5") - else - _$2=${$2} - fi - TARGET_$2=$_$2 -]) -dnl AC_SUBST($2) -AC_DEFINE_UNQUOTED($2,"$_$2",$7) -AC_SUBST(TARGET_$2) -]) - -AC_DEFUN([TUXBOX_APPS_DIRECTORY], [ -AC_REQUIRE([TUXBOX_APPS]) - -if test "$TARGET" = "cdk"; then - datadir="\${prefix}/share" - sysconfdir="\${prefix}/etc" - localstatedir="\${prefix}/var" - libdir="\${prefix}/lib" - targetdatadir="\${TARGET_PREFIX}/share" - targetsysconfdir="\${TARGET_PREFIX}/etc" - targetlocalstatedir="\${TARGET_PREFIX}/var" - targetlibdir="\${TARGET_PREFIX}/lib" -fi - -TUXBOX_APPS_DIRECTORY_ONE(configdir, CONFIGDIR, localstatedir, /var, /tuxbox/config, - [--with-configdir=PATH], [where to find config files]) - -TUXBOX_APPS_DIRECTORY_ONE(datadir, DATADIR, datadir, /share, /tuxbox, - [--with-datadir=PATH], [where to find data files]) - -TUXBOX_APPS_DIRECTORY_ONE(fontdir, FONTDIR, datadir, /share, /fonts, - [--with-fontdir=PATH], [where to find fonts]) - -TUXBOX_APPS_DIRECTORY_ONE(gamesdir, GAMESDIR, localstatedir, /var, /tuxbox/games, - [--with-gamesdir=PATH], [where to find games]) - -TUXBOX_APPS_DIRECTORY_ONE(libdir, LIBDIR, libdir, /lib, /tuxbox, - [--with-libdir=PATH], [where to find internal libs]) - -TUXBOX_APPS_DIRECTORY_ONE(plugindir, PLUGINDIR, libdir, /lib, /tuxbox/plugins, - [--with-plugindir=PATH], [where to find plugins]) - -TUXBOX_APPS_DIRECTORY_ONE(themesdir, THEMESDIR, datadir, /share, /tuxbox/neutrino/themes, - [--with-themesdir=PATH], [where to find themes]) -]) - -dnl automake <= 1.6 needs this specifications -AC_SUBST(CONFIGDIR) -AC_SUBST(DATADIR) -AC_SUBST(FONTDIR) -AC_SUBST(GAMESDIR) -AC_SUBST(LIBDIR) -AC_SUBST(PLUGINDIR) -AC_SUBST(THEMESDIR) -dnl end workaround - AC_DEFUN([TUXBOX_BOXTYPE], [ AC_ARG_WITH(boxtype, AS_HELP_STRING([--with-boxtype], [valid values: tripledragon, spark, azbox, generic, armbox, duckbox, mipsbox]), From 31490a2894dab30d7e8dffae773e8eccae440c1a Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 16 Apr 2019 23:56:54 +0200 Subject: [PATCH 10/29] configure.ac: completion of "remove obsolete TUXBOX_APPS_DIRECTORY macro" Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/d649522bb24cf63212d8184937595941011d0d13 Author: vanhofen Date: 2019-04-16 (Tue, 16 Apr 2019) Origin message was: ------------------ - configure.ac: completion of "remove obsolete TUXBOX_APPS_DIRECTORY macro" ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- configure.ac | 1 - 1 file changed, 1 deletion(-) diff --git a/configure.ac b/configure.ac index 533ce4b..19bce57 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,6 @@ AC_DEFINE(PACKAGE_VERSION_MICRO, ver_micro, [Micro version number]) AC_DEFINE(PACKAGE_VERSION_GIT, "ver_git", [internal vcs version info]) TUXBOX_APPS -TUXBOX_APPS_DIRECTORY TUXBOX_BOXTYPE AC_PROG_CC From a474b49ddde19ae12f7802451cec79490ed3e0c9 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 24 Apr 2019 12:27:58 +0200 Subject: [PATCH 11/29] .gitignore: a bit more structure; inspired by https://github.com/github/gitignore Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/68821bd25ef3364a0afa3df7a169c777ad20e38d Author: vanhofen Date: 2019-04-24 (Wed, 24 Apr 2019) Origin message was: ------------------ - .gitignore: a bit more structure; inspired by https://github.com/github/gitignore ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- .gitignore | 63 ++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 52 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index cb5d9ac..0501f62 100644 --- a/.gitignore +++ b/.gitignore @@ -1,27 +1,68 @@ -/aclocal.m4 -/autom4te.cache/ +### http://www.gnu.org/software/automake +Makefile Makefile.in + +### http://www.gnu.org/software/autoconf +autom4te.cache +/autoscan.log +/autoscan-*.log +/aclocal.m4 /compile /config.guess /config.h.in +/config.log +/config.status /config.sub -*/*-config.h -*/*-config.h.in /configure -*.directory +/configure.scan /depcomp /install-sh -/ltmain.sh -/m4/ /missing -*.*~ -*.a -*.la -*.lai +/stamp-h* + +### https://www.gnu.org/software/libtool/ +/libtool +/ltmain.sh + +### http://www.gnu.org/software/m4/ +m4/libtool.m4 +m4/ltoptions.m4 +m4/ltsugar.m4 +m4/ltversion.m4 +m4/lt~obsolete.m4 + +### compiled objects and libs +.libs *.lo *.o +*.so +*.lai +*.la +*.a + +### dependency files +.deps *.Plo *.Po +### diff and patch files +*.patch +*.diff +*.orig +*.rej + +### system generated stuff +# dolphin +.directory +# kate +*-swp +.*.swp + +### generally excluded files +*~ +*.pc git-* go_* + +### header files that fall out of the build +libstb-hal-config.h From 201845d6946bee919a089489a79bf25a53d192af Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 24 Apr 2019 12:36:29 +0200 Subject: [PATCH 12/29] configure.ac: remove AC_CONFIG_MACRO_DIR macro Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/07979c8cd2d9a07c93839a6fdba75bb5d123e2ca Author: vanhofen Date: 2019-04-24 (Wed, 24 Apr 2019) Origin message was: ------------------ - configure.ac: remove AC_CONFIG_MACRO_DIR macro ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- configure.ac | 1 - 1 file changed, 1 deletion(-) diff --git a/configure.ac b/configure.ac index 19bce57..b912772 100644 --- a/configure.ac +++ b/configure.ac @@ -15,7 +15,6 @@ AC_INIT([Tuxbox-libstb-hal], [ver_major.ver_minor.ver_micro]) AM_INIT_AUTOMAKE AC_CONFIG_HEADERS([libstb-hal-config.h:config.h.in]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) -AC_CONFIG_MACRO_DIR([m4]) AC_GNU_SOURCE AC_DEFINE(PACKAGE_VERSION_MAJOR, ver_major, [Major version number]) From bea2e3c1704b96719cf85255a76045d3c2b15bee Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 24 Apr 2019 12:54:33 +0200 Subject: [PATCH 13/29] Makefile.am: remove non-working pkginclude_HEADERS Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/61fbdd8df3c0b79cd8c02f50af7c10839e3638b2 Author: vanhofen Date: 2019-04-24 (Wed, 24 Apr 2019) Origin message was: ------------------ - Makefile.am: remove non-working pkginclude_HEADERS ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- Makefile.am | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/Makefile.am b/Makefile.am index 10b45bb..1443044 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,11 +17,13 @@ SUBDIRS += libtriple libstb_hal_la_LIBADD += \ libtriple/libtriple.la endif + if BOXTYPE_AZBOX SUBDIRS += libazbox libstb_hal_la_LIBADD += \ libazbox/libazbox.la endif + if BOXTYPE_GENERIC if BOXMODEL_RASPI SUBDIRS += libraspi @@ -33,6 +35,7 @@ libstb_hal_la_LIBADD += \ libgeneric-pc/libgeneric.la endif endif + if BOXTYPE_SPARK #libstb_hal_test_LDADD += -lasound SUBDIRS += libspark libeplayer3-sh4 @@ -40,6 +43,7 @@ libstb_hal_la_LIBADD += \ libspark/libspark.la \ libeplayer3-sh4/libeplayer3_sh4.la endif + if BOXTYPE_DUCKBOX #libstb_hal_test_LDADD += -lasound SUBDIRS += libduckbox libeplayer3-sh4 libdvbci @@ -48,6 +52,7 @@ libstb_hal_la_LIBADD += \ libeplayer3-sh4/libeplayer3_sh4.la \ libdvbci/libdvbci.la endif + if BOXTYPE_ARMBOX if BOXMODEL_HD60 SUBDIRS += libarmbox @@ -59,15 +64,14 @@ SUBDIRS += libarmbox libdvbci libstb_hal_la_LIBADD += \ libarmbox/libarmbox.la \ libdvbci/libdvbci.la - if !ENABLE_GSTREAMER_10 SUBDIRS += libeplayer3-arm - libstb_hal_la_LIBADD += \ libeplayer3-arm/libeplayer3_arm.la endif endif endif + if BOXTYPE_MIPSBOX SUBDIRS += libmipsbox libdvbci libstb_hal_la_LIBADD += \ @@ -77,21 +81,3 @@ SUBDIRS += libeplayer3-mips libstb_hal_la_LIBADD += \ libeplayer3-mips/libeplayer3_mips.la endif - -pkginclude_HEADERS = \ - include/audio_hal.h \ - include/ca.h \ - include/ca_ci.h \ - include/ca_hal.h \ - include/cs_api.h \ - include/cs_types.h \ - include/dmx_hal.h \ - include/glfb.h \ - include/hardware_caps.h \ - include/init.h \ - include/mmi.h \ - include/playback_hal.h \ - include/pwrmngr.h \ - include/record_hal.h \ - include/version_hal.h \ - include/video_hal.h From e0668522007724ba3300010d4f110dd621c6ce8b Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 24 Apr 2019 13:16:53 +0200 Subject: [PATCH 14/29] configure.ac: autoupdate Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/c1fde79388cc57238b60e2d1695ca769df116937 Author: vanhofen Date: 2019-04-24 (Wed, 24 Apr 2019) Origin message was: ------------------ - configure.ac: autoupdate ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- configure.ac | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index b912772..0f39684 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ define(ver_git, m4_esyscmd([ ])) AC_PACKAGE_NAME, PACKAGE_NAME_LIBSTB_HAL -AC_INIT([Tuxbox-libstb-hal], [ver_major.ver_minor.ver_micro]) +AC_INIT([libstb-hal], [ver_major.ver_minor.ver_micro]) AM_INIT_AUTOMAKE AC_CONFIG_HEADERS([libstb-hal-config.h:config.h.in]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) @@ -35,7 +35,7 @@ PKG_PROG_PKG_CONFIG AC_DISABLE_SHARED AC_DISABLE_STATIC AC_SYS_LARGEFILE -AC_PROG_LIBTOOL +LT_INIT AC_ARG_ENABLE(clutter, AS_HELP_STRING(--enable-clutter, use clutter instead of OpenGL), @@ -103,7 +103,7 @@ if test "$enable_flv2mpeg4" = "yes"; then AC_DEFINE(ENABLE_FLV2MPEG4, 1, [use flv2mpeg4 libeplayer3-arm]) fi -AC_OUTPUT([ +AC_CONFIG_FILES([ Makefile common/Makefile libmipsbox/Makefile @@ -120,3 +120,5 @@ libspark/Makefile libtriple/Makefile tools/Makefile ]) + +AC_OUTPUT From 314cf9c0ce6116592827f8b1ff411e25dd4c03f7 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 24 Apr 2019 13:26:42 +0200 Subject: [PATCH 15/29] configure.ac: add foreign switch to AM_INIT_AUTOMAKE macro Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/36dde1c2ab21606ba7e646153faf05616ff7d69f Author: vanhofen Date: 2019-04-24 (Wed, 24 Apr 2019) Origin message was: ------------------ - configure.ac: add foreign switch to AM_INIT_AUTOMAKE macro ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- autogen.sh | 2 +- configure.ac | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/autogen.sh b/autogen.sh index 4b211a4..97752be 100755 --- a/autogen.sh +++ b/autogen.sh @@ -5,4 +5,4 @@ aclocal --force libtoolize --force autoconf --force autoheader --force -automake --add-missing --force-missing --foreign +automake --add-missing --force-missing diff --git a/configure.ac b/configure.ac index 0f39684..e5ab8c3 100644 --- a/configure.ac +++ b/configure.ac @@ -11,8 +11,8 @@ define(ver_git, m4_esyscmd([ ])) AC_PACKAGE_NAME, PACKAGE_NAME_LIBSTB_HAL -AC_INIT([libstb-hal], [ver_major.ver_minor.ver_micro]) -AM_INIT_AUTOMAKE +AC_INIT([libstb-hal],[ver_major.ver_minor.ver_micro]) +AM_INIT_AUTOMAKE([foreign]) AC_CONFIG_HEADERS([libstb-hal-config.h:config.h.in]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) AC_GNU_SOURCE From 4531af158a69402eb35815663c63cba7ca531b08 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 24 Apr 2019 13:30:20 +0200 Subject: [PATCH 16/29] add missing empty INSTALL file Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/5508ab7e3decc98824a71523469d4b6d9fc1e0d0 Author: vanhofen Date: 2019-04-24 (Wed, 24 Apr 2019) Origin message was: ------------------ - add missing empty INSTALL file ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- INSTALL | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 INSTALL diff --git a/INSTALL b/INSTALL new file mode 100644 index 0000000..e69de29 From 9565abdafa70c43aff5180e98b015debc1c23af7 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 24 Apr 2019 13:52:42 +0200 Subject: [PATCH 17/29] fill COPYING file with GPLv2 Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/421fba7f6c884700211df4ee395dbafaeaa5cd6a Author: vanhofen Date: 2019-04-24 (Wed, 24 Apr 2019) Origin message was: ------------------ - fill COPYING file with GPLv2 ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- COPYING | 339 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 339 insertions(+) diff --git a/COPYING b/COPYING index e69de29..d159169 100644 --- a/COPYING +++ b/COPYING @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. From 2601f11e533a7ec41503e5c79df101fa6fc97d89 Mon Sep 17 00:00:00 2001 From: BPanther Date: Sat, 27 Apr 2019 07:43:02 +0200 Subject: [PATCH 18/29] vusolo4k enable fcc Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/1118b7fe5436068d054f84e47adea9952eb09945 Author: BPanther Date: 2019-04-27 (Sat, 27 Apr 2019) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libarmbox/init.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libarmbox/init.cpp b/libarmbox/init.cpp index 367f6f4..573266e 100644 --- a/libarmbox/init.cpp +++ b/libarmbox/init.cpp @@ -1,5 +1,6 @@ -#include +#include +#include #include #include #include @@ -37,6 +38,10 @@ void hal_api_init() proc_put("/proc/stb/fb/dst_width", buffer, strlen(buffer)); sprintf(buffer, "%x", 1); proc_put("/proc/stb/fb/dst_apply", buffer, strlen(buffer)); +#if BOXMODEL_VUSOLO4K + const char mode_fcc[] = { "enable" }; + proc_put("/proc/stb/frontend/fbc/fcc", mode_fcc, strlen(mode_fcc)); +#endif } initialized = true; hal_info("%s end\n", __FUNCTION__); From 75f3286fe59a03a176a6e1d955aab8296d45e392 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Thu, 9 May 2019 18:05:59 +0200 Subject: [PATCH 19/29] generic-pc: avoid segfault Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/43f0dfac279668bc5b98bdcc90943cc35aecd7d2 Author: Jacek Jendrzej Date: 2019-05-09 (Thu, 09 May 2019) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libgeneric-pc/audio.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libgeneric-pc/audio.cpp b/libgeneric-pc/audio.cpp index ce13a9b..3c01199 100644 --- a/libgeneric-pc/audio.cpp +++ b/libgeneric-pc/audio.cpp @@ -472,7 +472,8 @@ void cAudio::run() hal_debug("%s: pts 0x%" PRIx64 " %3f\n", __func__, curr_pts, curr_pts/90000.0); int o_buf_sz = av_samples_get_buffer_size(&out_linesize, o_ch, obuf_sz, AV_SAMPLE_FMT_S16, 1); - ao_play(adevice, (char *)obuf, o_buf_sz); + if (o_buf_sz > 0) + ao_play(adevice, (char *)obuf, o_buf_sz); } av_packet_unref(&avpkt); } From b853698e8114f86388e87269396e10d041a34744 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Sat, 11 May 2019 19:43:39 +0200 Subject: [PATCH 20/29] generic-pc: avoid segfault Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/362dfb5edf0e1b9794925bda5a97e3dfcc9e6101 Author: Jacek Jendrzej Date: 2019-05-11 (Sat, 11 May 2019) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libgeneric-pc/audio.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libgeneric-pc/audio.cpp b/libgeneric-pc/audio.cpp index 3c01199..b112518 100644 --- a/libgeneric-pc/audio.cpp +++ b/libgeneric-pc/audio.cpp @@ -400,6 +400,11 @@ void cAudio::run() hal_info("%s: avcodec_open2() failed\n", __func__); goto out; } + if(p->sample_rate == 0 || p->channels == 0){ + av_get_sample_fmt_string(tmp, sizeof(tmp), c->sample_fmt); + hal_info("Header missing %s, sample_fmt %d (%s) sample_rate %d channels %d\n",avcodec_get_name(p->codec_id), c->sample_fmt, tmp, p->sample_rate, p->channels); + goto out2; + } frame = av_frame_alloc(); if (!frame) { hal_info("%s: av_frame_alloc failed\n", __func__); From 9623de1e852c4dc91560bd3dae231674cd4652f1 Mon Sep 17 00:00:00 2001 From: max_10 Date: Fri, 17 May 2019 10:39:36 +0200 Subject: [PATCH 21/29] libgeneric-pc: reduce ffmpeg warnings Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/594ea2e043e4716620c6bf5a8baec88e8d91491b Author: max_10 Date: 2019-05-17 (Fri, 17 May 2019) Origin message was: ------------------ - libgeneric-pc: reduce ffmpeg warnings ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libgeneric-pc/audio.cpp | 6 ++++++ libgeneric-pc/video.cpp | 10 ++++++++++ 2 files changed, 16 insertions(+) diff --git a/libgeneric-pc/audio.cpp b/libgeneric-pc/audio.cpp index b112518..3d484fd 100644 --- a/libgeneric-pc/audio.cpp +++ b/libgeneric-pc/audio.cpp @@ -336,7 +336,9 @@ void cAudio::run() { hal_info("====================== start decoder thread ================================\n"); /* libavcodec & friends */ +#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 9, 100) av_register_all(); +#endif AVCodec *codec; AVFormatContext *avfc = NULL; @@ -473,7 +475,11 @@ void cAudio::run() } obuf_sz = swr_convert(swr, &obuf, obuf_sz, (const uint8_t **)frame->extended_data, frame->nb_samples); +#if (LIBAVUTIL_VERSION_MAJOR < 54) curr_pts = av_frame_get_best_effort_timestamp(frame); +#else + curr_pts = frame->best_effort_timestamp; +#endif hal_debug("%s: pts 0x%" PRIx64 " %3f\n", __func__, curr_pts, curr_pts/90000.0); int o_buf_sz = av_samples_get_buffer_size(&out_linesize, o_ch, obuf_sz, AV_SAMPLE_FMT_S16, 1); diff --git a/libgeneric-pc/video.cpp b/libgeneric-pc/video.cpp index d86e058..5c3aa0e 100644 --- a/libgeneric-pc/video.cpp +++ b/libgeneric-pc/video.cpp @@ -77,7 +77,9 @@ static const AVRational aspect_ratios[6] = { cVideo::cVideo(int, void *, void *, unsigned int) { hal_debug("%s\n", __func__); +#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 9, 100) av_register_all(); +#endif if (!HAL_nodec) dmxbuf = (uint8_t *)malloc(DMX_BUF_SZ); bufpos = 0; @@ -575,7 +577,11 @@ void cVideo::run(void) } f->width(c->width); f->height(c->height); +#if (LIBAVUTIL_VERSION_MAJOR < 54) int64_t vpts = av_frame_get_best_effort_timestamp(frame); +#else + int64_t vpts = frame->best_effort_timestamp; +#endif /* a/v delay determined experimentally :-) */ #if USE_OPENGL if (v_format == VIDEO_FORMAT_MPEG2) @@ -605,7 +611,11 @@ void cVideo::run(void) } hal_debug("%s: time_base: %d/%d, ticks: %d rate: %d pts 0x%" PRIx64 "\n", __func__, c->time_base.num, c->time_base.den, c->ticks_per_frame, dec_r, +#if (LIBAVUTIL_VERSION_MAJOR < 54) av_frame_get_best_effort_timestamp(frame)); +#else + frame->best_effort_timestamp); +#endif } else hal_debug("%s: got_frame: %d stillpicture: %d\n", __func__, got_frame, stillpicture); still_m.unlock(); From 739f17e94284554dcb98046e0ea7f80de21f7287 Mon Sep 17 00:00:00 2001 From: max_10 Date: Fri, 24 May 2019 15:12:15 +0200 Subject: [PATCH 22/29] libdvbci: no define CA_SET_DESCR_DATA, read from linux/dvb/ca.h Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/d17a16d51ee075fe4145575c103912ac649769c9 Author: max_10 Date: 2019-05-24 (Fri, 24 May 2019) Origin message was: ------------------ - libdvbci: no define CA_SET_DESCR_DATA, read from linux/dvb/ca.h ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libdvbci/descrambler.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libdvbci/descrambler.cpp b/libdvbci/descrambler.cpp index 48e2243..ac556c1 100644 --- a/libdvbci/descrambler.cpp +++ b/libdvbci/descrambler.cpp @@ -18,10 +18,7 @@ static const char * FILENAME = "[descrambler]"; static int desc_fd = -1; static int desc_user_count = 0; -#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE - -static const char *descrambler_filename = "/dev/ciplus_ca0"; - +#ifndef CA_SET_DESCR_DATA enum ca_descr_data_type { CA_DATA_IV, CA_DATA_KEY, @@ -41,6 +38,11 @@ struct ca_descr_data { }; #define CA_SET_DESCR_DATA _IOW('o', 137, struct ca_descr_data) +#endif + +#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE + +static const char *descrambler_filename = "/dev/ciplus_ca0"; int descrambler_set_key(int index, int parity, unsigned char *data) { From 9e961d7895ee299a580557438f89d19eb831eee2 Mon Sep 17 00:00:00 2001 From: max_10 Date: Fri, 24 May 2019 15:15:39 +0200 Subject: [PATCH 23/29] libdvbci: add CA_SET_PID, for kernels > 4.14 Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/bfbaa3f44c340e70280620edd54250e879a018a6 Author: max_10 Date: 2019-05-24 (Fri, 24 May 2019) Origin message was: ------------------ - libdvbci: add CA_SET_PID, for kernels > 4.14 ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libdvbci/descrambler.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libdvbci/descrambler.cpp b/libdvbci/descrambler.cpp index ac556c1..6345f0a 100644 --- a/libdvbci/descrambler.cpp +++ b/libdvbci/descrambler.cpp @@ -18,6 +18,15 @@ static const char * FILENAME = "[descrambler]"; static int desc_fd = -1; static int desc_user_count = 0; +#ifndef CA_SET_PID +typedef struct ca_pid { + unsigned int pid; + int index; /* -1 == disable*/ +} ca_pid_t; + +#define CA_SET_PID _IOW('o', 135, ca_pid_t) +#endif + #ifndef CA_SET_DESCR_DATA enum ca_descr_data_type { CA_DATA_IV, From f23152f806495d3b196bbcde5610aa84f08fd824 Mon Sep 17 00:00:00 2001 From: GetAway Date: Fri, 14 Jun 2019 20:16:02 +0200 Subject: [PATCH 24/29] surpress sprintf() warning when compiling with newer gcc and -Werror=format-overflow Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/d7daff838e7d4b3b2b90addc6db418ed9f1d8c4c Author: GetAway Date: 2019-06-14 (Fri, 14 Jun 2019) ------------------ This commit was generated by Migit --- tools/pic2m2v.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/pic2m2v.c b/tools/pic2m2v.c index 11b98ea..e70a78e 100644 --- a/tools/pic2m2v.c +++ b/tools/pic2m2v.c @@ -33,7 +33,7 @@ int main(int argc, char **argv) { - char destname[512]; + char destname[448]; char cmd[512]; char *p; char *fname; From d6ebfb5c5fb6632515ef7cd77ba55a02887d23c7 Mon Sep 17 00:00:00 2001 From: GetAway Date: Fri, 14 Jun 2019 21:03:10 +0200 Subject: [PATCH 25/29] libstb_hal: Suppress implicit-fallthrough warnings from GCC 7 Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/1f004bd0fdfd603cff14adf65b46468d6a17fedc Author: GetAway Date: 2019-06-14 (Fri, 14 Jun 2019) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libarmbox/hdmi_cec.cpp | 2 ++ libdvbci/dvbci_camgr.cpp | 1 + libdvbci/dvbci_ccmgr.cpp | 1 + libdvbci/dvbci_datetimemgr.cpp | 1 + libdvbci/dvbci_session.cpp | 3 ++- libeplayer3-arm/output/writer/mipsel/pcm.c | 3 +++ 6 files changed, 10 insertions(+), 1 deletion(-) diff --git a/libarmbox/hdmi_cec.cpp b/libarmbox/hdmi_cec.cpp index c2265d7..8ebe131 100644 --- a/libarmbox/hdmi_cec.cpp +++ b/libarmbox/hdmi_cec.cpp @@ -555,8 +555,10 @@ void hdmi_cec::Receive() break; } case CEC_OPCODE_USER_CONTROL_PRESSED: /* key pressed */ + { keypressed = true; pressedkey = rxmessage.data[1]; + } // fall through case CEC_OPCODE_USER_CONTROL_RELEASE: /* key released */ { long code = translateKey(pressedkey); diff --git a/libdvbci/dvbci_camgr.cpp b/libdvbci/dvbci_camgr.cpp index 6f1264c..88ac727 100644 --- a/libdvbci/dvbci_camgr.cpp +++ b/libdvbci/dvbci_camgr.cpp @@ -85,6 +85,7 @@ int eDVBCICAManagerSession::doAction() } case stateFinal: printf("[CI CA] stateFinal and action should not happen\n"); + // fall through default: return 0; } diff --git a/libdvbci/dvbci_ccmgr.cpp b/libdvbci/dvbci_ccmgr.cpp index 055bb8c..464aa51 100644 --- a/libdvbci/dvbci_ccmgr.cpp +++ b/libdvbci/dvbci_ccmgr.cpp @@ -1339,6 +1339,7 @@ int eDVBCIContentControlManagerSession::doAction() } case stateFinal: printf("stateFinal und action! kann doch garnicht sein ;)\n"); + // fall through default: return 0; } diff --git a/libdvbci/dvbci_datetimemgr.cpp b/libdvbci/dvbci_datetimemgr.cpp index 26dbd79..d6206c2 100644 --- a/libdvbci/dvbci_datetimemgr.cpp +++ b/libdvbci/dvbci_datetimemgr.cpp @@ -52,6 +52,7 @@ int eDVBCIDateTimeSession::doAction() return 0; case stateFinal: printf("stateFinal und action! kann doch garnicht sein ;)\n"); + // fall through default: return 0; } diff --git a/libdvbci/dvbci_session.cpp b/libdvbci/dvbci_session.cpp index 7618526..d4fe5c3 100644 --- a/libdvbci/dvbci_session.cpp +++ b/libdvbci/dvbci_session.cpp @@ -179,11 +179,12 @@ eDVBCISession* eDVBCISession::createSession(eDVBCISlot *slot, const unsigned cha printf("[CI SESS] CC MANAGER\n"); sessions[session_nb - 1] = new eDVBCIContentControlManagerSession(slot); break; - } + } // fall through case 0x00100041: // session=new eDVBCIAuthSession; printf("[CI SESS] AuthSession\n"); // break; + // fall through case 0x00200041: default: printf("[CI SESS] unknown resource type %02x %02x %02x %02x\n", resource_identifier[0], resource_identifier[1], resource_identifier[2], resource_identifier[3]); diff --git a/libeplayer3-arm/output/writer/mipsel/pcm.c b/libeplayer3-arm/output/writer/mipsel/pcm.c index d24b4e2..30caa13 100644 --- a/libeplayer3-arm/output/writer/mipsel/pcm.c +++ b/libeplayer3-arm/output/writer/mipsel/pcm.c @@ -137,6 +137,7 @@ static int writeData(WriterAVCallData_t *call) case AV_CODEC_ID_PCM_S16LE: case AV_CODEC_ID_PCM_U16LE: LE = 1; + // fall through case AV_CODEC_ID_PCM_S16BE: case AV_CODEC_ID_PCM_U16BE: width = depth = 16; @@ -144,6 +145,7 @@ static int writeData(WriterAVCallData_t *call) case AV_CODEC_ID_PCM_S24LE: case AV_CODEC_ID_PCM_U24LE: LE = 1; + // fall through case AV_CODEC_ID_PCM_S24BE: case AV_CODEC_ID_PCM_U24BE: width = depth = 24; @@ -151,6 +153,7 @@ static int writeData(WriterAVCallData_t *call) case AV_CODEC_ID_PCM_S32LE: case AV_CODEC_ID_PCM_U32LE: LE = 1; + // fall through case AV_CODEC_ID_PCM_S32BE: case AV_CODEC_ID_PCM_U32BE: width = depth = 32; From d955ec6ec477c5c2eef45e78181387e4af380502 Mon Sep 17 00:00:00 2001 From: max_10 Date: Sat, 15 Jun 2019 01:36:51 +0200 Subject: [PATCH 26/29] remove libeplayer3-mips Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/ef8f0cdf1a89c057282e4c9c27e446be0bff9a9b Author: max_10 Date: 2019-06-15 (Sat, 15 Jun 2019) Origin message was: ------------------ - remove libeplayer3-mips ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libeplayer3-mips/Makefile.am | 69 ------------------------------------ libeplayer3-mips/README.md | 1 - libeplayer3-mips/container | 1 - libeplayer3-mips/external | 1 - libeplayer3-mips/include | 1 - libeplayer3-mips/main | 1 - libeplayer3-mips/manager | 1 - libeplayer3-mips/output | 1 - libeplayer3-mips/playback | 1 - 9 files changed, 77 deletions(-) delete mode 100644 libeplayer3-mips/Makefile.am delete mode 120000 libeplayer3-mips/README.md delete mode 120000 libeplayer3-mips/container delete mode 120000 libeplayer3-mips/external delete mode 120000 libeplayer3-mips/include delete mode 120000 libeplayer3-mips/main delete mode 120000 libeplayer3-mips/manager delete mode 120000 libeplayer3-mips/output delete mode 120000 libeplayer3-mips/playback diff --git a/libeplayer3-mips/Makefile.am b/libeplayer3-mips/Makefile.am deleted file mode 100644 index 8cd8487..0000000 --- a/libeplayer3-mips/Makefile.am +++ /dev/null @@ -1,69 +0,0 @@ -AUTOMAKE_OPTIONS = subdir-objects -AM_CFLAGS = -Wall -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE - -CXXFLAGS = -Wall - -noinst_LTLIBRARIES = libeplayer3_mips.la - -AM_CPPFLAGS = -I$(srcdir)/include -AM_CPPFLAGS += -I$(top_srcdir)/include -AM_CPPFLAGS += -I$(srcdir)/external - -AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing - -SOURCE_FILES = container/container.c -SOURCE_FILES += container/container_ffmpeg.c -SOURCE_FILES += manager/manager.c -SOURCE_FILES += manager/audio.c -SOURCE_FILES += manager/video.c -SOURCE_FILES += manager/chapter.c -SOURCE_FILES += manager/subtitle.c -SOURCE_FILES += output/output_subtitle.c -SOURCE_FILES += output/output.c -SOURCE_FILES += output/writer/common/pes.c -SOURCE_FILES += output/writer/common/misc.c -SOURCE_FILES += output/writer/common/writer.c -SOURCE_FILES += output/linuxdvb_buffering.c -SOURCE_FILES += playback/playback.c -SOURCE_FILES += external/ffmpeg/src/bitstream.c -SOURCE_FILES += external/ffmpeg/src/latmenc.c -SOURCE_FILES += external/ffmpeg/src/mpeg4audio.c - -if ENABLE_FLV2MPEG4 -AM_CFLAGS += -DHAVE_FLV2MPEG4_CONVERTER -AM_CPPFLAGS += -I$(srcdir)/external/flv2mpeg4 -SOURCE_FILES += external/flv2mpeg4/src/m4vencode.c -SOURCE_FILES += external/flv2mpeg4/src/flvdecoder.c -SOURCE_FILES += external/flv2mpeg4/src/dcprediction.c -SOURCE_FILES += external/flv2mpeg4/src/flv2mpeg4.c -endif - -SOURCE_FILES += \ - output/linuxdvb_mipsel.c \ - output/writer/mipsel/writer.c \ - output/writer/mipsel/aac.c \ - output/writer/mipsel/ac3.c \ - output/writer/mipsel/mp3.c \ - output/writer/mipsel/pcm.c \ - output/writer/mipsel/lpcm.c \ - output/writer/mipsel/dts.c \ - output/writer/mipsel/amr.c \ - output/writer/mipsel/wma.c \ - output/writer/mipsel/h265.c \ - output/writer/mipsel/h264.c \ - output/writer/mipsel/mjpeg.c \ - output/writer/mipsel/mpeg2.c \ - output/writer/mipsel/mpeg4.c \ - output/writer/mipsel/divx3.c \ - output/writer/mipsel/vp.c \ - output/writer/mipsel/wmv.c \ - output/writer/mipsel/vc1.c - -libeplayer3_mips_la_SOURCES = $(SOURCE_FILES) - -LIBEPLAYER3_LIBS = libeplayer3_mips.la -lpthread -lavformat -lavcodec -lavutil -lswresample - -bin_PROGRAMS = eplayer3 -eplayer3_SOURCES = main/exteplayer.c -eplayer3_LDADD = $(LIBEPLAYER3_LIBS) -eplayer3_DEPENDENCIES = libeplayer3_mips.la diff --git a/libeplayer3-mips/README.md b/libeplayer3-mips/README.md deleted file mode 120000 index ff408ad..0000000 --- a/libeplayer3-mips/README.md +++ /dev/null @@ -1 +0,0 @@ -../libeplayer3-arm/README.md \ No newline at end of file diff --git a/libeplayer3-mips/container b/libeplayer3-mips/container deleted file mode 120000 index 2453de4..0000000 --- a/libeplayer3-mips/container +++ /dev/null @@ -1 +0,0 @@ -../libeplayer3-arm/container \ No newline at end of file diff --git a/libeplayer3-mips/external b/libeplayer3-mips/external deleted file mode 120000 index 2971e46..0000000 --- a/libeplayer3-mips/external +++ /dev/null @@ -1 +0,0 @@ -../libeplayer3-arm/external \ No newline at end of file diff --git a/libeplayer3-mips/include b/libeplayer3-mips/include deleted file mode 120000 index df1d8f8..0000000 --- a/libeplayer3-mips/include +++ /dev/null @@ -1 +0,0 @@ -../libeplayer3-arm/include \ No newline at end of file diff --git a/libeplayer3-mips/main b/libeplayer3-mips/main deleted file mode 120000 index 2a8b5e2..0000000 --- a/libeplayer3-mips/main +++ /dev/null @@ -1 +0,0 @@ -../libeplayer3-arm/main \ No newline at end of file diff --git a/libeplayer3-mips/manager b/libeplayer3-mips/manager deleted file mode 120000 index 950094e..0000000 --- a/libeplayer3-mips/manager +++ /dev/null @@ -1 +0,0 @@ -../libeplayer3-arm/manager \ No newline at end of file diff --git a/libeplayer3-mips/output b/libeplayer3-mips/output deleted file mode 120000 index 618f49c..0000000 --- a/libeplayer3-mips/output +++ /dev/null @@ -1 +0,0 @@ -../libeplayer3-arm/output \ No newline at end of file diff --git a/libeplayer3-mips/playback b/libeplayer3-mips/playback deleted file mode 120000 index 7a8298e..0000000 --- a/libeplayer3-mips/playback +++ /dev/null @@ -1 +0,0 @@ -../libeplayer3-arm/playback \ No newline at end of file From 8f6c348cd9975cc26ef12ce126859d34bd879655 Mon Sep 17 00:00:00 2001 From: max_10 Date: Sat, 15 Jun 2019 01:38:25 +0200 Subject: [PATCH 27/29] rename libeplayer3-arm -> libplayer3 Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/e1b78787fd3129cf0afedac963b62dc68d695af4 Author: max_10 Date: 2019-06-15 (Sat, 15 Jun 2019) Origin message was: ------------------ - rename libeplayer3-arm -> libplayer3 ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- {libeplayer3-arm => libeplayer3}/Makefile.am | 0 {libeplayer3-arm => libeplayer3}/README.md | 0 {libeplayer3-arm => libeplayer3}/container/buff_ffmpeg.c | 0 {libeplayer3-arm => libeplayer3}/container/container.c | 0 {libeplayer3-arm => libeplayer3}/container/container_ffmpeg.c | 0 {libeplayer3-arm => libeplayer3}/container/flv2mpeg4_ffmpeg.c | 0 {libeplayer3-arm => libeplayer3}/container/mpeg4p2_ffmpeg.c | 0 {libeplayer3-arm => libeplayer3}/container/wrapped_ffmpeg.c | 0 {libeplayer3-arm => libeplayer3}/external/ffmpeg/get_bits.h | 0 {libeplayer3-arm => libeplayer3}/external/ffmpeg/latmenc.h | 0 {libeplayer3-arm => libeplayer3}/external/ffmpeg/mathops.h | 0 {libeplayer3-arm => libeplayer3}/external/ffmpeg/mpeg4audio.h | 0 {libeplayer3-arm => libeplayer3}/external/ffmpeg/put_bits.h | 0 {libeplayer3-arm => libeplayer3}/external/ffmpeg/src/bitstream.c | 0 {libeplayer3-arm => libeplayer3}/external/ffmpeg/src/latmenc.c | 0 {libeplayer3-arm => libeplayer3}/external/ffmpeg/src/mpeg4audio.c | 0 {libeplayer3-arm => libeplayer3}/external/flv2mpeg4/doc/COPYING | 0 {libeplayer3-arm => libeplayer3}/external/flv2mpeg4/doc/CREDITS | 0 .../external/flv2mpeg4/doc/FFMPEG_CREDITS | 0 .../external/flv2mpeg4/doc/FFMPEG_IMPORTS | 0 {libeplayer3-arm => libeplayer3}/external/flv2mpeg4/doc/INSTALL | 0 {libeplayer3-arm => libeplayer3}/external/flv2mpeg4/doc/README | 0 {libeplayer3-arm => libeplayer3}/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 {libeplayer3-arm => libeplayer3}/external/flv2mpeg4/src/flv.h | 0 .../external/flv2mpeg4/src/flv2mpeg4.c | 0 .../external/flv2mpeg4/src/flvdecoder.c | 0 {libeplayer3-arm => libeplayer3}/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 {libeplayer3-arm => libeplayer3}/external/flv2mpeg4/src/type.h | 0 {libeplayer3-arm => libeplayer3}/include/aac.h | 0 {libeplayer3-arm => libeplayer3}/include/bcm_ioctls.h | 0 {libeplayer3-arm => libeplayer3}/include/common.h | 0 {libeplayer3-arm => libeplayer3}/include/container.h | 0 {libeplayer3-arm => libeplayer3}/include/debug.h | 0 {libeplayer3-arm => libeplayer3}/include/ffmpeg_metadata.h | 0 {libeplayer3-arm => libeplayer3}/include/manager.h | 0 {libeplayer3-arm => libeplayer3}/include/misc.h | 0 {libeplayer3-arm => libeplayer3}/include/output.h | 0 {libeplayer3-arm => libeplayer3}/include/pcm.h | 0 {libeplayer3-arm => libeplayer3}/include/pes.h | 0 {libeplayer3-arm => libeplayer3}/include/playback.h | 0 {libeplayer3-arm => libeplayer3}/include/stm_ioctls.h | 0 {libeplayer3-arm => libeplayer3}/include/writer.h | 0 {libeplayer3-arm => libeplayer3}/main/exteplayer.c | 0 {libeplayer3-arm => libeplayer3}/manager/audio.c | 0 {libeplayer3-arm => libeplayer3}/manager/chapter.c | 0 {libeplayer3-arm => libeplayer3}/manager/manager.c | 0 {libeplayer3-arm => libeplayer3}/manager/subtitle.c | 0 {libeplayer3-arm => libeplayer3}/manager/video.c | 0 {libeplayer3-arm => libeplayer3}/output/linuxdvb_buffering.c | 0 {libeplayer3-arm => libeplayer3}/output/linuxdvb_fake.c | 0 {libeplayer3-arm => libeplayer3}/output/linuxdvb_mipsel.c | 0 {libeplayer3-arm => libeplayer3}/output/linuxdvb_sh4.c | 0 {libeplayer3-arm => libeplayer3}/output/output.c | 0 {libeplayer3-arm => libeplayer3}/output/output_subtitle.c | 0 {libeplayer3-arm => libeplayer3}/output/writer/common/misc.c | 0 {libeplayer3-arm => libeplayer3}/output/writer/common/pes.c | 0 {libeplayer3-arm => libeplayer3}/output/writer/common/writer.c | 0 {libeplayer3-arm => libeplayer3}/output/writer/mipsel/aac.c | 0 {libeplayer3-arm => libeplayer3}/output/writer/mipsel/ac3.c | 0 {libeplayer3-arm => libeplayer3}/output/writer/mipsel/amr.c | 0 {libeplayer3-arm => libeplayer3}/output/writer/mipsel/divx3.c | 0 {libeplayer3-arm => libeplayer3}/output/writer/mipsel/dts.c | 0 {libeplayer3-arm => libeplayer3}/output/writer/mipsel/h264.c | 0 {libeplayer3-arm => libeplayer3}/output/writer/mipsel/h265.c | 0 {libeplayer3-arm => libeplayer3}/output/writer/mipsel/lpcm.c | 0 {libeplayer3-arm => libeplayer3}/output/writer/mipsel/mjpeg.c | 0 {libeplayer3-arm => libeplayer3}/output/writer/mipsel/mp3.c | 0 {libeplayer3-arm => libeplayer3}/output/writer/mipsel/mpeg2.c | 0 {libeplayer3-arm => libeplayer3}/output/writer/mipsel/mpeg4.c | 0 {libeplayer3-arm => libeplayer3}/output/writer/mipsel/pcm.c | 0 {libeplayer3-arm => libeplayer3}/output/writer/mipsel/vc1.c | 0 {libeplayer3-arm => libeplayer3}/output/writer/mipsel/vp.c | 0 {libeplayer3-arm => libeplayer3}/output/writer/mipsel/wma.c | 0 {libeplayer3-arm => libeplayer3}/output/writer/mipsel/wmv.c | 0 {libeplayer3-arm => libeplayer3}/output/writer/mipsel/writer.c | 0 {libeplayer3-arm => libeplayer3}/output/writer/sh4/aac.c | 0 {libeplayer3-arm => libeplayer3}/output/writer/sh4/ac3.c | 0 {libeplayer3-arm => libeplayer3}/output/writer/sh4/divx.c | 0 {libeplayer3-arm => libeplayer3}/output/writer/sh4/divx2.c | 0 {libeplayer3-arm => libeplayer3}/output/writer/sh4/dts.c | 0 {libeplayer3-arm => libeplayer3}/output/writer/sh4/h263.c | 0 {libeplayer3-arm => libeplayer3}/output/writer/sh4/h264.c | 0 {libeplayer3-arm => libeplayer3}/output/writer/sh4/mp3.c | 0 {libeplayer3-arm => libeplayer3}/output/writer/sh4/mpeg2.c | 0 {libeplayer3-arm => libeplayer3}/output/writer/sh4/pcm.c | 0 {libeplayer3-arm => libeplayer3}/output/writer/sh4/pes.c | 0 {libeplayer3-arm => libeplayer3}/output/writer/sh4/vc1.c | 0 {libeplayer3-arm => libeplayer3}/output/writer/sh4/vorbis.c | 0 {libeplayer3-arm => libeplayer3}/output/writer/sh4/wma.c | 0 {libeplayer3-arm => libeplayer3}/output/writer/sh4/wmv.c | 0 {libeplayer3-arm => libeplayer3}/output/writer/sh4/writer.c | 0 {libeplayer3-arm => libeplayer3}/playback/playback.c | 0 99 files changed, 0 insertions(+), 0 deletions(-) rename {libeplayer3-arm => libeplayer3}/Makefile.am (100%) 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 (100%) 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 (100%) 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 (100%) 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%) diff --git a/libeplayer3-arm/Makefile.am b/libeplayer3/Makefile.am similarity index 100% rename from libeplayer3-arm/Makefile.am rename to libeplayer3/Makefile.am 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 100% rename from libeplayer3-arm/container/container_ffmpeg.c rename to libeplayer3/container/container_ffmpeg.c 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 100% rename from libeplayer3-arm/main/exteplayer.c rename to libeplayer3/main/exteplayer.c 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 100% rename from libeplayer3-arm/output/writer/mipsel/mjpeg.c rename to libeplayer3/output/writer/mipsel/mjpeg.c 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 From 0dbb71cb3c420a864316568eb21e19a601a744a6 Mon Sep 17 00:00:00 2001 From: max_10 Date: Sat, 15 Jun 2019 01:45:44 +0200 Subject: [PATCH 28/29] Adjustment arm / mips for libplayer3 Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/2866328fe2e39beed125459efb7820235ca262ce Author: max_10 Date: 2019-06-15 (Sat, 15 Jun 2019) Origin message was: ------------------ - Adjustment arm / mips for libplayer3 ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- Makefile.am | 8 ++++---- configure.ac | 7 +++---- libeplayer3/Makefile.am | 8 ++++---- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1443044..3519962 100644 --- a/Makefile.am +++ b/Makefile.am @@ -65,9 +65,9 @@ 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 @@ -77,7 +77,7 @@ SUBDIRS += libmipsbox libdvbci libstb_hal_la_LIBADD += \ libmipsbox/libmipsbox.la \ libdvbci/libdvbci.la -SUBDIRS += libeplayer3-mips +SUBDIRS += libeplayer3 libstb_hal_la_LIBADD += \ - libeplayer3-mips/libeplayer3_mips.la + libeplayer3/libeplayer3.la endif diff --git a/configure.ac b/configure.ac index e5ab8c3..61aa18a 100644 --- a/configure.ac +++ b/configure.ac @@ -95,12 +95,12 @@ 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([ @@ -111,8 +111,7 @@ libarmbox/Makefile libazbox/Makefile libduckbox/Makefile libdvbci/Makefile -libeplayer3-mips/Makefile -libeplayer3-arm/Makefile +libeplayer3/Makefile libeplayer3-sh4/Makefile libgeneric-pc/Makefile libraspi/Makefile diff --git a/libeplayer3/Makefile.am b/libeplayer3/Makefile.am index b29e212..04e808c 100644 --- a/libeplayer3/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 From 88583acb9c8e40ea3264a0207633cd2ea1236525 Mon Sep 17 00:00:00 2001 From: max_10 Date: Sat, 15 Jun 2019 01:52:47 +0200 Subject: [PATCH 29/29] fix Adjustment arm / mips for libplayer3 Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/98c3725e14144a04e42ae15159ce4f2ed11ee126 Author: max_10 Date: 2019-06-15 (Sat, 15 Jun 2019) Origin message was: ------------------ - fix Adjustment arm / mips for libplayer3 ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libarmbox/Makefile.am | 2 +- libmipsbox/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/libmipsbox/Makefile.am b/libmipsbox/Makefile.am index df2e807..53b544d 100644 --- a/libmipsbox/Makefile.am +++ b/libmipsbox/Makefile.am @@ -27,7 +27,7 @@ libmipsbox_la_SOURCES += \ playback_libeplayer3.cpp AM_CPPFLAGS += \ - -I$(top_srcdir)/libeplayer3-mips/include + -I$(top_srcdir)/libeplayer3/include AM_LDFLAGS += \ -lass