har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/error_resilience: Avoid overhead of AVBuffer API

Browse Source 
These buffers are not shared in any way.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2022-08-04 18:26:56 +02:00
parent fc13803323
commit 9d0c71a81c
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/error_resilience.c
View File

@ -946,17 +946,17 @@ void ff_er_frame_end(ERContext *s)
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])
s->ref_index[i] = av_calloc(s->mb_stride * s->mb_height, 4 * sizeof(uint8_t));
s->motion_val_base[i] = av_calloc(size + 4, 2 * sizeof(uint16_t));
if (!s->ref_index[i] || !s->motion_val_base[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;
s->cur_pic.ref_index[i] = s->ref_index[i];
s->cur_pic.motion_val[i] = s->motion_val_base[i] + 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]);
av_freep(&s->ref_index[i]);
av_freep(&s->motion_val_base[i]);
s->cur_pic.ref_index[i] = NULL;
s->cur_pic.motion_val[i] = NULL;
}
@ -1343,8 +1343,8 @@ void ff_er_frame_end(ERContext *s)
}
for (i = 0; i < 2; i++) {
av_buffer_unref(&s->ref_index_buf[i]);
av_buffer_unref(&s->motion_val_buf[i]);
av_freep(&s->ref_index[i]);
av_freep(&s->motion_val_base[i]);
s->cur_pic.ref_index[i] = NULL;
s->cur_pic.motion_val[i] = NULL;
}

4
libavcodec/error_resilience.h
View File

@ -75,8 +75,8 @@ typedef struct ERContext {
ERPicture last_pic;
ERPicture next_pic;
AVBufferRef *ref_index_buf[2];
AVBufferRef *motion_val_buf[2];
int8_t *ref_index[2];
int16_t (*motion_val_base[2])[2];
uint16_t pp_time;
uint16_t pb_time;