diff options
| author | Hamsalekha S <hamsalekha.s@ittiam.com> | 2017-06-06 22:58:00 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-06 22:58:00 +0000 |
| commit | 4bbbcfe76d8c63fcb4dd66ffe11f1cc9c66832b9 (patch) | |
| tree | dde808c06c40204c925156f1f5c691ce453bd4b6 | |
| parent | a0cec244297232b501da84563ca896133aec9954 (diff) | |
| parent | 6b3d20c0327c7680fbfb71c690392db921c964ac (diff) | |
| download | android_external_libavc-4bbbcfe76d8c63fcb4dd66ffe11f1cc9c66832b9.tar.gz android_external_libavc-4bbbcfe76d8c63fcb4dd66ffe11f1cc9c66832b9.tar.bz2 android_external_libavc-4bbbcfe76d8c63fcb4dd66ffe11f1cc9c66832b9.zip | |
Merge "Decoder: Fix in the case of MMCO 6" into mnc-dev
am: 6b3d20c032
Change-Id: I7cc789a4b548e19077559799096e927d44ffdbb0
| -rw-r--r-- | decoder/ih264d_dpb_mgr.c | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/decoder/ih264d_dpb_mgr.c b/decoder/ih264d_dpb_mgr.c index e02cc90..0a61ffd 100644 --- a/decoder/ih264d_dpb_mgr.c +++ b/decoder/ih264d_dpb_mgr.c @@ -1289,11 +1289,22 @@ WORD32 ih264d_do_mmco_buffer(dpb_commands_t *ps_dpb_cmds, u4_cur_pic_num); if(ret != OK) return ret; - ret = ih264d_delete_st_node_or_make_lt(ps_dpb_mgr, - u4_cur_pic_num, u4_lt_idx, - u1_fld_pic_flag); - if(ret != OK) - return ret; + + if(ps_dpb_mgr->u1_num_st_ref_bufs > 0) + + { + ret = ih264d_delete_st_node_or_make_lt(ps_dpb_mgr, + u4_cur_pic_num, + u4_lt_idx, + u1_fld_pic_flag); + if(ret != OK) + return ret; + } + else + { + return ERROR_DBP_MANAGER_T; + } + u1_marked_lt = 1; break; } |