From 12ee09be3da0970d19207ad583eb6ae5df7e4a8c Mon Sep 17 00:00:00 2001
From: DingWei <DingWei@6e48237b-75ef-9749-8fc9-41990f28c85a>
Date: Wed, 8 Jun 2016 02:26:01 +0000
Subject: [PATCH] [h264d] remove warning; [oasl]  remove warning in linux;
 [m2v]   update CMakeLists in vs; remove warning;

git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@892 6e48237b-75ef-9749-8fc9-41990f28c85a
---
 mpp/codec/dec/h264/h264d_init.c  | 2 +-
 mpp/codec/dec/m2v/CMakeLists.txt | 5 ++---
 mpp/codec/dec/m2v/m2vd_parser.c  | 4 ++--
 mpp/hal/vpu/m2vd/CMakeLists.txt  | 2 +-
 osal/allocator/allocator_drm.c   | 7 ++++---
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/mpp/codec/dec/h264/h264d_init.c b/mpp/codec/dec/h264/h264d_init.c
index 0e004f51..358ab1b7 100644
--- a/mpp/codec/dec/h264/h264d_init.c
+++ b/mpp/codec/dec/h264/h264d_init.c
@@ -472,7 +472,7 @@ static MPP_RET check_dpb_field_paired(H264_FrameStore_t *p_last, H264_StorePic_t
 #endif
     H264D_DBG(H264D_DBG_FIELD_PAIRED, "[check_field_paired] combine_flag=%d, last_used=%d, last_pic_struct=%d, curr_struct=%d",
               dec_pic->combine_flag, (p_last ? p_last->is_used : -1), last_pic_structure, cur_structure);
-    return MPP_OK;
+    return ret = MPP_OK;
 }
 
 static MPP_RET check_dpb_discontinuous(H264_StorePic_t *p_last, H264_StorePic_t *dec_pic, H264_SLICE_t *currSlice)
diff --git a/mpp/codec/dec/m2v/CMakeLists.txt b/mpp/codec/dec/m2v/CMakeLists.txt
index 8f1b497b..03e06c8c 100644
--- a/mpp/codec/dec/m2v/CMakeLists.txt
+++ b/mpp/codec/dec/m2v/CMakeLists.txt
@@ -27,10 +27,9 @@ add_library(codec_m2vd STATIC
 				${M2VD_COMMON}
 				${M2VD_HDR} 
 				${M2VD_SRC} 
-			)
+			)	
 target_link_libraries(codec_m2vd
-                      mpp
-					  mpp_legacy
+                      mpp_base
                       )
 set_target_properties(codec_m2vd PROPERTIES FOLDER "mpp/codec")
 
diff --git a/mpp/codec/dec/m2v/m2vd_parser.c b/mpp/codec/dec/m2v/m2vd_parser.c
index 6c20dffa..f2ee2c9a 100644
--- a/mpp/codec/dec/m2v/m2vd_parser.c
+++ b/mpp/codec/dec/m2v/m2vd_parser.c
@@ -400,7 +400,7 @@ MPP_RET m2vd_parser_prepare(void *ctx, MppPacket pkt, HalDecTask *task)
     task->valid = 0;
 
     m2vd_parser_split_frame(buf,
-                            mpp_packet_get_length(pkt),
+                            (RK_U32)mpp_packet_get_length(pkt),
                             p->bitstream_sw_buf,
                             &out_size);
     pos += out_size;
@@ -1252,7 +1252,7 @@ MPP_RET m2vd_parser_parse(void *ctx, HalDecTask *in_task)
 
     p->flush_dpb_eos = 0;
 
-    p->frame_size = mpp_packet_get_length(in_task->input_packet);
+    p->frame_size = (RK_U32)mpp_packet_get_length(in_task->input_packet);
 
     mpp_set_bitread_ctx(p->bitread_ctx, p->bitstream_sw_buf, p->frame_size);
 
diff --git a/mpp/hal/vpu/m2vd/CMakeLists.txt b/mpp/hal/vpu/m2vd/CMakeLists.txt
index 4a3974d2..14c2dd0a 100644
--- a/mpp/hal/vpu/m2vd/CMakeLists.txt
+++ b/mpp/hal/vpu/m2vd/CMakeLists.txt
@@ -30,7 +30,7 @@ else()
     target_link_libraries(hal_m2vd osal)
 endif()    
 target_link_libraries(hal_m2vd
-                      mpp
+                      mpp_base
 					  )
 set_target_properties(hal_m2vd PROPERTIES FOLDER "mpp/hal")        
 
diff --git a/osal/allocator/allocator_drm.c b/osal/allocator/allocator_drm.c
index 19c4a7da..c2edc952 100644
--- a/osal/allocator/allocator_drm.c
+++ b/osal/allocator/allocator_drm.c
@@ -75,7 +75,8 @@ static int drm_alloc(int fd, size_t len, size_t align, unsigned int heap_mask,
     if (ret < 0)
         return ret;
     *handle = dmcb.handle;
-
+	(void)heap_mask;
+	(void)flags;
     return ret;
 }
 
@@ -102,7 +103,7 @@ static int drm_handle_to_fd(int fd, RK_U32 handle, int *map_fd, RK_U32 flags)
         mpp_err("map ioctl returned negative fd\n");
         return -EINVAL;
     }
-
+	(void)flags;
     return ret;
 }
 
@@ -140,7 +141,7 @@ static int drm_map(int fd, RK_U32 handle, size_t length, int prot,
         mpp_err("mmap failed: %s\n", strerror(errno));
         return -errno;
     }
-
+	(void)offset;
     return ret;
 }