浏览代码

[ALSA] Fix mulaw -> linear conversion in OSS PCM emulation

Modules: ALSA<-OSS emulation

Fixed the missing mulaw -> linear conversion in OSS PCM emulation code.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai 19 年之前
父节点
当前提交
c82590d2b2
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      sound/core/oss/pcm_plugin.c

+ 2 - 1
sound/core/oss/pcm_plugin.c

@@ -470,7 +470,8 @@ int snd_pcm_plug_format_plugins(struct snd_pcm_substream *plug,
 	/* format change */
 	/* format change */
 	if (srcformat.format != dstformat.format) {
 	if (srcformat.format != dstformat.format) {
 		tmpformat.format = dstformat.format;
 		tmpformat.format = dstformat.format;
-		if (tmpformat.format == SNDRV_PCM_FORMAT_MU_LAW) {
+		if (srcformat.format == SNDRV_PCM_FORMAT_MU_LAW ||
+		    tmpformat.format == SNDRV_PCM_FORMAT_MU_LAW) {
 			err = snd_pcm_plugin_build_mulaw(plug,
 			err = snd_pcm_plugin_build_mulaw(plug,
 							 &srcformat, &tmpformat,
 							 &srcformat, &tmpformat,
 							 &plugin);
 							 &plugin);