Merging changes from DEE 5.2 release.

Author: mszym1

plugins/code/common/PipingManager/PipingManager.cpp

@@ -40,6 +40,7 @@
 #include <limits>
 #include <PipingManager.h>
 
+
 #ifdef WIN32
 #ifndef NOMINMAX
 #define NOMINMAX
@@ -56,10 +57,11 @@
 
 #define DEFAULT_TIMEOUT (10000)
 #define DEFAULT_BUFFER (1024*128)
-#define NAMED_PIPE_BUFFER (1024*64)
-#define WRITE_SIZE (16*1024)
-#define READ_SIZE (16*1024)
+#define NAMED_PIPE_BUFFER (128*1024)
+#define WRITE_SIZE (64*1024)
+#define READ_SIZE (64*1024)
 
+static const auto cvtimeout = std::chrono::milliseconds(50);
 
 using namespace std::chrono;
 using std::vector;
@@ -188,6 +190,11 @@ struct PipeData
     bool                mConnected;
 #endif
 
+    std::condition_variable mInBufHasData;
+    std::condition_variable mInBufHasRoom;
+    std::condition_variable mOutBufHasData;
+    std::condition_variable mOutBufHasRoom;
+
     PipeData(std::string name, size_t maxbuf, pipe_type_t type, int id, bool client = false);
     ~PipeData();
     void closeThread();
@@ -212,41 +219,53 @@ int get_flag(pipe_type_t type)
 }
 #endif
 
+
+static bool stopWaitingForIQAvailable(PipeData* p) {
+    return (p->mInBuf.Taken() > 0);
+}
+
 static
 int pipe_write_func(PipeData* data)
 {
     piping_status_t status = PIPE_MGR_OK;
+    std::unique_lock<std::mutex> lck(data->mMutex);
+    data->mInBufHasData.wait_for(lck, cvtimeout, std::bind(stopWaitingForIQAvailable, data));
 
-    data->mMutex.lock();
     size_t writeSize = data->mInBuf.Taken();
     if (writeSize > WRITE_SIZE) writeSize = WRITE_SIZE;
     data->mInBuf.PeekFront(data->mTempBuf.data(), writeSize);
-    data->mMutex.unlock();
+    lck.unlock();
 
 #ifdef WIN32
     DWORD bytes_written = 0;
-    if (WriteFile(data->mHandle, data->mTempBuf.data(), (DWORD)writeSize, &bytes_written, NULL) == FALSE)
-    {
-        DWORD last_error = GetLastError();
-        data->mErrorString = std::to_string(last_error);
-        status = PIPE_MGR_WRITE_ERROR;
+    if (writeSize > 0) {
+        if (WriteFile(data->mHandle, data->mTempBuf.data(), (DWORD)writeSize, &bytes_written, NULL) == FALSE)
+        {
+            DWORD last_error = GetLastError();
+            data->mErrorString = std::to_string(last_error);
+            status = PIPE_MGR_WRITE_ERROR;
+        }
     }
 #else
-    int bytes_written = write(data->mHandle, data->mTempBuf.data(), writeSize);
-    if (bytes_written < 0)
-    {
-        if (errno != EAGAIN)
+    int bytes_written = 0;
+    if (writeSize > 0) {
+        bytes_written = write(data->mHandle, data->mTempBuf.data(), writeSize);
+        if (bytes_written < 0)
         {
-            data->mErrorString = "write returned " + std::to_string(bytes_written) + " (errno=" + std::to_string((int)errno) + ").";
-            status = PIPE_MGR_WRITE_ERROR;
+            if (errno != EAGAIN)
+            {
+                data->mErrorString = "write returned " + std::to_string(bytes_written) + " (errno=" + std::to_string((int)errno) + ").";
+                status = PIPE_MGR_WRITE_ERROR;
+            }
+            bytes_written = 0;
         }
-        bytes_written = 0;
     }
 #endif
     if (bytes_written > 0)
     {
         data->mMutex.lock();
         data->mInBuf.PopFront(bytes_written);
+        data->mInBufHasRoom.notify_all();
         data->mMutex.unlock();
         data->mTotalDataWritten += bytes_written;
     }
@@ -258,11 +277,18 @@ int pipe_write_func(PipeData* data)
         return -1;
 }
 
+static bool stopWaitingForOQFree(PipeData* p) {
+    return (p->mOutBuf.Free() > 0);
+}
+
 static
 int pipe_read_func(PipeData* data)
 {
     piping_status_t status = PIPE_MGR_OK;
+    std::unique_lock<std::mutex> lck(data->mMutex);
+    data->mOutBufHasRoom.wait_for(lck, cvtimeout, std::bind(stopWaitingForOQFree, data));
     size_t readSize = data->mOutBuf.Free();
+    lck.unlock();
     if (readSize > READ_SIZE) readSize = READ_SIZE;
     if (readSize == 0) return 0;
 
@@ -301,6 +327,7 @@ int pipe_read_func(PipeData* data)
     {
         data->mMutex.lock();
         data->mOutBuf.Append(data->mTempBuf.data(), bytes_read);
+        data->mOutBufHasData.notify_all();
         data->mMutex.unlock();
     }
 
@@ -354,7 +381,6 @@ void pipe_thread_func(PipeData* data)
     int written_bytes = 0;
     int read_bytes = 0;
     bool success= true;
-
     // run main thread loop
     while (data->mStop == false)
     {
@@ -386,9 +412,11 @@ void pipe_thread_func(PipeData* data)
             break;
         }
 
+#if 1
         if (written_bytes == 0 && read_bytes == 0) {
             std::this_thread::sleep_for(std::chrono::microseconds(100));
         }
+#endif
     }
 
 #ifdef WIN32
@@ -688,6 +716,11 @@ piping_status_t PipingManager::getPipePath(int pipe_id, std::string& path)
     }
 }
 
+
+static bool stopWaitingForIQFree(PipeData* p) {
+    return (p->mInBuf.Free() > 0);
+}
+
 piping_status_t PipingManager::writeToPipe(int pipe_id, void* buffer, size_t data_size, size_t& bytes_written)
 {
     piping_status_t status = PIPE_MGR_OK;
@@ -701,7 +734,9 @@ piping_status_t PipingManager::writeToPipe(int pipe_id, void* buffer, size_t dat
     else
     {
         PipeData* pipe = it->second;
-        std::lock_guard<std::mutex> lock(pipe->mMutex);
+
+        std::unique_lock<std::mutex> lck(pipe->mMutex);
+        pipe->mInBufHasRoom.wait_for(lck, cvtimeout, std::bind(stopWaitingForIQFree, pipe));
 
         size_t data_to_write = data_size;
         if (data_to_write > pipe->mInBuf.Free())
@@ -717,6 +752,7 @@ piping_status_t PipingManager::writeToPipe(int pipe_id, void* buffer, size_t dat
         {
             pipe->mInBuf.Append((char*)buffer, data_to_write);
             bytes_written = data_to_write;
+            pipe->mInBufHasData.notify_all();
         }
 
         status = pipe->mTimeout ? PIPE_MGR_TIMEOUT : status;
@@ -725,6 +761,10 @@ piping_status_t PipingManager::writeToPipe(int pipe_id, void* buffer, size_t dat
     return status;
 }
 
+static bool stopWaitingForOQAvailable(PipeData* p) {
+    return (p->mOutBuf.Taken() > 0);
+}
+
 piping_status_t PipingManager::readFromPipe(int pipe_id, void* buffer, size_t buffer_size, size_t& bytes_read)
 {
     piping_status_t status = PIPE_MGR_OK;
@@ -737,7 +777,9 @@ piping_status_t PipingManager::readFromPipe(int pipe_id, void* buffer, size_t bu
     else
     {
         PipeData* pipe = it->second;
-        std::lock_guard<std::mutex> lock(pipe->mMutex);
+
+        std::unique_lock<std::mutex> lck(pipe->mMutex);
+        pipe->mOutBufHasData.wait_for(lck, cvtimeout, std::bind(stopWaitingForOQAvailable, pipe));
 
         size_t data_to_read = buffer_size;
         if (data_to_read > pipe->mOutBuf.Taken())
@@ -749,6 +791,7 @@ piping_status_t PipingManager::readFromPipe(int pipe_id, void* buffer, size_t bu
         {
             pipe->mOutBuf.PopFront((char*)buffer, data_to_read);
             bytes_read = data_to_read;
+            pipe->mOutBufHasRoom.notify_all();
         }
 
         status = pipe->mTimeout ? PIPE_MGR_TIMEOUT : pipe->mStatus;

plugins/code/common/PipingManager/PipingManager.h

@@ -31,6 +31,7 @@
 */
 
 #include <string>
+#include <condition_variable>
 
 struct PipingManagerData;
 

plugins/code/hevc_enc/beamr/src/hevc_enc_beamr.cpp

@@ -50,7 +50,7 @@ static const PropertyInfo propertyInfo[] = {
     {"width", PROPERTY_TYPE_INTEGER, NULL, NULL, NULL, 1, 1, ACCESS_TYPE_WRITE_INIT},
     {"height", PROPERTY_TYPE_INTEGER, NULL, NULL, NULL, 1, 1, ACCESS_TYPE_WRITE_INIT},
     {"color_space", PROPERTY_TYPE_STRING, NULL, "i420", "i400:i420:i422:i444", 0, 1, ACCESS_TYPE_WRITE_INIT},
-    {"frame_rate", PROPERTY_TYPE_DECIMAL, NULL, NULL, "23.976:24:25:29.97:30:48:50:59.94:60", 1, 1,
+    {"frame_rate", PROPERTY_TYPE_DECIMAL, NULL, NULL, "23.976:24:25:29.97:30:48:50:59.94:60:119.88:120", 1, 1,
      ACCESS_TYPE_WRITE_INIT},
     {"data_rate", PROPERTY_TYPE_INTEGER, "Average data rate in kbps.", "15000", NULL, 0, 1, ACCESS_TYPE_WRITE_INIT},
     {"max_vbv_data_rate", PROPERTY_TYPE_INTEGER, "Max VBV ctrl rate in kbps.", "15000", NULL, 0, 1,

plugins/code/hevc_enc/beamr/src/hevc_enc_beamr_impl.cpp

@@ -642,7 +642,7 @@ void Encoder::parseGopStructureFile() {
                 continue;
             }
 
-            if (s.type != VH3_SLICE_B && s.type != VH3_SLICE_P && s.type != VH3_SLICE_I && s.type != -1) {
+            if (s.type != VH3_SLICE_B && s.type != VH3_SLICE_P && s.type != VH3_SLICE_I && s.type != VH3_SLICE_UNKNOWN) {
                 message("gop_structure_in_file: Ignoring line %llu. Invalid 'type' value.", lineNum);
                 continue;
             }

plugins/code/hevc_enc/beamr/src/hevc_enc_beamr_utils.cpp

@@ -148,6 +148,14 @@ FramePeriod string2FramePeriod(const std::string& s) {
         fp.timeScale = 60;
         fp.numUnitsInTick = 1;
     }
+    else if ("119.88" == s) {
+        fp.timeScale = 120000;
+        fp.numUnitsInTick = 1001;
+    }
+    else if ("120" == s) {
+        fp.timeScale = 120;
+        fp.numUnitsInTick = 1;
+    }
     return fp;
 }
 

plugins/code/hevc_enc/ffmpeg/src/hevc_enc_ffmpeg.cpp

@@ -50,7 +50,7 @@ PropertyInfo hevc_enc_ffmpeg_info[] =
     , { "width", PROPERTY_TYPE_INTEGER, NULL, NULL, NULL, 1, 1, ACCESS_TYPE_WRITE_INIT }
     , { "height", PROPERTY_TYPE_INTEGER, NULL, NULL, NULL, 1, 1, ACCESS_TYPE_WRITE_INIT }
     , { "color_space", PROPERTY_TYPE_STRING, NULL, "i420", "i400:i420:i422:i444", 0, 1, ACCESS_TYPE_WRITE_INIT }
-    , { "frame_rate", PROPERTY_TYPE_DECIMAL, NULL, NULL, "23.976:24:25:29.97:30:48:50:59.94:60", 1, 1, ACCESS_TYPE_WRITE_INIT }
+    , { "frame_rate", PROPERTY_TYPE_DECIMAL, NULL, NULL, "23.976:24:25:29.97:30:48:50:59.94:60:119.88:120", 1, 1, ACCESS_TYPE_WRITE_INIT }
     , { "data_rate", PROPERTY_TYPE_INTEGER, "Average data rate in kbps.", "15000", NULL, 0, 1, ACCESS_TYPE_WRITE_INIT }
     , { "max_vbv_data_rate", PROPERTY_TYPE_INTEGER, "Max VBV data rate in kbps.", "15000", NULL, 0, 1, ACCESS_TYPE_WRITE_INIT }
     , { "vbv_buffer_size", PROPERTY_TYPE_INTEGER, "VBV buffer size in kb.", "30000", NULL, 0, 1, ACCESS_TYPE_WRITE_INIT }

plugins/code/hevc_enc/ffmpeg/src/hevc_enc_ffmpeg_utils.cpp

@@ -817,6 +817,7 @@ fps_to_num_denom
     if ("23.976" == fps) return "24000/1001";
     else if ("29.97" == fps) return "30000/1001";
     else if ("59.94" == fps) return "60000/1001";
+    else if ("119.88" == fps) return "120000/1001";
     return std::to_string(std::stoi(fps))+"/1";
 }
 

plugins/code/hevc_enc/x265/readme.txt

@@ -1,11 +1,11 @@
 Dolby Encoding Engine plugin for the x265 HEVC encoder
 
-The provided source code was built and tested using the x265 library version 3.1.2.
+The provided source code was built and tested using the x265 library version 3.5.
 
 Build tools: 
-- Visual Studio 2013 (to build x265 library)
-- Visual Studio 2013 or 2015 (to build the plugin)
+- Visual Studio 2015
 - gcc 4.8.5
+- clang 12.0.0
 
 x265 compilation and prerequisities:
 - CMake
@@ -14,38 +14,44 @@ x265 compilation and prerequisities:
     Make sure cmake is added to PATH
 
 - NASM:
-    x265 shall be built with NASM (verified with 2.13.03) in order to achieve maximum performance.
+    x265 shall be built with NASM (verified with 2.15.05) in order to achieve maximum performance.
     NASM Release Builds are currently stored at www.nasm.us/pub/nasm/releasebuilds/ 
-    Linux:
+    Linux & Mac:
     - Download:
-      wget www.nasm.us/pub/nasm/releasebuilds/2.13.03/nasm-2.13.03.tar.xz
+      wget www.nasm.us/pub/nasm/releasebuilds/2.15.05/nasm-2.13.05.tar.xz
     - Extract:
-      tar -xvf nasm-2.13.03.tar.xz
-    - Go to the extracted nasm-2.13.03 directory, build and install:
+      tar -xvf nasm-2.15.05.tar.xz
+    - Go to the extracted nasm-2.15.05 directory, build and install:
       ./configure
       make
       sudo make install  
     Windows:
     - Download the installer: 
-      https://www.nasm.us/pub/nasm/releasebuilds/2.13.03/win64/nasm-2.13.03-installer-x64.exe
+      https://www.nasm.us/pub/nasm/releasebuilds/2.15.05/win64/nasm-2.15.05-installer-x64.exe
     - Execute the installer and follow the instructions
     - Add the NASM installation directory to PATH
 
 - Building x265:
     It is mandatory to build the x265 library with at least 10-bit API.
     The recommended way is to build an x265 library containing 8/10/12-bit API.
     The simplest way is to use the x265 multilib build scripts.
-    
-    Linux:
-    ./multilib.sh (in x265_3.1.2/build/linux directory)
+    Linux & Mac:
+    ./make-Makefiles.bash (If building for Mac, set CMAKE_OSX_DEPLOYMENT_TARGET value to 10.12)
+
+    ./multilib.sh (in x265_3.5/build/linux directory)
 
     Windows:
-    .\multilib.bat (in x265_3.1.2\vc12-x86_64)
+    .\multilib.bat (in x265_3.5\vc12-x86_64 if building in VS2013, in x265_3.5\vc15-x86_64 if VS2015 or later)
+    If builing with VS2015, change %VS150COMNTOOLS% in build-all.bat and multilib.bat to %VS140COMNTOOLS%
+    and change occurances of -G "Visual Studio 15 Win64" to -G "Visual Studio 14 Win64" in build-all.bat, make-solutions.bat, multilib.bat
+    or refer to resources/engineering_docs/x265_build_and_install/BuildAndInstallx265Plugin.md
 
     If you set up NASM properly, at the start of execution, the following message displays:
-    Found nasm: C:/Users/[USER]/NASM/nasm.exe (found version "2.13.03")
-    Found Nasm 2.13.03 to build assembly primitives
-    x265 version 3.1.2
+    Found nasm: C:/Users/[USER]/NASM/nasm.exe (found version "2.15.05")
+    Found Nasm 2.15.05 to build assembly primitives
+    x265 version 3.5
+
+    Generated libraries can be found in /8bit (/8bit/Release if Windows) directory
 
     Visit https://bitbucket.org/multicoreware/x265/wiki/Home for more details.
 
@@ -75,5 +81,5 @@ Build instructions, Linux:
 2. Build using make/hevc_enc_x265/linux_amd64_gnu/Makefile
     - make hevc_enc_x265_release.so
 3. Copy the .so library with the plugin and "libx265.so" to the Dolby Encoding Engine installation folder
-4. Rename "libx265.so" (or create a symbolic link) according to the used x265 API version, e.g. "libx265.so.176"
-    -  To check what the expected name is, use the command: ldd hevc_enc_x265_release.so
+4. Rename "libx265.so" (or create a symbolic link) according to the used x265 API version, e.g. "libx265.so.199"
+    -  To check what the expected name is, use the command: ldd hevc_enc_x265_release.so, or check the number in x265_config.h file

plugins/code/hevc_enc/x265/src/hevc_enc_x265.cpp

@@ -48,7 +48,7 @@ PropertyInfo hevc_enc_x265_info[] =
     ,{"width", PROPERTY_TYPE_INTEGER, NULL, NULL, NULL, 1, 1, ACCESS_TYPE_WRITE_INIT}
     ,{"height", PROPERTY_TYPE_INTEGER, NULL, NULL, NULL, 1, 1, ACCESS_TYPE_WRITE_INIT}
     ,{"color_space", PROPERTY_TYPE_STRING, NULL, "i420", "i400:i420:i422:i444", 0, 1, ACCESS_TYPE_WRITE_INIT}
-    ,{"frame_rate", PROPERTY_TYPE_DECIMAL, NULL, NULL, "23.976:24:25:29.97:30:48:50:59.94:60", 1, 1, ACCESS_TYPE_WRITE_INIT}
+    ,{"frame_rate", PROPERTY_TYPE_DECIMAL, NULL, NULL, "23.976:24:25:29.97:30:48:50:59.94:60:119.88:120", 1, 1, ACCESS_TYPE_WRITE_INIT}
     ,{"data_rate", PROPERTY_TYPE_INTEGER, "Average data rate in kbps.", "15000", NULL, 0, 1, ACCESS_TYPE_WRITE_INIT}
     ,{"max_vbv_data_rate", PROPERTY_TYPE_INTEGER, "Max VBV data rate in kbps.", "15000", NULL, 0, 1, ACCESS_TYPE_WRITE_INIT}
     ,{"vbv_buffer_size", PROPERTY_TYPE_INTEGER, "VBV buffer size in kb.", "30000", NULL, 0, 1, ACCESS_TYPE_WRITE_INIT}
@@ -80,7 +80,7 @@ PropertyInfo hevc_enc_x265_info[] =
     ,{ "force_slice_type", PROPERTY_TYPE_BOOLEAN, "Indicates that framework will try to force specific slice type.", "false", NULL, 0, 1, ACCESS_TYPE_WRITE_INIT }
 
     // Only properties below (ACCESS_TYPE_USER) can be modified 
-    ,{"preset", PROPERTY_TYPE_STRING, "Sets parameters to preselected values.", "medium", "ultrafast:superfast:veryfast:faster:fast:medium:slow:slower:veryslow:placebo", 0, 1, ACCESS_TYPE_USER}
+    ,{"preset", PROPERTY_TYPE_STRING, "Sets parameters to preselected values.", "medium", "placebo:veryslow:slower:slow:medium:fast:faster:veryfast:superfast:ultrafast", 0, 1, ACCESS_TYPE_USER}
     ,{"tune", PROPERTY_TYPE_STRING, "Tune the settings for a particular type of source or situation.", "none", "none:psnr:ssim:grain:fastdecode:zerolatency", 0, 1, ACCESS_TYPE_USER}
     ,{"open_gop", PROPERTY_TYPE_BOOLEAN, "Allows I-slices to be non-IDR.", "false", NULL, 0, 1, ACCESS_TYPE_USER}
     ,{"max_intra_period", PROPERTY_TYPE_INTEGER, "Max intra period in frames.", "25", "1:65535", 0, 1, ACCESS_TYPE_USER}

plugins/code/hevc_enc/x265/src/hevc_enc_x265_utils.cpp

@@ -291,6 +291,8 @@ parse_init_params
                 &&  value != "50"
                 &&  value != "59.94"
                 &&  value != "60"
+                &&  value != "119.88"
+                &&  value != "120"
                 )
             {
                 state->data->msg += "\nInvalid 'frame_rate' value.";
@@ -1147,5 +1149,6 @@ fps_to_num_denom
     if ("23.976" == fps) return {24000,1001};
     else if ("29.97" == fps) return {30000,1001};
     else if ("59.94" == fps) return {60000, 1001};
+    else if ("119.88" == fps) return {120000, 1001};
     else return {std::stoi(fps), 1};
 }