OSDN Git Service
Robert Shih [Tue, 15 Dec 2015 23:22:04 +0000 (15:22 -0800)]
CallbackDataSource: return bytes read instead of eos on short read
Bug:
25800374
Change-Id: I17af28f85d68dc964179dda8ddf8874c02f202a5
Wei Jia [Thu, 10 Dec 2015 18:12:01 +0000 (10:12 -0800)]
MediaCodec: check buffer size to prevent possible integer overflow for video encoder.
Bug:
25812794
Change-Id: Ib32053bc4d6a2ebe69aa4993dc32f5ab1b13ae81
Jeff Tinker [Thu, 10 Dec 2015 00:48:33 +0000 (00:48 +0000)]
Merge "Fix security vulnerability in ICrypto DO NOT MERGE" into mnc-dev am:
89bec04cf8 am:
f797a48b4c am:
3f05f30117 am:
007064a8ca
am:
e9d5ae1e10 -s ours
* commit '
e9d5ae1e105e46a4cad323f667a851e638294c32':
Fix security vulnerability in ICrypto DO NOT MERGE
Jeff Tinker [Thu, 10 Dec 2015 00:46:43 +0000 (16:46 -0800)]
Merge "Fix security vulnerability in ICrypto DO NOT MERGE" into mnc-dev am:
89bec04cf8 am:
f797a48b4c am:
3f05f30117
am:
007064a8ca
* commit '
007064a8caae76cc17e883ece4c9f361cb6a7429':
Fix security vulnerability in ICrypto DO NOT MERGE
Jeff Tinker [Thu, 10 Dec 2015 00:43:07 +0000 (16:43 -0800)]
Merge "Fix security vulnerability in ICrypto DO NOT MERGE" into mnc-dev am:
89bec04cf8 am:
f797a48b4c
am:
3f05f30117
* commit '
3f05f30117c9ad8a0956f31431ddd5fbc07fbd99':
Fix security vulnerability in ICrypto DO NOT MERGE
Jeff Tinker [Thu, 10 Dec 2015 00:41:15 +0000 (00:41 +0000)]
Merge "Fix security vulnerability in ICrypto DO NOT MERGE" into mnc-dev am:
89bec04cf8
am:
f797a48b4c
* commit '
f797a48b4ceaef56402ecd942ccdebab394daad0':
Fix security vulnerability in ICrypto DO NOT MERGE
Jeff Tinker [Thu, 10 Dec 2015 00:39:23 +0000 (16:39 -0800)]
Merge "Fix security vulnerability in ICrypto DO NOT MERGE" into mnc-dev
am:
89bec04cf8
* commit '
89bec04cf83598b1868f3f969c220c3200028e03':
Fix security vulnerability in ICrypto DO NOT MERGE
Jeff Tinker [Thu, 10 Dec 2015 00:38:22 +0000 (00:38 +0000)]
Merge "Fix security vulnerability in ICrypto DO NOT MERGE" into mnc-dev
Marco Nelissen [Wed, 9 Dec 2015 21:02:02 +0000 (21:02 +0000)]
Merge "Fix overflow in amrwbenc" am:
b135d0e6fb
am:
9f2e05eb78
* commit '
9f2e05eb78524d30b4196cc635bb16daf7557428':
Fix overflow in amrwbenc
Marco Nelissen [Wed, 9 Dec 2015 20:59:04 +0000 (20:59 +0000)]
Merge "Fix overflow in amrwbenc"
am:
b135d0e6fb
* commit '
b135d0e6fb57a810882a1488cb0ff670d0e25219':
Fix overflow in amrwbenc
Marco Nelissen [Wed, 9 Dec 2015 20:50:27 +0000 (20:50 +0000)]
Merge "Fix overflow in amrwbenc"
Marco Nelissen [Wed, 9 Dec 2015 20:49:08 +0000 (12:49 -0800)]
Fix overflow in amrwbenc
This got dropped in a previous merge.
Change-Id: Ic5ec1f6662944deee32e740697fc55774c894033
Marco Nelissen [Wed, 9 Dec 2015 20:30:51 +0000 (12:30 -0800)]
resolve merge conflicts of
85234a9133 to master.
Change-Id: I6b1b51ac4f15f936e42fadd48deb32e205dfa163
Marco Nelissen [Wed, 9 Dec 2015 20:06:36 +0000 (20:06 +0000)]
Merge "Tabs -> spaces"
am:
e491d0baa3
* commit '
e491d0baa3ed0977182372d84343f5a4025b31cb':
Tabs -> spaces
Marco Nelissen [Wed, 9 Dec 2015 20:06:26 +0000 (20:06 +0000)]
Merge "Fix overflows in amrwbenc" am:
bcd54f426f
am:
caf74f7732
* commit '
caf74f7732bcea4fb1a574fe01d93dcf80423cea':
Fix overflows in amrwbenc
Marco Nelissen [Wed, 9 Dec 2015 20:03:37 +0000 (20:03 +0000)]
Merge "Fix overflows in amrwbenc"
am:
bcd54f426f
* commit '
bcd54f426f3b7ac18db390cacaf3233225a19253':
Fix overflows in amrwbenc
Marco Nelissen [Wed, 9 Dec 2015 20:01:13 +0000 (20:01 +0000)]
Merge "Tabs -> spaces"
Marco Nelissen [Wed, 9 Dec 2015 19:57:01 +0000 (11:57 -0800)]
Tabs -> spaces
Change-Id: I706d7ef81a138739996e0fbb2759348c7a4be8a6
Marco Nelissen [Wed, 9 Dec 2015 19:56:17 +0000 (19:56 +0000)]
Merge "Fix overflows in amrwbenc"
Marco Nelissen [Tue, 8 Dec 2015 20:39:45 +0000 (12:39 -0800)]
Fix overflows in amrwbenc
Revert
3cdaed88daeeebfe05e7913837f41c2d92f411cc and
883ff4f4c41ae9bf84d1912ab054fe38f7505dd0, and fix the overflows that
should have been clamped instead of allowed to overflow.
Bug:
25843966
Bug:
23752600
Change-Id: I9af1726d058eb8eeaa80fa8df74fe0a3759486c1
Dan Austin [Wed, 9 Dec 2015 19:13:05 +0000 (19:13 +0000)]
Merge "Fix overflows in amrwbenc"
Marco Nelissen [Tue, 8 Dec 2015 20:39:45 +0000 (12:39 -0800)]
Fix overflows in amrwbenc
Revert
3cdaed88daeeebfe05e7913837f41c2d92f411cc and
883ff4f4c41ae9bf84d1912ab054fe38f7505dd0, and fix the overflows that
should have been clamped instead of allowed to overflow.
Bug:
25843966
Bug:
23752600
Change-Id: I9af1726d058eb8eeaa80fa8df74fe0a3759486c1
Chien-Yu Chen [Wed, 9 Dec 2015 18:27:46 +0000 (18:27 +0000)]
Merge "Camera: Support BufferQueue between Camera and StageFright"
Eric Laurent [Wed, 9 Dec 2015 17:34:33 +0000 (17:34 +0000)]
Merge "audio policy: engine configurable: do not compile example makefile"
Jeff Tinker [Wed, 9 Dec 2015 17:07:40 +0000 (17:07 +0000)]
Merge "Remove unused MediaDrm.unprovisionDevice"
Jeff Tinker [Wed, 9 Dec 2015 16:40:40 +0000 (08:40 -0800)]
Remove unused MediaDrm.unprovisionDevice
bug:
25726218
Change-Id: I6eb0ceb488c66c191897b3c190f5da1d71880c77
François Gaffie [Thu, 3 Dec 2015 16:21:27 +0000 (17:21 +0100)]
audio policy: engine configurable: do not compile example makefile
This patch avoids compiling the example makefile of the engine
configurable settings and structure files. It is up to the oem
to have its own makefile with its own structure and settings files.
Change-Id: I735290bff08ca6183da7ea4266ced9206f2bb6a1
Signed-off-by: François Gaffie <francois.gaffie@intel.com>
Yin-Chia Yeh [Wed, 9 Dec 2015 01:45:15 +0000 (01:45 +0000)]
Merge "Camera: plumbing for RAW OPAQUE"
Chong Zhang [Tue, 8 Dec 2015 23:12:57 +0000 (23:12 +0000)]
DO NOT MERGE nuplayer: do not use cached source for wvm content am:
91a23ed95c am:
83487187ab am:
fe2d80d385 -s ours am:
e6185af491 am:
3cb2e6732f am:
0e7c8849a9 am:
eb030dc365
am:
4e119b6efe -s ours
* commit '
4e119b6efe24919826a213e5f53da212d29f16dc':
DO NOT MERGE nuplayer: do not use cached source for wvm content
Chong Zhang [Tue, 8 Dec 2015 23:10:29 +0000 (23:10 +0000)]
DO NOT MERGE nuplayer: do not use cached source for wvm content am:
91a23ed95c am:
83487187ab am:
fe2d80d385 -s ours am:
e6185af491 am:
3cb2e6732f am:
0e7c8849a9
am:
eb030dc365
* commit '
eb030dc3656e57a5386902dc955bb5a24c8a2404':
DO NOT MERGE nuplayer: do not use cached source for wvm content
Chong Zhang [Tue, 8 Dec 2015 23:05:35 +0000 (23:05 +0000)]
DO NOT MERGE nuplayer: do not use cached source for wvm content am:
91a23ed95c am:
83487187ab am:
fe2d80d385 -s ours am:
e6185af491 am:
3cb2e6732f
am:
0e7c8849a9
* commit '
0e7c8849a934b0785adde3fd2ca26cc5d54517ee':
DO NOT MERGE nuplayer: do not use cached source for wvm content
Chong Zhang [Tue, 8 Dec 2015 23:02:49 +0000 (23:02 +0000)]
DO NOT MERGE nuplayer: do not use cached source for wvm content am:
91a23ed95c am:
83487187ab am:
fe2d80d385 -s ours am:
e6185af491
am:
3cb2e6732f
* commit '
3cb2e6732f6d7113435443b10fbe9e3ca8e792bb':
DO NOT MERGE nuplayer: do not use cached source for wvm content
Chong Zhang [Tue, 8 Dec 2015 23:00:23 +0000 (23:00 +0000)]
DO NOT MERGE nuplayer: do not use cached source for wvm content am:
91a23ed95c am:
83487187ab am:
fe2d80d385 -s ours
am:
e6185af491
* commit '
e6185af491ba38cd6f2b67874bebe3e6bbf65777':
DO NOT MERGE nuplayer: do not use cached source for wvm content
Chong Zhang [Tue, 8 Dec 2015 22:57:52 +0000 (22:57 +0000)]
DO NOT MERGE nuplayer: do not use cached source for wvm content am:
91a23ed95c am:
83487187ab
am:
fe2d80d385 -s ours
* commit '
fe2d80d385d71be73ba6ac0f5c98de1b524bf12f':
DO NOT MERGE nuplayer: do not use cached source for wvm content
Chong Zhang [Tue, 8 Dec 2015 22:55:18 +0000 (22:55 +0000)]
DO NOT MERGE nuplayer: do not use cached source for wvm content am:
91a23ed95c
am:
83487187ab
* commit '
83487187ab549d0966791a60a92d49d77e47f071':
DO NOT MERGE nuplayer: do not use cached source for wvm content
Chong Zhang [Tue, 8 Dec 2015 22:52:29 +0000 (22:52 +0000)]
DO NOT MERGE nuplayer: do not use cached source for wvm content
am:
91a23ed95c
* commit '
91a23ed95cda558a3c31e8ef34f420924f4d6d7d':
DO NOT MERGE nuplayer: do not use cached source for wvm content
Yin-Chia Yeh [Mon, 7 Dec 2015 22:38:04 +0000 (14:38 -0800)]
Camera: plumbing for RAW OPAQUE
Bug:
25596619
Change-Id: I0867a36962084bc508aebc89cb910473402a5e09
Yin-Chia Yeh [Tue, 8 Dec 2015 20:27:53 +0000 (20:27 +0000)]
Merge "Camera: fix HAL1.0 support"
Marco Nelissen [Tue, 8 Dec 2015 20:22:20 +0000 (12:22 -0800)]
Fix integer overflow in amrwbenc
Bug:
25843966
Change-Id: Ib9b37712819d776496b7a06b9e85c5d1e43f9d25
Yin-Chia Yeh [Tue, 8 Dec 2015 20:19:31 +0000 (12:19 -0800)]
Camera: fix HAL1.0 support
Bug:
26050582
Change-Id: Ic64fb005d7c804dc2b8b9c22fdbe44408646b406
Chien-Yu Chen [Fri, 13 Nov 2015 23:28:48 +0000 (15:28 -0800)]
Camera: Support BufferQueue between Camera and StageFright
Use a BufferQueue between Camera and StageFright to pass video
buffers for Camera HALv3 devices.
CameraSource in StageFright will try to use "buffer queue" mode
if it is supported by the camera device. In "buffer queue" mode,
CameraSource creates a buffer queue and a listener thread to recieve
video buffers from camera device. CameraSource then wraps the
ANWBuffer in MediaBuffer. If the camera device doesn't support
"buffer queue" mode, it falls back to "metadata in video buffer"
mode or "real YUV data" mode.
"Metadata in video buffer" mode is removed from Camera2Client and
only "buffer queue" mode is supported.
Bug:
24511454
Change-Id: Ice833b57bcd8d91852d6415402013f56f3e3970a
Jeff Tinker [Tue, 8 Dec 2015 00:38:50 +0000 (00:38 +0000)]
Merge "Fix security vulnerability in ICrypto"
Yin-Chia Yeh [Mon, 7 Dec 2015 20:25:55 +0000 (20:25 +0000)]
Merge "Camera: set mNumberOfNormalCameras correctly"
Yin-Chia Yeh [Mon, 7 Dec 2015 20:20:11 +0000 (12:20 -0800)]
Camera: set mNumberOfNormalCameras correctly
Need to set the number correctly when a camera HAL is not present.
Bug:
25951590
Change-Id: I666acf7a2a523c51f2c2ae88ff690ca9dccda08c
Andy Hung [Mon, 7 Dec 2015 19:24:19 +0000 (19:24 +0000)]
Merge "Check for non-negative fd before close, dup, lseek, or read."
Jean-Michel Trivi [Mon, 7 Dec 2015 17:56:19 +0000 (17:56 +0000)]
Merge "AudioPolicyManager: AudioInputDescriptor open ref count cleanup"
Andy Hung [Sat, 5 Dec 2015 01:20:50 +0000 (17:20 -0800)]
Check for non-negative fd before close, dup, lseek, or read.
Bug:
24896328
Change-Id: Idd8da8cf202f51f42d0a81421a91768ec3d5f025
Jeff Tinker [Sat, 5 Dec 2015 00:29:16 +0000 (16:29 -0800)]
Fix security vulnerability in ICrypto DO NOT MERGE
b/
25800375
Change-Id: I03c9395f7c7de4ac5813a1207452aac57aa39484
Eric Laurent [Sat, 5 Dec 2015 00:35:25 +0000 (00:35 +0000)]
Merge "audio policy: configurable engine: fix dead lock issue"
Jeff Tinker [Sat, 5 Dec 2015 00:29:16 +0000 (16:29 -0800)]
Fix security vulnerability in ICrypto
b/
25800375
Change-Id: I03c9395f7c7de4ac5813a1207452aac57aa39484
Jean-Michel Trivi [Fri, 4 Dec 2015 23:56:47 +0000 (15:56 -0800)]
AudioPolicyManager: AudioInputDescriptor open ref count cleanup
Always initialize the mOpenRefCount field.
Add functions for management for open ref count.
Change-Id: I0bbd021283047abfebbc108ced68c79e29297f25
François Gaffie [Thu, 3 Dec 2015 16:14:02 +0000 (17:14 +0100)]
audio policy: configurable engine: fix dead lock issue
This patch fixes a dead lock issue within configurable engine
of the audio policy. A clear was calling itself in loop instead
of calling clear on its base class.
Change-Id: I9f7c5f6425fbba36e029664ac130cbeafeca4ddf
Signed-off-by: François Gaffie <francois.gaffie@intel.com>
Chong Zhang [Fri, 20 Feb 2015 00:39:59 +0000 (16:39 -0800)]
DO NOT MERGE nuplayer: do not use cached source for wvm content
bug:
18730095,
25563255
Change-Id: Ibd4f54907949daae1d095fa0922050310d16698f
(cherry picked from commit
fc6cfd8343ae8919e85ec22efed9df626fe8854b)
Jean-Michel Trivi [Fri, 4 Dec 2015 17:17:03 +0000 (17:17 +0000)]
Merge "Validation of Number of Channels on WAV files." am:
8ec6ab3bfa am:
bc6d05bac1
am:
e6b4530d75
* commit '
e6b4530d758f411907ce737b7475c7dc22551a78':
Validation of Number of Channels on WAV files.
Andy Hung [Fri, 4 Dec 2015 17:16:42 +0000 (17:16 +0000)]
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am:
3d6a714980 am:
208bc477d9 -s ours am:
c56555962b am:
f4dfde92ea -s ours am:
92edb173a7 am:
9161b6adc9 am:
8f283a894d -s ours am:
6d3f50d9c3 am:
0357d3503f am:
6cd7a9f811 am:
83066d1046
am:
465792da79 -s ours
* commit '
465792da79bf484f4d979cf014448e14ab05adfa':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Jean-Michel Trivi [Fri, 4 Dec 2015 17:13:50 +0000 (17:13 +0000)]
Merge "Validation of Number of Channels on WAV files." am:
8ec6ab3bfa
am:
bc6d05bac1
* commit '
bc6d05bac14e2a3e7e4a104f6b7e9260b42320f5':
Validation of Number of Channels on WAV files.
Jean-Michel Trivi [Fri, 4 Dec 2015 17:10:17 +0000 (17:10 +0000)]
Merge "Validation of Number of Channels on WAV files."
am:
8ec6ab3bfa
* commit '
8ec6ab3bfa96316fabde6c23acb1e2630acac99b':
Validation of Number of Channels on WAV files.
Jean-Michel Trivi [Fri, 4 Dec 2015 17:06:54 +0000 (17:06 +0000)]
Merge "Validation of Number of Channels on WAV files."
Niel Alejandro Paz [Mon, 15 Jun 2015 18:14:39 +0000 (13:14 -0500)]
Validation of Number of Channels on WAV files.
Corrects the validation of the number of channels that was causing a floating
point exception when this number is zero.
It also corrects the range of admitted channels on WAV files.
Change-Id: I21f005d1f30c1fd93206c6bce0d3be4b8307059c
Signed-off-by: Niel Alejandro Paz <niel.paz.hernandez@intel.com>
Signed-off-by: Vineela Tummalapalli <vineela.tummalapalli@intel.com>
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
Eric Laurent [Fri, 4 Dec 2015 02:08:49 +0000 (02:08 +0000)]
Merge "audio policy: enhancing type conversion helper"
Eino-Ville Talvala [Fri, 4 Dec 2015 00:32:29 +0000 (00:32 +0000)]
Merge "CameraService: Remove device HALv2 support, other cleanup"
Andy Hung [Thu, 3 Dec 2015 23:39:47 +0000 (23:39 +0000)]
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am:
3d6a714980 am:
208bc477d9 -s ours am:
c56555962b am:
f4dfde92ea -s ours am:
92edb173a7 am:
9161b6adc9 am:
8f283a894d -s ours am:
6d3f50d9c3 am:
0357d3503f am:
6cd7a9f811
am:
83066d1046
* commit '
83066d1046795253a13d7d591d3c83de0c748d22':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Andy Hung [Thu, 3 Dec 2015 23:31:34 +0000 (23:31 +0000)]
Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread" into lmp-dev am:
0c4d693722 am:
ba49fda63a -s ours am:
bb1809ace7 am:
adfda28b42 am:
569d39f94a -s ours am:
975bb62996 am:
b51610971c am:
047cfaf95a am:
3abe346ed2
am:
ffa5d53049 -s ours
* commit '
ffa5d53049208edea27b88f67e7cc62a2d259319':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Wei Jia [Thu, 3 Dec 2015 23:31:17 +0000 (23:31 +0000)]
DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am:
6afc659b00 am:
9e1d7751b1 -s ours am:
4c0d243626 am:
862b693ba3 -s ours am:
db76a879ea am:
e0c9d8afd0 am:
2048dd5483 -s ours am:
7a2dbcd38b am:
f766fdb625 am:
29ff7f2ac7 am:
946388cc94
am:
fffc234d8f -s ours
* commit '
fffc234d8fa348b2bc84e6be94e5f2364e63e32b':
DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
Wei Jia [Thu, 3 Dec 2015 23:31:08 +0000 (23:31 +0000)]
DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am:
0462975291 am:
3e8e134597 -s ours am:
e4223a8d32 am:
bed81d6594 am:
dd4576b017 -s ours am:
e3bbe235f6 am:
b7e63bfadb am:
2c7411483b am:
062ea7264f
am:
694c766be9 -s ours
* commit '
694c766be9eb0057499461f3d9244e81205edc18':
DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
Wei Jia [Thu, 3 Dec 2015 23:31:00 +0000 (23:31 +0000)]
libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am:
69bd1cf225 am:
bee48d7956 am:
d1bcd1a80f am:
ff0c114eae
am:
9e1e002414
* commit '
9e1e0024140e07a94eff154d84b39d639fb98923':
libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
Andy Hung [Thu, 3 Dec 2015 23:30:49 +0000 (23:30 +0000)]
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am:
3d6a714980 am:
208bc477d9 -s ours am:
c56555962b am:
f4dfde92ea -s ours am:
92edb173a7 am:
9161b6adc9 am:
8f283a894d -s ours am:
6d3f50d9c3 am:
0357d3503f
am:
6cd7a9f811
* commit '
6cd7a9f811a5d8b6232012f11833f1a16235cabc':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Eric Laurent [Thu, 3 Dec 2015 23:30:49 +0000 (23:30 +0000)]
Merge "Volume should take VOLUME_MIN_DB value when audio is muted." am:
2e12b68fad am:
e04b1e747e
am:
a4d6e82d47
* commit '
a4d6e82d474fd8c18d27f879bd8643b918b7af91':
Volume should take VOLUME_MIN_DB value when audio is muted.
Andy Hung [Thu, 3 Dec 2015 23:27:32 +0000 (23:27 +0000)]
Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread" into lmp-dev am:
0c4d693722 am:
ba49fda63a -s ours am:
bb1809ace7 am:
adfda28b42 am:
569d39f94a -s ours am:
975bb62996 am:
b51610971c am:
047cfaf95a
am:
3abe346ed2
* commit '
3abe346ed28c70a4e3612bf4081410414669b898':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Andy Hung [Thu, 3 Dec 2015 23:27:24 +0000 (23:27 +0000)]
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am:
3d6a714980 am:
208bc477d9 -s ours am:
c56555962b am:
f4dfde92ea -s ours am:
92edb173a7 am:
9161b6adc9 am:
8f283a894d -s ours am:
6d3f50d9c3
am:
0357d3503f
* commit '
0357d3503f53fe447d3490380e91102bb8122cf8':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Andy Hung [Thu, 3 Dec 2015 23:24:17 +0000 (23:24 +0000)]
Merge "NuPlayerRenderer: Allow immediate pause on next track."
Andy Hung [Thu, 3 Dec 2015 23:22:45 +0000 (23:22 +0000)]
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am:
3d6a714980 am:
208bc477d9 -s ours am:
c56555962b am:
f4dfde92ea -s ours am:
92edb173a7 am:
9161b6adc9 am:
8f283a894d -s ours
am:
6d3f50d9c3
* commit '
6d3f50d9c31544a3cb9ae76c9ac08f92eb83c449':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Andy Hung [Thu, 3 Dec 2015 23:19:16 +0000 (23:19 +0000)]
Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread" into lmp-dev am:
0c4d693722 am:
ba49fda63a -s ours am:
bb1809ace7 am:
adfda28b42 am:
569d39f94a -s ours am:
975bb62996 am:
b51610971c
am:
047cfaf95a
* commit '
047cfaf95aa5b2e4c18da78ce0f013c01aebe690':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Andy Hung [Thu, 3 Dec 2015 23:19:07 +0000 (23:19 +0000)]
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am:
3d6a714980 am:
208bc477d9 -s ours am:
c56555962b am:
f4dfde92ea -s ours am:
92edb173a7 am:
9161b6adc9
am:
8f283a894d -s ours
* commit '
8f283a894dfe2d5c7d987cd62f0498c46a0ff90d':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Andy Hung [Thu, 3 Dec 2015 23:14:49 +0000 (23:14 +0000)]
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am:
3d6a714980 am:
208bc477d9 -s ours am:
c56555962b am:
f4dfde92ea -s ours am:
92edb173a7
am:
9161b6adc9
* commit '
9161b6adc9150fdefe4a48f371767ca192e54606':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Andy Hung [Thu, 3 Dec 2015 23:14:49 +0000 (23:14 +0000)]
Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread" into lmp-dev am:
0c4d693722 am:
ba49fda63a -s ours am:
bb1809ace7 am:
adfda28b42 am:
569d39f94a -s ours am:
975bb62996
am:
b51610971c
* commit '
b51610971c26307bf50dd4c9ff5a50f512e75d6a':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Andy Hung [Thu, 3 Dec 2015 23:11:16 +0000 (23:11 +0000)]
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am:
3d6a714980 am:
208bc477d9 -s ours am:
c56555962b am:
f4dfde92ea -s ours
am:
92edb173a7
* commit '
92edb173a725a1e648b926545e27110fef27a16a':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Andy Hung [Thu, 3 Dec 2015 23:11:15 +0000 (23:11 +0000)]
Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread" into lmp-dev am:
0c4d693722 am:
ba49fda63a -s ours am:
bb1809ace7 am:
adfda28b42 am:
569d39f94a -s ours
am:
975bb62996
* commit '
975bb62996d194c43ceb5f4a34f58870a1004e59':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Andy Hung [Thu, 3 Dec 2015 23:06:27 +0000 (23:06 +0000)]
Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread" into lmp-dev am:
0c4d693722 am:
ba49fda63a -s ours am:
bb1809ace7 am:
adfda28b42
am:
569d39f94a -s ours
* commit '
569d39f94ab77ebf219bd2f0717e1a322269cfb4':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Andy Hung [Thu, 3 Dec 2015 23:06:26 +0000 (23:06 +0000)]
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am:
3d6a714980 am:
208bc477d9 -s ours am:
c56555962b
am:
f4dfde92ea -s ours
* commit '
f4dfde92ea86c333fa04a2dc54e85791208b1ca4':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Andy Hung [Thu, 3 Dec 2015 23:02:45 +0000 (23:02 +0000)]
Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread" into lmp-dev am:
0c4d693722 am:
ba49fda63a -s ours am:
bb1809ace7
am:
adfda28b42
* commit '
adfda28b4211812737fd7a6d7b9729dbef35be93':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Andy Hung [Thu, 3 Dec 2015 23:02:45 +0000 (23:02 +0000)]
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am:
3d6a714980 am:
208bc477d9 -s ours
am:
c56555962b
* commit '
c56555962b7e0fcee2dc0a058127f8f309f19ea8':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Andy Hung [Thu, 3 Dec 2015 22:58:49 +0000 (22:58 +0000)]
Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread" into lmp-dev am:
0c4d693722 am:
ba49fda63a -s ours
am:
bb1809ace7
* commit '
bb1809ace7c3e38c40b3b84e63225613e638ee91':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Andy Hung [Thu, 3 Dec 2015 22:58:49 +0000 (22:58 +0000)]
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am:
3d6a714980
am:
208bc477d9 -s ours
* commit '
208bc477d92dbd2e5b4d1c0b2d000fa4c231e9d3':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Andy Hung [Thu, 3 Dec 2015 22:55:36 +0000 (22:55 +0000)]
Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread" into lmp-dev am:
0c4d693722
am:
ba49fda63a -s ours
* commit '
ba49fda63a38571596b197ce5a1a71d74ddb9464':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Andy Hung [Thu, 3 Dec 2015 22:55:36 +0000 (22:55 +0000)]
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
am:
3d6a714980
* commit '
3d6a7149802928ecf3f58b7218b0e82699b492df':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Andy Hung [Thu, 3 Dec 2015 22:41:06 +0000 (14:41 -0800)]
NuPlayerRenderer: Allow immediate pause on next track.
Prior code required audio data to have been decoded first.
Bug:
25904185
Change-Id: I52fa65b2ed53d29ddd534c2bf3070626d54bd633
Andy Hung [Thu, 3 Dec 2015 22:52:05 +0000 (22:52 +0000)]
Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread" into lmp-dev
am:
0c4d693722
* commit '
0c4d6937229096d530de7ef3fca496ac2d65c051':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Andy Hung [Thu, 3 Dec 2015 22:48:03 +0000 (22:48 +0000)]
Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread" into lmp-dev
Andy Hung [Thu, 3 Dec 2015 19:42:37 +0000 (19:42 +0000)]
Merge "Use modulo position variables in AudioTrack and AudioRecord"
Andy Hung [Wed, 2 Dec 2015 23:55:23 +0000 (15:55 -0800)]
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Sample decoding still occurs in SoundPoolThread
without holding the SoundPool lock.
Bug:
25781119
Change-Id: I11fde005aa9cf5438e0390a0d2dfe0ec1dd282e8
Wei Jia [Thu, 3 Dec 2015 18:42:10 +0000 (18:42 +0000)]
DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am:
6afc659b00 am:
9e1d7751b1 -s ours am:
4c0d243626 am:
862b693ba3 -s ours am:
db76a879ea am:
e0c9d8afd0 am:
2048dd5483 -s ours am:
7a2dbcd38b am:
f766fdb625 am:
29ff7f2ac7
am:
946388cc94
* commit '
946388cc942d4804fe1f308715cdb5adf135e0cc':
DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
Wei Jia [Thu, 3 Dec 2015 18:33:37 +0000 (18:33 +0000)]
DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am:
6afc659b00 am:
9e1d7751b1 -s ours am:
4c0d243626 am:
862b693ba3 -s ours am:
db76a879ea am:
e0c9d8afd0 am:
2048dd5483 -s ours am:
7a2dbcd38b am:
f766fdb625
am:
29ff7f2ac7
* commit '
29ff7f2ac7af5499dbbd6670b981251212831b60':
DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
Wei Jia [Thu, 3 Dec 2015 18:29:02 +0000 (18:29 +0000)]
DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am:
0462975291 am:
3e8e134597 -s ours am:
e4223a8d32 am:
bed81d6594 am:
dd4576b017 -s ours am:
e3bbe235f6 am:
b7e63bfadb am:
2c7411483b
am:
062ea7264f
* commit '
062ea7264f1d80c9e0f14d6efaea4179202bd8bd':
DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
Wei Jia [Thu, 3 Dec 2015 18:29:02 +0000 (18:29 +0000)]
DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am:
6afc659b00 am:
9e1d7751b1 -s ours am:
4c0d243626 am:
862b693ba3 -s ours am:
db76a879ea am:
e0c9d8afd0 am:
2048dd5483 -s ours am:
7a2dbcd38b
am:
f766fdb625
* commit '
f766fdb62590cc3c233ba51c45f2b4aade6483d4':
DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
Wei Jia [Thu, 3 Dec 2015 18:24:50 +0000 (18:24 +0000)]
DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am:
6afc659b00 am:
9e1d7751b1 -s ours am:
4c0d243626 am:
862b693ba3 -s ours am:
db76a879ea am:
e0c9d8afd0 am:
2048dd5483 -s ours
am:
7a2dbcd38b
* commit '
7a2dbcd38b27e9f626c5d7a56490b4315e5641ea':
DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
Wei Jia [Thu, 3 Dec 2015 18:20:37 +0000 (18:20 +0000)]
DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am:
6afc659b00 am:
9e1d7751b1 -s ours am:
4c0d243626 am:
862b693ba3 -s ours am:
db76a879ea am:
e0c9d8afd0
am:
2048dd5483 -s ours
* commit '
2048dd5483c76892f5c5d54ad54e9782073bed5c':
DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
Wei Jia [Thu, 3 Dec 2015 18:20:37 +0000 (18:20 +0000)]
DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am:
0462975291 am:
3e8e134597 -s ours am:
e4223a8d32 am:
bed81d6594 am:
dd4576b017 -s ours am:
e3bbe235f6 am:
b7e63bfadb
am:
2c7411483b
* commit '
2c7411483b098a84de41f56c2bce6ff8518ff7a2':
DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
Wei Jia [Thu, 3 Dec 2015 18:15:53 +0000 (18:15 +0000)]
DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am:
6afc659b00 am:
9e1d7751b1 -s ours am:
4c0d243626 am:
862b693ba3 -s ours am:
db76a879ea
am:
e0c9d8afd0
* commit '
e0c9d8afd0886162f19d28eb33c82878a0dada7d':
DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
Wei Jia [Thu, 3 Dec 2015 18:15:53 +0000 (18:15 +0000)]
DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am:
0462975291 am:
3e8e134597 -s ours am:
e4223a8d32 am:
bed81d6594 am:
dd4576b017 -s ours am:
e3bbe235f6
am:
b7e63bfadb
* commit '
b7e63bfadbd83396f68e7b99ee3b6e67f646bf58':
DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
OSDN Git Service
