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

[h264d] cancel warning in andorid

Browse Source 
[vp9d]  cancel warining in vs

git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@567 6e48237b-75ef-9749-8fc9-41990f28c85a
This commit is contained in:
DingWei
2016-02-04 04:11:45 +00:00
parent b246211b2d
commit 06333fa16b
5 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mpp/codec/dec/h264/h264d_sei.c
View File

@@ -94,7 +94,7 @@ static MPP_RET interpret_user_data_unregistered_info(RK_U8 *payload, RK_S32 size
goto __FAILED;
}
(void)size;
return ret = MPP_OK;
__FAILED:
return ret;

2
mpp/codec/dec/vp9/vp9d_api.c
View File

@@ -167,7 +167,7 @@ MPP_RET vp9d_prepare(void *ctx, MppPacket pkt, HalDecTask *task)
dts = mpp_packet_get_dts(pkt);
vp9_ctx->eos = mpp_packet_get_eos(pkt);
buf = pos = mpp_packet_get_pos(pkt);
length = mpp_packet_get_length(pkt);
length = (RK_S32)mpp_packet_get_length(pkt);
consumed = vp9d_split_frame(ps, &out_data, &out_size, buf, length);
pos += consumed;

30
mpp/codec/dec/vp9/vp9d_parser.c
View File

@@ -205,8 +205,8 @@ MPP_RET vp9d_get_frame_stream(Vp9CodecContext *ctx, RK_U8 *buf, RK_S32 length)
RK_U8 *data = NULL;
RK_S32 size = 0;
data = mpp_packet_get_data(ctx->pkt);
size = mpp_packet_get_size(ctx->pkt);
data = (RK_U8 *)mpp_packet_get_data(ctx->pkt);
size = (RK_S32)mpp_packet_get_size(ctx->pkt);
if (length > size) {
mpp_free(data);
@@ -350,8 +350,9 @@ static RK_S32 vp9_frame_init(VP9Context *s)
MPP_RET vp9d_parser_init(Vp9CodecContext *vp9_ctx, ParserCfg *init)
{
VP9Context *s = (VP9Context *)vp9_ctx->priv_data;
vp9_ctx->priv_data = (void *)mpp_calloc(VP9Context, 1);
VP9Context *s = vp9_ctx->priv_data;
if (!vp9_ctx->priv_data) {
mpp_err("vp9 codec context malloc fail");
return MPP_ERR_NOMEM;
@@ -635,7 +636,7 @@ static RK_S32 read_colorspace_details(Vp9CodecContext *ctx)
return res;
}
static inline RK_S32 decode012(BitReadCtx_t *gb)
static RK_S32 decode012(BitReadCtx_t *gb)
{
RK_S32 n;
n = mpp_get_bit1(gb);
@@ -827,12 +828,12 @@ static RK_S32 decode_parser_header(Vp9CodecContext *ctx,
}
}
for (i = 0; i < 3; i++) {
vp9d_dbg(VP9D_DBG_REF, "ref get width frame slot %p", s->refs[s->refidx[i]].f);
for (i = 0; i < 3; i++) {
RK_U32 refw = mpp_frame_get_width(s->refs[s->refidx[i]].f);
RK_U32 refh = mpp_frame_get_height(s->refs[s->refidx[i]].f);
RK_S32 reffmt = mpp_frame_get_fmt(s->refs[s->refidx[i]].f);
vp9d_dbg(VP9D_DBG_REF, "ref get width frame slot %p", s->refs[s->refidx[i]].f);
if (reffmt != fmt) {
/* mpp_err("Ref pixfmt (%s) did not match current frame (%s)",
av_get_pix_fmt_name(ref->format),
@@ -1289,7 +1290,7 @@ static RK_S32 decode_parser_header(Vp9CodecContext *ctx,
}
}
return (data2 - data) + size2;
return (RK_S32)((data2 - data) + size2);
}
static void adapt_prob(RK_U8 *p, RK_U32 ct0, RK_U32 ct1,
@@ -1554,17 +1555,18 @@ static void adapt_probs(VP9Context *s)
RK_S32 vp9_parser_frame(Vp9CodecContext *ctx, HalDecTask *task)
{
const RK_U8 *data;
RK_S32 size;
VP9Context *s = ctx->priv_data;
const RK_U8 *data = NULL;
RK_S32 size = 0;
VP9Context *s = (VP9Context *)ctx->priv_data;
RK_S32 res, i, ref;
vp9d_dbg(VP9D_DBG_FUNCTION, "%s", __func__);
vp9d_dbg(VP9D_DBG_FUNCTION, "%s", __FUNCTION__);
task->valid = -1;
#ifdef dump
dec_num++;
#endif
data = mpp_packet_get_pos(ctx->pkt);
size = mpp_packet_get_length(ctx->pkt);
data = (const RK_U8 *)mpp_packet_get_pos(ctx->pkt);
size = (RK_S32)mpp_packet_get_length(ctx->pkt);
s->pts = mpp_packet_get_pts(ctx->pkt);

1
mpp/codec/dec/vp9/vp9d_parser2_syntax.c
View File

@@ -1,3 +1,4 @@
#include <string.h>
#include "vp9d_codec.h"
#include "vp9d_parser.h"
#include "vp9d_syntax.h"

17
mpp/hal/rkdec/vp9d/hal_vp9d_api.c
View File

@@ -312,7 +312,7 @@ MPP_RET hal_vp9d_output_probe(void *hal, void *dxva)
//coeff releated prob 64 x 128 bit
for (i = 0; i < TX_SIZES; i++)
for (j = 0; j < PLANE_TYPES; j++) {
int32_t byte_count = 0;
RK_S32 byte_count = 0;
for (k = 0; k < COEF_BANDS; k++) {
for (m = 0; m < COEFF_CONTEXTS; m++)
for (n = 0; n < UNCONSTRAINED_NODES; n++) {
@@ -330,7 +330,7 @@ MPP_RET hal_vp9d_output_probe(void *hal, void *dxva)
//intra mode prob 80 x 128 bit
for (i = 0; i < INTRA_MODES; i++) { //vp9_kf_y_mode_prob
int32_t byte_count = 0;
RK_S32 byte_count = 0;
for (j = 0; j < INTRA_MODES; j++)
for (k = 0; k < INTRA_MODES - 1; k++) {
mpp_put_bits(&bp, vp9_kf_y_mode_prob[i][j][k], 8);
@@ -392,7 +392,7 @@ MPP_RET hal_vp9d_output_probe(void *hal, void *dxva)
//coeff releated
for (i = 0; i < TX_SIZES; i++)
for (j = 0; j < PLANE_TYPES; j++) {
int32_t byte_count = 0;
RK_S32 byte_count = 0;
for (k = 0; k < COEF_BANDS; k++) {
for (m = 0; m < COEFF_CONTEXTS; m++)
for (n = 0; n < UNCONSTRAINED_NODES; n++) {
@@ -408,7 +408,7 @@ MPP_RET hal_vp9d_output_probe(void *hal, void *dxva)
}
for (i = 0; i < TX_SIZES; i++)
for (j = 0; j < PLANE_TYPES; j++) {
int32_t byte_count = 0;
RK_S32 byte_count = 0;
for (k = 0; k < COEF_BANDS; k++) {
for (m = 0; m < COEFF_CONTEXTS; m++) {
for (n = 0; n < UNCONSTRAINED_NODES; n++) {
@@ -614,7 +614,7 @@ MPP_RET hal_vp9d_gen_regs(void *hal, HalTaskInfo *task)
VP9_REGS *vp9_hw_regs = (VP9_REGS*)reg_cxt->hw_regs;
intraFlag = (!pic_param->frame_type || pic_param->intra_only);
hal_vp9d_output_probe(hal, task->dec.syntax.data);
stream_len = mpp_packet_get_length(task->dec.input_packet);
stream_len = (RK_S32)mpp_packet_get_length(task->dec.input_packet);
memset(reg_cxt->hw_regs, 0, sizeof(VP9_REGS));
vp9_hw_regs->swreg2_sysctrl.sw_dec_mode = 2; //set as vp9 dec
vp9_hw_regs->swreg5_stream_len = ((stream_len + 15) & (~15)) + 0x80;
@@ -817,12 +817,11 @@ MPP_RET hal_vp9d_gen_regs(void *hal, HalTaskInfo *task)
//extern "C"
MPP_RET hal_vp9d_start(void *hal, HalTaskInfo *task)
{
RK_U32 i = 0;
MPP_RET ret = MPP_OK;
hal_vp9_context_t *reg_cxt = (hal_vp9_context_t *)hal;
VP9_REGS *hw_regs = ( VP9_REGS *)reg_cxt->hw_regs;;
RK_U8* p = (RK_U8*)reg_cxt->hw_regs;
RK_U32 i = 0;
VP9_REGS *hw_regs = ( VP9_REGS *)reg_cxt->hw_regs;
RK_U8 *p = (RK_U8*)reg_cxt->hw_regs;
if (hw_regs == NULL) {
mpp_err("hal_vp9d_start hw_regs is NULL");