History

remove API data format in decoder in 1.6

huili2 committed 11 years ago

Commit dc2cbe41 parent 991b05f12 files · +12 −132Browse files

Showing the changes to test/api/encode_decode_api_test.cpp (1 of 12 files). Show all

Unified · Split

test/api/encode_decode_api_test.cpp+7−17
@@ -500,7 +500,7 @@ void EncodeDecodeTestAPIBase::ValidateParamExtCombination() { · 499 unmodified lines
500 500
501 //for slice mode = SM_RASTER_SLICE501 //for slice mode = SM_RASTER_SLICE
502 if (SM_RASTER_SLICE == pSpatialLayer->sSliceArgument.uiSliceMode) {502 if (SM_RASTER_SLICE == pSpatialLayer->sSliceArgument.uiSliceMode) {
503 if (0!=pSpatialLayer->sSliceArgument.uiSliceMbNum[0]) {503 if (0 != pSpatialLayer->sSliceArgument.uiSliceMbNum[0]) {
504 SliceParamValidationForMode2 (iSpatialIdx);504 SliceParamValidationForMode2 (iSpatialIdx);
505 } else {505 } else {
506 SliceParamValidationForMode3 (iSpatialIdx);506 SliceParamValidationForMode3 (iSpatialIdx);
@@ -1069,7 +1069,6 @@ TEST_P (EncodeDecodeTestAPI, SetOptionECFlag_ERROR_CON_DISABLE) { · 562 unmodified lines
1069 }1069 }
1070 SDecodingParam decParam;1070 SDecodingParam decParam;
1071 memset (&decParam, 0, sizeof (SDecodingParam));1071 memset (&decParam, 0, sizeof (SDecodingParam));
1072 decParam.eOutputColorFormat = videoFormatI420;
1073 decParam.uiTargetDqLayer = UCHAR_MAX;1072 decParam.uiTargetDqLayer = UCHAR_MAX;
1074 decParam.eEcActiveIdc = ERROR_CON_DISABLE;1073 decParam.eEcActiveIdc = ERROR_CON_DISABLE;
1075 decParam.sVideoProperty.eVideoBsType = VIDEO_BITSTREAM_DEFAULT;1074 decParam.sVideoProperty.eVideoBsType = VIDEO_BITSTREAM_DEFAULT;
@@ -2422,7 +2421,6 @@ TEST_F (DecodeCrashTestAPI, DecoderCrashTest) { · 1346 unmodified lines
2422 2421
2423 SDecodingParam decParam;2422 SDecodingParam decParam;
2424 memset (&decParam, 0, sizeof (SDecodingParam));2423 memset (&decParam, 0, sizeof (SDecodingParam));
2425 decParam.eOutputColorFormat = videoFormatI420;
2426 decParam.uiTargetDqLayer = UCHAR_MAX;2424 decParam.uiTargetDqLayer = UCHAR_MAX;
2427 decParam.eEcActiveIdc = ERROR_CON_SLICE_COPY;2425 decParam.eEcActiveIdc = ERROR_CON_SLICE_COPY;
2428 decParam.sVideoProperty.eVideoBsType = VIDEO_BITSTREAM_DEFAULT;2426 decParam.sVideoProperty.eVideoBsType = VIDEO_BITSTREAM_DEFAULT;
@@ -2526,7 +2524,6 @@ class DecodeParseAPI : public ::testing::TestWithParam<EncodeDecodeFileParamBase · 97 unmodified lines
2526 decoder_->Uninitialize();2524 decoder_->Uninitialize();
2527 SDecodingParam decParam;2525 SDecodingParam decParam;
2528 memset (&decParam, 0, sizeof (SDecodingParam));2526 memset (&decParam, 0, sizeof (SDecodingParam));
2529 decParam.eOutputColorFormat = videoFormatRGB;
2530 decParam.uiTargetDqLayer = UCHAR_MAX;2527 decParam.uiTargetDqLayer = UCHAR_MAX;
2531 decParam.eEcActiveIdc = ERROR_CON_SLICE_COPY;2528 decParam.eEcActiveIdc = ERROR_CON_SLICE_COPY;
2532 decParam.bParseOnly = true;2529 decParam.bParseOnly = true;
@@ -3182,7 +3179,6 @@ TEST_F (EncodeDecodeTestAPI, SimulcastSVC) { · 649 unmodified lines
3182 3179
3183 SDecodingParam decParam;3180 SDecodingParam decParam;
3184 memset (&decParam, 0, sizeof (SDecodingParam));3181 memset (&decParam, 0, sizeof (SDecodingParam));
3185 decParam.eOutputColorFormat = videoFormatI420;
3186 decParam.uiTargetDqLayer = UCHAR_MAX;3182 decParam.uiTargetDqLayer = UCHAR_MAX;
3187 decParam.eEcActiveIdc = ERROR_CON_SLICE_COPY;3183 decParam.eEcActiveIdc = ERROR_CON_SLICE_COPY;
3188 decParam.sVideoProperty.eVideoBsType = VIDEO_BITSTREAM_DEFAULT;3184 decParam.sVideoProperty.eVideoBsType = VIDEO_BITSTREAM_DEFAULT;
@@ -3300,7 +3296,6 @@ TEST_F (EncodeDecodeTestAPI, SimulcastAVC) { · 111 unmodified lines
3300 3296
3301 SDecodingParam decParam;3297 SDecodingParam decParam;
3302 memset (&decParam, 0, sizeof (SDecodingParam));3298 memset (&decParam, 0, sizeof (SDecodingParam));
3303 decParam.eOutputColorFormat = videoFormatI420;
3304 decParam.uiTargetDqLayer = UCHAR_MAX;3299 decParam.uiTargetDqLayer = UCHAR_MAX;
3305 decParam.eEcActiveIdc = ERROR_CON_SLICE_COPY;3300 decParam.eEcActiveIdc = ERROR_CON_SLICE_COPY;
3306 decParam.sVideoProperty.eVideoBsType = VIDEO_BITSTREAM_DEFAULT;3301 decParam.sVideoProperty.eVideoBsType = VIDEO_BITSTREAM_DEFAULT;
@@ -3377,8 +3372,8 @@ TEST_F (EncodeDecodeTestAPI, SimulcastAVC_SPS_PPS_LISTING) { · 70 unmodified lines
3377 float fFrameRate = rand() + 0.5f;3372 float fFrameRate = rand() + 0.5f;
3378 int iEncFrameNum = WelsClip3 ((rand() % ENCODE_FRAME_NUM) + 1, 1, ENCODE_FRAME_NUM);3373 int iEncFrameNum = WelsClip3 ((rand() % ENCODE_FRAME_NUM) + 1, 1, ENCODE_FRAME_NUM);
3379 int iSliceNum = 1;3374 int iSliceNum = 1;
3380 iWidth = VALID_SIZE(iWidth);3375 iWidth = VALID_SIZE (iWidth);
3381 iHeight = VALID_SIZE(iHeight);3376 iHeight = VALID_SIZE (iHeight);
3382 // prepare params3377 // prepare params
3383 SEncParamExt sParam1;3378 SEncParamExt sParam1;
3384 SEncParamExt sParam2;3379 SEncParamExt sParam2;
@@ -3414,7 +3409,6 @@ TEST_F (EncodeDecodeTestAPI, SimulcastAVC_SPS_PPS_LISTING) { · 29 unmodified lines
3414 3409
3415 SDecodingParam decParam;3410 SDecodingParam decParam;
3416 memset (&decParam, 0, sizeof (SDecodingParam));3411 memset (&decParam, 0, sizeof (SDecodingParam));
3417 decParam.eOutputColorFormat = videoFormatI420;
3418 decParam.uiTargetDqLayer = UCHAR_MAX;3412 decParam.uiTargetDqLayer = UCHAR_MAX;
3419 decParam.eEcActiveIdc = ERROR_CON_SLICE_COPY;3413 decParam.eEcActiveIdc = ERROR_CON_SLICE_COPY;
3420 decParam.sVideoProperty.eVideoBsType = VIDEO_BITSTREAM_DEFAULT;3414 decParam.sVideoProperty.eVideoBsType = VIDEO_BITSTREAM_DEFAULT;
@@ -3533,7 +3527,7 @@ TEST_P (EncodeTestAPI, SetEncOptionSize) { · 112 unmodified lines
3533 param_.sSpatialLayers[0].iVideoHeight = p.iHeight;3527 param_.sSpatialLayers[0].iVideoHeight = p.iHeight;
3534 param_.sSpatialLayers[0].fFrameRate = p.fFramerate;3528 param_.sSpatialLayers[0].fFrameRate = p.fFramerate;
3535 param_.sSpatialLayers[0].sSliceArgument.uiSliceMode = p.eSliceMode;3529 param_.sSpatialLayers[0].sSliceArgument.uiSliceMode = p.eSliceMode;
3536 if ( SM_FIXEDSLCNUM_SLICE == p.eSliceMode ) {3530 if (SM_FIXEDSLCNUM_SLICE == p.eSliceMode) {
3537 param_.sSpatialLayers[0].sSliceArgument.uiSliceNum = 8;3531 param_.sSpatialLayers[0].sSliceArgument.uiSliceNum = 8;
3538 }3532 }
3539 3533
@@ -3554,7 +3548,7 @@ TEST_P (EncodeTestAPI, SetEncOptionSize) { · 14 unmodified lines
3554 unsigned char* pData[3] = { NULL };3548 unsigned char* pData[3] = { NULL };
3555 3549
3556 //FIXME: remove this after the multi-thread case is correctly handled in encoder3550 //FIXME: remove this after the multi-thread case is correctly handled in encoder
3557 if (p.iThreads>1 && SM_SIZELIMITED_SLICE == p.eSliceMode) {3551 if (p.iThreads > 1 && SM_SIZELIMITED_SLICE == p.eSliceMode) {
3558 p.bAllRandom = false;3552 p.bAllRandom = false;
3559 }3553 }
3560 3554
@@ -3635,7 +3629,6 @@ TEST_F (EncodeDecodeTestAPI, SimulcastAVCDiffFps) { · 74 unmodified lines
3635 3629
3636 SDecodingParam decParam;3630 SDecodingParam decParam;
3637 memset (&decParam, 0, sizeof (SDecodingParam));3631 memset (&decParam, 0, sizeof (SDecodingParam));
3638 decParam.eOutputColorFormat = videoFormatI420;
3639 decParam.uiTargetDqLayer = UCHAR_MAX;3632 decParam.uiTargetDqLayer = UCHAR_MAX;
3640 decParam.eEcActiveIdc = ERROR_CON_SLICE_COPY;3633 decParam.eEcActiveIdc = ERROR_CON_SLICE_COPY;
3641 decParam.sVideoProperty.eVideoBsType = VIDEO_BITSTREAM_DEFAULT;3634 decParam.sVideoProperty.eVideoBsType = VIDEO_BITSTREAM_DEFAULT;
@@ -3729,7 +3722,8 @@ TEST_F (EncodeDecodeTestAPI, SimulcastAVCDiffFps) { · 87 unmodified lines
3729TEST_F (EncodeDecodeTestAPI, DiffSlicingInDlayer) {3722TEST_F (EncodeDecodeTestAPI, DiffSlicingInDlayer) {
3730 int iSpatialLayerNum = 3;3723 int iSpatialLayerNum = 3;
3731 int iWidth = WelsClip3 ((((rand() % MAX_WIDTH) >> 1) + 1) << 1, (64 << 2), MAX_WIDTH);3724 int iWidth = WelsClip3 ((((rand() % MAX_WIDTH) >> 1) + 1) << 1, (64 << 2), MAX_WIDTH);
3732 int iHeight = WelsClip3 ((((rand() % MAX_HEIGHT) >> 1) + 1) << 1, (64 << 2), 2240);//TODO: use MAX_HEIGHT after the limit is removed3725 int iHeight = WelsClip3 ((((rand() % MAX_HEIGHT) >> 1) + 1) << 1, (64 << 2),
3726 2240);//TODO: use MAX_HEIGHT after the limit is removed
3733 float fFrameRate = rand() + 0.5f;3727 float fFrameRate = rand() + 0.5f;
3734 int iEncFrameNum = WelsClip3 ((rand() % ENCODE_FRAME_NUM) + 1, 1, ENCODE_FRAME_NUM);3728 int iEncFrameNum = WelsClip3 ((rand() % ENCODE_FRAME_NUM) + 1, 1, ENCODE_FRAME_NUM);
3735 3729
@@ -3774,7 +3768,6 @@ TEST_F (EncodeDecodeTestAPI, DiffSlicingInDlayer) { · 38 unmodified lines
3774 3768
3775 SDecodingParam decParam;3769 SDecodingParam decParam;
3776 memset (&decParam, 0, sizeof (SDecodingParam));3770 memset (&decParam, 0, sizeof (SDecodingParam));
3777 decParam.eOutputColorFormat = videoFormatI420;
3778 decParam.uiTargetDqLayer = UCHAR_MAX;3771 decParam.uiTargetDqLayer = UCHAR_MAX;
3779 decParam.eEcActiveIdc = ERROR_CON_SLICE_COPY;3772 decParam.eEcActiveIdc = ERROR_CON_SLICE_COPY;
3780 decParam.sVideoProperty.eVideoBsType = VIDEO_BITSTREAM_DEFAULT;3773 decParam.sVideoProperty.eVideoBsType = VIDEO_BITSTREAM_DEFAULT;
@@ -3838,7 +3831,6 @@ TEST_F (EncodeDecodeTestAPI, DiffSlicingInDlayerMixed) { · 57 unmodified lines
3838 3831
3839 SDecodingParam decParam;3832 SDecodingParam decParam;
3840 memset (&decParam, 0, sizeof (SDecodingParam));3833 memset (&decParam, 0, sizeof (SDecodingParam));
3841 decParam.eOutputColorFormat = videoFormatI420;
3842 decParam.uiTargetDqLayer = UCHAR_MAX;3834 decParam.uiTargetDqLayer = UCHAR_MAX;
3843 decParam.eEcActiveIdc = ERROR_CON_SLICE_COPY;3835 decParam.eEcActiveIdc = ERROR_CON_SLICE_COPY;
3844 decParam.sVideoProperty.eVideoBsType = VIDEO_BITSTREAM_DEFAULT;3836 decParam.sVideoProperty.eVideoBsType = VIDEO_BITSTREAM_DEFAULT;
@@ -3899,7 +3891,6 @@ TEST_F (EncodeDecodeTestAPI, ThreadNumAndSliceNum) { · 54 unmodified lines
3899 3891
3900 SDecodingParam decParam;3892 SDecodingParam decParam;
3901 memset (&decParam, 0, sizeof (SDecodingParam));3893 memset (&decParam, 0, sizeof (SDecodingParam));
3902 decParam.eOutputColorFormat = videoFormatI420;
3903 decParam.uiTargetDqLayer = UCHAR_MAX;3894 decParam.uiTargetDqLayer = UCHAR_MAX;
3904 decParam.eEcActiveIdc = ERROR_CON_SLICE_COPY;3895 decParam.eEcActiveIdc = ERROR_CON_SLICE_COPY;
3905 decParam.sVideoProperty.eVideoBsType = VIDEO_BITSTREAM_DEFAULT;3896 decParam.sVideoProperty.eVideoBsType = VIDEO_BITSTREAM_DEFAULT;
@@ -3961,7 +3952,6 @@ TEST_F (EncodeDecodeTestAPI, TriggerLoadBalancing) { · 55 unmodified lines
3961 3952
3962 SDecodingParam decParam;3953 SDecodingParam decParam;
3963 memset (&decParam, 0, sizeof (SDecodingParam));3954 memset (&decParam, 0, sizeof (SDecodingParam));
3964 decParam.eOutputColorFormat = videoFormatI420;
3965 decParam.uiTargetDqLayer = UCHAR_MAX;3955 decParam.uiTargetDqLayer = UCHAR_MAX;
3966 decParam.eEcActiveIdc = ERROR_CON_SLICE_COPY;3956 decParam.eEcActiveIdc = ERROR_CON_SLICE_COPY;
3967 decParam.sVideoProperty.eVideoBsType = VIDEO_BITSTREAM_DEFAULT;3957 decParam.sVideoProperty.eVideoBsType = VIDEO_BITSTREAM_DEFAULT;

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