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