diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-09-30 18:54:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-30 18:54:22 +0000 |
| commit | 019dd0e764f58c6e202583ceb31a840a03f2e551 (patch) | |
| tree | 481cde0c2c78eff4de329aab45e2062bbd3784ff | |
| parent | acc2465dbc2ce7cab47000a1aa27b81df390d63a (diff) | |
| parent | 91c6464fe5636fa6443d41d161e5f21d1fba1228 (diff) | |
| download | libhevc-019dd0e764f58c6e202583ceb31a840a03f2e551.tar.gz | |
Merge "decoder: Ignore RASL NALs after flush" am: bdda2ed544 am: 91c6464fe5
Original change: https://android-review.googlesource.com/c/platform/external/libhevc/+/1840717
Change-Id: I1cebe9bc13e442ef3d4cb1d6d3da0c5ff18c3efe
| -rw-r--r-- | decoder/ihevcd_api.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/decoder/ihevcd_api.c b/decoder/ihevcd_api.c index 4d094be..d8ee57d 100644 --- a/decoder/ihevcd_api.c +++ b/decoder/ihevcd_api.c @@ -2427,6 +2427,10 @@ WORD32 ihevcd_set_flush_mode(iv_obj_t *ps_codec_obj, /* once it comes out of flush mode */ ps_codec->u4_pic_cnt = 0; ps_codec->u4_disp_cnt = 0; + + /* If the first slice NAL fed to decoder after flush is a CRA NAL, then */ + /* it may have associated RASL nals that need to be skipped */ + ps_codec->i4_cra_as_first_pic = 1; return IV_SUCCESS; |