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
40 encoder_->SetOption (ENCODER_OPTION_TRACE_LEVEL, &iTraceLevel);40 encoder_->SetOption (ENCODER_OPTION_TRACE_LEVEL, &iTraceLevel);
41 decoder_->SetOption (DECODER_OPTION_TRACE_LEVEL, &iTraceLevel);41 decoder_->SetOption (DECODER_OPTION_TRACE_LEVEL, &iTraceLevel);
42 int32_t iSpsPpsIdAddition = 1;42 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);
44 int32_t iIDRPeriod = 60;44 int32_t iIDRPeriod = 60;
45 encoder_->SetOption (ENCODER_OPTION_IDR_INTERVAL, &iIDRPeriod);45 encoder_->SetOption (ENCODER_OPTION_IDR_INTERVAL, &iIDRPeriod);
46 SLTRConfig sLtrConfigVal;46 SLTRConfig sLtrConfigVal;
@@ -96,7 +96,7 @@ TEST_P (EncodeDecodeTestAPI, SetOptionECFlag_ERROR_CON_SLICE_COPY) { · 49 unmodified lines
96 encoder_->SetOption (ENCODER_OPTION_TRACE_LEVEL, &iTraceLevel);96 encoder_->SetOption (ENCODER_OPTION_TRACE_LEVEL, &iTraceLevel);
97 decoder_->SetOption (DECODER_OPTION_TRACE_LEVEL, &iTraceLevel);97 decoder_->SetOption (DECODER_OPTION_TRACE_LEVEL, &iTraceLevel);
98 int32_t iSpsPpsIdAddition = 1;98 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);
100 int32_t iIDRPeriod = 60;100 int32_t iIDRPeriod = 60;
101 encoder_->SetOption (ENCODER_OPTION_IDR_INTERVAL, &iIDRPeriod);101 encoder_->SetOption (ENCODER_OPTION_IDR_INTERVAL, &iIDRPeriod);
102 SLTRConfig sLtrConfigVal;102 SLTRConfig sLtrConfigVal;
@@ -682,7 +682,7 @@ TEST_F (EncodeDecodeTestAPI, Engine_SVC_Switch_I) { · 579 unmodified lines
682 encoder_->SetOption (ENCODER_OPTION_TRACE_LEVEL, &iTraceLevel);682 encoder_->SetOption (ENCODER_OPTION_TRACE_LEVEL, &iTraceLevel);
683 decoder_->SetOption (DECODER_OPTION_TRACE_LEVEL, &iTraceLevel);683 decoder_->SetOption (DECODER_OPTION_TRACE_LEVEL, &iTraceLevel);
684 int32_t iSpsPpsIdAddition = 1;684 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);
686 int32_t iIDRPeriod = (int32_t) pow (2.0f, (param_.iTemporalLayerNum - 1)) * ((rand() % 5) + 1);686 int32_t iIDRPeriod = (int32_t) pow (2.0f, (param_.iTemporalLayerNum - 1)) * ((rand() % 5) + 1);
687 encoder_->SetOption (ENCODER_OPTION_IDR_INTERVAL, &iIDRPeriod);687 encoder_->SetOption (ENCODER_OPTION_IDR_INTERVAL, &iIDRPeriod);
688 SLTRConfig sLtrConfigVal;688 SLTRConfig sLtrConfigVal;
@@ -749,7 +749,7 @@ TEST_F (EncodeDecodeTestAPI, Engine_SVC_Switch_P) { · 60 unmodified lines
749 encoder_->SetOption (ENCODER_OPTION_TRACE_LEVEL, &iTraceLevel);749 encoder_->SetOption (ENCODER_OPTION_TRACE_LEVEL, &iTraceLevel);
750 decoder_->SetOption (DECODER_OPTION_TRACE_LEVEL, &iTraceLevel);750 decoder_->SetOption (DECODER_OPTION_TRACE_LEVEL, &iTraceLevel);
751 int32_t iSpsPpsIdAddition = 1;751 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);
753 int32_t iIDRPeriod = 60;753 int32_t iIDRPeriod = 60;
754 encoder_->SetOption (ENCODER_OPTION_IDR_INTERVAL, &iIDRPeriod);754 encoder_->SetOption (ENCODER_OPTION_IDR_INTERVAL, &iIDRPeriod);
755 SLTRConfig sLtrConfigVal;755 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