mirrors/libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/libstb-hal.git synced 2025-08-26 23:13:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

armbox: delete parts of sh4 code

Browse Source
This commit is contained in:
max_10
2017-10-07 21:53:16 +02:00
parent 86244ea952
commit 5c0741a8e3
2 changed files with 7 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
libarmbox/video.cpp
View File

@@ -61,7 +61,6 @@ cVideo * pipDecoder = NULL;
int system_rev = 0; int system_rev = 0;
static bool hdmi_enabled = true;
static bool stillpicture = false; static bool stillpicture = false;
static const char *VDEV[] = { static const char *VDEV[] = {
@@ -123,13 +122,6 @@ static const char *VMPEG_framerate[] = {
#define VIDEO_STREAMTYPE_H265_HEVC 7 #define VIDEO_STREAMTYPE_H265_HEVC 7
#define VIDEO_STREAMTYPE_AVS 16 #define VIDEO_STREAMTYPE_AVS 16
static int hdmi_out(bool enable)
{
int ret = -1;
return ret;
}
cVideo::cVideo(int, void *, void *, unsigned int unit) cVideo::cVideo(int, void *, void *, unsigned int unit)
{ {
lt_debug("%s unit %u\n", __func__, unit); lt_debug("%s unit %u\n", __func__, unit);
@@ -138,8 +130,6 @@ cVideo::cVideo(int, void *, void *, unsigned int unit)
contrast = -1; contrast = -1;
saturation = -1; saturation = -1;
hue = -1; hue = -1;
scartvoltage = -1;
video_standby = 0; video_standby = 0;
if (unit > 1) { if (unit > 1) {
lt_info("%s: unit %d out of range, setting to 0\n", __func__, unit); lt_info("%s: unit %d out of range, setting to 0\n", __func__, unit);
@@ -387,9 +377,7 @@ int cVideo::SetVideoSystem(int video_system, bool remember)
Stop(); Stop();
stopped = true; stopped = true;
} }
hdmi_out(false);
ret = proc_put("/proc/stb/video/videomode", modes[video_system],strlen(modes[video_system])); ret = proc_put("/proc/stb/video/videomode", modes[video_system],strlen(modes[video_system]));
hdmi_out(true);
if (stopped) if (stopped)
Start(); Start();
@@ -540,20 +528,9 @@ void cVideo::Standby(unsigned int bOn)
if (bOn) if (bOn)
{ {
closeDevice(); closeDevice();
hdmi_out(false);
} }
else else
{ {
/* only enable HDMI output when coming from standby, not on
* start. I have no idea why, but enabling it on startup leads
* to strange locking problems of the framebuffer driver :-( */
if (!hdmi_enabled)
{
hdmi_out(true);
/* make sure the driver has time to settle.
* again - lame, but makes it work... */
sleep(1);
}
openDevice(); openDevice();
} }
video_standby = bOn; video_standby = bOn;
@@ -693,12 +670,6 @@ void cVideo::SetSyncMode(AVSYNC_TYPE mode)
* { 1, LOCALE_OPTIONS_ON }, * { 1, LOCALE_OPTIONS_ON },
* { 2, LOCALE_AUDIOMENU_AVSYNC_AM } * { 2, LOCALE_AUDIOMENU_AVSYNC_AM }
*/ */
const char *apply[] = { "disapply", "apply" };
const char *clock[] = { "video", "audio" };
const char *a = apply[mode > 0]; /* mode == 1 or mode == 2 -> "apply" */
const char *c = clock[mode > 1]; /* mode == 2 -> "audio" */
proc_put("/proc/stb/stream/policy/AV_SYNC", a, strlen(a));
proc_put("/proc/stb/stream/policy/MASTER_CLOCK", c, strlen(c));
}; };
int cVideo::SetStreamType(VIDEO_FORMAT type) int cVideo::SetStreamType(VIDEO_FORMAT type)

9
libarmbox/video_lib.h
View File

@@ -144,7 +144,6 @@ class cVideo
video_play_state_t playstate; video_play_state_t playstate;
int /*vidDispMode_t*/ croppingMode; int /*vidDispMode_t*/ croppingMode;
int /*vidOutFmt_t*/ outputformat; int /*vidOutFmt_t*/ outputformat;
int scartvoltage;
VIDEO_FORMAT StreamType; VIDEO_FORMAT StreamType;
VIDEO_DEFINITION VideoDefinition; VIDEO_DEFINITION VideoDefinition;
@@ -155,14 +154,20 @@ class cVideo
DISPLAY_AR PictureAR; DISPLAY_AR PictureAR;
VIDEO_FRAME_RATE FrameRate; VIDEO_FRAME_RATE FrameRate;
int video_standby; int video_standby;
int brightness;
int contrast;
int saturation;
int hue;
/* used internally by dmx */
int64_t GetPTS(void); int64_t GetPTS(void);
int brightness, contrast, saturation, hue;
public: public:
/* constructor & destructor */ /* constructor & destructor */
cVideo(int mode, void *, void *, unsigned int unit = 0); cVideo(int mode, void *, void *, unsigned int unit = 0);
~cVideo(void); ~cVideo(void);
/* used internally by playback */
void openDevice(void); void openDevice(void);
void closeDevice(void); void closeDevice(void);