Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-06-13 06:40:26 +02:00
Code Issues Projects Releases Wiki Activity

Reindent AlsaPlay2Callback

Browse Source
This commit is contained in:
Alban Peignier 2014-11-11 13:41:15 +01:00
parent 032a71e8b9
commit 19d98ca736
1 changed files with 231 additions and 231 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

462
cae/cae_alsa.cpp
View File

@ -286,249 +286,249 @@ void AlsaPlay2Callback(struct alsa_format *alsa_format)
memset(alsa_format->card_buffer,0,alsa_format->card_buffer_size); memset(alsa_format->card_buffer,0,alsa_format->card_buffer_size);
switch(alsa_format->format) { switch(alsa_format->format) {
case SND_PCM_FORMAT_S16_LE: case SND_PCM_FORMAT_S16_LE:
for(unsigned j=0;j<RD_MAX_STREAMS;j++) { for(unsigned j=0;j<RD_MAX_STREAMS;j++) {
if(alsa_playing[alsa_format->card][j]) { if(alsa_playing[alsa_format->card][j]) {
switch(alsa_output_channels[alsa_format->card][j]) { switch(alsa_output_channels[alsa_format->card][j]) {
case 1: case 1:
n=alsa_play_ring[alsa_format->card][j]-> n=alsa_play_ring[alsa_format->card][j]->
read(alsa_buffer,alsa_format-> read(alsa_buffer,alsa_format->
buffer_size/alsa_format->periods)/ buffer_size/alsa_format->periods)/
(2*sizeof(int16_t)); (2*sizeof(int16_t));
stream_out_meter=0; // Stream Output Meters stream_out_meter=0; // Stream Output Meters
for(int k=0;k<n;k++) { for(int k=0;k<n;k++) {
if(abs(((int16_t *)alsa_buffer)[k])>stream_out_meter) { if(abs(((int16_t *)alsa_buffer)[k])>stream_out_meter) {
stream_out_meter=abs(((int16_t *)alsa_buffer)[k]); stream_out_meter=abs(((int16_t *)alsa_buffer)[k]);
} }
} }
alsa_stream_output_meter[alsa_format->card][j][0]-> alsa_stream_output_meter[alsa_format->card][j][0]->
addValue(((double)stream_out_meter)/32768.0); addValue(((double)stream_out_meter)/32768.0);
alsa_stream_output_meter[alsa_format->card][j][1]-> alsa_stream_output_meter[alsa_format->card][j][1]->
addValue(((double)stream_out_meter)/32768.0); addValue(((double)stream_out_meter)/32768.0);
modulo=alsa_format->channels; modulo=alsa_format->channels;
for(unsigned i=0;i<(alsa_format->channels/2);i++) { for(unsigned i=0;i<(alsa_format->channels/2);i++) {
if(alsa_output_volume[alsa_format->card][i][j]!=0.0) { if(alsa_output_volume[alsa_format->card][i][j]!=0.0) {
for(int k=0;k<(2*n);k++) { for(int k=0;k<(2*n);k++) {
((int16_t *)alsa_format->card_buffer)[modulo*k+2*i]+= ((int16_t *)alsa_format->card_buffer)[modulo*k+2*i]+=
(int16_t)(alsa_output_volume[alsa_format->card][i][j]* (int16_t)(alsa_output_volume[alsa_format->card][i][j]*
(double)(((int16_t *)alsa_buffer)[k])); (double)(((int16_t *)alsa_buffer)[k]));
((int16_t *)alsa_format->card_buffer)[modulo*k+2*i+1]+= ((int16_t *)alsa_format->card_buffer)[modulo*k+2*i+1]+=
(int16_t)(alsa_output_volume[alsa_format->card][i][j]* (int16_t)(alsa_output_volume[alsa_format->card][i][j]*
(double)(((int16_t *)alsa_buffer)[k])); (double)(((int16_t *)alsa_buffer)[k]));
} }
} }
} }
n*=2; n*=2;
break; break;
case 2: case 2:
n=alsa_play_ring[alsa_format->card][j]-> n=alsa_play_ring[alsa_format->card][j]->
read(alsa_buffer,alsa_format->buffer_size*2/ read(alsa_buffer,alsa_format->buffer_size*2/
alsa_format->periods)/(2*sizeof(int16_t)); alsa_format->periods)/(2*sizeof(int16_t));
for(unsigned k=0;k<2;k++) { // Stream Output Meters for(unsigned k=0;k<2;k++) { // Stream Output Meters
stream_out_meter=0; stream_out_meter=0;
for(int l=0;l<n;l+=2) { for(int l=0;l<n;l+=2) {
if(abs(((int16_t *)alsa_buffer)[l+k])>stream_out_meter) { if(abs(((int16_t *)alsa_buffer)[l+k])>stream_out_meter) {
stream_out_meter=abs(((int16_t *)alsa_buffer)[l+k]); stream_out_meter=abs(((int16_t *)alsa_buffer)[l+k]);
} }
} }
alsa_stream_output_meter[alsa_format->card][j][k]-> alsa_stream_output_meter[alsa_format->card][j][k]->
addValue(((double)stream_out_meter)/32768.0); addValue(((double)stream_out_meter)/32768.0);
} }
modulo=alsa_format->channels; modulo=alsa_format->channels;
for(unsigned i=0;i<(alsa_format->channels/2);i++) { for(unsigned i=0;i<(alsa_format->channels/2);i++) {
if(alsa_output_volume[alsa_format->card][i][j]!=0.0) { if(alsa_output_volume[alsa_format->card][i][j]!=0.0) {
for(int k=0;k<n;k++) { for(int k=0;k<n;k++) {
((int16_t *)alsa_format->card_buffer)[modulo*k+2*i]+= ((int16_t *)alsa_format->card_buffer)[modulo*k+2*i]+=
(int16_t)(alsa_output_volume[alsa_format->card][i][j]* (int16_t)(alsa_output_volume[alsa_format->card][i][j]*
(double)(((int16_t *)alsa_buffer)[2*k])); (double)(((int16_t *)alsa_buffer)[2*k]));
((int16_t *)alsa_format->card_buffer)[modulo*k+2*i+1]+= ((int16_t *)alsa_format->card_buffer)[modulo*k+2*i+1]+=
(int16_t)(alsa_output_volume[alsa_format->card][i][j]* (int16_t)(alsa_output_volume[alsa_format->card][i][j]*
(double)(((int16_t *)alsa_buffer)[2*k+1])); (double)(((int16_t *)alsa_buffer)[2*k+1]));
} }
} }
} }
break; break;
} }
alsa_output_pos[alsa_format->card][j]+=n; alsa_output_pos[alsa_format->card][j]+=n;
if((n==0)&&alsa_eof[alsa_format->card][j]) { if((n==0)&&alsa_eof[alsa_format->card][j]) {
alsa_stopping[alsa_format->card][j]=true; alsa_stopping[alsa_format->card][j]=true;
} }
} }
} }
n=alsa_format->buffer_size/(2*alsa_format->periods); n=alsa_format->buffer_size/(2*alsa_format->periods);
// //
// Process Passthroughs // Process Passthroughs
// //
for(unsigned i=0;i<alsa_format->capture_channels;i+=2) { for(unsigned i=0;i<alsa_format->capture_channels;i+=2) {
p=alsa_passthrough_ring[alsa_format->card][i/2]-> p=alsa_passthrough_ring[alsa_format->card][i/2]->
read(alsa_format->passthrough_buffer,4*n)/4; read(alsa_format->passthrough_buffer,4*n)/4;
for(unsigned j=0;j<alsa_format->channels;j+=2) { for(unsigned j=0;j<alsa_format->channels;j+=2) {
for(unsigned k=0;k<2;k++) { for(unsigned k=0;k<2;k++) {
for(int l=0;l<p;l++) { for(int l=0;l<p;l++) {
((int16_t *)alsa_format-> ((int16_t *)alsa_format->
card_buffer)[alsa_format->channels*l+j+k]+= card_buffer)[alsa_format->channels*l+j+k]+=
(int16_t)((double)((int16_t *) (int16_t)((double)((int16_t *)
alsa_format->passthrough_buffer)[2*l+k]* alsa_format->passthrough_buffer)[2*l+k]*
alsa_passthrough_volume[alsa_format->card][i/2][j/2]); alsa_passthrough_volume[alsa_format->card][i/2][j/2]);
} }
} }
} }
} }
// //
// Process Output Meters // Process Output Meters
// //
for(unsigned i=0;i<alsa_format->channels;i+=2) { for(unsigned i=0;i<alsa_format->channels;i+=2) {
unsigned port=i/2; unsigned port=i/2;
for(unsigned j=0;j<2;j++) { for(unsigned j=0;j<2;j++) {
out_meter[port][j]=0; out_meter[port][j]=0;
for(unsigned k=0;k<alsa_format->buffer_size;k++) { for(unsigned k=0;k<alsa_format->buffer_size;k++) {
if(((int16_t *)alsa_format-> if(((int16_t *)alsa_format->
card_buffer)[alsa_format->channels*k+2*i+j]> card_buffer)[alsa_format->channels*k+2*i+j]>
out_meter[i][j]) { out_meter[i][j]) {
out_meter[i][j]= out_meter[i][j]=
((int16_t *)alsa_format-> ((int16_t *)alsa_format->
card_buffer)[alsa_format->channels*k+2*i+j]; card_buffer)[alsa_format->channels*k+2*i+j];
} }
} }
alsa_output_meter[alsa_format->card][i][j]-> alsa_output_meter[alsa_format->card][i][j]->
addValue(((double)out_meter[i][j])/32768.0); addValue(((double)out_meter[i][j])/32768.0);
} }
} }
break; break;
case SND_PCM_FORMAT_S32_LE: case SND_PCM_FORMAT_S32_LE:
for(unsigned j=0;j<RD_MAX_STREAMS;j++) { for(unsigned j=0;j<RD_MAX_STREAMS;j++) {
if(alsa_playing[alsa_format->card][j]) { if(alsa_playing[alsa_format->card][j]) {
switch(alsa_output_channels[alsa_format->card][j]) { switch(alsa_output_channels[alsa_format->card][j]) {
case 1: case 1:
n=alsa_play_ring[alsa_format->card][j]-> n=alsa_play_ring[alsa_format->card][j]->
read(alsa_buffer,alsa_format->buffer_size/ read(alsa_buffer,alsa_format->buffer_size/
alsa_format->periods)/(2*sizeof(int16_t)); alsa_format->periods)/(2*sizeof(int16_t));
stream_out_meter=0; stream_out_meter=0;
for(int k=0;k<n;k++) { // Stream Output Meters for(int k=0;k<n;k++) { // Stream Output Meters
if(abs(((int16_t *)alsa_buffer)[k])>stream_out_meter) { if(abs(((int16_t *)alsa_buffer)[k])>stream_out_meter) {
stream_out_meter=abs(((int16_t *)alsa_buffer)[k]); stream_out_meter=abs(((int16_t *)alsa_buffer)[k]);
} }
} }
alsa_stream_output_meter[alsa_format->card][j][0]-> alsa_stream_output_meter[alsa_format->card][j][0]->
addValue(((double)stream_out_meter)/32768.0); addValue(((double)stream_out_meter)/32768.0);
alsa_stream_output_meter[alsa_format->card][j][1]-> alsa_stream_output_meter[alsa_format->card][j][1]->
addValue(((double)stream_out_meter)/32768.0); addValue(((double)stream_out_meter)/32768.0);
modulo=alsa_format->channels*2; modulo=alsa_format->channels*2;
for(unsigned i=0;i<(alsa_format->channels/2);i++) { for(unsigned i=0;i<(alsa_format->channels/2);i++) {
if(alsa_output_volume[alsa_format->card][i][j]!=0.0) { if(alsa_output_volume[alsa_format->card][i][j]!=0.0) {
for(int k=0;k<(2*n);k++) { for(int k=0;k<(2*n);k++) {
((int16_t *)alsa_format->card_buffer)[modulo*k+4*i+1]+= ((int16_t *)alsa_format->card_buffer)[modulo*k+4*i+1]+=
(int16_t)(alsa_output_volume[alsa_format->card][i][j]* (int16_t)(alsa_output_volume[alsa_format->card][i][j]*
(double)(((int16_t *)alsa_buffer)[k])); (double)(((int16_t *)alsa_buffer)[k]));
((int16_t *)alsa_format->card_buffer)[modulo*k+4*i+3]+= ((int16_t *)alsa_format->card_buffer)[modulo*k+4*i+3]+=
(int16_t)(alsa_output_volume[alsa_format->card][i][j]* (int16_t)(alsa_output_volume[alsa_format->card][i][j]*
(double)(((int16_t *)alsa_buffer)[k])); (double)(((int16_t *)alsa_buffer)[k]));
} }
} }
} }
n*=2; n*=2;
break; break;
case 2: case 2:
n=alsa_play_ring[alsa_format->card][j]-> n=alsa_play_ring[alsa_format->card][j]->
read(alsa_buffer,alsa_format->buffer_size*2/ read(alsa_buffer,alsa_format->buffer_size*2/
alsa_format->periods)/(2*sizeof(int16_t)); alsa_format->periods)/(2*sizeof(int16_t));
for(unsigned k=0;k<2;k++) { // Stream Output Meters for(unsigned k=0;k<2;k++) { // Stream Output Meters
stream_out_meter=0; stream_out_meter=0;
for(int l=0;l<n;l+=2) { for(int l=0;l<n;l+=2) {
if(abs(((int16_t *)alsa_buffer)[l+k])>stream_out_meter) { if(abs(((int16_t *)alsa_buffer)[l+k])>stream_out_meter) {
stream_out_meter=abs(((int16_t *)alsa_buffer)[l+k]); stream_out_meter=abs(((int16_t *)alsa_buffer)[l+k]);
} }
} }
alsa_stream_output_meter[alsa_format->card][j][k]-> alsa_stream_output_meter[alsa_format->card][j][k]->
addValue(((double)stream_out_meter)/32768.0); addValue(((double)stream_out_meter)/32768.0);
} }
modulo=alsa_format->channels*2; modulo=alsa_format->channels*2;
for(unsigned i=0;i<(alsa_format->channels/2);i++) { for(unsigned i=0;i<(alsa_format->channels/2);i++) {
if(alsa_output_volume[alsa_format->card][i][j]!=0.0) { if(alsa_output_volume[alsa_format->card][i][j]!=0.0) {
for(int k=0;k<n;k++) { for(int k=0;k<n;k++) {
((int16_t *)alsa_format->card_buffer)[modulo*k+4*i+1]+= ((int16_t *)alsa_format->card_buffer)[modulo*k+4*i+1]+=
(int16_t)(alsa_output_volume[alsa_format->card][i][j]* (int16_t)(alsa_output_volume[alsa_format->card][i][j]*
(double)(((int16_t *)alsa_buffer)[2*k])); (double)(((int16_t *)alsa_buffer)[2*k]));
((int16_t *)alsa_format->card_buffer)[modulo*k+4*i+3]+= ((int16_t *)alsa_format->card_buffer)[modulo*k+4*i+3]+=
(int16_t)(alsa_output_volume[alsa_format->card][i][j]* (int16_t)(alsa_output_volume[alsa_format->card][i][j]*
(double)(((int16_t *)alsa_buffer)[2*k+1])); (double)(((int16_t *)alsa_buffer)[2*k+1]));
} }
} }
} }
break; break;
} }
alsa_output_pos[alsa_format->card][j]+=n; alsa_output_pos[alsa_format->card][j]+=n;
if((n==0)&&alsa_eof[alsa_format->card][j]) { if((n==0)&&alsa_eof[alsa_format->card][j]) {
alsa_stopping[alsa_format->card][j]=true; alsa_stopping[alsa_format->card][j]=true;
// Empty the ring buffer // Empty the ring buffer
while(alsa_play_ring[alsa_format->card][j]-> while(alsa_play_ring[alsa_format->card][j]->
read(alsa_buffer,alsa_format->buffer_size*2/ read(alsa_buffer,alsa_format->buffer_size*2/
alsa_format->periods)/(2*sizeof(int16_t))>0); alsa_format->periods)/(2*sizeof(int16_t))>0);
} }
} }
} }
n=alsa_format->buffer_size/(2*alsa_format->periods); n=alsa_format->buffer_size/(2*alsa_format->periods);
// //
// Process Passthroughs // Process Passthroughs
// //
for(unsigned i=0;i<alsa_format->capture_channels;i+=2) { for(unsigned i=0;i<alsa_format->capture_channels;i+=2) {
p=alsa_passthrough_ring[alsa_format->card][i/2]-> p=alsa_passthrough_ring[alsa_format->card][i/2]->
read(alsa_format->passthrough_buffer,8*n)/8; read(alsa_format->passthrough_buffer,8*n)/8;
for(unsigned j=0;j<alsa_format->channels;j+=2) { for(unsigned j=0;j<alsa_format->channels;j+=2) {
for(unsigned k=0;k<2;k++) { for(unsigned k=0;k<2;k++) {
for(int l=0;l<p;l++) { for(int l=0;l<p;l++) {
((int32_t *)alsa_format-> ((int32_t *)alsa_format->
card_buffer)[alsa_format->channels*l+j+k]+= card_buffer)[alsa_format->channels*l+j+k]+=
(int32_t)((double)((int32_t *) (int32_t)((double)((int32_t *)
alsa_format->passthrough_buffer)[2*l+k]* alsa_format->passthrough_buffer)[2*l+k]*
alsa_passthrough_volume[alsa_format->card][i/2][j/2]); alsa_passthrough_volume[alsa_format->card][i/2][j/2]);
} }
} }
} }
} }
// //
// Process Output Meters // Process Output Meters
// //
for(unsigned i=0;i<alsa_format->channels;i+=2) { for(unsigned i=0;i<alsa_format->channels;i+=2) {
unsigned port=i/2; unsigned port=i/2;
for(unsigned j=0;j<2;j++) { for(unsigned j=0;j<2;j++) {
out_meter[port][j]=0; out_meter[port][j]=0;
for(unsigned k=0; for(unsigned k=0;
k<(alsa_format->buffer_size*2/alsa_format->periods); k<(alsa_format->buffer_size*2/alsa_format->periods);
k++) { k++) {
if(((int16_t *)alsa_format-> if(((int16_t *)alsa_format->
card_buffer)[alsa_format->channels*2*k+2*i+1+2*j]> card_buffer)[alsa_format->channels*2*k+2*i+1+2*j]>
out_meter[port][j]) { out_meter[port][j]) {
out_meter[port][j]= out_meter[port][j]=
((int16_t *)alsa_format-> ((int16_t *)alsa_format->
card_buffer)[alsa_format->channels*2*k+2*i+1+2*j]; card_buffer)[alsa_format->channels*2*k+2*i+1+2*j];
} }
} }
alsa_output_meter[alsa_format->card][port][j]-> alsa_output_meter[alsa_format->card][port][j]->
addValue(((double)out_meter[port][j])/32768.0); addValue(((double)out_meter[port][j])/32768.0);
} }
} }
break; break;
default: default:
break; break;
} }
int s=snd_pcm_writei(alsa_format->pcm,alsa_format->card_buffer,n); int s=snd_pcm_writei(alsa_format->pcm,alsa_format->card_buffer,n);
if(s!=n) { if(s!=n) {
if(s<0) { if(s<0) {
LogLine(RDConfig::LogNotice, LogLine(RDConfig::LogNotice,
QString().sprintf("*** alsa error %d: %s",-s,snd_strerror(s))); QString().sprintf("*** alsa error %d: %s",-s,snd_strerror(s)));
} }
else { else {
LogLine(RDConfig::LogNotice, LogLine(RDConfig::LogNotice,
QString().sprintf("period size mismatch - wrote %d\n",s)); QString().sprintf("period size mismatch - wrote %d\n",s));
} }
} }
if((snd_pcm_state(alsa_format->pcm)!=SND_PCM_STATE_RUNNING)&& if((snd_pcm_state(alsa_format->pcm)!=SND_PCM_STATE_RUNNING)&&
@ -536,8 +536,8 @@ void AlsaPlay2Callback(struct alsa_format *alsa_format)
snd_pcm_drop (alsa_format->pcm); snd_pcm_drop (alsa_format->pcm);
snd_pcm_prepare(alsa_format->pcm); snd_pcm_prepare(alsa_format->pcm);
LogLine(RDConfig::LogNotice,QString(). LogLine(RDConfig::LogNotice,QString().
sprintf("****** ALSA Playout Xrun - Card: %d ******", sprintf("****** ALSA Playout Xrun - Card: %d ******",
alsa_format->card)); alsa_format->card));
} }
} }
} }