Commit: 8dda0650b55c467200c34ada127b5d9b54edea5c - hardware-intel-intel-driver (git)

hardware/intel/intel-driver

Commit MetaInfo

• Revisión: 8dda0650b55c467200c34ada127b5d9b54edea5c (tree)
• Tiempo: 2015-05-19 02:21:50
• Autor: Zhao Yakui <yakui.zhao@inte...>
• Commiter: Sean V Kelley

Log Message

Decode: Free the allocated internal surface used by JPEG to avoid memory leak

Signed-off-by: Zhao Yakui <[e-mail]>
Signed-off-by: Sean V Kelley <[e-mail]>
Tested-by: Sean V Kelley <[e-mail]>

Cambiar Resumen

• modified: src/gen75_mfd.c
• modified: src/gen7_mfd.c
• modified: src/gen7_mfd.h

Diferencia incremental

--- a/src/gen75_mfd.c
+++ b/src/gen75_mfd.c
@@ -3189,8 +3189,11 @@ out:
 static void
 gen75_mfd_context_destroy(void *hw_context)
 {
+    VADriverContextP ctx;
     struct gen7_mfd_context *gen7_mfd_context = (struct gen7_mfd_context *)hw_context;
 
+    ctx = (VADriverContextP)(gen7_mfd_context->driver_context);
+
     dri_bo_unreference(gen7_mfd_context->post_deblocking_output.bo);
     gen7_mfd_context->post_deblocking_output.bo = NULL;
 
@@ -3214,6 +3217,13 @@ gen75_mfd_context_destroy(void *hw_context)
 
     dri_bo_unreference(gen7_mfd_context->jpeg_wa_slice_data_bo);
 
+    if (gen7_mfd_context->jpeg_wa_surface_id != VA_INVALID_SURFACE) {
+        i965_DestroySurfaces(ctx,
+                             &gen7_mfd_context->jpeg_wa_surface_id,
+                             1);
+        gen7_mfd_context->jpeg_wa_surface_object = NULL;
+    }
+
     intel_batchbuffer_free(gen7_mfd_context->base.batch);
     free(gen7_mfd_context);
 }
@@ -3263,5 +3273,7 @@ gen75_dec_hw_context_init(VADriverContextP ctx, struct object_config *obj_config
     default:
         break;
     }
+
+    gen7_mfd_context->driver_context = ctx;
     return (struct hw_context *)gen7_mfd_context;
 }

--- a/src/gen7_mfd.c
+++ b/src/gen7_mfd.c
@@ -2668,8 +2668,11 @@ out:
 static void
 gen7_mfd_context_destroy(void *hw_context)
 {
+    VADriverContextP ctx;
     struct gen7_mfd_context *gen7_mfd_context = (struct gen7_mfd_context *)hw_context;
 
+    ctx = (VADriverContextP)(gen7_mfd_context->driver_context);
+
     dri_bo_unreference(gen7_mfd_context->post_deblocking_output.bo);
     gen7_mfd_context->post_deblocking_output.bo = NULL;
 
@@ -2693,6 +2696,13 @@ gen7_mfd_context_destroy(void *hw_context)
 
     dri_bo_unreference(gen7_mfd_context->jpeg_wa_slice_data_bo);
 
+    if (gen7_mfd_context->jpeg_wa_surface_id != VA_INVALID_SURFACE) {
+        i965_DestroySurfaces(ctx,
+                             &gen7_mfd_context->jpeg_wa_surface_id,
+                             1);
+        gen7_mfd_context->jpeg_wa_surface_object = NULL;
+    }
+
     intel_batchbuffer_free(gen7_mfd_context->base.batch);
     free(gen7_mfd_context);
 }
@@ -2741,5 +2751,7 @@ gen7_dec_hw_context_init(VADriverContextP ctx, struct object_config *obj_config)
     default:
         break;
     }
+
+    gen7_mfd_context->driver_context = ctx;
     return (struct hw_context *)gen7_mfd_context;
 }

--- a/src/gen7_mfd.h
+++ b/src/gen7_mfd.h
@@ -93,6 +93,8 @@ struct gen7_mfd_context
     dri_bo *jpeg_wa_slice_data_bo;
 
     int                 wa_mpeg2_slice_vertical_position;
+
+    void *driver_context;
 };
 
 #endif /* _GEN7_MFD_H_ */