Syncing plugins with DEE v3.2 release.

mszym1 · mszym1 · commit f97db2acbb31 · 2019-07-11T12:51:53.000+02:00
diff --git a/plugins/code/common/GenericPlugin/GenericPlugin.h b/plugins/code/common/GenericPlugin/GenericPlugin.h
@@ -40,6 +40,7 @@
 class GenericPlugin {
 public:
     GenericPlugin();
+    virtual ~GenericPlugin() {}
 
     virtual Status setProperty(const Property* property);
     const char* getMessage();
diff --git a/plugins/code/hevc_enc/ffmpeg/examples/example_profile_5.xml b/plugins/code/hevc_enc/ffmpeg/examples/example_profile_5.xml
@@ -27,7 +27,7 @@
         <append_frames>0</append_frames>    <!-- integer -->
         <target_width>0</target_width>    <!-- integer list -->
         <target_height>0</target_height>    <!-- integer list -->
-        <max_scene_frames>240</max_scene_frames>    <!-- integer: from 1 to 256 -->
+        <max_scene_frames>240</max_scene_frames>    <!-- integer: from 12 to 256 -->
         <preprocessing_mode>optimized</preprocessing_mode>    <!-- One of: optimized, standard -->
         <data_rate>16000</data_rate>    <!-- integer list -->
         <max_vbv_data_rate>16000</max_vbv_data_rate>    <!-- integer list -->
@@ -53,7 +53,7 @@
         </scaling>
         <noise>
           <base>
-            <strength>0</strength>    <!-- integer: from 0 to 0 -->
+            <strength>0</strength>    <!-- fixed value -->
           </base>
         </noise>
         <hevc_enc>
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
@@ -57,7 +57,7 @@
         </scaling>
         <noise>
           <base>
-            <strength>0</strength>    <!-- integer: from 0 to 0 -->
+            <strength>0</strength>    <!-- fixed value -->
           </base>
         </noise>
         <hevc_enc>
diff --git a/plugins/code/hevc_enc/ffmpeg/src/hevc_enc_ffmpeg.cpp b/plugins/code/hevc_enc/ffmpeg/src/hevc_enc_ffmpeg.cpp
@@ -324,7 +324,7 @@ ffmpeg_process
             return STATUS_ERROR;
         }
 
-        for (int i = 0; i < 3; i++)
+        for (int j = 0; j < 3; j++)
         {
             bool plane_written_flag = false;
             size_t plane_data_written = 0;
@@ -333,7 +333,7 @@ ffmpeg_process
                 if (state->data->ffmpeg_ret_code != 0) break;
 
                 size_t bytes_written = 0;
-                status = state->data->piping_mgr.writeToPipe(state->data->in_pipe_id, (void*)((char*)current_pic.plane[i] + plane_data_written), plane_size[i] - plane_data_written, bytes_written);
+                status = state->data->piping_mgr.writeToPipe(state->data->in_pipe_id, (void*)((char*)current_pic.plane[j] + plane_data_written), plane_size[j] - plane_data_written, bytes_written);
                 plane_data_written += bytes_written;
                 if (status != PIPE_MGR_OK)
                 {
@@ -342,7 +342,7 @@ ffmpeg_process
                     return STATUS_ERROR;
                 }
 
-                if (plane_data_written == plane_size[i])
+                if (plane_data_written == plane_size[j])
                     plane_written_flag = true;
                 
                 if (bytes_written == 0)
diff --git a/plugins/code/hevc_enc/x265/examples/example_profile_5.xml b/plugins/code/hevc_enc/x265/examples/example_profile_5.xml
@@ -27,7 +27,7 @@
         <append_frames>0</append_frames>    <!-- integer -->
         <target_width>0</target_width>    <!-- integer list -->
         <target_height>0</target_height>    <!-- integer list -->
-        <max_scene_frames>240</max_scene_frames>    <!-- integer: from 1 to 256 -->
+        <max_scene_frames>240</max_scene_frames>    <!-- integer: from 12 to 256 -->
         <preprocessing_mode>optimized</preprocessing_mode>    <!-- One of: optimized, standard -->
         <data_rate>16000</data_rate>    <!-- integer list -->
         <max_vbv_data_rate>16000</max_vbv_data_rate>    <!-- integer list -->
@@ -53,7 +53,7 @@
         </scaling>
         <noise>
           <base>
-            <strength>0</strength>    <!-- integer: from 0 to 0 -->
+            <strength>0</strength>    <!-- fixed value -->
           </base>
         </noise>
         <hevc_enc>
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
@@ -57,7 +57,7 @@
         </scaling>
         <noise>
           <base>
-            <strength>0</strength>    <!-- integer: from 0 to 0 -->
+            <strength>0</strength>    <!-- fixed value -->
           </base>
         </noise>
         <hevc_enc>
diff --git a/plugins/code/hevc_enc/x265/src/hevc_enc_x265.cpp b/plugins/code/hevc_enc/x265/src/hevc_enc_x265.cpp
@@ -347,6 +347,7 @@ x265_close
     if (state->lib_initialized)
     {
         state->api->encoder_close(state->encoder);
+        state->api->cleanup();
         state->lib_initialized = false;
     }
 
@@ -377,19 +378,19 @@ x265_process
     hevc_enc_x265_t* state = (hevc_enc_x265_t*)handle;
     
     x265_nal *p_nal;
-    uint32_t nal;
+    uint32_t nal_count = 0;
 
     if (state->data->pending_header && !state->param->bRepeatHeaders)
     {
         state->data->pending_header = false;
-        if (state->api->encoder_headers(state->encoder, &p_nal, &nal) < 0)
+        if (state->api->encoder_headers(state->encoder, &p_nal, &nal_count) < 0)
         {
             state->data->msg = "Failure generating stream headers.";
             return STATUS_ERROR;
         }
-        if (nal)
+        if (nal_count)
         {
-            for (int j = 0; j < (int)nal; j++)
+            for (uint32_t j = 0; j < nal_count; j++)
             {
                 nalu_t nalu;
                 nalu.type = cast_nal_type(p_nal[j].type);
@@ -447,13 +448,13 @@ x265_process
         if (true == state->data->uhd_bd)
             input_picture.sliceType = X265_TYPE_B;
 
-        int num_encoded = state->api->encoder_encode(state->encoder, &p_nal, &nal, &input_picture, NULL);
+        int num_encoded = state->api->encoder_encode(state->encoder, &p_nal, &nal_count, &input_picture, NULL);
         if (num_encoded < 0)
         {
             state->data->msg = "encoder_encode() failed.";
             return STATUS_ERROR;
         }
-        for (uint32_t j = 0; j < nal; j++)
+        for (uint32_t j = 0; j < nal_count; j++)
         {
             nalu_t nalu;
             nalu.type = cast_nal_type(p_nal[j].type);
@@ -502,8 +503,8 @@ x265_flush
     }
 
     x265_nal *p_nal;
-    uint32_t nal;
-    int num_encoded = state->api->encoder_encode(state->encoder, &p_nal, &nal, NULL, NULL);
+    uint32_t nal_count = 0;
+    int num_encoded = state->api->encoder_encode(state->encoder, &p_nal, &nal_count, NULL, NULL);
     
     if (num_encoded < 0)
     {
@@ -518,7 +519,7 @@ x265_flush
         return STATUS_OK;
     }
 
-    for (uint32_t j = 0; j < nal; j++)
+    for (uint32_t j = 0; j < nal_count; j++)
     {
         nalu_t nalu;
         nalu.type = cast_nal_type(p_nal[j].type);
diff --git a/plugins/code/hevc_enc/x265/src/hevc_enc_x265_utils.cpp b/plugins/code/hevc_enc/x265/src/hevc_enc_x265_utils.cpp
@@ -820,18 +820,18 @@ parse_init_params
         else if ("param" == name)
         {
             auto items = split_string(value, ':');
-            for (auto i : items)
+            for (auto item : items)
             {  
                 std::string param_name, param_value;
-                std::size_t found = i.find("=");
+                std::size_t found = item.find("=");
                 if (found == std::string::npos)
                 {
-                    param_name = i;
+                    param_name = item;
                 }
                 else
                 {
-                    param_name = i.substr(0, found);
-                    param_value = i.substr(found+1);
+                    param_name = item.substr(0, found);
+                    param_value = item.substr(found+1);
                     std::replace(param_value.begin(), param_value.end(), ';', ':');
                 }
                 state->data->internal_params.push_back({param_name, param_value});
diff --git a/plugins/code/j2k_dec/kakadu/src/j2k_dec_kakadu.cpp b/plugins/code/j2k_dec/kakadu/src/j2k_dec_kakadu.cpp
@@ -38,6 +38,13 @@
 #include <cstdio>
 #include <string>
 
+#ifdef _WIN32
+#pragma warning(push, 0)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#endif
+
 // Kakadu core includes
 #include "kdu_elementary.h"
 #include "kdu_messaging.h"
@@ -46,6 +53,13 @@
 #include "kdu_sample_processing.h"
 // Kakadu support includes
 #include "kdu_stripe_decompressor.h"
+
+#ifdef _WIN32
+#pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
+#endif
+
 #include "j2k_dec_kakadu.h"
 
 using namespace kdu_supp;

Original file line number	Diff line number	Diff line change
`@@ -324,7 +324,7 @@ ffmpeg_process`
`324`	`324`	`return STATUS_ERROR;`
`325`	`325`	`}`
`326`	`326`
`327`		`- for (int i = 0; i < 3; i++)`
	`327`	`+ for (int j = 0; j < 3; j++)`
`328`	`328`	`{`
`329`	`329`	`bool plane_written_flag = false;`
`330`	`330`	`size_t plane_data_written = 0;`
`@@ -333,7 +333,7 @@ ffmpeg_process`
`333`	`333`	`if (state->data->ffmpeg_ret_code != 0) break;`
`334`	`334`
`335`	`335`	`size_t bytes_written = 0;`
`336`		`- status = state->data->piping_mgr.writeToPipe(state->data->in_pipe_id, (void)((char)current_pic.plane[i] + plane_data_written), plane_size[i] - plane_data_written, bytes_written);`
	`336`	`+ status = state->data->piping_mgr.writeToPipe(state->data->in_pipe_id, (void)((char)current_pic.plane[j] + plane_data_written), plane_size[j] - plane_data_written, bytes_written);`
`337`	`337`	`plane_data_written += bytes_written;`
`338`	`338`	`if (status != PIPE_MGR_OK)`
`339`	`339`	`{`
`@@ -342,7 +342,7 @@ ffmpeg_process`
`342`	`342`	`return STATUS_ERROR;`
`343`	`343`	`}`
`344`	`344`
`345`		`- if (plane_data_written == plane_size[i])`
	`345`	`+ if (plane_data_written == plane_size[j])`
`346`	`346`	`plane_written_flag = true;`
`347`	`347`
`348`	`348`	`if (bytes_written == 0)`
Original file line number	Diff line number	Diff line change
`@@ -347,6 +347,7 @@ x265_close`
`347`	`347`	`if (state->lib_initialized)`
`348`	`348`	`{`
`349`	`349`	`state->api->encoder_close(state->encoder);`
	`350`	`+ state->api->cleanup();`
`350`	`351`	`state->lib_initialized = false;`
`351`	`352`	`}`
`352`	`353`
`@@ -377,19 +378,19 @@ x265_process`
`377`	`378`	`hevc_enc_x265_t* state = (hevc_enc_x265_t*)handle;`
`378`	`379`
`379`	`380`	`x265_nal *p_nal;`
`380`		`- uint32_t nal;`
	`381`	`+ uint32_t nal_count = 0;`
`381`	`382`
`382`	`383`	`if (state->data->pending_header && !state->param->bRepeatHeaders)`
`383`	`384`	`{`
`384`	`385`	`state->data->pending_header = false;`
`385`		`- if (state->api->encoder_headers(state->encoder, &p_nal, &nal) < 0)`
	`386`	`+ if (state->api->encoder_headers(state->encoder, &p_nal, &nal_count) < 0)`
`386`	`387`	`{`
`387`	`388`	`state->data->msg = "Failure generating stream headers.";`
`388`	`389`	`return STATUS_ERROR;`
`389`	`390`	`}`
`390`		`- if (nal)`
	`391`	`+ if (nal_count)`
`391`	`392`	`{`
`392`		`- for (int j = 0; j < (int)nal; j++)`
	`393`	`+ for (uint32_t j = 0; j < nal_count; j++)`
`393`	`394`	`{`
`394`	`395`	`nalu_t nalu;`
`395`	`396`	`nalu.type = cast_nal_type(p_nal[j].type);`
`@@ -447,13 +448,13 @@ x265_process`
`447`	`448`	`if (true == state->data->uhd_bd)`
`448`	`449`	`input_picture.sliceType = X265_TYPE_B;`
`449`	`450`
`450`		`- int num_encoded = state->api->encoder_encode(state->encoder, &p_nal, &nal, &input_picture, NULL);`
	`451`	`+ int num_encoded = state->api->encoder_encode(state->encoder, &p_nal, &nal_count, &input_picture, NULL);`
`451`	`452`	`if (num_encoded < 0)`
`452`	`453`	`{`
`453`	`454`	`state->data->msg = "encoder_encode() failed.";`
`454`	`455`	`return STATUS_ERROR;`
`455`	`456`	`}`
`456`		`- for (uint32_t j = 0; j < nal; j++)`
	`457`	`+ for (uint32_t j = 0; j < nal_count; j++)`
`457`	`458`	`{`
`458`	`459`	`nalu_t nalu;`
`459`	`460`	`nalu.type = cast_nal_type(p_nal[j].type);`
`@@ -502,8 +503,8 @@ x265_flush`
`502`	`503`	`}`
`503`	`504`
`504`	`505`	`x265_nal *p_nal;`
`505`		`- uint32_t nal;`
`506`		`- int num_encoded = state->api->encoder_encode(state->encoder, &p_nal, &nal, NULL, NULL);`
	`506`	`+ uint32_t nal_count = 0;`
	`507`	`+ int num_encoded = state->api->encoder_encode(state->encoder, &p_nal, &nal_count, NULL, NULL);`
`507`	`508`
`508`	`509`	`if (num_encoded < 0)`
`509`	`510`	`{`
`@@ -518,7 +519,7 @@ x265_flush`
`518`	`519`	`return STATUS_OK;`
`519`	`520`	`}`
`520`	`521`
`521`		`- for (uint32_t j = 0; j < nal; j++)`
	`522`	`+ for (uint32_t j = 0; j < nal_count; j++)`
`522`	`523`	`{`
`523`	`524`	`nalu_t nalu;`
`524`	`525`	`nalu.type = cast_nal_type(p_nal[j].type);`
Original file line number	Diff line number	Diff line change
`@@ -820,18 +820,18 @@ parse_init_params`
`820`	`820`	`else if ("param" == name)`
`821`	`821`	`{`
`822`	`822`	`auto items = split_string(value, ':');`
`823`		`- for (auto i : items)`
	`823`	`+ for (auto item : items)`
`824`	`824`	`{`
`825`	`825`	`std::string param_name, param_value;`
`826`		`- std::size_t found = i.find("=");`
	`826`	`+ std::size_t found = item.find("=");`
`827`	`827`	`if (found == std::string::npos)`
`828`	`828`	`{`
`829`		`- param_name = i;`
	`829`	`+ param_name = item;`
`830`	`830`	`}`
`831`	`831`	`else`
`832`	`832`	`{`
`833`		`- param_name = i.substr(0, found);`
`834`		`- param_value = i.substr(found+1);`
	`833`	`+ param_name = item.substr(0, found);`
	`834`	`+ param_value = item.substr(found+1);`
`835`	`835`	`std::replace(param_value.begin(), param_value.end(), ';', ':');`
`836`	`836`	`}`
`837`	`837`	`state->data->internal_params.push_back({param_name, param_value});`