| Index: source/libvpx/vpx/vp8cx.h
|
| ===================================================================
|
| --- source/libvpx/vpx/vp8cx.h (revision 195011)
|
| +++ source/libvpx/vpx/vp8cx.h (working copy)
|
| @@ -187,7 +187,10 @@
|
|
|
|
|
| /* TODO(jkoleszar): Move to vp9cx.h */
|
| - VP9E_SET_LOSSLESS
|
| + VP9E_SET_LOSSLESS,
|
| + VP9E_SET_TILE_COLUMNS,
|
| + VP9E_SET_TILE_ROWS,
|
| + VP9E_SET_FRAME_PARALLEL_DECODING
|
| };
|
|
|
| /*!\brief vpx 1-D scaling mode
|
| @@ -298,6 +301,9 @@
|
| VPX_CTRL_USE_TYPE(VP8E_SET_TUNING, int) /* vp8e_tuning */
|
| VPX_CTRL_USE_TYPE(VP8E_SET_CQ_LEVEL, unsigned int)
|
|
|
| +VPX_CTRL_USE_TYPE(VP9E_SET_TILE_COLUMNS, int)
|
| +VPX_CTRL_USE_TYPE(VP9E_SET_TILE_ROWS, int)
|
| +
|
| VPX_CTRL_USE_TYPE(VP8E_GET_LAST_QUANTIZER, int *)
|
| VPX_CTRL_USE_TYPE(VP8E_GET_LAST_QUANTIZER_64, int *)
|
|
|
| @@ -305,6 +311,7 @@
|
|
|
| VPX_CTRL_USE_TYPE(VP9E_SET_LOSSLESS, unsigned int)
|
|
|
| +VPX_CTRL_USE_TYPE(VP9E_SET_FRAME_PARALLEL_DECODING, unsigned int)
|
| /*! @} - end defgroup vp8_encoder */
|
| #include "vpx_codec_impl_bottom.h"
|
| #endif
|
|
|