This repository was archived by the owner on Jul 29, 2024. It is now read-only.
Vbv dev #155
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -208,10 +208,10 @@ static void SetEnableConstrainedIntra (const char *value, EbConfig_t * | |
| static void SetCfgTune (const char *value, EbConfig_t *cfg) {cfg->tune = (uint8_t)strtoul(value, NULL, 0); }; | ||
| static void SetBitRateReduction (const char *value, EbConfig_t *cfg) {cfg->bitRateReduction = (EB_BOOL)strtol(value, NULL, 0); }; | ||
| static void SetImproveSharpness (const char *value, EbConfig_t *cfg) {cfg->improveSharpness = (EB_BOOL)strtol(value, NULL, 0);}; | ||
| static void SetVbvMaxrate (const char *value, EbConfig_t *cfg) { cfg->vbvMaxRate = strtoul(value, NULL, 0);}; | ||
| static void SetVbvBufsize (const char *value, EbConfig_t *cfg) { cfg->vbvBufsize = strtoul(value, NULL, 0);}; | ||
| static void SetVbvBufInit (const char *value, EbConfig_t *cfg) { cfg->vbvBufInit = strtoul(value, NULL, 0);}; | ||
| static void SetHrdFlag (const char *value, EbConfig_t *cfg) { cfg->hrdFlag = strtoul(value, NULL, 0);}; | ||
| static void SetVideoUsabilityInfo (const char *value, EbConfig_t *cfg) {cfg->videoUsabilityInfo = strtol(value, NULL, 0);}; | ||
| static void SetHighDynamicRangeInput (const char *value, EbConfig_t *cfg) {cfg->highDynamicRangeInput = strtol(value, NULL, 0);}; | ||
| static void SetAccessUnitDelimiter (const char *value, EbConfig_t *cfg) {cfg->accessUnitDelimiter = strtol(value, NULL, 0);}; | ||
|
|
@@ -329,12 +329,9 @@ config_entry_t config_entry[] = { | |
|
|
||
| // Quantization | ||
| { SINGLE_INPUT, QP_TOKEN, "QP", SetCfgQp }, | ||
| { SINGLE_INPUT, USE_QP_FILE_TOKEN, "UseQpFile", SetCfgUseQpFile }, | ||
|
||
| { SINGLE_INPUT, RATE_CONTROL_ENABLE_TOKEN, "RateControlMode", SetRateControlMode }, | ||
| { SINGLE_INPUT, LOOK_AHEAD_DIST_TOKEN, "LookAheadDistance", SetLookAheadDistance}, | ||
| { SINGLE_INPUT, TARGET_BIT_RATE_TOKEN, "TargetBitRate", SetTargetBitRate }, | ||
|
||
| { SINGLE_INPUT, MAX_QP_TOKEN, "MaxQpAllowed", SetMaxQpAllowed }, | ||
| { SINGLE_INPUT, MIN_QP_TOKEN, "MinQpAllowed", SetMinQpAllowed }, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2224,9 +2224,8 @@ void CopyApiFromApp( | |
| } | ||
|
|
||
| //Set required flags to signal vbv status when hrd is enabled | ||
| if (sequenceControlSetPtr->staticConfig.hrdFlag == 1) { | ||
| sequenceControlSetPtr->staticConfig.videoUsabilityInfo = 1; | ||
|
||
| sequenceControlSetPtr->videoUsabilityInfoPtr->vuiHrdParametersPresentFlag = 1; | ||
| sequenceControlSetPtr->staticConfig.bufferingPeriodSEI = 1; | ||
| sequenceControlSetPtr->staticConfig.pictureTimingSEI = 1; | ||
|
|
@@ -2521,13 +2520,13 @@ static EB_ERRORTYPE VerifySettings(\ | |
|
|
||
| if (config->hrdFlag > 1) | ||
| { | ||
| printf("SVT [Error]: Instance %u: hrdFlag must be [0 - 1]\n", channelNumber + 1); | ||
| return_error = EB_ErrorBadParameter; | ||
|
Contributor
There was a problem hiding this comment. please use "SVT_LOG("SVT [Error]:"
Contributor
There was a problem hiding this comment. Please follow the coding style here. |
||
| } | ||
|
|
||
| if (config->hrdFlag == 1 && ((config->vbvBufsize <= 0) || (config->vbvMaxrate <= 0))) | ||
| { | ||
| printf("SVT [Error]: Instance %u: hrd requires vbv max rate and vbv bufsize to be greater than 0 ", channelNumber + 1); | ||
|
||
| return_error = EB_ErrorBadParameter; | ||
| } | ||
|
|
||
|
|
@@ -2546,13 +2545,11 @@ static EB_ERRORTYPE VerifySettings(\ | |
| if ((config->searchAreaWidth > 256) || (config->searchAreaWidth == 0)){ | ||
| SVT_LOG("SVT [Error]: Instance %u: Invalid SearchAreaWidth. SearchAreaWidth must be [1 - 256]\n",channelNumber+1); | ||
| return_error = EB_ErrorBadParameter; | ||
| } | ||
|
|
||
| if((config->searchAreaHeight > 256) || (config->searchAreaHeight == 0)) { | ||
| SVT_LOG("SVT [Error]: Instance %u: Invalid SearchAreaHeight. SearchAreaHeight must be [1 - 256]\n",channelNumber+1); | ||
| return_error = EB_ErrorBadParameter; | ||
| } | ||
|
|
||
| if (levelIdx < 13) { | ||
|
|
@@ -2724,27 +2721,27 @@ static EB_ERRORTYPE VerifySettings(\ | |
| } | ||
|
|
||
| if ((config->maxCLL && !config->highDynamicRangeInput) || (config->maxFALL && !config->highDynamicRangeInput)) { | ||
| SVT_LOG("SVT [Error]: Instance %u: maxCLL or maxFALL should be used only with high dynamic range input; set highDynamicRangeInput to 1\n", channelNumber); | ||
| return_error = EB_ErrorBadParameter; | ||
| } | ||
|
|
||
| if (config->useMasteringDisplayColorVolume && !config->highDynamicRangeInput) { | ||
| SVT_LOG("SVT [Error]: Instance %u: MasterDisplay should be used only with high dynamic range input; set highDynamicRangeInput to 1\n", channelNumber); | ||
| return_error = EB_ErrorBadParameter; | ||
| } | ||
|
|
||
| if (config->dolbyVisionProfile != 0 && config->dolbyVisionProfile != 81) { | ||
| SVT_LOG("SVT [Error]: Instance %u: Only Dolby Vision Profile 8.1 is supported \n", channelNumber); | ||
| return_error = EB_ErrorBadParameter; | ||
| } | ||
|
|
||
| if (config->dolbyVisionProfile == 81 && config->encoderBitDepth != 10) { | ||
| SVT_LOG("SVT [Error]: Instance %u: Dolby Vision Profile 8.1 work only with main10 input \n", channelNumber); | ||
| return_error = EB_ErrorBadParameter; | ||
| } | ||
|
|
||
| if (config->dolbyVisionProfile == 81 && !config->useMasteringDisplayColorVolume) { | ||
| SVT_LOG("SVT [Error]: Instance %u: Dolby Vision Profile 8.1 requires mastering display color volume information \n", channelNumber); | ||
| return_error = EB_ErrorBadParameter; | ||
| } | ||
|
|
||
|
|
@@ -2807,7 +2804,7 @@ static EB_ERRORTYPE VerifySettings(\ | |
| } | ||
|
|
||
| if (config->vbvBufInit > 100) { | ||
| printf("SVT [Error]: Instance %u: Invalid vbvBufInit [0 - 100]\n", channelNumber + 1); | ||
| return_error = EB_ErrorBadParameter; | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please remove extra empty line.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed empty line and pushed patch (Commit : 9db1593)