This allows decoders to know that a baseline stream doesn't contain any of the features that aren't in the constrained baseline subset. Set the flags based on what profile we target.
Showing the changes to test/api/encoder_test.cpp (1 of 6 files). Show all
Unified · Split
| @@ -79,23 +79,23 @@ TEST_P (EncoderOutputTest, CompareOutput) { · 78 unmodified lines | ||
| 79 | 79 | static const EncodeFileParam kFileParamArray[] = { |
| 80 | 80 | { |
| 81 | 81 | "res/CiscoVT2people_320x192_12fps.yuv", |
| 82 | − "0a36b75e423fc6b49f6adf7eee12c039a096f538", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 82 | + "16b145cf76a677d87240ef6c8efff0ff8d3a2f3a", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 83 | 83 | }, |
| 84 | 84 | { |
| 85 | 85 | "res/CiscoVT2people_160x96_6fps.yuv", |
| 86 | − "73981e6ea5b62f7338212c538a7cc755e7c9c030", CAMERA_VIDEO_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 86 | + "874ab77ba13f199d70b67cd75f8e23baf482c1ed", CAMERA_VIDEO_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 87 | 87 | }, |
| 88 | 88 | { |
| 89 | 89 | "res/Static_152_100.yuv", |
| 90 | − "02bbff550ee0630e44e46e14dc459d3686f2a360", CAMERA_VIDEO_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 90 | + "73b40ad71e1f1ffbbd5425de2b094ccbdfa798a6", CAMERA_VIDEO_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 91 | 91 | }, |
| 92 | 92 | { |
| 93 | 93 | "res/CiscoVT2people_320x192_12fps.yuv", |
| 94 | − "c8b759bcec7ffa048f1d3ded594b8815bed0aead", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_ROWMB_SLICE, false, 1, false, false, false // One slice per MB row | |
| 94 | + "c1b187be92a35ac8f4f9724b594559e0394c1df8", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_ROWMB_SLICE, false, 1, false, false, false // One slice per MB row | |
| 95 | 95 | }, |
| 96 | 96 | { |
| 97 | 97 | "res/CiscoVT2people_320x192_12fps.yuv", |
| 98 | − "e64ba75456c821ca35a949eda89f85bff8ee69fa", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, true, 1, false, false, false | |
| 98 | + "959a94ea684bf37eaf39909f6460e02b50ad0a5f", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, true, 1, false, false, false | |
| 99 | 99 | }, |
| 100 | 100 | { |
| 101 | 101 | "res/CiscoVT2people_320x192_12fps.yuv", |
| @@ -103,7 +103,7 @@ static const EncodeFileParam kFileParamArray[] = { · 1 unmodified line | ||
| 103 | 103 | }, |
| 104 | 104 | { |
| 105 | 105 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", |
| 106 | − "2bc06262d87fa0897ad4c336cc4047d5a67f7203", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1, false, false, false | |
| 106 | + "27a595af0e9598feb4dc1403fd99affddfa51f46", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1, false, false, false | |
| 107 | 107 | }, |
| 108 | 108 | { |
| 109 | 109 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", |
| @@ -112,32 +112,32 @@ static const EncodeFileParam kFileParamArray[] = { · 2 unmodified lines | ||
| 112 | 112 | // the following values may be adjusted for times since we start tuning the strategy |
| 113 | 113 | { |
| 114 | 114 | "res/CiscoVT2people_320x192_12fps.yuv", |
| 115 | − "3ce65d9c326657b845cd00b22ce76128c29f8347", SCREEN_CONTENT_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 115 | + "7113004abe156bf69c399803f302644645ac42be", SCREEN_CONTENT_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 116 | 116 | }, |
| 117 | 117 | { |
| 118 | 118 | "res/CiscoVT2people_160x96_6fps.yuv", |
| 119 | − "2b57e1cc7a4db6258116c302eada3bf870ee94a1", SCREEN_CONTENT_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 119 | + "51fc38d467509f94e85f9678f11429220e46d862", SCREEN_CONTENT_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 120 | 120 | }, |
| 121 | 121 | { |
| 122 | 122 | "res/Static_152_100.yuv", |
| 123 | − "bad065da4564d0580a1722d91463fa0f9fd947c8", SCREEN_CONTENT_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 123 | + "1af33ad3d8c40756ef1f6074c019a06535c35ab0", SCREEN_CONTENT_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false | |
| 124 | 124 | }, |
| 125 | 125 | { |
| 126 | 126 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", |
| 127 | − "8ee6cd375b58e9877f6145fb72da844e65162b14", SCREEN_CONTENT_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1, false, false, false | |
| 127 | + "e032f8f8b153f37e614676735074cdce843032de", SCREEN_CONTENT_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1, false, false, false | |
| 128 | 128 | }, |
| 129 | 129 | //for different strategy |
| 130 | 130 | { |
| 131 | 131 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", |
| 132 | − "6a7fc060a4d9dc0ec397987f02df0cf4d96181e6", SCREEN_CONTENT_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1, true, true, false | |
| 132 | + "28e290b204257eae5c735b2b96491358ec14221e", SCREEN_CONTENT_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1, true, true, false | |
| 133 | 133 | }, |
| 134 | 134 | { |
| 135 | 135 | "res/CiscoVT2people_320x192_12fps.yuv", |
| 136 | − "fc6faa6409150cce304bcdefb486fee4b4a70e1d", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, true //turn on cabac | |
| 136 | + "59e51ffc741172df4a729d7fc1f85645885311a5", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, true //turn on cabac | |
| 137 | 137 | }, |
| 138 | 138 | { |
| 139 | 139 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", |
| 140 | − "7b166367ece61cf489c793872c40c37d4047b7aa", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1, false, false, true | |
| 140 | + "f4361779554ae66ce62308f1e01218369ca0edf4", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1, false, false, true | |
| 141 | 141 | }, |
| 142 | 142 | }; |
| 143 | 143 | |