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-28 07:50:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/TangoCash/libstb-hal-tangos

Browse Source 
Conflicts:
	libeplayer3-arm/playback/playback.c


Origin commit data
------------------
Branch: master
Commit: 5154f7e6e2
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-08-16 (Thu, 16 Aug 2018)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2018-08-16 22:06:15 +02:00
parent 30eed94a75 234b8dde87
commit 9b11f42a33
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
azbox/video.cpp
View File

@@ -494,13 +494,13 @@ static inline int rate2csapi(int rate)
return 1; return 1;
case 25: case 25:
return 2; return 2;
case 29976: case 29970:
return 3; return 3;
case 30: case 30:
return 4; return 4;
case 50: case 50:
return 5; return 5;
case 50940: case 59940:
return 6; return 6;
case 60: case 60:
return 7; return 7;

3
libeplayer3-arm/playback/playback.c
View File

@@ -301,7 +301,7 @@ static int PlaybackPlay(Context_t *context)
context->playback->SlowMotion = 0; context->playback->SlowMotion = 0;
context->playback->Speed = 0; context->playback->Speed = 0;
if (context->container && context->container->selectedContainer) if (context->container && context->container->selectedContainer)
context->container->selectedContainer->Command(context, CONTAINER_STOP, NULL); ret = context->container->selectedContainer->Command(context, CONTAINER_STOP, NULL);
} }
else else
{ {
@@ -331,6 +331,7 @@ static int PlaybackPlay(Context_t *context)
playback_printf(10, "clearing isCreationPhase!\n"); playback_printf(10, "clearing isCreationPhase!\n");
context->playback->isCreationPhase = 0; // allow thread to go into next state context->playback->isCreationPhase = 0; // allow thread to go into next state
if (context->container && context->container->selectedContainer) if (context->container && context->container->selectedContainer)
ret = context->container->selectedContainer->Command(context, CONTAINER_PLAY, NULL); ret = context->container->selectedContainer->Command(context, CONTAINER_PLAY, NULL);
if (ret != 0) if (ret != 0)

9
libspark/video.cpp
View File

@@ -794,13 +794,13 @@ static inline int rate2csapi(int rate)
return 1; return 1;
case 25000: case 25000:
return 2; return 2;
case 29976: case 29970:
return 3; return 3;
case 30000: case 30000:
return 4; return 4;
case 50000: case 50000:
return 5; return 5;
case 50940: case 59940:
return 6; return 6;
case 60000: case 60000:
return 7; return 7;
@@ -817,7 +817,10 @@ void cVideo::getPictureInfo(int &width, int &height, int &rate)
if (fd == -1) if (fd == -1)
{ {
/* in movieplayer mode, fd is not opened -> fall back to procfs */ /* in movieplayer mode, fd is not opened -> fall back to procfs */
r = proc_get_hex(VMPEG_framerate[devnum]); char buf[16];
int n = proc_get(VMPEG_framerate[devnum], buf, 16);
if (n > 0)
sscanf(buf, "%i", &r);
width = proc_get_hex(VMPEG_xres[devnum]); width = proc_get_hex(VMPEG_xres[devnum]);
height = proc_get_hex(VMPEG_yres[devnum]); height = proc_get_hex(VMPEG_yres[devnum]);
rate = rate2csapi(r); rate = rate2csapi(r);