Commit Graph

25749 Commits

Author SHA1 Message Date
James Dong
c8d2fa704a am cbd038fe: Merge "Make MediaWriter stop and pause return errors if necessary" into gingerbread
Merge commit 'cbd038fe207f183bc7e0a610973473f7c2e9d118' into gingerbread-plus-aosp

* commit 'cbd038fe207f183bc7e0a610973473f7c2e9d118':
  Make MediaWriter stop and pause return errors if necessary
2010-08-19 14:02:25 -07:00
James Dong
cbd038fe20 Merge "Make MediaWriter stop and pause return errors if necessary" into gingerbread 2010-08-19 13:59:32 -07:00
Mathias Agopian
a90a1e55c6 am 545eab8a: Merge "remove unused pixel format" into gingerbread
Merge commit '545eab8ae80b070177cc442931eadc8cd980de26' into gingerbread-plus-aosp

* commit '545eab8ae80b070177cc442931eadc8cd980de26':
  remove unused pixel format
2010-08-19 13:39:56 -07:00
Mathias Agopian
545eab8ae8 Merge "remove unused pixel format" into gingerbread 2010-08-19 13:37:35 -07:00
James Dong
d036662470 Make MediaWriter stop and pause return errors if necessary
o Make the API consistent with SF framework, which the MediaSource
  provides a return status for stop

o Also, helps to convey errors that occurred right when a
  premature stop() is called, leading to a potentially
  mal-formed output file.

Change-Id: I52a932345f38570fdf8ea04d67d73dd94ccd30ef
2010-08-19 13:33:13 -07:00
Jeff Brown
d7d58be0b8 am 00144745: Merge "Make the throttling more sensitive to end-to-end latency." into gingerbread
Merge commit '0014474569b8bb237f00fa692ab173678bff619e' into gingerbread-plus-aosp

* commit '0014474569b8bb237f00fa692ab173678bff619e':
  Make the throttling more sensitive to end-to-end latency.
2010-08-19 13:30:08 -07:00
Jeff Brown
0014474569 Merge "Make the throttling more sensitive to end-to-end latency." into gingerbread 2010-08-19 13:27:58 -07:00
Jeff Brown
0f4d7bc184 Make the throttling more sensitive to end-to-end latency.
The code now takes into account the time when the event was generated.
So with a 60Hz throttling rate, it ensures that a motion event will not
be delayed due to throttling by any more than 1/60th of second past
the time it was generated.

Change-Id: Iaea1d4f76e79036b4a18873485230731c3cd63c3
2010-08-19 13:26:58 -07:00
Mathias Agopian
e509328efc remove unused pixel format
Change-Id: I55bc3cc41385743c07f7e4de06335c922f746f73
2010-08-19 13:11:42 -07:00
Mathias Agopian
b3aaf3baa7 am bccfcd95: Merge "fix [2931718] glDrawArrays skips a triangle when more than 70 vertices are used." into gingerbread
Merge commit 'bccfcd95d3cc4029c1ed8514d31436a857283873' into gingerbread-plus-aosp

* commit 'bccfcd95d3cc4029c1ed8514d31436a857283873':
  fix [2931718] glDrawArrays skips a triangle when more than 70 vertices are used.
2010-08-19 11:46:43 -07:00
Mathias Agopian
bccfcd95d3 Merge "fix [2931718] glDrawArrays skips a triangle when more than 70 vertices are used." into gingerbread 2010-08-19 11:44:50 -07:00
Andreas Huber
873ebfb825 am 223e4f73: Merge "Support for MP4V-ES packetization format according to RFC3016." into gingerbread
Merge commit '223e4f732a325e456ca6151f132f1d4c3c625631' into gingerbread-plus-aosp

* commit '223e4f732a325e456ca6151f132f1d4c3c625631':
  Support for MP4V-ES packetization format according to RFC3016.
2010-08-19 11:22:14 -07:00
Andreas Huber
223e4f732a Merge "Support for MP4V-ES packetization format according to RFC3016." into gingerbread 2010-08-19 11:19:51 -07:00
Andreas Huber
a979ad6739 Support for MP4V-ES packetization format according to RFC3016.
Change-Id: I5e182936c52f9eb80cdcf6132ead03705ee32d61
2010-08-19 11:18:35 -07:00
Wu-cheng Li
6694c71dd8 am eba12749: Merge "Adding getSupportedPreviewSizes to CameraParameters.DO NOT MERGE" into gingerbread
Merge commit 'eba1274978911ea188eead128645299669d02f60' into gingerbread-plus-aosp

* commit 'eba1274978911ea188eead128645299669d02f60':
  Adding getSupportedPreviewSizes to CameraParameters.DO NOT MERGE
2010-08-19 11:10:44 -07:00
Wu-cheng Li
9ba1ed6a8f am ccb91596: Merge "Adding getSupportedPictureSizes to CameraParameters.DO NOT MERGE" into gingerbread
Merge commit 'ccb915963e70c9b4e8fc47b5af97ab37b979195a' into gingerbread-plus-aosp

* commit 'ccb915963e70c9b4e8fc47b5af97ab37b979195a':
  Adding getSupportedPictureSizes to CameraParameters.DO NOT MERGE
2010-08-19 11:10:40 -07:00
Wu-cheng Li
eba1274978 Merge "Adding getSupportedPreviewSizes to CameraParameters.DO NOT MERGE" into gingerbread 2010-08-19 11:08:39 -07:00
Wu-cheng Li
ccb915963e Merge "Adding getSupportedPictureSizes to CameraParameters.DO NOT MERGE" into gingerbread 2010-08-19 11:08:36 -07:00
Andreas Huber
b29ebd397e am f0ad5484: Merge "In the absence of width/height information in the sdp, extract the dimensions from the avc codec specific data." into gingerbread
Merge commit 'f0ad54846168f07fc1fd7f18cde93deea1559f86' into gingerbread-plus-aosp

* commit 'f0ad54846168f07fc1fd7f18cde93deea1559f86':
  In the absence of width/height information in the sdp, extract the dimensions from the avc codec specific data.
2010-08-19 10:56:40 -07:00
Andreas Huber
f0ad548461 Merge "In the absence of width/height information in the sdp, extract the dimensions from the avc codec specific data." into gingerbread 2010-08-19 10:54:21 -07:00
Eric Laurent
5aff90a638 am 1aaba885: Merge "Audio Effects: fixed "strength supported" parameter size." into gingerbread
Merge commit '1aaba885def9a3b59edbfe2a0f8c3899948533ff' into gingerbread-plus-aosp

* commit '1aaba885def9a3b59edbfe2a0f8c3899948533ff':
  Audio Effects: fixed "strength supported" parameter size.
2010-08-19 10:47:01 -07:00
Eric Laurent
1aaba885de Merge "Audio Effects: fixed "strength supported" parameter size." into gingerbread 2010-08-19 10:42:36 -07:00
Andreas Huber
eef3c33e56 In the absence of width/height information in the sdp, extract the dimensions from the avc codec specific data.
Change-Id: I98c4194593c7e6e24f6fc339c862245111800293
2010-08-19 10:39:47 -07:00
Nipun Kwatra
6c008b8640 Adding getSupportedPreviewSizes to CameraParameters.DO NOT MERGE
Moved functionality to parse string of sizes from getSupportedPictureSizes
to parseSizesList.
Added getSupportedPreviewSizes which returns a list of supported preview sizes.

Change-Id: I41d4f62f9f1641e9e9258aa2ebaeda13ba846c02
2010-08-19 09:59:18 -07:00
Nipun Kwatra
0de0c4960d Adding getSupportedPictureSizes to CameraParameters.DO NOT MERGE
Also added a struct 'Size' containing a width and a height field.
Modified parse_size to optionally set an end pointer pointing to the
character after the found size.

Change-Id: I0c95ebf1ad4684721b32165f363db7d4d15a1b19
2010-08-19 09:59:11 -07:00
Kenny Root
821afa9aec am 54d41379: Merge "Add OBB flags to support overlays" into gingerbread
Merge commit '54d41379357d1d800d0a7bd7c5dc56111710482a' into gingerbread-plus-aosp

* commit '54d41379357d1d800d0a7bd7c5dc56111710482a':
  Add OBB flags to support overlays
2010-08-19 09:11:31 -07:00
Andreas Huber
6bcffcd2dc am 8c192fe9: Merge "Better support for rtsp streamed through VLC. Temporarily make the socket blocking to read all of the session description." into gingerbread
Merge commit '8c192fe990d7bc7149d2ec1a7c9f4ada3f32e52a' into gingerbread-plus-aosp

* commit '8c192fe990d7bc7149d2ec1a7c9f4ada3f32e52a':
  Better support for rtsp streamed through VLC. Temporarily make the socket blocking to read all of the session description.
2010-08-19 09:11:28 -07:00
Kenny Root
54d4137935 Merge "Add OBB flags to support overlays" into gingerbread 2010-08-19 09:09:32 -07:00
Andreas Huber
8c192fe990 Merge "Better support for rtsp streamed through VLC. Temporarily make the socket blocking to read all of the session description." into gingerbread 2010-08-19 09:09:12 -07:00
Eric Laurent
3a899b8510 am 0b9a12bf: Merge "Fix issue 2929440" into gingerbread
Merge commit '0b9a12bf8101830fa9bde4015d0043df14cab6db' into gingerbread-plus-aosp

* commit '0b9a12bf8101830fa9bde4015d0043df14cab6db':
  Fix issue 2929440
2010-08-19 08:51:54 -07:00
Eric Laurent
0b9a12bf81 Merge "Fix issue 2929440" into gingerbread 2010-08-19 08:49:20 -07:00
Steve Howard
1f44210482 am e0c8582e: Merge "Improve orientation sensing when waking up while flat." into gingerbread
Merge commit 'e0c8582e8a9f2b6eb5ebde667ddd1fddf4652bd4' into gingerbread-plus-aosp

* commit 'e0c8582e8a9f2b6eb5ebde667ddd1fddf4652bd4':
  Improve orientation sensing when waking up while flat.
2010-08-19 08:32:23 -07:00
Steve Howard
e0c8582e8a Merge "Improve orientation sensing when waking up while flat." into gingerbread 2010-08-19 08:29:29 -07:00
Eric Laurent
8448a79767 Fix issue 2929440
Fixed regression introduced by change a54d7d3d7d in audioflinger mixer thread:
When the output stream is suspended, the sleep time between two writes must match the actual duration
of one output stream buffer otherwise the playback rate is not respected.

Change-Id: Ic5bebe890290d1f44aeff9dd3c142d18e26fff2a
2010-08-19 08:15:08 -07:00
Chia-chi Yeh
eb21c38a53 am f49c1689: Merge "RTP: fix few leaks when fail to add streams into a group." into gingerbread
Merge commit 'f49c1689b54aec6ce0272c805224625da73e2188' into gingerbread-plus-aosp

* commit 'f49c1689b54aec6ce0272c805224625da73e2188':
  RTP: fix few leaks when fail to add streams into a group.
2010-08-19 07:59:38 -07:00
Wei-Ta Chen
9f7257f0a1 am 8d124f70: Merge "Fix a bug, where one thread is using JNIEnv associated with another thread." into gingerbread
Merge commit '8d124f709e5c55f9737a336cda353af3dfb04605' into gingerbread-plus-aosp

* commit '8d124f709e5c55f9737a336cda353af3dfb04605':
  Fix a bug, where one thread is using JNIEnv associated with another thread.
2010-08-19 07:59:35 -07:00
Chia-chi Yeh
f49c1689b5 Merge "RTP: fix few leaks when fail to add streams into a group." into gingerbread 2010-08-19 03:36:36 -07:00
Chia-chi Yeh
b879032347 RTP: fix few leaks when fail to add streams into a group.
Change-Id: Iefb3fe219ad48641da37a83c8d14e9ebf1d3086c
2010-08-19 18:26:53 +08:00
Wei-Ta Chen
8d124f709e Merge "Fix a bug, where one thread is using JNIEnv associated with another thread." into gingerbread 2010-08-19 00:28:10 -07:00
Chia-chi Yeh
e18790856b am ae93f52e: Merge "RTP: remove froyo-compatible code." into gingerbread
Merge commit 'ae93f52e4462bbbb5cc908864c20368ac8cbf2a6' into gingerbread-plus-aosp

* commit 'ae93f52e4462bbbb5cc908864c20368ac8cbf2a6':
  RTP: remove froyo-compatible code.
2010-08-18 23:14:16 -07:00
Chia-chi Yeh
ae93f52e44 Merge "RTP: remove froyo-compatible code." into gingerbread 2010-08-18 23:12:20 -07:00
Wei-Ta Chen
291303ba3d Fix a bug, where one thread is using JNIEnv associated with another thread.
We see abort messages like this when using JavaPixelAllocator and JavaMemoryUsageReporter.
W/dalvikvm(  680): JNI WARNING: threadid=2 using env from threadid=10
W/dalvikvm(  680):              in Landroid/graphics/LargeBitmap;.nativeClean (I)V (CallVoidMethodV)

To fix it, we keep JavaVM, rather than JNIEnv, in JavaPixelAllocator and JavaMemoryUsageReporter,
because JavaVM allows us to get the JNIEnv corresponds to the current thread.

Change-Id: Ibd4b394a53dd3fdccc5a442eeb0dedf836479575
2010-08-19 12:21:44 +08:00
Mathias Agopian
e8963f7c37 fix [2931718] glDrawArrays skips a triangle when more than 70 vertices are used.
a typo prevented the last 2 vertices of a batch to be copied to the front of
the next batch. Instead, the 2 very first vertices were used.

Change-Id: I3c344784dac1cef64df2fb6f6efb2f901cc788db
2010-08-18 20:07:25 -07:00
Jeff Brown
36beeca4c3 am 3d8c9bdb: Raise motion event throttle to 60Hz from 35Hz.
Merge commit '3d8c9bdbed0c31143227697bd0d94fd234fe08ad' into gingerbread-plus-aosp

* commit '3d8c9bdbed0c31143227697bd0d94fd234fe08ad':
  Raise motion event throttle to 60Hz from 35Hz.
2010-08-18 17:52:17 -07:00
Jeff Brown
3d8c9bdbed Raise motion event throttle to 60Hz from 35Hz.
Bug: 2931575
Change-Id: Ib8b1793addcda74b2fa6de2ce61b6133b8ffda9d
2010-08-18 17:48:53 -07:00
Jeff Brown
d25f0aea1c am 99401b29: Merge "Add support for throttling motion events." into gingerbread
Merge commit '99401b29c3f39488a058d3eb616009b751879a77' into gingerbread-plus-aosp

* commit '99401b29c3f39488a058d3eb616009b751879a77':
  Add support for throttling motion events.
2010-08-18 17:42:47 -07:00
Jeff Brown
99401b29c3 Merge "Add support for throttling motion events." into gingerbread 2010-08-18 17:40:44 -07:00
Dianne Hackborn
d172594e3a am cf6d2a1d: Merge "Fix issue #2845673: android:exported="false" is not obeyed" into gingerbread
Merge commit 'cf6d2a1de274e9a4156b12be811a180eb36412ab' into gingerbread-plus-aosp

* commit 'cf6d2a1de274e9a4156b12be811a180eb36412ab':
  Fix issue #2845673: android:exported="false" is not obeyed
2010-08-18 17:08:36 -07:00
Dianne Hackborn
cf6d2a1de2 Merge "Fix issue #2845673: android:exported="false" is not obeyed" into gingerbread 2010-08-18 17:05:40 -07:00
Jeff Brown
ae9fc03bdc Add support for throttling motion events.
Change-Id: I24b3a17753e91ecda60a60fe5cd2e6b3260e033d
2010-08-18 16:58:27 -07:00