diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-05-21 23:36:25 +0000 |
|---|---|---|
| committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-05-21 23:36:25 +0000 |
| commit | e6d4971fdb01bc6ab368ee0afd057beabf868906 (patch) | |
| tree | fe006d5ff4ecf9890b0fa10aecad2af02ee1e2c5 | |
| parent | 2e1c177836cc3abc01dd4f96ad8f8a31b209347e (diff) | |
| parent | 1863b7cc038918298728488d57667d97c5cd505d (diff) | |
| download | android_external_libavc-e6d4971fdb01bc6ab368ee0afd057beabf868906.tar.gz android_external_libavc-e6d4971fdb01bc6ab368ee0afd057beabf868906.tar.bz2 android_external_libavc-e6d4971fdb01bc6ab368ee0afd057beabf868906.zip | |
[automerger] Bug fix for flush without valid frames am: 10c1176f1b am: 54fe392964 am: 6261ed297b am: 051d4fb2dc am: 1863b7cc03
Change-Id: Ibd65acb3016732e53b25cb4aee2ec58076f6340f
| -rw-r--r-- | decoder/ih264d_api.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/decoder/ih264d_api.c b/decoder/ih264d_api.c index 3ace427..094ca8e 100644 --- a/decoder/ih264d_api.c +++ b/decoder/ih264d_api.c @@ -1979,8 +1979,16 @@ WORD32 ih264d_video_decode(iv_obj_t *dec_hdl, void *pv_api_ip, void *pv_api_op) } - if(ps_dec->u1_flushfrm && ps_dec->u1_init_dec_flag) + if(ps_dec->u1_flushfrm) { + if(ps_dec->u1_init_dec_flag == 0) + { + /*Come out of flush mode and return*/ + ps_dec->u1_flushfrm = 0; + return (IV_FAIL); + } + + ih264d_get_next_display_field(ps_dec, ps_dec->ps_out_buffer, &(ps_dec->s_disp_op)); |