OSDN Git Service
ty.lee [Mon, 8 Oct 2012 06:40:28 +0000 (23:40 -0700)]
am
c8823995: audioflinger/resampler: add build source for libaudio-resampler
* commit '
c8823995d16b909fae30ff4f94217e875d3e8c8a':
audioflinger/resampler: add build source for libaudio-resampler
ty.lee [Mon, 1 Oct 2012 04:54:14 +0000 (13:54 +0900)]
audioflinger/resampler: add build source for libaudio-resampler
Bug:
7229644
Change-Id: I93bde36be1c3ec84174a4c98423e28f8b3d8782f
Signed-off-by: ty.lee <ty.lee@lge.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
Eino-Ville Talvala [Sun, 7 Oct 2012 16:07:13 +0000 (09:07 -0700)]
am
4d410ede: Camera2: Fix off-by-one error in ZSL selection.
* commit '
4d410ede659448557398c84552eb0bf50ef09cbc':
Camera2: Fix off-by-one error in ZSL selection.
Eino-Ville Talvala [Sat, 6 Oct 2012 20:50:31 +0000 (13:50 -0700)]
Camera2: Fix off-by-one error in ZSL selection.
Bug:
7258126
Change-Id: Ie6da4645c46a7bb0dbd11d7c6183e904f41f74fd
Eino-Ville Talvala [Sat, 6 Oct 2012 04:48:30 +0000 (21:48 -0700)]
am
f6e09d20: Camera2: Unconditionally shut down streams on disconnect.
* commit '
f6e09d200c3e043737adcdadd52310ebbd1b19da':
Camera2: Unconditionally shut down streams on disconnect.
Eino-Ville Talvala [Fri, 5 Oct 2012 00:01:25 +0000 (17:01 -0700)]
Camera2: Unconditionally shut down streams on disconnect.
stopPreviewL may do nothing in certain states. Stop streams directly
to avoid those failures, so that we always maintain the HAL interface
invariant that streams referenced by in-flight requests are never
deleted.
Bug:
7276954
Change-Id: Ic4cffc43036f4944684d941981a43d6dd1dce7af
Igor Murashkin [Fri, 5 Oct 2012 20:54:51 +0000 (13:54 -0700)]
am
7373cbe8: Camera2: Fix metering regions to take into account the current zoom/crop region
* commit '
7373cbe85e617345f7002256a4be389fe62af913':
Camera2: Fix metering regions to take into account the current zoom/crop region
Igor Murashkin [Fri, 28 Sep 2012 22:30:03 +0000 (15:30 -0700)]
Camera2: Fix metering regions to take into account the current zoom/crop region
Also adds a quirk to disable this fix to work around for incompliant HALs
Bug:
7246065
Change-Id: I80bad25e56ba59149270238e5639bb33cae495ae
Igor Murashkin [Fri, 5 Oct 2012 19:14:12 +0000 (12:14 -0700)]
am
af3d2887: Camera2: Change policy for calculating previewFpsRange from previewFps
* commit '
af3d28870f7890370d6acb21d20cf1ccab4b9e08':
Camera2: Change policy for calculating previewFpsRange from previewFps
Igor Murashkin [Thu, 4 Oct 2012 21:22:18 +0000 (14:22 -0700)]
Camera2: Change policy for calculating previewFpsRange from previewFps
Bug:
7259959
Change-Id: I759a559d7115201264f88db1f23edc2d6aef6c43
Igor Murashkin [Fri, 5 Oct 2012 18:41:07 +0000 (11:41 -0700)]
am
becb0bc4: Merge "Camera2: Don\'t promote weak IBinder ptrs to strong ones" into jb-mr1-dev
* commit '
becb0bc4b620dcd88b559d821e40a9ca7ced5604':
Camera2: Don't promote weak IBinder ptrs to strong ones
Igor Murashkin [Fri, 5 Oct 2012 18:35:53 +0000 (11:35 -0700)]
Merge "Camera2: Don't promote weak IBinder ptrs to strong ones" into jb-mr1-dev
Eino-Ville Talvala [Fri, 5 Oct 2012 18:22:13 +0000 (11:22 -0700)]
am
95069fef: Camera2: Use the triggerAfWithAuto quirk
* commit '
95069fefbdf54d87a624c2ac73727fce1c38545e':
Camera2: Use the triggerAfWithAuto quirk
Eino-Ville Talvala [Fri, 5 Oct 2012 18:22:12 +0000 (11:22 -0700)]
am
4865c526: Camera2: Synchronize mode changes and triggers
* commit '
4865c526e681366481b0ab242ffa1ead57bb02cc':
Camera2: Synchronize mode changes and triggers
Igor Murashkin [Fri, 5 Oct 2012 17:44:57 +0000 (10:44 -0700)]
Camera2: Don't promote weak IBinder ptrs to strong ones
The Binder driver does not support promoting weak pointers into strong
pointers. Occassionally the system would lock up when trying to do this
(when closing the camera app).
Bug:
7289040
Change-Id: I8bc0b5c48616bf0b7f4eed1878ad4994ee635871
The Android Open Source Project [Fri, 5 Oct 2012 15:16:37 +0000 (08:16 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I9545f52b76d36bfbdf29cd270d0af200cb2d51fe
The Android Automerger [Fri, 5 Oct 2012 13:59:26 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Igor Murashkin [Wed, 3 Oct 2012 23:02:09 +0000 (16:02 -0700)]
Camera2: Fix deadlock while zooming during record
Acquired SharedParameters before mMutex in StreamingProcessor,
this avoids any potential deadlocks since Camera2Client code would
always acquire SharedParameters first before invoking StreamingProcessor.
Bug:
7275259
Change-Id: Ia741162c455300378bee049f063590ece5328b95
Eino-Ville Talvala [Thu, 4 Oct 2012 23:34:16 +0000 (16:34 -0700)]
am
9942f62d: Merge "Camera2: Include JPEG settings in ZSL requests." into jb-mr1-dev
* commit '
9942f62d6a5ee0a65da751b681217d3c4243cd89':
Camera2: Include JPEG settings in ZSL requests.
Eino-Ville Talvala [Thu, 4 Oct 2012 07:56:40 +0000 (00:56 -0700)]
Camera2: Use the triggerAfWithAuto quirk
When this quirk is set, and a scene mode is enabled, do AF calls with
AF mode AUTO instead of whatever the scene more override AF mode is.
Bug:
7159577
Change-Id: I3ea6b8386abc0968047fc9bba3a35c5db5bdcfd3
Eino-Ville Talvala [Tue, 2 Oct 2012 20:30:28 +0000 (13:30 -0700)]
Camera2: Synchronize mode changes and triggers
Make sure that changes to various parameters have reached the HAL
before triggering asynchronous events like autofocus or precapture
metering.
Bug:
7107220
Change-Id: I3c50038de1671968eb32004ce538435121934e7e
Eino-Ville Talvala [Thu, 4 Oct 2012 23:30:46 +0000 (16:30 -0700)]
Merge "Camera2: Include JPEG settings in ZSL requests." into jb-mr1-dev
Andreas Huber [Thu, 4 Oct 2012 21:50:45 +0000 (14:50 -0700)]
am
1f915a85: Merge "Optionally emit LPCM audio instead of using AAC in wifi display code" into jb-mr1-dev
* commit '
1f915a85fedc14757c91e59a62ea6d612ce548bf':
Optionally emit LPCM audio instead of using AAC in wifi display code
Andreas Huber [Thu, 4 Oct 2012 21:45:55 +0000 (14:45 -0700)]
Merge "Optionally emit LPCM audio instead of using AAC in wifi display code" into jb-mr1-dev
Eino-Ville Talvala [Thu, 4 Oct 2012 20:21:08 +0000 (13:21 -0700)]
Camera2: Include JPEG settings in ZSL requests.
Bug:
7287743
Change-Id: I1aba81b228451c3df712ce1f42b7aab79cac575f
Andreas Huber [Thu, 4 Oct 2012 18:46:29 +0000 (11:46 -0700)]
Optionally emit LPCM audio instead of using AAC in wifi display code
related-to-bug:
7248248
May decrease power usage at the cost of significantly increasing audio bitrate.
Use "adb shell setprop media.wfd.use-pcm-audio true"
to turn it on (must be done before connecting).
Change-Id: I7ebeadf3209e01522a2644948287b23d7c383c7e
Glenn Kasten [Thu, 4 Oct 2012 18:20:14 +0000 (11:20 -0700)]
am
7ffab293: Merge "Integrate improved coefficient sinc resampler: VHQ" into jb-mr1-dev
* commit '
7ffab2933bfc50ee0b64ea586b663dcb9275d593':
Integrate improved coefficient sinc resampler: VHQ
Glenn Kasten [Thu, 4 Oct 2012 18:16:36 +0000 (11:16 -0700)]
Merge "Integrate improved coefficient sinc resampler: VHQ" into jb-mr1-dev
Igor Murashkin [Thu, 4 Oct 2012 17:00:47 +0000 (10:00 -0700)]
am
f66cc52c: Merge "Camera2: Fix deadlock while zooming during record" into jb-mr1-dev
* commit '
f66cc52cc5a075b86b585cf72c4a41f6907b2142':
Camera2: Fix deadlock while zooming during record
Igor Murashkin [Thu, 4 Oct 2012 16:56:44 +0000 (09:56 -0700)]
Merge "Camera2: Fix deadlock while zooming during record" into jb-mr1-dev
Glenn Kasten [Mon, 1 Oct 2012 21:04:31 +0000 (14:04 -0700)]
Integrate improved coefficient sinc resampler: VHQ
Summary:
Very high quality is enabled only for 44.1 -> 48 or 48 -> 44.1,
and uses low quality for all other use cases.
Track estimated CPU load and throttles the quality based on load;
as currently configured it should allow up to 2 instances of very high quality.
Medium quality and high quality are currently disabled unless explicitly requested.
Details:
Only load .so the first time it is needed.
Cleanup code style: formatting, indentation, whitespace.
Restore medium quality resampler, but it is not used (see next line).
Fix memory leak for sinc resampler.
Check sample rate in resampler constructor.
Add logs for debugging.
Rename DEFAULT to DEFAULT_QUALITY for consistency with other quality levels.
Renumber VERY_HIGH_QUALITY from 255 to 4.
Use enum src_quality consistently.
Improve parsing of property af.resampler.quality.
Fix reentrancy bug - allow an instance of high quality and an instance
of very high quality to both be active concurrently.
Bug:
7229644
Change-Id: I0ce6b913b05038889f50462a38830b61a602a9f7
The Android Open Source Project [Thu, 4 Oct 2012 14:48:05 +0000 (07:48 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: If88cdd28e163c84b5d6e64eb82b1c322d665a382
The Android Automerger [Thu, 4 Oct 2012 13:59:31 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
James Dong [Thu, 4 Oct 2012 00:02:28 +0000 (17:02 -0700)]
am
d69fd4d2: Merge "Enable hdcp for WiFi display" into jb-mr1-dev
* commit '
d69fd4d2567f9fce02252ce10d7ae3a28fc79e04':
Enable hdcp for WiFi display
James Dong [Wed, 3 Oct 2012 23:57:35 +0000 (16:57 -0700)]
Merge "Enable hdcp for WiFi display" into jb-mr1-dev
Igor Murashkin [Wed, 3 Oct 2012 23:02:09 +0000 (16:02 -0700)]
Camera2: Fix deadlock while zooming during record
Acquired SharedParameters before mMutex in StreamingProcessor,
this avoids any potential deadlocks since Camera2Client code would
always acquire SharedParameters first before invoking StreamingProcessor.
Bug:
7275259
Change-Id: Ia741162c455300378bee049f063590ece5328b95
Eino-Ville Talvala [Wed, 3 Oct 2012 21:59:29 +0000 (14:59 -0700)]
Camera2: Properly update FPS range when FPS is set.
Otherwise a getParameters followed by setParameters will trigger an
incorrect reversion in FPS parameters.
Bug:
7279267
Change-Id: I7426860f05497dbdf4245c34cef1b38f2f5a1832
Dave Burke [Wed, 3 Oct 2012 01:39:39 +0000 (18:39 -0700)]
Drop video bitrate to 2.5mbps.
We have too much corruption/loss at higher bitrates. Reviewed quality
trade-off with jdong@. We can increase in the future if we have a
better packet loss concealment solution.
Bug:
7241844
Change-Id: I3b500a9c3a4429e834fb4c5ca04164d4e106fa9e
Andreas Huber [Wed, 3 Oct 2012 17:16:58 +0000 (10:16 -0700)]
Better power savings with wifi display code.
No more polling the encoder for work to do, the encoder instead notifies
if there's activity.
Change-Id: Ia707211b4f5c5a6e6b70d750233d204a2d6bb778
related-to-bug:
7248248
Andreas Huber [Wed, 3 Oct 2012 16:01:11 +0000 (09:01 -0700)]
Increase polling frequency again temporarily to fix A/V issues
Fixes a bug in the silence detection and increases the timeout after which
we enter "silent mode" to 10 secs.
Change-Id: I802b058f054becd5c377186664437f7b3970193f
related-to-bug:
7248248
Eino-Ville Talvala [Wed, 3 Oct 2012 22:24:19 +0000 (15:24 -0700)]
am
ce953ce4: Merge "Camera2: Properly update FPS range when FPS is set." into jb-mr1-dev
* commit '
ce953ce4d698155c50356df093712df1dea76051':
Camera2: Properly update FPS range when FPS is set.
Eino-Ville Talvala [Wed, 3 Oct 2012 22:20:38 +0000 (15:20 -0700)]
Merge "Camera2: Properly update FPS range when FPS is set." into jb-mr1-dev
Eino-Ville Talvala [Wed, 3 Oct 2012 21:59:29 +0000 (14:59 -0700)]
Camera2: Properly update FPS range when FPS is set.
Otherwise a getParameters followed by setParameters will trigger an
incorrect reversion in FPS parameters.
Bug:
7279267
Change-Id: I7426860f05497dbdf4245c34cef1b38f2f5a1832
Alex Ray [Wed, 3 Oct 2012 21:32:35 +0000 (14:32 -0700)]
am
c2063056: Camera2: Fix prematurely clearing stream request
* commit '
c20630569431234db23b6182dd17102023dee68e':
Camera2: Fix prematurely clearing stream request
Alex Ray [Wed, 3 Oct 2012 06:30:07 +0000 (23:30 -0700)]
Camera2: Fix prematurely clearing stream request
Zsl handling was clearing the stream request before a capture request
was ready to be sent to the HAL, which would cause capture delays and
timeouts in certain conditions.
Bug:
7259520
Change-Id: Idde8bc4fc58b8b426c6985feac87759740e338ea
Igor Murashkin [Wed, 3 Oct 2012 20:54:12 +0000 (13:54 -0700)]
am
b3e97b34: Camera2: Fix trying to release HAL stream twice
* commit '
b3e97b347dceb882983427ac872b772e25f3f166':
Camera2: Fix trying to release HAL stream twice
James Dong [Wed, 3 Oct 2012 19:08:40 +0000 (12:08 -0700)]
Enable hdcp for WiFi display
o related-to-bug:
7055369
Change-Id: Ie1ddd1e961f9ff60fe32b57cf7f8de4f4ecf5aa0
Igor Murashkin [Wed, 3 Oct 2012 18:56:04 +0000 (11:56 -0700)]
am
ecf17e82: Camera2: Handle client processes dying by closing camera resources
* commit '
ecf17e82505fdb60d59e00b6dd59036df93de655':
Camera2: Handle client processes dying by closing camera resources
Igor Murashkin [Tue, 2 Oct 2012 22:21:31 +0000 (15:21 -0700)]
Camera2: Fix trying to release HAL stream twice
When we fail to disconnect the native window, StreamAdapter::release
would fail and remain in the old (ALLOCATED) state, thus it thinks that
we haven't released the HAL stream yet.
With this change, ignore DEAD_OBJECT native window disconnect failures,
so the state transitions to RELEASED and we don't double release HAL
streams.
Bug:
7258314
Change-Id: I524893e4b4d6463d7b0a7ce32fb6f658afba8e11
Igor Murashkin [Tue, 2 Oct 2012 23:05:11 +0000 (16:05 -0700)]
Camera2: Handle client processes dying by closing camera resources
CameraService now subscribes to binder death notifications
for each client, and disconnects the client if the death happened
without cleanly shutting down the client first.
Bug:
7258314
Change-Id: I7803836b589fd8f0dfe00f6c28a707b82012e751
Igor Murashkin [Wed, 3 Oct 2012 18:37:23 +0000 (11:37 -0700)]
am
22d58d37: Camera2: Don\'t change state when reconnect is called
* commit '
22d58d37db6b5f48a10b3a19f69ffda09943c125':
Camera2: Don't change state when reconnect is called
Igor Murashkin [Wed, 3 Oct 2012 02:07:14 +0000 (19:07 -0700)]
Camera2: Don't change state when reconnect is called
Bug:
7252802
Change-Id: Ibed4f59a96bef75bf84b1aaf1235fb87e94102ef
Andreas Huber [Wed, 3 Oct 2012 17:58:12 +0000 (10:58 -0700)]
am
9f9d7de7: Merge "Drop video bitrate to 2.5mbps." into jb-mr1-dev
* commit '
9f9d7de77beb65ab51e73e55eea6f0b3a4e75bd2':
Drop video bitrate to 2.5mbps.
Eino-Ville Talvala [Wed, 3 Oct 2012 17:56:22 +0000 (10:56 -0700)]
am
1bac8972: Merge "Camera2: Use ZSL format quirk." into jb-mr1-dev
* commit '
1bac89725021fee46f953d7d5f35690ff01e91f2':
Camera2: Use ZSL format quirk.
Andreas Huber [Wed, 3 Oct 2012 17:54:30 +0000 (10:54 -0700)]
Merge "Drop video bitrate to 2.5mbps." into jb-mr1-dev
Eino-Ville Talvala [Wed, 3 Oct 2012 17:52:12 +0000 (10:52 -0700)]
Merge "Camera2: Use ZSL format quirk." into jb-mr1-dev
Andreas Huber [Wed, 3 Oct 2012 17:47:17 +0000 (10:47 -0700)]
am
4401091b: Merge "Better power savings with wifi display code." into jb-mr1-dev
* commit '
4401091bc89fc69b7fc7df58cf6b403776f2698a':
Better power savings with wifi display code.
Dave Burke [Wed, 3 Oct 2012 01:39:39 +0000 (18:39 -0700)]
Drop video bitrate to 2.5mbps.
We have too much corruption/loss at higher bitrates. Reviewed quality
trade-off with jdong@. We can increase in the future if we have a
better packet loss concealment solution.
Bug:
7241844
Change-Id: I3b500a9c3a4429e834fb4c5ca04164d4e106fa9e
Andreas Huber [Wed, 3 Oct 2012 17:43:33 +0000 (10:43 -0700)]
Merge "Better power savings with wifi display code." into jb-mr1-dev
Andreas Huber [Wed, 3 Oct 2012 17:16:58 +0000 (10:16 -0700)]
Better power savings with wifi display code.
No more polling the encoder for work to do, the encoder instead notifies
if there's activity.
Change-Id: Ia707211b4f5c5a6e6b70d750233d204a2d6bb778
related-to-bug:
7248248
Andreas Huber [Wed, 3 Oct 2012 16:54:32 +0000 (09:54 -0700)]
am
3a555c19: Merge "Increase polling frequency again temporarily to fix A/V issues" into jb-mr1-dev
* commit '
3a555c19dbd6ae7bf0d63cb9879befb22773770d':
Increase polling frequency again temporarily to fix A/V issues
Andreas Huber [Wed, 3 Oct 2012 16:50:51 +0000 (09:50 -0700)]
Merge "Increase polling frequency again temporarily to fix A/V issues" into jb-mr1-dev
Andreas Huber [Wed, 3 Oct 2012 16:01:11 +0000 (09:01 -0700)]
Increase polling frequency again temporarily to fix A/V issues
Fixes a bug in the silence detection and increases the timeout after which
we enter "silent mode" to 10 secs.
Change-Id: I802b058f054becd5c377186664437f7b3970193f
related-to-bug:
7248248
The Android Open Source Project [Wed, 3 Oct 2012 14:33:50 +0000 (07:33 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I9de953cb5d49ea43902882573b01bc91f74d4953
The Android Automerger [Wed, 3 Oct 2012 13:59:31 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eino-Ville Talvala [Wed, 3 Oct 2012 01:14:49 +0000 (18:14 -0700)]
Camera2: Use ZSL format quirk.
Switch service to using HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED,
unless ZSL quirk is set.
This is important for compatibility across multiple implementations.
Bug:
6243944
Change-Id: Iea74671cbb44890a07e4f99cd757b0a5423d447a
Eino-Ville Talvala [Wed, 3 Oct 2012 00:40:05 +0000 (17:40 -0700)]
am
ee40d832: Merge "Camera2: Use scene mode override parameter" into jb-mr1-dev
* commit '
ee40d832e55847182412b0f56da652af054d7c06':
Camera2: Use scene mode override parameter
Eino-Ville Talvala [Wed, 3 Oct 2012 00:36:25 +0000 (17:36 -0700)]
Merge "Camera2: Use scene mode override parameter" into jb-mr1-dev
Jean-Michel Trivi [Wed, 3 Oct 2012 00:25:16 +0000 (17:25 -0700)]
am
2808b590: Merge "Bug
7170947 Configure AAC decoder for mobile DRC settings" into jb-mr1-dev
* commit '
2808b5902a4dd70be231fcb2e3131eb1944807da':
Bug
7170947 Configure AAC decoder for mobile DRC settings
Jean-Michel Trivi [Wed, 3 Oct 2012 00:21:09 +0000 (17:21 -0700)]
Merge "Bug
7170947 Configure AAC decoder for mobile DRC settings" into jb-mr1-dev
Jean-Michel Trivi [Tue, 2 Oct 2012 18:18:16 +0000 (11:18 -0700)]
Bug
7170947 Configure AAC decoder for mobile DRC settings
Configure the AAC decoder to use the modile DRC settings when
decoding streams with DRC metadata.
Settings are:
- target reference level of -12dB
- DRC compression factor (attenuation) at max
These settings can be overridden by platform properties if the
default values are to be modified.
Change-Id: If329fe566497685b735abe4e4b9a5e01697c063b
Eino-Ville Talvala [Tue, 2 Oct 2012 20:30:04 +0000 (13:30 -0700)]
Camera2: Use scene mode override parameter
- Read in SCENE_MODE_OVERRIDES static parameter if available.
Use it to select AF/AE/AWB modes when a scene mode is set.
- Add quirks structure to parameters; not yet used
- Fix desynchronization between range and single FPS value.
Still need to sort out best way to convert from one to another.
Bug:
7259959
Bug:
7159577
Bug:
7172543
Change-Id: I0d07c31d5f21fbc4b0ec2fa23f7f778073d2d6e0
Andreas Huber [Tue, 2 Oct 2012 21:45:40 +0000 (14:45 -0700)]
am
47aa9c47: Merge "Enable silence detection and don\'t driver the audio encoder" into jb-mr1-dev
* commit '
47aa9c47a0796bb695d09aa307b2d1c2c913f0eb':
Enable silence detection and don't driver the audio encoder
Andreas Huber [Tue, 2 Oct 2012 21:44:13 +0000 (14:44 -0700)]
am
805b3ae3: Merge "Now back to 30fps, suspend updates if surface flinger didn\'t send us" into jb-mr1-dev
* commit '
805b3ae300ea414ce5973e60a9b544169da0ac44':
Now back to 30fps, suspend updates if surface flinger didn't send us
Andreas Huber [Tue, 2 Oct 2012 21:42:34 +0000 (14:42 -0700)]
am
f5aa7aa9: Merge "More power savings: No need to keep a history of outgoing packets" into jb-mr1-dev
* commit '
f5aa7aa94465e774ccdb07039690a5f42de1518a':
More power savings: No need to keep a history of outgoing packets
Andreas Huber [Tue, 2 Oct 2012 21:42:33 +0000 (14:42 -0700)]
am
16461dca: Merge "Increase converter polling interval." into jb-mr1-dev
* commit '
16461dca0ba8ac1850463db6245d20dc1699279d':
Increase converter polling interval.
Andreas Huber [Tue, 2 Oct 2012 21:42:32 +0000 (14:42 -0700)]
am
f1b95045: Merge "Take advantage of the hardware encoder\'s ability to prepend SPS/PPS" into jb-mr1-dev
* commit '
f1b9504587b04d8a7067aca90b1f0575ccf74bb9':
Take advantage of the hardware encoder's ability to prepend SPS/PPS
Andreas Huber [Tue, 2 Oct 2012 21:40:52 +0000 (14:40 -0700)]
Merge "Enable silence detection and don't driver the audio encoder" into jb-mr1-dev
Andreas Huber [Tue, 2 Oct 2012 21:39:20 +0000 (14:39 -0700)]
Merge "Now back to 30fps, suspend updates if surface flinger didn't send us" into jb-mr1-dev
Andreas Huber [Tue, 2 Oct 2012 21:39:07 +0000 (14:39 -0700)]
Merge "More power savings: No need to keep a history of outgoing packets" into jb-mr1-dev
Andreas Huber [Tue, 2 Oct 2012 21:38:55 +0000 (14:38 -0700)]
Merge "Increase converter polling interval." into jb-mr1-dev
Andreas Huber [Tue, 2 Oct 2012 21:38:42 +0000 (14:38 -0700)]
Merge "Take advantage of the hardware encoder's ability to prepend SPS/PPS" into jb-mr1-dev
Andreas Huber [Tue, 2 Oct 2012 21:17:38 +0000 (14:17 -0700)]
Enable silence detection and don't driver the audio encoder
or send any audio out over the network if we've seen at least one second
of silence.
Change-Id: Ic2bca4ce7d55bd246283dc669f5f5cb6106d88ea
related-to-bug:
7248248
Andreas Huber [Tue, 2 Oct 2012 19:49:33 +0000 (12:49 -0700)]
Now back to 30fps, suspend updates if surface flinger didn't send us
any new frames for one second or longer.
Change-Id: I1c2ec349b0a4b7c4eb9dcdde483362ec87dd69fa
related-to-bug:
7248248
Marco Nelissen [Tue, 2 Oct 2012 18:03:42 +0000 (11:03 -0700)]
am
0389cc09: Fix video continuity
* commit '
0389cc09f7b90f155a8942a0d2e1925cad1dbe2d':
Fix video continuity
Andreas Huber [Tue, 2 Oct 2012 17:47:48 +0000 (10:47 -0700)]
More power savings: No need to keep a history of outgoing packets
if we're not enabling retransmission anyway.
Change-Id: I361120607974a2fab758c28b5033716213aef88e
related-to-bug:
7248248
Marco Nelissen [Tue, 2 Oct 2012 17:47:39 +0000 (10:47 -0700)]
Fix video continuity
Fixes "pixelation" seen after seeking in Netflix.
b/
7211673
Change-Id: Id675acaef1e5fd7151fdfa7bd79e2f25990e1ecd
Andreas Huber [Tue, 2 Oct 2012 17:31:46 +0000 (10:31 -0700)]
Increase converter polling interval.
Change-Id: I455005086a63c70883a71e189753a117b195f22f
related-to-bug:
7248248
Andreas Huber [Tue, 2 Oct 2012 17:16:47 +0000 (10:16 -0700)]
Take advantage of the hardware encoder's ability to prepend SPS/PPS
to IDR frames instead of doing it manually.
Change-Id: I994cfbd6539013406dd610393ba1f0b9a0dbf4d5
related-to-bug:
7245308
The Android Open Source Project [Tue, 2 Oct 2012 16:18:11 +0000 (09:18 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I2158d0cd4ff2c94fad7af68bc20e2ca2ca03a2dd
The Android Automerger [Tue, 2 Oct 2012 13:59:28 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jeff Tinker [Tue, 2 Oct 2012 08:29:08 +0000 (01:29 -0700)]
am
bd710197: Merge "[WVDRM] Fix for stuttering on low bandwidth" into jb-mr1-dev
* commit '
bd710197a47e3772763c48bfb5d6be21df173a7f':
[WVDRM] Fix for stuttering on low bandwidth
Jeff Tinker [Tue, 2 Oct 2012 08:25:40 +0000 (01:25 -0700)]
Merge "[WVDRM] Fix for stuttering on low bandwidth" into jb-mr1-dev
Andreas Huber [Mon, 1 Oct 2012 23:46:35 +0000 (16:46 -0700)]
am
ee178668: Use incremental updates sent by surface flinger
* commit '
ee178668818eb4f43ff40735405f8fc42372620f':
Use incremental updates sent by surface flinger
Andreas Huber [Mon, 1 Oct 2012 23:45:06 +0000 (16:45 -0700)]
am
1c730d33: Merge "ALooper::GetNowUs() now relies on systemTime instead of gettimeofday." into jb-mr1-dev
* commit '
1c730d33da2fa861000b3990b5e6c9ff69291387':
ALooper::GetNowUs() now relies on systemTime instead of gettimeofday.
Andreas Huber [Mon, 1 Oct 2012 23:45:05 +0000 (16:45 -0700)]
am
1a0d1670: Merge "Optionally have SurfaceMediaSource return absolute timestamps" into jb-mr1-dev
* commit '
1a0d1670b4304f294530f4ca9ce68defad6445dc':
Optionally have SurfaceMediaSource return absolute timestamps
Andreas Huber [Mon, 1 Oct 2012 23:38:26 +0000 (16:38 -0700)]
Use incremental updates sent by surface flinger
instead of running at a fixed framerate.
Change-Id: Ia3f36aa449e2e952bf3263ffbb709a9b79b09c26
related-to-bug:
7266398
Andreas Huber [Mon, 1 Oct 2012 23:40:03 +0000 (16:40 -0700)]
Merge "ALooper::GetNowUs() now relies on systemTime instead of gettimeofday." into jb-mr1-dev
Andreas Huber [Mon, 1 Oct 2012 23:39:50 +0000 (16:39 -0700)]
Merge "Optionally have SurfaceMediaSource return absolute timestamps" into jb-mr1-dev
Andreas Huber [Mon, 1 Oct 2012 18:26:30 +0000 (11:26 -0700)]
Perform an orderly shutdown if possible, force disconnect if necessary
wait for up to 2 secs for the dongle to send us a "TEARDOWN", after that
forcibly shutdown the connection.
Change-Id: Ie049857cd468b7af6986d6305f725c54571b2276
related-to-bug:
7258622