diff options
| author | hkuang <hkuang@google.com> | 2013-07-25 11:11:39 -0700 |
|---|---|---|
| committer | hkuang <hkuang@google.com> | 2013-07-25 12:03:12 -0700 |
| commit | 91037db265ecdd914a26e056cf69207b4f50924e (patch) | |
| tree | c78c618cf6d0ffb187e2734d524bca19698b3c0d /libvpx/vp9/vp9_cx_iface.c | |
| parent | ba164dffc5a6795bce97fae02b51ccf3330e15e4 (diff) | |
| download | android_external_libvpx-91037db265ecdd914a26e056cf69207b4f50924e.tar.gz android_external_libvpx-91037db265ecdd914a26e056cf69207b4f50924e.tar.bz2 android_external_libvpx-91037db265ecdd914a26e056cf69207b4f50924e.zip | |
Roll latest libvpx into Android.
Make the VP9 decoding 2X faster than the old one.
Checkout is from master branch(hash:242157c756314827ad9244952c7253e8900b9626).
Change-Id: Ibe67b3ee19f82b87df2416826b63a67f7f79b63a
Diffstat (limited to 'libvpx/vp9/vp9_cx_iface.c')
| -rw-r--r-- | libvpx/vp9/vp9_cx_iface.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libvpx/vp9/vp9_cx_iface.c b/libvpx/vp9/vp9_cx_iface.c index e5b5089..be7828f 100644 --- a/libvpx/vp9/vp9_cx_iface.c +++ b/libvpx/vp9/vp9_cx_iface.c @@ -233,10 +233,10 @@ static vpx_codec_err_t set_vp9e_config(VP9_CONFIG *oxcf, oxcf->width = cfg.g_w; oxcf->height = cfg.g_h; /* guess a frame rate if out of whack, use 30 */ - oxcf->frame_rate = (double)(cfg.g_timebase.den) / (double)(cfg.g_timebase.num); + oxcf->framerate = (double)(cfg.g_timebase.den) / (double)(cfg.g_timebase.num); - if (oxcf->frame_rate > 180) { - oxcf->frame_rate = 30; + if (oxcf->framerate > 180) { + oxcf->framerate = 30; } switch (cfg.g_pass) { @@ -1032,6 +1032,7 @@ static vpx_codec_ctrl_fn_map_t vp9e_ctf_maps[] = { {VP8E_SET_CQ_LEVEL, set_param}, {VP8E_SET_MAX_INTRA_BITRATE_PCT, set_param}, {VP9E_SET_LOSSLESS, set_param}, + {VP9E_SET_FRAME_PARALLEL_DECODING, set_param}, {VP9_GET_REFERENCE, get_reference}, { -1, NULL}, }; |