From: han.lu@intel.com
To: tiwai@suse.de, liam.r.girdwood@linux.intel.com,
alsa-devel@alsa-project.org
Cc: "Lu, Han" <han.lu@intel.com>
Subject: [PATCH V3 2/6] alsabat: use general function for wav header update
Date: Wed, 23 Mar 2016 15:52:43 +0800 [thread overview]
Message-ID: <3fdea8c7365508c6b6ca74931601a86fb0ce4b6f.1458718230.git.han.lu@intel.com> (raw)
In-Reply-To: <cover.1458718230.git.han.lu@intel.com>
In-Reply-To: <cover.1458718230.git.han.lu@intel.com>
From: "Lu, Han" <han.lu@intel.com>
In playback thread, use general function update_wav_header()
to replace a bunch of code, so the structure is cleaner and
no need to define variable "wav".
Signed-off-by: Lu, Han <han.lu@intel.com>
diff --git a/bat/alsa.c b/bat/alsa.c
index 666bcf2..5acc2bc 100644
--- a/bat/alsa.c
+++ b/bat/alsa.c
@@ -292,11 +292,10 @@ static int write_to_pcm(const struct pcm_container *sndpcm,
static int write_to_pcm_loop(struct pcm_container *sndpcm, struct bat *bat)
{
- int err;
+ int err = 0;
int bytes = sndpcm->period_bytes; /* playback buffer size */
int frames = bytes * 8 / sndpcm->frame_bits; /* frame count */
FILE *fp = NULL;
- struct wav_container wav;
int bytes_total = 0;
if (bat->debugplay) {
@@ -308,7 +307,7 @@ static int write_to_pcm_loop(struct pcm_container *sndpcm, struct bat *bat)
return err;
}
/* leave space for wav header */
- if (fseek(fp, sizeof(wav), SEEK_SET) != 0) {
+ if (fseek(fp, sizeof(struct wav_container), SEEK_SET) != 0) {
err = -errno;
fclose(fp);
return err;
@@ -344,19 +343,7 @@ static int write_to_pcm_loop(struct pcm_container *sndpcm, struct bat *bat)
}
if (bat->debugplay) {
- /* update wav header */
- prepare_wav_info(&wav, bat);
- wav.chunk.length = bytes_total;
- wav.header.length = (wav.chunk.length) + sizeof(wav.chunk)
- + sizeof(wav.format) + sizeof(wav.header) - 8;
-
- rewind(fp);
- err = write_wav_header(fp, &wav, bat);
- if (err != 0) {
- fprintf(bat->err, _("Write file error: %s %s(%d)\n"),
- bat->debugplay, snd_strerror(err), err);
- return err;
- }
+ update_wav_header(bat, fp, bytes_total);
fclose(fp);
}
--
2.5.0
next prev parent reply other threads:[~2016-03-23 7:51 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-23 7:52 [PATCH V3 0/6] alsabat: clean structure and tinyalsa support han.lu
2016-03-23 7:52 ` [PATCH V3 1/6] alsabat: refactoring alsa capture thread han.lu
2016-03-23 7:52 ` han.lu [this message]
2016-03-23 7:52 ` [PATCH V3 3/6] alsabat: clean return value for playback and capture threads han.lu
2016-03-23 7:52 ` [PATCH V3 4/6] alsabat: use general data generator function han.lu
2016-03-23 7:52 ` [PATCH V3 5/6] alsabat: move alsa process to a single block han.lu
2016-03-23 7:52 ` [PATCH V3 6/6] alsabat: add tinyalsa support han.lu
2016-03-23 16:52 ` [PATCH V3 0/6] alsabat: clean structure and " Takashi Iwai
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=3fdea8c7365508c6b6ca74931601a86fb0ce4b6f.1458718230.git.han.lu@intel.com \
--to=han.lu@intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=liam.r.girdwood@linux.intel.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.