aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarish Mahendrakar <hmahendrakar@google.com>2023-12-09 06:41:24 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-12-09 06:41:24 +0000
commit9177302a515ae5b511e4ec0bf8e089097ac24588 (patch)
treed9de399e994a9f0ffd99df7181b3eb334076fd5a
parent7d10f02d30aa64c24df1bf6c9131c5f167c1ae55 (diff)
parentc51417a3a48c03309a2c034657df66930345c646 (diff)
downloadlibdav1d-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.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib.c b/src/lib.c
index 3807efd..7b82309 100644
--- a/src/lib.c
+++ b/src/lib.c
@@ -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) {