shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Remove -Wextra suppression."

--- a/libs.mk

+++ b/libs.mk

@@ -112,11 +112,6 @@

   CODEC_DOC_SECTIONS += decoder

 endif

-# Suppress -Wextra warnings in first party code pending investigation.

-# https://bugs.chromium.org/p/webm/issues/detail?id=1246

-$(BUILD_PFX)vp8/encoder/onyx_if.c.o: CFLAGS += -Wno-unknown-warning-option -Wno-clobbered

-$(BUILD_PFX)vp8/decoder/onyxd_if.c.o: CFLAGS += -Wno-unknown-warning-option -Wno-clobbered

-

 ifeq ($(CONFIG_MSVS),yes)

 CODEC_LIB=$(if $(CONFIG_STATIC_MSVCRT),vpxmt,vpxmd)

 GTEST_LIB=$(if $(CONFIG_STATIC_MSVCRT),gtestmt,gtestmd)

--- a/vp8/decoder/onyxd_if.c

+++ b/vp8/decoder/onyxd_if.c

@@ -321,22 +321,6 @@

   pbi->dec_fb_ref[GOLDEN_FRAME] = &cm->yv12_fb[cm->gld_fb_idx];

   pbi->dec_fb_ref[ALTREF_FRAME] = &cm->yv12_fb[cm->alt_fb_idx];

-  if (setjmp(pbi->common.error.jmp)) {

-    /* We do not know if the missing frame(s) was supposed to update

-     * any of the reference buffers, but we act conservative and

-     * mark only the last buffer as corrupted.

-     */

-    cm->yv12_fb[cm->lst_fb_idx].corrupted = 1;

-

-    if (cm->fb_idx_ref_cnt[cm->new_fb_idx] > 0) {

-      cm->fb_idx_ref_cnt[cm->new_fb_idx]--;

-    }

-    pbi->common.error.setjmp = 0;

-    goto decode_exit;

-  }

-

-  pbi->common.error.setjmp = 1;

-

   retcode = vp8_decode_frame(pbi);

   if (retcode < 0) {

--- a/vp8/encoder/onyx_if.c

+++ b/vp8/encoder/onyx_if.c

@@ -4813,14 +4813,6 @@

   cm = &cpi->common;

-  if (setjmp(cpi->common.error.jmp)) {

-    cpi->common.error.setjmp = 0;

-    vpx_clear_system_state();

-    return VPX_CODEC_CORRUPT_FRAME;

-  }

-

-  cpi->common.error.setjmp = 1;

-

   vpx_usec_timer_start(&cmptimer);

   cpi->source = NULL;

--- a/vp8/vp8_cx_iface.c

+++ b/vp8/vp8_cx_iface.c

@@ -16,6 +16,7 @@

 #include "vpx/internal/vpx_codec_internal.h"

 #include "vpx_version.h"

 #include "vpx_mem/vpx_mem.h"

+#include "vpx_ports/system_state.h"

 #include "vpx_ports/vpx_once.h"

 #include "vp8/encoder/onyx_int.h"

 #include "vpx/vp8cx.h"

@@ -796,9 +797,11 @@

 static vpx_codec_err_t vp8e_encode(vpx_codec_alg_priv_t *ctx,

                                    const vpx_image_t *img, vpx_codec_pts_t pts,

                                    unsigned long duration,

-                                   vpx_enc_frame_flags_t flags,

+                                   vpx_enc_frame_flags_t enc_flags,

                                    unsigned long deadline) {

-  vpx_codec_err_t res = VPX_CODEC_OK;

+  volatile vpx_codec_err_t res = VPX_CODEC_OK;

+  // Make a copy as volatile to avoid -Wclobbered with longjmp.

+  volatile vpx_enc_frame_flags_t flags = enc_flags;

   if (!ctx->cfg.rc_target_bitrate) {

 #if CONFIG_MULTI_RES_ENCODING

@@ -840,6 +843,12 @@

     }

   }

+  if (setjmp(ctx->cpi->common.error.jmp)) {

+    ctx->cpi->common.error.setjmp = 0;

+    vpx_clear_system_state();

+    return VPX_CODEC_CORRUPT_FRAME;

+  }

+

   /* Initialize the encoder instance on the first frame*/

   if (!res && ctx->cpi) {

     unsigned int lib_flags;

@@ -885,6 +894,8 @@

     cx_data_sz = ctx->cx_data_sz;

     cx_data_end = ctx->cx_data + cx_data_sz;

     lib_flags = 0;

+

+    ctx->cpi->common.error.setjmp = 1;

     while (cx_data_sz >= ctx->cx_data_sz / 2) {

       comp_data_state = vp8_get_compressed_data(

--- a/vp8/vp8_dx_iface.c

+++ b/vp8/vp8_dx_iface.c

@@ -335,8 +335,8 @@

   if (!res) {

     VP8D_COMP *pbi = ctx->yv12_frame_buffers.pbi[0];

+    VP8_COMMON *const pc = &pbi->common;

     if (resolution_change) {

-      VP8_COMMON *const pc = &pbi->common;

       MACROBLOCKD *const xd = &pbi->mb;

 #if CONFIG_MULTITHREAD

       int i;

@@ -427,6 +427,23 @@

       /* required to get past the first get_free_fb() call */

       pbi->common.fb_idx_ref_cnt[0] = 0;

     }

+

+    if (setjmp(pbi->common.error.jmp)) {

+      /* We do not know if the missing frame(s) was supposed to update

+       * any of the reference buffers, but we act conservative and

+       * mark only the last buffer as corrupted.

+       */

+      pc->yv12_fb[pc->lst_fb_idx].corrupted = 1;

+

+      if (pc->fb_idx_ref_cnt[pc->new_fb_idx] > 0) {

+        pc->fb_idx_ref_cnt[pc->new_fb_idx]--;

+      }

+      pc->error.setjmp = 0;

+      res = update_error_state(ctx, &pbi->common.error);

+      return res;

+    }

+

+    pbi->common.error.setjmp = 1;

     /* update the pbi fragment data */

     pbi->fragments = ctx->fragments;