You've already forked FFmpeg
							
							
				mirror of
				https://github.com/FFmpeg/FFmpeg.git
				synced 2025-10-30 23:18:11 +02:00 
			
		
		
		
	swr/rematrix: move templating parameters to template itself.
This commit is contained in:
		| @@ -22,42 +22,17 @@ | ||||
| #include "libavutil/avassert.h" | ||||
| #include "libavutil/channel_layout.h" | ||||
|  | ||||
| #define ONE (1.0) | ||||
| #define R(x) x | ||||
| #define SAMPLE float | ||||
| #define COEFF float | ||||
| #define INTER float | ||||
| #define RENAME(x) x ## _float | ||||
| #define TEMPLATE_REMATRIX_FLT | ||||
| #include "rematrix_template.c" | ||||
| #undef SAMPLE | ||||
| #undef RENAME | ||||
| #undef R | ||||
| #undef ONE | ||||
| #undef COEFF | ||||
| #undef INTER | ||||
| #undef TEMPLATE_REMATRIX_FLT | ||||
|  | ||||
| #define ONE (1.0) | ||||
| #define R(x) x | ||||
| #define SAMPLE double | ||||
| #define COEFF double | ||||
| #define INTER double | ||||
| #define RENAME(x) x ## _double | ||||
| #define TEMPLATE_REMATRIX_DBL | ||||
| #include "rematrix_template.c" | ||||
| #undef SAMPLE | ||||
| #undef RENAME | ||||
| #undef R | ||||
| #undef ONE | ||||
| #undef COEFF | ||||
| #undef INTER | ||||
| #undef TEMPLATE_REMATRIX_DBL | ||||
|  | ||||
| #define ONE (-32768) | ||||
| #define R(x) (((x) + 16384)>>15) | ||||
| #define SAMPLE int16_t | ||||
| #define COEFF int | ||||
| #define INTER int | ||||
| #define RENAME(x) x ## _s16 | ||||
| #define TEMPLATE_REMATRIX_S16 | ||||
| #include "rematrix_template.c" | ||||
|  | ||||
| #undef TEMPLATE_REMATRIX_S16 | ||||
|  | ||||
| #define FRONT_LEFT             0 | ||||
| #define FRONT_RIGHT            1 | ||||
|   | ||||
| @@ -18,6 +18,29 @@ | ||||
|  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||||
|  */ | ||||
|  | ||||
| #if defined(TEMPLATE_REMATRIX_FLT) | ||||
| #    define ONE (1.0) | ||||
| #    define R(x) x | ||||
| #    define SAMPLE float | ||||
| #    define COEFF float | ||||
| #    define INTER float | ||||
| #    define RENAME(x) x ## _float | ||||
| #elif defined(TEMPLATE_REMATRIX_DBL) | ||||
| #    define ONE (1.0) | ||||
| #    define R(x) x | ||||
| #    define SAMPLE double | ||||
| #    define COEFF double | ||||
| #    define INTER double | ||||
| #    define RENAME(x) x ## _double | ||||
| #elif defined(TEMPLATE_REMATRIX_S16) | ||||
| #    define ONE (-32768) | ||||
| #    define R(x) (((x) + 16384)>>15) | ||||
| #    define SAMPLE int16_t | ||||
| #    define COEFF int | ||||
| #    define INTER int | ||||
| #    define RENAME(x) x ## _s16 | ||||
| #endif | ||||
|  | ||||
| typedef void (RENAME(mix_any_func_type))(SAMPLE **out, const SAMPLE **in1, COEFF *coeffp, integer len); | ||||
|  | ||||
| static void RENAME(sum2)(SAMPLE *out, const SAMPLE *in1, const SAMPLE *in2, COEFF *coeffp, integer index1, integer index2, integer len){ | ||||
| @@ -72,3 +95,10 @@ static RENAME(mix_any_func_type) *RENAME(get_mix_any_func)(SwrContext *s){ | ||||
|  | ||||
|     return NULL; | ||||
| } | ||||
|  | ||||
| #undef ONE | ||||
| #undef R | ||||
| #undef SAMPLE | ||||
| #undef COEFF | ||||
| #undef INTER | ||||
| #undef RENAME | ||||
|   | ||||
		Reference in New Issue
	
	Block a user