diff options
| author | Ritu Baldwa <ritu.baldwa@ittiam.com> | 2018-03-09 16:39:07 +0530 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-08-10 20:24:39 +0000 |
| commit | cbd7d1ea4ec8a102ac065680aadb68ba33da72f1 (patch) | |
| tree | 8596881a314c56dd710f792956e2639a175295de | |
| parent | d66694071ea1f7241823739a78c396149cfab7cd (diff) | |
| download | android_external_libavc-cbd7d1ea4ec8a102ac065680aadb68ba33da72f1.tar.gz android_external_libavc-cbd7d1ea4ec8a102ac065680aadb68ba33da72f1.tar.bz2 android_external_libavc-cbd7d1ea4ec8a102ac065680aadb68ba33da72f1.zip | |
Decoder: Modify setting short term reference field flag
Do not mark bottom field as short term in case of error.
Bug: 73553038
Bug: 73552574
Bug: 73552999
Test: poc before/after
Change-Id: I8576861af36996a361a81f48ba9b251f0ae4e660
(cherry picked from commit 47cc04b40c94b14841d27eb3ac0b01c3f1739180)
| -rw-r--r-- | decoder/ih264d_dpb_mgr.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/decoder/ih264d_dpb_mgr.c b/decoder/ih264d_dpb_mgr.c index 525adef..b7ee498 100644 --- a/decoder/ih264d_dpb_mgr.c +++ b/decoder/ih264d_dpb_mgr.c @@ -375,9 +375,6 @@ WORD32 ih264d_insert_st_node(dpb_manager_t *ps_dpb_mgr, if((ps_dpb_info[i].ps_pic_buf == ps_pic_buf) && ps_dpb_info[i].u1_used_as_ref) { - /* Can occur only for field bottom pictures */ - ps_dpb_info[i].s_bot_field.u1_reference_info = IS_SHORT_TERM; - /*signal an error in the case of frame pic*/ if(ps_dpb_info[i].ps_pic_buf->u1_pic_type == FRM_PIC) { @@ -385,6 +382,8 @@ WORD32 ih264d_insert_st_node(dpb_manager_t *ps_dpb_mgr, } else { + /* Can occur only for field bottom pictures */ + ps_dpb_info[i].s_bot_field.u1_reference_info = IS_SHORT_TERM; return OK; } } |