OSDN Git Service
Marco Nelissen [Thu, 13 Mar 2014 15:54:25 +0000 (15:54 +0000)]
am
19afb386: Merge "Remove streaming URI from default logs"
* commit '
19afb3869eb6a3e3733dc1f7420e1d4c3c03d376':
Remove streaming URI from default logs
Marco Nelissen [Wed, 12 Mar 2014 15:41:55 +0000 (15:41 +0000)]
Merge "Remove streaming URI from default logs"
Narayan Kamath [Tue, 11 Mar 2014 18:42:27 +0000 (18:42 +0000)]
am
2ad7af29: Merge "Check for ARCH_ARM_HAVE_NEON flag only for ARM arch"
* commit '
2ad7af29bb667d939f27417011567847c4b62f94':
Check for ARCH_ARM_HAVE_NEON flag only for ARM arch
Narayan Kamath [Tue, 11 Mar 2014 18:42:26 +0000 (18:42 +0000)]
am
a9b82160: Merge "LP64 fixes for media/libeffects"
* commit '
a9b82160a6682438d43709ba5e7a29022ad1af58':
LP64 fixes for media/libeffects
Glenn Kasten [Tue, 11 Mar 2014 18:36:27 +0000 (18:36 +0000)]
am
395c2fc0: Merge "audioflinger: Fix for a deadlock in track creation"
* commit '
395c2fc0c422c9218f39f6ed2040e90b1cc9920a':
audioflinger: Fix for a deadlock in track creation
Narayan Kamath [Tue, 11 Mar 2014 18:17:48 +0000 (18:17 +0000)]
am
525b099a: Merge "Fix ALOGVs for 64bit"
* commit '
525b099ada155d6654300cb2e5d8c1a09f4eb8ba':
Fix ALOGVs for 64bit
Glenn Kasten [Tue, 11 Mar 2014 18:17:07 +0000 (18:17 +0000)]
am
0cf16339: Merge "Fix preventing from heap overwrite in capture command"
* commit '
0cf1633922f970caee19e2cc2f5c042ca30b4aa6':
Fix preventing from heap overwrite in capture command
Narayan Kamath [Tue, 11 Mar 2014 18:16:23 +0000 (18:16 +0000)]
am
096d72a3: Merge "AArch64: Correction for LP64"
* commit '
096d72a32824a0a8c86a716ba44d589183b2b0b3':
AArch64: Correction for LP64
Ying Wang [Tue, 11 Mar 2014 18:08:16 +0000 (18:08 +0000)]
am
5969b408: Merge "Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH"
* commit '
5969b40858d2046aa2b8481926e34c4cb9062a4a':
Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH
Glenn Kasten [Tue, 11 Mar 2014 17:12:06 +0000 (17:12 +0000)]
am
8fc4d57d: Merge "Avoid a building error"
* commit '
8fc4d57d41f532b90187b9404a8ac705770d75b4':
Avoid a building error
Zhijun He [Mon, 10 Mar 2014 23:42:18 +0000 (23:42 +0000)]
am
bc69c8ba: DO NOT MERGE: Camera: delete preview callback when preview size is changed
* commit '
bc69c8ba9a8fc881603669205a56d0ca1b572a95':
DO NOT MERGE: Camera: delete preview callback when preview size is changed
Zhijun He [Tue, 21 Jan 2014 20:15:56 +0000 (12:15 -0800)]
DO NOT MERGE: Camera: delete preview callback when preview size is changed
Preview callback stream is left configured even the preview size is changed.
This makes the callback stream unnecessarily configured even in recording mode,
which could cause distorted preview for some devices.
Bug:
12210027
Bug:
12591410
Change-Id: If50cddfe5562e91aec1feb1760eccb82ddb21730
David Williams [Thu, 6 Sep 2012 14:33:38 +0000 (16:33 +0200)]
Remove streaming URI from default logs
Streaming URI should not be visible in default logcat logs
Change-Id: I104cc56b5335f8c5621013e4c5be8028f0379833
Eric Laurent [Sat, 8 Mar 2014 06:23:51 +0000 (06:23 +0000)]
am
6db20dcb: Merge "AudioTrack: When paused, return cached playback position" into klp-dev
* commit '
6db20dcb54dad932a3ea2e3a5dca41fce5802eb4':
AudioTrack: When paused, return cached playback position
Glenn Kasten [Sat, 8 Mar 2014 06:22:13 +0000 (06:22 +0000)]
am
2f55c2c0: Merge "Simplify AudioTrack stream end and fix race" into klp-dev
* commit '
2f55c2c03b17795e94b325d402ac5b409e3ba0e8':
Simplify AudioTrack stream end and fix race
Marco Nelissen [Sat, 8 Mar 2014 06:22:12 +0000 (06:22 +0000)]
am
5874615f: Allow for larger codec private data
* commit '
5874615f26a6ba9cda8ba359e5035b21f6e3818b':
Allow for larger codec private data
Eric Laurent [Sat, 8 Mar 2014 00:29:56 +0000 (00:29 +0000)]
Merge "AudioTrack: When paused, return cached playback position" into klp-dev
Marco Nelissen [Fri, 7 Mar 2014 22:59:21 +0000 (22:59 +0000)]
am
4ee5d2b9: (-s ours) Merge "LiveSession: Use the actual, possibly redirected url as base in the M3U"
* commit '
4ee5d2b9d0cdaf936bd5fecd670e5f38da63e4ae':
LiveSession: Use the actual, possibly redirected url as base in the M3U
Glenn Kasten [Fri, 7 Mar 2014 20:22:38 +0000 (20:22 +0000)]
Merge "Simplify AudioTrack stream end and fix race" into klp-dev
Colin Cross [Fri, 7 Mar 2014 19:33:37 +0000 (19:33 +0000)]
am
80b72e6f: Merge "libeffects: don\'t set module path"
* commit '
80b72e6f4202ce26facbe51b8739814bca198a2c':
libeffects: don't set module path
Glenn Kasten [Fri, 20 Sep 2013 16:28:56 +0000 (09:28 -0700)]
Simplify AudioTrack stream end and fix race
Bug:
10994052
Change-Id: Ib2e38e7a600bcffef8cbc68c1722e40fbbc7ea67
Marco Nelissen [Mon, 3 Feb 2014 22:33:16 +0000 (14:33 -0800)]
Allow for larger codec private data
This change adds support for multibyte sizes in the ESDS. Previously the
Matroska extractor only supported single byte sizes, so codec private data
had to be less than 108 bytes, and would crash if it was bigger.
b/
12584090
Change-Id: I9edfc2f687187d1e98bcfd2fe56576312435df3e
Marco Nelissen [Fri, 7 Mar 2014 18:31:40 +0000 (18:31 +0000)]
am
5bc83fc3: Merge "Fix SIGABRT when playing mp4 file" into klp-dev
* commit '
5bc83fc352e5682ecafe61d77062c26ac8db4229':
Fix SIGABRT when playing mp4 file
Lajos Molnar [Fri, 7 Mar 2014 18:31:25 +0000 (18:31 +0000)]
am
49ea1337: Merge changes I787e1c05,I72d3a5e1,I0a5cc65f,I75fc2a25,I2c2be08d, ... into klp-dev
* commit '
49ea13379fb15ddb73183ebafa3a377342ef932f':
LiveSession: Use the actual, possibly redirected url as base in the M3U
M3UParser: Skip query strings when looking for the last slash in a URL
ChromiumHTTPDataSource: Keep track of the redirected URL
Initial HLS seamless switch implementation.
NuPlayer side support for seamless format switch.
LiveSession refactor
PlaylistFetcher: Add support for block-by-block decryption.
LiveSession: Add support for block-by-block fetchFile.
Lajos Molnar [Fri, 7 Mar 2014 18:31:24 +0000 (18:31 +0000)]
am
e0c3058a: Merge "AnotherPacketSource support to get latest buffered MetaData." into klp-dev
* commit '
e0c3058a1d0953f4c85bfc964926cf5babb7dbac':
AnotherPacketSource support to get latest buffered MetaData.
Lajos Molnar [Fri, 7 Mar 2014 18:31:23 +0000 (18:31 +0000)]
am
2613347d: Merge "Added support to query ACodec whether adaptive playback is enabled." into klp-dev
* commit '
2613347d74c3f35bc6fda5df1c29c1119c22d432':
Added support to query ACodec whether adaptive playback is enabled.
Lajos Molnar [Fri, 7 Mar 2014 18:31:23 +0000 (18:31 +0000)]
am
909498b7: Merge "stagefright: use CODECS field in EXT-X_STREAM-INF as fallback" into klp-dev
* commit '
909498b72d740e3151561fd4435ad0a329ec9c6e':
stagefright: use CODECS field in EXT-X_STREAM-INF as fallback
Lajos Molnar [Fri, 7 Mar 2014 18:31:22 +0000 (18:31 +0000)]
am
2338782d: Merge "Fixed misplaced bracket for switch-case block." into klp-dev
* commit '
2338782d18d9bcc8197c63dbf205332a2a737440':
Fixed misplaced bracket for switch-case block.
Lajos Molnar [Fri, 7 Mar 2014 18:31:21 +0000 (18:31 +0000)]
am
ad21a81a: Merge "stagefright: Fix issue with tracking media format in packet source" into klp-dev
* commit '
ad21a81af3e7d6b58002c9dce9c3278b6323e4a9':
stagefright: Fix issue with tracking media format in packet source
Lajos Molnar [Fri, 7 Mar 2014 18:31:20 +0000 (18:31 +0000)]
am
b74b2098: Merge "stagefright: Fix bugs in playlist fetcher logic" into klp-dev
* commit '
b74b209862cbcbab6053cf4a43bbc16940aaafd2':
stagefright: Fix bugs in playlist fetcher logic
Eino-Ville Talvala [Fri, 7 Mar 2014 18:31:19 +0000 (18:31 +0000)]
am
a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-dev
* commit '
a11111f9135c98cf4247bbd1a61d7df3053e549e':
DO NOT MERGE: Camera: fix focusArea wrong indexing issue
DO NOT MERGE: camera2: Fix race with stream deletion during disconnect.
DO NOT MERGE: camera2/3: Add protection for still capture path
Eric Laurent [Fri, 7 Mar 2014 18:31:16 +0000 (18:31 +0000)]
am
ed4d8b28: Merge "stagefright: do not offload LD-AAC decoding" into klp-dev
* commit '
ed4d8b28b8ee5a3e4ebc8f73bf4dc86c75a74258':
stagefright: do not offload LD-AAC decoding
Eric Laurent [Fri, 7 Mar 2014 18:30:41 +0000 (18:30 +0000)]
am
880413f7: Merge "stagefright: fix offloading HE-AAC sampling rate." into klp-dev
* commit '
880413f7923ec77467243e15dc34d4af4f8064f9':
stagefright: fix offloading HE-AAC sampling rate.
Marco Nelissen [Fri, 7 Mar 2014 18:22:53 +0000 (18:22 +0000)]
Merge "Fix SIGABRT when playing mp4 file" into klp-dev
Narayan Kamath [Fri, 7 Mar 2014 16:04:47 +0000 (16:04 +0000)]
Merge "Check for ARCH_ARM_HAVE_NEON flag only for ARM arch"
Narayan Kamath [Fri, 7 Mar 2014 16:04:44 +0000 (16:04 +0000)]
Merge "LP64 fixes for media/libeffects"
Lajos Molnar [Fri, 7 Mar 2014 02:35:50 +0000 (02:35 +0000)]
Merge changes I787e1c05,I72d3a5e1,I0a5cc65f,I75fc2a25,I2c2be08d, ... into klp-dev
* changes:
LiveSession: Use the actual, possibly redirected url as base in the M3U
M3UParser: Skip query strings when looking for the last slash in a URL
ChromiumHTTPDataSource: Keep track of the redirected URL
Initial HLS seamless switch implementation.
NuPlayer side support for seamless format switch.
LiveSession refactor
PlaylistFetcher: Add support for block-by-block decryption.
LiveSession: Add support for block-by-block fetchFile.
Lajos Molnar [Fri, 7 Mar 2014 02:33:32 +0000 (02:33 +0000)]
Merge "AnotherPacketSource support to get latest buffered MetaData." into klp-dev
Lajos Molnar [Fri, 7 Mar 2014 02:33:08 +0000 (02:33 +0000)]
Merge "Added support to query ACodec whether adaptive playback is enabled." into klp-dev
Lajos Molnar [Fri, 7 Mar 2014 02:32:34 +0000 (02:32 +0000)]
Merge "stagefright: use CODECS field in EXT-X_STREAM-INF as fallback" into klp-dev
Lajos Molnar [Fri, 7 Mar 2014 02:32:25 +0000 (02:32 +0000)]
Merge "Fixed misplaced bracket for switch-case block." into klp-dev
Lajos Molnar [Fri, 7 Mar 2014 02:32:09 +0000 (02:32 +0000)]
Merge "stagefright: Fix issue with tracking media format in packet source" into klp-dev
Lajos Molnar [Fri, 7 Mar 2014 02:31:50 +0000 (02:31 +0000)]
Merge "stagefright: Fix bugs in playlist fetcher logic" into klp-dev
Glenn Kasten [Fri, 7 Mar 2014 02:30:11 +0000 (02:30 +0000)]
am
af191eb4: Merge "Replace size_t in shared memory by uint32_t"
* commit '
af191eb4feac513d17dc0362e0cea5bc9e0ffe9d':
Replace size_t in shared memory by uint32_t
Lajos Molnar [Fri, 7 Mar 2014 02:27:07 +0000 (02:27 +0000)]
am
7eacea11: Merge "avcenc: Only do startcode escaping if the next byte requires it"
* commit '
7eacea1156a3896ee7813cd9a06c535e63c95f6a':
avcenc: Only do startcode escaping if the next byte requires it
Narayan Kamath [Fri, 7 Mar 2014 02:26:36 +0000 (02:26 +0000)]
am
3c9130a8: Merge "Make frameworks/av 64-bit compatible"
* commit '
3c9130a8a12ce962dc8d22e04243b135b9e98b01':
Make frameworks/av 64-bit compatible
Colin Cross [Fri, 7 Mar 2014 02:26:14 +0000 (02:26 +0000)]
am
cdda7bf4: Merge "frameworks/av: fix errors inside ALOGV"
* commit '
cdda7bf4d3ca9cad6979374a18dd5be79ea83d80':
frameworks/av: fix errors inside ALOGV
Glenn Kasten [Fri, 7 Mar 2014 02:26:05 +0000 (02:26 +0000)]
am
5930e8eb: Merge "AudioFlinger: Remove code for supporting resampling in fast tracks"
* commit '
5930e8ebdacf3a59c13eef11fd03658ba58b443e':
AudioFlinger: Remove code for supporting resampling in fast tracks
Glenn Kasten [Fri, 7 Mar 2014 02:26:05 +0000 (02:26 +0000)]
am
4361749d: Merge "AudioTrack: Never try to use the fast path if resampling is required"
* commit '
4361749d74113069aafb0620a1189404205c58d0':
AudioTrack: Never try to use the fast path if resampling is required
Lajos Molnar [Fri, 7 Mar 2014 02:26:02 +0000 (02:26 +0000)]
am
7142d10a: Merge "avcenc: Update video port parameters in the base class"
* commit '
7142d10a7a3941b2deb18869a7f7b79462e0aa52':
avcenc: Update video port parameters in the base class
Lajos Molnar [Fri, 7 Mar 2014 02:26:02 +0000 (02:26 +0000)]
am
61bdaaa1: Merge "ChromiumHTTPDataSource: Keep track of the redirected URL"
* commit '
61bdaaa18a1d52666827e31bb7980a5784443835':
ChromiumHTTPDataSource: Keep track of the redirected URL
Lajos Molnar [Fri, 7 Mar 2014 02:26:01 +0000 (02:26 +0000)]
am
88e99f9a: Merge "SoftVPXEncoder: Set the frame size on the output port as well"
* commit '
88e99f9a5e098ee50019ce85f2b1273b48883f37':
SoftVPXEncoder: Set the frame size on the output port as well
Marco Nelissen [Fri, 7 Mar 2014 02:26:00 +0000 (02:26 +0000)]
am
44f2b8c2: Merge "M3UParser: Fix typo in
8883a38a308"
* commit '
44f2b8c2ff4baf64baa0510cd37ac178ef91b7bc':
M3UParser: Fix typo in
8883a38a308
Marco Nelissen [Fri, 7 Mar 2014 02:25:59 +0000 (02:25 +0000)]
am
8519b8a1: Merge "M3UParser: Skip query strings when looking for the last slash in a URL"
* commit '
8519b8a1298d80949edadce9c8f0963ef62cc3ff':
M3UParser: Skip query strings when looking for the last slash in a URL
Colin Cross [Fri, 7 Mar 2014 02:25:14 +0000 (02:25 +0000)]
am
e2307ccb: Merge "frameworks/av: fix errors inside ALOGV"
* commit '
e2307ccbab9c32a7806f15c2572cfe6ec428f2f5':
frameworks/av: fix errors inside ALOGV
Glenn Kasten [Fri, 7 Mar 2014 02:23:19 +0000 (02:23 +0000)]
am
d66cd743: Merge "audioflinger: conform inline ASM to UAL"
* commit '
d66cd743525cc049033caa3e81cbdf74c72a4556':
audioflinger: conform inline ASM to UAL
Martin Storsjo [Fri, 22 Nov 2013 15:57:31 +0000 (17:57 +0200)]
LiveSession: Use the actual, possibly redirected url as base in the M3U
This fixes playback of HLS streams where the M3U playlists use
relative paths and the main playlist is opened via a redirect.
Bug:
13174301
Change-Id: I787e1c050daddc566be4c8e3f84803d3f91eec46
Martin Storsjo [Fri, 22 Nov 2013 15:05:05 +0000 (17:05 +0200)]
M3UParser: Skip query strings when looking for the last slash in a URL
Bug:
13174301
Change-Id: I72d3a5e11fef9bbd75b291bc490c9cab1dce58da
Haynes Mathew George [Wed, 8 Jan 2014 21:59:53 +0000 (13:59 -0800)]
AudioTrack: When paused, return cached playback position
An offload output can be re-used between two audio tracks having
the same configuration. A timestamp query for a paused track
while the other is running would return an incorrect time.
To fix this, cache the playback position on a pause() and return
this time when requested until the track is resumed.
Bug:
12826612.
Change-Id: Ia42b8b8fd2ba8993dfcc9abca72da48d71d78d74
Marco Nelissen [Mon, 25 Nov 2013 16:39:56 +0000 (08:39 -0800)]
Fix SIGABRT when playing mp4 file
If the track duration was shorter than the segment duration, the calculated
encoder padding would be negative, resulting in a crash.
b/
11823061
https://code.google.com/p/android/issues/detail?id=62610
Change-Id: I3989ad88caea38d212b61355c15aec13382c6116
Eino-Ville Talvala [Fri, 7 Mar 2014 01:40:59 +0000 (01:40 +0000)]
Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-dev
* changes:
DO NOT MERGE: Camera: fix focusArea wrong indexing issue
DO NOT MERGE: camera2: Fix race with stream deletion during disconnect.
DO NOT MERGE: camera2/3: Add protection for still capture path
Lajos Molnar [Fri, 7 Mar 2014 01:34:19 +0000 (01:34 +0000)]
am
5db1e3a6: Merge "correct one logic error in decide whether should render or not"
* commit '
5db1e3a6f30c252ed61461dd8c58786e905e5f5a':
correct one logic error in decide whether should render or not
Eric Laurent [Fri, 7 Mar 2014 01:34:18 +0000 (01:34 +0000)]
am
c4eef29a: Merge "fix deadlock issues that arise when there are simultaneous effect control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds"
* commit '
c4eef29af4e306319d8741e0c3ade1ede9a0a2b5':
fix deadlock issues that arise when there are simultaneous effect control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds
Eric Laurent [Fri, 7 Mar 2014 01:34:18 +0000 (01:34 +0000)]
am
b447379e: Merge "audioflinger: fix static track end detection"
* commit '
b447379e2ea1c9ca4cd543ac183df70567d40485':
audioflinger: fix static track end detection
Eric Laurent [Fri, 7 Mar 2014 01:09:33 +0000 (01:09 +0000)]
Merge "stagefright: do not offload LD-AAC decoding" into klp-dev
Brian Carlstrom [Fri, 7 Mar 2014 00:37:18 +0000 (00:37 +0000)]
am
60181e36: Merge "frameworks/av: Rename persist.sys.dalvik.vm.lib to allow new default"
* commit '
60181e360e1c6240d70a3b365b78f8ff28b31493':
frameworks/av: Rename persist.sys.dalvik.vm.lib to allow new default
Martin Storsjo [Fri, 22 Nov 2013 16:11:58 +0000 (18:11 +0200)]
ChromiumHTTPDataSource: Keep track of the redirected URL
This makes the code actually match an existing comment in
DrmInitialization, which claimed that mURI was the redirected
URL and not the original one.
Bug:
13174301
Change-Id: I0a5cc65f520f1482ff91320ae78af84a8a681ee3
Robert Shih [Thu, 20 Feb 2014 21:07:26 +0000 (13:07 -0800)]
Initial HLS seamless switch implementation.
Bug:
11854054
Change-Id: I75fc2a258111295039ac13cc37e407df25891dd2
Robert Shih [Fri, 24 Jan 2014 00:18:22 +0000 (16:18 -0800)]
NuPlayer side support for seamless format switch.
Avoid reinstantiating decoder if seamless format switch is supported.
Bug:
11854054
Change-Id: I2c2be08d6da90cc835ec747d04a76db2313dfc7c
Robert Shih [Fri, 14 Feb 2014 20:21:50 +0000 (12:21 -0800)]
LiveSession refactor
Bug:
11854054
Change-Id: Ia91dce109835e042f72934376d4838b4cc72cb10
Robert Shih [Thu, 6 Feb 2014 22:25:25 +0000 (14:25 -0800)]
PlaylistFetcher: Add support for block-by-block decryption.
Bug:
11854054
Change-Id: Ifd3f3369275889e716b360087b5b60d01635b578
Robert Shih [Thu, 6 Feb 2014 22:01:30 +0000 (14:01 -0800)]
LiveSession: Add support for block-by-block fetchFile.
Bug:
11854054
Change-Id: I4025ba7fab8fab2e0c720f73894e908fd98a43d8
Robert Shih [Thu, 23 Jan 2014 22:25:32 +0000 (14:25 -0800)]
AnotherPacketSource support to get latest buffered MetaData.
Bug:
11854054
Change-Id: Ib3b6e0984036082bf3c4eb7901a2b29be52fdd29
Robert Shih [Thu, 23 Jan 2014 23:26:43 +0000 (15:26 -0800)]
Added support to query ACodec whether adaptive playback is enabled.
Bug:
11854054
Change-Id: I6b0308aa8550c643706959277e46dad586c37297
Robert Shih [Thu, 23 Jan 2014 23:00:53 +0000 (15:00 -0800)]
stagefright: use CODECS field in EXT-X_STREAM-INF as fallback
Use the CODECS field in EXT-X-STREAM-INF as a viable fallback for identifying
available streams in a variant playlist.
Bug:
11854054
Change-Id: I5011809dc7c56220b023eb1a16f2d6a392ddd6f1
Robert Shih [Thu, 23 Jan 2014 22:16:32 +0000 (14:16 -0800)]
Fixed misplaced bracket for switch-case block.
Bug:
11854054
Change-Id: I66b410e1e19601ad65d8357bda4c0c58e2dc15dc
Lajos Molnar [Tue, 17 Dec 2013 22:10:46 +0000 (14:10 -0800)]
stagefright: Fix issue with tracking media format in packet source
Media format in AnotherPacketSource is now tracked across discontinuities.
This fixes a bug where format was set on queueAccessUnit and cleared on
dequeueAccessUnit, thereby allowing it to remain cleared.
Change-Id: I20975a630443f4a223a2b4344e8244f34b9560b9
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
12060952
Lajos Molnar [Mon, 16 Dec 2013 18:16:32 +0000 (10:16 -0800)]
stagefright: Fix bugs in playlist fetcher logic
1. Improve start time: start playback as soon as the target duration
or 10s was buffered.
2. Select playlist monitor time based on target duration to avoid
continuously missing the boat.
3. If "we miss the boat" we still must request a safe sequence
number (last - 3)
Change-Id: Ie99c360ac67b152ad9af19e9c6e520016f67e4e3
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
12060952
Eric Laurent [Thu, 6 Mar 2014 19:21:49 +0000 (19:21 +0000)]
Merge "stagefright: fix offloading HE-AAC sampling rate." into klp-dev
Eric Laurent [Fri, 6 Dec 2013 19:51:42 +0000 (11:51 -0800)]
stagefright: do not offload LD-AAC decoding
For now, do not offload LD and ELD AAC decoding because there
is no way to know if it is supported by the audio DSP implementation.
The longer term fix will be to have mapMimeToAudioFormat() use the
audio object type in track metadata to refine the AAC format and the
audio HAL list supported AAC profiles.
Bug:
11697128.
Change-Id: Iaa88ecf3f4ae42ad48c1b42a9b007dd80eb88147
Glenn Kasten [Thu, 6 Mar 2014 19:08:44 +0000 (19:08 +0000)]
Merge "audioflinger: Fix for a deadlock in track creation"
Haynes Mathew George [Fri, 13 Dec 2013 23:40:13 +0000 (15:40 -0800)]
audioflinger: Fix for a deadlock in track creation
AudioFlinger enters a deadlock (with itself) on trying to free a
RecordTrack or Track object that failed initialization. Clear this
bad object from the caller instead.
Bug:
12423233
Change-Id: I926f2beb922a70f6924e593e2bbf1a5b5df85b16
Chong Zhang [Thu, 6 Mar 2014 18:01:07 +0000 (18:01 +0000)]
am
3b7ddf83: set AAC MPEG version to MPEG-2
* commit '
3b7ddf83db2d11c08116a6476c0f11e71bd72ba4':
set AAC MPEG version to MPEG-2
Chong Zhang [Fri, 7 Feb 2014 20:05:34 +0000 (12:05 -0800)]
set AAC MPEG version to MPEG-2
wifi display play spec only allows MPEG-2 AAC.
Bug:
12747927
Change-Id: Ic96d27ce57f5c8e7da55e43b38f629b5c7333817
Eric Laurent [Fri, 6 Dec 2013 19:16:54 +0000 (11:16 -0800)]
stagefright: fix offloading HE-AAC sampling rate.
Fix HE AAC SBR sampling rate reading for explicit
signaling.
Bug:
11697128.
Change-Id: Ifec0ab9d48d9293f6774ec1efd9da9445994cb7c
Glenn Kasten [Wed, 5 Mar 2014 23:47:20 +0000 (23:47 +0000)]
am
d812fc01: Increase kFastTrackMultiplier from 1 to 2
* commit '
d812fc012298470a1b8120e6d60a24b0b1d48047':
Increase kFastTrackMultiplier from 1 to 2
Eric Laurent [Wed, 5 Mar 2014 23:47:20 +0000 (23:47 +0000)]
am
88876fb4: AudioTrack: fix obtainBuffer timeout calculation
* commit '
88876fb4eb8365343f2a9ca0e8f53148ca38b845':
AudioTrack: fix obtainBuffer timeout calculation
Haynes Mathew George [Wed, 5 Mar 2014 23:47:18 +0000 (23:47 +0000)]
am
145b727b: libstagefright: Delay release of wakelock in TimedEventQueue
* commit '
145b727b4cce8b1b8d161612f30d12bbdfc8d134':
libstagefright: Delay release of wakelock in TimedEventQueue
Eric Laurent [Wed, 5 Mar 2014 23:47:17 +0000 (23:47 +0000)]
am
281dd4e1: audioflinger: fix static track end detection
* commit '
281dd4e13309973dbb85bce531f884237e0d8fb0':
audioflinger: fix static track end detection
Gaurav Kumar [Wed, 5 Mar 2014 23:47:17 +0000 (23:47 +0000)]
am
abab1c33: AudioMixer: Remove tracks from enabledTracks after reseting outTemp
* commit '
abab1c33caf0982c11713e6d64d60105dcbc8ab7':
AudioMixer: Remove tracks from enabledTracks after reseting outTemp
Eric Laurent [Wed, 5 Mar 2014 23:47:16 +0000 (23:47 +0000)]
am
d0115d8c: update offloaded audio track sampling rate
* commit '
d0115d8c4db2f337030dea706bc0a434c4a03ed6':
update offloaded audio track sampling rate
Zhijun He [Wed, 29 Jan 2014 16:52:01 +0000 (08:52 -0800)]
DO NOT MERGE: Camera: fix focusArea wrong indexing issue
Bug:
12304559
Change-Id: Id28b35fdd9697c1ec3365f617996801965de8bd0
Eric Laurent [Wed, 5 Mar 2014 22:41:53 +0000 (22:41 +0000)]
am
7e92abea: audioflinger: fix offload write buffer offset
* commit '
7e92abeafb184e8a34213d7149592e95a72601b0':
audioflinger: fix offload write buffer offset
Ruben Brunk [Thu, 5 Dec 2013 19:00:37 +0000 (11:00 -0800)]
DO NOT MERGE: camera2: Fix race with stream deletion during disconnect.
Bug:
11856804
- Shutdown order in Camera2Client allows a stream to be
deleted before the corresponding processing thread has
quit. This can result in updates being called on the
processor thread without a valid stream.
Change-Id: Ie4e649771f4321498659211f2a37ed89a6d956c4
Zhijun He [Tue, 26 Nov 2013 23:11:05 +0000 (15:11 -0800)]
DO NOT MERGE: camera2/3: Add protection for still capture path
Jpeg stream in JpegProcessor could be deleted while process new capture is
ongoing, which unsafe to access a dead consumer endpoint.
Bug:
9316454
Change-Id: I2950f31ea28d0ba01f08502e2e3ba452bf8bb818
Glenn Kasten [Tue, 3 Dec 2013 17:06:43 +0000 (09:06 -0800)]
Increase kFastTrackMultiplier from 1 to 2
Bug:
11967381
Change-Id: Iedec06280aa745d9df5d661f4916940cede9c191
Eric Laurent [Tue, 28 Jan 2014 02:13:39 +0000 (18:13 -0800)]
AudioTrack: fix obtainBuffer timeout calculation
AudioTrack::obtainBuffer() passes a pointer to a timeout
variable that has gone out of scope when calling
ClientProxy::obtainBuffer().
Same fix for AudioRecord.
Bug:
11968591.
Change-Id: I5b3d0d86ed2bd8c0412eb2432b1ab519d70efce9
Haynes Mathew George [Fri, 6 Dec 2013 19:31:57 +0000 (11:31 -0800)]
libstagefright: Delay release of wakelock in TimedEventQueue
Delay release of wakelock in the TimedEventQueue to
after an event has been processed.
This ensures AP shutdown does not happen while an event
is ready but hasn't been processed yet.
Bug:
11976087.
Change-Id: I9bce83b9ff0f2b4d174a53c95e5b0f135b5ccc70
Eric Laurent [Sat, 21 Dec 2013 01:36:01 +0000 (17:36 -0800)]
audioflinger: fix static track end detection
If a static track is not a fast track,
prepareTracks_l() must rely on framesReady() to
detect end of buffer and remove the track from the active
track list.
Failing to do so results in the track staying active but
not processed by the mixer because in underrun. This leaves the
mix buffer content uninitialized and causes the effect process
function to accumulate its output onto undefined data.
Bug:
12013676.
Change-Id: I4b0819a9d93141ac3307b8786fc6a451dd585220
Gaurav Kumar [Mon, 6 Jan 2014 05:27:18 +0000 (10:57 +0530)]
AudioMixer: Remove tracks from enabledTracks after reseting outTemp
If any track goes through AudioMixer::process__genericNoResampling, and
its getnextbuffer returns NULL, Then that track is removed by AudioMixer
from enabledTracks.
Thus if all tracks getnextbuffer return NULL, Then this function doesn't
reset outTemp and last buffer in AudioFlinger's mMixBuffer will be
repeated and noise is observed.
Remove tracks from enabledTracks after reseting outTemp to zero, so that
process__genericNoResampling will reset outTemp and noise won't appear.
Bug:
12450065
Change-Id: I28996d425838728955f01eb1a00acf6e6dc2dea1
Signed-off-by: Gaurav Kumar <gaurav.kumar@broadcom.com>
Signed-off-by: Pierre Couillaud <pierre@broadcom.com>