OSDN Git Service
Haynes Mathew George [Wed, 5 Mar 2014 19:26:47 +0000 (19:26 +0000)]
am
7c206e5b: am
e0cd1051: audioflinger: update track ready condition
* commit '
7c206e5bd24b5ae4565d0e60b637458a1054dfcf':
audioflinger: update track ready condition
Haynes Mathew George [Wed, 5 Mar 2014 19:26:47 +0000 (19:26 +0000)]
am
21e81bca: am
e010f65e: audioflinger: Fix for a deadlock in track creation
* commit '
21e81bca4d1e6f7d1ccac61b65da7c7a4a121064':
audioflinger: Fix for a deadlock in track creation
Haynes Mathew George [Wed, 5 Mar 2014 01:24:09 +0000 (01:24 +0000)]
am
e0cd1051: audioflinger: update track ready condition
* commit '
e0cd1051ed9fea0629745c29020516ae62298461':
audioflinger: update track ready condition
Haynes Mathew George [Wed, 5 Mar 2014 01:24:09 +0000 (01:24 +0000)]
am
e010f65e: audioflinger: Fix for a deadlock in track creation
* commit '
e010f65e6337267cb15f8894c950a3f64370dd36':
audioflinger: Fix for a deadlock in track creation
Haynes Mathew George [Sat, 28 Dec 2013 00:09:28 +0000 (16:09 -0800)]
audioflinger: update track ready condition
Signal track ready if the track isStopping().
Bug:
12423190
Change-Id: I95e14905df10ebf301e398263478c8ca25d7e2ce
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
Eric Laurent [Tue, 4 Mar 2014 23:21:48 +0000 (23:21 +0000)]
am
57159656: am
a4f24ff9: AudioTrack: fix position callback after restore
* commit '
571596564f4b818b8e89c4bbe824e557e8e00075':
AudioTrack: fix position callback after restore
Eric Laurent [Tue, 4 Mar 2014 23:17:47 +0000 (23:17 +0000)]
am
a4f24ff9: AudioTrack: fix position callback after restore
* commit '
a4f24ff9b239300b4bb2098c1413c0a60edc2d7e':
AudioTrack: fix position callback after restore
Dongwon Kang [Tue, 11 Feb 2014 09:26:40 +0000 (18:26 +0900)]
Fix wrong channel table in ESQueue according to the A/52 table 5.8
Reference: http://www.atsc.org/cms/standards/A52-2012(12-17).pdf
Bug:
12950777
Change-Id: Ic60033170b21e67408a3b3444507f6528946bdd0
Changwan Ryu [Mon, 28 Oct 2013 02:08:44 +0000 (11:08 +0900)]
[DO NOT MERGE] Support TS + AC3 for ATSC standard
Change-Id: I141667f3f54b242bafdf0ab9db86852c56f49ffa
Changwan Ryu [Mon, 28 Oct 2013 01:53:48 +0000 (10:53 +0900)]
[DO NOT MERGE] Support AC3 in stagefright
Change-Id: I12016b424bd069413bd6e380ff11484e175e05f3
Glenn Kasten [Wed, 29 Jan 2014 17:57:49 +0000 (17:57 +0000)]
am
d2dc66a2: am
1bf0eecd: Merge "AudioMixer: Remove tracks from enabledTracks after reseting outTemp"
* commit '
d2dc66a223b611142da8a019ebde79e3f8dc18f5':
AudioMixer: Remove tracks from enabledTracks after reseting outTemp
Glenn Kasten [Wed, 29 Jan 2014 17:53:44 +0000 (17:53 +0000)]
am
1bf0eecd: Merge "AudioMixer: Remove tracks from enabledTracks after reseting outTemp"
* commit '
1bf0eecd2ec6a3b3e29ad2c91bcefda76abef2fe':
AudioMixer: Remove tracks from enabledTracks after reseting outTemp
Glenn Kasten [Wed, 29 Jan 2014 17:48:44 +0000 (17:48 +0000)]
Merge "AudioMixer: Remove tracks from enabledTracks after reseting outTemp"
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: I1ccac7ee4a3bf7fd930254356c072099e11e7c19
Signed-off-by: Gaurav Kumar <gaurav.kumar@broadcom.com>
Signed-off-by: Pierre Couillaud <pierre@broadcom.com>
Dongwon Kang [Wed, 29 Jan 2014 00:59:34 +0000 (00:59 +0000)]
Merge "Support for MPEG2 video" into klp-modular-dev
Colin Cross [Tue, 28 Jan 2014 01:03:02 +0000 (01:03 +0000)]
am
06f7d151: am
06da69d5: Merge "frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
* commit '
06f7d1513ee325b5792ef26b77aeaae373f83ddc':
frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
Colin Cross [Tue, 28 Jan 2014 00:51:41 +0000 (00:51 +0000)]
am
06da69d5: Merge "frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
* commit '
06da69d57d90e180e1165905e6c703227a06f041':
frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
Colin Cross [Tue, 28 Jan 2014 00:43:21 +0000 (00:43 +0000)]
Merge "frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
Colin Cross [Sat, 25 Jan 2014 05:00:32 +0000 (21:00 -0800)]
frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
LOCAL_MODULE_PATH doesn't work for multiarch builds, replace it
with LOCAL_MODULE_RELATIVE_PATH.
Change-Id: I4e4ceec61d026bbe74ba604554c06104bde42e5e
Eric Laurent [Mon, 27 Jan 2014 19:49:29 +0000 (19:49 +0000)]
am
fe6db33a: am
4ef1dc2d: Merge "Only increase the counter when we do take a wakelock"
* commit '
fe6db33a4b6454f441c6f0f5ff622d7527c5680c':
Only increase the counter when we do take a wakelock
Eric Laurent [Mon, 27 Jan 2014 19:49:28 +0000 (19:49 +0000)]
am
8ba3192f: am
d0e7e801: Merge "Do partial reads in MemoryLeakTrackUtil"
* commit '
8ba3192fc5f3fd72217f5946e8bd1831f0854749':
Do partial reads in MemoryLeakTrackUtil
Eric Laurent [Mon, 27 Jan 2014 19:20:16 +0000 (11:20 -0800)]
am
4ef1dc2d: Merge "Only increase the counter when we do take a wakelock"
* commit '
4ef1dc2d5b5f5df93b173b0b4c4719d4484e031d':
Only increase the counter when we do take a wakelock
Eric Laurent [Mon, 27 Jan 2014 19:20:15 +0000 (11:20 -0800)]
am
d0e7e801: Merge "Do partial reads in MemoryLeakTrackUtil"
* commit '
d0e7e8012e19ac750e7858756247be1036da32c4':
Do partial reads in MemoryLeakTrackUtil
Eric Laurent [Mon, 27 Jan 2014 17:19:48 +0000 (17:19 +0000)]
Merge "Only increase the counter when we do take a wakelock"
Eric Laurent [Mon, 27 Jan 2014 17:10:34 +0000 (17:10 +0000)]
Merge "Do partial reads in MemoryLeakTrackUtil"
Oscar Rydhé [Tue, 22 Jan 2013 10:09:54 +0000 (11:09 +0100)]
Do partial reads in MemoryLeakTrackUtil
Do partial read in MemoryLeakTrackUtil dumpMemoryAddresses
to avoid using more memory than what is allocated.
Change-Id: I94feb4e00647407f938571167b981c7371f39e3d
Jimmy Dalqvist [Tue, 14 Jan 2014 13:13:52 +0000 (14:13 +0100)]
Only increase the counter when we do take a wakelock
We keep track on how many wakelocks we have taken. We always
just take one real wakelock but increase / decrease the
counter every time we try to acquire / release a wakelock.
The counter is always increased even if the power manager is
not ready, leading to an incorrect counter that could cause a
crash when we try to release it.
Make sure we only increase the counter when a wakelock, real
or counted, is taken.
Change-Id: Iad940e052694932f1dad8a1a71fa63601d289d6a
Changwan Ryu [Tue, 29 Oct 2013 05:31:00 +0000 (14:31 +0900)]
Support for MPEG2 video
Change-Id: If1f4e20939c96c87c65c84d56e529501facb8597
(cherry picked from commit
774eb18c40c3a7da0bc1636a9779f02315ddbad8)
Marco Nelissen [Fri, 17 Jan 2014 21:32:22 +0000 (21:32 +0000)]
am
1526c2e1: am
96a7b5a9: Merge "Long mp3 metadata displays as corrupted file after transfer"
* commit '
1526c2e1d7be6b942859c68c509493d3636bca43':
Long mp3 metadata displays as corrupted file after transfer
Marco Nelissen [Fri, 17 Jan 2014 21:27:19 +0000 (13:27 -0800)]
am
96a7b5a9: Merge "Long mp3 metadata displays as corrupted file after transfer"
* commit '
96a7b5a9c87ec3f8cadad5bffc06a82f9f4d86d8':
Long mp3 metadata displays as corrupted file after transfer
Marco Nelissen [Fri, 17 Jan 2014 21:23:17 +0000 (21:23 +0000)]
Merge "Long mp3 metadata displays as corrupted file after transfer"
Marco Nelissen [Fri, 17 Jan 2014 19:30:24 +0000 (19:30 +0000)]
am
319c5640: am
07a017d3: Merge "Added support for ID3v2 meta data in 3gp files"
* commit '
319c5640ca2e5838e35faaddc47df00174dac1b5':
Added support for ID3v2 meta data in 3gp files
Marco Nelissen [Fri, 17 Jan 2014 19:30:23 +0000 (19:30 +0000)]
am
fd0daeb3: am
4cc47940: Merge "Fix compile error in NuPlayerRenderer debug print"
* commit '
fd0daeb3fd20ba1c0a0fae530ea263e382a811e5':
Fix compile error in NuPlayerRenderer debug print
Marco Nelissen [Fri, 17 Jan 2014 19:19:50 +0000 (11:19 -0800)]
am
07a017d3: Merge "Added support for ID3v2 meta data in 3gp files"
* commit '
07a017d3ff9cb36e47649a9de28e469415eb8103':
Added support for ID3v2 meta data in 3gp files
Marco Nelissen [Fri, 17 Jan 2014 19:19:49 +0000 (11:19 -0800)]
am
4cc47940: Merge "Fix compile error in NuPlayerRenderer debug print"
* commit '
4cc4794029998b21a1689794cd5bcbd5e4480ef6':
Fix compile error in NuPlayerRenderer debug print
Marco Nelissen [Fri, 17 Jan 2014 17:08:51 +0000 (17:08 +0000)]
Merge "Added support for ID3v2 meta data in 3gp files"
Marco Nelissen [Fri, 17 Jan 2014 16:04:36 +0000 (16:04 +0000)]
Merge "Fix compile error in NuPlayerRenderer debug print"
Oscar Rydhé [Thu, 27 Jan 2011 13:01:24 +0000 (14:01 +0100)]
Added support for ID3v2 meta data in 3gp files
Added support for parsing ID3v2 meta data from
the ID32 chunk in 3gp files. The priority will be
3gpp -> ID3v2 -> iTunes per field.
Change-Id: I0282ecab58e3e5fa6bd738078d562c8bb8ce00ed
Marco Nelissen [Wed, 15 Jan 2014 22:24:02 +0000 (22:24 +0000)]
am
cbf9e91a: am
1e8a57c2: Merge "Avoid jumps to faulty position after seeks"
* commit '
cbf9e91a5ab186904d3dad21eae416c23ee13668':
Avoid jumps to faulty position after seeks
Marco Nelissen [Wed, 15 Jan 2014 22:18:14 +0000 (14:18 -0800)]
am
1e8a57c2: Merge "Avoid jumps to faulty position after seeks"
* commit '
1e8a57c212d26c41325e950ed629244071acc326':
Avoid jumps to faulty position after seeks
Marco Nelissen [Wed, 15 Jan 2014 22:12:04 +0000 (22:12 +0000)]
Merge "Avoid jumps to faulty position after seeks"
Eino-Ville Talvala [Wed, 15 Jan 2014 20:35:37 +0000 (20:35 +0000)]
am
3eccdde9: am
c7614eb7: Merge "libcameraservice: Fix build in ISO C++11 mode"
* commit '
3eccdde99f7063eba4e2788aa7c8c290f7a24120':
libcameraservice: Fix build in ISO C++11 mode
Eino-Ville Talvala [Wed, 15 Jan 2014 20:30:41 +0000 (12:30 -0800)]
am
c7614eb7: Merge "libcameraservice: Fix build in ISO C++11 mode"
* commit '
c7614eb7cf2e3e121baa3de26e3622974a163786':
libcameraservice: Fix build in ISO C++11 mode
Eino-Ville Talvala [Wed, 15 Jan 2014 20:26:02 +0000 (20:26 +0000)]
Merge "libcameraservice: Fix build in ISO C++11 mode"
Nick Kralevich [Sat, 11 Jan 2014 05:48:40 +0000 (05:48 +0000)]
am
514ac2ba: am
e311b15c: Merge "Fix c++11 narrowing"
* commit '
514ac2bae9fc32327cac3ba22c4862e8b5ef259e':
Fix c++11 narrowing
Nick Kralevich [Sat, 11 Jan 2014 04:25:46 +0000 (20:25 -0800)]
am
e311b15c: Merge "Fix c++11 narrowing"
* commit '
e311b15cf821f65f68af2cdfe01e864cbc9a86ce':
Fix c++11 narrowing
Nick Kralevich [Sat, 11 Jan 2014 04:20:10 +0000 (04:20 +0000)]
Merge "Fix c++11 narrowing"
Glenn Kasten [Fri, 10 Jan 2014 17:32:40 +0000 (17:32 +0000)]
am
d8d45edf: am
61540b5f: Merge "Frameworks: AudioFlinger: Fix effects memory leak"
* commit '
d8d45edf6a2714fff051d67aa1ac83d74bb0c6e0':
Frameworks: AudioFlinger: Fix effects memory leak
Glenn Kasten [Fri, 10 Jan 2014 17:26:02 +0000 (09:26 -0800)]
am
61540b5f: Merge "Frameworks: AudioFlinger: Fix effects memory leak"
* commit '
61540b5fe82cad1c6baa018f02bd2554e62e4364':
Frameworks: AudioFlinger: Fix effects memory leak
Glenn Kasten [Fri, 10 Jan 2014 17:22:39 +0000 (17:22 +0000)]
Merge "Frameworks: AudioFlinger: Fix effects memory leak"
Marco Nelissen [Thu, 9 Jan 2014 17:54:13 +0000 (17:54 +0000)]
am
586dda1d: am
5ca94d2f: Merge "HLS: Fixed rounding error with decimal segment duration"
* commit '
586dda1d0845612af88e3f4ffc46ed38e304ef85':
HLS: Fixed rounding error with decimal segment duration
Marco Nelissen [Thu, 9 Jan 2014 17:50:14 +0000 (09:50 -0800)]
am
5ca94d2f: Merge "HLS: Fixed rounding error with decimal segment duration"
* commit '
5ca94d2f3c4662aed7b66a97b77eb2d1948464ad':
HLS: Fixed rounding error with decimal segment duration
Marco Nelissen [Thu, 9 Jan 2014 17:43:40 +0000 (17:43 +0000)]
Merge "HLS: Fixed rounding error with decimal segment duration"
Narayan Kamath [Wed, 8 Jan 2014 09:45:25 +0000 (09:45 +0000)]
am
f60cfa7f: am
99044adc: Merge "Change M4OSA_ERR_CREATE to return unsigned integer."
* commit '
f60cfa7faa0bdde0a4f302f1272d6aa869588cc4':
Change M4OSA_ERR_CREATE to return unsigned integer.
Narayan Kamath [Wed, 8 Jan 2014 09:01:54 +0000 (01:01 -0800)]
am
99044adc: Merge "Change M4OSA_ERR_CREATE to return unsigned integer."
* commit '
99044adc6e209d31e9c5308d960e2bd5f6999f85':
Change M4OSA_ERR_CREATE to return unsigned integer.
Narayan Kamath [Wed, 8 Jan 2014 08:56:10 +0000 (08:56 +0000)]
Merge "Change M4OSA_ERR_CREATE to return unsigned integer."
Oscar Rydhé [Tue, 15 Oct 2013 07:54:08 +0000 (09:54 +0200)]
Fix compile error in NuPlayerRenderer debug print
When activating verbose log prints in NuPlayerRenderer the build
fails because a variable have changed but the log print hasn't been
updated.
Change-Id: I3089b087d296c37dfe6379d7e75d5892912fef96
Ashok Bhat [Thu, 2 Jan 2014 14:54:57 +0000 (14:54 +0000)]
Change M4OSA_ERR_CREATE to return unsigned integer.
While M4OSA_ERR is defined as M4OSA_UInt32, MOSA_ERR_CREATE
is defined to return M4OSA_Int32. This leads to signed/unsigned
comparison warnings. M4OSA_ERR_CREATE has been changed to return
M4OSA_UInt32 to fix this issue.
Change-Id: I71a5c50a95c7f296469604b486a1d3969d302a3f
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Eric Laurent [Sat, 21 Dec 2013 01:32:26 +0000 (01:32 +0000)]
am
b904d53f: am
8115f4b2: Merge "stagefright: do not offload LD-AAC decoding"
* commit '
b904d53ffaaafddb2f9b6f469b73d2a3bec3dd0d':
stagefright: do not offload LD-AAC decoding
Eric Laurent [Sat, 21 Dec 2013 01:28:59 +0000 (01:28 +0000)]
am
5a086733: am
1777ed30: Merge "stagefright: fix offloading HE-AAC sampling rate."
* commit '
5a086733f8a7472bee85b371e9d02874c9317f3b':
stagefright: fix offloading HE-AAC sampling rate.
Eric Laurent [Sat, 21 Dec 2013 01:26:47 +0000 (17:26 -0800)]
am
8115f4b2: Merge "stagefright: do not offload LD-AAC decoding"
* commit '
8115f4b206dbd04c620f062feb3c7785e2732ab3':
stagefright: do not offload LD-AAC decoding
Eric Laurent [Sat, 21 Dec 2013 01:23:27 +0000 (17:23 -0800)]
am
1777ed30: Merge "stagefright: fix offloading HE-AAC sampling rate."
* commit '
1777ed30bfb3b9c1edc037a1b5482d5ab8f28b9b':
stagefright: fix offloading HE-AAC sampling rate.
Eric Laurent [Sat, 21 Dec 2013 01:19:56 +0000 (01:19 +0000)]
Merge "stagefright: do not offload LD-AAC decoding"
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.
Change-Id: Iaa88ecf3f4ae42ad48c1b42a9b007dd80eb88147
Eric Laurent [Sat, 21 Dec 2013 01:18:46 +0000 (01:18 +0000)]
Merge "stagefright: fix offloading HE-AAC sampling rate."
Yin Liu [Tue, 4 Dec 2012 08:19:53 +0000 (09:19 +0100)]
Long mp3 metadata displays as corrupted file after transfer
Cut the metadata to 1 Byte and return in function
getObjectPropertyList in order to show it properly on a PC.
Change-Id: Iefacf9fa86c20ece2572e6d95d35877a94066fe7
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
Oscar Rydhé [Tue, 17 Dec 2013 08:53:18 +0000 (09:53 +0100)]
HLS: Fixed rounding error with decimal segment duration
If segment duration is specified with decimal value only the
integer value will be used, causing the stream duration to
be wrong.
Reported to Android public issue tracker:
https://code.google.com/p/android/issues/detail?id=56223
Change-Id: I34fb7a81af6ad3d9a214228cfe3724636ebf5ab5
Roger1 Jonsson [Thu, 11 Oct 2012 08:32:33 +0000 (10:32 +0200)]
Avoid jumps to faulty position after seeks
When seeking multiple times it is possible that some seeks
are discarded in AwesomePlayer, which causes unwanted jumps
to faulty positions.
The reason is that a seek flag is reset twice in AwesomePlayer.
At first when the video seek is completed and then again when the
audio seek is completed. If a new seek is made after the previous
video seek completed but before the previous audio seek completed,
the new seek position is discarded by the previous audio seek
completion.
This fix makes sure that the seek flag is reset only when video
has completed the seek.
Change-Id: I8f8741d4cb8682345f1d1855bbad57c05f4e3c8d
Nick Kralevich [Wed, 18 Dec 2013 05:50:54 +0000 (05:50 +0000)]
am
d497b648: am
1f95555c: Merge "libeffects: do not use GNU old-style field designators"
* commit '
d497b648ccb316e3fbda4c081f7c3010318bbcd9':
libeffects: do not use GNU old-style field designators
Nick Kralevich [Wed, 18 Dec 2013 04:17:23 +0000 (20:17 -0800)]
am
1f95555c: Merge "libeffects: do not use GNU old-style field designators"
* commit '
1f95555c69219180f792ac742cc0e386496c29e6':
libeffects: do not use GNU old-style field designators
Nick Kralevich [Wed, 18 Dec 2013 04:12:18 +0000 (04:12 +0000)]
Merge "libeffects: do not use GNU old-style field designators"
synergy dev [Wed, 18 Dec 2013 01:48:51 +0000 (17:48 -0800)]
libeffects: do not use GNU old-style field designators
Avoiding the use of GCC extensions improves code portability
Change-Id: I9edbedc5c8ad4aa46ca54bc2e28280441431a530
Eric Laurent [Tue, 17 Dec 2013 22:17:31 +0000 (22:17 +0000)]
am
35da47e5: am
274cc85d: Merge "libstagefright: Delay release of wakelock in TimedEventQueue"
* commit '
35da47e5d55392e6adbc97efaf181cb1dd259c04':
libstagefright: Delay release of wakelock in TimedEventQueue
Eric Laurent [Tue, 17 Dec 2013 22:17:31 +0000 (22:17 +0000)]
am
e4301da6: am
f81f7a52: Merge "audioflinger: check for condition before waiting"
* commit '
e4301da6b830b8ae3e27b6f095c1a96bed0b69ac':
audioflinger: check for condition before waiting
Eric Laurent [Tue, 17 Dec 2013 22:17:30 +0000 (22:17 +0000)]
am
38138bb1: am
645e4397: Merge "AudioTrack: fix position callback after restore"
* commit '
38138bb1816e49f3f4e73e5bff2affe3d24a96fc':
AudioTrack: fix position callback after restore
Eric Laurent [Tue, 17 Dec 2013 22:17:29 +0000 (22:17 +0000)]
am
51d166ec: am
9060d498: Merge "update offloaded audio track sampling rate"
* commit '
51d166ec7985949fa69262f213a4162708ebe81e':
update offloaded audio track sampling rate
Eric Laurent [Tue, 17 Dec 2013 22:11:15 +0000 (14:11 -0800)]
am
274cc85d: Merge "libstagefright: Delay release of wakelock in TimedEventQueue"
* commit '
274cc85dcb255185838705a91dba00efa52bf436':
libstagefright: Delay release of wakelock in TimedEventQueue
Eric Laurent [Tue, 17 Dec 2013 22:11:14 +0000 (14:11 -0800)]
am
f81f7a52: Merge "audioflinger: check for condition before waiting"
* commit '
f81f7a52d4720f441197f75918d2b2c05d41ab45':
audioflinger: check for condition before waiting
Eric Laurent [Tue, 17 Dec 2013 22:11:14 +0000 (14:11 -0800)]
am
645e4397: Merge "AudioTrack: fix position callback after restore"
* commit '
645e43977d3aabc5addab022d772accc32fd5bdc':
AudioTrack: fix position callback after restore
Eric Laurent [Tue, 17 Dec 2013 22:11:13 +0000 (14:11 -0800)]
am
9060d498: Merge "update offloaded audio track sampling rate"
* commit '
9060d498be0c54d3caf84e2dbf1ba62516b3e76e':
update offloaded audio track sampling rate
Eric Laurent [Tue, 17 Dec 2013 22:06:50 +0000 (22:06 +0000)]
Merge "libstagefright: Delay release of wakelock in TimedEventQueue"
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: I71a5f3ac4a57e1d05dd5d9ab5c6f91ed7bb64c87
Eric Laurent [Tue, 17 Dec 2013 22:06:10 +0000 (22:06 +0000)]
Merge "audioflinger: check for condition before waiting"
Haynes Mathew George [Wed, 4 Dec 2013 05:26:02 +0000 (21:26 -0800)]
audioflinger: check for condition before waiting
AsyncCallbackThread must check for any condition that
has already been satisfied before waiting.
Bug:
11824817
Change-Id: Ic8c2090d521ecd6a30b76ee75635258d35eb1eff
Eric Laurent [Tue, 17 Dec 2013 22:05:19 +0000 (22:05 +0000)]
Merge "AudioTrack: fix position callback after restore"
Eric Laurent [Wed, 27 Nov 2013 22:29:13 +0000 (14:29 -0800)]
AudioTrack: fix position callback after restore
When restoring an AudioTrack, the next position callback point
should not be modified and set ahead of current buffer head.
Otherwise, as frames are dropped, the new position is never reached
and an application relying on position callbacks to reload the buffer
would be stalled.
Bug:
11868603.
Change-Id: I93b2a311642a0c89944b78bcc0482d4ceed98ae4
Eric Laurent [Tue, 17 Dec 2013 22:04:08 +0000 (22:04 +0000)]
Merge "update offloaded audio track sampling rate"
Eric Laurent [Sat, 27 Jul 2013 00:16:50 +0000 (17:16 -0700)]
update offloaded audio track sampling rate
AudioPlayer must read the sampling rate from offloaded audio sinks
whenever a new time position is computed as the decoder can update
the sampling rate on the fly.
Change-Id: I997e5248cfd4017aeceb4e11689324ded2a5bc88
Glenn Kasten [Tue, 17 Dec 2013 16:33:47 +0000 (16:33 +0000)]
am
5893736d: am
a67c7653: Merge "Increase kFastTrackMultiplier from 1 to 2"
* commit '
5893736dc1776008026e660526d34943ea888fd6':
Increase kFastTrackMultiplier from 1 to 2
Glenn Kasten [Tue, 17 Dec 2013 16:30:03 +0000 (08:30 -0800)]
am
a67c7653: Merge "Increase kFastTrackMultiplier from 1 to 2"
* commit '
a67c76538fff102cd44b2f38dd073df5f2a33605':
Increase kFastTrackMultiplier from 1 to 2
Glenn Kasten [Tue, 17 Dec 2013 16:26:41 +0000 (16:26 +0000)]
Merge "Increase kFastTrackMultiplier from 1 to 2"
Andy McFadden [Wed, 11 Dec 2013 22:07:50 +0000 (22:07 +0000)]
am
7c464c07: am
a0e1c391: Merge changes Ia684fde5,I58fcb526
* commit '
7c464c0783ab2917572fdc565056ca677abf90ba':
Fix the help text
screenrecord fixes
Andy McFadden [Wed, 11 Dec 2013 22:07:49 +0000 (22:07 +0000)]
am
17ce8846: am
1c9ca7d1: Merge "Add "--bugreport" option to screenrecord"
* commit '
17ce8846ca97754579442f80d3e19e2d5aa7597f':
Add "--bugreport" option to screenrecord
Andy McFadden [Wed, 11 Dec 2013 21:48:44 +0000 (13:48 -0800)]
am
a0e1c391: Merge changes Ia684fde5,I58fcb526
* commit '
a0e1c3918dd1356445df98e89dab6be2c8a78da3':
Fix the help text
screenrecord fixes
Andy McFadden [Wed, 11 Dec 2013 21:48:43 +0000 (13:48 -0800)]
am
1c9ca7d1: Merge "Add "--bugreport" option to screenrecord"
* commit '
1c9ca7d13e948af4633d5e5f8117d8c53ac684f6':
Add "--bugreport" option to screenrecord
Andy McFadden [Wed, 11 Dec 2013 21:30:41 +0000 (21:30 +0000)]
Merge changes Ia684fde5,I58fcb526
* changes:
Fix the help text
screenrecord fixes
Andy McFadden [Wed, 11 Dec 2013 21:29:49 +0000 (21:29 +0000)]
Merge "Add "--bugreport" option to screenrecord"
Andy McFadden [Wed, 20 Nov 2013 00:48:50 +0000 (16:48 -0800)]
Fix the help text
Pesky bloggers.
(cherry-pick from Ia8677b054423db292a34e28337431b57804df259)
Change-Id: Ia684fde52697ea78fca79de958ef8b31a50e68ba