diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-09-30 19:06:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-30 19:06:24 +0000 |
| commit | 5e6d90a9916e2167191430fd17b7b2df22105bd9 (patch) | |
| tree | 481cde0c2c78eff4de329aab45e2062bbd3784ff | |
| parent | fed0676575b64ffb0469b8d743f68dfdb645e95f (diff) | |
| parent | 019dd0e764f58c6e202583ceb31a840a03f2e551 (diff) | |
| download | libhevc-5e6d90a9916e2167191430fd17b7b2df22105bd9.tar.gz | |
Merge "decoder: Ignore RASL NALs after flush" am: bdda2ed544 am: 91c6464fe5 am: 019dd0e764
Original change: https://android-review.googlesource.com/c/platform/external/libhevc/+/1840717
Change-Id: Id26c5eca91b4ac9c3d64cf9c0539e9056a5d9ad1
| -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; |