diff options
| author | Anton Khirnov <anton@khirnov.net> | 2016-03-23 09:54:43 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2016-03-28 09:55:16 +0200 |
| commit | 8eecae77ff6e2923de57dd883421d24fd53ca61f (patch) | |
| tree | bf329684a52ed16f678e96c76f549f4d5013bd8c | |
| parent | 527bf5f7c6890664b0f1dccd42397f4d204659fe (diff) | |
| download | ffmpeg-8eecae77ff6e2923de57dd883421d24fd53ca61f.tar.gz | |
svq3: move edge_emu_buffer to the SVQ3Context
| -rw-r--r-- | libavcodec/svq3.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index 3785cca230..5564d295a8 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -103,6 +103,8 @@ typedef struct SVQ3Context { unsigned int top_samples_available; unsigned int topright_samples_available; unsigned int left_samples_available; + + uint8_t *edge_emu_buffer; } SVQ3Context; #define FULLPEL_MODE 1 @@ -336,11 +338,11 @@ static inline void svq3_mc_dir_part(SVQ3Context *s, src = pic->f->data[0] + mx + my * sl->linesize; if (emu) { - s->vdsp.emulated_edge_mc(sl->edge_emu_buffer, src, + s->vdsp.emulated_edge_mc(s->edge_emu_buffer, src, sl->linesize, sl->linesize, width + 1, height + 1, mx, my, s->h_edge_pos, s->v_edge_pos); - src = sl->edge_emu_buffer; + src = s->edge_emu_buffer; } if (thirdpel) (avg ? s->tdsp.avg_tpel_pixels_tab @@ -363,12 +365,12 @@ static inline void svq3_mc_dir_part(SVQ3Context *s, src = pic->f->data[i] + mx + my * sl->uvlinesize; if (emu) { - s->vdsp.emulated_edge_mc(sl->edge_emu_buffer, src, + s->vdsp.emulated_edge_mc(s->edge_emu_buffer, src, sl->uvlinesize, sl->uvlinesize, width + 1, height + 1, mx, my, (s->h_edge_pos >> 1), s->v_edge_pos >> 1); - src = sl->edge_emu_buffer; + src = s->edge_emu_buffer; } if (thirdpel) (avg ? s->tdsp.avg_tpel_pixels_tab @@ -1264,9 +1266,9 @@ static int get_buffer(AVCodecContext *avctx, H264Picture *pic) if (ret < 0) goto fail; - if (!sl->edge_emu_buffer) { - sl->edge_emu_buffer = av_mallocz(pic->f->linesize[0] * 17); - if (!sl->edge_emu_buffer) + if (!s->edge_emu_buffer) { + s->edge_emu_buffer = av_mallocz(pic->f->linesize[0] * 17); + if (!s->edge_emu_buffer) return AVERROR(ENOMEM); } @@ -1491,6 +1493,7 @@ static av_cold int svq3_decode_end(AVCodecContext *avctx) av_freep(&s->last_pic); av_freep(&s->slice_buf); av_freep(&s->intra4x4_pred_mode); + av_freep(&s->edge_emu_buffer); memset(&h->cur_pic, 0, sizeof(h->cur_pic)); |