OSDN Git Service
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
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
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
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
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
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
Andreas Huber [Mon, 1 Oct 2012 21:58:53 +0000 (14:58 -0700)]
am
0cb47712: Inform DisplayManager that we\'re running over a secure channel (HDCP)
* commit '
0cb47712a4fc0e01ad8680ee6ac3a5d72eafe0ba':
Inform 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
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
Andreas Huber [Mon, 1 Oct 2012 18:42:52 +0000 (11:42 -0700)]
am
ad0d97c7: Perform an orderly shutdown if possible, force disconnect if necessary
* commit '
ad0d97c7cf620e96a0b088dd9461645a3f8900b7':
Perform an orderly shutdown if possible, force disconnect if necessary
Andreas Huber [Mon, 1 Oct 2012 18:42:51 +0000 (11:42 -0700)]
am
0e1d7164: Remove double negatives from SurfaceMediaSource
* commit '
0e1d71641624c641a0a1abe4098943f5a42c6f94':
Remove double negatives from SurfaceMediaSource
Andreas Huber [Mon, 1 Oct 2012 18:42:50 +0000 (11:42 -0700)]
am
6360758c: Make sure we still handle shutdown-related message even if we\'re
* commit '
6360758ce2d171169d2a21e30266547ee4ac0fec':
Make sure we still handle shutdown-related message even if we're
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
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
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
Glenn Kasten [Mon, 1 Oct 2012 17:15:53 +0000 (10:15 -0700)]
am
087dd8e7: Disable audio watchdog
* commit '
087dd8e7232e4c009e9121ab7e8c37985522c9ad':
Disable audio watchdog
Dave Burke [Mon, 1 Oct 2012 17:15:11 +0000 (10:15 -0700)]
am
4769f0b8: Merge "Even cleaner shutdown." into jb-mr1-dev
* commit '
4769f0b873030bbaa6977fe18696961d1d1b26ba':
Even cleaner shutdown.
Jean-Michel Trivi [Mon, 1 Oct 2012 17:15:10 +0000 (10:15 -0700)]
am
7165491b: Merge "bug
7253033 clean up before closing an output" into jb-mr1-dev
* commit '
7165491b8fe140609ab987b510ad1a55715856e9':
bug
7253033 clean up before closing an output
Glenn Kasten [Mon, 1 Oct 2012 17:15:08 +0000 (10:15 -0700)]
am
d13df246: Merge "Enable write side of MonoPipe to be shutdown" into jb-mr1-dev
* commit '
d13df2463bd09d8c1fc5b20050d3262a4e89512d':
Enable write side of MonoPipe to be shutdown
Eino-Ville Talvala [Mon, 1 Oct 2012 17:13:35 +0000 (10:13 -0700)]
am
73bbd1f1: Camera2: Refactor preview/recording management to separate class.
* commit '
73bbd1f1c493835f191ea2b0b72439292496b40a':
Camera2: Refactor preview/recording management to separate class.
James Painter [Mon, 1 Oct 2012 17:13:06 +0000 (10:13 -0700)]
am
0517e304: DO NOT MERGE: Remove experimental parameters for burst mode
* commit '
0517e304d0cce25653a033e3cb00172d54ba251d':
DO NOT MERGE: Remove experimental parameters for burst mode
The Android Automerger [Mon, 1 Oct 2012 01:17:32 +0000 (18:17 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
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
Dave Burke [Sun, 30 Sep 2012 19:14:20 +0000 (12:14 -0700)]
Merge "Even cleaner shutdown." 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
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
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
The Android Automerger [Sun, 30 Sep 2012 13:59:27 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
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
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
Andreas Huber [Fri, 28 Sep 2012 23:34:38 +0000 (16:34 -0700)]
Even cleaner shutdown.
Change-Id: I5a76f83db3a5e43f55eb4e04269d890c2015bae7
related-to-bug:
7247918
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
Andreas Huber [Fri, 28 Sep 2012 22:29:20 +0000 (15:29 -0700)]
am
bbe96f0f: Fix shutdown if HDCP was never instantiated.
* commit '
bbe96f0f05a1f1a1b3cfec0d124cb0d63c1ebf2a':
Fix 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
Alex Ray [Fri, 28 Sep 2012 20:14:56 +0000 (13:14 -0700)]
am
23f74017: Merge "Camera2: Use new JPEG transport header" into jb-mr1-dev
* commit '
23f74017a2c457a25382677b6e696c4cfa06cef5':
Camera2: Use new JPEG transport header
Alex Ray [Fri, 28 Sep 2012 20:12:28 +0000 (13:12 -0700)]
Merge "Camera2: Use new JPEG transport header" into jb-mr1-dev
Andreas Huber [Fri, 28 Sep 2012 19:52:52 +0000 (12:52 -0700)]
am
3a0ef0dc: Tell the encoder to emit SPS/PPS before IDR frames in wifi display code.
* commit '
3a0ef0dc71f3776d115f30d87f1d8867daefea88':
Tell 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
Andreas Huber [Fri, 28 Sep 2012 18:06:02 +0000 (11:06 -0700)]
am
e646b2d2: Merge "Various improvements to a cleaner shutdown of the wifi display connection." into jb-mr1-dev
* commit '
e646b2d26459ca30667097e9600ee3f57ebfd228':
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
Alex Ray [Fri, 28 Sep 2012 17:33:18 +0000 (10:33 -0700)]
am
24dfc952: Merge "Camera2: Re-entering preview state on v2 Device" into jb-mr1-dev
* commit '
24dfc952bcb609f7ba59c7fb9f7c3004ffb8c83b':
Camera2: Re-entering preview state on v2 Device
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
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
The Android Automerger [Fri, 28 Sep 2012 13:59:20 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
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
Eino-Ville Talvala [Fri, 28 Sep 2012 03:40:23 +0000 (20:40 -0700)]
am
d0cec0cb: Camera2: Only _some_ FPS values in the old API are scaled.
* commit '
d0cec0cb574a3d629afb7c32883bc986d7a65535':
Camera2: 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
Eino-Ville Talvala [Thu, 27 Sep 2012 23:38:09 +0000 (16:38 -0700)]
am
12d3e887: Merge "Camera2: Fix FPS value scaling between HAL2 and API" into jb-mr1-dev
* commit '
12d3e887c6cefcd5ae0abce528ea576950ce6b9f':
Camera2: Fix FPS value scaling between HAL2 and API
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
Andreas Huber [Thu, 27 Sep 2012 21:33:48 +0000 (14:33 -0700)]
am
de799a74: wfd_presentation_url should not include the port number according to wfd specs
* commit '
de799a74064a363d26f4c1bbc5a59d1b7127f49f':
wfd_presentation_url should not include the port number according to wfd specs
Andreas Huber [Thu, 27 Sep 2012 21:32:22 +0000 (14:32 -0700)]
am
ecc8db5e: Merge "Cleaner Wifi Display shutdown process, avoid crashing HDCP on exit." into jb-mr1-dev
* commit '
ecc8db5ee83d648532be1392f53277aa3a25284e':
Cleaner Wifi Display shutdown process, avoid crashing HDCP on exit.
Andreas Huber [Thu, 27 Sep 2012 21:32:21 +0000 (14:32 -0700)]
am
5cfd237f: Merge "Prepend SPS/PPS manually before encryption in HDCP mode. This is" into jb-mr1-dev
* commit '
5cfd237fd70572796b86f977ff4fdfe29cab888d':
Prepend SPS/PPS manually before encryption in HDCP mode. This is
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
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
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
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
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
Dave Burke [Thu, 27 Sep 2012 19:57:04 +0000 (12:57 -0700)]
am
f58cac48: Tune WFD audio bitrate (did some listening tests). Bug:
7241844
* commit '
f58cac48e5732dbc4a5f33eed9cd39f109146ca4':
Tune WFD audio bitrate (did some listening tests). Bug:
7241844
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
The Android Open Source Project [Thu, 27 Sep 2012 16:57:48 +0000 (09:57 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I140c6ef68bdb8fa5a2e4d1041405ba9f3c85097a
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
The Android Automerger [Thu, 27 Sep 2012 13:59:33 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Alex Ray [Wed, 26 Sep 2012 22:52:50 +0000 (15:52 -0700)]
Camera2: Re-entering preview state on v2 Device
Bug:
7240891
Change-Id: I6a01b27197b4ee89a68f06f4375d315a716b67ae
Iliyan Malchev [Thu, 27 Sep 2012 03:24:18 +0000 (20:24 -0700)]
am
6d6a4d3f: Merge changes Ia4414241,I34f5d36a into jb-mr1-dev
* commit '
6d6a4d3f37b332284b8b976bd5bb21d29007a97e':
audioflinger: use resample coefficients from audio-resampler library.
audioflinger/resampler: Add VERY_HIGH_QUALITY audio-resampler
Iliyan Malchev [Thu, 27 Sep 2012 03:22:12 +0000 (20:22 -0700)]
Merge changes Ia4414241,I34f5d36a into jb-mr1-dev
* changes:
audioflinger: use resample coefficients from audio-resampler library.
audioflinger/resampler: Add VERY_HIGH_QUALITY audio-resampler
Dave Burke [Thu, 27 Sep 2012 02:12:56 +0000 (19:12 -0700)]
am
ee93c8c0: Tune iframe interval to 1sec. Bug:
7241844
* commit '
ee93c8c0f65cc1965ca09c9e33ae672f8bc9b88c':
Tune iframe interval to 1sec. Bug:
7241844
SathishKumar Mani [Tue, 17 Jan 2012 18:49:47 +0000 (10:49 -0800)]
audioflinger: use resample coefficients from audio-resampler library.
-Add a separate quality VERY_HIGH_QUALITY in resampler
-Use resample coefficients audio-resampler library for
quality VERY_HIGH_QUALITY.
-This improves the quality of resampled output.
Bug:
7024293
Change-Id: Ia44142413bed5f5963d7eab7846eec877a2415e4
Signed-off-by: Iliyan Malchev <malchev@google.com>
SathishKumar Mani [Mon, 24 Sep 2012 18:48:11 +0000 (11:48 -0700)]
audioflinger/resampler: Add VERY_HIGH_QUALITY audio-resampler
Change-Id: I34f5d36ae60010ec64222d6660d10a84da3bf566
Bug:
7024293
Signed-off-by: Iliyan Malchev <malchev@google.com>
Dave Burke [Thu, 27 Sep 2012 00:56:37 +0000 (17:56 -0700)]
Tune iframe interval to 1sec.
Bug:
7241844
Change-Id: Iae0d73ecc680f6fa69d82ee2e8fac18ebece7782
Andreas Huber [Wed, 26 Sep 2012 21:49:49 +0000 (14:49 -0700)]
am
72ff5903: 720p24 i-frames every 2 secs.
* commit '
72ff5903df5f409ea83f74c363a52f0745ced8b8':
720p24 i-frames every 2 secs.
Andreas Huber [Wed, 26 Sep 2012 21:30:33 +0000 (14:30 -0700)]
720p24 i-frames every 2 secs.
related-to-bug:
7239971
Change-Id: I4cbf7e9b878b180b0683656e9e8c0a6bb18e06dc