From b1c72b633ef633a1ee6e83c3556393b6fe9068c4 Mon Sep 17 00:00:00 2001 From: Frank Galligan Date: Thu, 23 Jan 2014 14:59:00 -0800 Subject: Revert external frame buffer code. A future CL will add external frame buffers differently. Squash commit of four revert commits: Revert "Increase required number of external frame buffers" This reverts commit 9e41d569d7c84dd9ca8f0047c15377a883945685. Revert "Add external constants." This reverts commit bbf53047b03106e3c2e24b28cb836cc838db5ee8. Revert "Add frame buffer lru cache." This reverts commit fbada948fa345e67acf9aa41a8f9a78f5dfe8648. Conflicts: vpxdec.c Change-Id: I76fe42419923a6ea6c75d9997cbbf941d73d3005 Revert "Add support to pass in external frame buffers." This reverts commit 10f891696bc4c972c13cc9fde2c53470501a03e2. Conflicts: test/external_frame_buffer_test.cc vp9/common/vp9_alloccommon.c vp9/common/vp9_reconinter.c vp9/decoder/vp9_decodeframe.c vp9/encoder/vp9_onyx_if.c vp9/vp9_dx_iface.c vpx/vpx_decoder.h vpx/vpx_external_frame_buffer.h vpx_scale/generic/yv12config.c vpxdec.c Change-Id: I7434cf590f1c852b38569980e4247fad0d939c2e --- vpx/src/vpx_decoder.c | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'vpx/src/vpx_decoder.c') diff --git a/vpx/src/vpx_decoder.c b/vpx/src/vpx_decoder.c index 39fd217ea..a99e48f88 100644 --- a/vpx/src/vpx_decoder.c +++ b/vpx/src/vpx_decoder.c @@ -226,22 +226,3 @@ vpx_codec_err_t vpx_codec_set_mem_map(vpx_codec_ctx_t *ctx, return SAVE_STATUS(ctx, res); } - -vpx_codec_err_t vpx_codec_set_frame_buffers( - vpx_codec_ctx_t *ctx, - vpx_codec_frame_buffer_t *fb_list, int fb_count, - vpx_realloc_frame_buffer_cb_fn_t cb, void *user_priv) { - vpx_codec_err_t res; - - if (!ctx || !fb_list || fb_count <= 0 || !cb) { - res = VPX_CODEC_INVALID_PARAM; - } else if (!ctx->iface || !ctx->priv || - !(ctx->iface->caps & VPX_CODEC_CAP_EXTERNAL_FRAME_BUFFER)) { - res = VPX_CODEC_ERROR; - } else { - res = ctx->iface->dec.set_fb(ctx->priv->alg_priv, fb_list, fb_count, - cb, user_priv); - } - - return SAVE_STATUS(ctx, res); -} -- cgit v1.2.3