mirror of
https://github.com/nyanmisaka/mpp.git
synced 2025-10-05 17:16:50 +08:00
[misc]: remove compile warning, and add utils directory for test cases
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@315 6e48237b-75ef-9749-8fc9-41990f28c85a
This commit is contained in:
@@ -346,6 +346,8 @@ list( LENGTH module_list module_size )
|
|||||||
# ----------------------------------------------------------------------------
|
# ----------------------------------------------------------------------------
|
||||||
# project overall include file
|
# project overall include file
|
||||||
include_directories(inc)
|
include_directories(inc)
|
||||||
|
# small utile functions for test case
|
||||||
|
include_directories(utils)
|
||||||
|
|
||||||
# ----------------------------------------------------------------------------
|
# ----------------------------------------------------------------------------
|
||||||
# osal library
|
# osal library
|
||||||
@@ -355,6 +357,11 @@ include_directories(osal/inc)
|
|||||||
# OSAL is needed on all platform, do not need option
|
# OSAL is needed on all platform, do not need option
|
||||||
add_subdirectory(osal)
|
add_subdirectory(osal)
|
||||||
|
|
||||||
|
# ----------------------------------------------------------------------------
|
||||||
|
# utils for test case
|
||||||
|
# ----------------------------------------------------------------------------
|
||||||
|
add_subdirectory(utils)
|
||||||
|
|
||||||
# ----------------------------------------------------------------------------
|
# ----------------------------------------------------------------------------
|
||||||
# Media Process Platform library
|
# Media Process Platform library
|
||||||
# ----------------------------------------------------------------------------
|
# ----------------------------------------------------------------------------
|
||||||
|
@@ -1459,7 +1459,7 @@ MPP_RET h265d_prepare(void *ctx, MppPacket pkt, HalDecTask *task)
|
|||||||
HEVCContext *s = h265dctx->priv_data;
|
HEVCContext *s = h265dctx->priv_data;
|
||||||
RK_U8 *buf = NULL;
|
RK_U8 *buf = NULL;
|
||||||
void *pos = NULL;
|
void *pos = NULL;
|
||||||
RK_S32 length = 0;
|
size_t length = 0;
|
||||||
s->eos = mpp_packet_get_eos(pkt);
|
s->eos = mpp_packet_get_eos(pkt);
|
||||||
buf = mpp_packet_get_pos(pkt);
|
buf = mpp_packet_get_pos(pkt);
|
||||||
length = mpp_packet_get_size(pkt);
|
length = mpp_packet_get_size(pkt);
|
||||||
|
@@ -1302,7 +1302,7 @@ static int scaling_list_data(HEVCContext *s, ScalingList *sl)
|
|||||||
RK_U32 matrix_id;
|
RK_U32 matrix_id;
|
||||||
|
|
||||||
for (size_id = 0; size_id < 4; size_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]);
|
READ_BIT1(gb, &scaling_list_pred_mode_flag[size_id][matrix_id]);
|
||||||
if (!scaling_list_pred_mode_flag[size_id][matrix_id]) {
|
if (!scaling_list_pred_mode_flag[size_id][matrix_id]) {
|
||||||
RK_U32 delta = 0;
|
RK_U32 delta = 0;
|
||||||
|
8
utils/CMakeLists.txt
Normal file
8
utils/CMakeLists.txt
Normal 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
24
utils/utils.c
Normal 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
30
utils/utils.h
Normal 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__*/
|
||||||
|
|
Reference in New Issue
Block a user