mirrors/recycled-ni-libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git synced 2025-08-26 23:12:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

re-formatting code using astyle; see https://github.com/neutrino-images/ni-buildsystem/blob/master/support/scripts/astyle.sh

Browse Source 
Origin commit data
------------------
Branch: master
Commit: 53ca350af4
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-11-07 (Sun, 07 Nov 2021)

Origin message was:
------------------
- re-formatting code using astyle; see https://github.com/neutrino-images/ni-buildsystem/blob/master/support/scripts/astyle.sh

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2021-11-07 21:22:27 +01:00
parent 37d5fc0f21
commit 9d9bd38d6a
12 changed files with 88 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
common/ca_ci.cpp
View File

@@ -107,7 +107,8 @@ void cCA::write_ci_info(int slot, CaIdVector caids)
snprintf(fname, sizeof(fname), "/tmp/ci-slot%d", slot); snprintf(fname, sizeof(fname), "/tmp/ci-slot%d", slot);
ModuleName(CA_SLOT_TYPE_CI, slot, mname); ModuleName(CA_SLOT_TYPE_CI, slot, mname);
FILE *fd = fopen(fname, "w"); FILE *fd = fopen(fname, "w");
if (fd == NULL) return; if (fd == NULL)
return;
snprintf(buf, sizeof(buf), "%s\n", mname); snprintf(buf, sizeof(buf), "%s\n", mname);
fputs(buf, fd); fputs(buf, fd);
if (caids.size() > 40) if (caids.size() > 40)
@@ -129,7 +130,8 @@ void cCA::del_ci_info(int slot)
{ {
char fname[20]; char fname[20];
snprintf(fname, sizeof(fname), "/tmp/ci-slot%d", slot); snprintf(fname, sizeof(fname), "/tmp/ci-slot%d", slot);
if (access(fname, F_OK) == 0) remove(fname); if (access(fname, F_OK) == 0)
remove(fname);
} }
/* helper function to call the cpp thread loop */ /* helper function to call the cpp thread loop */
@@ -645,7 +647,8 @@ bool cCA::SendCAPMT(u64 tpid, u8 source, u8 camask, const unsigned char *cabuf,
bool sid_found = false; bool sid_found = false;
bool recordUse_found = false; bool recordUse_found = false;
printf("%s -> %s\n", FILENAME, __func__); printf("%s -> %s\n", FILENAME, __func__);
if (!num_slots) return true; /* stb's without ci-slots */ if (!num_slots)
return true; /* stb's without ci-slots */
#if x_debug #if x_debug
printf("TP: %llX\n", TP); printf("TP: %llX\n", TP);
printf("SID: %04X\n", SID); printf("SID: %04X\n", SID);

9
libarmbox/dmx.cpp
View File

@@ -469,13 +469,16 @@ bool cDemux::sectionFilter(unsigned short _pid, const unsigned char *const filte
if (debuglevel == 2) if (debuglevel == 2)
{ {
fprintf(stderr, "filt: "); fprintf(stderr, "filt: ");
for (int i = 0; i < len; i++) fprintf(stderr, "%02hhx ", s_flt.filter.filter[i]); for (int i = 0; i < len; i++)
fprintf(stderr, "%02hhx ", s_flt.filter.filter[i]);
fprintf(stderr, "\n"); fprintf(stderr, "\n");
fprintf(stderr, "mask: "); fprintf(stderr, "mask: ");
for (int i = 0; i < len; i++) fprintf(stderr, "%02hhx ", s_flt.filter.mask[i]); for (int i = 0; i < len; i++)
fprintf(stderr, "%02hhx ", s_flt.filter.mask[i]);
fprintf(stderr, "\n"); fprintf(stderr, "\n");
fprintf(stderr, "mode: "); fprintf(stderr, "mode: ");
for (int i = 0; i < len; i++) fprintf(stderr, "%02hhx ", s_flt.filter.mode[i]); for (int i = 0; i < len; i++)
fprintf(stderr, "%02hhx ", s_flt.filter.mode[i]);
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }

12
libarmbox/hardware_caps.c
View File

@@ -29,10 +29,14 @@ hw_caps_t *get_hwcaps(void)
memset(&caps, 0, sizeof(hw_caps_t)); memset(&caps, 0, sizeof(hw_caps_t));
caps.pip_devs = 0; caps.pip_devs = 0;
if (access("/dev/dvb/adapter0/video1", F_OK) != -1) caps.pip_devs = 1; if (access("/dev/dvb/adapter0/video1", F_OK) != -1)
if (access("/dev/dvb/adapter0/video2", F_OK) != -1) caps.pip_devs = 2; caps.pip_devs = 1;
if (access("/dev/dvb/adapter0/video3", F_OK) != -1) caps.pip_devs = 3; if (access("/dev/dvb/adapter0/video2", F_OK) != -1)
if (caps.pip_devs > 0) caps.can_pip = 1; caps.pip_devs = 2;
if (access("/dev/dvb/adapter0/video3", F_OK) != -1)
caps.pip_devs = 3;
if (caps.pip_devs > 0)
caps.can_pip = 1;
#if BOXMODEL_VUSOLO4K #if BOXMODEL_VUSOLO4K
caps.has_CI = 1; caps.has_CI = 1;

13
libarmbox/video.cpp
View File

@@ -918,11 +918,13 @@ void cVideo::QuadPiP(bool active, int _x, int _y, int _w, int _h)
{ {
char buffer[64]; char buffer[64];
int _a = 1; int _a = 1;
if (active) { if (active)
{
#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUDUO4KSE || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K #if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUDUO4KSE || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K
proc_put("/proc/stb/video/decodermode", "mosaic", strlen("mosaic")); proc_put("/proc/stb/video/decodermode", "mosaic", strlen("mosaic"));
#endif #endif
for (unsigned int i = 0; i < 4; i++) { for (unsigned int i = 0; i < 4; i++)
{
sprintf(buffer, "%x", _x); sprintf(buffer, "%x", _x);
proc_put(VMPEG_dst_left[i], buffer, strlen(buffer)); proc_put(VMPEG_dst_left[i], buffer, strlen(buffer));
sprintf(buffer, "%x", _y); sprintf(buffer, "%x", _y);
@@ -934,8 +936,11 @@ void cVideo::QuadPiP(bool active, int _x, int _y, int _w, int _h)
sprintf(buffer, "%x", _a); sprintf(buffer, "%x", _a);
proc_put(VMPEG_dst_apply[i], buffer, strlen(buffer)); proc_put(VMPEG_dst_apply[i], buffer, strlen(buffer));
} }
} else { }
for (unsigned int i = 0; i < 4; i++) { else
{
for (unsigned int i = 0; i < 4; i++)
{
sprintf(buffer, "%x", 0); sprintf(buffer, "%x", 0);
proc_put(VMPEG_dst_left[i], buffer, strlen(buffer)); proc_put(VMPEG_dst_left[i], buffer, strlen(buffer));
sprintf(buffer, "%x", 0); sprintf(buffer, "%x", 0);

12
libgeneric-pc/dmx.cpp
View File

@@ -203,7 +203,8 @@ int cDemux::Read(unsigned char *buff, int len, int timeout)
* return from read(), so as a "emergency exit" for e.g. NIT scan, set a (long) * return from read(), so as a "emergency exit" for e.g. NIT scan, set a (long)
* timeout here */ * timeout here */
int to = timeout; int to = timeout;
if (dmx_type == DMX_PSI_CHANNEL && timeout <= 0){ if (dmx_type == DMX_PSI_CHANNEL && timeout <= 0)
{
to = 60 * 1000; to = 60 * 1000;
} }
@@ -363,13 +364,16 @@ bool cDemux::sectionFilter(unsigned short _pid, const unsigned char *const filte
if (debuglevel == 2) if (debuglevel == 2)
{ {
fprintf(stderr, "filt: "); fprintf(stderr, "filt: ");
for (int i = 0; i < DMX_FILTER_SIZE; i++)fprintf(stderr, "%02hhx ", s_flt.filter.filter[i]); for (int i = 0; i < DMX_FILTER_SIZE; i++)
fprintf(stderr, "%02hhx ", s_flt.filter.filter[i]);
fprintf(stderr, "\n"); fprintf(stderr, "\n");
fprintf(stderr, "mask: "); fprintf(stderr, "mask: ");
for (int i = 0; i < DMX_FILTER_SIZE; i++)fprintf(stderr, "%02hhx ", s_flt.filter.mask[i]); for (int i = 0; i < DMX_FILTER_SIZE; i++)
fprintf(stderr, "%02hhx ", s_flt.filter.mask[i]);
fprintf(stderr, "\n"); fprintf(stderr, "\n");
fprintf(stderr, "mode: "); fprintf(stderr, "mode: ");
for (int i = 0; i < DMX_FILTER_SIZE; i++)fprintf(stderr, "%02hhx ", s_flt.filter.mode[i]); for (int i = 0; i < DMX_FILTER_SIZE; i++)
fprintf(stderr, "%02hhx ", s_flt.filter.mode[i]);
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }

12
libmipsbox/hardware_caps.c
View File

@@ -29,10 +29,14 @@ hw_caps_t *get_hwcaps(void)
memset(&caps, 0, sizeof(hw_caps_t)); memset(&caps, 0, sizeof(hw_caps_t));
caps.pip_devs = 0; caps.pip_devs = 0;
if (access("/dev/dvb/adapter0/video1", F_OK) != -1) caps.pip_devs = 1; if (access("/dev/dvb/adapter0/video1", F_OK) != -1)
if (access("/dev/dvb/adapter0/video2", F_OK) != -1) caps.pip_devs = 2; caps.pip_devs = 1;
if (access("/dev/dvb/adapter0/video3", F_OK) != -1) caps.pip_devs = 3; if (access("/dev/dvb/adapter0/video2", F_OK) != -1)
if (caps.pip_devs > 0) caps.can_pip = 1; caps.pip_devs = 2;
if (access("/dev/dvb/adapter0/video3", F_OK) != -1)
caps.pip_devs = 3;
if (caps.pip_devs > 0)
caps.can_pip = 1;
#if BOXMODEL_VUDUO #if BOXMODEL_VUDUO
caps.has_CI = 2; caps.has_CI = 2;

9
libraspi/dmx.cpp
View File

@@ -350,13 +350,16 @@ bool cDemux::sectionFilter(unsigned short _pid, const unsigned char *const filte
if (debuglevel == 2) if (debuglevel == 2)
{ {
fprintf(stderr, "filt: "); fprintf(stderr, "filt: ");
for (int i = 0; i < DMX_FILTER_SIZE; i++)fprintf(stderr, "%02hhx ", s_flt.filter.filter[i]); for (int i = 0; i < DMX_FILTER_SIZE; i++)
fprintf(stderr, "%02hhx ", s_flt.filter.filter[i]);
fprintf(stderr, "\n"); fprintf(stderr, "\n");
fprintf(stderr, "mask: "); fprintf(stderr, "mask: ");
for (int i = 0; i < DMX_FILTER_SIZE; i++)fprintf(stderr, "%02hhx ", s_flt.filter.mask[i]); for (int i = 0; i < DMX_FILTER_SIZE; i++)
fprintf(stderr, "%02hhx ", s_flt.filter.mask[i]);
fprintf(stderr, "\n"); fprintf(stderr, "\n");
fprintf(stderr, "mode: "); fprintf(stderr, "mode: ");
for (int i = 0; i < DMX_FILTER_SIZE; i++)fprintf(stderr, "%02hhx ", s_flt.filter.mode[i]); for (int i = 0; i < DMX_FILTER_SIZE; i++)
fprintf(stderr, "%02hhx ", s_flt.filter.mode[i]);
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }