aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-12-10 00:07:43 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-12-10 00:07:43 +0000
commit72ae945b9a6d3de4927bbf2c5a22099ffed7ca95 (patch)
treed9de399e994a9f0ffd99df7181b3eb334076fd5a
parent1ca28c49ec4152e99b10551ecbb2154bbdb9c334 (diff)
parentaa7140001b3e7001c45874a2dbd9c131d362575e (diff)
downloadlibdav1d-72ae945b9a6d3de4927bbf2c5a22099ffed7ca95.tar.gz
Snap for 11201039 from aa7140001b3e7001c45874a2dbd9c131d362575e to 24Q1-release
Change-Id: I6e120dfbe13deb98ddb85067f29924fc097dac52
-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) {