Merge branch 'master' of https://bitbucket.org/max_10/libstb-hal-max

Conflicts:
	Makefile.am
	configure.ac


Origin commit data
------------------
Branch: master
Commit: 561c4239ec
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-06-17 (Mon, 17 Jun 2019)



------------------
This commit was generated by Migit

Makefile.am

@@ -65,9 +65,19 @@ libstb_hal_la_LIBADD += \
 	libarmbox/libarmbox.la \
 	libdvbci/libdvbci.la
 if !ENABLE_GSTREAMER_10
-SUBDIRS += libeplayer3-arm
+SUBDIRS += libeplayer3
 libstb_hal_la_LIBADD += \
-	libeplayer3-arm/libeplayer3_arm.la
+	libeplayer3/libeplayer3.la
 endif
 endif
 endif
+
+if BOXTYPE_MIPSBOX
+SUBDIRS += libmipsbox libdvbci
+libstb_hal_la_LIBADD += \
+	libmipsbox/libmipsbox.la \
+	libdvbci/libdvbci.la
+SUBDIRS += libeplayer3
+libstb_hal_la_LIBADD += \
+	libeplayer3/libeplayer3.la
+endif

acinclude.m4

@@ -75,9 +75,9 @@ AC_SYS_LARGEFILE
 
 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"
 		;;
 		*)
@@ -90,7 +90,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
@@ -113,6 +114,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"
@@ -134,6 +142,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")
@@ -167,6 +176,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")
 
@@ -184,6 +194,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?
@@ -247,6 +259,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

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 += \

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<eDVBCISlot*>::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);

configure.ac

@@ -95,22 +95,23 @@ if test x$BOXTYPE = xgeneric -a x$BOXMODEL != xraspi; then
 fi
 
 AC_ARG_ENABLE(flv2mpeg4,
-	AS_HELP_STRING(--enable-flv2mpeg4, use flv2mpeg4 libeplayer3-arm),
+	AS_HELP_STRING(--enable-flv2mpeg4, use flv2mpeg4 libeplayer3),
 	,[enable_flv2mpeg4=no])
 
 AM_CONDITIONAL(ENABLE_FLV2MPEG4, test "$enable_flv2mpeg4" = "yes")
 if test "$enable_flv2mpeg4" = "yes"; then
-	AC_DEFINE(ENABLE_FLV2MPEG4, 1, [use flv2mpeg4 libeplayer3-arm])
+	AC_DEFINE(ENABLE_FLV2MPEG4, 1, [use flv2mpeg4 libeplayer3])
 fi
 
 AC_CONFIG_FILES([
 Makefile
 common/Makefile
+libmipsbox/Makefile
 libarmbox/Makefile
 libazbox/Makefile
 libduckbox/Makefile
 libdvbci/Makefile
-libeplayer3-arm/Makefile
+libeplayer3/Makefile
 libeplayer3-sh4/Makefile
 libgeneric-pc/Makefile
 libraspi/Makefile

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

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"

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; };

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

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

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

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 += \

libdvbci/descrambler.cpp

@@ -142,7 +142,7 @@ int descrambler_set_key(int index, int parity, unsigned char *data)
 int descrambler_set_pid(int index, int enable, int pid)
 {
 	struct ca_pid p;
-#if HAVE_ARM_HARDWARE
+#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
 	unsigned int flags = 0x80;
 
 	if (index)

libdvbci/dvbci_ccmgr.cpp

@@ -1354,7 +1354,7 @@ void eDVBCIContentControlManagerSession::resendKey(eDVBCISlot *tslot)
 
 	if (!tslot->SidBlackListed && (tslot->recordUse[0] || tslot->liveUse[0]))
 	{
-#if HAVE_ARM_HARDWARE
+#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
 		if (slot->newPids)
 		{
 			if (slot->pids.size())

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