OSDN Git Service
Lajos Molnar [Fri, 7 Mar 2014 02:38:23 +0000 (02:38 +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 02:38:22 +0000 (02:38 +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 02:38:22 +0000 (02:38 +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 02:38:21 +0000 (02:38 +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 02:38:20 +0000 (02:38 +0000)]
am
b74b2098: Merge "stagefright: Fix bugs in playlist fetcher logic" into klp-dev
* commit '
b74b209862cbcbab6053cf4a43bbc16940aaafd2':
stagefright: Fix bugs in playlist fetcher logic
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
Eino-Ville Talvala [Fri, 7 Mar 2014 02:00:59 +0000 (02:00 +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
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
Eric Laurent [Fri, 7 Mar 2014 01:35:41 +0000 (01:35 +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 01:09:33 +0000 (01:09 +0000)]
Merge "stagefright: do not offload LD-AAC decoding" into klp-dev
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 21:58:27 +0000 (21:58 +0000)]
am
880413f7: Merge "stagefright: fix offloading HE-AAC sampling rate." into klp-dev
* commit '
880413f7923ec77467243e15dc34d4af4f8064f9':
stagefright: fix offloading HE-AAC sampling rate.
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
Chong Zhang [Thu, 6 Mar 2014 18:44:46 +0000 (18:44 +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:51:03 +0000 (23:51 +0000)]
am
9e64cd42: am
d812fc01: Increase kFastTrackMultiplier from 1 to 2
* commit '
9e64cd42032665c90c52804c1042b3671621cda5':
Increase kFastTrackMultiplier from 1 to 2
Eric Laurent [Wed, 5 Mar 2014 23:51:02 +0000 (23:51 +0000)]
am
25a86930: am
88876fb4: AudioTrack: fix obtainBuffer timeout calculation
* commit '
25a86930ac0ccf4750ad2fb0c2f5a4a122d24ecf':
AudioTrack: fix obtainBuffer timeout calculation
Haynes Mathew George [Wed, 5 Mar 2014 23:51:01 +0000 (23:51 +0000)]
am
994d9bad: am
145b727b: libstagefright: Delay release of wakelock in TimedEventQueue
* commit '
994d9bad4c545cc8861e971f9dbcb4c061ee19ed':
libstagefright: Delay release of wakelock in TimedEventQueue
Eric Laurent [Wed, 5 Mar 2014 23:51:01 +0000 (23:51 +0000)]
am
4f4c9a22: am
281dd4e1: audioflinger: fix static track end detection
* commit '
4f4c9a22f4676c65bcae77f0805dcd699b3ba475':
audioflinger: fix static track end detection
Gaurav Kumar [Wed, 5 Mar 2014 23:50:55 +0000 (23:50 +0000)]
am
c7753b12: am
abab1c33: AudioMixer: Remove tracks from enabledTracks after reseting outTemp
* commit '
c7753b12a9c8c1cba69ba75bccc0083c37bc67f1':
AudioMixer: Remove tracks from enabledTracks after reseting outTemp
Eric Laurent [Wed, 5 Mar 2014 23:50:49 +0000 (23:50 +0000)]
am
ec94f7a6: am
d0115d8c: update offloaded audio track sampling rate
* commit '
ec94f7a6eba6f55175c39c3abcd64046ecd413ad':
update offloaded audio track sampling rate
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:44:59 +0000 (22:44 +0000)]
am
7028a2c8: am
7e92abea: audioflinger: fix offload write buffer offset
* commit '
7028a2c8106ee5a22db88da5dad581820ee07254':
audioflinger: fix offload write buffer offset
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>
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.
Bug:
12823955.
Change-Id: I997e5248cfd4017aeceb4e11689324ded2a5bc88
Eric Laurent [Fri, 22 Nov 2013 17:29:56 +0000 (09:29 -0800)]
audioflinger: fix offload write buffer offset
Fix current audio HAL write buffer offset calculation
which assumes that the frame size is a multiple of 2.
'
Bug:
12823725.
Change-Id: I0195ed5cfef225a6f114e7dd405a02680bb7254e
jpadmana [Wed, 5 Mar 2014 19:26:49 +0000 (19:26 +0000)]
am
6b260425: am
85b3013e: 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 '
6b2604259c12ee28b49f26ab2adac96eefe30934':
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
Haynes Mathew George [Wed, 5 Mar 2014 19:26:48 +0000 (19:26 +0000)]
am
fc04776a: am
50c3157c: audioflinger: check for condition before waiting
* commit '
fc04776adc5572fcc323b1dca66dee27a537c619':
audioflinger: check for condition before waiting
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
jpadmana [Wed, 5 Mar 2014 01:24:11 +0000 (01:24 +0000)]
am
85b3013e: 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 '
85b3013e06e8fe7802fe6259ecac80261e834332':
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
Haynes Mathew George [Wed, 5 Mar 2014 01:24:10 +0000 (01:24 +0000)]
am
50c3157c: audioflinger: check for condition before waiting
* commit '
50c3157c5a3e0617be77716beff1ae8801d8a72f':
audioflinger: check for condition before waiting
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
jpadmana [Thu, 14 Nov 2013 11:50:52 +0000 (17:20 +0530)]
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
Whenever there are parallel calls to proxy and non sub-effects wrappers,
some of the calls are not completed. This is due to deadlock arsing out
of Proxy waiting for the subeffect call to return and subeffect waiting
for proxy to release lock.
The call flow is changed to a cleaner and simple one - Proxy gets the
aeli(effect library info) of subeffects during the EffectGetSubEffects()
call. Therby, proxy will manage the sub effects by itself rather than
going through effects factory.
Change-Id: If4b259da5776f151c1e81a78a0239d342046d923
Signed-off-by: jpadmana <jayashree.r.padmanaban@intel.com>
Bug:
12424044
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
was already been satisfied before waiting.
Bug:
11824817
Change-Id: I04683a1f355de4f440106cab47fd916aa39d5e35
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"