summaryrefslogtreecommitdiff
path: root/vpx/src
diff options
context:
space:
mode:
authorFabio Pedretti <fabio.ped@libero.it>2010-06-14 09:05:35 -0400
committerJohn Koleszar <jkoleszar@google.com>2010-06-14 09:06:42 -0400
commita0d04ea94e291ed72a452eee3309a298959727eb (patch)
tree94ad5c6161f12e221fe46d318a74ed46b1748142 /vpx/src
parent6f47a34613bdbf16ed943ffe7bf1491c487c053d (diff)
downloadlibvpx-a0d04ea94e291ed72a452eee3309a298959727eb.tar
libvpx-a0d04ea94e291ed72a452eee3309a298959727eb.tar.gz
libvpx-a0d04ea94e291ed72a452eee3309a298959727eb.tar.bz2
libvpx-a0d04ea94e291ed72a452eee3309a298959727eb.zip
Remove useless 500 frame limit
Change-Id: Ib82de60cf32cf08844c3e2d88d7c587396f3892c
Diffstat (limited to 'vpx/src')
-rw-r--r--vpx/src/vpx_decoder.c12
-rw-r--r--vpx/src/vpx_encoder.c13
2 files changed, 0 insertions, 25 deletions
diff --git a/vpx/src/vpx_decoder.c b/vpx/src/vpx_decoder.c
index 9939aa28a..cbf5259f2 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 55fd5bf84..f43328f3d 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);