summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge "stagefright: rename usePersistentInputSurface to setInputSurface" ↵Chong Zhang2015-05-138-12/+10
|\ | | | | | | into mnc-dev
| * stagefright: rename usePersistentInputSurface to setInputSurfaceChong Zhang2015-05-138-12/+10
| | | | | | | | | | | | | | | | and clear persistent surface pointer when MediaRecorder is reset bug: 21045118 bug: 21045402 Change-Id: Ifd0d6deeb969f2252123929541b30b518cecbf9a
* | am 0eb7c793: am b5fbb811: am c8c86c1d: am bcf2becf: am c531d995: am ↵Lajos Molnar2015-05-131-0/+22
|\ \ | | | | | | | | | | | | | | | | | | 438217a0: Merge "Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes" into lmp-dev * commit '0eb7c79398ef04e457c76f117feef6d7bcbbc684': Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes
| * \ am b5fbb811: am c8c86c1d: am bcf2becf: am c531d995: am 438217a0: Merge "Add ↵Lajos Molnar2015-05-121-0/+22
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes" into lmp-dev * commit 'b5fbb81157eaab594bb37275176a0a178098dc46': Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes
| | * \ am c531d995: am 438217a0: Merge "Add AUtils::isInRange, and use it to detect ↵Lajos Molnar2015-05-121-0/+22
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | malformed MPEG4 nal sizes" into lmp-dev * commit 'c531d9956513b9b82dad84aeb507b866e6b3951a': Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes
| | | * | Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizesLajos Molnar2015-04-241-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19641538 Change-Id: I5aae3f100846c125decc61eec7cd6563e3f33777
| | | * | am 99370d2d: am ae6965ae: am 3aef3560: am e360f0f6: IAudioPolicyService: ↵Eric Laurent2014-11-101-2/+7
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bound array size in queryDefaultPreProcessing * commit '99370d2da54d7537ffda7fef1f6ef36f8b690321': IAudioPolicyService: bound array size in queryDefaultPreProcessing
| | | | * \ am ae6965ae: am 3aef3560: am e360f0f6: IAudioPolicyService: bound array size ↵Eric Laurent2014-11-101-2/+7
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in queryDefaultPreProcessing * commit 'ae6965ae7664aaea489a8d58358035610075c9af': IAudioPolicyService: bound array size in queryDefaultPreProcessing
| | | | | * \ am 3aef3560: am e360f0f6: IAudioPolicyService: bound array size in ↵Eric Laurent2014-11-101-2/+7
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | queryDefaultPreProcessing * commit '3aef35600523eb6b4ccc8086a8913e80701a031a': IAudioPolicyService: bound array size in queryDefaultPreProcessing
| | | | | | * | IAudioPolicyService: bound array size in queryDefaultPreProcessingEric Laurent2014-11-101-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18226810. Change-Id: Ib8e2bfe835a8681aac50bf23161db14e50c9a124 (cherry picked from commit 74adca9ad30b7f8a70d40c5237bade0d16c4ea58)
* | | | | | | | Merge "MediaSync: support changing surface on the fly." into mnc-devWei Jia2015-05-121-2/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | MediaSync: support changing surface on the fly.Wei Jia2015-05-111-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19666434 Change-Id: I5809df2d3bb0dd6b4a982f11d62c4b7a452ed6fb
* | | | | | | | | Merge "Update sampling rate to 192kHz for devices" into mnc-devAndy Hung2015-05-121-0/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update sampling rate to 192kHz for devicesAndy Hung2015-05-121-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0a83206be51d7ae18ccf85b94b2127356307be69
* | | | | | | | | | Merge "mediaresourcemanager: change resource manager service log to use ring ↵Ronghua Wu2015-05-121-0/+361
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | buffer." into mnc-dev
| * | | | | | | | | | mediaresourcemanager: change resource manager service log to use ring buffer.Ronghua Wu2015-05-111-0/+361
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | move the ring buffer implementation from libcameraservice to media include. also add line prefix support to the service log. Bug: 20637674 Change-Id: Ib6b32f31abe92c42644ef7012f1e3d46220ccfbd
* | | | | | | | | | Merge "Revert "Add camera app op - camera"" into mnc-devSvetoslav Ganov2015-05-122-5/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Revert "Add camera app op - camera"Svetoslav Ganov2015-05-122-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is not needed duplication of work This reverts commit 32fa6d0e65dbf956e253a1006e9419dce2fe75c9. Change-Id: I2c81b0dacb2ed99c408c79c1f9e22a4baa564494
* | | | | | | | | | | Merge "libstagefright: report special error when codec is released by ↵Ronghua Wu2015-05-081-1/+7
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resource manager." into mnc-dev
| * | | | | | | | | | | libstagefright: report special error when codec is released by resource manager.Ronghua Wu2015-05-081-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19620911 Change-Id: I3403da361adbf2ea6979fcadb0d5ad0889d3513e
* | | | | | | | | | | | Merge changes from topic 'codec-surface' into mnc-devLajos Molnar2015-05-082-0/+21
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: stagefright: enable experiments stagefright: allow connecting to surfaces that attach buffers
| * | | | | | | | | | | stagefright: enable experimentsLajos Molnar2015-05-072-0/+21
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20894716 Change-Id: I8c05b99dca8b3099a3a1b2b465f0f58bef786572
* | | | | | | | | | | libstagefright: config resource manager with secure codec co-existing policy.Ronghua Wu2015-05-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19620911 Change-Id: I0d729782c1622f23e9c37b7a9231e58e3f807470
* | | | | | | | | | | Merge "libstagefright: export profiling results directly to xml." into mnc-devRonghua Wu2015-05-081-2/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | libstagefright: export profiling results directly to xml.Ronghua Wu2015-05-051-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19620911 Change-Id: Icdeb1c30816d6de120ea0acd0880b3a9614bea8f
* | | | | | | | | | | stagefright: support push-blank-buffers-on-shutdown for SW rendererLajos Molnar2015-05-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20885565 Change-Id: I2a361b8dd6d39d2cf994f6748ed562be4c642b77
* | | | | | | | | | | stagefright: move native window helpers into SurfaceUtilsLajos Molnar2015-05-073-7/+34
| |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20885565 Change-Id: I2ed14be8a7cb08b1ed4ea65cb9286dc1384fe64a
* | | | | | | | | | Merge "Implement audio device callback" into mnc-devEric Laurent2015-05-064-8/+125
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Implement audio device callbackEric Laurent2015-05-064-8/+125
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add class AudioSystem::AudioDeviceCallback notifying AudioSystem clients upon device selection change on a given input or output thread. Maintain a list of installed callback per I/O handle in AudioSystem and call registered callbacks when an OPEN of CONFIG_CHANGED event is received on IAudioFlingerClient::ioConfigChanged(). Add methods to AudioTrack and AudioRecord to add and remove device change callbacks. Add methods to AudioTrack and AudioRecord to query currently selected device. ioConfigChanged() events now convey the audio patch describing the input or output thread routing. Fix AudioRecord failure to start when invalidation is handled by start(). Change-Id: I9e938adf025fa712337c63b1e02a8c18f2a20d39
* | | | | | | | | Merge "AudioRecord keeps track of UID" into mnc-devJean-Michel Trivi2015-05-052-0/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | AudioRecord keeps track of UIDJean-Michel Trivi2015-05-052-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 20832981 Change-Id: If5f3c61fae02d86b9d6fdf411711f854fd56c77d
* | | | | | | | | | MediaSync: clean up configureAudioTrack and configureSurface.Wei Jia2015-05-041-2/+2
| |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19666434 Change-Id: I579956aad4a6d591b5338d518e610b8532a72402
* | | | | | | | | Add camera app op - cameraSvet Ganov2015-05-022-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I26570cc0a23fdea740b416a26838d40cac296c85
* | | | | | | | | Merge "stagefright: add support for dynamically setting MediaCodec output ↵Lajos Molnar2015-05-023-2/+17
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | surface" into mnc-dev
| * | | | | | | | | stagefright: add support for dynamically setting MediaCodec output surfaceLajos Molnar2015-05-013-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11990461 Change-Id: I2aee89ef504234dc66eb5fcf6e62e1706088f758
* | | | | | | | | | MediaRecorder: implement persistent input surface APIsChong Zhang2015-05-014-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19127604 Bug: 19489395 Change-Id: I7dd8015a8fe029f9867fcdb52322629c77eff50b
* | | | | | | | | | MediaCodec: implement persistent input surface APIsChong Zhang2015-05-016-0/+76
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19127604 Bug: 19489395 Change-Id: Idaf1cc9008016f66903e93907a676f54e342e1a3
* | | | | | | | | Merge "stagefright: MediaCodec: rename mNativeWindow to mSurface" into mnc-devLajos Molnar2015-05-021-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | stagefright: MediaCodec: rename mNativeWindow to mSurfaceLajos Molnar2015-05-011-2/+2
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because mNativeWindow is of type sp<Surface> Bug: 19489395 Change-Id: I5ddc78b04e387915a2293b71195d7a6494986356
* | | | | | | | | Merge "AudioTrack: reduce retrograde motion spew" into mnc-devPhil Burk2015-05-011-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | AudioTrack: reduce retrograde motion spewPhil Burk2015-05-011-0/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I96aced52b136ceea924aa3d9ef56374dd4c49784 Signed-off-by: Phil Burk <philburk@google.com>
* | | | | | | | | Merge "AudioSystem: refactor audio config cache and callbacks" into mnc-devEric Laurent2015-05-013-36/+75
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | AudioSystem: refactor audio config cache and callbacksEric Laurent2015-05-013-36/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up implementation of audio configuration cache and callback events from AudioFlinger: - Define class AudioIoDescriptor for audio input and output configurations outside of AudioSystem class. - Do not use void * but an AudioIoDescriptor as argument to audio config callbacks from AudioFlinger. - Remove unused configuration events. - Move AudioSystem audio input and output cache from static singletons to members of AudioFlingerClient subclass. Change-Id: I67c196c32c09ce2756af0755ee1fe631040c3270
* | | | | | | | | stagefright: remove NativeWindowWrapperLajos Molnar2015-04-301-50/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that Surface and SurfaceTextureClient are the same and Surface, it does not add value. Bug: 19489395 Change-Id: I016ecd1cf5cc51ce6244b6fa34ecd75f84e3db01
* | | | | | | | | stagefright: support setting/getting playback/sync config in MediaSyncLajos Molnar2015-04-308-22/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18249558 Bug: 19666434 Bug: 20057497 Change-Id: I5868b17423d7c20cfaf4a399f3eb67bfba440605
* | | | | | | | | Merge "MediaSync: map returned output buffers to previously received input ↵Wei Jia2015-04-301-0/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | buffers." into mnc-dev
| * | | | | | | | | MediaSync: map returned output buffers to previously received input buffers.Wei Jia2015-04-301-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19666434 Change-Id: I81e9cb8e73d950b3be5d29cf010c6793894ad802
* | | | | | | | | | Merge "AudioTrack: fix spurious retrograde messages" into mnc-devPhil Burk2015-04-301-0/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | AudioTrack: fix spurious retrograde messagesPhil Burk2015-04-291-0/+3
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The retrograde motion was confused by some positions coming from the DSP on offloaded tracks. So the retrograde check was moved up into AudioTrack.cpp. This allows us to take advantage of the checks for invalid positions based on timing. Bug: 2047891 Change-Id: Ifcad2349201443a7f1711347c203297100449536 Signed-off-by: Phil Burk <philburk@google.com>
* | | | | | | | | | Merge "audio policy: session routes continued." into mnc-devEric Laurent2015-04-302-0/+4
|\ \ \ \ \ \ \ \ \ \