mirror of
https://github.com/nyanmisaka/mpp.git
synced 2025-10-07 01:52:46 +08:00
[h265h]:all pps data used same pps_id
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@509 6e48237b-75ef-9749-8fc9-41990f28c85a
This commit is contained in:
@@ -1151,6 +1151,7 @@ RK_S32 hal_h265d_output_pps_packet(void *hal, void *dxva)
|
||||
h265d_reg_context_t *reg_cxt = ( h265d_reg_context_t *)hal;
|
||||
h265d_dxva2_picture_context_t *dxva_cxt = (h265d_dxva2_picture_context_t*)dxva;
|
||||
BitputCtx_t bp;
|
||||
pps_packet = mpp_calloc(RK_U64, fifo_len + 1);
|
||||
|
||||
_count = 0;
|
||||
if (NULL == reg_cxt || dxva_cxt == NULL) {
|
||||
@@ -1166,9 +1167,7 @@ RK_S32 hal_h265d_output_pps_packet(void *hal, void *dxva)
|
||||
return MPP_ERR_NOMEM;
|
||||
}
|
||||
memset(pps_ptr, 0, 80 * 64);
|
||||
pps_packet = (RK_U64 *)(pps_ptr + dxva_cxt->pp.pps_id * 80);
|
||||
#else
|
||||
pps_packet = mpp_malloc(RK_U64, fifo_len);
|
||||
// pps_packet = (RK_U64 *)(pps_ptr + dxva_cxt->pp.pps_id * 80);
|
||||
#endif
|
||||
|
||||
|
||||
@@ -1367,16 +1366,18 @@ RK_S32 hal_h265d_output_pps_packet(void *hal, void *dxva)
|
||||
mpp_align(&bp, 64);
|
||||
}
|
||||
|
||||
#ifdef ANDROID
|
||||
for(i = 0; i < 64; i++){
|
||||
memcpy(pps_ptr+i*80,pps_packet,80);
|
||||
}
|
||||
#ifdef dump
|
||||
fwrite(pps_ptr, 1, 80 * 64, fp);
|
||||
fflush(fp);
|
||||
#endif
|
||||
#ifndef ANDROID
|
||||
#endif
|
||||
if (pps_packet != NULL) {
|
||||
mpp_free(pps_packet);
|
||||
}
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user