OSDN Git Service

android-x86/frameworks-av.git
12 years agoMerge "Camera2: Call onAutoFocus immediately for fixed-focus cameras" into jb-mr1-dev
Igor Murashkin [Tue, 9 Oct 2012 20:49:28 +0000 (13:49 -0700)]
Merge "Camera2: Call onAutoFocus immediately for fixed-focus cameras" into jb-mr1-dev

12 years agoMerge "Camera2: Move non-ZSL shutter sound firing to be later." into jb-mr1-dev
Eino-Ville Talvala [Tue, 9 Oct 2012 19:12:07 +0000 (12:12 -0700)]
Merge "Camera2: Move non-ZSL shutter sound firing to be later." into jb-mr1-dev

12 years agoMerge "audio policy: deprecate ro.camera.sound.forced" into jb-mr1-dev
Eric Laurent [Tue, 9 Oct 2012 18:28:53 +0000 (11:28 -0700)]
Merge "audio policy: deprecate ro.camera.sound.forced" into jb-mr1-dev

12 years agoCamera2: Call onAutoFocus immediately for fixed-focus cameras
Igor Murashkin [Tue, 9 Oct 2012 01:05:12 +0000 (18:05 -0700)]
Camera2: Call onAutoFocus immediately for fixed-focus cameras

Bug: 7311578
Change-Id: Ib8a8ea1f5fc269abdd24ed1e0370dc9b87b284ee

12 years agoMerge "Camera2: Always disconnect in the client destructor" into jb-mr1-dev
Eino-Ville Talvala [Tue, 9 Oct 2012 05:20:47 +0000 (22:20 -0700)]
Merge "Camera2: Always disconnect in the client destructor" into jb-mr1-dev

12 years agoCamera2: Move non-ZSL shutter sound firing to be later.
Eino-Ville Talvala [Mon, 8 Oct 2012 05:43:48 +0000 (22:43 -0700)]
Camera2: Move non-ZSL shutter sound firing to be later.

Instead of firing shutter sound when capture request is submitted for
non-ZSL captures, fire it when the metadata frame is received. This
guarantees that the shutter sound fires after picture capture is
completed by the sensor.

Bug: 7259900
Change-Id: I4a1eeed89ed0400bf80b0f0cc2d5799c3d9bb9e3

12 years agoaudio policy: deprecate ro.camera.sound.forced
Eric Laurent [Mon, 8 Oct 2012 23:00:36 +0000 (16:00 -0700)]
audio policy: deprecate ro.camera.sound.forced

The volume and routing policy of AUDIO_STREAM_ENFORCED_AUDIBLE is
now controlled by AudioService.

Do not read ro.camera.sound.forced is not needed anymore.

Bug 7032634.

Change-Id: Ic0a6396fc4b6efb91cdb4dffe0c8eb035d0440bd

12 years agoCamera2: Always disconnect in the client destructor
Igor Murashkin [Mon, 8 Oct 2012 22:09:46 +0000 (15:09 -0700)]
Camera2: Always disconnect in the client destructor

If Camera2Client failed to initialize, it would skip disconnect step,
and thus the camera would be forever marked as busy. By always calling
disconnect it will always call free.

It also adds a new guarantee that Client::disconnect is idempotent

Bug: 7298182
Change-Id: Ic9876f1665b7d9b3c0da692880f63f165e3f4fa5

12 years agoCamera2: isSmoothZoomSupported should return FALSE
Igor Murashkin [Mon, 8 Oct 2012 21:08:32 +0000 (14:08 -0700)]
Camera2: isSmoothZoomSupported should return FALSE

Bug: 7308024
Change-Id: Ib757bef8f6dc203f8dfa6ea6d11191e3c7cfcc6d

12 years agoCamera2: Set default flash mode to FLASH_OFF
Alex Ray [Mon, 8 Oct 2012 19:04:15 +0000 (12:04 -0700)]
Camera2: Set default flash mode to FLASH_OFF

Bug: 6970090
Change-Id: I904b1be2ee0710e82e8e647753a705184c10b46c

12 years agoMerge "Camera2: Fix Parameters#setZoom off by 1 validation error" into jb-mr1-dev
Igor Murashkin [Mon, 8 Oct 2012 20:10:48 +0000 (13:10 -0700)]
Merge "Camera2: Fix Parameters#setZoom off by 1 validation error" into jb-mr1-dev

12 years agoMerge "Camera2: On stopping preview, wait until captures are completed." into jb...
Eino-Ville Talvala [Mon, 8 Oct 2012 19:17:36 +0000 (12:17 -0700)]
Merge "Camera2: On stopping preview, wait until captures are completed." into jb-mr1-dev

12 years agoCamera2: Fix Parameters#setZoom off by 1 validation error
Igor Murashkin [Mon, 8 Oct 2012 18:16:03 +0000 (11:16 -0700)]
Camera2: Fix Parameters#setZoom off by 1 validation error

Bug: 7298683
Change-Id: If79ac6396379593eb852f041ca7d5a20ad2f9e6d

12 years agoMerge "Camera2: Report getMaxNumFocusAreas 0 for fixed focus cameras" into jb-mr1-dev
Igor Murashkin [Mon, 8 Oct 2012 17:23:06 +0000 (10:23 -0700)]
Merge "Camera2: Report getMaxNumFocusAreas 0 for fixed focus cameras" into jb-mr1-dev

12 years agoCamera2: On stopping preview, wait until captures are completed.
Eino-Ville Talvala [Fri, 5 Oct 2012 19:03:10 +0000 (12:03 -0700)]
Camera2: On stopping preview, wait until captures are completed.

If preview is stopped while a still capture or a video snapshot is
underway, wait until the capture completes before stopping preview.

Also use the same behavior for disconnect - do not shut down the
camera device until captures are complete.

This works around HAL implementations which report to be done
(get_in_progress_count returns 0) even when a capture is still
outstanding.

Bug: 7276954

Change-Id: I66290acf1740cc330eadecbcded0c59fa9c5d2fd

12 years agoaudioflinger/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>
12 years agoCamera2: 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

12 years agoCamera2: Report getMaxNumFocusAreas 0 for fixed focus cameras
Igor Murashkin [Sat, 6 Oct 2012 00:09:09 +0000 (17:09 -0700)]
Camera2: Report getMaxNumFocusAreas 0 for fixed focus cameras

Bug: 7298805
Change-Id: I7499b80a9416bf454c8ea80c31ea4fdd3c4ee2d7

12 years agoCamera2: 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

12 years agoCamera2: 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

12 years agoCamera2: 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

12 years agoMerge "Camera2: Don't promote weak IBinder ptrs to strong ones" into jb-mr1-dev
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

12 years agoCamera2: Don't promote weak IBinder ptrs to strong ones
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

12 years agoCamera2: Use the triggerAfWithAuto quirk
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

12 years agoCamera2: Synchronize mode changes and triggers
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

12 years agoMerge "Camera2: Include JPEG settings in ZSL requests." into jb-mr1-dev
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

12 years agoMerge "Optionally emit LPCM audio instead of using AAC in wifi display code" into...
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

12 years agoCamera2: Include JPEG settings in ZSL requests.
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

12 years agoOptionally emit LPCM audio instead of using AAC in wifi display code
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

12 years agoMerge "Integrate improved coefficient sinc resampler: VHQ" into jb-mr1-dev
Glenn Kasten [Thu, 4 Oct 2012 18:16:36 +0000 (11:16 -0700)]
Merge "Integrate improved coefficient sinc resampler: VHQ" into jb-mr1-dev

12 years agoMerge "Camera2: Fix deadlock while zooming during record" into jb-mr1-dev
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

12 years agoIntegrate improved coefficient sinc resampler: VHQ
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

12 years agoMerge "Enable hdcp for WiFi display" into jb-mr1-dev
James Dong [Wed, 3 Oct 2012 23:57:35 +0000 (16:57 -0700)]
Merge "Enable hdcp for WiFi display" into jb-mr1-dev

12 years agoCamera2: Fix deadlock while zooming during record
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

12 years agoMerge "Camera2: Properly update FPS range when FPS is set." into jb-mr1-dev
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

12 years agoCamera2: Properly update FPS range when FPS is set.
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

12 years agoCamera2: 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

12 years agoEnable hdcp for WiFi display
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

12 years agoCamera2: Fix trying to release HAL stream twice
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

12 years agoCamera2: Handle client processes dying by closing camera resources
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

12 years agoCamera2: 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

12 years agoMerge "Drop video bitrate to 2.5mbps." into jb-mr1-dev
Andreas Huber [Wed, 3 Oct 2012 17:54:30 +0000 (10:54 -0700)]
Merge "Drop video bitrate to 2.5mbps." into jb-mr1-dev

12 years agoMerge "Camera2: Use ZSL format quirk." 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

12 years agoDrop video bitrate to 2.5mbps.
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

12 years agoMerge "Better power savings with wifi display code." into jb-mr1-dev
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

12 years agoBetter power savings with wifi display code.
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

12 years agoMerge "Increase polling frequency again temporarily to fix A/V issues" into jb-mr1-dev
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

12 years agoIncrease polling frequency again temporarily to fix A/V issues
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

12 years agoCamera2: Use ZSL format quirk.
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

12 years agoMerge "Camera2: Use scene mode override parameter" into jb-mr1-dev
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

12 years agoMerge "Bug 7170947 Configure AAC decoder for mobile DRC settings" into jb-mr1-dev
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

12 years agoBug 7170947 Configure AAC decoder for mobile DRC settings
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

12 years agoCamera2: Use scene mode override parameter
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

12 years agoMerge "Enable silence detection and don't driver the audio encoder" into jb-mr1-dev
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

12 years agoMerge "Now back to 30fps, suspend updates if surface flinger didn't send us" into...
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

12 years agoMerge "More power savings: No need to keep a history of outgoing packets" into jb...
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

12 years agoMerge "Increase converter polling interval." 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

12 years agoMerge "Take advantage of the hardware encoder's ability to prepend SPS/PPS" into...
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

12 years agoEnable silence detection and don't driver the audio encoder
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

12 years agoNow back to 30fps, suspend updates if surface flinger didn't send us
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

12 years agoMore power savings: No need to keep a history of outgoing packets
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

12 years agoFix video continuity
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

12 years agoIncrease converter polling interval.
Andreas Huber [Tue, 2 Oct 2012 17:31:46 +0000 (10:31 -0700)]
Increase converter polling interval.

Change-Id: I455005086a63c70883a71e189753a117b195f22f
related-to-bug: 7248248

12 years agoTake advantage of the hardware encoder's ability to prepend SPS/PPS
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

12 years agoMerge "[WVDRM] Fix for stuttering on low bandwidth" into jb-mr1-dev
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

12 years agoUse incremental updates sent by surface flinger
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

12 years agoMerge "ALooper::GetNowUs() now relies on systemTime instead of gettimeofday." into...
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

12 years agoMerge "Optionally have SurfaceMediaSource return absolute timestamps" 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

12 years agoALooper::GetNowUs() now relies on systemTime instead of gettimeofday.
Andreas Huber [Mon, 1 Oct 2012 23:03:44 +0000 (16:03 -0700)]
ALooper::GetNowUs() now relies on systemTime instead of gettimeofday.

Change-Id: Ia31eb0940b02581327a8bf51af6df135f9ab6de3
related-to-bug: 7266324

12 years agoOptionally have SurfaceMediaSource return absolute timestamps
Andreas Huber [Mon, 1 Oct 2012 22:59:54 +0000 (15:59 -0700)]
Optionally have SurfaceMediaSource return absolute timestamps

based on systemTime().

Change-Id: I2eff15dd149a4b737d6e7473d1907cf0c80b6b38
related-to-bug: 7266706

12 years agoInform DisplayManager that we're running over a secure channel (HDCP)
Andreas Huber [Mon, 1 Oct 2012 21:26:42 +0000 (14:26 -0700)]
Inform DisplayManager that we're running over a secure channel (HDCP)

if that's the case.

Change-Id: I5f16cad04a6937a3fb65600a971866a77e0ae9fc
related-to-bug: 7265406

12 years ago[WVDRM] Fix for stuttering on low bandwidth
Jeff Tinker [Mon, 1 Oct 2012 19:57:48 +0000 (12:57 -0700)]
[WVDRM] Fix for stuttering on low bandwidth

Reintroduces the play/pause rebuffering logic we eliminated
in JB zero day to fix double spins and slow startup - but
activates that logic only based on a comparison of the
current bandwidth measurement and the lowest bitrate track
in the movie.

Needs to be submitted with related changes in /vendor/widevine

bug: 7230071
Change-Id: If4f5ecda36c4858ce8bf5c4abb722f90a329ecdb

12 years agoPerform an orderly shutdown if possible, force disconnect if necessary
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

12 years agoRemove double negatives from SurfaceMediaSource
Andreas Huber [Mon, 1 Oct 2012 18:22:05 +0000 (11:22 -0700)]
Remove double negatives from SurfaceMediaSource

ensure mStarted actually reflects the state of SurfaceMediaSource

Change-Id: I92557896993ad8da23fe6940e997402ad63b8cbc
related-to-bug: 7258622

12 years agoMake sure we still handle shutdown-related message even if we're
Andreas Huber [Mon, 1 Oct 2012 17:43:55 +0000 (10:43 -0700)]
Make sure we still handle shutdown-related message even if we're

in error-state.

Change-Id: Ie12dd1a63306b4020b9de9eae007f6d768f02df6
related-to-bug: 7262673

12 years agoDisable audio watchdog
Glenn Kasten [Thu, 27 Sep 2012 20:49:02 +0000 (13:49 -0700)]
Disable audio watchdog

It's not critical, and is wasting power

Bug: 7241714
Change-Id: I6ad4375f0000c92529688723dbe0ff0caa809c5d

12 years agoMerge "Even cleaner shutdown." into jb-mr1-dev
Dave Burke [Sun, 30 Sep 2012 19:14:20 +0000 (12:14 -0700)]
Merge "Even cleaner shutdown." into jb-mr1-dev

12 years agoMerge "bug 7253033 clean up before closing an output" into jb-mr1-dev
Jean-Michel Trivi [Sun, 30 Sep 2012 18:57:35 +0000 (11:57 -0700)]
Merge "bug 7253033 clean up before closing an output" into jb-mr1-dev

12 years agoMerge "Enable write side of MonoPipe to be shutdown" into jb-mr1-dev
Glenn Kasten [Sun, 30 Sep 2012 18:48:10 +0000 (11:48 -0700)]
Merge "Enable write side of MonoPipe to be shutdown" into jb-mr1-dev

12 years agobug 7253033 clean up before closing an output
Jean-Michel Trivi [Fri, 28 Sep 2012 21:49:39 +0000 (14:49 -0700)]
bug 7253033 clean up before closing an output

An output can only be closed if there is no lock contention that
 prevents ThreadBase::exit() from being blocked. If an output
 device is waiting for an operation to complete (here a write
 in the remote_submix module, because the pipe is full), signal
 the module that it's entering the "exiting" state.

Change-Id: I8248add60da543e90c25a4c809866cdb26255651

12 years agoCamera2: Refactor preview/recording management to separate class.
Eino-Ville Talvala [Wed, 26 Sep 2012 17:45:47 +0000 (10:45 -0700)]
Camera2: Refactor preview/recording management to separate class.

Untangle preview/recording management from main class to simplify
callpaths; in preparation for fixing several HAL/app interactions
bugs.

Bug: 7172543
Bug: 7159577
Bug: 7107220
Change-Id: Iab5503f66b35d88a1524111536a484c9e33fd934

12 years agoDO NOT MERGE: Remove experimental parameters for burst mode
James Painter [Fri, 28 Sep 2012 07:09:12 +0000 (00:09 -0700)]
DO NOT MERGE: Remove experimental parameters for burst mode

Bug: 7248756
Change-Id: I3aaf2da4791b2a13e1e788b2914e4c51c529a75d

12 years agoEven cleaner shutdown.
Andreas Huber [Fri, 28 Sep 2012 23:34:38 +0000 (16:34 -0700)]
Even cleaner shutdown.

Change-Id: I5a76f83db3a5e43f55eb4e04269d890c2015bae7
related-to-bug: 7247918

12 years agoEnable write side of MonoPipe to be shutdown
Glenn Kasten [Fri, 28 Sep 2012 19:22:52 +0000 (12:22 -0700)]
Enable write side of MonoPipe to be shutdown

Bug: 7253033
Change-Id: Iea8390763b59ffa7a8e2a6b77dd04ea23442698f

12 years agoFix shutdown if HDCP was never instantiated.
Andreas Huber [Fri, 28 Sep 2012 22:13:18 +0000 (15:13 -0700)]
Fix shutdown if HDCP was never instantiated.

Change-Id: Icdf6785880180f417c5432dff54c7e0fb12ef84d
related-to-bug: 7247918

12 years agoMerge "Camera2: Use new JPEG transport header" into jb-mr1-dev
Alex Ray [Fri, 28 Sep 2012 20:12:28 +0000 (13:12 -0700)]
Merge "Camera2: Use new JPEG transport header" into jb-mr1-dev

12 years agoTell the encoder to emit SPS/PPS before IDR frames in wifi display code.
Andreas Huber [Fri, 28 Sep 2012 18:34:41 +0000 (11:34 -0700)]
Tell the encoder to emit SPS/PPS before IDR frames in wifi display code.

Change-Id: Ic40e09b66784dd2e370d30b688d50561a47ab85a
related-to-bug: 7245308

12 years agoMerge "Various improvements to a cleaner shutdown of the wifi display connection...
Andreas Huber [Fri, 28 Sep 2012 18:01:42 +0000 (11:01 -0700)]
Merge "Various improvements to a cleaner shutdown of the wifi display connection." into jb-mr1-dev

12 years agoMerge "Camera2: Re-entering preview state on v2 Device" into jb-mr1-dev
Alex Ray [Fri, 28 Sep 2012 17:30:38 +0000 (10:30 -0700)]
Merge "Camera2: Re-entering preview state on v2 Device" into jb-mr1-dev

12 years agoVarious improvements to a cleaner shutdown of the wifi display connection.
Andreas Huber [Fri, 28 Sep 2012 17:23:51 +0000 (10:23 -0700)]
Various improvements to a cleaner shutdown of the wifi display connection.

Change-Id: Id029a89939e53c2bd1d20e572d3975ec2795c239
related-to-bug: 7247918

12 years agoCamera2: Use new JPEG transport header
Alex Ray [Thu, 27 Sep 2012 23:06:48 +0000 (16:06 -0700)]
Camera2: Use new JPEG transport header

Check for new JPEG transport header at the end of the stream buffer
instead of at the beginning.

Bug: 7108816
Change-Id: I26c52267cb406dae50c9d0ee01e6c26359ba84aa

12 years agoCamera2: Only _some_ FPS values in the old API are scaled.
Eino-Ville Talvala [Fri, 28 Sep 2012 01:08:20 +0000 (18:08 -0700)]
Camera2: Only _some_ FPS values in the old API are scaled.

The (deprecated) single-FPS parameter is not scaled by 1000.

Bug: 7230239
Change-Id: I5664cce90f9cb01e57e39f1a1f7c8eb730501da3

12 years agoMerge "Camera2: Fix FPS value scaling between HAL2 and API" into jb-mr1-dev
Eino-Ville Talvala [Thu, 27 Sep 2012 23:36:15 +0000 (16:36 -0700)]
Merge "Camera2: Fix FPS value scaling between HAL2 and API" into jb-mr1-dev

12 years agowfd_presentation_url should not include the port number according to wfd specs
Andreas Huber [Thu, 27 Sep 2012 21:27:42 +0000 (14:27 -0700)]
wfd_presentation_url should not include the port number according to wfd specs

Change-Id: I9c0e0174f6ab4cb24c6eafcaae853e432b3dffb9
related-to-bug: 7247490

12 years agoMerge "Cleaner Wifi Display shutdown process, avoid crashing HDCP on exit." into...
Andreas Huber [Thu, 27 Sep 2012 21:31:04 +0000 (14:31 -0700)]
Merge "Cleaner Wifi Display shutdown process, avoid crashing HDCP on exit." into jb-mr1-dev

12 years agoMerge "Prepend SPS/PPS manually before encryption in HDCP mode. This is" into jb...
Andreas Huber [Thu, 27 Sep 2012 21:30:49 +0000 (14:30 -0700)]
Merge "Prepend SPS/PPS manually before encryption in HDCP mode. This is" into jb-mr1-dev

12 years agoCleaner Wifi Display shutdown process, avoid crashing HDCP on exit.
Andreas Huber [Thu, 27 Sep 2012 21:13:05 +0000 (14:13 -0700)]
Cleaner Wifi Display shutdown process, avoid crashing HDCP on exit.

Change-Id: Ie54ee3edd672ec629360b4ecc5df2f85ecbaa45f
related-to-bug: 7247584

12 years agoCamera2: Fix FPS value scaling between HAL2 and API
Eino-Ville Talvala [Thu, 27 Sep 2012 21:18:13 +0000 (14:18 -0700)]
Camera2: Fix FPS value scaling between HAL2 and API

API assumes FPS values are in fixed-point with LSB 0.001; HAL2 just
uses ints with no fractional part.

HAL should probably use floats or something similar, but for now, fix
scaling so the two agree on FPS values.

Bug: 7230239
Change-Id: Ie18a4f11fc9d17d9ae2d04781511a273213eda55

12 years agoTune WFD audio bitrate (did some listening tests).
Dave Burke [Thu, 27 Sep 2012 19:54:57 +0000 (12:54 -0700)]
Tune WFD audio bitrate (did some listening tests).
Bug: 7241844

Change-Id: I5243f7a771871e650c6c2f380e0e81e7671c7bac

12 years agoPrepend SPS/PPS manually before encryption in HDCP mode. This is
Andreas Huber [Thu, 27 Sep 2012 15:53:23 +0000 (08:53 -0700)]
Prepend SPS/PPS manually before encryption in HDCP mode. This is

a temporary change that will go away once the encoder can take care
of this.

Change-Id: Id65218f8a250d8c8fe3e8987b522065b5f5d7dca
related-to-bug: 7245308