package/mpp
1
0
Fork 0
mirror of https://github.com/nyanmisaka/mpp.git synced 2025-10-06 01:26:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[misc]: remove compile warning, and add utils directory for test cases

Browse Source 
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@315 6e48237b-75ef-9749-8fc9-41990f28c85a
This commit is contained in:
ChenHengming
2015-09-28 21:22:25 +00:00
parent c28734a33a
commit c6d93bd1b9
6 changed files with 71 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@@ -346,6 +346,8 @@ list( LENGTH module_list module_size )
# ----------------------------------------------------------------------------
# project overall include file
include_directories(inc)
# small utile functions for test case
include_directories(utils)
# ----------------------------------------------------------------------------
# osal library
@@ -355,6 +357,11 @@ include_directories(osal/inc)
# OSAL is needed on all platform, do not need option
add_subdirectory(osal)
# ----------------------------------------------------------------------------
# utils for test case
# ----------------------------------------------------------------------------
add_subdirectory(utils)
# ----------------------------------------------------------------------------
# Media Process Platform library
# ----------------------------------------------------------------------------

2
mpp/codec/dec/h265/h265d_parser.c
View File

@@ -1459,7 +1459,7 @@ MPP_RET h265d_prepare(void *ctx, MppPacket pkt, HalDecTask *task)
HEVCContext *s = h265dctx->priv_data;
RK_U8 *buf = NULL;
void *pos = NULL;
RK_S32 length = 0;
size_t length = 0;
s->eos = mpp_packet_get_eos(pkt);
buf = mpp_packet_get_pos(pkt);
length = mpp_packet_get_size(pkt);

2
mpp/codec/dec/h265/h265d_ps.c
View File

@@ -1302,7 +1302,7 @@ static int scaling_list_data(HEVCContext *s, ScalingList *sl)
RK_U32 matrix_id;
for (size_id = 0; size_id < 4; size_id++)
for (matrix_id = 0; matrix_id < (size_id == 3 ? 2 : 6); matrix_id++) {
for (matrix_id = 0; matrix_id < (RK_U32)((size_id == 3) ? 2 : 6); matrix_id++) {
READ_BIT1(gb, &scaling_list_pred_mode_flag[size_id][matrix_id]);
if (!scaling_list_pred_mode_flag[size_id][matrix_id]) {
RK_U32 delta = 0;

8
utils/CMakeLists.txt Normal file
View File

@@ -0,0 +1,8 @@
# vim: syntax=cmake
# ----------------------------------------------------------------------------
# add libvpu implement
# ----------------------------------------------------------------------------
add_library(utils STATIC
utils.c
)
target_link_libraries(utils osal)

24
utils/utils.c Normal file
View File

@@ -0,0 +1,24 @@
/*
*
* Copyright 2010 Rockchip Electronics S.LSI Co. LTD
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#define MODULE_TAG "utils"
#include <string.h>
#include "mpp_log.h"

30
utils/utils.h Normal file
View File

@@ -0,0 +1,30 @@
/*
* Copyright 2010 Rockchip Electronics S.LSI Co. LTD
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef __UTILS_H__
#define __UTILS_H__
#ifdef __cplusplus
extern "C" {
#endif
#ifdef __cplusplus
}
#endif
#endif /*__UTILS_H__*/