highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

snow: use VideoDSPContext

Browse Source 
It was left over from the initial conversion.
This commit is contained in:
Luca Barbato 2012-12-29 18:05:49 +01:00
parent 30a7648730
commit d615da60c1
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/snow.c
View File

@ -349,7 +349,7 @@ void ff_snow_pred_block(SnowContext *s, uint8_t *dst, uint8_t *tmp, int stride,
src += sx + sy*stride; src += sx + sy*stride;
if( (unsigned)sx >= w - b_w - (HTAPS_MAX-2) if( (unsigned)sx >= w - b_w - (HTAPS_MAX-2)
|| (unsigned)sy >= h - b_h - (HTAPS_MAX-2)){ || (unsigned)sy >= h - b_h - (HTAPS_MAX-2)){
s->dsp.emulated_edge_mc(tmp + MB_SIZE, src, stride, b_w+HTAPS_MAX-1, b_h+HTAPS_MAX-1, sx, sy, w, h); s->vdsp.emulated_edge_mc(tmp + MB_SIZE, src, stride, b_w+HTAPS_MAX-1, b_h+HTAPS_MAX-1, sx, sy, w, h);
src= tmp + MB_SIZE; src= tmp + MB_SIZE;
} }
// assert(b_w == b_h || 2*b_w == b_h || b_w == 2*b_h); // assert(b_w == b_h || 2*b_w == b_h || b_w == 2*b_h);
@ -402,6 +402,7 @@ av_cold int ff_snow_common_init(AVCodecContext *avctx){
s->max_ref_frames=1; //just make sure its not an invalid value in case of no initial keyframe s->max_ref_frames=1; //just make sure its not an invalid value in case of no initial keyframe
ff_dsputil_init(&s->dsp, avctx); ff_dsputil_init(&s->dsp, avctx);
ff_videodsp_init(&s->vdsp, 8);
ff_dwt_init(&s->dwt); ff_dwt_init(&s->dwt);
#define mcf(dx,dy)\ #define mcf(dx,dy)\

1
libavcodec/snow.h
View File

@ -108,6 +108,7 @@ typedef struct SnowContext{
AVCodecContext *avctx; AVCodecContext *avctx;
RangeCoder c; RangeCoder c;
DSPContext dsp; DSPContext dsp;
VideoDSPContext vdsp;
DWTContext dwt; DWTContext dwt;
AVFrame new_picture; AVFrame new_picture;
AVFrame input_picture; ///< new_picture with the internal linesizes AVFrame input_picture; ///< new_picture with the internal linesizes