Attachment #145971 for bug #213099

Lines 150-156 Link Here

(-)avidemux_2.4.1-gcc43-inlines/avidemux/ADM_libraries/ADM_utilities/ADM_imageUtils.cpp (-1 / +1 lines)
150	return df;	150	return df;
151	}	151	}
152	#if defined( ARCH_X86 ) \|\| defined (ARCH_X86_64)	152	#if defined( ARCH_X86 ) \|\| defined (ARCH_X86_64)
153	static uint64_t noise64;	153	static uint64_t noise64 asm("noise64");
154	static uint32_t computeDiffMMX(uint8_t s1,uint8_t s2,uint32_t noise,uint32_t l)	154	static uint32_t computeDiffMMX(uint8_t s1,uint8_t s2,uint32_t noise,uint32_t l)
155	{	155	{
156	uint32_t df=0;	156	uint32_t df=0;




#if (defined( ARCH_X86)  || defined(ARCH_X86_64)) && defined(ASM_ILACING)

static uint32_t      ADMVideo_interlaceCount_MMX( uint8_t *src ,uint32_t w, uint32_t h);
static uint8_t *_l_p asm("_l_p") =NULL;
static uint8_t *_l_c asm("_l_c") =NULL;
static uint8_t *_l_n asm("_l_n") =NULL;

static int64_t _l_h asm("_l_h");

static mmx_t _lthresh, _added, _total asm("_total"), _lwrd;
static mmx_t _l255;
static mmx_t _l0;





#include "admmangle.h"

#ifdef ARCH_X86_64
static int64_t _l_w asm("_l_w"), _l_h asm("_l_h");
#else
 static int32_t _l_w asm("_l_w"), _l_h asm("_l_h");
#endif
 static uint8_t *_l_p asm("_l_p"), *_l_c asm("_l_c"), *_l_n asm("_l_n");
 static uint8_t *_l_e asm("_l_e"), *_l_e2 asm("_l_e2");
#define EXPAND(x) (x)+((x)<<16)+((x)<<32) +((x)<<48)
static uint64_t  __attribute__((used)) _mmTHRESH1 asm("_mmTHRESH1") =EXPAND((uint64_t )THRES1);
static uint64_t  __attribute__((used)) full_ones asm("full_ones") =0xFFFFFFFFFFFFFFFFLL;


static void myBlendASM(void);

Lines 45-53 Link Here

(-)avidemux_2.4.1-gcc43-inlines/avidemux/ADM_videoFilter/ADM_vidDeintASM.cpp (-3 / +3 lines)
45		45
46	void myDeintASM(void);	46	void myDeintASM(void);
47		47
48	static int32_t _l_w,_l_h,_l_all;	48	static int32_t _l_w,_l_h, _l_all asm("_l_all");
49	static uint8_t _l_p,_l_c,*_l_n;	49	static uint8_t _l_p asm("_l_p"), _l_c asm("_l_c"), *_l_n asm("_l_n");
50	static uint8_t _l_e,_l_e2;	50	static uint8_t _l_e asm("_l_e"), _l_e2 asm("_l_e2");
51	#define EXPAND(x) (x)+((x)<<16)+((x)<<32) +((x)<<48)	51	#define EXPAND(x) (x)+((x)<<16)+((x)<<32) +((x)<<48)
52	static mmx_t _mmTHRESH1;	52	static mmx_t _mmTHRESH1;
53	static mmx_t _mmTHRESH2;	53	static mmx_t _mmTHRESH2;





#include "ADM_assert.h"

static int16_t scaletab[16] asm("scaletab");
static uint64_t scaletab_MMX[65536] asm("scaletab_MMX");

void initScaleTab( void )
{

//#define ASM_FLUX
BUILD_CREATE(fluxsmooth_create,ADMVideoFlux);

static uint64_t spat_thresh asm("spat_thresh") ASM_CONST =0LL;
static uint64_t temp_thresh asm("temp_thresh") ASM_CONST =0LL;
static uint64_t ASM_CONST _l_counter_init asm("_l_counter_init"),
    _l_indexer asm("_l_indexer"), _l_prev_pels asm("_l_prev_pels"),
    _l_next_pels asm("_l_next_pels");
static long int _l_src_pitch asm("_l_src_pitch") ASM_CONST =0;
static long int _l_dst_pitch asm("_l_dst_pitch") ASM_CONST =0;
static int _l_xmax asm("_l_xmax") ASM_CONST=0;

static int ycnt asm("ycnt");
static uint8_t * _l_currp asm("_l_currp");
static uint8_t * _l_prevp asm("_l_prevp");
static uint8_t * _l_nextp asm("_l_nextp");
static uint8_t * _l_destp asm("_l_destp");


static uint32_t size;

Lines 174-180 Link Here

(-)avidemux_2.4.1-gcc43-inlines/avidemux/ADM_videoFilter/ADM_vidResampleFPS.cpp (-1 / +1 lines)
174	return 1;	174	return 1;
175	}	175	}
176	#if (defined( ARCH_X86) \|\| defined(ARCH_X86_64))	176	#if (defined( ARCH_X86) \|\| defined(ARCH_X86_64))
177	static uint64_t low,high;	177	static uint64_t low asm("low"), high asm("high");
178	static void blendMMX(uint8_t src, uint8_t src2, uint8_t *dst, uint8_t alpha, uint8_t beta,uint32_t count)	178	static void blendMMX(uint8_t src, uint8_t src2, uint8_t *dst, uint8_t alpha, uint8_t beta,uint32_t count)
179	{	179	{
180	uint32_t left=count&3;	180	uint32_t left=count&3;

Return to bug 213099

Lines 40-54 Link Here

(-)avidemux_2.4.1-gcc43-inlines/avidemux/ADM_videoFilter/ADM_vidBlend.cpp (-6 / +6 lines)
40	#include "admmangle.h"	40	#include "admmangle.h"
41		41
42	#ifdef ARCH_X86_64	42	#ifdef ARCH_X86_64
43	static int64_t _l_w,_l_h;	43	static int64_t _l_w asm("_l_w"), _l_h asm("_l_h");
44	#else	44	#else
45	static int32_t _l_w,_l_h;	45	static int32_t _l_w asm("_l_w"), _l_h asm("_l_h");
46	#endif	46	#endif
47	static uint8_t _l_p,_l_c,*_l_n;	47	static uint8_t _l_p asm("_l_p"), _l_c asm("_l_c"), *_l_n asm("_l_n");
48	static uint8_t _l_e,_l_e2;	48	static uint8_t _l_e asm("_l_e"), _l_e2 asm("_l_e2");
49	#define EXPAND(x) (x)+((x)<<16)+((x)<<32) +((x)<<48)	49	#define EXPAND(x) (x)+((x)<<16)+((x)<<32) +((x)<<48)
50	static uint64_t __attribute__((used)) _mmTHRESH1=EXPAND((uint64_t )THRES1);	50	static uint64_t __attribute__((used)) _mmTHRESH1 asm("_mmTHRESH1") =EXPAND((uint64_t )THRES1);
51	static uint64_t __attribute__((used)) full_ones=0xFFFFFFFFFFFFFFFFLL;	51	static uint64_t __attribute__((used)) full_ones asm("full_ones") =0xFFFFFFFFFFFFFFFFLL;
52		52
53		53
54	static void myBlendASM(void);	54	static void myBlendASM(void);

Lines 44-51 Link Here

(-)avidemux_2.4.1-gcc43-inlines/avidemux/ADM_videoFilter/ADM_vidFlux.cpp (-13 / +15 lines)
44		44
45	#include "ADM_assert.h"	45	#include "ADM_assert.h"
46		46
47	static int16_t scaletab[16];	47	static int16_t scaletab[16] asm("scaletab");
48	static uint64_t scaletab_MMX[65536];	48	static uint64_t scaletab_MMX[65536] asm("scaletab_MMX");
49		49
50	void initScaleTab( void )	50	void initScaleTab( void )
51	{	51	{
Lines 72-89 Link Here
72	//#define ASM_FLUX	72	//#define ASM_FLUX
73	BUILD_CREATE(fluxsmooth_create,ADMVideoFlux);	73	BUILD_CREATE(fluxsmooth_create,ADMVideoFlux);
74		74
75	static uint64_t spat_thresh ASM_CONST =0LL;	75	static uint64_t spat_thresh asm("spat_thresh") ASM_CONST =0LL;
76	static uint64_t temp_thresh ASM_CONST =0LL;	76	static uint64_t temp_thresh asm("temp_thresh") ASM_CONST =0LL;
77	static uint64_t ASM_CONST _l_counter_init,_l_indexer,_l_prev_pels,_l_next_pels;	77	static uint64_t ASM_CONST _l_counter_init asm("_l_counter_init"),
78	static long int _l_src_pitch ASM_CONST =0;	78	_l_indexer asm("_l_indexer"), _l_prev_pels asm("_l_prev_pels"),
79	static long int _l_dst_pitch ASM_CONST =0;	79	_l_next_pels asm("_l_next_pels");
80	static int _l_xmax ASM_CONST=0;	80	static long int _l_src_pitch asm("_l_src_pitch") ASM_CONST =0;
		81	static long int _l_dst_pitch asm("_l_dst_pitch") ASM_CONST =0;
		82	static int _l_xmax asm("_l_xmax") ASM_CONST=0;
81		83
82	static int ycnt;	84	static int ycnt asm("ycnt");
83	static uint8_t * _l_currp;	85	static uint8_t * _l_currp asm("_l_currp");
84	static uint8_t * _l_prevp;	86	static uint8_t * _l_prevp asm("_l_prevp");
85	static uint8_t * _l_nextp;	87	static uint8_t * _l_nextp asm("_l_nextp");
86	static uint8_t * _l_destp;	88	static uint8_t * _l_destp asm("_l_destp");
87		89
88		90
89	static uint32_t size;	91	static uint32_t size;