OSDN Git Service

Squashed commit of the following:
authorGlenn Kasten <gkasten@google.com>
Thu, 5 Jun 2014 03:31:46 +0000 (20:31 -0700)
committerGlenn Kasten <gkasten@google.com>
Thu, 5 Jun 2014 03:36:20 +0000 (03:36 +0000)
commitc263ca0ad8b6bdf5b0693996bc5f2f5916e0cd49
treed513a586c518ed6f061cf446a5f2e3e18017b4f2
parentcc839bd4727be02d9352f46d043a7e9cc9c7d642
Squashed commit of the following:

commit 9128d6ffec43731d723f9b394f243d940f4c7e41
Author: Glenn Kasten <gkasten@google.com>
Date:   Tue May 13 10:38:42 2014 -0700

    Use of fast capture by normal capture

    Will only configure fast capture path if the input buffer size is less than
    10 ms and the input sample rate is same as the primary output sample rate.

    Change-Id: I4a7cdc6069d750845412c626d27e83f72a1ab397

commit 2e5e0806a5abe7499848358ef5fde5c26405000d
Author: Glenn Kasten <gkasten@google.com>
Date:   Mon Jun 2 08:29:22 2014 -0700

    Add mPrimaryOutputSampleRate

    Change-Id: I46b527fc3f2b5a5720a74b4f0b9a8f2e0d570b09

commit baf1d73467923996d1b1f2a9237260cc5697e050
Author: Andy Hung <hunga@google.com>
Date:   Fri May 30 10:42:03 2014 -0700

    Change parameter type for volume to float in AudioMixer

    Change-Id: I4da1505ce852505f86f8e5b87f60e8edceeb30e0

commit 40fe20fa9760cd03c69778c2021cf7a490d75ece
Author: Andy Hung <hunga@google.com>
Date:   Fri May 30 10:35:47 2014 -0700

    Rename UNITY_GAIN to UNITY_GAIN_INT in AudioMixer

    Change-Id: Ic040311305026f0b4c4280a5b3bef7a447ac1da3

commit 37c9a2b49f876abc5ff537a9ec036d7f0a423775
Author: Andy Hung <hunga@google.com>
Date:   Thu May 29 21:33:13 2014 -0700

    Refactor setVolumeRampVariables in AudioMixer

    Change-Id: I8fcf3101bcea292de7c65433fa578f1c9cdd0974

commit 397070eca31f121d5d3993de1bfea99aaea5d4f3
Author: Andy Hung <hunga@google.com>
Date:   Thu May 29 18:52:38 2014 -0700

    Fix floating point output from mixer

    A buffer pointer was being erroneously reset to buffer start,
    potentially causing an audio glitch. The floating point
    output mode is not enabled at this time, but will be in
    the future.

    Change-Id: If8b6414d232f064f3a2e2c5a6da889a91b27fb24

commit 2e61aa5b33b2247bbc5d4eaa0b519df9accd4bbc
Author: Andy Hung <hunga@google.com>
Date:   Fri May 23 21:22:17 2014 -0700

    Add multiple format capability to FastMixer

    Floating point data from MixerThread into FastMixer.
    Multiple output format capability from FastMixer to Sink.

    Change-Id: I0da17810ee71381a39a006c46faec71108d22c26

commit b9ea653c702a785bbd23a66c5e588d40b4192c4e
Author: Andy Hung <hunga@google.com>
Date:   Thu May 29 15:53:09 2014 -0700

    Avoid resetting BufferProviders in mixer unnecessarily

    Change-Id: Iad85c4dfd21be1dbf89dc11906106b34219376f8

commit 7f1a6d6da21c616f80cf9ba21bea11b419ec561b
Author: Andy Hung <hunga@google.com>
Date:   Tue May 27 12:32:17 2014 -0700

    Update dynamic resampler buffer fetching

    Make the criteria tight for fetching to avoid storing
    excessive frame data internal to the resampler.
    This should reduce jitter in frame delivery computation.

    Bug: 14962343
    Change-Id: I7adaf714d11c272696ccdbf218bda994c7217477

commit b5e4aac07b9a02f0c803c090058602b03ac09ebb
Author: Glenn Kasten <gkasten@google.com>
Date:   Tue May 27 12:30:54 2014 -0700

    Allow kFastTrackMultiplier to be specified per device

    Change-Id: I4eaaaf038df720cec4f5d9221d1b632970f9e3dd

commit b93cd97a52af31122df2da2cc0415cda888c8c73
Author: Andy Hung <hunga@google.com>
Date:   Fri May 23 21:13:31 2014 -0700

    Rename mixBuffer to mMixerBuffer in FastMixer

    Likewise mixBufferState becomes mMixerBufferState.
    This harmonizes with the naming in AF::MixerThread.

    Change-Id: I1255d7c07cc2c6ee925d7430925236d2bd163122

commit 8340758622b9711365a8801806cbdf934803c63f
Author: Andy Hung <hunga@google.com>
Date:   Mon May 12 16:51:41 2014 -0700

    Add multiple format capability to AudioMixer

    Change-Id: I04ac1cafd90b6ed652f8d51888ad07576678f0bc
Signed-off-by: Andy Hung <hunga@google.com>
commit 6b695b9d094820c232a897a3fabbe83d2b7193fe
Author: Glenn Kasten <gkasten@google.com>
Date:   Thu Mar 13 14:59:31 2014 -0700

    Start adding FastCapture based on FastThread WIP

    This version supports at most one fast capture client.

    Change-Id: Idf609bfc80ae22433433d66a5232c043c65506df

commit e951ad05a2c388471d7e2806d91e7d51325a150a
Author: Glenn Kasten <gkasten@google.com>
Date:   Mon May 12 11:06:26 2014 -0700

    Move validation of frameCount from set to openRecord_l

    This move is needed because frameCount is validated on server side for
    fast tracks (as should be done for normal tracks too).

    Change-Id: I6d99e80869fd90fab373cf60ef348c01f075fbca

commit 73e76992dbba794894837c38e5472312ea829cf3
Author: Glenn Kasten <gkasten@google.com>
Date:   Tue May 13 10:41:52 2014 -0700

    Allow track buffer "allocation" to be from pipe

    Change-Id: Ib9ac170f8e8b7746b3588157a56cbee3b753a1cb

commit 60de1d7ded05c6304037d4858b401094b1d2b4d3
Author: Andy Hung <hunga@google.com>
Date:   Fri May 9 15:02:21 2014 -0700

    Add format parameter to getTrackName() and track_t

    Change-Id: Ia152a839014e235fbfb656104c15d7c1b456d02e
Signed-off-by: Andy Hung <hunga@google.com>
Change-Id: Ied0ade8b25d23e89bb03319a7e3135c238f735b9
21 files changed:
media/libmedia/AudioRecord.cpp
media/libmedia/AudioTrackShared.cpp
services/audioflinger/Android.mk
services/audioflinger/AudioFlinger.cpp
services/audioflinger/AudioFlinger.h
services/audioflinger/AudioMixer.cpp
services/audioflinger/AudioMixer.h
services/audioflinger/AudioResamplerDyn.cpp
services/audioflinger/FastCapture.cpp [new file with mode: 0644]
services/audioflinger/FastCapture.h [new file with mode: 0644]
services/audioflinger/FastCaptureState.cpp [new file with mode: 0644]
services/audioflinger/FastCaptureState.h [new file with mode: 0644]
services/audioflinger/FastMixer.cpp
services/audioflinger/FastMixer.h
services/audioflinger/FastMixerState.cpp
services/audioflinger/FastMixerState.h
services/audioflinger/StateQueueInstantiations.cpp
services/audioflinger/Threads.cpp
services/audioflinger/Threads.h
services/audioflinger/TrackBase.h
services/audioflinger/Tracks.cpp