diff options
| author | Jim Bankoski <jimbankoski@google.com> | 2013-09-06 10:13:35 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-09-12 06:29:07 -0700 |
| commit | e7f2aa0fb86855c617aca1586e10722eed21d2d1 (patch) | |
| tree | 60e142e777e3c4ed31341df233d23304a33851f6 /vp9 | |
| parent | cddde51ec59edf753453b5ad2d45e790d9412179 (diff) | |
| download | libvpx-e7f2aa0fb86855c617aca1586e10722eed21d2d1.tar libvpx-e7f2aa0fb86855c617aca1586e10722eed21d2d1.tar.gz libvpx-e7f2aa0fb86855c617aca1586e10722eed21d2d1.tar.bz2 libvpx-e7f2aa0fb86855c617aca1586e10722eed21d2d1.zip | |
clang warnings : ref frame enum mismatch
Convert from refframe_type_t to VP9_REFFRAME
Change-Id: Iff4043c3fdb3e1c9c2b412bdffd5da8ed913ec13
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/vp9_cx_iface.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/vp9/vp9_cx_iface.c b/vp9/vp9_cx_iface.c index f44cd2723..48866d22e 100644 --- a/vp9/vp9_cx_iface.c +++ b/vp9/vp9_cx_iface.c @@ -89,6 +89,18 @@ struct vpx_codec_alg_priv { unsigned int fixed_kf_cntr; }; +static const VP9_REFFRAME ref_frame_to_vp9_reframe(vpx_ref_frame_type_t frame) { + switch (frame) { + case VP8_LAST_FRAME: + return VP9_LAST_FLAG; + case VP8_GOLD_FRAME: + return VP9_GOLD_FLAG; + case VP8_ALTR_FRAME: + return VP9_ALT_FLAG; + } + assert(!"Invalid Reference Frame"); + return VP9_LAST_FLAG; +} static vpx_codec_err_t update_error_state(vpx_codec_alg_priv_t *ctx, @@ -853,7 +865,8 @@ static vpx_codec_err_t vp9e_set_reference(vpx_codec_alg_priv_t *ctx, YV12_BUFFER_CONFIG sd; image2yuvconfig(&frame->img, &sd); - vp9_set_reference_enc(ctx->cpi, frame->frame_type, &sd); + vp9_set_reference_enc(ctx->cpi, ref_frame_to_vp9_reframe(frame->frame_type), + &sd); return VPX_CODEC_OK; } else return VPX_CODEC_INVALID_PARAM; @@ -871,7 +884,8 @@ static vpx_codec_err_t vp9e_copy_reference(vpx_codec_alg_priv_t *ctx, YV12_BUFFER_CONFIG sd; image2yuvconfig(&frame->img, &sd); - vp9_copy_reference_enc(ctx->cpi, frame->frame_type, &sd); + vp9_copy_reference_enc(ctx->cpi, + ref_frame_to_vp9_reframe(frame->frame_type), &sd); return VPX_CODEC_OK; } else return VPX_CODEC_INVALID_PARAM; |