From dd793f24e886fc4bbac445e73db08dd2999e0341 Mon Sep 17 00:00:00 2001 From: jojo61 Date: Tue, 16 Oct 2018 16:09:37 +0200 Subject: [PATCH] impoved still picture --- softhddev.c | 2 +- video.c | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/softhddev.c b/softhddev.c index d104d3d..e311466 100644 --- a/softhddev.c +++ b/softhddev.c @@ -2703,7 +2703,7 @@ void StillPicture(const uint8_t * data, int size) #ifdef STILL_DEBUG fprintf(stderr, "still-picture\n"); #endif - for (i = 0; i < (MyVideoStream->CodecID == AV_CODEC_ID_HEVC ? 8 : 8); ++i) { + for (i = 0; i < (MyVideoStream->CodecID == AV_CODEC_ID_HEVC ? 8 : 12); ++i) { const uint8_t *split; int n; diff --git a/video.c b/video.c index e83e0b5..0d5aad0 100644 --- a/video.c +++ b/video.c @@ -1872,9 +1872,12 @@ static void CuvidPrintFrames(const CuvidDecoder * decoder) } int CuvidTestSurfaces() { - if (atomic_read(&CuvidDecoders[0]->SurfacesFilled) < VIDEO_SURFACES_MAX) - return 1; - return 0; + if (CuvidDecoders[0] != NULL) { + if (atomic_read(&CuvidDecoders[0]->SurfacesFilled) < VIDEO_SURFACES_MAX) + return 1; + return 0; + } else + return 0; } /// @@ -4842,7 +4845,7 @@ static void VideoCreateWindow(xcb_window_t parent, xcb_visualid_t visual, XCB_WINDOW_CLASS_INPUT_OUTPUT, visual, XCB_CW_BACK_PIXEL | XCB_CW_BORDER_PIXEL | XCB_CW_EVENT_MASK | XCB_CW_COLORMAP, values); - + Debug(3,"Create Window at %d,%d\n",VideoWindowX,VideoWindowY); // define only available with xcb-utils-0.3.8 #ifdef XCB_ICCCM_NUM_WM_SIZE_HINTS_ELEMENTS // FIXME: utf _NET_WM_NAME @@ -4939,8 +4942,7 @@ const char *VideoGetDriverName(void) /// int VideoSetGeometry(const char *geometry) { - XParseGeometry(geometry, &VideoWindowX, &VideoWindowY, &VideoWindowWidth, - &VideoWindowHeight); + XParseGeometry(geometry, &VideoWindowX, &VideoWindowY, &VideoWindowWidth, &VideoWindowHeight); return 0; }