Index: source/libvpx/vp9/decoder/vp9_decoder.h |
=================================================================== |
--- source/libvpx/vp9/decoder/vp9_decoder.h (revision 271012) |
+++ source/libvpx/vp9/decoder/vp9_decoder.h (working copy) |
@@ -27,21 +27,11 @@ |
extern "C" { |
#endif |
-typedef struct VP9DecoderConfig { |
- int width; |
- int height; |
- int version; |
- int max_threads; |
- int inv_tile_order; |
-} VP9DecoderConfig; |
- |
typedef struct VP9Decoder { |
DECLARE_ALIGNED(16, MACROBLOCKD, mb); |
DECLARE_ALIGNED(16, VP9_COMMON, common); |
- VP9DecoderConfig oxcf; |
- |
int64_t last_time_stamp; |
int ready_for_new_data; |
@@ -49,7 +39,6 @@ |
int decoded_key_frame; |
- int do_loopfilter_inline; // apply loopfilter to available rows immediately |
VP9Worker lf_worker; |
VP9Worker *tile_workers; |
@@ -59,6 +48,9 @@ |
vpx_decrypt_cb decrypt_cb; |
void *decrypt_state; |
+ |
+ int max_threads; |
+ int inv_tile_order; |
} VP9Decoder; |
void vp9_initialize_dec(); |
@@ -83,9 +75,8 @@ |
int vp9_get_reference_dec(struct VP9Decoder *pbi, |
int index, YV12_BUFFER_CONFIG **fb); |
+struct VP9Decoder *vp9_decoder_create(); |
-struct VP9Decoder *vp9_decoder_create(const VP9DecoderConfig *oxcf); |
- |
void vp9_decoder_remove(struct VP9Decoder *pbi); |
#ifdef __cplusplus |