OSDN Git Service

android-x86/frameworks-av.git
9 years agoRTSP: clear data/eos status before returning from seek
Robert Shih [Tue, 14 Jul 2015 00:59:36 +0000 (17:59 -0700)]
RTSP: clear data/eos status before returning from seek

The original RTSP seek implementation involves pausing and restarting
a session. This change clears data/eos status after an rtsp session
is paused for a seek, and delays the seek to return after data/eos
status are cleared.

Bug: 22207372
Change-Id: I1bdf65653f90436f7ee5d7fe85eeadc1598a0d56

9 years agoMerge "SimpleSoftOMXComponent: change CHECK to error notification." into mnc-dev
Wei Jia [Thu, 9 Jul 2015 23:17:33 +0000 (23:17 +0000)]
Merge "SimpleSoftOMXComponent: change CHECK to error notification." into mnc-dev

9 years agoaudio policy: session route: move SessionRoute to common
François Gaffie [Wed, 8 Jul 2015 07:46:05 +0000 (09:46 +0200)]
audio policy: session route: move SessionRoute to common

Move the SessionRoute and SessionRouteMap inner class from policy
manager to common policy pillars as initiated by the refactor.

This code was added at teh wrong place by commit aa981194.

Bug: 22376521.

Change-Id: I29aca21614e409c59aae4b7b14163552fb0bffb1
Signed-off-by: François Gaffie <francois.gaffie@intel.com>
9 years agoMerge "audio policy: add support for device combo with speaker safe" into mnc-dev
Eric Laurent [Thu, 9 Jul 2015 18:51:13 +0000 (18:51 +0000)]
Merge "audio policy: add support for device combo with speaker safe" into mnc-dev

9 years agoMerge "SoftAVCDec: fail gracefully in onQueueFilled" into mnc-dev
Robert Shih [Thu, 9 Jul 2015 17:32:06 +0000 (17:32 +0000)]
Merge "SoftAVCDec: fail gracefully in onQueueFilled" into mnc-dev

9 years agoSoftAVCDec: fail gracefully in onQueueFilled
Hamsalekha S [Thu, 25 Jun 2015 01:45:35 +0000 (18:45 -0700)]
SoftAVCDec: fail gracefully in onQueueFilled

Bug: 21942104
Change-Id: Ia3b16b39b53c3a4678f4bba9e80dd0a715409520

9 years agoSimpleSoftOMXComponent: change CHECK to error notification.
Wei Jia [Tue, 7 Jul 2015 21:29:25 +0000 (14:29 -0700)]
SimpleSoftOMXComponent: change CHECK to error notification.

SoftAVCDec, SoftMPEG4: fix handling of zero-byte input buffer.

ACodec: do not send empty input buffer without EOS to the omx component.

Bug: 22199127
Change-Id: I0bbcf5778f969ba6e30d0db31770c4289e2b64a4

9 years agoMerge "MPEG4Source::fragmentedRead: check range before writing into buffers" into...
Robert Shih [Wed, 8 Jul 2015 21:30:32 +0000 (21:30 +0000)]
Merge "MPEG4Source::fragmentedRead: check range before writing into buffers" into mnc-dev

9 years agoMerge "AudioFlinger: reset frame position on standby" into mnc-dev
Phil Burk [Wed, 8 Jul 2015 17:56:23 +0000 (17:56 +0000)]
Merge "AudioFlinger: reset frame position on standby" into mnc-dev

9 years agoAudioFlinger: reset frame position on standby
Phil Burk [Mon, 6 Jul 2015 23:24:14 +0000 (16:24 -0700)]
AudioFlinger: reset frame position on standby

The HAL does not reset the frame position on standby().
But applications expect the frame position to be reset.
So we subtract the position at standby from the current position.

Bug: 21724210
Bug: 21930805
Change-Id: I0c4520ba1c6c06a580f45f6bafc8cf1d56969f07
Signed-off-by: Phil Burk <philburk@google.com>
9 years agoMPEG4Source::fragmentedRead: check range before writing into buffers
Robert Shih [Tue, 23 Jun 2015 00:58:27 +0000 (17:58 -0700)]
MPEG4Source::fragmentedRead: check range before writing into buffers

Bug: 22008959
Change-Id: I5f6e188adcc593796455bdaf7b0b8aba672b106e

9 years agoaudio policy: add support for device combo with speaker safe
Eric Laurent [Thu, 2 Jul 2015 22:30:23 +0000 (15:30 -0700)]
audio policy: add support for device combo with speaker safe

combo devices with AUDIO_DEVICE_OUT_SPEAKER_SAFE were not
supported by audio policy manager causing selection
of speaker+headphone when spekaer_safe+headphone would be
the right selection.

Bug: 21537010.
Change-Id: I9865352559c9d32c6754ad3d2b84bddfe2dc8aac

9 years agoMerge "NuPlayer: disable pre-start preview for audio only sources" into mnc-dev
Robert Shih [Tue, 7 Jul 2015 20:22:57 +0000 (20:22 +0000)]
Merge "NuPlayer: disable pre-start preview for audio only sources" into mnc-dev

9 years agoMerge "camera2: Fix native binder interface and add tests." into mnc-dev
Ruben Brunk [Tue, 7 Jul 2015 19:31:52 +0000 (19:31 +0000)]
Merge "camera2: Fix native binder interface and add tests." into mnc-dev

9 years agoNuPlayer: disable pre-start preview for audio only sources
Robert Shih [Mon, 6 Jul 2015 22:09:10 +0000 (15:09 -0700)]
NuPlayer: disable pre-start preview for audio only sources

Bug: 22117876
Change-Id: I0e00ff8f081d80946cbd19028f1f786c1b8268f3

9 years agoMerge "CameraModule: fix getCameraInfo()" into mnc-dev
Chien-Yu Chen [Tue, 7 Jul 2015 17:19:15 +0000 (17:19 +0000)]
Merge "CameraModule: fix getCameraInfo()" into mnc-dev

9 years agoaudio: Do not delete PatchRecord before Peer is stopped
Eric Laurent [Tue, 7 Jul 2015 01:32:01 +0000 (18:32 -0700)]
audio: Do not delete PatchRecord before Peer is stopped

PatchPanel::clearPatchConnections deletes PatchRecord before
the peer PatchTrack is stopped. This can cause an access to already
free'ed memory leading to a crash in PatchTrack::getNextBuffer.

Fix is to delete PatchRecord and PatchTrack only after removing
both of them from active tracks list

Bug: 22304526.
Change-Id: I7003756d3d2dd8912ce5e3b2fc31f5e82f455888

9 years agocamera2: Fix native binder interface and add tests.
Ruben Brunk [Tue, 16 Jun 2015 18:00:37 +0000 (11:00 -0700)]
camera2: Fix native binder interface and add tests.

- Add CameraBinderTests for limited coverage of native
  camera2 binder interfaces for the camera service.
- Fix several bugs in the native binder interfaces.

Bug: 18468810
Change-Id: Iab2d81a5cacd20daf7454aeeed033cc13d88452c

9 years agoCameraModule: fix getCameraInfo()
Chien-Yu Chen [Thu, 2 Jul 2015 00:08:03 +0000 (17:08 -0700)]
CameraModule: fix getCameraInfo()

Remove mCameraCharacteristicsMap.

CameraModule kept a CameraMetadata in mCameraCharacteristicsMap
and kept its camera_metadata in mCameraInfoMap. When CameraMetadata
gets moved in mCameraCharacteristicsMap, it may clone a new
camera_metadata and free the old one. So the original
camera_metadata stored in mCameraCharacteristicsMap becomes invalid.

Bug: 22171288
Change-Id: Ia8e99fe42989946bc952ad23abb296aeac60da83

9 years agoMerge "audio policy: fix regression in incall notification management" into mnc-dev
Eric Laurent [Mon, 6 Jul 2015 22:11:33 +0000 (22:11 +0000)]
Merge "audio policy: fix regression in incall notification management" into mnc-dev

9 years agoMerge "audio: add definitions for devices connected over IP" into mnc-dev
Eric Laurent [Mon, 6 Jul 2015 21:48:31 +0000 (21:48 +0000)]
Merge "audio: add definitions for devices connected over IP" into mnc-dev

9 years agoaudio: add definitions for devices connected over IP
Eric Laurent [Wed, 1 Jul 2015 00:09:20 +0000 (17:09 -0700)]
audio: add definitions for devices connected over IP

Bug: 22068684.
Change-Id: Idde0eaf7121d2e43f32eee3e6b10e99d8cff4912

9 years agoFix build warning
Glenn Kasten [Mon, 6 Jul 2015 17:53:26 +0000 (10:53 -0700)]
Fix build warning

Change-Id: I876edc37fb2093ee13c876c2af5c46512763154d

9 years agoMerge "audiopolicy: Update flag enum tables for the new flags" into mnc-dev
Glenn Kasten [Mon, 6 Jul 2015 17:48:29 +0000 (17:48 +0000)]
Merge "audiopolicy: Update flag enum tables for the new flags" into mnc-dev

9 years agoaudio policy: fix regression in incall notification management
Eric Laurent [Fri, 3 Jul 2015 00:10:28 +0000 (17:10 -0700)]
audio policy: fix regression in incall notification management

Commit 2110e04c introduced a regression preventing ongoing alarms to
be restored when exiting a call and leaving the replacement tone
playing for ever.

Also add missing management of accessibility prompts when entering a
call.

Bug: 21857005.
Change-Id: I4295c791c003db42c0fba9f618e51f60438158d1

9 years agoaudiopolicy: Update flag enum tables for the new flags
Ravi Kumar Alamanda [Thu, 2 Jul 2015 19:30:46 +0000 (12:30 -0700)]
audiopolicy: Update flag enum tables for the new flags

Without an entry in sOutputFlagNameToEnumTable or sInputFlagNameToEnumTable,
a profile with specific output/input flag in the audio_policy.conf will
not be detected by AudioPolicyManager.

Bug: 19230391

Change-Id: I94bb3594e2eb8b57747b474a253da3551263c59a

9 years agoMerge "stagefright: prevent allocating stale buffers for OMX decoders" into mnc-dev
Lajos Molnar [Wed, 1 Jul 2015 21:00:13 +0000 (21:00 +0000)]
Merge "stagefright: prevent allocating stale buffers for OMX decoders" into mnc-dev

9 years agostagefright: fix deadlock and NPE in GraphicBufferSource
Lajos Molnar [Wed, 1 Jul 2015 19:06:40 +0000 (12:06 -0700)]
stagefright: fix deadlock and NPE in GraphicBufferSource

Bug: 22202388
Change-Id: I04f2f783ecc0e0c50adf16a666f6d7ab4221e285

9 years agoam 907d0c52: (-s ours) am 9cc01515: am 4e2a1310: am fc9c5e60: am d5d23f64: am 36d73ea...
Eric Laurent [Wed, 1 Jul 2015 17:51:13 +0000 (17:51 +0000)]
am 907d0c52: (-s ours) am 9cc01515: am 4e2a1310: am fc9c5e60: am d5d23f64: am 36d73eab: am 0e35e4f9: am c655561b: (-s ours) am 29b83cbb: DO NOT MERGE - audio effects: fix heap overflow

* commit '907d0c529b28f03814baccb86421ba376d6203c9':
  DO NOT MERGE - audio effects: fix heap overflow

9 years agoresolved conflicts for merge of ca12af3f to mnc-dev
Wei Jia [Wed, 1 Jul 2015 17:30:26 +0000 (10:30 -0700)]
resolved conflicts for merge of ca12af3f to mnc-dev

Change-Id: Ibbdba6437ec3d201454cafe72008357e32bab7e5

9 years agoMerge "Camera3-Device: Fix AE lock available" into mnc-dev
Chien-Yu Chen [Wed, 1 Jul 2015 17:10:50 +0000 (17:10 +0000)]
Merge "Camera3-Device: Fix AE lock available" into mnc-dev

9 years agoMerge "libstagefright: parse /etc/media_codecs_performance.xml for performance data...
Ronghua Wu [Wed, 1 Jul 2015 14:27:36 +0000 (14:27 +0000)]
Merge "libstagefright: parse /etc/media_codecs_performance.xml for performance data." into mnc-dev

9 years agoMerge "Fix SoftMP3 divide by 0" into mnc-dev
Andy Hung [Wed, 1 Jul 2015 00:46:44 +0000 (00:46 +0000)]
Merge "Fix SoftMP3 divide by 0" into mnc-dev

9 years agostagefright: prevent allocating stale buffers for OMX decoders
Lajos Molnar [Fri, 26 Jun 2015 22:33:17 +0000 (15:33 -0700)]
stagefright: prevent allocating stale buffers for OMX decoders

Also fix some issues encountered once using generationNumbers:
- properly account outstanding buffers in MediaSync
- don't release arbitrary frame if attach fails

Bug: 11990461
Change-Id: Icee5ea188ca4eb856138feb5e6ec5d4ee5e44008

9 years agoam 9cc01515: am 4e2a1310: am fc9c5e60: am d5d23f64: am 36d73eab: am 0e35e4f9: am...
Eric Laurent [Tue, 30 Jun 2015 22:03:19 +0000 (22:03 +0000)]
am 9cc01515: am 4e2a1310: am fc9c5e60: am d5d23f64: am 36d73eab: am 0e35e4f9: am c655561b: (-s ours) am 29b83cbb: DO NOT MERGE - audio effects: fix heap overflow

* commit '9cc015156455abb0d575573f3c9ac2793b9abfa2':
  DO NOT MERGE - audio effects: fix heap overflow

9 years agoam 2d80c0a1: am a549658b: am 7397892d: am 402eaab9: am 370290f4: am bcd5edf9: am...
Wei Jia [Tue, 30 Jun 2015 22:03:18 +0000 (22:03 +0000)]
am 2d80c0a1: am a549658b: am 7397892d: am 402eaab9: am 370290f4: am bcd5edf9: am 13c925ca: am 6ff53b96: Merge "Prevent integer overflow when processing covr MPEG4 atoms" into klp-dev

* commit '2d80c0a13c40f29d2a4b4aca8765705cbb4b2fe8':
  Prevent integer overflow when processing covr MPEG4 atoms

9 years agoam 4e2a1310: am fc9c5e60: am d5d23f64: am 36d73eab: am 0e35e4f9: am c655561b: (-s...
Eric Laurent [Tue, 30 Jun 2015 21:49:08 +0000 (21:49 +0000)]
am 4e2a1310: am fc9c5e60: am d5d23f64: am 36d73eab: am 0e35e4f9: am c655561b: (-s ours) am 29b83cbb: DO NOT MERGE - audio effects: fix heap overflow

* commit '4e2a1310fd455b1c0ad7607312e0a79d858fc0ed':
  DO NOT MERGE - audio effects: fix heap overflow

9 years agoam a549658b: am 7397892d: am 402eaab9: am 370290f4: am bcd5edf9: am 13c925ca: am...
Wei Jia [Tue, 30 Jun 2015 21:49:06 +0000 (21:49 +0000)]
am a549658b: am 7397892d: am 402eaab9: am 370290f4: am bcd5edf9: am 13c925ca: am 6ff53b96: Merge "Prevent integer overflow when processing covr MPEG4 atoms" into klp-dev

* commit 'a549658bb6eca9dd0dbd9f3c6fb2911dda127e65':
  Prevent integer overflow when processing covr MPEG4 atoms

9 years agoam fc9c5e60: am d5d23f64: am 36d73eab: am 0e35e4f9: am c655561b: (-s ours) am 29b83cb...
Eric Laurent [Tue, 30 Jun 2015 21:29:00 +0000 (21:29 +0000)]
am fc9c5e60: am d5d23f64: am 36d73eab: am 0e35e4f9: am c655561b: (-s ours) am 29b83cbb: DO NOT MERGE - audio effects: fix heap overflow

* commit 'fc9c5e6048becb1a671a0015d4ab343346b2fa0f':
  DO NOT MERGE - audio effects: fix heap overflow

9 years agoam 7397892d: am 402eaab9: am 370290f4: am bcd5edf9: am 13c925ca: am 6ff53b96: Merge...
Wei Jia [Tue, 30 Jun 2015 21:28:59 +0000 (21:28 +0000)]
am 7397892d: am 402eaab9: am 370290f4: am bcd5edf9: am 13c925ca: am 6ff53b96: Merge "Prevent integer overflow when processing covr MPEG4 atoms" into klp-dev

* commit '7397892d72ec97eaddcade24d0427468a3f89c0b':
  Prevent integer overflow when processing covr MPEG4 atoms

9 years agoFix SoftMP3 divide by 0
Andy Hung [Mon, 1 Jun 2015 04:31:02 +0000 (21:31 -0700)]
Fix SoftMP3 divide by 0

Bug: 21525346
Change-Id: I19f1ec0f4e9571bd6aeb26efbcba5f16dc664e47

9 years agoam d5d23f64: am 36d73eab: am 0e35e4f9: am c655561b: (-s ours) am 29b83cbb: DO NOT...
Eric Laurent [Tue, 30 Jun 2015 20:11:54 +0000 (20:11 +0000)]
am d5d23f64: am 36d73eab: am 0e35e4f9: am c655561b: (-s ours) am 29b83cbb: DO NOT MERGE - audio effects: fix heap overflow

* commit 'd5d23f6438cd77f18a93658b1bb67326d5f7c73b':
  DO NOT MERGE - audio effects: fix heap overflow

9 years agoam 402eaab9: am 370290f4: am bcd5edf9: am 13c925ca: am 6ff53b96: Merge "Prevent integ...
Wei Jia [Tue, 30 Jun 2015 20:11:53 +0000 (20:11 +0000)]
am 402eaab9: am 370290f4: am bcd5edf9: am 13c925ca: am 6ff53b96: Merge "Prevent integer overflow when processing covr MPEG4 atoms" into klp-dev

* commit '402eaab965809c09f1fdbd79533444d8b21b9afa':
  Prevent integer overflow when processing covr MPEG4 atoms

9 years agoam 36d73eab: am 0e35e4f9: am c655561b: (-s ours) am 29b83cbb: DO NOT MERGE - audio...
Eric Laurent [Tue, 30 Jun 2015 20:00:15 +0000 (20:00 +0000)]
am 36d73eab: am 0e35e4f9: am c655561b: (-s ours) am 29b83cbb: DO NOT MERGE - audio effects: fix heap overflow

* commit '36d73eab51912060b3159c5ddacdd96bf636260f':
  DO NOT MERGE - audio effects: fix heap overflow

9 years agoam 370290f4: am bcd5edf9: am 13c925ca: am 6ff53b96: Merge "Prevent integer overflow...
Wei Jia [Tue, 30 Jun 2015 20:00:12 +0000 (20:00 +0000)]
am 370290f4: am bcd5edf9: am 13c925ca: am 6ff53b96: Merge "Prevent integer overflow when processing covr MPEG4 atoms" into klp-dev

* commit '370290f400ff3057a71a192a70dfd69499aa8937':
  Prevent integer overflow when processing covr MPEG4 atoms

9 years agoam 0e35e4f9: am c655561b: (-s ours) am 29b83cbb: DO NOT MERGE - audio effects: fix...
Eric Laurent [Tue, 30 Jun 2015 19:45:13 +0000 (19:45 +0000)]
am 0e35e4f9: am c655561b: (-s ours) am 29b83cbb: DO NOT MERGE - audio effects: fix heap overflow

* commit '0e35e4f902801b2a5375078d13aba1578de7e424':
  DO NOT MERGE - audio effects: fix heap overflow

9 years agoam bcd5edf9: am 13c925ca: am 6ff53b96: Merge "Prevent integer overflow when processin...
Wei Jia [Tue, 30 Jun 2015 19:45:12 +0000 (19:45 +0000)]
am bcd5edf9: am 13c925ca: am 6ff53b96: Merge "Prevent integer overflow when processing covr MPEG4 atoms" into klp-dev

* commit 'bcd5edf99867b7bc10a3847d17cfb1e63b3b1764':
  Prevent integer overflow when processing covr MPEG4 atoms

9 years agoMerge "ignore buffers that's already removed" into mnc-dev
Chong Zhang [Tue, 30 Jun 2015 19:38:15 +0000 (19:38 +0000)]
Merge "ignore buffers that's already removed" into mnc-dev

9 years agoam c655561b: (-s ours) am 29b83cbb: DO NOT MERGE - audio effects: fix heap overflow
Eric Laurent [Tue, 30 Jun 2015 18:21:44 +0000 (18:21 +0000)]
am c655561b: (-s ours) am 29b83cbb: DO NOT MERGE - audio effects: fix heap overflow

* commit 'c655561b3580ae7ba3a721e69ac240606e11fab8':
  DO NOT MERGE - audio effects: fix heap overflow

9 years agoam 13c925ca: am 6ff53b96: Merge "Prevent integer overflow when processing covr MPEG4...
Wei Jia [Tue, 30 Jun 2015 18:21:32 +0000 (18:21 +0000)]
am 13c925ca: am 6ff53b96: Merge "Prevent integer overflow when processing covr MPEG4 atoms" into klp-dev

* commit '13c925cab2decaed6786b0642f2b5a9f8516e71a':
  Prevent integer overflow when processing covr MPEG4 atoms

9 years agoCamera3-Device: Fix AE lock available
Chien-Yu Chen [Tue, 30 Jun 2015 18:20:58 +0000 (11:20 -0700)]
Camera3-Device: Fix AE lock available

Pass whether AE lock is available when creating the request thread
because when the request thread was created, its parent's info
was not set yet.

Bug: 20494782
Change-Id: I11ed3f99c473955c437e81f3e1d704c15a9ca1a4

9 years agoMerge "stagefright: ask for flex-YUV camera buffers for software encoders" into mnc-dev
Lajos Molnar [Mon, 29 Jun 2015 22:42:47 +0000 (22:42 +0000)]
Merge "stagefright: ask for flex-YUV camera buffers for software encoders" into mnc-dev

9 years agoignore buffers that's already removed
Chong Zhang [Mon, 29 Jun 2015 19:51:39 +0000 (12:51 -0700)]
ignore buffers that's already removed

bug: 22005018
Change-Id: I892a0fe77519d5fb996bcb4cc95e0d10e859000c

9 years agoMerge "libstagefright: only do boot time codec profiling for debugging." into mnc-dev
Ronghua Wu [Sat, 27 Jun 2015 00:23:32 +0000 (00:23 +0000)]
Merge "libstagefright: only do boot time codec profiling for debugging." into mnc-dev

9 years agoMerge "reduce number of binder calls from mediaserver" into mnc-dev
Eric Laurent [Sat, 27 Jun 2015 00:16:34 +0000 (00:16 +0000)]
Merge "reduce number of binder calls from mediaserver" into mnc-dev

9 years agostagefright: ask for flex-YUV camera buffers for software encoders
Lajos Molnar [Fri, 26 Jun 2015 00:04:09 +0000 (17:04 -0700)]
stagefright: ask for flex-YUV camera buffers for software encoders

Bug: 13222807
Change-Id: I854b73a63cf9239311729598241725d84e8513aa

9 years agoreduce number of binder calls from mediaserver
Eric Laurent [Fri, 26 Jun 2015 16:39:24 +0000 (09:39 -0700)]
reduce number of binder calls from mediaserver

Reduce the number of audio port, audio patch and
IO config changed binder calls from mediaserver to
client processes:
- Do not call IO config changed callback if selected
device is the same as previously selected one on a given
audio flinger playback or capture thread.
- Do not call the audio port or audo patch list update
callback on a client if this client as no listener registered.

Bug: 22045560.

Change-Id: If780e105404de79b7cb5c80c27b793ceb6b1c423

9 years agolibstagefright: only do boot time codec profiling for debugging.
Ronghua Wu [Thu, 25 Jun 2015 23:14:35 +0000 (16:14 -0700)]
libstagefright: only do boot time codec profiling for debugging.

and remove "max-supported-instances".

Bug: 22089269
Change-Id: Ia786105d3371926b90a559649b9495f5c1397cea

9 years agoMerge "libstagefright: parse concurrent-instances." into mnc-dev
Ronghua Wu [Thu, 25 Jun 2015 22:14:57 +0000 (22:14 +0000)]
Merge "libstagefright: parse concurrent-instances." into mnc-dev

9 years agolibstagefright: parse concurrent-instances.
Ronghua Wu [Thu, 25 Jun 2015 21:13:04 +0000 (14:13 -0700)]
libstagefright: parse concurrent-instances.

Bug: 22089269
Change-Id: I43c04e7fbc88dd1ec3fe21bcf4acf2e2e8cab25a

9 years agoMerge "audio policy: fix several device descriptor issues." into mnc-dev
Eric Laurent [Thu, 25 Jun 2015 19:07:44 +0000 (19:07 +0000)]
Merge "audio policy: fix several device descriptor issues." into mnc-dev

9 years agoaudio policy: fix several device descriptor issues.
Eric Laurent [Thu, 25 Jun 2015 18:48:20 +0000 (11:48 -0700)]
audio policy: fix several device descriptor issues.

- checkOutputsForDevice() should only clear device descriptor attributes
if the device is digital.
- checkInputsForDevice() did not clear device descriptor attributes at all.
- AudioPort::clearCapabilities() and importAudioPort() should not
manage gains as these are device specific.
- importAudioPort() should load a default port config.

Bug: 21990937.
Change-Id: Ida762ed8f9baaabae392cb4291eff1a8d3009751

9 years agoSoftAVCEnc: Added support for Main Profile encoding.
Doney Alex [Mon, 1 Jun 2015 12:44:02 +0000 (18:14 +0530)]
SoftAVCEnc: Added support for Main Profile encoding.

Configured intra frame interval and deblock in setParams.

Change-Id: If501fa0ac42f2c4bf6604ea84715f7f13f707e74

9 years agoClear the executable bit from source files
Martin Storsjo [Tue, 9 Jun 2015 17:57:37 +0000 (20:57 +0300)]
Clear the executable bit from source files

The executable bit was accidentally set on these files in commits
eedcd5cccc and ec7398f37.

Change-Id: I057e8841ad12561b05c4dc9553ca1cd664c7f59c

9 years agoMerge "Camera3: Support AE precapture trigger CANCEL" into mnc-dev
Chien-Yu Chen [Wed, 24 Jun 2015 23:03:14 +0000 (23:03 +0000)]
Merge "Camera3: Support AE precapture trigger CANCEL" into mnc-dev

9 years agoCamera3: Support AE precapture trigger CANCEL
Chien-Yu Chen [Tue, 23 Jun 2015 02:49:01 +0000 (19:49 -0700)]
Camera3: Support AE precapture trigger CANCEL

Support AE precapture trigger CANCEL for devices <= API
version 3.2.

Bug: 20494782
Change-Id: I6003ba8057ca4ec9e8dfda47b8411ae6be913d22

9 years agomerge in mnc-release history after reset to mnc-dev
The Android Automerger [Wed, 24 Jun 2015 09:52:48 +0000 (02:52 -0700)]
merge in mnc-release history after reset to mnc-dev

9 years agoam ac85eb2c: am 020c15b7: am 867e38cc: am ffdc54b6: am 3f0b4976: am 4c855d20: am...
Eric Laurent [Wed, 24 Jun 2015 00:10:25 +0000 (00:10 +0000)]
am ac85eb2c: am 020c15b7: am 867e38cc: am ffdc54b6: am 3f0b4976: am 4c855d20: am 6368e6d2: audio effects: fix heap overflow

* commit 'ac85eb2ce87fd3a58931c119bd2209285b9a8c98':
  audio effects: fix heap overflow

9 years agoMerge "Add default for pre-distortion active array." into mnc-dev
Ruben Brunk [Tue, 23 Jun 2015 23:33:31 +0000 (23:33 +0000)]
Merge "Add default for pre-distortion active array." into mnc-dev

9 years agoam 020c15b7: am 867e38cc: am ffdc54b6: am 3f0b4976: am 4c855d20: am 6368e6d2: audio...
Eric Laurent [Tue, 23 Jun 2015 23:04:15 +0000 (23:04 +0000)]
am 020c15b7: am 867e38cc: am ffdc54b6: am 3f0b4976: am 4c855d20: am 6368e6d2: audio effects: fix heap overflow

* commit '020c15b763345e237c0df79e638d94dc0b6f9de8':
  audio effects: fix heap overflow

9 years agomerge in mnc-release history after reset to mnc-dev
The Android Automerger [Tue, 23 Jun 2015 08:03:08 +0000 (01:03 -0700)]
merge in mnc-release history after reset to mnc-dev

9 years agoam 867e38cc: am ffdc54b6: am 3f0b4976: am 4c855d20: am 6368e6d2: audio effects: fix...
Eric Laurent [Tue, 23 Jun 2015 02:06:31 +0000 (02:06 +0000)]
am 867e38cc: am ffdc54b6: am 3f0b4976: am 4c855d20: am 6368e6d2: audio effects: fix heap overflow

* commit '867e38cc6db0a34798d8ad8c9ad89d8fa462cbb6':
  audio effects: fix heap overflow

9 years agoam ffdc54b6: am 3f0b4976: am 4c855d20: am 6368e6d2: audio effects: fix heap overflow
Eric Laurent [Tue, 23 Jun 2015 01:52:41 +0000 (01:52 +0000)]
am ffdc54b6: am 3f0b4976: am 4c855d20: am 6368e6d2: audio effects: fix heap overflow

* commit 'ffdc54b607a787324d967b81ee586fd706672c05':
  audio effects: fix heap overflow

9 years agoam 3f0b4976: am 4c855d20: am 6368e6d2: audio effects: fix heap overflow
Eric Laurent [Tue, 23 Jun 2015 01:38:50 +0000 (01:38 +0000)]
am 3f0b4976: am 4c855d20: am 6368e6d2: audio effects: fix heap overflow

* commit '3f0b4976ec8023c5cad92b21ac3064d63d1aa581':
  audio effects: fix heap overflow

9 years agoam 29b83cbb: DO NOT MERGE - audio effects: fix heap overflow
Eric Laurent [Tue, 23 Jun 2015 01:32:08 +0000 (01:32 +0000)]
am 29b83cbb: DO NOT MERGE - audio effects: fix heap overflow

* commit '29b83cbb9018e53a18cf6e0fb34893f9774dcb96':
  DO NOT MERGE - audio effects: fix heap overflow

9 years agoam 4c855d20: am 6368e6d2: audio effects: fix heap overflow
Eric Laurent [Tue, 23 Jun 2015 01:29:00 +0000 (01:29 +0000)]
am 4c855d20: am 6368e6d2: audio effects: fix heap overflow

* commit '4c855d207edaaeb8c61109977a5297418295658c':
  audio effects: fix heap overflow

9 years agoam 6368e6d2: audio effects: fix heap overflow
Eric Laurent [Tue, 23 Jun 2015 01:14:34 +0000 (01:14 +0000)]
am 6368e6d2: audio effects: fix heap overflow

* commit '6368e6d23ca27cd59a9a1876d6b5a2301a8657ed':
  audio effects: fix heap overflow

9 years agoDO NOT MERGE - audio effects: fix heap overflow
Eric Laurent [Fri, 19 Jun 2015 22:33:57 +0000 (15:33 -0700)]
DO NOT MERGE - audio effects: fix heap overflow

Check consistency of effect command reply sizes before
copying to reply address.

Also add null pointer check on reply size.
Also remove unused parameter warning.

Bug: 21953516.
Change-Id: I4cf00c12eaed696af28f3b7613f7e36f47a160c4

9 years agoMerge "Using centralized isAudioPlaybackRateValid to validate parameters" into mnc-dev
Ricardo Garcia [Tue, 23 Jun 2015 00:25:07 +0000 (00:25 +0000)]
Merge "Using centralized isAudioPlaybackRateValid to validate parameters" into mnc-dev

9 years agoUsing centralized isAudioPlaybackRateValid to validate parameters
Ricardo Garcia [Fri, 1 May 2015 01:39:16 +0000 (18:39 -0700)]
Using centralized isAudioPlaybackRateValid to validate parameters

Centralized validation code
bug: 20701446

Change-Id: I9d9941c7639c05b2afe069ff4f858c693c910bfe

9 years agoAdd default for pre-distortion active array.
Ruben Brunk [Mon, 22 Jun 2015 21:26:51 +0000 (14:26 -0700)]
Add default for pre-distortion active array.

Bug: 20491394
Change-Id: I53b0539b37cc7a042e6765c97775b8c2bbba7159

9 years agostagefright: allow state change while handling OMX message list
Lajos Molnar [Sat, 20 Jun 2015 00:40:28 +0000 (17:40 -0700)]
stagefright: allow state change while handling OMX message list

Bug: 21724210
Bug: 21925253
Change-Id: Id1c055ce611d4632ae13fbc69d79b65caf657a2a

9 years agostagefright: handle removal of a tracked buffer in ACodec
Lajos Molnar [Fri, 19 Jun 2015 22:23:36 +0000 (15:23 -0700)]
stagefright: handle removal of a tracked buffer in ACodec

Bug: 21815057
Change-Id: Idd1c71b4b0b68028020c3e10615936870ffd2dec

9 years agoMerge "Add property to ignore audio effects on the platform" into mnc-dev
Jean-Michel Trivi [Mon, 22 Jun 2015 18:09:23 +0000 (18:09 +0000)]
Merge "Add property to ignore audio effects on the platform" into mnc-dev

9 years agoMerge "Fix for Visualizer release bug" into mnc-dev
Ricardo Garcia [Mon, 22 Jun 2015 17:56:31 +0000 (17:56 +0000)]
Merge "Fix for Visualizer release bug" into mnc-dev

9 years agoAdd property to ignore audio effects on the platform
Jean-Michel Trivi [Fri, 19 Jun 2015 19:26:52 +0000 (12:26 -0700)]
Add property to ignore audio effects on the platform

Use boolean property ro.audio.ignore_effects to load or ignore the
  audio effects.

Bug 21906334

Change-Id: I778f8b10a1caf25f7679705b1c83775223df011d

9 years agoMerge "Fix FastMixer high bit depth Hal support" into mnc-dev
Andy Hung [Mon, 22 Jun 2015 15:41:41 +0000 (15:41 +0000)]
Merge "Fix FastMixer high bit depth Hal support" into mnc-dev

9 years agoMerge "stagefright: relax check of OMX buffer header - again" into mnc-dev
Lajos Molnar [Mon, 22 Jun 2015 05:04:58 +0000 (05:04 +0000)]
Merge "stagefright: relax check of OMX buffer header - again" into mnc-dev

9 years agoMerge "stagefright: allow state change while handling OMX message list" into mnc-dev
Lajos Molnar [Mon, 22 Jun 2015 05:03:03 +0000 (05:03 +0000)]
Merge "stagefright: allow state change while handling OMX message list" into mnc-dev

9 years agostagefright: relax check of OMX buffer header - again
Lajos Molnar [Fri, 12 Jun 2015 19:52:27 +0000 (12:52 -0700)]
stagefright: relax check of OMX buffer header - again

- move check to after FillBufferDone only.
- add support for NULL graphicBuffer - just in case

Bug: 21773260
Change-Id: Ibf03511f1d04425e29b63fe4e560e0d8ba6ea20e

9 years agoaudio effects: fix heap overflow
Eric Laurent [Fri, 19 Jun 2015 22:33:57 +0000 (15:33 -0700)]
audio effects: fix heap overflow

Check consistency of effect command reply sizes before
copying to reply address.

Also add null pointer check on reply size.
Also remove unused parameter warning.

Bug: 21953516.
Change-Id: I4cf00c12eaed696af28f3b7613f7e36f47a160c4
(cherry picked from commit 0f714a464d2425afe00d6450535e763131b40844)

9 years agoMerge "audio effects: fix heap overflow" into mnc-dev
Eric Laurent [Sat, 20 Jun 2015 01:18:10 +0000 (01:18 +0000)]
Merge "audio effects: fix heap overflow" into mnc-dev

9 years agoMerge "stagefright: handle removal of a tracked buffer in ACodec" into mnc-dev
Lajos Molnar [Sat, 20 Jun 2015 01:13:42 +0000 (01:13 +0000)]
Merge "stagefright: handle removal of a tracked buffer in ACodec" into mnc-dev

9 years agostagefright: allow state change while handling OMX message list
Lajos Molnar [Sat, 20 Jun 2015 00:40:28 +0000 (17:40 -0700)]
stagefright: allow state change while handling OMX message list

Bug: 21724210
Bug: 21925253
Change-Id: Id1c055ce611d4632ae13fbc69d79b65caf657a2a

9 years agoaudio effects: fix heap overflow
Eric Laurent [Fri, 19 Jun 2015 22:33:57 +0000 (15:33 -0700)]
audio effects: fix heap overflow

Check consistency of effect command reply sizes before
copying to reply address.

Also add null pointer check on reply size.
Also remove unused parameter warning.

Bug: 21953516.
Change-Id: I4cf00c12eaed696af28f3b7613f7e36f47a160c4

9 years agoMerge "AudioFlinger: reset SPDIF encoder on flush" into mnc-dev
Phil Burk [Sat, 20 Jun 2015 00:48:07 +0000 (00:48 +0000)]
Merge "AudioFlinger: reset SPDIF encoder on flush" into mnc-dev

9 years agoFix FastMixer high bit depth Hal support
Andy Hung [Sat, 20 Jun 2015 00:34:53 +0000 (17:34 -0700)]
Fix FastMixer high bit depth Hal support

Bug: 21959591
Change-Id: Ia3351ea5644b36852a1f0dad1314beac97d840e1

9 years agoFix for Visualizer release bug
Ricardo Garcia [Fri, 19 Jun 2015 04:01:53 +0000 (21:01 -0700)]
Fix for Visualizer release bug

Setting callback reference to NULL before requesting exit.

bug: 21804802
Change-Id: I54323959686880f4e7a10b766850f8c86c06edb6

9 years agoAudioFlinger: reset SPDIF encoder on flush
Phil Burk [Thu, 18 Jun 2015 22:37:08 +0000 (15:37 -0700)]
AudioFlinger: reset SPDIF encoder on flush

This may prevent corrupt data from reaching the AVR.

Bug: 19604395
Change-Id: I3dbdd002326917b9f14dda46a3e5170e1ec799bb
Signed-off-by: Phil Burk <philburk@google.com>
9 years agostagefright: handle removal of a tracked buffer in ACodec
Lajos Molnar [Fri, 19 Jun 2015 22:23:36 +0000 (15:23 -0700)]
stagefright: handle removal of a tracked buffer in ACodec

Bug: 21815057
Change-Id: Idd1c71b4b0b68028020c3e10615936870ffd2dec