Commit b9fd2007 authored by Alexander Tsoy's avatar Alexander Tsoy Committed by Takashi Iwai
Browse files

ALSA: usb-audio: Replace s/frame/packet/ where appropriate 



Replace several occurences of "frame" with a "packet" where appropriate.

Signed-off-by: default avatarAlexander Tsoy <alexander@tsoy.me>
Link: https://lore.kernel.org/r/20200629025934.154288-2-alexander@tsoy.me


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 695cf5ab

sound/usb/card.h

+3 −3
Original line number Diff line number Diff line
@@ -84,10 +84,10 @@ struct snd_usb_endpoint { 
	dma_addr_t sync_dma;		/* DMA address of syncbuf */



	unsigned int pipe;		/* the data i/o pipe */

	unsigned int framesize[2];	/* small/large frame sizes in samples */

	unsigned int sample_rem;	/* remainder from division fs/fps */

	unsigned int packsize[2];	/* small/large packet sizes in samples */

	unsigned int sample_rem;	/* remainder from division fs/pps */

	unsigned int sample_accum;	/* sample accumulator */

	unsigned int fps;		/* frames per second */

	unsigned int pps;		/* packets per second */

	unsigned int freqn;		/* nominal sampling rate in fs/fps in Q16.16 format */

	unsigned int freqm;		/* momentary sampling rate in fs/fps in Q16.16 format */

	int	   freqshift;		/* how much to shift the feedback value to get Q16.16 */

sound/usb/endpoint.c

+9 −10
Original line number Diff line number Diff line
@@ -159,11 +159,11 @@ int snd_usb_endpoint_next_packet_size(struct snd_usb_endpoint *ep) 
		return ep->maxframesize;



	ep->sample_accum += ep->sample_rem;

	if (ep->sample_accum >= ep->fps) {

		ep->sample_accum -= ep->fps;

		ret = ep->framesize[1];

	if (ep->sample_accum >= ep->pps) {

		ep->sample_accum -= ep->pps;

		ret = ep->packsize[1];

	} else {

		ret = ep->framesize[0];

		ret = ep->packsize[0];

	}



	return ret;
@@ -1088,16 +1088,15 @@ int snd_usb_endpoint_set_params(struct snd_usb_endpoint *ep, 


	if (snd_usb_get_speed(ep->chip->dev) == USB_SPEED_FULL) {

		ep->freqn = get_usb_full_speed_rate(rate);

		ep->fps = 1000;

		ep->pps = 1000 >> ep->datainterval;

	} else {

		ep->freqn = get_usb_high_speed_rate(rate);

		ep->fps = 8000;

		ep->pps = 8000 >> ep->datainterval;

	}

	ep->fps >>= ep->datainterval;



	ep->sample_rem = rate % ep->fps;

	ep->framesize[0] = rate / ep->fps;

	ep->framesize[1] = (rate + (ep->fps - 1)) / ep->fps;

	ep->sample_rem = rate % ep->pps;

	ep->packsize[0] = rate / ep->pps;

	ep->packsize[1] = (rate + (ep->pps - 1)) / ep->pps;



	/* calculate the frequency in 16.16 format */

	ep->freqm = ep->freqn;

CRA Git | Maintained and supported by SUSTech CRA and CCSE