summaryrefslogtreecommitdiffstats
path: root/src/psb_texture.c
diff options
context:
space:
mode:
authorhding3 <haitao.ding@intel.com>2012-12-12 09:25:02 +0800
committerPatrick Tjin <pattjin@google.com>2014-07-21 22:06:12 -0700
commit8bc6a6aa815a18f936036b5a47106b47aa904b1b (patch)
tree7f061190b4b1ee7d86947b3efb4602fb949933ab /src/psb_texture.c
parentd87d8c35ea58a64352072c3fee78cf1d1c412a59 (diff)
downloadandroid_hardware_intel_img_psb_video-8bc6a6aa815a18f936036b5a47106b47aa904b1b.tar.gz
android_hardware_intel_img_psb_video-8bc6a6aa815a18f936036b5a47106b47aa904b1b.tar.bz2
android_hardware_intel_img_psb_video-8bc6a6aa815a18f936036b5a47106b47aa904b1b.zip
[PORT FROM MAIN][psb-video] Fix klocwork issue on mainline
BZ: 72765 70530 Fix klocwork issues lik potential NULL pointer dereference, not relase mutex resource and not used variables. Signed-off-by: Elaine Wang <elaine.wang@intel.com> Signed-off-by: hding3 <haitao.ding@intel.com> Change-Id: I4dd65a457c8160612a5a38021a75b9d34c0f092c Reviewed-on: http://android.intel.com:8080/82316 Reviewed-by: Ding, Haitao <haitao.ding@intel.com> Tested-by: Ding, Haitao <haitao.ding@intel.com> Reviewed-by: cactus <cactus@intel.com> Tested-by: cactus <cactus@intel.com>
Diffstat (limited to 'src/psb_texture.c')
-rw-r--r--src/psb_texture.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/psb_texture.c b/src/psb_texture.c
index d2cf2be..b4c265e 100644
--- a/src/psb_texture.c
+++ b/src/psb_texture.c
@@ -461,9 +461,13 @@ static PPVR2DMEMINFO psb_wrap_surface_pvr2dbuf(psb_driver_data_p driver_data, VA
unsigned char* tmp_buffer;
unsigned char tmp;
object_surface_p obj_surface = SURFACE(surface);
- psb_surface_p psb_surface = obj_surface->psb_surface;
+ psb_surface_p psb_surface;
+ VAStatus vaStatus = VA_STATUS_SUCCESS;
PVR2DERROR ePVR2DStatus;
+ CHECK_SURFACE(obj_surface);
+ psb_surface = obj_surface->psb_surface;
+
/* Find and return the wrapped buffer index */
for (i = 0; i < VIDEO_BUFFER_NUM; i++) {
if (driver_data->wrapped_surface_id[i] == surface && driver_data->videoBuf[i]) {
@@ -518,6 +522,7 @@ void psb_putsurface_textureblit(
struct psb_texture_s *texture_priv = &driver_data->ctexture_priv;
object_surface_p obj_surface;
PsbVASurfaceRec *surface_subpic = NULL;
+ VAStatus vaStatus = VA_STATUS_SUCCESS;
obj_surface = SURFACE(surface);
PVR2D_VPBLT sBltVP;
@@ -628,7 +633,9 @@ void psb_putsurface_textureblit(
}
object_subpic_p obj_subpic = SUBPIC(surface_subpic->subpic_id);
- sBltVP.AlphaBlendingFunc = PVR2D_ALPHA_OP_GLOBAL;
+ CHECK_SURFACE(obj_subpic);
+ // sBltVP.AlphaBlendingFunc = PVR2D_ALPHA_OP_GLOBAL;
+ sBltVP.AlphaBlendingFunc = 3;
sBltVP.subpicGlobalAlpha[i] = obj_subpic->global_alpha;
sBltVP.sSrcSubpic[i].pSurfMemInfo = pVaVideoSubpicMemInfo;