diff --git a/azbox/video.cpp b/azbox/video.cpp index 8ce3817..230f514 100644 --- a/azbox/video.cpp +++ b/azbox/video.cpp @@ -494,13 +494,13 @@ static inline int rate2csapi(int rate) return 1; case 25: return 2; - case 29976: + case 29970: return 3; case 30: return 4; case 50: return 5; - case 50940: + case 59940: return 6; case 60: return 7; diff --git a/libeplayer3-arm/playback/playback.c b/libeplayer3-arm/playback/playback.c index 098cc4d..3c5597b 100644 --- a/libeplayer3-arm/playback/playback.c +++ b/libeplayer3-arm/playback/playback.c @@ -301,7 +301,7 @@ static int PlaybackPlay(Context_t *context) context->playback->SlowMotion = 0; context->playback->Speed = 0; if (context->container && context->container->selectedContainer) - context->container->selectedContainer->Command(context, CONTAINER_STOP, NULL); + ret = context->container->selectedContainer->Command(context, CONTAINER_STOP, NULL); } else { @@ -331,6 +331,7 @@ static int PlaybackPlay(Context_t *context) playback_printf(10, "clearing isCreationPhase!\n"); context->playback->isCreationPhase = 0; // allow thread to go into next state + if (context->container && context->container->selectedContainer) ret = context->container->selectedContainer->Command(context, CONTAINER_PLAY, NULL); if (ret != 0) diff --git a/libspark/video.cpp b/libspark/video.cpp index a190ac8..f4c0b34 100644 --- a/libspark/video.cpp +++ b/libspark/video.cpp @@ -794,13 +794,13 @@ static inline int rate2csapi(int rate) return 1; case 25000: return 2; - case 29976: + case 29970: return 3; case 30000: return 4; case 50000: return 5; - case 50940: + case 59940: return 6; case 60000: return 7; @@ -817,7 +817,10 @@ void cVideo::getPictureInfo(int &width, int &height, int &rate) if (fd == -1) { /* 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]); height = proc_get_hex(VMPEG_yres[devnum]); rate = rate2csapi(r);