Skip to content

Commit

Permalink
mark CTB rows with errors as finished in WPP mode
Browse files Browse the repository at this point in the history
  • Loading branch information
farindk committed May 6, 2015
1 parent 0ea1884 commit 750b0da
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
2 changes: 2 additions & 0 deletions libde265/decctx.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1006,6 +1006,8 @@ de265_error decoder_context::decode_slice_unit_WPP(image_unit* imgunit,
// If slice segment consists of several WPP rows, each of them
// has to start at a row.

//printf("does not start at start\n");

err = DE265_WARNING_SLICEHEADER_INVALID;
break;
}
Expand Down
7 changes: 6 additions & 1 deletion libde265/slice.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4145,11 +4145,16 @@ void thread_task_ctb_row::work()
int ctby = tctx->CtbAddrInRS / ctbW;
int myCtbRow = ctby;

//printf("start decoding at row %d\n", ctby);
//printf("start CTB-row decoding at row %d\n", ctby);

if (data->firstSliceSubstream) {
bool success = initialize_CABAC_at_slice_segment_start(tctx);
if (!success) {
// could not decode this row, mark whole row as finished
for (int x=0;x<ctbW;x++) {
img->ctb_progress[myCtbRow*ctbW + x].set_progress(CTB_PROGRESS_PREFILTER);
}

state = Finished;
img->thread_finishes(this);
tctx->sliceunit->finished_threads.increase_progress(1);
Expand Down

0 comments on commit 750b0da

Please sign in to comment.