Index: source/libvpx/vp9/decoder/vp9_decoder.h |
=================================================================== |
--- source/libvpx/vp9/decoder/vp9_decoder.h (revision 278778) |
+++ source/libvpx/vp9/decoder/vp9_decoder.h (working copy) |
@@ -27,23 +27,31 @@ |
extern "C" { |
#endif |
+// TODO(hkuang): combine this with TileWorkerData. |
+typedef struct TileData { |
+ VP9_COMMON *cm; |
+ vp9_reader bit_reader; |
+ DECLARE_ALIGNED(16, MACROBLOCKD, xd); |
+} TileData; |
+ |
typedef struct VP9Decoder { |
DECLARE_ALIGNED(16, MACROBLOCKD, mb); |
DECLARE_ALIGNED(16, VP9_COMMON, common); |
- int64_t last_time_stamp; |
int ready_for_new_data; |
int refresh_frame_flags; |
- int decoded_key_frame; |
+ int frame_parallel_decode; // frame-based threading. |
VP9Worker lf_worker; |
- |
VP9Worker *tile_workers; |
int num_tile_workers; |
+ TileData *tile_data; |
+ int total_tiles; |
+ |
VP9LfSync lf_row_sync; |
vpx_decrypt_cb decrypt_cb; |
@@ -53,15 +61,10 @@ |
int inv_tile_order; |
} VP9Decoder; |
-void vp9_initialize_dec(); |
- |
int vp9_receive_compressed_data(struct VP9Decoder *pbi, |
- size_t size, const uint8_t **dest, |
- int64_t time_stamp); |
+ size_t size, const uint8_t **dest); |
-int vp9_get_raw_frame(struct VP9Decoder *pbi, |
- YV12_BUFFER_CONFIG *sd, |
- int64_t *time_stamp, int64_t *time_end_stamp, |
+int vp9_get_raw_frame(struct VP9Decoder *pbi, YV12_BUFFER_CONFIG *sd, |
vp9_ppflags_t *flags); |
vpx_codec_err_t vp9_copy_reference_dec(struct VP9Decoder *pbi, |