Showing the changes to test/api/encoder_test.cpp (1 of 1 file). Show all
Unified · Split
| @@ -61,8 +61,6 @@ TEST_P (EncoderOutputTest, CompareOutput) { · 60 unmodified lines | |||
| 61 | 61 | ||
| 62 | //will remove this after screen content algorithms are ready, | 62 | //will remove this after screen content algorithms are ready, |
| 63 | //because the bitstream output will vary when the different algorithms are added. | 63 | //because the bitstream output will vary when the different algorithms are added. |
| 64 | if (p.usageType == SCREEN_CONTENT_REAL_TIME) | ||
| 65 | return; | ||
| 66 | unsigned char digest[SHA_DIGEST_LENGTH]; | 64 | unsigned char digest[SHA_DIGEST_LENGTH]; |
| 67 | SHA1Result (&ctx_, digest); | 65 | SHA1Result (&ctx_, digest); |
| 68 | if (!HasFatalFailure()) { | 66 | if (!HasFatalFailure()) { |
| @@ -99,18 +97,26 @@ static const EncodeFileParam kFileParamArray[] = { · 30 unmodified lines | |||
| 99 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", | 97 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", |
| 100 | "2bc06262d87fa0897ad4c336cc4047d5a67f7203", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1 | 98 | "2bc06262d87fa0897ad4c336cc4047d5a67f7203", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1 |
| 101 | }, | 99 | }, |
| 100 | { | ||
| 101 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", | ||
| 102 | "68c3220e49b7a57d563faf7c99a870ab34a23400", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_SINGLE_SLICE, false, 4 | ||
| 103 | }, | ||
| 102 | { | 104 | { |
| 103 | "res/CiscoVT2people_320x192_12fps.yuv", | 105 | "res/CiscoVT2people_320x192_12fps.yuv", |
| 104 | "", SCREEN_CONTENT_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1 | 106 | "030d0e2d742ac039c2ab6333fe7cb18623c0d283", SCREEN_CONTENT_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1 |
| 105 | }, | 107 | }, |
| 106 | { | 108 | { |
| 107 | "res/CiscoVT2people_160x96_6fps.yuv", | 109 | "res/CiscoVT2people_160x96_6fps.yuv", |
| 108 | "", SCREEN_CONTENT_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1 | 110 | "40aa19d4b2684a59e689860d2a793876f33904f7", SCREEN_CONTENT_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1 |
| 109 | }, | 111 | }, |
| 110 | { | 112 | { |
| 111 | "res/Static_152_100.yuv", | 113 | "res/Static_152_100.yuv", |
| 112 | "", SCREEN_CONTENT_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1 | 114 | "494068b59aa9ed9118a9f33174b732024effc870", SCREEN_CONTENT_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1 |
| 113 | } | 115 | }, |
| 116 | { | ||
| 117 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", | ||
| 118 | "dc5aedee4d8f1fe8d6647a9f7b8c2d3df758ac27", SCREEN_CONTENT_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1 | ||
| 119 | }, | ||
| 114 | }; | 120 | }; |
| 115 | 121 | ||
| 116 | INSTANTIATE_TEST_CASE_P (EncodeFile, EncoderOutputTest, | 122 | INSTANTIATE_TEST_CASE_P (EncodeFile, EncoderOutputTest, |