diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-07 04:30:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-23 14:53:23 +0100 |
| commit | aa672f5e6af4eaf1166ff95a628f9ac6e6a292b4 (patch) | |
| tree | 8835da3a0cb332bfd42ab13a48b727d2bd1f17b2 /libavcodec/hevc.c | |
| parent | b959e6393e8a234c73621f372397759efed66e7a (diff) | |
| download | android_external_ffmpeg-aa672f5e6af4eaf1166ff95a628f9ac6e6a292b4.tar.gz android_external_ffmpeg-aa672f5e6af4eaf1166ff95a628f9ac6e6a292b4.tar.bz2 android_external_ffmpeg-aa672f5e6af4eaf1166ff95a628f9ac6e6a292b4.zip | |
avcodec/hevc: clear tab_slice_address of ctb on error.
This allows us to detect which areas have failed to decode
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a18f11158216c22f4a69e44f8cbb59b300a7f10c)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevc.c')
| -rw-r--r-- | libavcodec/hevc.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index 6f072b9976..4a0907f3f2 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -1825,8 +1825,11 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) s->filter_slice_edges[ctb_addr_rs] = s->sh.slice_loop_filter_across_slices_enabled_flag; more_data = hls_coding_quadtree(s, x_ctb, y_ctb, s->sps->log2_ctb_size, 0); - if (more_data < 0) + if (more_data < 0) { + s->tab_slice_address[ctb_addr_rs] = -1; return more_data; + } + ctb_addr_ts++; ff_hevc_save_states(s, ctb_addr_ts); @@ -1892,8 +1895,10 @@ static int hls_decode_entry_wpp(AVCodecContext *avctxt, void *input_ctb_row, int hls_sao_param(s, x_ctb >> s->sps->log2_ctb_size, y_ctb >> s->sps->log2_ctb_size); more_data = hls_coding_quadtree(s, x_ctb, y_ctb, s->sps->log2_ctb_size, 0); - if (more_data < 0) + if (more_data < 0) { + s->tab_slice_address[ctb_addr_rs] = -1; return more_data; + } ctb_addr_ts++; |