generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/error_resilience: fix the case when MVs are not available

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-03-17 05:22:20 +01:00
parent 8ef9dcf1d7
commit 4f22e39e65
2 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
libavcodec/error_resilience.c
View File

@@ -904,9 +904,26 @@ void ff_er_frame_end(ERContext *s)
} }
if (!s->cur_pic.motion_val[0] || !s->cur_pic.ref_index[0]) { if (!s->cur_pic.motion_val[0] || !s->cur_pic.ref_index[0]) {
av_log(s->avctx, AV_LOG_ERROR, "MVs not available, ER not possible.\n"); av_log(s->avctx, AV_LOG_ERROR, "Warning MVs not available\n");
for (i = 0; i < 2; i++) {
s->ref_index_buf[i] = av_buffer_allocz(s->mb_stride * s->mb_height * 4 * sizeof(uint8_t));
s->motion_val_buf[i] = av_buffer_allocz((size + 4) * 2 * sizeof(uint16_t));
if (!s->ref_index_buf[i] || !s->motion_val_buf[i])
break;
s->cur_pic.ref_index[i] = s->ref_index_buf[i]->data;
s->cur_pic.motion_val[i] = (int16_t (*)[2])s->motion_val_buf[i]->data + 4;
}
if (i < 2) {
for (i = 0; i < 2; i++) {
av_buffer_unref(&s->ref_index_buf[i]);
av_buffer_unref(&s->motion_val_buf[i]);
s->cur_pic.ref_index[i] = NULL;
s->cur_pic.motion_val[i] = NULL;
}
return; return;
} }
}
if (s->avctx->debug & FF_DEBUG_ER) { if (s->avctx->debug & FF_DEBUG_ER) {
for (mb_y = 0; mb_y < s->mb_height; mb_y++) { for (mb_y = 0; mb_y < s->mb_height; mb_y++) {
@@ -1279,6 +1296,13 @@ ec_clean:
s->mbintra_table[mb_xy] = 1; s->mbintra_table[mb_xy] = 1;
} }
for (i = 0; i < 2; i++) {
av_buffer_unref(&s->ref_index_buf[i]);
av_buffer_unref(&s->motion_val_buf[i]);
s->cur_pic.ref_index[i] = NULL;
s->cur_pic.motion_val[i] = NULL;
}
memset(&s->cur_pic, 0, sizeof(ERPicture)); memset(&s->cur_pic, 0, sizeof(ERPicture));
memset(&s->last_pic, 0, sizeof(ERPicture)); memset(&s->last_pic, 0, sizeof(ERPicture));
memset(&s->next_pic, 0, sizeof(ERPicture)); memset(&s->next_pic, 0, sizeof(ERPicture));

3
libavcodec/error_resilience.h
View File

@@ -72,6 +72,9 @@ typedef struct ERContext {
ERPicture last_pic; ERPicture last_pic;
ERPicture next_pic; ERPicture next_pic;
AVBufferRef *ref_index_buf[2];
AVBufferRef *motion_val_buf[2];
uint16_t pp_time; uint16_t pp_time;
uint16_t pb_time; uint16_t pb_time;
int quarter_sample; int quarter_sample;