package/mpp
1
0
Fork 0
mirror of https://github.com/nyanmisaka/mpp.git synced 2025-09-27 05:25:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[h265_syntx]:fix current dpbs has more ref then rps need cause decoder error

Browse Source 
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@530 6e48237b-75ef-9749-8fc9-41990f28c85a
This commit is contained in:
ChenSiyong
2016-01-19 06:43:19 +00:00
parent e4d3871dbf
commit 4cf7c60c8f
1 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
mpp/codec/dec/h265/h265d_parser2_syntax.c
View File

@@ -58,6 +58,8 @@ static void fill_picture_parameters(const HEVCContext *h,
const HEVCSPS *sps = (HEVCSPS *)h->sps_list[pps->sps_id];
RK_U32 i, j;
RK_U32 rps_used[16];
RK_U32 nb_rps_used;
memset(pp, 0, sizeof(*pp));
@@ -158,13 +160,31 @@ static void fill_picture_parameters(const HEVCContext *h,
pp->log2_parallel_merge_level_minus2 = pps->log2_parallel_merge_level - 2;
pp->CurrPicOrderCntVal = h->poc;
nb_rps_used = 0;
for (i = 0; i < NB_RPS_TYPE; i++) {
for (j = 0; j < h->rps[i].nb_refs; j++) {
if ((i == ST_FOLL) || (i == LT_FOLL)) {
;
} else {
rps_used[nb_rps_used++] = h->rps[i].list[j];
}
}
}
// mpp_err("fill RefPicList from the DPB");
// fill RefPicList from the DPB
for (i = 0, j = 0; i < MPP_ARRAY_ELEMS(pp->RefPicList); i++) {
for (i = 0, j = 0; i < MPP_ARRAY_ELEMS(pp->RefPicList); i++)
{
const HEVCFrame *frame = NULL;
while (!frame && j < MPP_ARRAY_ELEMS(h->DPB)) {
if (&h->DPB[j] != current_picture && (h->DPB[j].flags & (HEVC_FRAME_FLAG_LONG_REF | HEVC_FRAME_FLAG_SHORT_REF)))
frame = &h->DPB[j];
if (&h->DPB[j] != current_picture &&
(h->DPB[j].flags & (HEVC_FRAME_FLAG_LONG_REF | HEVC_FRAME_FLAG_SHORT_REF))) {
RK_S32 k = 0;
for (k = 0; k < nb_rps_used; k++) { /*skip fill RefPicList no used in rps*/
if (rps_used[k] == h->DPB[j].poc) {
frame = &h->DPB[j];
}
}
}
j++;
}