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-31 17:30:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mpx' of https://github.com/tuxbox-neutrino/library-stb-hal

Browse Source 
Origin commit data
------------------
Branch: master
Commit: 3e35d80b48
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-05-17 (Thu, 17 May 2018)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2018-05-17 21:22:10 +02:00
parent 505bab426d 6c9570d333
commit 1a33966303
3 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
generic-pc/dmx.cpp
View File

@@ -71,7 +71,7 @@ static const char *devname[NUM_DEMUXDEV] = {
#define NUM_DEMUX 1 #define NUM_DEMUX 1
static int dmx_source[NUM_DEMUX] = { 0 }; static int dmx_source[NUM_DEMUX] = { 0 };
static bool init[NUM_DEMUXDEV] = { false }; // static bool init[NUM_DEMUXDEV] = { false };
/* uuuugly */ /* uuuugly */
static int dmx_tp_count = 0; static int dmx_tp_count = 0;

10
libarmbox/video.cpp
View File

@@ -345,6 +345,10 @@ retry:
} }
lt_info("#%d: %s cannot open %s: %m, retries %d\n", devnum, __func__, VDEV[devnum], n); lt_info("#%d: %s cannot open %s: %m, retries %d\n", devnum, __func__, VDEV[devnum], n);
} }
if ( fd >= 0 && (ioctl(fd,VIDEO_SET_BLANK, false) < 0)){
perror("VIDEO SET BLANK: ");
}
playstate = VIDEO_STOPPED; playstate = VIDEO_STOPPED;
} }
@@ -353,8 +357,12 @@ void cVideo::closeDevice(void)
lt_debug("%s\n", __func__); lt_debug("%s\n", __func__);
/* looks like sometimes close is unhappy about non-empty buffers */ /* looks like sometimes close is unhappy about non-empty buffers */
// Start(); // Start();
if (fd >= 0) if (fd >= 0){
if ((ioctl(fd,VIDEO_SET_BLANK, true) < 0)){
perror("VIDEO SET BLANK: ");
}
close(fd); close(fd);
}
fd = -1; fd = -1;
playstate = VIDEO_STOPPED; playstate = VIDEO_STOPPED;
} }

8
libarmbox/video_lib.h
View File

@@ -73,8 +73,12 @@ typedef enum {
} DISPLAY_AR; } DISPLAY_AR;
typedef enum { typedef enum {
DISPLAY_AR_MODE_PANSCAN = 0, /* FIX for HD51 mix-up of letterbox / panscan
DISPLAY_AR_MODE_LETTERBOX, Standard is 1. PANSCAN 2. LETTERBOX
If next drivers are correct please revert
this and pzapit.cpp */
DISPLAY_AR_MODE_LETTERBOX = 0,
DISPLAY_AR_MODE_PANSCAN,
DISPLAY_AR_MODE_NONE, DISPLAY_AR_MODE_NONE,
DISPLAY_AR_MODE_PANSCAN2 DISPLAY_AR_MODE_PANSCAN2
} DISPLAY_AR_MODE; } DISPLAY_AR_MODE;