Revert "Merge branch 'feat/reader-low-res-first-then-sharpen'"
This reverts commiteb0750051f, reversing changes made toce34974727.
This commit is contained in:
1 parent
eb0750051f
commit
bbc73635a6
4 files changed
+71
-745
No files matched your search
@@ -15,12 +15,7 @@
|
||||
* P5 「先点适高,再切条漫」:scaled 不增长(评审点名的第二入口);
|
||||
* P6 双击放大再双击缩回:缩回后按新几何重解 → scaled 不增长(P2-1);
|
||||
* P7 静止若干帧不产生新解码(无重解抖动/活锁,P2-2);
|
||||
* P8 驻留页图有字节上界(<= 9MB);
|
||||
* P9 800×1280(评审表格另一档):翻页 + 条漫都必须零重采样;
|
||||
* P10 大屏(1080×1920):fit 目标被字节上限钳住后不得反复重解;
|
||||
* P11 分档策略(M31):非 JPEG 大页不分档(一次解到目标档、仍是原生 blit);
|
||||
* 低档先落位→停稳换清晰→拖动取消的完整生命周期在 test_reader_membudget 的 B10
|
||||
* 用真实 JPEG 夹具覆盖。
|
||||
* P8 驻留页图有字节上界(<= 9MB)。
|
||||
*
|
||||
* 编译:test/run_tests.sh(与 test_open_book_host 同口径;只发布 meow_ui.a 时 SKIP)。
|
||||
*/
|
||||
@@ -373,45 +368,6 @@ int main(void)
|
||||
"800x1280 webtoon: zero resample (scaled %d -> %d)", st,
|
||||
mr_reader_ui_scaled_draws());
|
||||
|
||||
/* ---- P11 分档策略(M31):非 JPEG 大页不分档——一次解到目标档,仍是原生 blit ----
|
||||
* 低档/高档的完整生命周期(低档先落位→停稳换清晰→拖动取消)在 test_reader_membudget
|
||||
* 的 B10 用真实 JPEG 夹具覆盖;这里只钉住「分档只给 JPEG」这条策略,防止把 PNG/BMP
|
||||
* 也拖进未校准的「小图→落框」峰值路径。 */
|
||||
{
|
||||
char book3[MR_PATH_MAX];
|
||||
snprintf(book3, sizeof book3, "./mr_perf_books_%ld/v3", (long)getpid());
|
||||
int ok3 = mkdir_p(book3) == 0;
|
||||
for (int i = 0; ok3 && i < 2; i++) {
|
||||
char p[MR_PATH_MAX];
|
||||
snprintf(p, sizeof p, "%s/t%d.bmp", book3, i + 1);
|
||||
/* 1600×2400 = 3.84MP:量级与真机大页相同,但格式不是 JPEG。 */
|
||||
if (write_bmp24(p, 1600, 2400, (unsigned)(i + 41)) != 0) ok3 = 0;
|
||||
}
|
||||
if (!ok3) {
|
||||
printf(" SKIP: tier fixture write failed\n");
|
||||
} else {
|
||||
meow_view_page_pop(); /* 关掉 book2 */
|
||||
uint64_t t_open = meow_ui_time_ms();
|
||||
mr_reader_open_dir(book3);
|
||||
uint64_t open_ms = meow_ui_time_ms() - t_open;
|
||||
CHECK(mr_reader_ui_count() == 2, "tier book pages=%d", mr_reader_ui_count());
|
||||
CHECK(open_ms < 500, "open returns without decoding on the UI thread (%llu ms)",
|
||||
(unsigned long long)open_ms);
|
||||
pump_ms(600);
|
||||
draw_once();
|
||||
CHECK(mr_reader_ui_focus_tier() == MR_TIER_HIGH,
|
||||
"non-JPEG big page decodes straight to the target tier (tier=%d)",
|
||||
mr_reader_ui_focus_tier());
|
||||
CHECK(mr_reader_ui_low_decodes() == 0,
|
||||
"no low tier for PNG/BMP (%d low decodes)", mr_reader_ui_low_decodes());
|
||||
int bl = mr_reader_ui_blit_draws(), sc = mr_reader_ui_scaled_draws();
|
||||
draw_once();
|
||||
CHECK(mr_reader_ui_blit_draws() > bl && mr_reader_ui_scaled_draws() == sc,
|
||||
"big BMP page draws as native blit (blit +%d, scaled +%d)",
|
||||
mr_reader_ui_blit_draws() - bl, mr_reader_ui_scaled_draws() - sc);
|
||||
}
|
||||
}
|
||||
|
||||
meow_view_page_pop();
|
||||
meow_view_free(reader);
|
||||
meow_view_free(lib);
|
||||
|
||||
Reference in new issue
Block a user