[x265] [PATCH] Fix segmentation fault with svt enabled build and modify library install path

[Snehaa Giridharan]

# HG changeset patch
# User Snehaa Giridharan <snehaa at multicorewareinc.com>
# Date 1578404459 -19800
#      Tue Jan 07 19:10:59 2020 +0530
# Node ID ba3a323971111472b2240e45cb3b6e7824a25ce4
# Parent  2b8ee235997fabcad221069ecf8a80d0d50c9133
Fix segmentation fault with svt enabled build and modify library install
path

This commit
1. Fixes segmentation fault on running x265 encodes via svt integrated
build.
2. Modifies library install path of SVT from bin to library folder.

diff -r 2b8ee235997f -r ba3a32397111 source/CMakeLists.txt
--- a/source/CMakeLists.txt Wed Dec 11 16:11:24 2019 +0530
+++ b/source/CMakeLists.txt Tue Jan 07 19:10:59 2020 +0530
@@ -573,7 +573,7 @@
 if(SVTHEVC_FOUND)
     install(FILES "${SVT_HEVC_INCLUDE_DIR}/EbApi.h" DESTINATION include)
     install(FILES "${SVT_HEVC_INCLUDE_DIR}/EbErrorCodes.h" DESTINATION
include)
-    install(FILES "${SVT_HEVC_LIBRARY}" DESTINATION ${BIN_INSTALL_DIR})
+    install(FILES "${SVT_HEVC_LIBRARY}" DESTINATION ${LIB_INSTALL_DIR})
 endif()

 install(FILES x265.h "${PROJECT_BINARY_DIR}/x265_config.h" DESTINATION
include)
diff -r 2b8ee235997f -r ba3a32397111 source/encoder/api.cpp
--- a/source/encoder/api.cpp Wed Dec 11 16:11:24 2019 +0530
+++ b/source/encoder/api.cpp Tue Jan 07 19:10:59 2020 +0530
@@ -415,12 +415,12 @@

 #ifdef SVT_HEVC
     EB_ERRORTYPE return_error;
-    static unsigned char picSendDone = 0;
-    numEncoded = 0;
-    static int codedNal = 0, eofReached = 0;
- EB_H265_ENC_CONFIGURATION* svtParam =
(EB_H265_ENC_CONFIGURATION*)encoder->m_svtAppData->svtHevcParams;
     if (encoder->m_param->bEnableSvtHevc)
     {
+        static unsigned char picSendDone = 0;
+        numEncoded = 0;
+        static int codedNal = 0, eofReached = 0;
+        EB_H265_ENC_CONFIGURATION* svtParam =
(EB_H265_ENC_CONFIGURATION*)encoder->m_svtAppData->svtHevcParams;
         if (pic_in)
         {
             if (pic_in->colorSpace == X265_CSP_I420) // SVT-HEVC supports
only yuv420p color space

-- 
*Thanks and Regards,*
*Snehaa.G*
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/x265-devel/attachments/20200107/c5569191/attachment.html>