ref: b26bcda090f40f834fdeeb68bafdd5772dcbd726
parent: f91bd8b1edceda02250ecee5f3c7c941f7ec44af
parent: 2b4be0551d3171b64f665c383d871dd0f7b15c60
author: guangwei <[email protected]>
date: Mon Jul 17 14:16:03 EDT 2017
Merge pull request #2779 from huili2/enhance_encconsole modify enc sps/pps id strategy in configure file
--- a/codec/console/enc/src/welsenc.cpp
+++ b/codec/console/enc/src/welsenc.cpp
@@ -396,7 +396,7 @@
printf (" -numtl Temporal layer number (default: 1)\n"); printf (" -iper Intra period (default: -1) : must be a power of 2 of GOP size (or -1)\n"); printf (" -nalsize the Maximum NAL size. which should be larger than the each layer slicesize when slice mode equals to SM_SIZELIMITED_SLICE\n");- printf (" -spsid Enable id adding in SPS/PPS per IDR \n");+ printf (" -spsid SPS/PPS id strategy: 0:const, 1: increase, 2: sps list, 3: sps list and pps increase, 4: sps/pps list\n"); printf (" -cabac Entropy coding mode(0:cavlc 1:cabac \n"); printf (" -denois Control denoising (default: 0)\n"); printf (" -scene Control scene change detection (default: 0)\n");--- a/testbin/welsenc.cfg
+++ b/testbin/welsenc.cfg
@@ -12,7 +12,7 @@
TemporalLayerNum 2 # temporal layer number(1--4)
IntraPeriod 0 # Intra Period ( multipler of GoP size or -1)
-EnableSpsPpsIDAddition 1
+SpsPpsIDStrategy 1 # sps/pps id strategy(0-4), 0: const id, 1: increasing id, 2: sps list, 3: sps list & pps increase, 4: sps/pps list
EnableFrameCropping 1 # enable frame cropping flag
EntropyCodingModeFlag 0 #0:cavlc 1:cabac
--- a/testbin/welsenc_arbitrary_res.cfg
+++ b/testbin/welsenc_arbitrary_res.cfg
@@ -12,7 +12,7 @@
TemporalLayerNum 3 # temporal layer number(1--4
IntraPeriod 0 # Intra Period ( multiple of GoP size or -1)
-EnableSpsPpsIDAddition 1
+SpsPpsIDStrategy 1 # sps/pps id strategy(0-4), 0: const id, 1: increasing id, 2: sps list, 3: sps list & pps increase, 4: sps/pps list
EnableFrameCropping 1 # enable frame cropping flag
EntropyCodingModeFlag 0 #0:cavlc 1:cabac
--- a/testbin/welsenc_ios.cfg
+++ b/testbin/welsenc_ios.cfg
@@ -12,7 +12,7 @@
TemporalLayerNum 3 # temporal layer number(1--4)
IntraPeriod 0 # Intra Period ( multipler of GoP size or -1)
-EnableSpsPpsIDAddition 1
+SpsPpsIDStrategy 1 # sps/pps id strategy(0-4), 0: const id, 1: increasing id, 2: sps list, 3: sps list & pps increase, 4: sps/pps list
EnableFrameCropping 1 # enable frame cropping flag
EntropyCodingModeFlag 0 #0:cavlc 1:cabac
--- a/testbin/welsenc_vd_1d.cfg
+++ b/testbin/welsenc_vd_1d.cfg
@@ -12,7 +12,7 @@
TemporalLayerNum 3 # temporal layer number(1--4
IntraPeriod 0 # Intra Period ( multipler of GoP size or -1)
-EnableSpsPpsIDAddition 1
+SpsPpsIDStrategy 1 # sps/pps id strategy(0-4), 0: const id, 1: increasing id, 2: sps list, 3: sps list & pps increase, 4: sps/pps list
EnableFrameCropping 1 # enable frame cropping flag
EntropyCodingModeFlag 0 #0:cavlc 1:cabac
--- a/testbin/welsenc_vd_rc.cfg
+++ b/testbin/welsenc_vd_rc.cfg
@@ -12,7 +12,7 @@
TemporalLayerNum 3 # temporal layer number(1--4)
IntraPeriod 0 # Intra Period ( multipler of GoP size or -1)
-EnableSpsPpsIDAddition 1
+SpsPpsIDStrategy 1 # sps/pps id strategy(0-4), 0: const id, 1: increasing id, 2: sps list, 3: sps list & pps increase, 4: sps/pps list
EnableFrameCropping 1 # enable frame cropping flag
EntropyCodingModeFlag 0 #0:cavlc 1:cabac