OSDN Git Service
Dan Willemsen [Wed, 14 Dec 2016 05:57:26 +0000 (21:57 -0800)]
Fix CameraParameters2::OrderedKeyedVector::removeItem tautological-compare
The tautological-compare warning/error is uncovered when
frameworks/av/include is moved from being a system header directory to a
normal include directory.
Test: m -j checkbuild
Change-Id: Ie2d6c354f11e162416a1ac5e8ea185fa62a959a0
Treehugger Robot [Wed, 14 Dec 2016 18:06:48 +0000 (18:06 +0000)]
Merge "Fix warning: Called C++ object pointer is null"
Jerry Zhang [Tue, 13 Dec 2016 00:12:04 +0000 (00:12 +0000)]
Merge "Refactored Mtp driver interface into multiple classes."
Jerry Zhang [Mon, 24 Oct 2016 19:10:41 +0000 (12:10 -0700)]
Refactored Mtp driver interface into multiple classes.
Added new interface for FunctionFS. This allows most of
the driver code to exist in userspace. The driver will
automatically use FunctionFS if it is enabled for that
device, otherwise it will default to the kernel driver.
The intention is to eventually deprecate the kernel driver.
Bug:
30976142
Change-Id: I36b8d16ca254fddd995b3ea1bd3d37b0ff4a28f7
Test: New automated tests for MtpFfsHandle, AsyncIO.
Manual testing on each device.
Treehugger Robot [Thu, 8 Dec 2016 00:47:11 +0000 (00:47 +0000)]
Merge "Log correct reason for camera connect failures"
Yunlian Jiang [Wed, 7 Dec 2016 04:54:10 +0000 (20:54 -0800)]
Fix warning: Called C++ object pointer is null
Bug: None
Test: The warning is gone.
Change-Id: If33148cc1d8b0f3b26b39afdfc086d2abf18173d
Tobias Lindskog [Tue, 1 Nov 2016 13:25:52 +0000 (14:25 +0100)]
Log correct reason for camera connect failures
Show the detailed error when we have it, rather than trying to show it
only when we don't.
Bug:
33358375
Change-Id: Ifa7a4f8de7b35a0379224efd1e27d6745844b853
Pavlin Radoslavov [Fri, 2 Dec 2016 07:37:05 +0000 (07:37 +0000)]
Merge "Add a mechanism for Audio Feeding Parameters negotiation"
am:
653748414b
Change-Id: Id6855d139a248d15ec0ea0ee0f01cf7655862ac7
Treehugger Robot [Fri, 2 Dec 2016 07:25:29 +0000 (07:25 +0000)]
Merge "Add a mechanism for Audio Feeding Parameters negotiation"
Pavlin Radoslavov [Tue, 22 Nov 2016 20:13:59 +0000 (12:13 -0800)]
Add a mechanism for Audio Feeding Parameters negotiation
Previously, the Audio Feeding Parameters between the Media Framework
and A2DP were hard-coded: 44.1 KHz sample rate, 16-bits per sample, Stereo.
Now the Media Framework queries A2DP, and uses the returned values.
Bug: b/
30958229
Test: Manual testing: A2DP streaming to headphones. TestTracker/68727
Change-Id: Ib86035814c49f773b7ed3d64da334ca9ea87eb14
Caroline Tice [Thu, 1 Dec 2016 21:28:18 +0000 (21:28 +0000)]
Merge "Remove null-ptr deref compiler warning."
am:
b4d217ed0f
Change-Id: Iaa009b250224afa46e7220c44054ae1755d897bd
Treehugger Robot [Thu, 1 Dec 2016 21:10:12 +0000 (21:10 +0000)]
Merge "Remove null-ptr deref compiler warning."
Caroline Tice [Thu, 1 Dec 2016 00:20:52 +0000 (16:20 -0800)]
Remove null-ptr deref compiler warning.
This CL removes the following compiler warning:
frameworks/av/media/libstagefright/MPEG4Extractor.cpp:1025:35
warning: Access to field 'next' results in a dereference of a null
pointer (loaded from variable 'cur')
[clang-analyzer-core.NullDereference]
Bug: None
Test: Compiled with change and no warning.
Change-Id: I365843068b098b111c281ac293a0b0b3aa2ec875
Yin-Chia Yeh [Wed, 30 Nov 2016 19:13:02 +0000 (19:13 +0000)]
Merge "Camera: fix camera facing override logic"
am:
853f568b31
Change-Id: I5028a6f298eb2c961556760b6ea248c673c13ba6
Treehugger Robot [Wed, 30 Nov 2016 19:00:16 +0000 (19:00 +0000)]
Merge "Camera: fix camera facing override logic"
Yin-Chia Yeh [Tue, 29 Nov 2016 20:13:15 +0000 (12:13 -0800)]
Camera: fix camera facing override logic
Test: hack existing HAL to report EXTERNAL and run cts
Bug:
33091893
Change-Id: Idae8742fb4b18b2ef4842ec66284268fc650df22
Yunlian Jiang [Wed, 23 Nov 2016 04:24:47 +0000 (04:24 +0000)]
Merge "fix Potential leak of memory pointed to by 'sourcesLiteral'"
am:
fa81ba8775
Change-Id: I7d261ceb8cfce3b3f56ed907e1e32d70e7a40d45
Caroline Tice [Wed, 23 Nov 2016 04:24:30 +0000 (04:24 +0000)]
Merge "Fix null-pointer derefernce warning."
am:
955e85294d
Change-Id: I492db6e2ea9cbe052f4120aba3477052ad791a29
Treehugger Robot [Wed, 23 Nov 2016 04:18:14 +0000 (04:18 +0000)]
Merge "fix Potential leak of memory pointed to by 'sourcesLiteral'"
Treehugger Robot [Wed, 23 Nov 2016 04:17:17 +0000 (04:17 +0000)]
Merge "Fix null-pointer derefernce warning."
Jinguang Dong [Tue, 22 Nov 2016 18:41:21 +0000 (18:41 +0000)]
Merge "framework/av: fixbug for mistake clear mainbuffer data, root cause by not offset to fout"
am:
25ef483a8c
Change-Id: I6c8ee1c28b51f1578a781fdc7dd1d51326046d2f
Treehugger Robot [Tue, 22 Nov 2016 18:37:03 +0000 (18:37 +0000)]
Merge "framework/av: fixbug for mistake clear mainbuffer data, root cause by not offset to fout"
Jinguang Dong [Mon, 14 Nov 2016 11:57:14 +0000 (19:57 +0800)]
framework/av: fixbug for mistake clear mainbuffer data,
root cause by not offset to fout
Test: 1. pair and connect with bluetooth ear phone;
2. record video by camera ,play and pause again by
loop test;
3. Checking whether ear phone has pop sound.
Change-Id: Ief4117d634b9e7a9f27c669b8de7626b15df7636
Dan Willemsen [Fri, 18 Nov 2016 23:28:33 +0000 (23:28 +0000)]
Merge "Remove LOCAL_COPY_HEADERS from libparameter"
am:
76321a335c
Change-Id: Ie99187aa91ddb1a9fa199dcf681edd4565cc0d1b
Treehugger Robot [Fri, 18 Nov 2016 23:19:25 +0000 (23:19 +0000)]
Merge "Remove LOCAL_COPY_HEADERS from libparameter"
Dan Willemsen [Fri, 18 Nov 2016 21:28:36 +0000 (13:28 -0800)]
Remove LOCAL_COPY_HEADERS from libparameter
Requires the libaudiopolicypfwwrapper to depend on libparameter to get
the exported headers. Also fix the libaudiopolicyengineconfigurable
build to resolve missing liblog symbols.
Test: USE_CONFIGURABLE_AUDIO_POLICY=1 mmma -j frameworks/av/services/audiopolicy
Jinguang Dong [Thu, 17 Nov 2016 19:12:18 +0000 (19:12 +0000)]
Merge "Camera3: Add missing mTriggerMutex lock"
am:
ad4663c5a5
Change-Id: I59b7de9cdd9f608afa503293947a19d3f11d533b
Treehugger Robot [Thu, 17 Nov 2016 19:02:13 +0000 (19:02 +0000)]
Merge "Camera3: Add missing mTriggerMutex lock"
Robert Shih [Thu, 17 Nov 2016 17:54:42 +0000 (17:54 +0000)]
Merge "httplive: fix overflow in BandwidthEstimator"
am:
6cc43e10f4
Change-Id: I62c07442b4bcb05fa067e879c445bf19d4832b13
Robert Shih [Thu, 17 Nov 2016 17:43:36 +0000 (17:43 +0000)]
Merge "httplive: fix overflow in BandwidthEstimator"
Jinguang Dong [Mon, 14 Nov 2016 08:04:02 +0000 (16:04 +0800)]
Camera3: Add missing mTriggerMutex lock
There is thread safety problem for mTriggerMap in
Camera3Device::RequestThread::clear(). For correctness,
acquire mTriggerMutex before mTriggermap.clear().
Test: 1. Configure power saving mode to 2 seconds by
modification software;
2. using pyhon or monkey to turn on the screen every 4
second;
3. device doesn't crash any more on loop test.
Change-Id: I2f04e21dae3a9879d6cebfefb9d9c191ef3f4df4
Yunlian Jiang [Wed, 16 Nov 2016 04:17:57 +0000 (04:17 +0000)]
Merge "fix Access to field 'targets' results in a dereference of a null pointer"
am:
caea9fc26a
Change-Id: Id38c914a250aab0b4a395739db7e700c821ddaf3
Treehugger Robot [Wed, 16 Nov 2016 04:08:57 +0000 (04:08 +0000)]
Merge "fix Access to field 'targets' results in a dereference of a null pointer"
Caroline Tice [Wed, 16 Nov 2016 02:03:48 +0000 (18:03 -0800)]
Fix null-pointer derefernce warning.
Fixes IOMX.cpp:599 warning: Dereference of null pointer
BUG: None
Test: Warning is now gone.
Change-Id: Ife4a8d8af9b2eccd020448ac2ad4c65de081eb4c
Yunlian Jiang [Wed, 16 Nov 2016 01:55:57 +0000 (17:55 -0800)]
fix Potential leak of memory pointed to by 'sourcesLiteral'
Bug: none
Test: the warning is gone.
Change-Id: I8fe9610e24e31e3f788d00fa7f594e1274771433
Yunlian Jiang [Wed, 16 Nov 2016 01:52:15 +0000 (17:52 -0800)]
fix Access to field 'targets' results in a dereference of a null pointer
This fixes Access to field 'targets' results in a dereference of a null
pointer
Test: the warning is gone.
Change-Id: If5d8c1c87c4cf77252bd5d262eefeba30c772fe7
Robert Shih [Mon, 14 Nov 2016 19:23:49 +0000 (11:23 -0800)]
httplive: fix overflow in BandwidthEstimator
Bug:
32424616
Change-Id: If857fec44c6466aaadbde8cccbbf95a98d231fa2
Roger1 Jonsson [Sat, 12 Nov 2016 02:32:41 +0000 (02:32 +0000)]
Merge "Avoid crash for stss sync sample number 0"
am:
11f51b0463
Change-Id: I923fe096f4b9fef2d9b5b3a6e5674a0283b9f65e
Treehugger Robot [Sat, 12 Nov 2016 02:22:29 +0000 (02:22 +0000)]
Merge "Avoid crash for stss sync sample number 0"
Alex Naidis [Fri, 11 Nov 2016 17:39:39 +0000 (17:39 +0000)]
Merge "mediacodec/mediaextractor: allow multiple Seccomp extensions"
am:
da4cb8cb6c
Change-Id: Ia85752fe429a0fbb985ca0ad5425029c0a2811cf
Treehugger Robot [Fri, 11 Nov 2016 17:29:02 +0000 (17:29 +0000)]
Merge "mediacodec/mediaextractor: allow multiple Seccomp extensions"
Alex Naidis [Sat, 29 Oct 2016 14:18:15 +0000 (16:18 +0200)]
mediacodec/mediaextractor: allow multiple Seccomp extensions
This is useful if we have multiple device
layers and want to have common extensions while
supporting device specific extensions at the same time.
Change-Id: Iefbff9c1ec680963a7ea4c2db09d8e888dd87703
Signed-off-by: Alex Naidis <alex.naidis@linux.com>
Ricardo Garcia [Thu, 10 Nov 2016 15:13:35 +0000 (15:13 +0000)]
Merge "Override Auxiliary audio effect output as stereo"
am:
568085d022
Change-Id: I4f705ee2b47f30731d4f1ac46213fbcd678633a5
Ricardo Garcia [Thu, 10 Nov 2016 15:04:10 +0000 (15:04 +0000)]
Merge "Override Auxiliary audio effect output as stereo"
Yuuki Yokoyama [Tue, 23 Aug 2016 08:11:03 +0000 (17:11 +0900)]
Override Auxiliary audio effect output as stereo
Auxiliary audio effect supports only stereo as output channel.
Override output channel in case of Auxiliary effect.
Bug:
31985321
Change-Id: I308a6281e2ae2b8f814a659aa40dc6220ab7660a
Roger1 Jonsson [Wed, 26 Oct 2016 07:20:00 +0000 (09:20 +0200)]
Avoid crash for stss sync sample number 0
A sample number value of 0 means that the value stored in
the mSyncSamples array, would become negative (-1),
when converted to index value. This causes a crash.
Make sure that stss sample numbers are bigger
than 0 before converting sample number to index value.
Bug:
32423862
Test: Playback video that triggers stss sync sample number 0
Change-Id: I35bee7c718e01b086d7e05deda13b38083f509f5
Marco Nelissen [Mon, 7 Nov 2016 17:22:54 +0000 (17:22 +0000)]
Merge "Split libmedia into libmedia and libaudioclient"
am:
bad65c51a3
Change-Id: I39343fcc662eee153a9ba3ee511a277827d2f98b
Marco Nelissen [Mon, 7 Nov 2016 17:21:49 +0000 (17:21 +0000)]
Split libmedia into libmedia and libaudioclient
am:
795a2a7554
Change-Id: Ic08eddc5650d3f5d344ebcf93ad98ae5bb236c8c
Marco Nelissen [Mon, 7 Nov 2016 17:14:24 +0000 (17:14 +0000)]
Merge "Split libmedia into libmedia and libaudioclient"
Marco Nelissen [Wed, 2 Nov 2016 20:21:22 +0000 (13:21 -0700)]
Split libmedia into libmedia and libaudioclient
This makes it so audioserver doesn't need to link against the entire libmedia,
which has dependencies on camera, ICU, OpenGL and other things that aren't
needed for audio.
Test: build/boot
Change-Id: I99ba1a3dc3b33ca9b3abd98e7519dbf228ee62af
Marco Nelissen [Sat, 5 Nov 2016 01:21:29 +0000 (01:21 +0000)]
Merge "Remove unused libraries from libstagefright_http_support"
am:
bf26c4eb62
Change-Id: I7238f2705588d21aa3533af314825636232a9b1f
Treehugger Robot [Sat, 5 Nov 2016 01:16:49 +0000 (01:16 +0000)]
Merge "Remove unused libraries from libstagefright_http_support"
Marco Nelissen [Sat, 5 Nov 2016 00:02:25 +0000 (00:02 +0000)]
Merge "Move IMediaLogService to libmedialogservice"
am:
12dc4449ee
Change-Id: I78dd9164b47538205fbed6fe04fafb8bbcc55009
Treehugger Robot [Fri, 4 Nov 2016 23:56:10 +0000 (23:56 +0000)]
Merge "Move IMediaLogService to libmedialogservice"
Marco Nelissen [Fri, 4 Nov 2016 22:52:36 +0000 (22:52 +0000)]
Merge "Remove unused libstagefright_yuv"
am:
a4e77422c9
Change-Id: Ia23b671f54a2f8923e15311e0763fd10c2c469db
Marco Nelissen [Fri, 4 Nov 2016 22:52:20 +0000 (22:52 +0000)]
Merge "Remove unneeded links with dynamic libraries"
am:
46d0a5b493
Change-Id: Ica6dd538c30b9aeccddad229cb24ade4d82d2e4c
Treehugger Robot [Fri, 4 Nov 2016 22:46:14 +0000 (22:46 +0000)]
Merge "Remove unused libstagefright_yuv"
Treehugger Robot [Fri, 4 Nov 2016 22:46:05 +0000 (22:46 +0000)]
Merge "Remove unneeded links with dynamic libraries"
Marco Nelissen [Wed, 2 Nov 2016 22:46:18 +0000 (15:46 -0700)]
Remove unused libraries from libstagefright_http_support
Test: build/boot
Change-Id: I47e79fa0b51e4bb2ae63e10160aea861fabc96ac
Marco Nelissen [Wed, 2 Nov 2016 16:59:52 +0000 (09:59 -0700)]
Move IMediaLogService to libmedialogservice
So audioserver and libmedialogservice don't have to link against libmedia
Test: build/boot
Change-Id: I4040d9f6db59807c3fa56321d45fb6ab50fb5edb
Marco Nelissen [Thu, 27 Oct 2016 17:54:27 +0000 (10:54 -0700)]
Remove unused libstagefright_yuv
Test: built and booted
Change-Id: I3db16c365b36143fee4aa532dc9cdec0bca612a5
Marco Nelissen [Tue, 25 Oct 2016 20:17:47 +0000 (13:17 -0700)]
Remove unneeded links with dynamic libraries
Various media components were linking against dynamic libraries that weren't needed.
Test: built and booted
Change-Id: I7379506fd06d4e28e0eff0001fd073a2d3860f8e
Nick Kralevich [Wed, 2 Nov 2016 03:17:45 +0000 (03:17 +0000)]
Merge "Revert "mediacodec/mediaextractor: allow multiple Seccomp extensions""
am:
712690b374
Change-Id: Ia9c56bdf0fa132ef07508a660c44c4560d20f967
Nick Kralevich [Wed, 2 Nov 2016 03:12:22 +0000 (03:12 +0000)]
Merge "Revert "mediacodec/mediaextractor: allow multiple Seccomp extensions""
Nick Kralevich [Wed, 2 Nov 2016 03:10:52 +0000 (03:10 +0000)]
Revert "mediacodec/mediaextractor: allow multiple Seccomp extensions"
Seeing the following build errors:
$ . ./build/envsetup.sh && lunch aosp_dragon-userdebug
$ m -j 50
...
Starting build with ninja
ninja: Entering directory `.'
ninja: error: 'device/google/dragon/seccomp/mediaextractor-seccomp.policy', needed by 'out/target/product/dragon/obj/ETC/mediaextractor-seccomp.policy_intermediates/mediaextractor-seccomp.policy', missing and no known rule to make it
make: *** [ninja_wrapper] Error 1
make: Leaving directory `/SDD/master'
This reverts commit
87a80ef1e391247beb08854efded9cf9a52b8a09.
Change-Id: I5d039845c69b18f3a7199458c5301314d006f43b
Alex Naidis [Wed, 2 Nov 2016 01:02:30 +0000 (01:02 +0000)]
Merge "mediacodec/mediaextractor: allow multiple Seccomp extensions"
am:
e119cfe384
Change-Id: I3e72b83d44731fa77f7ce7d397e804a9a5c46982
Treehugger Robot [Wed, 2 Nov 2016 00:54:34 +0000 (00:54 +0000)]
Merge "mediacodec/mediaextractor: allow multiple Seccomp extensions"
Alex Naidis [Sat, 29 Oct 2016 14:18:15 +0000 (16:18 +0200)]
mediacodec/mediaextractor: allow multiple Seccomp extensions
This is useful if we have multiple device
layers and want to have common extensions while
supporting device specific extensions at the same time.
Change-Id: Iefbff9c1ec680963a7ea4c2db09d8e888dd87702
Signed-off-by: Alex Naidis <alex.naidis@linux.com>
Robert Shih [Tue, 25 Oct 2016 22:35:05 +0000 (22:35 +0000)]
Merge "FLACExtractor: copy protect mWriteBuffer"
am:
f521451f62
Change-Id: Ie46c44142ea7f397529c3149e89b6d0a3ae71cf0
Robert Shih [Tue, 25 Oct 2016 22:27:38 +0000 (22:27 +0000)]
Merge "FLACExtractor: copy protect mWriteBuffer"
Marco Nelissen [Tue, 25 Oct 2016 20:05:55 +0000 (20:05 +0000)]
Merge "Prefer software codec with debug property"
am:
829b2a0bf0
Change-Id: Ib5cc5065540f48efaebeb02ecd1bd8036f0e56d1
Treehugger Robot [Tue, 25 Oct 2016 20:01:10 +0000 (20:01 +0000)]
Merge "Prefer software codec with debug property"
Robert Shih [Mon, 24 Oct 2016 18:38:31 +0000 (11:38 -0700)]
FLACExtractor: copy protect mWriteBuffer
Bug:
30895578
Change-Id: I4cba36bbe3502678210e5925181683df9726b431
Harish Mahendrakar [Tue, 25 Oct 2016 17:38:47 +0000 (17:38 +0000)]
Merge "SoftAVCDec: Handle interlaced streams where two fields are sent in one input"
am:
460dcb750d
Change-Id: I8dc483438793d73cbe2b403c085da5310740562f
Treehugger Robot [Tue, 25 Oct 2016 17:30:42 +0000 (17:30 +0000)]
Merge "SoftAVCDec: Handle interlaced streams where two fields are sent in one input"
Marco Nelissen [Tue, 25 Oct 2016 16:56:21 +0000 (09:56 -0700)]
Prefer software codec with debug property
Change-Id: Ifc44a1dee79142d13393eac3c0750b9874b46a8f
Harish Mahendrakar [Thu, 20 Oct 2016 09:26:35 +0000 (14:56 +0530)]
SoftAVCDec: Handle interlaced streams where two fields are sent in one input
When both fields are sent in a single input buffer, only the first field was
being decoded. Fix this by not releasing input buffer when some bytes are still
left unused in the input buffer.
If both fields are sent in a separate call, decoder handles that correctly and
returns an output frame for every two fields
Bug:
32364044
Test: Manually tested by decoding clip attached in the above bug
Change-Id: Idab5acd9cbaefc5d2560a70d375f3a532d9e78eb
Dan Albert [Thu, 20 Oct 2016 22:16:46 +0000 (22:16 +0000)]
Merge "Add license to ndk_headers."
am:
cf39459d1f
Change-Id: Ie3b9f7461e6d1713d72d76bedeb32d1a6f5aa3f3
Treehugger Robot [Thu, 20 Oct 2016 22:12:39 +0000 (22:12 +0000)]
Merge "Add license to ndk_headers."
Dan Albert [Thu, 20 Oct 2016 17:07:28 +0000 (10:07 -0700)]
Add license to ndk_headers.
Test: make ndk
Bug: None
Change-Id: Ic04e648cc74bbd79295e89c07d92b0fdb2fb7978
Andy Hung [Thu, 20 Oct 2016 16:41:09 +0000 (16:41 +0000)]
Merge "Add logging of written frame counts"
am:
8080b95b4b
Change-Id: Ida324d82465e8f5e4bbc02f21e95a1112b17a49b
Treehugger Robot [Thu, 20 Oct 2016 16:28:06 +0000 (16:28 +0000)]
Merge "Add logging of written frame counts"
Andy Hung [Wed, 21 Sep 2016 19:55:15 +0000 (12:55 -0700)]
Add logging of written frame counts
Bug:
31591209
Change-Id: Ife5917aa65b02c3b0791dfe1975c70ccf58f9a75
(cherry picked from commit
2c45393d842a5d2968ef78fa7a08667efdf15f2a)
Andy Hung [Thu, 20 Oct 2016 05:56:16 +0000 (05:56 +0000)]
Merge "AudioFlinger: Account for frames dropped in suspend mode"
am:
290e7ed8d0
Change-Id: Iac45c4a07c7a8f56ecf87ac54d11355c1cdcbe11
Treehugger Robot [Thu, 20 Oct 2016 05:44:33 +0000 (05:44 +0000)]
Merge "AudioFlinger: Account for frames dropped in suspend mode"
Andy Hung [Thu, 28 Jul 2016 17:53:22 +0000 (10:53 -0700)]
AudioFlinger: Account for frames dropped in suspend mode
These frames must be added to the kernel position in timestamps.
Bug:
30025777
Change-Id: I30c14503c9467059c3782e5c96c01ae1cf3709f6
(cherry picked from commit
238fa3deff26d7e4d9e81bd0a88c936f16226c4e)
Caroline Tice [Wed, 19 Oct 2016 17:50:35 +0000 (17:50 +0000)]
Merge "Fix potental memory leak (compiler warning)."
am:
c1184a7991
Change-Id: I78b5d0ed14bfb18108ee43a8d3570cdb6bc65b32
Caroline Tice [Wed, 19 Oct 2016 17:34:28 +0000 (17:34 +0000)]
Merge "Fix potental memory leak (compiler warning)."
Caroline Tice [Tue, 18 Oct 2016 23:32:13 +0000 (16:32 -0700)]
Fix potental memory leak (compiler warning).
This CL fixes the following warning:
EffectProxy.cpp:93:8: warning: Potential leak of memory pointed to by
'pContext'.
BUG=None
Test: WITH_TIDY=1 WITH_STATIC_ANLYZER=1 mm
Change-Id: I7f127042eb50d3d6297473bfd90a5402b182cc85
Viraj Karandikar [Tue, 18 Oct 2016 17:34:36 +0000 (17:34 +0000)]
Merge "WAVExtractor: support ambisonic subformat"
am:
5d7e276b21
Change-Id: Iaae56344a8831e0dac7a724be5ba3f8e5b098e52
Treehugger Robot [Tue, 18 Oct 2016 17:26:47 +0000 (17:26 +0000)]
Merge "WAVExtractor: support ambisonic subformat"
Marco Nelissen [Fri, 14 Oct 2016 15:00:49 +0000 (15:00 +0000)]
Merge "Fix issues with metadata handling when format change happens" am:
92047ec34b am:
d41a64c7ad
am:
2a02f18cf1
Change-Id: Ia945c856b0b805111ebcb5a93908934ddaa78db1
Marco Nelissen [Fri, 14 Oct 2016 14:57:18 +0000 (14:57 +0000)]
Merge "Fix issues with metadata handling when format change happens" am:
92047ec34b
am:
d41a64c7ad
Change-Id: Iadd42f2bf9f6a6863333fae9dc26c17522cc9b28
Marco Nelissen [Fri, 14 Oct 2016 14:53:48 +0000 (14:53 +0000)]
Merge "Fix issues with metadata handling when format change happens"
am:
92047ec34b
Change-Id: Ib9ed5ce0c7c12f99be25aaabef3e53038aa03b7d
Marco Nelissen [Fri, 14 Oct 2016 14:49:24 +0000 (14:49 +0000)]
Merge "Fix issues with metadata handling when format change happens"
Robert Shih [Fri, 14 Oct 2016 01:22:40 +0000 (01:22 +0000)]
Merge "HTTPLiveSource: implement getFormatMeta" into nyc-mr1-dev am:
0afc0f8f3c
am:
069372b3f0
Change-Id: I94001c933c46425ebf9e134531e438118330c482
Robert Shih [Fri, 14 Oct 2016 01:22:25 +0000 (01:22 +0000)]
HTTPLiveSource: implement getFormatMeta am:
a83eebb78c
am:
7c55dd0c5b
Change-Id: Ifc927603a8c35f27cd58a1f0ce92ee92e99f1025
Robert Shih [Fri, 14 Oct 2016 01:16:26 +0000 (01:16 +0000)]
Merge "HTTPLiveSource: implement getFormatMeta" into nyc-mr1-dev
am:
0afc0f8f3c
Change-Id: Ia989add104201cd0524525c58ba4fd603564a509
Robert Shih [Fri, 14 Oct 2016 01:16:25 +0000 (01:16 +0000)]
HTTPLiveSource: implement getFormatMeta
am:
a83eebb78c
Change-Id: If4e85e963ae832a9f16c69fd7a5d6bbeb07789bf
Robert Shih [Fri, 14 Oct 2016 01:12:03 +0000 (01:12 +0000)]
Merge "HTTPLiveSource: implement getFormatMeta" into nyc-mr1-dev