OSDN Git Service

android-x86/frameworks-av.git
10 years agoMerge "Remove stream type from AudioSystem::getRenderPosition()"
Glenn Kasten [Wed, 26 Mar 2014 21:13:18 +0000 (21:13 +0000)]
Merge "Remove stream type from AudioSystem::getRenderPosition()"

10 years agoMerge "Use symbol AUDIO_SESSION_OUTPUT_MIX from <system/audio.h>"
Glenn Kasten [Wed, 26 Mar 2014 21:08:12 +0000 (21:08 +0000)]
Merge "Use symbol AUDIO_SESSION_OUTPUT_MIX from <system/audio.h>"

10 years agoMerge "Fix uses of KeyedVector"
Glenn Kasten [Wed, 26 Mar 2014 20:56:04 +0000 (20:56 +0000)]
Merge "Fix uses of KeyedVector"

10 years agoMerge "Remove streamType parameter from AudioSystem::getLatency()"
Glenn Kasten [Wed, 26 Mar 2014 20:44:48 +0000 (20:44 +0000)]
Merge "Remove streamType parameter from AudioSystem::getLatency()"

10 years agoRemove stream type from AudioSystem::getRenderPosition()
Glenn Kasten [Wed, 26 Mar 2014 14:50:05 +0000 (07:50 -0700)]
Remove stream type from AudioSystem::getRenderPosition()

The I/O handle is never equal to AUDIO_IO_HANDLE_NONE,
so the stream type is not needed.

Change-Id: I1ab134a2fa379d6dd0b6167345a856a192d478f9

10 years agoMerge "Remove dead code"
Glenn Kasten [Wed, 26 Mar 2014 18:59:01 +0000 (18:59 +0000)]
Merge "Remove dead code"

10 years agoMerge "Fix log spam when MonoPipe is unable to get local frequency"
Glenn Kasten [Wed, 26 Mar 2014 18:44:40 +0000 (18:44 +0000)]
Merge "Fix log spam when MonoPipe is unable to get local frequency"

10 years agoMerge "Revert "camera: Fix setParameters for Preview FPS single/range values""
Eino-Ville Talvala [Wed, 26 Mar 2014 18:36:18 +0000 (18:36 +0000)]
Merge "Revert "camera: Fix setParameters for Preview FPS single/range values""

10 years agoRevert "camera: Fix setParameters for Preview FPS single/range values"
Eino-Ville Talvala [Wed, 26 Mar 2014 18:10:09 +0000 (18:10 +0000)]
Revert "camera: Fix setParameters for Preview FPS single/range values"

Causes a regression on some devices, so reverting until we're in a position to fix those devices.

This reverts commit 9078a1b3b9f9c0c48046ade0e8e18b0d79a659db.

Bug: 13563098
Change-Id: I7aedd01fde8b8fdee77e972ec395f0ecadbf8ccb

10 years agoMerge "Document AudioSystem::newAudioSessionId() failures"
Glenn Kasten [Wed, 26 Mar 2014 18:27:43 +0000 (18:27 +0000)]
Merge "Document AudioSystem::newAudioSessionId() failures"

10 years agoMerge "Document AudioFlinger::nextUniqueId()"
Glenn Kasten [Wed, 26 Mar 2014 17:38:35 +0000 (17:38 +0000)]
Merge "Document AudioFlinger::nextUniqueId()"

10 years agoRemove dead code
Glenn Kasten [Wed, 26 Mar 2014 15:21:17 +0000 (08:21 -0700)]
Remove dead code

Change-Id: I0878d11451c7bbbf96b59f5fe0cd97ba1f033aa9

10 years agoUse symbol AUDIO_SESSION_OUTPUT_MIX from <system/audio.h>
Glenn Kasten [Wed, 26 Mar 2014 00:41:42 +0000 (17:41 -0700)]
Use symbol AUDIO_SESSION_OUTPUT_MIX from <system/audio.h>

Change-Id: I4e48bb7edcc9f9407ee63bb33d029aca02211d74

10 years agoRemove streamType parameter from AudioSystem::getLatency()
Glenn Kasten [Wed, 26 Mar 2014 00:48:57 +0000 (17:48 -0700)]
Remove streamType parameter from AudioSystem::getLatency()

Change-Id: Ie7346e93436ddc215cad7d16be555dcb6c277d54

10 years agoFix uses of KeyedVector
Glenn Kasten [Fri, 17 Jan 2014 18:21:24 +0000 (10:21 -0800)]
Fix uses of KeyedVector

Constructor for AudioFlinger::mAudioHwDevs was missing, and so
AudioFlinger::findSuitableHwDev_l() could return an undefined pointer
if a non-0 module wasn't found.

A KeyedVector of Plain Old Data (POD) element type must specify the
default value in the constructor, or else the default will be undefined.

Minor:
 - Parameter had wrong type in constructor for AudioSystem::gOutputs.
 - Remove obsolete AudioSystem::gStreamOutputMap.

Change-Id: I9841493e018440e559d8b8b0e4e748ba2b2d365b

10 years agoDocument AudioFlinger::nextUniqueId()
Glenn Kasten [Fri, 17 Jan 2014 20:09:05 +0000 (12:09 -0800)]
Document AudioFlinger::nextUniqueId()

Change-Id: Iafe96f1c10bd85cb23a2553945ca68aa601dc2eb

10 years agoDocument AudioSystem::newAudioSessionId() failures
Glenn Kasten [Fri, 17 Jan 2014 18:25:08 +0000 (10:25 -0800)]
Document AudioSystem::newAudioSessionId() failures

Change-Id: Iaa168722f362c36bdfa87fe20dc0a59b43cf1ca3

10 years agoFix log spam when MonoPipe is unable to get local frequency
Glenn Kasten [Thu, 21 Nov 2013 21:54:25 +0000 (13:54 -0800)]
Fix log spam when MonoPipe is unable to get local frequency

Local frequency does not change, so only ask for it the first time a
MonoPipe is constructed in a given client process.  Thereafter use a
previously cached value.  Likewise, if the local frequency is unavailable,
only log this the first time.

Change-Id: Ib1fc7251c3832e02fe03811db39a87e500f1df50

10 years agoam c3dcf100: (-s ours) am 65550a0e: am 0370be96: DO NOT MERGE: camera: Fix setParamet...
Igor Murashkin [Tue, 25 Mar 2014 21:23:26 +0000 (21:23 +0000)]
am c3dcf100: (-s ours) am 65550a0e: am 0370be96: DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values

* commit 'c3dcf1007aa964f825b2ea2ef86acb7f332e748f':
  DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values

10 years agoam a1aaaf86: am 4f53fe74: Merge "CameraService: deadlock fix"
Eino-Ville Talvala [Tue, 25 Mar 2014 21:22:52 +0000 (21:22 +0000)]
am a1aaaf86: am 4f53fe74: Merge "CameraService: deadlock fix"

* commit 'a1aaaf86cd04eabaf961a30d7b0a9fa857089862':
  CameraService: deadlock fix

10 years agoam 65550a0e: am 0370be96: DO NOT MERGE: camera: Fix setParameters for Preview FPS...
Igor Murashkin [Tue, 25 Mar 2014 20:15:40 +0000 (20:15 +0000)]
am 65550a0e: am 0370be96: DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values

* commit '65550a0e17852fe657795508e3bf05bdbfb2520b':
  DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values

10 years agoam 0370be96: DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range...
Igor Murashkin [Tue, 25 Mar 2014 20:11:09 +0000 (20:11 +0000)]
am 0370be96: DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values

* commit '0370be96e33ea0c8fb4069e704deccce43b7403c':
  DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values

10 years agoam 4f53fe74: Merge "CameraService: deadlock fix"
Eino-Ville Talvala [Tue, 25 Mar 2014 19:09:34 +0000 (19:09 +0000)]
am 4f53fe74: Merge "CameraService: deadlock fix"

* commit '4f53fe74051026e6635ba5bdbed4f1898cb66028':
  CameraService: deadlock fix

10 years agoFix operator precedence
Glenn Kasten [Tue, 25 Mar 2014 18:49:08 +0000 (11:49 -0700)]
Fix operator precedence

Change-Id: I164708a5b76a341a185467b008ecbec98d58a6df

10 years agoDO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
Igor Murashkin [Wed, 19 Mar 2014 01:15:23 +0000 (18:15 -0700)]
DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values

As a workaround, duplicate CameraParameters into CameraParameters2 to
prevent ABI break for some camera HALs that directly link into
CameraParameters.

CameraParameters2 implements the real fixes needed in the framework,
while CameraParameters is left in to satisfy older camera HALs.

Bug: 12609188
Change-Id: I82ea6f5de2183dd046d4bf5683600c97f37ab4da

10 years agoMerge "CameraService: deadlock fix"
Eino-Ville Talvala [Tue, 25 Mar 2014 18:14:01 +0000 (18:14 +0000)]
Merge "CameraService: deadlock fix"

10 years agoMerge "mtp: avoid silent allocation overflow in MtpProperty"
Lajos Molnar [Tue, 25 Mar 2014 14:49:27 +0000 (14:49 +0000)]
Merge "mtp: avoid silent allocation overflow in MtpProperty"

10 years agoCameraService: deadlock fix
Kalle Lampila [Tue, 30 Apr 2013 12:27:19 +0000 (15:27 +0300)]
CameraService: deadlock fix

Release lock before return from CameraService::dump()

Change-Id: Ia20b0921fc675a284f3b7f8d26e0e3596b5a8774
Signed-off-by: Kalle Lampila <kallex.lampila@intel.com>
10 years agomtp: avoid silent allocation overflow in MtpProperty
Lajos Molnar [Mon, 24 Mar 2014 23:18:36 +0000 (16:18 -0700)]
mtp: avoid silent allocation overflow in MtpProperty

Bug: 13006907
Change-Id: Ice0352394840132c9c2ce6c28366632c792a32c0

10 years agoMerge "Camera3: Fix flush call deadlock"
Zhijun He [Tue, 25 Mar 2014 01:08:25 +0000 (01:08 +0000)]
Merge "Camera3: Fix flush call deadlock"

10 years agoam 5c679d41: resolved conflicts for merge of 3d7c5002 to klp-modular-dev-plus-aosp
Colin Cross [Mon, 24 Mar 2014 19:36:36 +0000 (19:36 +0000)]
am 5c679d41: resolved conflicts for merge of 3d7c5002 to klp-modular-dev-plus-aosp

* commit '5c679d41714e42f153f6aeb492df54510a195bc1':
  libcameraservice: build 64-bit
  libcameraservice: fix 64-bit print format warnings

10 years agoam ba139033: (-s ours) am 30890210: am 333ceb4f: Merge "DO NOT MERGE: PlaylistFetcher...
Lajos Molnar [Mon, 24 Mar 2014 17:34:26 +0000 (17:34 +0000)]
am ba139033: (-s ours) am 30890210: am 333ceb4f: Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS." into klp-dev

* commit 'ba1390335794a38472bf0349568bc4f199dc5c90':
  DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.

10 years agoCamera3: Fix flush call deadlock
Zhijun He [Mon, 24 Mar 2014 01:44:49 +0000 (18:44 -0700)]
Camera3: Fix flush call deadlock

Flush shouldn't call waitUntilDrained directly, as they are all API calls
with mLock and mInterfaceLock held. Move the waitUntilDrained implementation
into waitUntilDrainedLocked to solve this issue.

Change-Id: Id7d931091d5c11e12204790841097433515446db

10 years agoresolved conflicts for merge of 3d7c5002 to klp-modular-dev-plus-aosp
Colin Cross [Sat, 22 Mar 2014 00:43:32 +0000 (17:43 -0700)]
resolved conflicts for merge of 3d7c5002 to klp-modular-dev-plus-aosp

Change-Id: Ia6d87d56174d1388c1148fb55b6e4bc57d8666db

10 years agoam d1afbf13: am 1bfb8f76: am f622e2c7: Increased recorded MP4 max file size to 4GB...
Rachad [Sat, 22 Mar 2014 00:29:17 +0000 (00:29 +0000)]
am d1afbf13: am 1bfb8f76: am f622e2c7: Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 bytes -- FAT32 max file size)

* commit 'd1afbf1372488bd927afdbb2ca49a3000511125f':
  Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 bytes -- FAT32 max file size)

10 years agoMerge changes I9f28bc42,I135620e0
Colin Cross [Sat, 22 Mar 2014 00:23:15 +0000 (00:23 +0000)]
Merge changes I9f28bc42,I135620e0

* changes:
  libcameraservice: build 64-bit
  libcameraservice: fix 64-bit print format warnings

10 years agoMerge "CameraService: Add support for burst capture and repeating burst."
Jianing Wei [Sat, 22 Mar 2014 00:04:19 +0000 (00:04 +0000)]
Merge "CameraService: Add support for burst capture and repeating burst."

10 years agoCameraService: Add support for burst capture and repeating burst.
Jianing Wei [Thu, 13 Mar 2014 01:29:36 +0000 (18:29 -0700)]
CameraService: Add support for burst capture and repeating burst.

Bug: 10749500
Change-Id: I292a485b222e5cf97388d76bf0d956a6ac54bb2f

10 years agolibcameraservice: build 64-bit
Colin Cross [Fri, 21 Mar 2014 22:09:19 +0000 (15:09 -0700)]
libcameraservice: build 64-bit

libcameraservice builds fine for 64-bit, remove LOCAL_32_BIT_ONLY

Change-Id: I9f28bc42dc424dee9b92e6ab092f86d3aa1419b7

10 years agolibcameraservice: fix 64-bit print format warnings
Colin Cross [Fri, 21 Mar 2014 22:04:25 +0000 (15:04 -0700)]
libcameraservice: fix 64-bit print format warnings

Use PRId64 from inttypes.h to print nsecs_t (int64_t)
Use %zu to print size_t

Change-Id: I135620e0388db33587a8a7da393b48a45cb7275a

10 years agoMerge "stagefright: initial media_codecs_google*.xml files"
Lajos Molnar [Fri, 21 Mar 2014 19:29:14 +0000 (19:29 +0000)]
Merge "stagefright: initial media_codecs_google*.xml files"

10 years agoam 30890210: am 333ceb4f: Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop...
Lajos Molnar [Fri, 21 Mar 2014 19:26:31 +0000 (19:26 +0000)]
am 30890210: am 333ceb4f: Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS." into klp-dev

* commit '3089021031d6ad0f2b330567f108aec03fa13994':
  DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.

10 years agoam 333ceb4f: Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing...
Lajos Molnar [Fri, 21 Mar 2014 19:20:27 +0000 (19:20 +0000)]
am 333ceb4f: Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS." into klp-dev

* commit '333ceb4f66ccf790081026f645474e07d832fbdb':
  DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.

10 years agoMerge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS." into...
Lajos Molnar [Fri, 21 Mar 2014 19:09:48 +0000 (19:09 +0000)]
Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS." into klp-dev

10 years agoDO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.
Robert Shih [Fri, 7 Feb 2014 20:26:58 +0000 (12:26 -0800)]
DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.

First check for embedded ID3 tag, then bail out if invalid.

Bug: 12934795
Change-Id: I74acebed4bfb2c6ca44dfe936166fdba8510233f

10 years agoam 1bfb8f76: am f622e2c7: Increased recorded MP4 max file size to 4GB (more precisely...
Rachad [Fri, 21 Mar 2014 17:11:22 +0000 (17:11 +0000)]
am 1bfb8f76: am f622e2c7: Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 bytes -- FAT32 max file size)

* commit '1bfb8f762dd21b39756fd8fd9990172cae1cef79':
  Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 bytes -- FAT32 max file size)

10 years agoam f622e2c7: Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 bytes...
Rachad [Fri, 21 Mar 2014 17:08:11 +0000 (17:08 +0000)]
am f622e2c7: Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 bytes -- FAT32 max file size)

* commit 'f622e2c78407b50806a53a06a89b2b6546420f55':
  Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 bytes -- FAT32 max file size)

10 years agoIncreased recorded MP4 max file size to 4GB
Rachad [Tue, 11 Feb 2014 00:54:46 +0000 (16:54 -0800)]
Increased recorded MP4 max file size to 4GB
(more precisely 2^32-1 bytes -- FAT32 max file size)

bug: 11039801
Change-Id: I6169f798c59d123d02d5fd7afa3b9e645ebdb598
(cherry picked from commit 1f1f2b1678fd0d038dfc501252dd2b65ecf10cae)

10 years agoMerge "audio policy: add option to use new policy manager"
Eric Laurent [Fri, 21 Mar 2014 01:09:34 +0000 (01:09 +0000)]
Merge "audio policy: add option to use new policy manager"

10 years agoam 84f7a5b2: (-s ours) am 9ec86fa0: am a577eefb: am 5be9c1da: am 01eed3c0: am 7a107b8...
Marco Nelissen [Thu, 20 Mar 2014 23:12:54 +0000 (23:12 +0000)]
am 84f7a5b2: (-s ours) am 9ec86fa0: am a577eefb: am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build

* commit '84f7a5b28a686f9a165e1df5c90a72b218a87568':
  Fix build

10 years agoam fb08bd76: (-s ours) am 994cbef7: am 2853e48c: am 6f65db14: am 0e0891f8: am 6cdc90b...
Marco Nelissen [Thu, 20 Mar 2014 22:11:41 +0000 (22:11 +0000)]
am fb08bd76: (-s ours) am 994cbef7: am 2853e48c: am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates

* commit 'fb08bd765844160649f23c0e5ee76772678528ba':
  Verify certificates

10 years agoam 9ec86fa0: am a577eefb: am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061: am...
Marco Nelissen [Thu, 20 Mar 2014 21:02:03 +0000 (21:02 +0000)]
am 9ec86fa0: am a577eefb: am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build

* commit '9ec86fa05479cc468859c69009afda752ea46539':
  Fix build

10 years agoam a577eefb: am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am...
Marco Nelissen [Thu, 20 Mar 2014 20:57:12 +0000 (20:57 +0000)]
am a577eefb: am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build

* commit 'a577eefbaca24d1b9ac947daca54be1992888748':
  Fix build

10 years agoam 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am...
Marco Nelissen [Thu, 20 Mar 2014 20:48:52 +0000 (20:48 +0000)]
am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build

* commit '5be9c1daf956c35d37585d21fff5d6b99f506560':
  Fix build

10 years agoam 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix...
Marco Nelissen [Thu, 20 Mar 2014 20:29:33 +0000 (13:29 -0700)]
am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build

* commit '01eed3c0fb951e349d68f4bce818bef22e7925b1':
  Fix build

10 years agoam 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build
Marco Nelissen [Thu, 20 Mar 2014 20:18:07 +0000 (13:18 -0700)]
am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build

* commit '7a107b857e658ba11c0c1fd2325ac91a2c0569a2':
  Fix build

10 years agoam 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build
Marco Nelissen [Thu, 20 Mar 2014 20:13:35 +0000 (13:13 -0700)]
am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build

* commit '854aa061b1e2d7eaaf8ffa2ead323c1478393c57':
  Fix build

10 years agoam 42ba5806: am 72499628: am 25bab830: Fix build
Marco Nelissen [Thu, 20 Mar 2014 20:08:17 +0000 (13:08 -0700)]
am 42ba5806: am 72499628: am 25bab830: Fix build

* commit '42ba5806c03753a39f85016265173819ac465745':
  Fix build

10 years agoam 72499628: am 25bab830: Fix build
Marco Nelissen [Thu, 20 Mar 2014 20:04:11 +0000 (13:04 -0700)]
am 72499628: am 25bab830: Fix build

* commit '72499628a24ccea0befe726de6e2b32176ddf208':
  Fix build

10 years agoam 25bab830: Fix build
Marco Nelissen [Thu, 20 Mar 2014 20:00:07 +0000 (13:00 -0700)]
am 25bab830: Fix build

* commit '25bab830af062dcaef6f75220066b221fd30957e':
  Fix build

10 years agoFix build
Marco Nelissen [Thu, 20 Mar 2014 19:32:48 +0000 (12:32 -0700)]
Fix build

As of jb-mr1, need to explicitly include library dependencies. The original
change in jb, which the automerger dutyfully merged, did not need this.

Change-Id: I429637e2d01b8084376bb97a02bb091a0ea9eaf7

10 years agoam 994cbef7: am 2853e48c: am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am...
Marco Nelissen [Thu, 20 Mar 2014 19:09:03 +0000 (19:09 +0000)]
am 994cbef7: am 2853e48c: am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates

* commit '994cbef7361b0f304883ea463488342347ed67b8':
  Verify certificates

10 years agoam 2853e48c: am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am...
Marco Nelissen [Thu, 20 Mar 2014 18:58:42 +0000 (18:58 +0000)]
am 2853e48c: am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates

* commit '2853e48c855fc95f2bd7bf9438a878f2a79d75a7':
  Verify certificates

10 years agoam 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am...
Marco Nelissen [Thu, 20 Mar 2014 18:17:24 +0000 (18:17 +0000)]
am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates

* commit '6f65db14e310b513c8943b236a6e61cf27cef4c7':
  Verify certificates

10 years agoam 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am...
Marco Nelissen [Thu, 20 Mar 2014 18:08:43 +0000 (11:08 -0700)]
am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates

* commit '0e0891f8b49f31e6a28b563f86aae537e66bb6e0':
  Verify certificates

10 years agoam 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am...
Marco Nelissen [Thu, 20 Mar 2014 17:49:15 +0000 (10:49 -0700)]
am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates

* commit '6cdc90b5e41374dd665df3ae7283ef0c1f532678':
  Verify certificates

10 years agoam ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify...
Marco Nelissen [Thu, 20 Mar 2014 17:31:32 +0000 (10:31 -0700)]
am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates

* commit 'ebc9b47330ab8565f7bdd9b3973a8f75e3206e77':
  Verify certificates

10 years agoam fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:27:04 +0000 (10:27 -0700)]
am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates

* commit 'fb49b8bad468db591f55a7064181372f02ad94a2':
  Verify certificates

10 years agoam dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:21:14 +0000 (10:21 -0700)]
am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates

* commit 'dfd90c8052a913ed2bbbea1873ee51838d40bfe1':
  Verify certificates

10 years agoam d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:16:53 +0000 (10:16 -0700)]
am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates

* commit 'd434944b00cf83a38019047e0d7db155a15d77f4':
  Verify certificates

10 years agoam 3bc4f7ea: am 0c271b75: Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:11:20 +0000 (10:11 -0700)]
am 3bc4f7ea: am 0c271b75: Verify certificates

* commit '3bc4f7eaf063201dc85ecc2f7c2bf2b70ab564ed':
  Verify certificates

10 years agoam 0c271b75: Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:04:18 +0000 (10:04 -0700)]
am 0c271b75: Verify certificates

* commit '0c271b750f7314e187f8479f478ad9382d9a9045':
  Verify certificates

10 years agostagefright: initial media_codecs_google*.xml files
Lajos Molnar [Wed, 19 Mar 2014 22:21:53 +0000 (15:21 -0700)]
stagefright: initial media_codecs_google*.xml files

Separated description of Google-provided codecs into their own
files based on domain.  Google-provided audio/telephony codecs
should be included prior to specifying vendor codecs.  Google-
provided video codecs should be included after vendor codecs.

Bug: 13549114
Change-Id: I216f01feaf0379c6cd7d8714e02792fdf2214a90

10 years agoMerge "A few fixes in SW VP8 encoder:"
Alex Glaznev [Thu, 20 Mar 2014 00:47:28 +0000 (00:47 +0000)]
Merge "A few fixes in SW VP8 encoder:"

10 years agocamera: Fix setParameters for Preview FPS single/range values
Igor Murashkin [Wed, 19 Mar 2014 01:15:23 +0000 (18:15 -0700)]
camera: Fix setParameters for Preview FPS single/range values

Bug: 12609188
Change-Id: I82ea6f5de2183dd046d4bf5683600c97f37ab4db

10 years agolibstagefright: fix 64-bit warnings
Colin Cross [Wed, 19 Mar 2014 23:59:00 +0000 (16:59 -0700)]
libstagefright: fix 64-bit warnings

%lld -> %" PRId64 " for int64_t
%d -> %zu for size_t
Also fixes some casts from void* to integer types, and some comparisons
between signed and unsigned.

Change-Id: I9c52f76240e39399da252c66459042a6fc626a90

10 years agoA few fixes in SW VP8 encoder:
Alex Glaznev [Tue, 25 Feb 2014 21:50:39 +0000 (13:50 -0800)]
A few fixes in SW VP8 encoder:

- Increase encoder output buffer size to 1 Mb to avoid buffer
  overrun when encoding high complexity HD frames.

- Store output port format parameters.

- Use same VP8 encoder settings as in WebRTC when encoder is
  configured to run in CBR mode.

Bug: b/12924516
Bug: b/12908952
Change-Id: Ida884efd0cd1a7272998f5835abd290bfb19b2ac

10 years agoMerge "Add MediaPlayer::getAudioStreamType."
John Spurlock [Wed, 19 Mar 2014 21:57:42 +0000 (21:57 +0000)]
Merge "Add MediaPlayer::getAudioStreamType."

10 years agoMerge commit 'c250980f' into manualmerge
Glenn Kasten [Wed, 19 Mar 2014 21:15:27 +0000 (14:15 -0700)]
Merge commit 'c250980f' into manualmerge

Change-Id: I254d456e8cb6c580dd77d602b391bed09110454e

10 years agoam 24e1bd71: Merge "libstagefright is no longer 32 bit only."
Glenn Kasten [Wed, 19 Mar 2014 21:04:56 +0000 (21:04 +0000)]
am 24e1bd71: Merge "libstagefright is no longer 32 bit only."

* commit '24e1bd71ac6850d9062b3bd803b37c0e92f69c7a':
  libstagefright is no longer 32 bit only.

10 years agoMerge "libstagefright is no longer 32 bit only."
Glenn Kasten [Wed, 19 Mar 2014 20:58:48 +0000 (20:58 +0000)]
Merge "libstagefright is no longer 32 bit only."

10 years agoam 08298357: am bd7bde79: Merge "Use libaudioresampler instead of libaudioflinger"
Glenn Kasten [Wed, 19 Mar 2014 20:46:50 +0000 (20:46 +0000)]
am 08298357: am bd7bde79: Merge "Use libaudioresampler instead of libaudioflinger"

* commit '08298357a2fb8fe9574a32187c68f34ec356e3a8':
  Use libaudioresampler instead of libaudioflinger

10 years agoMerge "Use more tags to help the ICU detector."
Marco Nelissen [Wed, 19 Mar 2014 20:41:08 +0000 (20:41 +0000)]
Merge "Use more tags to help the ICU detector."

10 years agoam bd7bde79: Merge "Use libaudioresampler instead of libaudioflinger"
Glenn Kasten [Wed, 19 Mar 2014 20:37:03 +0000 (20:37 +0000)]
am bd7bde79: Merge "Use libaudioresampler instead of libaudioflinger"

* commit 'bd7bde794c587dc9443c22abd3bcaa78fd804615':
  Use libaudioresampler instead of libaudioflinger

10 years agoMerge "Use libaudioresampler instead of libaudioflinger"
Glenn Kasten [Wed, 19 Mar 2014 20:29:11 +0000 (20:29 +0000)]
Merge "Use libaudioresampler instead of libaudioflinger"

10 years agoam bd1f8f0a: am fb28c384: am 1faa4170: stagefright: allow for minUndequeuedBufs to...
Lajos Molnar [Wed, 19 Mar 2014 20:27:59 +0000 (20:27 +0000)]
am bd1f8f0a: am fb28c384: am 1faa4170: stagefright: allow for minUndequeuedBufs to be one less

* commit 'bd1f8f0a5cc55761edfbd2a472e229dd4b0d2cdf':
  stagefright: allow for minUndequeuedBufs to be one less

10 years agoresolved conflicts for merge of f40c4c56 to master
Glenn Kasten [Wed, 19 Mar 2014 20:21:51 +0000 (13:21 -0700)]
resolved conflicts for merge of f40c4c56 to master

Change-Id: Ifd5385ad42a81e02e6a6afc6281f09fbff361671

10 years agoam fb28c384: am 1faa4170: stagefright: allow for minUndequeuedBufs to be one less
Lajos Molnar [Wed, 19 Mar 2014 20:00:39 +0000 (20:00 +0000)]
am fb28c384: am 1faa4170: stagefright: allow for minUndequeuedBufs to be one less

* commit 'fb28c384316518f699e7dd3e9149c9e84b05a525':
  stagefright: allow for minUndequeuedBufs to be one less

10 years agoam 1faa4170: stagefright: allow for minUndequeuedBufs to be one less
Lajos Molnar [Wed, 19 Mar 2014 19:56:15 +0000 (19:56 +0000)]
am 1faa4170: stagefright: allow for minUndequeuedBufs to be one less

* commit '1faa41704e0b976e546321effcb09a85767d51ba':
  stagefright: allow for minUndequeuedBufs to be one less

10 years agoam 36817364: Merge "Add libaudioresampler"
Glenn Kasten [Wed, 19 Mar 2014 19:56:09 +0000 (19:56 +0000)]
am 36817364: Merge "Add libaudioresampler"

* commit '36817364738d4c45adc3e448fbec02a9611bfeda':
  Add libaudioresampler

10 years agoMerge "Add libaudioresampler"
Glenn Kasten [Wed, 19 Mar 2014 19:45:28 +0000 (19:45 +0000)]
Merge "Add libaudioresampler"

10 years agoAdd MediaPlayer::getAudioStreamType.
John Spurlock [Wed, 19 Mar 2014 17:05:45 +0000 (13:05 -0400)]
Add MediaPlayer::getAudioStreamType.

Change-Id: I9cd8a718d2873543609aa651fd85749478f4f89f

10 years agostagefright: allow for minUndequeuedBufs to be one less
Lajos Molnar [Wed, 19 Mar 2014 19:22:01 +0000 (12:22 -0700)]
stagefright: allow for minUndequeuedBufs to be one less

Bug: 13533477
Change-Id: I909324e3e24f65d8051e0d5474267620efcfc729

10 years agolibstagefright is no longer 32 bit only.
Narayan Kamath [Wed, 19 Mar 2014 16:07:30 +0000 (09:07 -0700)]
libstagefright is no longer 32 bit only.

Change-Id: I88d5fcfc005a2c2acd0246cdd9c08b6c00b6c39b
Signed-off-by: Glenn Kasten <gkasten@android.com>
10 years agoUse libaudioresampler instead of libaudioflinger
Glenn Kasten [Wed, 19 Mar 2014 16:05:59 +0000 (09:05 -0700)]
Use libaudioresampler instead of libaudioflinger

in order to be able to build libvideoeditor as 64-bit also.

libaudioresampler is available in both 32-bit and 64-bit,
unlike libaudioflinger which is currently 32-bit only.

Change-Id: Id63857da877b1e45b7c1f8e35f18dca6600be3f7

10 years agoAdd libaudioresampler
Glenn Kasten [Wed, 19 Mar 2014 16:05:08 +0000 (09:05 -0700)]
Add libaudioresampler

libaudioresampler is available in both 32-bit and 64-bit,
unlike libaudioflinger which is currently 32-bit only.

Bug: 8141282
Change-Id: I839f7b4e6aaed6984012ca6d514323f927669df6

10 years agostagefright: add include support for MediaCodecList xml parser
Lajos Molnar [Wed, 19 Mar 2014 02:46:52 +0000 (19:46 -0700)]
stagefright: add include support for MediaCodecList xml parser

One can include full-formed XML files using <Include href=".." />.
For security/simplicity, file names must be in the form of
"media_codecs_.*\.xml"

Change-Id: Id039a4fd0ade390224485fcf5ecc1d107b2bdb9a

10 years agoVerify certificates
Marco Nelissen [Thu, 13 Mar 2014 21:18:25 +0000 (14:18 -0700)]
Verify certificates

b/13418320

Cherrypicked from 8a57d24c733b08da846b54d1adf029e606b5a5f3
https://googleplex-android-review.git.corp.google.com/#/c/433309/

Change-Id: I3052dd5f9ec057e700784cd713f6a7dab9ecfe7b

10 years agoUse more tags to help the ICU detector.
Marco Nelissen [Tue, 18 Mar 2014 21:00:39 +0000 (14:00 -0700)]
Use more tags to help the ICU detector.

The detector only gave non-ascii data to ICU. In some cases that could
result in very short data, for which ICU would issue a low confidence
level for the actual encoding. By padding the data with additional
(ascii) tags, we improve accuracy for such files. Becauses this can
reduce accuracy in other cases, only do this when the initial confidence
is low.

b/13473604

Change-Id: I63d932043155c310b0e358cdf2d37787961e94b7

10 years agoam 129c7653: am 9cde5172: am b635b0e6: mediaplayer: keep more buffers with the Buffer...
Lajos Molnar [Wed, 19 Mar 2014 03:24:56 +0000 (03:24 +0000)]
am 129c7653: am 9cde5172: am b635b0e6: mediaplayer: keep more buffers with the BufferQueue

* commit '129c76538570cd42fce2154bfb0aec934cf84ff3':
  mediaplayer: keep more buffers with the BufferQueue