From: Pierre Ossman <ossman@cendio.se>
To: alsa-devel@alsa-project.org, Takashi Iwai <tiwai@suse.de>
Subject: [PATCH] Allow ioplugins to override snd_pcm_delay()
Date: Fri, 26 May 2006 16:01:16 +0200 [thread overview]
Message-ID: <44770A2C.7030109@cendio.se> (raw)
[-- Attachment #1.1.1: Type: text/plain, Size: 299 bytes --]
Some io plug-ins might want to adjust the reported delay value and not
strictly follow the current buffer usage (that's why we have two calls
after all).
Allow them to specify a delay() callback and use the previous behaviour
if they don't.
Signed-off-by: Pierre Ossman <ossman@cendio.se>
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.1.2: ioplug-delay.patch --]
[-- Type: text/x-patch; name="ioplug-delay.patch", Size: 2068 bytes --]
Index: src/pcm/pcm_ioplug.c
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_ioplug.c,v
retrieving revision 1.10
diff -u -r1.10 pcm_ioplug.c
--- src/pcm/pcm_ioplug.c 28 Jun 2005 10:24:45 -0000 1.10
+++ src/pcm/pcm_ioplug.c 26 May 2006 13:59:14 -0000
@@ -106,8 +106,15 @@
static int snd_pcm_ioplug_delay(snd_pcm_t *pcm, snd_pcm_sframes_t *delayp)
{
- snd_pcm_ioplug_hw_ptr_update(pcm);
- *delayp = snd_pcm_mmap_hw_avail(pcm);
+ ioplug_priv_t *io = pcm->private_data;
+
+ if ((io->data->version >= 0x010001) &&
+ (io->data->callback->delay))
+ return io->data->callback->delay(io->data, delayp);
+ else {
+ snd_pcm_ioplug_hw_ptr_update(pcm);
+ *delayp = snd_pcm_mmap_hw_avail(pcm);
+ }
return 0;
}
@@ -872,7 +879,9 @@
ioplug->callback->stop &&
ioplug->callback->pointer);
- if (ioplug->version != SND_PCM_IOPLUG_VERSION) {
+ /* We support 1.0.0 to current */
+ if ((ioplug->version < 0x010000) ||
+ (ioplug->version > SND_PCM_IOPLUG_VERSION)) {
SNDERR("ioplug: Plugin version mismatch\n");
return -ENXIO;
}
Index: include/pcm_ioplug.h
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/include/pcm_ioplug.h,v
retrieving revision 1.5
diff -u -r1.5 pcm_ioplug.h
--- include/pcm_ioplug.h 24 May 2005 09:42:01 -0000 1.5
+++ include/pcm_ioplug.h 26 May 2006 13:59:14 -0000
@@ -65,7 +65,7 @@
*/
#define SND_PCM_IOPLUG_VERSION_MAJOR 1 /**< Protocol major version */
#define SND_PCM_IOPLUG_VERSION_MINOR 0 /**< Protocol minor version */
-#define SND_PCM_IOPLUG_VERSION_TINY 0 /**< Protocol tiny version */
+#define SND_PCM_IOPLUG_VERSION_TINY 1 /**< Protocol tiny version */
/**
* IO-plugin protocol version
*/
@@ -184,6 +184,10 @@
* dump; optional
*/
void (*dump)(snd_pcm_ioplug_t *io, snd_output_t *out);
+ /**
+ * get the delay for the running PCM; optional
+ */
+ int (*delay)(snd_pcm_ioplug_t *io, snd_pcm_sframes_t *delayp);
};
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 251 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
[-- Attachment #3: Type: text/plain, Size: 161 bytes --]
_______________________________________________
Alsa-devel mailing list
Alsa-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/alsa-devel
next reply other threads:[~2006-05-26 14:01 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-05-26 14:01 Pierre Ossman [this message]
2006-05-26 15:10 ` [PATCH] Allow ioplugins to override snd_pcm_delay() Takashi Iwai
-- strict thread matches above, loose matches on Subject: below --
2006-05-26 9:38 Pierre Ossman
2006-05-26 12:24 ` Takashi Iwai
2006-05-26 12:31 ` Pierre Ossman
2006-05-26 12:35 ` Pierre Ossman
2006-05-26 12:41 ` Takashi Iwai
2006-05-26 12:41 ` James Courtier-Dutton
2006-05-26 12:46 ` Pierre Ossman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=44770A2C.7030109@cendio.se \
--to=ossman@cendio.se \
--cc=alsa-devel@alsa-project.org \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox