Merge pull request #2779 from huili2/enhance_encconsole

modify enc sps/pps id strategy in configure file

guangwei committed 9 years ago

Commit b26bcda2 parents f91bd8b 2b4be056 files · +6 −6Browse files

Unified · Split

6 files

codec/console/enc/src/welsenc.cpp +1 −1
testbin/welsenc.cfg +1 −1
testbin/welsenc_arbitrary_res.cfg +1 −1
testbin/welsenc_ios.cfg +1 −1
testbin/welsenc_vd_1d.cfg +1 −1
testbin/welsenc_vd_rc.cfg +1 −1

codec/console/enc/src/welsenc.cpp+1−1

@@ -396,7 +396,7 @@ void PrintHelp() { · 395 unmodified lines
396	printf (" -numtl Temporal layer number (default: 1)\n");	396	printf (" -numtl Temporal layer number (default: 1)\n");
397	printf (" -iper Intra period (default: -1) : must be a power of 2 of GOP size (or -1)\n");	397	printf (" -iper Intra period (default: -1) : must be a power of 2 of GOP size (or -1)\n");
398	printf (" -nalsize the Maximum NAL size. which should be larger than the each layer slicesize when slice mode equals to SM_SIZELIMITED_SLICE\n");	398	printf (" -nalsize the Maximum NAL size. which should be larger than the each layer slicesize when slice mode equals to SM_SIZELIMITED_SLICE\n");
399	printf (" -spsid Enable id adding in SPS/PPS per IDR \n");	399	printf (" -spsid SPS/PPS id strategy: 0:const, 1: increase, 2: sps list, 3: sps list and pps increase, 4: sps/pps list\n");
400	printf (" -cabac Entropy coding mode(0:cavlc 1:cabac \n");	400	printf (" -cabac Entropy coding mode(0:cavlc 1:cabac \n");
401	printf (" -denois Control denoising (default: 0)\n");	401	printf (" -denois Control denoising (default: 0)\n");
402	printf (" -scene Control scene change detection (default: 0)\n");	402	printf (" -scene Control scene change detection (default: 0)\n");

testbin/welsenc.cfg+1−1

@@ -12,7 +12,7 @@ FramesToBeEncoded -1 # Number of frames (at input frame · 11 unmodified lines
12		12
13	TemporalLayerNum 2 # temporal layer number(1--4)	13	TemporalLayerNum 2 # temporal layer number(1--4)
14	IntraPeriod 0 # Intra Period ( multipler of GoP size or -1)	14	IntraPeriod 0 # Intra Period ( multipler of GoP size or -1)
15	EnableSpsPpsIDAddition 1	15	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
16		16
17	EnableFrameCropping 1 # enable frame cropping flag	17	EnableFrameCropping 1 # enable frame cropping flag
18	EntropyCodingModeFlag 0 #0:cavlc 1:cabac	18	EntropyCodingModeFlag 0 #0:cavlc 1:cabac

testbin/welsenc_arbitrary_res.cfg+1−1

@@ -12,7 +12,7 @@ FramesToBeEncoded -1 # Number of frames (at input frame · 11 unmodified lines
12		12
13	TemporalLayerNum 3 # temporal layer number(1--4	13	TemporalLayerNum 3 # temporal layer number(1--4
14	IntraPeriod 0 # Intra Period ( multiple of GoP size or -1)	14	IntraPeriod 0 # Intra Period ( multiple of GoP size or -1)
15	EnableSpsPpsIDAddition 1	15	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
16		16
17	EnableFrameCropping 1 # enable frame cropping flag	17	EnableFrameCropping 1 # enable frame cropping flag
18	EntropyCodingModeFlag 0 #0:cavlc 1:cabac	18	EntropyCodingModeFlag 0 #0:cavlc 1:cabac

testbin/welsenc_ios.cfg+1−1

@@ -12,7 +12,7 @@ FramesToBeEncoded -1 # Number of frames (at input frame · 11 unmodified lines
12		12
13	TemporalLayerNum 3 # temporal layer number(1--4)	13	TemporalLayerNum 3 # temporal layer number(1--4)
14	IntraPeriod 0 # Intra Period ( multipler of GoP size or -1)	14	IntraPeriod 0 # Intra Period ( multipler of GoP size or -1)
15	EnableSpsPpsIDAddition 1	15	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
16		16
17	EnableFrameCropping 1 # enable frame cropping flag	17	EnableFrameCropping 1 # enable frame cropping flag
18	EntropyCodingModeFlag 0 #0:cavlc 1:cabac	18	EntropyCodingModeFlag 0 #0:cavlc 1:cabac

testbin/welsenc_vd_1d.cfg+1−1

@@ -12,7 +12,7 @@ FramesToBeEncoded -1 # Number of frames (at input frame · 11 unmodified lines
12		12
13	TemporalLayerNum 3 # temporal layer number(1--4	13	TemporalLayerNum 3 # temporal layer number(1--4
14	IntraPeriod 0 # Intra Period ( multipler of GoP size or -1)	14	IntraPeriod 0 # Intra Period ( multipler of GoP size or -1)
15	EnableSpsPpsIDAddition 1	15	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
16		16
17	EnableFrameCropping 1 # enable frame cropping flag	17	EnableFrameCropping 1 # enable frame cropping flag
18	EntropyCodingModeFlag 0 #0:cavlc 1:cabac	18	EntropyCodingModeFlag 0 #0:cavlc 1:cabac

testbin/welsenc_vd_rc.cfg+1−1

@@ -12,7 +12,7 @@ FramesToBeEncoded -1 # Number of frames (at input frame · 11 unmodified lines
12		12
13	TemporalLayerNum 3 # temporal layer number(1--4)	13	TemporalLayerNum 3 # temporal layer number(1--4)
14	IntraPeriod 0 # Intra Period ( multipler of GoP size or -1)	14	IntraPeriod 0 # Intra Period ( multipler of GoP size or -1)
15	EnableSpsPpsIDAddition 1	15	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
16		16
17	EnableFrameCropping 1 # enable frame cropping flag	17	EnableFrameCropping 1 # enable frame cropping flag
18	EntropyCodingModeFlag 0 #0:cavlc 1:cabac	18	EntropyCodingModeFlag 0 #0:cavlc 1:cabac