Various updates and improvements.

mszym1 · mszym1 · commit c44344319f7e · 2021-07-19T09:20:25.000+02:00
diff --git a/plugins/code/hevc_dec/beamr/README.md b/plugins/code/hevc_dec/beamr/README.md
@@ -1,6 +1,6 @@
 # Beamr HEVC decoder plugin for Dolby Encoding Engine
 
-Provided source code was built and tested using Beamr5x-4.6.0.7.
+Provided source code was built and tested using Beamr5x-4.7.2.2.
 
 ## Build tools
 
diff --git a/plugins/code/hevc_enc/beamr/README.md b/plugins/code/hevc_enc/beamr/README.md
@@ -1,6 +1,6 @@
 # Beamr HEVC encoder plugin for Dolby Encoding Engine
 
-Provided source code was built and tested using Beamr5x-4.6.0.7.
+Provided source code was built and tested using Beamr5x-4.7.2.2.
 
 ## Build tools
 
@@ -73,7 +73,3 @@ The presented XML interface contains only basic encoder parameters. Other parame
 
 These elements allow configuring encoder using native Beamr parameters, which can be found in Beamr SDK documentation and sample configs in `$BEAMR_SDK\samples\*.cfg`.
 
-## Known issues
-
-- When encoding Enhancement layer for Dolby Vision profile 7, encoder forces tier Main instead fo High.
-  - This issue shall be fixed with the next release of Beamr SDK.
diff --git a/plugins/code/hevc_enc/ffmpeg/examples/example_profile_5.xml b/plugins/code/hevc_enc/ffmpeg/examples/example_profile_5.xml
@@ -41,7 +41,9 @@
         <append_frames_method>1</append_frames_method>    <!-- integer: from 0 to 1 -->
         <decoder>
           <j2k_dec>
-            <kakadu_dlb/>    <!-- If plugin 'kakadu_dlb' is not available use the other one, e.g. 'base'. -->
+            <kakadu_dlb>    <!-- If plugin 'kakadu_dlb' is not available use the other one, e.g. 'base'. -->
+              <thread_num>4</thread_num>    <!-- integer: from 0 to 255 -->
+            </kakadu_dlb>
           </j2k_dec>
         </decoder>
         <scaling>
diff --git a/plugins/code/hevc_enc/ffmpeg/examples/example_profile_8_1.xml b/plugins/code/hevc_enc/ffmpeg/examples/example_profile_8_1.xml
@@ -45,7 +45,9 @@
         <disable_md_postproc>false</disable_md_postproc>    <!-- boolean: true or false -->
         <decoder>
           <j2k_dec>
-            <kakadu_dlb/>    <!-- If plugin 'kakadu_dlb' is not available use the other one, e.g. 'base'. -->
+            <kakadu_dlb>    <!-- If plugin 'kakadu_dlb' is not available use the other one, e.g. 'base'. -->
+              <thread_num>4</thread_num>    <!-- integer: from 0 to 255 -->
+            </kakadu_dlb>
           </j2k_dec>
         </decoder>
         <scaling>
diff --git a/plugins/code/hevc_enc/x265/examples/example_dv_mezz_to_hdr10.xml b/plugins/code/hevc_enc/x265/examples/example_dv_mezz_to_hdr10.xml
@@ -46,7 +46,9 @@
         <encode_pass_num>2</encode_pass_num>    <!-- integer -->
         <decoder>
           <j2k_dec>
-            <kakadu_dlb/>    <!-- If plugin 'kakadu_dlb' is not available use the other one, e.g. 'base'. -->
+            <kakadu_dlb>    <!-- If plugin 'kakadu_dlb' is not available use the other one, e.g. 'base'. -->
+              <thread_num>4</thread_num>    <!-- integer: from 0 to 255 -->
+            </kakadu_dlb>
           </j2k_dec>
         </decoder>
         <scaling>
diff --git a/plugins/code/hevc_enc/x265/examples/example_dv_mezz_to_sdr.xml b/plugins/code/hevc_enc/x265/examples/example_dv_mezz_to_sdr.xml
@@ -33,7 +33,9 @@
         <encode_pass_num>2</encode_pass_num>    <!-- integer -->
         <decoder>
           <j2k_dec>
-            <kakadu_dlb/>    <!-- If plugin 'kakadu_dlb' is not available use the other one, e.g. 'base'. -->
+            <kakadu_dlb>    <!-- If plugin 'kakadu_dlb' is not available use the other one, e.g. 'base'. -->
+              <thread_num>4</thread_num>    <!-- integer: from 0 to 255 -->
+            </kakadu_dlb>
           </j2k_dec>
         </decoder>
         <scaling>
diff --git a/plugins/code/hevc_enc/x265/examples/example_profile_5.xml b/plugins/code/hevc_enc/x265/examples/example_profile_5.xml
@@ -41,7 +41,9 @@
         <append_frames_method>1</append_frames_method>    <!-- integer: from 0 to 1 -->
         <decoder>
           <j2k_dec>
-            <kakadu_dlb/>    <!-- If plugin 'kakadu_dlb' is not available use the other one, e.g. 'base'. -->
+            <kakadu_dlb>    <!-- If plugin 'kakadu_dlb' is not available use the other one, e.g. 'base'. -->
+              <thread_num>4</thread_num>    <!-- integer: from 0 to 255 -->
+            </kakadu_dlb>
           </j2k_dec>
         </decoder>
         <scaling>
diff --git a/plugins/code/hevc_enc/x265/examples/example_profile_8_1.xml b/plugins/code/hevc_enc/x265/examples/example_profile_8_1.xml
@@ -45,7 +45,9 @@
         <disable_md_postproc>false</disable_md_postproc>    <!-- boolean: true or false -->
         <decoder>
           <j2k_dec>
-            <kakadu_dlb/>    <!-- If plugin 'kakadu_dlb' is not available use the other one, e.g. 'base'. -->
+            <kakadu_dlb>    <!-- If plugin 'kakadu_dlb' is not available use the other one, e.g. 'base'. -->
+              <thread_num>4</thread_num>    <!-- integer: from 0 to 255 -->
+            </kakadu_dlb>
           </j2k_dec>
         </decoder>
         <scaling>
diff --git a/plugins/code/j2k_dec/comprimato/src/j2k_dec_comprimato.cpp b/plugins/code/j2k_dec/comprimato/src/j2k_dec_comprimato.cpp
@@ -126,7 +126,7 @@ comprimato_init
         }
         else
         {
-            state->data->msg += "\nUnknown XML property: " + name;
+            state->data->msg += "\nUnknown property: " + name;
             return STATUS_ERROR;
         }
     }
@@ -161,6 +161,7 @@ comprimato_close
 )
 {
     j2k_dec_comprimato_t* state = (j2k_dec_comprimato_t*)handle;
+    state->data->msg.clear();
 
     CHECK_API_OK(cmpto_j2k_dec_ctx_destroy(state->data->cmpto_ctx));
     delete[] state->data->output_buffer;
@@ -177,6 +178,7 @@ comprimato_process
 )
 {
     j2k_dec_comprimato_t* state = (j2k_dec_comprimato_t*)handle;
+    state->data->msg.clear();
 
     cmpto_j2k_dec_img* img;
     cmpto_j2k_dec_img* decoded_img;
diff --git a/plugins/code/j2k_dec/ffmpeg/src/j2k_dec_ffmpeg.cpp b/plugins/code/j2k_dec/ffmpeg/src/j2k_dec_ffmpeg.cpp
@@ -176,7 +176,7 @@ ffmpeg_init
         }
         else
         {
-            state->data->msg += "\nUnknown XML property: " + name;
+            state->data->msg += "\nUnknown property: " + name;
             return STATUS_ERROR;
         }
     }
@@ -237,6 +237,7 @@ ffmpeg_close
     )
 {
     j2k_dec_ffmpeg_t* state = (j2k_dec_ffmpeg_t*)handle;
+    state->data->msg.clear();
 
     cur_instance_idx = 0;
 
@@ -289,6 +290,7 @@ ffmpeg_process
     )
 {
     j2k_dec_ffmpeg_t* state = (j2k_dec_ffmpeg_t*)handle;
+    state->data->msg.clear();
     FILE* file_in;
     FILE* file_out;
     
diff --git a/plugins/code/j2k_dec/j2k_dec_api.h b/plugins/code/j2k_dec/j2k_dec_api.h
@@ -49,7 +49,7 @@ extern "C" {
 *      temp_file_num : integer : n/a : j2k_dec_get_property : accessed before j2k_dec_init, optional, should be used if plugin needs some temp files
 *      temp_file : string : n/a : j2k_dec_init : occurs multiple times, according to value retrieved from 'temp_file_num'
 *
-* Additionally, j2k_dec_init_params_t structure will contain all plugin-specific properties set via XML interface (ACCESS_TYPE_USER).
+* Additionally, j2k_dec_init_params_t structure will contain all plugin-specific properties set via user's configuration (ACCESS_TYPE_USER).
 *
 */
 
diff --git a/plugins/code/j2k_dec/kakadu/src/j2k_dec_kakadu.cpp b/plugins/code/j2k_dec/kakadu/src/j2k_dec_kakadu.cpp
@@ -75,7 +75,7 @@ PropertyInfo j2k_dec_kakadu_info[] =
     { "config_path", PROPERTY_TYPE_STRING, "Path to DEE config file.", NULL, NULL, 1, 1, ACCESS_TYPE_WRITE_INIT },
     { "width", PROPERTY_TYPE_INTEGER, "Picture width", NULL, NULL, 1, 1, ACCESS_TYPE_WRITE_INIT },
     { "height", PROPERTY_TYPE_INTEGER, "Picture height", NULL, NULL, 1, 1, ACCESS_TYPE_WRITE_INIT },
-    { "thread_num", PROPERTY_TYPE_INTEGER, "Number of threads to be used by decoder instance. Value 0 disables multi-threading.", "4", "0:255", 0, 1, ACCESS_TYPE_USER }
+    { "thread_num", PROPERTY_TYPE_INTEGER, "Number of threads to be used by decoder instance. Value '0' disables multi-threading.", "4", "0:255", 0, 1, ACCESS_TYPE_USER }
 };
 
 size_t
@@ -184,9 +184,8 @@ kakadu_init
 {
     j2k_dec_kakadu_t* state = (j2k_dec_kakadu_t*)handle;
     state->data = new j2k_dec_kakadu_data_t;
-   
+    
     init_data(state->data);
-
     for (size_t i = 0; i < init_params->count; i++)
     {
         std::string name(init_params->properties[i].name);
@@ -215,7 +214,7 @@ kakadu_init
             }
             else
             {
-                state->data->msg += "Unknown XML property: " + name;
+                state->data->msg += "Unknown property: " + name;
                 return STATUS_ERROR;
             }
         } catch(std::exception&){
@@ -263,6 +262,7 @@ kakadu_close
     )
 {
     j2k_dec_kakadu_t* state = (j2k_dec_kakadu_t*)handle;
+    state->data->msg.clear();
 
     if (state->data)
     {
@@ -300,7 +300,8 @@ kakadu_process
     )
 {
     j2k_dec_kakadu_t* state = (j2k_dec_kakadu_t*)handle;
-    
+    state->data->msg.clear();
+
     j2k_buffer input;
     input.open(in->buffer, (kdu_long)in->size);
     kdu_codestream codestream; codestream.create(&input);
diff --git a/plugins/code/prores_dec/apple/src/ProresDecApple.cpp b/plugins/code/prores_dec/apple/src/ProresDecApple.cpp
@@ -177,14 +177,16 @@ ProresDecApple::ProresDecApple()
     ,bytesPerRow(0)
     ,bufferSize(0)
     ,decoderFormat(kPRFormat_b64a)
-    ,outBuffer(NULL)
-    ,scratchMem(NULL)
+    ,decoder(nullptr)
+    ,outBuffer(nullptr)
+    ,scratchMem(nullptr)
     ,pluginFormat(RGB48LE)
 {
 }
 
 Status ProresDecApple::init(const ProresDecInitParams* initParams)
 {
+    close();
     msg.clear();
     for (int i = 0; i < initParams->count; i++)
     {
@@ -236,9 +238,19 @@ Status ProresDecApple::init(const ProresDecInitParams* initParams)
             }
             this->threads = multithread;
         }
+        else if ("thread_num" == name)
+        {
+            int thread_num = std::stoi(value);
+            if (thread_num < 0)
+            {
+                msg += "\nInvalid 'thread_num' value.";
+                continue;
+            }
+            this->threads = thread_num;
+        }
         else
         {
-            msg += "\nUnknown XML property: " + name;
+            msg += "\nUnknown property: " + name;
         }
     }
 
@@ -291,12 +303,19 @@ Status ProresDecApple::process(const ProresDecInput* in, ProresDecOutput* out)
 
 Status ProresDecApple::close()
 {
-    if (outBuffer != NULL)
-        delete[] outBuffer;    
-    if (scratchMem != NULL)
+    if (outBuffer) {
+        delete[] outBuffer;
+        outBuffer = nullptr;
+    }
+    if (scratchMem) {
         delete[] scratchMem;
-        
-    PRCloseDecoder(decoder);
+        scratchMem = nullptr;
+    }
+
+    if (decoder) {
+        PRCloseDecoder(decoder);
+        decoder = nullptr;
+    }
         
     return STATUS_OK;
 }
@@ -332,7 +351,7 @@ void ProresDecApple::fillProperties()
         propVector.push_back({ "output_format", PROPERTY_TYPE_STRING, "Desired format of decoded data", "rgb48le", "yuv422p16le:rgb48le", 1, 1, ACCESS_TYPE_WRITE_INIT });
         propVector.push_back({ "width",  PROPERTY_TYPE_INTEGER, "Source picture width", NULL, NULL, 1, 1, ACCESS_TYPE_WRITE_INIT });
         propVector.push_back({ "height", PROPERTY_TYPE_INTEGER, "Source picture height", NULL, NULL, 1, 1, ACCESS_TYPE_WRITE_INIT });
-        propVector.push_back({ "multithread", PROPERTY_TYPE_INTEGER, "Number of threads used for decoding, 0 means auto", NULL, NULL, 1, 1, ACCESS_TYPE_WRITE_INIT });
+        propVector.push_back({ "multithread", PROPERTY_TYPE_INTEGER, "Number of threads used for decoding. '0' means \"configure automatically\".", NULL, NULL, 1, 1, ACCESS_TYPE_WRITE_INIT });
     }
 }
 
diff --git a/plugins/code/prores_dec/prores_dec_api.h b/plugins/code/prores_dec/prores_dec_api.h
@@ -52,7 +52,7 @@ extern "C" {
 *      temp_file_num : integer : n/a : prores_dec_get_property : accessed before prores_dec_init, optional, should be used if plugin needs some temp files
 *      temp_file : string : n/a : prores_dec_init : occurs multiple times, according to value retrieved from 'temp_file_num'
 *
-* Additionally, prores_dec_init_params_t structure will contain all plugin-specific properties set via XML interface (ACCESS_TYPE_USER).
+* Additionally, prores_dec_init_params_t structure will contain all plugin-specific properties set via user's configuration (ACCESS_TYPE_USER).
 *
 */
 
diff --git a/plugins/code/tiff_dec/libtiff/src/tiff_dec_libtiff.cpp b/plugins/code/tiff_dec/libtiff/src/tiff_dec_libtiff.cpp
@@ -303,6 +303,8 @@ static Status libtiff_get_property(TiffDecHandle handle, Property* property) {
 
 static const char* libtiff_get_message(TiffDecHandle handle) {
     tiff_dec_libtiff_t* state = (tiff_dec_libtiff_t*)handle;
+    if (!state->data)
+        return NULL;
     return state->data->msg.empty() ? NULL : state->data->msg.c_str();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ comprimato_init`
`126`	`126`	`}`
`127`	`127`	`else`
`128`	`128`	`{`
`129`		`- state->data->msg += "\nUnknown XML property: " + name;`
	`129`	`+ state->data->msg += "\nUnknown property: " + name;`
`130`	`130`	`return STATUS_ERROR;`
`131`	`131`	`}`
`132`	`132`	`}`
`@@ -161,6 +161,7 @@ comprimato_close`
`161`	`161`	`)`
`162`	`162`	`{`
`163`	`163`	`j2k_dec_comprimato_t* state = (j2k_dec_comprimato_t*)handle;`
	`164`	`+ state->data->msg.clear();`
`164`	`165`
`165`	`166`	`CHECK_API_OK(cmpto_j2k_dec_ctx_destroy(state->data->cmpto_ctx));`
`166`	`167`	`delete[] state->data->output_buffer;`
`@@ -177,6 +178,7 @@ comprimato_process`
`177`	`178`	`)`
`178`	`179`	`{`
`179`	`180`	`j2k_dec_comprimato_t* state = (j2k_dec_comprimato_t*)handle;`
	`181`	`+ state->data->msg.clear();`
`180`	`182`
`181`	`183`	`cmpto_j2k_dec_img* img;`
`182`	`184`	`cmpto_j2k_dec_img* decoded_img;`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ ffmpeg_init`
`176`	`176`	`}`
`177`	`177`	`else`
`178`	`178`	`{`
`179`		`- state->data->msg += "\nUnknown XML property: " + name;`
	`179`	`+ state->data->msg += "\nUnknown property: " + name;`
`180`	`180`	`return STATUS_ERROR;`
`181`	`181`	`}`
`182`	`182`	`}`
`@@ -237,6 +237,7 @@ ffmpeg_close`
`237`	`237`	`)`
`238`	`238`	`{`
`239`	`239`	`j2k_dec_ffmpeg_t* state = (j2k_dec_ffmpeg_t*)handle;`
	`240`	`+ state->data->msg.clear();`
`240`	`241`
`241`	`242`	`cur_instance_idx = 0;`
`242`	`243`
`@@ -289,6 +290,7 @@ ffmpeg_process`
`289`	`290`	`)`
`290`	`291`	`{`
`291`	`292`	`j2k_dec_ffmpeg_t* state = (j2k_dec_ffmpeg_t*)handle;`
	`293`	`+ state->data->msg.clear();`
`292`	`294`	`FILE* file_in;`
`293`	`295`	`FILE* file_out;`
`294`	`296`