tequilaOS/platform_hardware_libhardware
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Line length 100"

Browse source
This commit is contained in:
Glenn Kasten 2014-12-30 18:53:00 +00:00 committed by Android (Google) Code Review
commit c9a9133be6
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
include/hardware/audio_effect.h
View file

@ -344,9 +344,10 @@ struct effect_interface_s {
// Output: // Output:
// returned value: 0 successful operation // returned value: 0 successful operation
// -EINVAL invalid interface handle or // -EINVAL invalid interface handle or
// invalid command/reply size or format according to command code // invalid command/reply size or format according to
// The return code should be restricted to indicate problems related to the this // command code
// API specification. Status related to the execution of a particular command should be // The return code should be restricted to indicate problems related to this API
// specification. Status related to the execution of a particular command should be
// indicated as part of the reply field. // indicated as part of the reply field.
// //
// *pReplyData updated with command response // *pReplyData updated with command response
@ -937,11 +938,12 @@ typedef struct audio_effect_library_s {
// //
// Input: // Input:
// uuid: pointer to the effect uuid. // uuid: pointer to the effect uuid.
// sessionId: audio session to which this effect instance will be attached. All effects // sessionId: audio session to which this effect instance will be attached.
// created with the same session ID are connected in series and process the same signal // All effects created with the same session ID are connected in series and process
// stream. Knowing that two effects are part of the same effect chain can help the // the same signal stream. Knowing that two effects are part of the same effect
// library implement some kind of optimizations. // chain can help the library implement some kind of optimizations.
// ioId: identifies the output or input stream this effect is directed to at audio HAL. // ioId: identifies the output or input stream this effect is directed to in
// audio HAL.
// For future use especially with tunneled HW accelerated effects // For future use especially with tunneled HW accelerated effects
// //
// Input/Output: // Input/Output:

3
modules/usbaudio/alsa_device_profile.c
View file

@ -278,7 +278,8 @@ static unsigned profile_enum_sample_formats(alsa_device_profile* profile, struct
return num_written; return num_written;
} }
static unsigned profile_enum_channel_counts(alsa_device_profile* profile, unsigned min, unsigned max) static unsigned profile_enum_channel_counts(alsa_device_profile* profile, unsigned min,
unsigned max)
{ {
static const unsigned std_channel_counts[] = {8, 4, 2, 1}; static const unsigned std_channel_counts[] = {8, 4, 2, 1};