mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3947 from akallabeth/openh264_fixes 

Openh264 fixes
This commit is contained in:
David Fort 2017-05-10 21:22:18 +02:00 committed by GitHub
parent 8df8cc6fb5 21e20ac9f2
commit ca1872c60e
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmake/FindOpenH264.cmake
View File

@ -7,17 +7,22 @@
# OPENH264_INCLUDE_DIR - the OpenH264 include directory
# OPENH264_LIBRARIES - libopenh264 library
if (UNIX AND NOT ANDROID)
find_package(PkgConfig QUIET)
pkg_check_modules(PC_OPENH264 QUIET openh264)
endif (UNIX AND NOT ANDROID)
if (OPENH264_INCLUDE_DIR AND OPENH264_LIBRARY)
set(OPENH264_FIND_QUIETLY TRUE)
endif (OPENH264_INCLUDE_DIR AND OPENH264_LIBRARY)
find_path(OPENH264_INCLUDE_DIR NAMES wels/codec_api.h wels/codec_app_def.h wels/codec_def.h
PATH_SUFFIXES include
HINTS ${OPENH264_ROOT})
HINTS ${OPENH264_ROOT} ${PC_OPENH264_INCLUDE_DIRS})
find_library(OPENH264_LIBRARY
NAMES openh264_dll openh264 welsdec
PATH_SUFFIXES lib
HINTS ${OPENH264_ROOT})
HINTS ${OPENH264_ROOT} ${PC_OPENH264_LIBRARY_DIRS})
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenH264 DEFAULT_MSG OPENH264_LIBRARY OPENH264_INCLUDE_DIR)

6
libfreerdp/gdi/gfx.c
View File

@ -424,6 +424,9 @@ static UINT gdi_SurfaceCommand_AVC420(rdpGdi* gdi,
WLog_ERR(TAG, "%s: unable to create h264 context", __FUNCTION__);
return ERROR_NOT_ENOUGH_MEMORY;
}
if (!h264_context_reset(surface->h264, surface->width, surface->height))
return ERROR_INTERNAL_ERROR;
}
bs = (RDPGFX_AVC420_BITMAP_STREAM*) cmd->extra;
@ -493,6 +496,9 @@ static UINT gdi_SurfaceCommand_AVC444(rdpGdi* gdi, RdpgfxClientContext* context,
WLog_ERR(TAG, "%s: unable to create h264 context", __FUNCTION__);
return ERROR_NOT_ENOUGH_MEMORY;
}
if (!h264_context_reset(surface->h264, surface->width, surface->height))
return ERROR_INTERNAL_ERROR;
}
bs = (RDPGFX_AVC444_BITMAP_STREAM*) cmd->extra;