commit 42db6b4babd8123aa1b3cb44f34543dd8ed29796
author Mudassir Galaganath <mudassir.galaganath@ittiam.com> Thu Nov 16 17:33:39 2023 +0530
committer Wan-Teh Chang <wtc@google.com> Mon Nov 20 19:42:02 2023 +0000
tree ba143f3a5384d6f208653cc86ada0f703acc0c22
parent 690762d1cb0bc23663296e4fb3bce800e7ed4fd7

Add longjmp targets in update_extra_cfg()

This CL adds longjmp targets in update_extra_cfg() to
propagate the allocation failures from av1_change_config()
when invoked using 'cpi' and 'cpi_lap'.

Bug: aomedia:3276
Change-Id: Ibb2fb75375462e44afcf8af59f9cb8f5bfc2c233

av1/av1_cx_iface.c

diff --git a/av1/av1_cx_iface.c b/av1/av1_cx_iface.c
index 7256f48..3c8a39b 100644
--- a/av1/av1_cx_iface.c
+++ b/av1/av1_cx_iface.c
@@ -1601,11 +1601,26 @@
     bool is_sb_size_changed = false;
     av1_change_config_seq(ctx->ppi, &ctx->oxcf, &is_sb_size_changed);
     for (int i = 0; i < ctx->ppi->num_fp_contexts; i++) {
-      av1_change_config(ctx->ppi->parallel_cpi[i], &ctx->oxcf,
-                        is_sb_size_changed);
+      AV1_COMP *const cpi = ctx->ppi->parallel_cpi[i];
+      struct aom_internal_error_info *const error = cpi->common.error;
+      if (setjmp(error->jmp)) {
+        error->setjmp = 0;
+        return error->error_code;
+      }
+      error->setjmp = 1;
+      av1_change_config(cpi, &ctx->oxcf, is_sb_size_changed);
+      error->setjmp = 0;
     }
     if (ctx->ppi->cpi_lap != NULL) {
-      av1_change_config(ctx->ppi->cpi_lap, &ctx->oxcf, is_sb_size_changed);
+      AV1_COMP *const cpi_lap = ctx->ppi->cpi_lap;
+      struct aom_internal_error_info *const error = cpi_lap->common.error;
+      if (setjmp(error->jmp)) {
+        error->setjmp = 0;
+        return error->error_code;
+      }
+      error->setjmp = 1;
+      av1_change_config(cpi_lap, &ctx->oxcf, is_sb_size_changed);
+      error->setjmp = 0;
     }
   }
   return res;