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/decode_api_test.cpp (1 of 6 files). Show all

Unified · Split

test/api/decode_api_test.cpp+7−7
@@ -114,7 +114,7 @@ TEST_P (EncodeDecodeTestAPI, GetOptionIDR) { · 113 unmodified lines
114 2; //the current strategy supports more than 2 modes, but the switch between the modes>2 is not allowed114 2; //the current strategy supports more than 2 modes, but the switch between the modes>2 is not allowed
115 iIDRPeriod = (rand() % 150) + 1;115 iIDRPeriod = (rand() % 150) + 1;
116 encoder_->SetOption (ENCODER_OPTION_IDR_INTERVAL, &iIDRPeriod);116 encoder_->SetOption (ENCODER_OPTION_IDR_INTERVAL, &iIDRPeriod);
117 encoder_->SetOption (ENCODER_OPTION_ENABLE_SPS_PPS_ID_ADDITION, &iSpsPpsIdAddition);117 encoder_->SetOption (ENCODER_OPTION_SPS_PPS_ID_STRATEGY, &iSpsPpsIdAddition);
118 118
119 EncodeOneFrame (0);119 EncodeOneFrame (0);
120 120
@@ -151,7 +151,7 @@ TEST_P (EncodeDecodeTestAPI, InOutTimeStamp) { · 30 unmodified lines
151 encoder_->SetOption (ENCODER_OPTION_TRACE_LEVEL, &iTraceLevel);151 encoder_->SetOption (ENCODER_OPTION_TRACE_LEVEL, &iTraceLevel);
152 decoder_->SetOption (DECODER_OPTION_TRACE_LEVEL, &iTraceLevel);152 decoder_->SetOption (DECODER_OPTION_TRACE_LEVEL, &iTraceLevel);
153 int32_t iSpsPpsIdAddition = 1;153 int32_t iSpsPpsIdAddition = 1;
154 encoder_->SetOption (ENCODER_OPTION_ENABLE_SPS_PPS_ID_ADDITION, &iSpsPpsIdAddition);154 encoder_->SetOption (ENCODER_OPTION_SPS_PPS_ID_STRATEGY, &iSpsPpsIdAddition);
155 int32_t iIDRPeriod = 60;155 int32_t iIDRPeriod = 60;
156 encoder_->SetOption (ENCODER_OPTION_IDR_INTERVAL, &iIDRPeriod);156 encoder_->SetOption (ENCODER_OPTION_IDR_INTERVAL, &iIDRPeriod);
157 SLTRConfig sLtrConfigVal;157 SLTRConfig sLtrConfigVal;
@@ -205,7 +205,7 @@ TEST_P (EncodeDecodeTestAPI, GetOptionTid_AVC_NOPREFIX) { · 47 unmodified lines
205 encoder_->SetOption (ENCODER_OPTION_TRACE_LEVEL, &iTraceLevel);205 encoder_->SetOption (ENCODER_OPTION_TRACE_LEVEL, &iTraceLevel);
206 decoder_->SetOption (DECODER_OPTION_TRACE_LEVEL, &iTraceLevel);206 decoder_->SetOption (DECODER_OPTION_TRACE_LEVEL, &iTraceLevel);
207 int32_t iSpsPpsIdAddition = 1;207 int32_t iSpsPpsIdAddition = 1;
208 encoder_->SetOption (ENCODER_OPTION_ENABLE_SPS_PPS_ID_ADDITION, &iSpsPpsIdAddition);208 encoder_->SetOption (ENCODER_OPTION_SPS_PPS_ID_STRATEGY, &iSpsPpsIdAddition);
209 int32_t iIDRPeriod = 60;209 int32_t iIDRPeriod = 60;
210 encoder_->SetOption (ENCODER_OPTION_IDR_INTERVAL, &iIDRPeriod);210 encoder_->SetOption (ENCODER_OPTION_IDR_INTERVAL, &iIDRPeriod);
211 SLTRConfig sLtrConfigVal;211 SLTRConfig sLtrConfigVal;
@@ -278,7 +278,7 @@ TEST_P (EncodeDecodeTestAPI, GetOptionTid_AVC_WITH_PREFIX_NOLOSS) { · 66 unmodified lines
278 encoder_->SetOption (ENCODER_OPTION_TRACE_LEVEL, &iTraceLevel);278 encoder_->SetOption (ENCODER_OPTION_TRACE_LEVEL, &iTraceLevel);
279 decoder_->SetOption (DECODER_OPTION_TRACE_LEVEL, &iTraceLevel);279 decoder_->SetOption (DECODER_OPTION_TRACE_LEVEL, &iTraceLevel);
280 int32_t iSpsPpsIdAddition = 1;280 int32_t iSpsPpsIdAddition = 1;
281 encoder_->SetOption (ENCODER_OPTION_ENABLE_SPS_PPS_ID_ADDITION, &iSpsPpsIdAddition);281 encoder_->SetOption (ENCODER_OPTION_SPS_PPS_ID_STRATEGY, &iSpsPpsIdAddition);
282 int32_t iIDRPeriod = 60;282 int32_t iIDRPeriod = 60;
283 encoder_->SetOption (ENCODER_OPTION_IDR_INTERVAL, &iIDRPeriod);283 encoder_->SetOption (ENCODER_OPTION_IDR_INTERVAL, &iIDRPeriod);
284 SLTRConfig sLtrConfigVal;284 SLTRConfig sLtrConfigVal;
@@ -334,7 +334,7 @@ TEST_P (EncodeDecodeTestAPI, GetOptionTid_SVC_L1_NOLOSS) { · 49 unmodified lines
334 encoder_->SetOption (ENCODER_OPTION_TRACE_LEVEL, &iTraceLevel);334 encoder_->SetOption (ENCODER_OPTION_TRACE_LEVEL, &iTraceLevel);
335 decoder_->SetOption (DECODER_OPTION_TRACE_LEVEL, &iTraceLevel);335 decoder_->SetOption (DECODER_OPTION_TRACE_LEVEL, &iTraceLevel);
336 int32_t iSpsPpsIdAddition = 1;336 int32_t iSpsPpsIdAddition = 1;
337 encoder_->SetOption (ENCODER_OPTION_ENABLE_SPS_PPS_ID_ADDITION, &iSpsPpsIdAddition);337 encoder_->SetOption (ENCODER_OPTION_SPS_PPS_ID_STRATEGY, &iSpsPpsIdAddition);
338 int32_t iIDRPeriod = 60;338 int32_t iIDRPeriod = 60;
339 encoder_->SetOption (ENCODER_OPTION_IDR_INTERVAL, &iIDRPeriod);339 encoder_->SetOption (ENCODER_OPTION_IDR_INTERVAL, &iIDRPeriod);
340 SLTRConfig sLtrConfigVal;340 SLTRConfig sLtrConfigVal;
@@ -400,7 +400,7 @@ TEST_P (EncodeDecodeTestAPI, SetOption_Trace) { · 59 unmodified lines
400 400
401 401
402 int32_t iSpsPpsIdAddition = 1;402 int32_t iSpsPpsIdAddition = 1;
403 encoder_->SetOption (ENCODER_OPTION_ENABLE_SPS_PPS_ID_ADDITION, &iSpsPpsIdAddition);403 encoder_->SetOption (ENCODER_OPTION_SPS_PPS_ID_STRATEGY, &iSpsPpsIdAddition);
404 int32_t iIDRPeriod = 60;404 int32_t iIDRPeriod = 60;
405 encoder_->SetOption (ENCODER_OPTION_IDR_INTERVAL, &iIDRPeriod);405 encoder_->SetOption (ENCODER_OPTION_IDR_INTERVAL, &iIDRPeriod);
406 SLTRConfig sLtrConfigVal;406 SLTRConfig sLtrConfigVal;
@@ -464,7 +464,7 @@ TEST_P (EncodeDecodeTestAPI, SetOption_Trace_NULL) { · 57 unmodified lines
464 decoder_->SetOption (DECODER_OPTION_TRACE_LEVEL, &iTraceLevel);464 decoder_->SetOption (DECODER_OPTION_TRACE_LEVEL, &iTraceLevel);
465 465
466 int32_t iSpsPpsIdAddition = 1;466 int32_t iSpsPpsIdAddition = 1;
467 encoder_->SetOption (ENCODER_OPTION_ENABLE_SPS_PPS_ID_ADDITION, &iSpsPpsIdAddition);467 encoder_->SetOption (ENCODER_OPTION_SPS_PPS_ID_STRATEGY, &iSpsPpsIdAddition);
468 int32_t iIDRPeriod = 60;468 int32_t iIDRPeriod = 60;
469 encoder_->SetOption (ENCODER_OPTION_IDR_INTERVAL, &iIDRPeriod);469 encoder_->SetOption (ENCODER_OPTION_IDR_INTERVAL, &iIDRPeriod);
470 SLTRConfig sLtrConfigVal;470 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