IABSD.fr/ports/x11/mplayer/patches/patch-stream_audio_in_c

Branch : - branch - master - tag -

• Show log

  Commit

• Author : naddy
  Date : 2022-03-11 20:15:18
  Hash : 21f1bb8a
  Message : drop RCS Ids

• x11/mplayer/patches/patch-stream_audio_in_c

• Index: stream/audio_in.c
  --- stream/audio_in.c.orig
  +++ stream/audio_in.c
  @@ -54,6 +54,12 @@ int audio_in_init(audio_in_t *ai, int type)
   	ai->oss.device = strdup("/dev/dsp");
   	return 0;
   #endif
  +#ifdef CONFIG_SNDIO_AUDIO
  +    case AUDIO_IN_SNDIO:
  +	ai->sndio.hdl = NULL;
  +	ai->sndio.device = strdup("default");
  +	return 0;
  +#endif
       default:
   	return -1;
       }
  @@ -75,6 +81,12 @@ int audio_in_setup(audio_in_t *ai)
   	ai->setup = 1;
   	return 0;
   #endif
  +#ifdef CONFIG_SNDIO_AUDIO
  +    case AUDIO_IN_SNDIO:
  +	if (ai_sndio_init(ai) < 0) return -1;
  +	ai->setup = 1;
  +	return 0;
  +#endif
       default:
   	return -1;
       }
  @@ -97,6 +109,13 @@ int audio_in_set_samplerate(audio_in_t *ai, int rate)
   	if (ai_oss_set_samplerate(ai) < 0) return -1;
   	return ai->samplerate;
   #endif
  +#ifdef CONFIG_SNDIO_AUDIO
  +    case AUDIO_IN_SNDIO:
  +	ai->req_samplerate = rate;
  +	if (!ai->setup) return 0;
  +	if (ai_sndio_setup(ai) < 0) return -1;
  +	return ai->samplerate;
  +#endif
       default:
   	return -1;
       }
  @@ -119,6 +138,13 @@ int audio_in_set_channels(audio_in_t *ai, int channels
   	if (ai_oss_set_channels(ai) < 0) return -1;
   	return ai->channels;
   #endif
  +#ifdef CONFIG_SNDIO_AUDIO
  +    case AUDIO_IN_SNDIO:
  +	ai->req_channels = channels;
  +	if (!ai->setup) return 0;
  +	if (ai_sndio_setup(ai) < 0) return -1;
  +	return ai->channels;
  +#endif
       default:
   	return -1;
       }
  @@ -147,6 +173,12 @@ int audio_in_set_device(audio_in_t *ai, char *device)
   	ai->oss.device = strdup(device);
   	return 0;
   #endif
  +#ifdef CONFIG_SNDIO_AUDIO
  +    case AUDIO_IN_SNDIO:
  +	if (ai->sndio.device) free(ai->sndio.device);
  +	ai->sndio.device = strdup(device);
  +	return 0;
  +#endif
       default:
   	return -1;
       }
  @@ -172,6 +204,13 @@ int audio_in_uninit(audio_in_t *ai)
   	    ai->setup = 0;
   	    return 0;
   #endif
  +#ifdef CONFIG_SNDIO_AUDIO
  +	case AUDIO_IN_SNDIO:
  +	    if (ai->sndio.hdl)
  +	        sio_close(ai->sndio.hdl);
  +	    ai->setup = 0;
  +	    return 0;
  +#endif
   	}
       }
       return -1;
  @@ -188,6 +227,12 @@ int audio_in_start_capture(audio_in_t *ai)
       case AUDIO_IN_OSS:
   	return 0;
   #endif
  +#ifdef CONFIG_SNDIO_AUDIO
  +    case AUDIO_IN_SNDIO:
  +	if (!sio_start(ai->sndio.hdl))
  +	    return -1;
  +	return 0;
  +#endif
       default:
   	return -1;
       }
  @@ -221,6 +266,19 @@ int audio_in_read_chunk(audio_in_t *ai, unsigned char 
   #ifdef CONFIG_OSS_AUDIO
       case AUDIO_IN_OSS:
   	ret = read(ai->oss.audio_fd, buffer, ai->blocksize);
  +	if (ret != ai->blocksize) {
  +	    if (ret < 0) {
  +		mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AUDIOIN_ErrReadingAudio, strerror(errno));
  +	    } else {
  +		mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AUDIOIN_NotEnoughSamples);
  +	    }
  +	    return -1;
  +	}
  +	return ret;
  +#endif
  +#ifdef CONFIG_SNDIO_AUDIO
  +    case AUDIO_IN_SNDIO:
  +	ret = sio_read(ai->sndio.hdl, buffer, ai->blocksize);
   	if (ret != ai->blocksize) {
   	    if (ret < 0) {
   		mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AUDIOIN_ErrReadingAudio, strerror(errno));