Avoid dereferencing a pointer before checking pointer against NULL

[android-x86/hardware-intel-common-vaapi.git] / src / gen9_mfd.h

diff --git a/src/gen9_mfd.h b/src/gen9_mfd.h
index c266dd4..b08eab8 100644 (file)
--- a/src/gen9_mfd.h
+++ b/src/gen9_mfd.h
@@ -38,8 +38,7 @@
 
 struct hw_context;
 
-typedef struct vp9_frame_status
-{
+typedef struct vp9_frame_status {
     uint16_t frame_width;
     uint16_t frame_height;
     uint8_t frame_type;
@@ -49,11 +48,15 @@ typedef struct vp9_frame_status
     uint8_t intra_only;
     uint8_t prob_buffer_saved_flag;
     uint8_t prob_buffer_restored_flag;
-    dri_bo * mv_temporal_buffer_bo;
-}vp9_last_frame_status;
+} vp9_last_frame_status;
 
-struct gen9_hcpd_context
-{
+typedef struct vp9_mv_temporal_buffer {
+    dri_bo *bo;
+    uint16_t frame_width;
+    uint16_t frame_height;
+} VP9_MV_BUFFER;
+
+struct gen9_hcpd_context {
     struct hw_context base;
 
     GenFrameStoreContext fs_ctx;
@@ -84,6 +87,8 @@ struct gen9_hcpd_context
     GenBuffer hvd_tile_rowstore_buffer;
     GenBuffer vp9_probability_buffer;
     GenBuffer vp9_segment_id_buffer;
+    VP9_MV_BUFFER vp9_mv_temporal_buffer_curr;
+    VP9_MV_BUFFER vp9_mv_temporal_buffer_last;
 
     unsigned short first_inter_slice_collocated_ref_idx;
     unsigned short first_inter_slice_collocated_from_l0_flag;
@@ -93,8 +98,6 @@ struct gen9_hcpd_context
     FRAME_CONTEXT vp9_frame_ctx[FRAME_CONTEXTS];
     FRAME_CONTEXT vp9_fc_inter_default;
     FRAME_CONTEXT vp9_fc_key_default;
-    FRAME_CONTEXT vp9_fc;
-    FRAME_CONTEXT vp9_saved_fc;
 };
 
 #endif /* GEN9_MFD_H */