From a0d04ea94e291ed72a452eee3309a298959727eb Mon Sep 17 00:00:00 2001
From: Fabio Pedretti <fabio.ped@libero.it>
Date: Mon, 14 Jun 2010 09:05:35 -0400
Subject: [PATCH] Remove useless 500 frame limit
Change-Id: Ib82de60cf32cf08844c3e2d88d7c587396f3892c
---
configure | 5 -----
vpx/internal/vpx_codec_internal.h | 3 +--
vpx/src/vpx_decoder.c | 12 ------------
vpx/src/vpx_encoder.c | 13 -------------
4 files changed, 1 insertion(+), 32 deletions(-)
diff --git a/configure b/configure
index f2b42bef47..9a3269a7f6 100755
--- a/configure
+++ b/configure
@@ -27,13 +27,11 @@ Advanced options:
supported by hardware [auto]
${toggle_codec_srcs} in/exclude codec library source code
${toggle_debug_libs} in/exclude debug version of libraries
- ${toggle_eval_limit} enable limited evaluation build
${toggle_md5} support for output of checksum data
${toggle_static_msvcrt} use static MSVCRT (VS builds only)
${toggle_vp8} VP8 codec support
${toggle_psnr} output of PSNR data, if supported (encoders)
${toggle_mem_tracker} track memory usage
- ${toggle_eval_limit} decoder limitted to 500 frames
${toggle_postproc} postprocessing
${toggle_multithread} multithreaded encoding and decoding.
${toggle_spatial_resampling} spatial sampling (scaling) support
@@ -230,7 +228,6 @@ CONFIG_LIST="
dequant_tokens
dc_recon
new_tokens
- eval_limit
runtime_cpu_detect
postproc
postproc_generic
@@ -271,7 +268,6 @@ CMDLINE_SELECT="
dequant_tokens
dc_recon
new_tokens
- eval_limit
postproc
postproc_generic
multithread
@@ -361,7 +357,6 @@ process_targets() {
enabled codec_srcs && DIST_DIR="${DIST_DIR}-src"
! enabled postproc && DIST_DIR="${DIST_DIR}-nopost"
! enabled multithread && DIST_DIR="${DIST_DIR}-nomt"
- enabled eval_limit && DIST_DIR="${DIST_DIR}-eval"
! enabled install_docs && DIST_DIR="${DIST_DIR}-nodocs"
DIST_DIR="${DIST_DIR}-${tgt_isa}-${tgt_os}"
case "${tgt_os}" in
diff --git a/vpx/internal/vpx_codec_internal.h b/vpx/internal/vpx_codec_internal.h
index f525a6013c..c653cc5a8d 100644
--- a/vpx/internal/vpx_codec_internal.h
+++ b/vpx/internal/vpx_codec_internal.h
@@ -56,7 +56,7 @@
* types, removing or reassigning enums, adding/removing/rearranging
* fields to structures
*/
-#define VPX_CODEC_INTERNAL_ABI_VERSION (2) /**<\hideinitializer*/
+#define VPX_CODEC_INTERNAL_ABI_VERSION (3) /**<\hideinitializer*/
typedef struct vpx_codec_alg_priv vpx_codec_alg_priv_t;
@@ -340,7 +340,6 @@ struct vpx_codec_priv
vpx_codec_iface_t *iface;
struct vpx_codec_alg_priv *alg_priv;
const char *err_detail;
- unsigned int eval_counter;
vpx_codec_flags_t init_flags;
struct
{
diff --git a/vpx/src/vpx_decoder.c b/vpx/src/vpx_decoder.c
index 9939aa28a0..cbf5259f2f 100644
--- a/vpx/src/vpx_decoder.c
+++ b/vpx/src/vpx_decoder.c
@@ -122,22 +122,10 @@ vpx_codec_err_t vpx_codec_decode(vpx_codec_ctx_t *ctx,
res = VPX_CODEC_INVALID_PARAM;
else if (!ctx->iface || !ctx->priv)
res = VPX_CODEC_ERROR;
-
-#if CONFIG_EVAL_LIMIT
- else if (ctx->priv->eval_counter >= 500)
- {
- ctx->priv->err_detail = "Evaluation limit exceeded.";
- res = VPX_CODEC_ERROR;
- }
-
-#endif
else
{
res = ctx->iface->dec.decode(ctx->priv->alg_priv, data, data_sz,
user_priv, deadline);
-#if CONFIG_EVAL_LIMIT
- ctx->priv->eval_counter++;
-#endif
}
return SAVE_STATUS(ctx, res);
diff --git a/vpx/src/vpx_encoder.c b/vpx/src/vpx_encoder.c
index 55fd5bf84d..f43328f3d1 100644
--- a/vpx/src/vpx_encoder.c
+++ b/vpx/src/vpx_encoder.c
@@ -127,15 +127,6 @@ vpx_codec_err_t vpx_codec_encode(vpx_codec_ctx_t *ctx,
res = VPX_CODEC_ERROR;
else if (!(ctx->iface->caps & VPX_CODEC_CAP_ENCODER))
res = VPX_CODEC_INCAPABLE;
-
-#if CONFIG_EVAL_LIMIT
- else if (ctx->priv->eval_counter >= 500)
- {
- ctx->priv->err_detail = "Evaluation limit exceeded.";
- res = VPX_CODEC_ERROR;
- }
-
-#endif
else
{
/* Execute in a normalized floating point environment, if the platform
@@ -145,10 +136,6 @@ vpx_codec_err_t vpx_codec_encode(vpx_codec_ctx_t *ctx,
res = ctx->iface->enc.encode(ctx->priv->alg_priv, img, pts,
duration, flags, deadline);
FLOATING_POINT_RESTORE();
-
-#if CONFIG_EVAL_LIMIT
- ctx->priv->eval_counter++;
-#endif
}
return SAVE_STATUS(ctx, res);
--
GitLab