diff options
author | Harish Mahendrakar <hmahendrakar@google.com> | 2023-12-09 06:41:24 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-09 06:41:24 +0000 |
commit | 9177302a515ae5b511e4ec0bf8e089097ac24588 (patch) | |
tree | d9de399e994a9f0ffd99df7181b3eb334076fd5a | |
parent | 7d10f02d30aa64c24df1bf6c9131c5f167c1ae55 (diff) | |
parent | c51417a3a48c03309a2c034657df66930345c646 (diff) | |
download | libdav1d-9177302a515ae5b511e4ec0bf8e089097ac24588.tar.gz |
Temporarily disable multi-threading in film grain stage am: ebc97fe938 am: c51417a3a4
Original change: https://android-review.googlesource.com/c/platform/external/libdav1d/+/2864955
Change-Id: I51a1d24f3051ab80630a737c7435e0ef2506f6d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | src/lib.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -50,6 +50,9 @@ #include "src/thread_task.h" #include "src/wedge.h" +// TODO(b/315538557): Temporarily disable multi-threading in film grain +#define DISABLE_FG_MT 1 + static COLD void init_internal(void) { dav1d_init_cpu(); dav1d_init_ii_wedge_masks(); @@ -496,7 +499,7 @@ int dav1d_apply_grain(Dav1dContext *const c, Dav1dPicture *const out, int res = dav1d_picture_alloc_copy(c, out, in->p.w, in); if (res < 0) goto error; - if (c->n_tc > 1) { + if (c->n_tc > 1 && !DISABLE_FG_MT) { dav1d_task_delayed_fg(c, out, in); } else { switch (out->p.bpc) { |