diff options
| author | Yaowu Xu <yaowu@google.com> | 2013-10-24 10:31:29 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-10-24 10:31:29 -0700 |
| commit | 1dcf09407727167359f835ef9c3cd51b02c9d80f (patch) | |
| tree | 975d39e86760f58f3abd5aff0c83a237f0555de2 /vp9/vp9_cx_iface.c | |
| parent | 4a59def9b43966b36bf4a958deafa74f9861a6be (diff) | |
| parent | 03b2ae16f2bb904ff491bc6ee6e82dc9c414c93d (diff) | |
| download | libvpx-1dcf09407727167359f835ef9c3cd51b02c9d80f.tar libvpx-1dcf09407727167359f835ef9c3cd51b02c9d80f.tar.gz libvpx-1dcf09407727167359f835ef9c3cd51b02c9d80f.tar.bz2 libvpx-1dcf09407727167359f835ef9c3cd51b02c9d80f.zip | |
Merge "Disable two libvpx APIs for VP9"
Diffstat (limited to 'vp9/vp9_cx_iface.c')
| -rw-r--r-- | vp9/vp9_cx_iface.c | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/vp9/vp9_cx_iface.c b/vp9/vp9_cx_iface.c index fb380e1db..0f12d8870 100644 --- a/vp9/vp9_cx_iface.c +++ b/vp9/vp9_cx_iface.c @@ -975,37 +975,16 @@ static vpx_codec_err_t vp9e_use_reference(vpx_codec_alg_priv_t *ctx, static vpx_codec_err_t vp9e_set_roi_map(vpx_codec_alg_priv_t *ctx, int ctr_id, va_list args) { - vpx_roi_map_t *data = va_arg(args, vpx_roi_map_t *); - - if (data) { - vpx_roi_map_t *roi = (vpx_roi_map_t *)data; - - if (!vp9_set_roimap(ctx->cpi, roi->roi_map, roi->rows, roi->cols, - roi->delta_q, roi->delta_lf, roi->static_threshold)) - return VPX_CODEC_OK; - else - return VPX_CODEC_INVALID_PARAM; - } else { - return VPX_CODEC_INVALID_PARAM; - } + // TODO(yaowu): Need to re-implement and test for VP9. + return VPX_CODEC_INVALID_PARAM; } static vpx_codec_err_t vp9e_set_activemap(vpx_codec_alg_priv_t *ctx, int ctr_id, va_list args) { - vpx_active_map_t *data = va_arg(args, vpx_active_map_t *); - - if (data) { - vpx_active_map_t *map = (vpx_active_map_t *)data; - - if (!vp9_set_active_map(ctx->cpi, map->active_map, map->rows, map->cols)) - return VPX_CODEC_OK; - else - return VPX_CODEC_INVALID_PARAM; - } else { - return VPX_CODEC_INVALID_PARAM; - } + // TODO(yaowu): Need to re-implement and test for VP9. + return VPX_CODEC_INVALID_PARAM; } static vpx_codec_err_t vp9e_set_scalemode(vpx_codec_alg_priv_t *ctx, |