Update document for new tile API (#173)

Signed-off-by: Jun Tian <jun.tian@intel.com>
OpenVisualCloud · Apr 9, 2019 · 689b4cf · 689b4cf
1 parent f924ff9
commit 689b4cf
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/Docs/svt-hevc_encoder_user_guide.md b/Docs/svt-hevc_encoder_user_guide.md
@@ -303,6 +303,8 @@ The encoder parameters present in the Sample.cfg file are listed in this table b
 | **TargetSocket** | -ss | [-1,1] | -1 | For dual socket systems, this can specify which socket the encoder runs on.Refer to Appendix A.2 |
 | **SwitchThreadsToRtPriority** | -rt | [0,1] | 1 | Enables or disables threads to real time priority, 0 = OFF, 1 = ON (only works on Linux) |
 | **FPSInVPS** | -fpsinvps | [0,1] | 0 | Enables or disables the VPS timing info, 0 = OFF, 1 = ON |
+| **TileRowCount** | -tile_row_cnt | [1,16] | 1 | Tile count in the Row |
+| **TileColumnCount** | -tile_col_cnt | [1,16] | 1 | Tile count in the column |
 | **UnrestrictedMotionVector** | -umv | [0,1] | 1 | Enables or disables unrestriced motion vectors, 0 = OFF(motion vectors are constrained within frame boundary), 1 = ON |
 | **MaxCLL** | -max-cll | [0 , 2^16-1] | 0 | Maximum content light level (MaxCLL) as required by the Consumer Electronics Association 861.3 specification. Applicable for HDR content. If specified, signalled only when HighDynamicRangeInput is set to 1 |
 | **MaxFALL** | -max-fall | [0 , 2^16-1] | 0 | Maximum Frame Average light level (MaxFALL) as required by the Consumer Electronics Association 861.3 specification. Applicable for HDR content. If specified, signalled only when HighDynamicRangeInput is set to 1 |

diff --git a/Source/App/EbAppConfig.c b/Source/App/EbAppConfig.c
@@ -922,12 +922,12 @@ static EB_ERRORTYPE VerifySettings(EbConfig_t *config, uint32_t channelNumber)
     pictureWidthInLcu = (config->sourceWidth + MAX_LCU_SIZE - 1) / MAX_LCU_SIZE; 
     pictureHeightInLcu = (config->sourceHeight + MAX_LCU_SIZE - 1) / MAX_LCU_SIZE; 
 
-    if (config->tileColumnCount > EB_TILE_COLUMN_MAX_COUNT) {
+    if (config->tileColumnCount < 1 || config->tileColumnCount > EB_TILE_COLUMN_MAX_COUNT) {
         printf("Error Instance %u: Invalid TileColumnCount. TileColumnCount range should be 1 to 16. In order to specify more than 16 tile columns, please increase the value of the macro EB_TILE_COLUMN_MAX_COUNT defined in EbDefinitions.h\n", channelNumber + 1);
         return_error = EB_ErrorBadParameter;
     }
 
-    if (config->tileRowCount > EB_TILE_ROW_MAX_COUNT) {
+    if (config->tileRowCount < 1 || config->tileRowCount > EB_TILE_ROW_MAX_COUNT) {
         printf("Error Instance %u: Invalid TileRowCount. TileRowCount range should be 1 to 16. In order to specify more than 16 tile rows, please increase the value of the macro EB_TILE_ROW_MAX_COUNT defined in EbDefinitions.h\n", channelNumber + 1);
         return_error = EB_ErrorBadParameter;
     }

diff --git a/Source/Lib/Codec/EbEncHandle.c b/Source/Lib/Codec/EbEncHandle.c
@@ -2793,6 +2793,16 @@ static EB_ERRORTYPE VerifySettings(\
         return_error = EB_ErrorBadParameter;
     }
 
+    if (config->tileColumnCount < 1) {
+        SVT_LOG("SVT [Error]: Instance %u : Invalid tile column count\n", channelNumber + 1);
+        return_error = EB_ErrorBadParameter;
+    }
+
+    if (config->tileRowCount < 1) {
+        SVT_LOG("SVT [Error]: Instance %u : Invalid tile row count\n", channelNumber + 1);
+        return_error = EB_ErrorBadParameter;
+    }
+
     if (config->unrestrictedMotionVector > 1) {
         SVT_LOG("SVT [Error]: Instance %u : Invalid Unrestricted Motion Vector flag [0 - 1]\n", channelNumber + 1);
         return_error = EB_ErrorBadParameter;