History

change sps/pps strategy option name as ENCODER_OPTION_SPS_PPS_ID_STRATEGY to avoid confusion

Karina committed 9 years ago

Commit 7a252731 parent 0724f616 files · +19 −19Browse files

Showing the changes to test/api/decoder_ec_test.cpp (1 of 6 files). Show all

Unified · Split

test/api/decoder_ec_test.cpp+4−4
@@ -40,7 +40,7 @@ TEST_P (EncodeDecodeTestAPI, SetOptionECFlag_ERROR_CON_DISABLE) { · 39 unmodified lines
4040 encoder_->SetOption (ENCODER_OPTION_TRACE_LEVEL, &iTraceLevel);
4141 decoder_->SetOption (DECODER_OPTION_TRACE_LEVEL, &iTraceLevel);
4242 int32_t iSpsPpsIdAddition = 1;
43− encoder_->SetOption (ENCODER_OPTION_ENABLE_SPS_PPS_ID_ADDITION, &iSpsPpsIdAddition);
43+ encoder_->SetOption (ENCODER_OPTION_SPS_PPS_ID_STRATEGY, &iSpsPpsIdAddition);
4444 int32_t iIDRPeriod = 60;
4545 encoder_->SetOption (ENCODER_OPTION_IDR_INTERVAL, &iIDRPeriod);
4646 SLTRConfig sLtrConfigVal;
@@ -96,7 +96,7 @@ TEST_P (EncodeDecodeTestAPI, SetOptionECFlag_ERROR_CON_SLICE_COPY) { · 49 unmodified lines
9696 encoder_->SetOption (ENCODER_OPTION_TRACE_LEVEL, &iTraceLevel);
9797 decoder_->SetOption (DECODER_OPTION_TRACE_LEVEL, &iTraceLevel);
9898 int32_t iSpsPpsIdAddition = 1;
99− encoder_->SetOption (ENCODER_OPTION_ENABLE_SPS_PPS_ID_ADDITION, &iSpsPpsIdAddition);
99+ encoder_->SetOption (ENCODER_OPTION_SPS_PPS_ID_STRATEGY, &iSpsPpsIdAddition);
100100 int32_t iIDRPeriod = 60;
101101 encoder_->SetOption (ENCODER_OPTION_IDR_INTERVAL, &iIDRPeriod);
102102 SLTRConfig sLtrConfigVal;
@@ -682,7 +682,7 @@ TEST_F (EncodeDecodeTestAPI, Engine_SVC_Switch_I) { · 579 unmodified lines
682682 encoder_->SetOption (ENCODER_OPTION_TRACE_LEVEL, &iTraceLevel);
683683 decoder_->SetOption (DECODER_OPTION_TRACE_LEVEL, &iTraceLevel);
684684 int32_t iSpsPpsIdAddition = 1;
685− encoder_->SetOption (ENCODER_OPTION_ENABLE_SPS_PPS_ID_ADDITION, &iSpsPpsIdAddition);
685+ encoder_->SetOption (ENCODER_OPTION_SPS_PPS_ID_STRATEGY, &iSpsPpsIdAddition);
686686 int32_t iIDRPeriod = (int32_t) pow (2.0f, (param_.iTemporalLayerNum - 1)) * ((rand() % 5) + 1);
687687 encoder_->SetOption (ENCODER_OPTION_IDR_INTERVAL, &iIDRPeriod);
688688 SLTRConfig sLtrConfigVal;
@@ -749,7 +749,7 @@ TEST_F (EncodeDecodeTestAPI, Engine_SVC_Switch_P) { · 60 unmodified lines
749749 encoder_->SetOption (ENCODER_OPTION_TRACE_LEVEL, &iTraceLevel);
750750 decoder_->SetOption (DECODER_OPTION_TRACE_LEVEL, &iTraceLevel);
751751 int32_t iSpsPpsIdAddition = 1;
752− encoder_->SetOption (ENCODER_OPTION_ENABLE_SPS_PPS_ID_ADDITION, &iSpsPpsIdAddition);
752+ encoder_->SetOption (ENCODER_OPTION_SPS_PPS_ID_STRATEGY, &iSpsPpsIdAddition);
753753 int32_t iIDRPeriod = 60;
754754 encoder_->SetOption (ENCODER_OPTION_IDR_INTERVAL, &iIDRPeriod);
755755 SLTRConfig sLtrConfigVal;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t