Showing the changes to test/api/BaseEncoderTest.cpp (1 of 38 files). Show all
Unified · Split
| @@ -6,8 +6,8 @@ · 5 unmodified lines | ||
| 6 | 6 | #include "BaseEncoderTest.h" |
| 7 | 7 | |
| 8 | 8 | static int InitWithParam (ISVCEncoder* encoder, EUsageType usageType, int width, |
| 9 | − int height, float frameRate, SliceModeEnum sliceMode, bool denoise, int layers, bool losslessLink, bool enableLtr) { | |
| 10 | − if (SM_SINGLE_SLICE == sliceMode && !denoise && layers == 1 && !losslessLink && !enableLtr) { | |
| 9 | + int height, float frameRate, SliceModeEnum sliceMode, bool denoise, int layers, bool losslessLink, bool enableLtr,bool cabac) { | |
| 10 | + if (SM_SINGLE_SLICE == sliceMode && !denoise && layers == 1 && !losslessLink && !enableLtr &&!cabac) { | |
| 11 | 11 | SEncParamBase param; |
| 12 | 12 | memset (¶m, 0, sizeof (SEncParamBase)); |
| 13 | 13 | |
| @@ -31,7 +31,7 @@ static int InitWithParam (ISVCEncoder* encoder, EUsageType usageType, int width, · 17 unmodified lines | ||
| 31 | 31 | param.iSpatialLayerNum = layers; |
| 32 | 32 | param.bIsLosslessLink = losslessLink; |
| 33 | 33 | param.bEnableLongTermReference = enableLtr; |
| 34 | − | |
| 34 | + param.iEntropyCodingModeFlag = cabac?1:0; | |
| 35 | 35 | if (sliceMode != SM_SINGLE_SLICE && sliceMode != SM_DYN_SLICE) //SM_DYN_SLICE don't support multi-thread now |
| 36 | 36 | param.iMultipleThreadIdc = 2; |
| 37 | 37 | |
| @@ -69,9 +69,8 @@ void BaseEncoderTest::TearDown() { · 31 unmodified lines | ||
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | void BaseEncoderTest::EncodeStream (InputStream* in, EUsageType usageType, int width, int height, |
| 72 | − float frameRate, SliceModeEnum slices, bool denoise, int layers, bool losslessLink, bool enableLtr, Callback* cbk) { | |
| 73 | − int rv = InitWithParam (encoder_, usageType, width, height, frameRate, slices, denoise, layers, losslessLink, | |
| 74 | − enableLtr); | |
| 72 | + float frameRate, SliceModeEnum slices, bool denoise, int layers, bool losslessLink, bool enableLtr, bool cabac,Callback* cbk) { | |
| 73 | + int rv = InitWithParam (encoder_, usageType, width, height, frameRate, slices, denoise, layers, losslessLink, enableLtr,cabac); | |
| 75 | 74 | ASSERT_TRUE (rv == cmResultSuccess); |
| 76 | 75 | |
| 77 | 76 | // I420: 1(Y) + 1/4(U) + 1/4(V) |
| @@ -104,8 +103,8 @@ void BaseEncoderTest::EncodeStream (InputStream* in, EUsageType usageType, int w · 26 unmodified lines | ||
| 104 | 103 | } |
| 105 | 104 | |
| 106 | 105 | void BaseEncoderTest::EncodeFile (const char* fileName, EUsageType usageType, int width, int height, |
| 107 | − float frameRate, SliceModeEnum slices, bool denoise, int layers, bool losslessLink, bool enableLtr, Callback* cbk) { | |
| 106 | + float frameRate, SliceModeEnum slices, bool denoise, int layers, bool losslessLink, bool enableLtr, bool cabac,Callback* cbk) { | |
| 108 | 107 | FileInputStream fileStream; |
| 109 | 108 | ASSERT_TRUE (fileStream.Open (fileName)); |
| 110 | − EncodeStream (&fileStream, usageType, width, height, frameRate, slices, denoise, layers, losslessLink, enableLtr, cbk); | |
| 109 | + EncodeStream (&fileStream, usageType, width, height, frameRate, slices, denoise, layers, losslessLink, enableLtr, cabac,cbk); | |
| 111 | 110 | } |