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-27 15:32:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Duckbox-Developers/libstb-hal-cst-next

Browse Source 
Origin commit data
------------------
Branch: master
Commit: a2a3740c53
Author: TangoCash <eric@loxat.de>
Date: 2017-06-09 (Fri, 09 Jun 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
TangoCash
2017-06-09 14:27:50 +02:00
parent 6cac538104 d8dfd55f6b
commit 3fdadfad34
3 changed files with 53 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
generic-pc/playback.cpp
View File

@@ -145,3 +145,8 @@ cPlayback::~cPlayback()
{ {
printf("%s:%s\n", FILENAME, __func__); printf("%s:%s\n", FILENAME, __func__);
} }
uint64_t cPlayback::GetReadCount()
{
return 0;
}

42
libspark/video.cpp
View File

@@ -348,6 +348,41 @@ int cVideo::setBlank(int)
return Stop(1); return Stop(1);
} }
int cVideo::GetVideoSystem()
{
lt_debug("%s\n", __func__);
char current[32];
static const char *modes[] = {
"pal", // VIDEO_STD_NTSC
"pal", // VIDEO_STD_SECAM
"pal", // VIDEO_STD_PAL
"480p", // VIDEO_STD_480P
"576p50", // VIDEO_STD_576P
"720p60", // VIDEO_STD_720P60
"1080i60", // VIDEO_STD_1080I60
"720p50", // VIDEO_STD_720P50
"1080i50", // VIDEO_STD_1080I50
"1080p30", // VIDEO_STD_1080P30
"1080p24", // VIDEO_STD_1080P24
"1080p25", // VIDEO_STD_1080P25
"1080p50", // VIDEO_STD_1080P50
"1080p60", // VIDEO_STD_1080P60
"1080p2397", // VIDEO_STD_1080P2397
"1080p2997", // VIDEO_STD_1080P2997
"720p50" // VIDEO_STD_AUTO
};
int ret = proc_get("/proc/stb/video/videomode", current, 32);
for (int i=0; i<sizeof(modes)/sizeof(*modes); i++) {
if (strcmp(current, modes[i]) == 0)
{
lt_info("%s: video_system (%s) \n", __func__, current);
return i;
}
}
return -1;
}
int cVideo::SetVideoSystem(int video_system, bool remember) int cVideo::SetVideoSystem(int video_system, bool remember)
{ {
lt_debug("%s(%d, %d)\n", __func__, video_system, remember); lt_debug("%s(%d, %d)\n", __func__, video_system, remember);
@@ -365,8 +400,11 @@ int cVideo::SetVideoSystem(int video_system, bool remember)
"1080p30", // VIDEO_STD_1080P30 "1080p30", // VIDEO_STD_1080P30
"1080p24", // VIDEO_STD_1080P24 "1080p24", // VIDEO_STD_1080P24
"1080p25", // VIDEO_STD_1080P25 "1080p25", // VIDEO_STD_1080P25
"720p50", // VIDEO_STD_AUTO -> not implemented "1080p50", // VIDEO_STD_1080P50
"1080p50" // VIDEO_STD_1080P50 -> SPARK only "1080p60", // VIDEO_STD_1080P60
"1080p2397", // VIDEO_STD_1080P2397
"1080p2997", // VIDEO_STD_1080P2997
"720p50" // VIDEO_STD_AUTO
}; };
if (video_system > VIDEO_STD_MAX) if (video_system > VIDEO_STD_MAX)

10
libspark/video_lib.h
View File

@@ -101,9 +101,12 @@ typedef enum {
VIDEO_STD_1080P30, VIDEO_STD_1080P30,
VIDEO_STD_1080P24, VIDEO_STD_1080P24,
VIDEO_STD_1080P25, VIDEO_STD_1080P25,
VIDEO_STD_1080P50,
VIDEO_STD_1080P60,
VIDEO_STD_1080P2397,
VIDEO_STD_1080P2997,
VIDEO_STD_AUTO, VIDEO_STD_AUTO,
VIDEO_STD_1080P50, /* SPARK only */ VIDEO_STD_MAX = VIDEO_STD_AUTO
VIDEO_STD_MAX
} VIDEO_STD; } VIDEO_STD;
/* not used, for dummy functions */ /* not used, for dummy functions */
@@ -182,6 +185,9 @@ class cVideo
int Stop(bool blank = true); int Stop(bool blank = true);
bool Pause(void); bool Pause(void);
/* get video system infos */
int GetVideoSystem();
/* set video_system */ /* set video_system */
int SetVideoSystem(int video_system, bool remember = true); int SetVideoSystem(int video_system, bool remember = true);
int SetStreamType(VIDEO_FORMAT type); int SetStreamType(VIDEO_FORMAT type);