diff options
| author | Vijay Mali <vmali@nvidia.com> | 2010-05-13 17:46:07 +0530 |
|---|---|---|
| committer | Gary King <gking@nvidia.com> | 2010-05-13 13:54:08 -0700 |
| commit | 5739789393f37094e465b1f17ebc962e345757c6 (patch) | |
| tree | 1e81ce3667599ce7616aa67dc783a3f49a1b53d4 | |
| parent | db12d594697385aeb6c7448703730d1c5781750a (diff) | |
[tegra ALSA] Updating sndfx header file
In order to keep sndfx file in sync with audiofx header
file updating tegra_sndfx.h with structures and
definitions, made the corresponding changes in code.
Verified both playback and record are working fine.
For bug 686588
synopsis: Incosistent kernel panic while running ALSA decode tests
Change-Id: Idc121a467a7c5460d0aa68416232d07b539b2a45
Reviewed-on: http://git-master/r/1379
Reviewed-by: Vijay Mali <vmali@nvidia.com>
Tested-by: Vijay Mali <vmali@nvidia.com>
Reviewed-by: Manjula Gupta <magupta@nvidia.com>
Tested-by: Manjula Gupta <magupta@nvidia.com>
Reviewed-by: Gary King <gking@nvidia.com>
| -rw-r--r-- | sound/soc/tegra/tegra_pcm_rpc.c | 2 | ||||
| -rw-r--r-- | sound/soc/tegra/tegra_sndfx.h | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/sound/soc/tegra/tegra_pcm_rpc.c b/sound/soc/tegra/tegra_pcm_rpc.c index 09aeefa71592..6b486d10110a 100644 --- a/sound/soc/tegra/tegra_pcm_rpc.c +++ b/sound/soc/tegra/tegra_pcm_rpc.c @@ -121,6 +121,7 @@ static int play_thread( void *arg) abd.Format.BitsPerSample = runtime->sample_bits; abd.Format.Channels = runtime->channels; abd.Format.ChannelMask = 0; + abd.Format.ValidBitsPerSample = 0; e = tegra_snd_cx->xrt_fxn.StreamAddBuffer( (NvAudioFxStreamHandle)prtd->stdoutpath->Stream, @@ -211,6 +212,7 @@ static int rec_thread( void *arg ) pin_format.Format.BitsPerSample = runtime->sample_bits; pin_format.Format.Channels = runtime->channels; pin_format.Format.ChannelMask = 0; + pin_format.Format.ValidBitsPerSample = 0; pin_format.Pin = NvAudioFxSourcePin; e = tegra_snd_cx->xrt_fxn.SetProperty( diff --git a/sound/soc/tegra/tegra_sndfx.h b/sound/soc/tegra/tegra_sndfx.h index d5295a4a0c90..d08a2a9c751b 100644 --- a/sound/soc/tegra/tegra_sndfx.h +++ b/sound/soc/tegra/tegra_sndfx.h @@ -186,6 +186,7 @@ typedef struct NvAudioFxFormatRec NvU32 Channels; NvU32 BitsPerSample; NvU32 ChannelMask; + NvU32 ValidBitsPerSample; } NvAudioFxFormat; // Description of the NvAudioFxProperty_Method property. @@ -225,6 +226,7 @@ typedef NvS32 NvAudioFxState; #define NvAudioFxState_Pause (0x1040) #define NvAudioFxState_Disable (0x1050) #define NvAudioFxState_EndOfStream (0x1060) +#define NvAudioFxState_Locked (0x1070) // Audio DRC information. @@ -241,6 +243,10 @@ typedef struct NvAudioFxDrcDescriptorRec #define NvAudioFxEqNumFilters (5) #define NvAudioFxEqNumChannels (2) +// AudioFx Default Volume Settings +#define NVAUDIOFX_DEFAULT_VOLUME (256) +#define NVAUDIOFX_DEFAULT_MAX_VOLUME (1024) + typedef struct NvAudioFxEqDescriptorRec { NvS32 dBGain[NvAudioFxEqNumChannels][NvAudioFxEqNumFilters]; |