Since this is on by default now, we don't need a separate test that has it enabled. Thus we can now remove one of the encoder tests. By not overriding the deblocking setting at all, the hash changes for the other tests that use SEncParamExt.
Showing the changes to test/api/encoder_test.cpp (1 of 4 files). Show all
Unified · Split
| @@ -33,7 +33,6 @@ struct EncodeFileParam { · 32 unmodified lines | |||
| 33 | float frameRate; | 33 | float frameRate; |
| 34 | SliceModeEnum slices; | 34 | SliceModeEnum slices; |
| 35 | bool denoise; | 35 | bool denoise; |
| 36 | int deblocking; | ||
| 37 | int layers; | 36 | int layers; |
| 38 | }; | 37 | }; |
| 39 | 38 | ||
| @@ -57,7 +56,7 @@ class EncoderOutputTest : public ::testing::WithParamInterface<EncodeFileParam>, · 17 unmodified lines | |||
| 57 | 56 | ||
| 58 | TEST_P(EncoderOutputTest, CompareOutput) { | 57 | TEST_P(EncoderOutputTest, CompareOutput) { |
| 59 | EncodeFileParam p = GetParam(); | 58 | EncodeFileParam p = GetParam(); |
| 60 | EncodeFile(p.fileName, p.width, p.height, p.frameRate, p.slices, p.denoise, p.deblocking, p.layers, this); | 59 | EncodeFile(p.fileName, p.width, p.height, p.frameRate, p.slices, p.denoise, p.layers, this); |
| 61 | 60 | ||
| 62 | unsigned char digest[SHA_DIGEST_LENGTH]; | 61 | unsigned char digest[SHA_DIGEST_LENGTH]; |
| 63 | SHA1Result(&ctx_, digest); | 62 | SHA1Result(&ctx_, digest); |
| @@ -69,31 +68,27 @@ TEST_P(EncoderOutputTest, CompareOutput) { · 5 unmodified lines | |||
| 69 | static const EncodeFileParam kFileParamArray[] = { | 68 | static const EncodeFileParam kFileParamArray[] = { |
| 70 | { | 69 | { |
| 71 | "res/CiscoVT2people_320x192_12fps.yuv", | 70 | "res/CiscoVT2people_320x192_12fps.yuv", |
| 72 | "8d4c87f48e8a679c1ccbf5fe1ee040fed4776b30", 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, 1 | 71 | "8d4c87f48e8a679c1ccbf5fe1ee040fed4776b30", 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1 |
| 73 | }, | 72 | }, |
| 74 | { | 73 | { |
| 75 | "res/CiscoVT2people_160x96_6fps.yuv", | 74 | "res/CiscoVT2people_160x96_6fps.yuv", |
| 76 | "75334dc69d95b8ac2e0a52977bba0179df4f151f", 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1, 1 | 75 | "75334dc69d95b8ac2e0a52977bba0179df4f151f", 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1 |
| 77 | }, | 76 | }, |
| 78 | { | 77 | { |
| 79 | "res/Static_152_100.yuv", | 78 | "res/Static_152_100.yuv", |
| 80 | "3467201e18a934e7f8c50f3c8f3e05f4334ad12c", 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1, 1 | 79 | "3467201e18a934e7f8c50f3c8f3e05f4334ad12c", 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1 |
| 81 | }, | 80 | }, |
| 82 | { | 81 | { |
| 83 | "res/CiscoVT2people_320x192_12fps.yuv", | 82 | "res/CiscoVT2people_320x192_12fps.yuv", |
| 84 | "592d9cb28dbd3e6d9e04febadf62b075c1c012b7", 320, 192, 12.0f, SM_ROWMB_SLICE, false, 1, 1 // One slice per MB row | 83 | "a57c7cc8a00ffe8d8ca5527a13af1683a41b5150", 320, 192, 12.0f, SM_ROWMB_SLICE, false, 1 // One slice per MB row |
| 85 | }, | 84 | }, |
| 86 | { | 85 | { |
| 87 | "res/CiscoVT2people_320x192_12fps.yuv", | 86 | "res/CiscoVT2people_320x192_12fps.yuv", |
| 88 | "49d392e826ba77cb8cd0b3f701f102a72623c1cf", 320, 192, 12.0f, SM_SINGLE_SLICE, true, 1, 1 | 87 | "bc9b203c1b031299df7981201c2af393994d876f", 320, 192, 12.0f, SM_SINGLE_SLICE, true, 1 |
| 89 | }, | 88 | }, |
| 90 | { | 89 | { |
| 91 | "res/CiscoVT2people_320x192_12fps.yuv", | 90 | "res/CiscoVT2people_320x192_12fps.yuv", |
| 92 | "8d4c87f48e8a679c1ccbf5fe1ee040fed4776b30", 320, 192, 12.0f, SM_SINGLE_SLICE, false, 0, 1 | 91 | "ba81a0f1a14214e6d3c7f1608991b3ac97789370", 320, 192, 12.0f, SM_SINGLE_SLICE, false, 2 |
| 93 | }, | ||
| 94 | { | ||
| 95 | "res/CiscoVT2people_320x192_12fps.yuv", | ||
| 96 | "ba81a0f1a14214e6d3c7f1608991b3ac97789370", 320, 192, 12.0f, SM_SINGLE_SLICE, false, 0, 2 | ||
| 97 | }, | 92 | }, |
| 98 | }; | 93 | }; |
| 99 | 94 | ||