diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-11-20 01:13:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-11-20 01:13:59 +0000 |
| commit | 89937f03cd0ef3716933a513a340a42f4d50f2ec (patch) | |
| tree | 039109d5b579d24e0841b14d7848ab962dc5353e /decoder | |
| parent | 5a3dafc3248edcd2df5e2fdafaca61b6acbc44b1 (diff) | |
| parent | fdbbd60bfebe48c0539897d7eeeeb5816e59ce1b (diff) | |
| download | libhevc-89937f03cd0ef3716933a513a340a42f4d50f2ec.tar.gz | |
Merge "Decoder: Signal IVD_RES_CHANGED error for change in crop params" into nyc-dev
Diffstat (limited to 'decoder')
| -rw-r--r-- | decoder/ihevcd_parse_headers.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/decoder/ihevcd_parse_headers.c b/decoder/ihevcd_parse_headers.c index d0c998c..61cd245 100644 --- a/decoder/ihevcd_parse_headers.c +++ b/decoder/ihevcd_parse_headers.c @@ -1599,6 +1599,18 @@ IHEVCD_ERROR_T ihevcd_parse_sps(codec_t *ps_codec) if((0 >= disp_wd) || (0 >= disp_ht)) return IHEVCD_INVALID_PARAMETER; + if((0 != ps_codec->u4_allocate_dynamic_done) && + ((ps_codec->i4_disp_wd != disp_wd) || + (ps_codec->i4_disp_ht != disp_ht))) + { + if(0 == ps_codec->i4_first_pic_done) + { + return IHEVCD_INVALID_PARAMETER; + } + ps_codec->i4_reset_flag = 1; + return (IHEVCD_ERROR_T)IVD_RES_CHANGED; + } + ps_codec->i4_disp_wd = disp_wd; ps_codec->i4_disp_ht = disp_ht; |