1406 Commits

Author SHA1 Message Date
Andreas Huber
45bd1159fa am 02654f01: Merge "On this particular device the hardware video decoder spits out buffers that don\'t actually contain our video data, so we cannot use them to restore the video frame after suspend/resume." into gingerbread
Merge commit '02654f01bc6bd2e581b4a1d2409ecea217294fa2' into gingerbread-plus-aosp

* commit '02654f01bc6bd2e581b4a1d2409ecea217294fa2':
  On this particular device the hardware video decoder spits out buffers that don't actually contain our video data, so we cannot use them to restore the video frame after suspend/resume.
2010-10-07 14:02:01 -07:00
Jeff Brown
d577cfd73a Merge "Switch Looper back to using poll() instead of epoll()." into gingerbread 2010-10-07 13:29:56 -07:00
Jeff Brown
415d8c3819 Switch Looper back to using poll() instead of epoll().
Added a couple of micro-optimizations to avoid calling wake() unnecessarily
and reduce JNI overhead slightly.

Fixed a minor issue where we were not clearing the "next" field of Messages
returned by the MessageQueue so the Message would hold on to its successor
and potentially prevent the GC from collecting it if the message were leaked
somehow.

Change-Id: I488d29417ce0cdd7d0e447cda76ec978ef7f811c
2010-10-07 13:26:39 -07:00
Andreas Huber
a458719bb6 am 56ee1080: am 17bc4f65: Merge "Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out." into gingerbread
Merge commit '56ee1080f004110bff622e5b60c243d9cabfe120'

* commit '56ee1080f004110bff622e5b60c243d9cabfe120':
  Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out.
2010-10-07 12:21:33 -07:00
Jeff Brown
928b5bfa7d am 56364bcd: am 78d15acf: Merge "Make secure views tolerate IME overlays." into gingerbread
Merge commit '56364bcd0d1a1b064db3e83fdb64f948ce5c2ad7'

* commit '56364bcd0d1a1b064db3e83fdb64f948ce5c2ad7':
  Make secure views tolerate IME overlays.
2010-10-07 12:20:45 -07:00
Andreas Huber
4c19bf9833 Work to support switching transport streams mid-stream and signalling discontinuities to the decoder.
Change-Id: I7150e5e7342e1117c524856b204aadcb763e06ed
related-to-bug: 2368598
2010-10-07 11:41:43 -07:00
Andreas Huber
1e19416383 On this particular device the hardware video decoder spits out buffers that don't actually contain our video data, so we cannot use them to restore the video frame after suspend/resume.
Change-Id: I1b8fe68c1766299844fe84ebbff49cb8b3e4cc7c
related-to-bug: 3070094
2010-10-07 09:19:25 -07:00
James Dong
cf2bdd1fd8 Merge "0-memcpy video recording framework" 2010-10-07 08:11:26 -07:00
James Dong
769bb2aaa4 0-memcpy video recording framework
Part II: proposed camera hal change

Change-Id: I51663cf5de2b00f71e4ff1828080094676065444
2010-10-07 02:09:03 -07:00
Mathias Agopian
499f518400 am ff04e97f: am f4619308: Merge "fix [2835280] Add support for cancelling buffers to ANativeWindow" into gingerbread
Merge commit 'ff04e97faf75c435e453d4c1caf7eeac8b9c1ceb'

* commit 'ff04e97faf75c435e453d4c1caf7eeac8b9c1ceb':
  fix [2835280] Add support for cancelling buffers to ANativeWindow
2010-10-06 17:07:39 -07:00
James Dong
8c4a042984 am a86a6c4e: am 6f1c7bda: Merge "Fixed an issue where the reserved free space in the file writer was larger than intended" into gingerbread
Merge commit 'a86a6c4e326bfdfc351dacca95b23bb78f78efbe'

* commit 'a86a6c4e326bfdfc351dacca95b23bb78f78efbe':
  Fixed an issue where the reserved free space in the file writer was larger than intended
2010-10-06 16:17:14 -07:00
Kenny Root
4f65ea6055 am bfa33b94: am f84a5918: Merge "Use pread() in ZipFileRO for Linux" into gingerbread
Merge commit 'bfa33b9484e2c0a019ab81f30261b9696df23a9b'

* commit 'bfa33b9484e2c0a019ab81f30261b9696df23a9b':
  Use pread() in ZipFileRO for Linux
2010-10-05 17:02:42 -07:00
Andreas Huber
56ee1080f0 am 17bc4f65: Merge "Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out." into gingerbread
Merge commit '17bc4f65324a823598e7671256c815bf32ddcc95' into gingerbread-plus-aosp

* commit '17bc4f65324a823598e7671256c815bf32ddcc95':
  Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out.
2010-10-05 14:13:16 -07:00
Andreas Huber
c743f4506f Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out.
Change-Id: Id574a0203efcb5e565f1b0fe77869fc33b9a9d56
2010-10-05 13:53:39 -07:00
Jeff Brown
56364bcd0d am 78d15acf: Merge "Make secure views tolerate IME overlays." into gingerbread
Merge commit '78d15acfb20269ce263ce19514a2c0e7a98409e2' into gingerbread-plus-aosp

* commit '78d15acfb20269ce263ce19514a2c0e7a98409e2':
  Make secure views tolerate IME overlays.
2010-10-05 13:17:04 -07:00
Jeff Brown
19dfc83c37 Make secure views tolerate IME overlays.
Change-Id: I3cf09b9d91045f4d9c558b4aace482a7b0bbd3d8
2010-10-05 12:26:23 -07:00
Mathias Agopian
ff04e97faf am f4619308: Merge "fix [2835280] Add support for cancelling buffers to ANativeWindow" into gingerbread
Merge commit 'f461930872beb4362998642c115691bdd2e94617' into gingerbread-plus-aosp

* commit 'f461930872beb4362998642c115691bdd2e94617':
  fix [2835280] Add support for cancelling buffers to ANativeWindow
2010-10-04 20:21:14 -07:00
Mathias Agopian
8ddd2c72ee fix [2835280] Add support for cancelling buffers to ANativeWindow
There is a new ANativeWindow::cancelBuffer() API that can be used to
cancel any dequeued buffer, BEFORE it's been enqueued. The buffer is
returned to the list of availlable buffers. dequeue and cancel are not
mutually thread safe, they must be called from the same thread or
external synchronization must be used.

Change-Id: I86cc7985bace8b6a93ad2c75d2bef5c3c2cb4d61
2010-10-04 20:10:11 -07:00
Mathias Agopian
bba3b8efbe am 19058877: Merge "refactored screenshot code" into gingerbread
Merge commit '19058877df9bf94f197a72855f810f7f6bf8d068' into gingerbread-plus-aosp

* commit '19058877df9bf94f197a72855f810f7f6bf8d068':
  refactored screenshot code
2010-10-04 20:06:51 -07:00
Mathias Agopian
19058877df Merge "refactored screenshot code" into gingerbread 2010-10-04 20:04:42 -07:00
James Dong
a86a6c4e32 am 6f1c7bda: Merge "Fixed an issue where the reserved free space in the file writer was larger than intended" into gingerbread
Merge commit '6f1c7bda39774fe3a1febf72b03c8ad481c1ea54' into gingerbread-plus-aosp

* commit '6f1c7bda39774fe3a1febf72b03c8ad481c1ea54':
  Fixed an issue where the reserved free space in the file writer was larger than intended
2010-10-04 18:39:52 -07:00
James Dong
6f1c7bda39 Merge "Fixed an issue where the reserved free space in the file writer was larger than intended" into gingerbread 2010-10-04 18:37:48 -07:00
Mathias Agopian
597c7f67b5 refactored screenshot code
the core screenshot function now can capture the screen at any lower resolution
performing bilinear filtering.

we also now have some client code to interface with the screenshot service.

it's now possible to request a screenshot at a lower resolution.

Change-Id: I33689bba98507ab928d0898b21596d0d2fe4b953
2010-10-04 17:36:17 -07:00
Kenny Root
bfa33b9484 am f84a5918: Merge "Use pread() in ZipFileRO for Linux" into gingerbread
Merge commit 'f84a5918f5e0572c0280fa705970ef7459b45393' into gingerbread-plus-aosp

* commit 'f84a5918f5e0572c0280fa705970ef7459b45393':
  Use pread() in ZipFileRO for Linux
2010-10-04 17:12:10 -07:00
James Dong
6a9e39ac55 Fixed an issue where the reserved free space in the file writer was larger than intended
The problem was that even though user does not explicitly request the max file size
limit via MediaRecorder.setMaxFileSize(), the file writer sets an implicit file
size limit if 32-bit file offset is used on user's behalf. The reserved free space
is estimated based on the file size, if the file size limit is set by the user.

The fix is to add an extra bool to tell the difference between an
explit requested file size and an implicit file limit and use that
to set the estimated moov box size accordingly.

Change-Id: I731aca6c7833aa764ed7b905edb77721577471b3
2010-10-04 16:54:59 -07:00
Kenny Root
259ec46e8e Use pread() in ZipFileRO for Linux
AssetManager instances are created by zygote and passed to all its
children so that they don't have to individually open
frameworks-res.apk. This creates a problem for determining the current
file offset when using lseek() on those files, because you can't
guarantee the cross-process locking of a mutex. Luckily, Linux
implements pread() to get around this suckiness.

The problem is that only Linux implements this, so we have to keep the
old locking for use on host builds with aapt and friends. aapt doesn't
have this same problem of sharing file descriptors across forked
processes, so we can keep the local AutoMutex to protect accesses of
those files.

Change-Id: Ibe9f11499a53fe345f50fbaea438815ec0fd363e
2010-10-04 15:17:19 -07:00
Kenny Root
6d95c0d941 am ac754073: am b58b2714: Merge "ZipFileRO: moar logging and wrap close" into gingerbread
Merge commit 'ac7540733cafcca5bdb1842e1ebcb396ba064583'

* commit 'ac7540733cafcca5bdb1842e1ebcb396ba064583':
  ZipFileRO: moar logging and wrap close
2010-10-04 07:54:06 -07:00
Kenny Root
ac7540733c am b58b2714: Merge "ZipFileRO: moar logging and wrap close" into gingerbread
Merge commit 'b58b27142a936aa76897a7040c08b8a0989a685b' into gingerbread-plus-aosp

* commit 'b58b27142a936aa76897a7040c08b8a0989a685b':
  ZipFileRO: moar logging and wrap close
2010-10-04 07:41:11 -07:00
Kenny Root
b58b27142a Merge "ZipFileRO: moar logging and wrap close" into gingerbread 2010-10-04 07:28:20 -07:00
Takeshi Aimi
dc549d60f9 Update of DRM framework.
- Change "void" type of return value to "int" for returning status.
  - Add some of overloaded Java APIs which accept database Uri as input.
  - Add asynchronous APIs
  - Add OnEventListener and OnErrorListener for asynchronous APIs
  - Disable debug log
  - Change decrypt() API to accept an optional buffer needed by some of DRM schemes

Changes are incorporated by Sony Corporation.

Change-Id: I414a165e22cc79be6ea7cd28041788aa2b6b8f7c
2010-10-04 22:14:53 +09:00
James Dong
4fd446f7b7 Video size retrieval/configuration support in camera hal
This is the first part of the camera hal change required for
0-memcpy of input video frames for video recording.

o removed check in setVideoSize()/getVideoSize() for impl consistency

Change-Id: I01274a62b9f9eaf32154d98f8d0bfedacf645698
2010-10-03 21:24:49 -07:00
Jeff Brown
a4d45cda69 am ea58d1ba: am e951ef07: Merge "Wait for initial device scan to finish before updating config." into gingerbread
Merge commit 'ea58d1bac2960c1794f048bfa5d1a60b1a3d23a1'

* commit 'ea58d1bac2960c1794f048bfa5d1a60b1a3d23a1':
  Wait for initial device scan to finish before updating config.
2010-10-01 21:49:39 -07:00
Jeff Brown
0f5f2e4c27 am e11b76d3: am f6295b35: Merge "Minor logging changes to input dispatcher to help with debugging." into gingerbread
Merge commit 'e11b76d3efb056edea301d53a354d0730adf3520'

* commit 'e11b76d3efb056edea301d53a354d0730adf3520':
  Minor logging changes to input dispatcher to help with debugging.
2010-10-01 21:49:29 -07:00
Jeff Brown
ea58d1bac2 am e951ef07: Merge "Wait for initial device scan to finish before updating config." into gingerbread
Merge commit 'e951ef07dd8cb36ec0e127e80f5d558b8a2d6125' into gingerbread-plus-aosp

* commit 'e951ef07dd8cb36ec0e127e80f5d558b8a2d6125':
  Wait for initial device scan to finish before updating config.
2010-10-01 19:03:42 -07:00
Jeff Brown
e11b76d3ef am f6295b35: Merge "Minor logging changes to input dispatcher to help with debugging." into gingerbread
Merge commit 'f6295b35db7a7c40d4fb1c981e231bebcf13e2ba' into gingerbread-plus-aosp

* commit 'f6295b35db7a7c40d4fb1c981e231bebcf13e2ba':
  Minor logging changes to input dispatcher to help with debugging.
2010-10-01 19:01:14 -07:00
Jeff Brown
7342bb9693 Wait for initial device scan to finish before updating config.
This change narrows the opportunity for a race condition setting the
resource Configuration while devices are being updated.

Change-Id: I58efa563f4129ab0fce7108511d16a99dff7e451
2010-10-01 18:55:43 -07:00
Kenny Root
6cb241f902 ZipFileRO: moar logging and wrap close
There is apparently still a race upon reading the entry Local File
Header that can't be tracked down, so move the LFH check inside the
mutex-protected block so we can call lseek again to see where we are
when we log an error.

Also, close() can fail so use TEMP_FAILURE_RETRY on it so we don't
unwittingly leak file descriptors when Mean Mr. EINTR comes a-knocking.

Change-Id: I753abad0bd882fe28f7281c406fa76f64393ef4c
2010-10-01 18:30:59 -07:00
Jeff Brown
f2f4871830 Minor logging changes to input dispatcher to help with debugging.
Added dumpsys reporting to EventHub.
Made the formatting a bit clearer.
Added 'Locked' suffix to some internal methods of EventHub.

Change-Id: Ic449560bcce378f6361895d27c66854e9724abb0
2010-10-01 18:05:13 -07:00
Jeff Brown
efb8a3d6e0 am 57fa3e8b: am 9e32a438: Merge "Support haptic feedback for virtual keys defined in key layout." into gingerbread
Merge commit '57fa3e8b4c94125ddb5be015dd7fbde4a458894f'

* commit '57fa3e8b4c94125ddb5be015dd7fbde4a458894f':
  Support haptic feedback for virtual keys defined in key layout.
2010-10-01 17:08:34 -07:00
Jeff Brown
57fa3e8b4c am 9e32a438: Merge "Support haptic feedback for virtual keys defined in key layout." into gingerbread
Merge commit '9e32a438fd87180692da55197972ecddb1a731d9' into gingerbread-plus-aosp

* commit '9e32a438fd87180692da55197972ecddb1a731d9':
  Support haptic feedback for virtual keys defined in key layout.
2010-10-01 16:16:23 -07:00
Jeff Brown
0eaf3931a3 Support haptic feedback for virtual keys defined in key layout.
Change-Id: I83e4108a87332692e03791dc066206becbc7941f
2010-10-01 15:08:56 -07:00
Mathias Agopian
2a471bb690 Merge "refactored screenshot code" 2010-10-01 12:15:12 -07:00
Eric Laurent
785c416ecf am de12c3cf: am 220ab887: Merge "Issue 3032913: improve AudioTrack recovery time" into gingerbread
Merge commit 'de12c3cf56e3f27b2efc60eeae8b5e422747f2b9'

* commit 'de12c3cf56e3f27b2efc60eeae8b5e422747f2b9':
  Issue 3032913: improve AudioTrack recovery time
2010-09-30 19:47:21 -07:00
Jeff Brown
52a4ac3f5e am 5d3cef8a: am e0c12c88: Merge "Move verbose logging of device capabilities to dumpsys." into gingerbread
Merge commit '5d3cef8a6d1baec29512764b9e0ba240ccd7fcfe'

* commit '5d3cef8a6d1baec29512764b9e0ba240ccd7fcfe':
  Move verbose logging of device capabilities to dumpsys.
2010-09-30 18:12:28 -07:00
Eric Laurent
de12c3cf56 am 220ab887: Merge "Issue 3032913: improve AudioTrack recovery time" into gingerbread
Merge commit '220ab8877b234e6807b7f6d9028ba55d23220301' into gingerbread-plus-aosp

* commit '220ab8877b234e6807b7f6d9028ba55d23220301':
  Issue 3032913: improve AudioTrack recovery time
2010-09-30 17:47:07 -07:00
Eric Laurent
4712baab81 Issue 3032913: improve AudioTrack recovery time
This issue showed that when an AudioTrack underruns during a too long period
of time and is therefore disabled by audioflinger mixer, it takes an additional
delay of up to 3 seconds to recover.
This fix adds a simple mechanism to recover immediately when the client application
is ready to write data again in the AudioTrack buffer

Also throttle warnings on record overflows

Change-Id: I8b2c71578dd134b9e60a15ee4d91b70f3799cb3d
2010-09-30 17:21:23 -07:00
Jeff Brown
5d3cef8a6d am e0c12c88: Merge "Move verbose logging of device capabilities to dumpsys." into gingerbread
Merge commit 'e0c12c8803a7e2457098afc5dbf00e501d725fa0' into gingerbread-plus-aosp

* commit 'e0c12c8803a7e2457098afc5dbf00e501d725fa0':
  Move verbose logging of device capabilities to dumpsys.
2010-09-30 15:57:29 -07:00
Jeff Brown
ef3d7e8611 Move verbose logging of device capabilities to dumpsys.
Change-Id: I5d55eaebfdf049bd1ac1e7bab2758886cfefc9d7
2010-09-30 15:34:48 -07:00
Mathias Agopian
38ed2e39c5 refactored screenshot code
the core screenshot function now can capture the screen at any lower resolution
performing bilinear filtering.

we also now have some client code to interface with the screenshot service.

it's now possible to request a screenshot at a lower resolution.

Change-Id: I5a3b0e431421800e3aad601d9af8f94adffbc71f
2010-09-29 16:55:15 -07:00
Kenny Root
bff405f910 resolved conflicts for merge of d8e8186c to master
Change-Id: Ica3f6cd958717ea7033cab8b4bf9cd3425c1e1c5
2010-09-28 18:16:50 -07:00