mirror of
				https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
				synced 2025-11-03 09:01:50 -05:00 
			
		
		
		
	mix: Use table for calc_stream_columes()
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
This commit is contained in:
		
							parent
							
								
									1335914e72
								
							
						
					
					
						commit
						c90868f2e0
					
				
					 1 changed files with 20 additions and 26 deletions
				
			
		| 
						 | 
					@ -104,6 +104,24 @@ static void calc_linear_float_stream_volumes(pa_mix_info streams[], unsigned nst
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					typedef void (*pa_calc_stream_volumes_func_t) (pa_mix_info streams[], unsigned nstreams, const pa_cvolume *volume, const pa_sample_spec *spec);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					static const pa_calc_stream_volumes_func_t calc_stream_volumes_table[] = {
 | 
				
			||||||
 | 
					  [PA_SAMPLE_U8]        = (pa_calc_stream_volumes_func_t) calc_linear_integer_stream_volumes,
 | 
				
			||||||
 | 
					  [PA_SAMPLE_ALAW]      = (pa_calc_stream_volumes_func_t) calc_linear_integer_stream_volumes,
 | 
				
			||||||
 | 
					  [PA_SAMPLE_ULAW]      = (pa_calc_stream_volumes_func_t) calc_linear_integer_stream_volumes,
 | 
				
			||||||
 | 
					  [PA_SAMPLE_S16LE]     = (pa_calc_stream_volumes_func_t) calc_linear_integer_stream_volumes,
 | 
				
			||||||
 | 
					  [PA_SAMPLE_S16BE]     = (pa_calc_stream_volumes_func_t) calc_linear_integer_stream_volumes,
 | 
				
			||||||
 | 
					  [PA_SAMPLE_FLOAT32LE] = (pa_calc_stream_volumes_func_t) calc_linear_float_stream_volumes,
 | 
				
			||||||
 | 
					  [PA_SAMPLE_FLOAT32BE] = (pa_calc_stream_volumes_func_t) calc_linear_float_stream_volumes,
 | 
				
			||||||
 | 
					  [PA_SAMPLE_S32LE]     = (pa_calc_stream_volumes_func_t) calc_linear_integer_stream_volumes,
 | 
				
			||||||
 | 
					  [PA_SAMPLE_S32BE]     = (pa_calc_stream_volumes_func_t) calc_linear_integer_stream_volumes,
 | 
				
			||||||
 | 
					  [PA_SAMPLE_S24LE]     = (pa_calc_stream_volumes_func_t) calc_linear_integer_stream_volumes,
 | 
				
			||||||
 | 
					  [PA_SAMPLE_S24BE]     = (pa_calc_stream_volumes_func_t) calc_linear_integer_stream_volumes,
 | 
				
			||||||
 | 
					  [PA_SAMPLE_S24_32LE]  = (pa_calc_stream_volumes_func_t) calc_linear_integer_stream_volumes,
 | 
				
			||||||
 | 
					  [PA_SAMPLE_S24_32BE]  = (pa_calc_stream_volumes_func_t) calc_linear_integer_stream_volumes
 | 
				
			||||||
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
size_t pa_mix(
 | 
					size_t pa_mix(
 | 
				
			||||||
        pa_mix_info streams[],
 | 
					        pa_mix_info streams[],
 | 
				
			||||||
        unsigned nstreams,
 | 
					        unsigned nstreams,
 | 
				
			||||||
| 
						 | 
					@ -140,13 +158,13 @@ size_t pa_mix(
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    end = (uint8_t*) data + length;
 | 
					    end = (uint8_t*) data + length;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    calc_stream_volumes_table[spec->format](streams, nstreams, volume, spec);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    switch (spec->format) {
 | 
					    switch (spec->format) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        case PA_SAMPLE_S16NE:{
 | 
					        case PA_SAMPLE_S16NE:{
 | 
				
			||||||
            unsigned channel = 0;
 | 
					            unsigned channel = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            calc_linear_integer_stream_volumes(streams, nstreams, volume, spec);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
            while (data < end) {
 | 
					            while (data < end) {
 | 
				
			||||||
                int32_t sum = 0;
 | 
					                int32_t sum = 0;
 | 
				
			||||||
                unsigned i;
 | 
					                unsigned i;
 | 
				
			||||||
| 
						 | 
					@ -188,8 +206,6 @@ size_t pa_mix(
 | 
				
			||||||
        case PA_SAMPLE_S16RE:{
 | 
					        case PA_SAMPLE_S16RE:{
 | 
				
			||||||
            unsigned channel = 0;
 | 
					            unsigned channel = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            calc_linear_integer_stream_volumes(streams, nstreams, volume, spec);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
            while (data < end) {
 | 
					            while (data < end) {
 | 
				
			||||||
                int32_t sum = 0;
 | 
					                int32_t sum = 0;
 | 
				
			||||||
                unsigned i;
 | 
					                unsigned i;
 | 
				
			||||||
| 
						 | 
					@ -225,8 +241,6 @@ size_t pa_mix(
 | 
				
			||||||
        case PA_SAMPLE_S32NE:{
 | 
					        case PA_SAMPLE_S32NE:{
 | 
				
			||||||
            unsigned channel = 0;
 | 
					            unsigned channel = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            calc_linear_integer_stream_volumes(streams, nstreams, volume, spec);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
            while (data < end) {
 | 
					            while (data < end) {
 | 
				
			||||||
                int64_t sum = 0;
 | 
					                int64_t sum = 0;
 | 
				
			||||||
                unsigned i;
 | 
					                unsigned i;
 | 
				
			||||||
| 
						 | 
					@ -260,8 +274,6 @@ size_t pa_mix(
 | 
				
			||||||
        case PA_SAMPLE_S32RE:{
 | 
					        case PA_SAMPLE_S32RE:{
 | 
				
			||||||
            unsigned channel = 0;
 | 
					            unsigned channel = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            calc_linear_integer_stream_volumes(streams, nstreams, volume, spec);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
            while (data < end) {
 | 
					            while (data < end) {
 | 
				
			||||||
                int64_t sum = 0;
 | 
					                int64_t sum = 0;
 | 
				
			||||||
                unsigned i;
 | 
					                unsigned i;
 | 
				
			||||||
| 
						 | 
					@ -295,8 +307,6 @@ size_t pa_mix(
 | 
				
			||||||
        case PA_SAMPLE_S24NE: {
 | 
					        case PA_SAMPLE_S24NE: {
 | 
				
			||||||
            unsigned channel = 0;
 | 
					            unsigned channel = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            calc_linear_integer_stream_volumes(streams, nstreams, volume, spec);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
            while (data < end) {
 | 
					            while (data < end) {
 | 
				
			||||||
                int64_t sum = 0;
 | 
					                int64_t sum = 0;
 | 
				
			||||||
                unsigned i;
 | 
					                unsigned i;
 | 
				
			||||||
| 
						 | 
					@ -330,8 +340,6 @@ size_t pa_mix(
 | 
				
			||||||
        case PA_SAMPLE_S24RE: {
 | 
					        case PA_SAMPLE_S24RE: {
 | 
				
			||||||
            unsigned channel = 0;
 | 
					            unsigned channel = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            calc_linear_integer_stream_volumes(streams, nstreams, volume, spec);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
            while (data < end) {
 | 
					            while (data < end) {
 | 
				
			||||||
                int64_t sum = 0;
 | 
					                int64_t sum = 0;
 | 
				
			||||||
                unsigned i;
 | 
					                unsigned i;
 | 
				
			||||||
| 
						 | 
					@ -365,8 +373,6 @@ size_t pa_mix(
 | 
				
			||||||
        case PA_SAMPLE_S24_32NE: {
 | 
					        case PA_SAMPLE_S24_32NE: {
 | 
				
			||||||
            unsigned channel = 0;
 | 
					            unsigned channel = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            calc_linear_integer_stream_volumes(streams, nstreams, volume, spec);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
            while (data < end) {
 | 
					            while (data < end) {
 | 
				
			||||||
                int64_t sum = 0;
 | 
					                int64_t sum = 0;
 | 
				
			||||||
                unsigned i;
 | 
					                unsigned i;
 | 
				
			||||||
| 
						 | 
					@ -400,8 +406,6 @@ size_t pa_mix(
 | 
				
			||||||
        case PA_SAMPLE_S24_32RE: {
 | 
					        case PA_SAMPLE_S24_32RE: {
 | 
				
			||||||
            unsigned channel = 0;
 | 
					            unsigned channel = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            calc_linear_integer_stream_volumes(streams, nstreams, volume, spec);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
            while (data < end) {
 | 
					            while (data < end) {
 | 
				
			||||||
                int64_t sum = 0;
 | 
					                int64_t sum = 0;
 | 
				
			||||||
                unsigned i;
 | 
					                unsigned i;
 | 
				
			||||||
| 
						 | 
					@ -435,8 +439,6 @@ size_t pa_mix(
 | 
				
			||||||
        case PA_SAMPLE_U8: {
 | 
					        case PA_SAMPLE_U8: {
 | 
				
			||||||
            unsigned channel = 0;
 | 
					            unsigned channel = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            calc_linear_integer_stream_volumes(streams, nstreams, volume, spec);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
            while (data < end) {
 | 
					            while (data < end) {
 | 
				
			||||||
                int32_t sum = 0;
 | 
					                int32_t sum = 0;
 | 
				
			||||||
                unsigned i;
 | 
					                unsigned i;
 | 
				
			||||||
| 
						 | 
					@ -469,8 +471,6 @@ size_t pa_mix(
 | 
				
			||||||
        case PA_SAMPLE_ULAW: {
 | 
					        case PA_SAMPLE_ULAW: {
 | 
				
			||||||
            unsigned channel = 0;
 | 
					            unsigned channel = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            calc_linear_integer_stream_volumes(streams, nstreams, volume, spec);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
            while (data < end) {
 | 
					            while (data < end) {
 | 
				
			||||||
                int32_t sum = 0;
 | 
					                int32_t sum = 0;
 | 
				
			||||||
                unsigned i;
 | 
					                unsigned i;
 | 
				
			||||||
| 
						 | 
					@ -506,8 +506,6 @@ size_t pa_mix(
 | 
				
			||||||
        case PA_SAMPLE_ALAW: {
 | 
					        case PA_SAMPLE_ALAW: {
 | 
				
			||||||
            unsigned channel = 0;
 | 
					            unsigned channel = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            calc_linear_integer_stream_volumes(streams, nstreams, volume, spec);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
            while (data < end) {
 | 
					            while (data < end) {
 | 
				
			||||||
                int32_t sum = 0;
 | 
					                int32_t sum = 0;
 | 
				
			||||||
                unsigned i;
 | 
					                unsigned i;
 | 
				
			||||||
| 
						 | 
					@ -543,8 +541,6 @@ size_t pa_mix(
 | 
				
			||||||
        case PA_SAMPLE_FLOAT32NE: {
 | 
					        case PA_SAMPLE_FLOAT32NE: {
 | 
				
			||||||
            unsigned channel = 0;
 | 
					            unsigned channel = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            calc_linear_float_stream_volumes(streams, nstreams, volume, spec);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
            while (data < end) {
 | 
					            while (data < end) {
 | 
				
			||||||
                float sum = 0;
 | 
					                float sum = 0;
 | 
				
			||||||
                unsigned i;
 | 
					                unsigned i;
 | 
				
			||||||
| 
						 | 
					@ -576,8 +572,6 @@ size_t pa_mix(
 | 
				
			||||||
        case PA_SAMPLE_FLOAT32RE: {
 | 
					        case PA_SAMPLE_FLOAT32RE: {
 | 
				
			||||||
            unsigned channel = 0;
 | 
					            unsigned channel = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            calc_linear_float_stream_volumes(streams, nstreams, volume, spec);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
            while (data < end) {
 | 
					            while (data < end) {
 | 
				
			||||||
                float sum = 0;
 | 
					                float sum = 0;
 | 
				
			||||||
                unsigned i;
 | 
					                unsigned i;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue