MrBesen
/
ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/snow: Move dsp helper functions to snow_dwt.h 

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2023-09-30 16:27:46 +02:00
parent 155e7e126b
commit f52b4a6e69
3 changed files with 40 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
libavcodec/snow.h
View File

@ -176,44 +176,6 @@ extern const uint8_t * const ff_obmc_tab[4];
extern const uint8_t ff_qexp[QROOT];
extern int ff_scale_mv_ref[MAX_REF_FRAMES][MAX_REF_FRAMES];
/* C bits used by mmx/sse2/altivec */
static av_always_inline void snow_interleave_line_header(int * i, int width, IDWTELEM * low, IDWTELEM * high){
(*i) = (width) - 2;
if (width & 1){
low[(*i)+1] = low[((*i)+1)>>1];
(*i)--;
}
}
static av_always_inline void snow_interleave_line_footer(int * i, IDWTELEM * low, IDWTELEM * high){
for (; (*i)>=0; (*i)-=2){
low[(*i)+1] = high[(*i)>>1];
low[*i] = low[(*i)>>1];
}
}
static av_always_inline void snow_horizontal_compose_lift_lead_out(int i, IDWTELEM * dst, IDWTELEM * src, IDWTELEM * ref, int width, int w, int lift_high, int mul, int add, int shift){
for(; i<w; i++){
dst[i] = src[i] - ((mul * (ref[i] + ref[i + 1]) + add) >> shift);
}
if((width^lift_high)&1){
dst[w] = src[w] - ((mul * 2 * ref[w] + add) >> shift);
}
}
static av_always_inline void snow_horizontal_compose_liftS_lead_out(int i, IDWTELEM * dst, IDWTELEM * src, IDWTELEM * ref, int width, int w){
for(; i<w; i++){
dst[i] = src[i] + ((ref[i] + ref[(i+1)]+W_BO + 4 * src[i]) >> W_BS);
}
if(width&1){
dst[w] = src[w] + ((2 * ref[w] + W_BO + 4 * src[w]) >> W_BS);
}
}
/* common code */
int ff_snow_common_init(AVCodecContext *avctx);

40
libavcodec/snow_dwt.h
View File

@ -24,6 +24,8 @@
#include <stddef.h>
#include <stdint.h>
#include "libavutil/attributes.h"
struct MpegEncContext;
typedef int DWTELEM;
@ -91,6 +93,44 @@ typedef struct SnowDWTContext {
: ff_slice_buffer_load_line((slice_buf), \
(line_num)))
/* C bits used by mmx/sse2/altivec */
static av_always_inline void snow_interleave_line_header(int *i, int width, IDWTELEM *low, IDWTELEM *high)
{
*i = width - 2;
if (width & 1) {
low[*i + 1] = low[(*i + 1)>>1];
(*i)--;
}
}
static av_always_inline void snow_interleave_line_footer(int *i, IDWTELEM *low, const IDWTELEM *high)
{
for (; *i >= 0; *i -= 2) {
low[*i + 1] = high[*i >> 1];
low[*i] = low[*i >> 1];
}
}
static av_always_inline void snow_horizontal_compose_lift_lead_out(int i, IDWTELEM *dst, const IDWTELEM *src, const IDWTELEM *ref, int width, int w, int lift_high, int mul, int add, int shift)
{
for (; i < w; i++)
dst[i] = src[i] - ((mul * (ref[i] + ref[i + 1]) + add) >> shift);
if ((width ^ lift_high) & 1)
dst[w] = src[w] - ((mul * 2 * ref[w] + add) >> shift);
}
static av_always_inline void snow_horizontal_compose_liftS_lead_out(int i, IDWTELEM *dst, const IDWTELEM *src, const IDWTELEM *ref, int width, int w)
{
for (; i < w; i++)
dst[i] = src[i] + ((ref[i] + ref[(i+1)]+W_BO + 4 * src[i]) >> W_BS);
if (width & 1)
dst[w] = src[w] + ((2 * ref[w] + W_BO + 4 * src[w]) >> W_BS);
}
int ff_slice_buffer_init(slice_buffer *buf, int line_count,
int max_allocated_lines, int line_width,
IDWTELEM *base_buffer);

1
libavcodec/x86/snowdsp.c
View File

@ -24,7 +24,6 @@
#include "libavutil/attributes.h"
#include "libavutil/cpu.h"
#include "libavutil/x86/asm.h"
#include "libavcodec/snow.h"
#include "libavcodec/snow_dwt.h"
#if HAVE_INLINE_ASM