OSDN Git Service

android-x86/frameworks-av.git
7 years agoMerge "HTTPLIVE: do not store hash of malformed M3U8 file"
Robert Shih [Wed, 4 Jan 2017 19:18:14 +0000 (19:18 +0000)]
Merge "HTTPLIVE: do not store hash of malformed M3U8 file"
am: e8b14c3c5c

Change-Id: I8dcc94b4dca4a10221f383f35be68f15242c6e40

7 years agoMerge "HTTPLIVE: do not store hash of malformed M3U8 file"
Robert Shih [Wed, 4 Jan 2017 19:07:38 +0000 (19:07 +0000)]
Merge "HTTPLIVE: do not store hash of malformed M3U8 file"

7 years agoMerge "Add a mechanism for handling audio device configuration change"
Pavlin Radoslavov [Thu, 29 Dec 2016 00:04:36 +0000 (00:04 +0000)]
Merge "Add a mechanism for handling audio device configuration change"
am: 549e431947

Change-Id: Ia33a6a9a3f4088f0ca351ad2ffe96c5ebd5d7bf7

7 years agoMerge "Add a mechanism for handling audio device configuration change"
Treehugger Robot [Wed, 28 Dec 2016 23:55:28 +0000 (23:55 +0000)]
Merge "Add a mechanism for handling audio device configuration change"

7 years agoAdd a mechanism for handling audio device configuration change
Pavlin Radoslavov [Tue, 27 Dec 2016 02:57:22 +0000 (18:57 -0800)]
Add a mechanism for handling audio device configuration change

* Added new call handleDeviceConfigChange() to the Media Framework.
  That call can be used when there are device configuration changes
  (e.g., Bluetooth A2DP codec configuration has changed).
* Added new method AudioPolicyManager::handleDeviceConfigChange().
  That method toggles the UNAVAILABLE/AVAILABLE connection state of the
  device, so it can be reconfigured as appropriate - e.g., the audio
  feeding parameters can be updated.
* Fix ALOGVV compilation errors when extra logging is enabled.

Test: A2DP streaming to headsets
Bug: 30958229
Change-Id: I388abbbb3ec4d1a003b441cb0c77e00d80cad668

7 years agoMerge "Replace cutils/log.h with either android/log.h or log/log.h"
Mark Salyzyn [Thu, 22 Dec 2016 19:11:37 +0000 (19:11 +0000)]
Merge "Replace cutils/log.h with either android/log.h or log/log.h"
am: a05da2eea4

Change-Id: Iff7f7223f7db444393daef8a5036645688a80cc6

7 years agoMerge "Make users of MtpServer provide DeviceInfo fields"
Alex Klyubin [Thu, 22 Dec 2016 19:08:44 +0000 (19:08 +0000)]
Merge "Make users of MtpServer provide DeviceInfo fields"
am: b5ee680912

Change-Id: I83b174e262a39aa354f0d610192d9c7486e4fc60

7 years agoMerge "Replace cutils/log.h with either android/log.h or log/log.h"
Mark Salyzyn [Thu, 22 Dec 2016 18:26:17 +0000 (18:26 +0000)]
Merge "Replace cutils/log.h with either android/log.h or log/log.h"

7 years agoMerge "Make users of MtpServer provide DeviceInfo fields"
Alex Klyubin [Thu, 22 Dec 2016 17:06:06 +0000 (17:06 +0000)]
Merge "Make users of MtpServer provide DeviceInfo fields"

7 years agoReplace cutils/log.h with either android/log.h or log/log.h
Mark Salyzyn [Thu, 29 Sep 2016 15:48:48 +0000 (08:48 -0700)]
Replace cutils/log.h with either android/log.h or log/log.h

Test: compile
Bug: 31289077
Change-Id: I795a76f978d2213737f1fa908da789c543219b75

7 years agoHTTPLIVE: do not store hash of malformed M3U8 file
Jinguang Dong [Tue, 20 Dec 2016 06:33:39 +0000 (14:33 +0800)]
HTTPLIVE: do not store hash of malformed M3U8 file

From code analysis, we should make sure that M3UParser::initCheck
returns OK then perform hash memcpy. This would prevent NuPlayer from
overlooking a malformed M3U8 and crashing later on a NULL derefernce.

Test: 1 Play http://117.34.15.47/7d.v.iask.com/player/ovs1_idx_chid_1054589_br_400_fn_4_pn_weitv_sig_md5.m3u8
      2 mediaserver does not crash

Bug: 33763371
Change-Id: I3d8f5450cdf45288110121973c679c8d58210d5c

7 years agoMake users of MtpServer provide DeviceInfo fields
Alex Klyubin [Wed, 21 Dec 2016 19:20:22 +0000 (11:20 -0800)]
Make users of MtpServer provide DeviceInfo fields

This is part of weaning apps off accessing system identifiers via
system properties API. Apps should use android.os.Build API instead.

Bug: 33700679
Test: Enable MTP mode then check that mtp-detect output same as before this commit
Change-Id: Ic21da7b8e976aaa1abc606a3cb4a1f2bd8698408

7 years agoMerge "default no ouput verbose message of APM::AudioPolicyEngine/PFWWrapper"
Eric Laurent [Tue, 20 Dec 2016 18:51:18 +0000 (18:51 +0000)]
Merge "default no ouput verbose message of APM::AudioPolicyEngine/PFWWrapper"
am: 36a75eeb15

Change-Id: I733b003ed3981762cdfed2713973e3dda0073adf

7 years agoMerge "default no ouput verbose message of APM::AudioPolicyEngine/PFWWrapper"
Eric Laurent [Tue, 20 Dec 2016 16:15:44 +0000 (16:15 +0000)]
Merge "default no ouput verbose message of APM::AudioPolicyEngine/PFWWrapper"

7 years agoMerge "Fix issues with extractor dumpsys"
Marco Nelissen [Tue, 20 Dec 2016 00:11:15 +0000 (00:11 +0000)]
Merge "Fix issues with extractor dumpsys"
am: 24cd6995c7

Change-Id: I075dfc9daa01e3202c8054690915c43cb0567cac

7 years agoMerge "Fix potential NULL dereference"
Marco Nelissen [Tue, 20 Dec 2016 00:11:01 +0000 (00:11 +0000)]
Merge "Fix potential NULL dereference"
am: ccf56a09ee

Change-Id: I6476a47b0f5d28731d858cfcc32eb489750e20f1

7 years agoMerge "Fix issues with extractor dumpsys"
Treehugger Robot [Tue, 20 Dec 2016 00:05:46 +0000 (00:05 +0000)]
Merge "Fix issues with extractor dumpsys"

7 years agoMerge "Fix potential NULL dereference"
Treehugger Robot [Tue, 20 Dec 2016 00:00:33 +0000 (00:00 +0000)]
Merge "Fix potential NULL dereference"

7 years agoFix potential NULL dereference
Marco Nelissen [Mon, 19 Dec 2016 22:26:38 +0000 (14:26 -0800)]
Fix potential NULL dereference

Bug: 32875080
Change-Id: I9d6808812e735e58e8b477635441fd92f94f8d25

7 years agoFix issues with extractor dumpsys
Marco Nelissen [Mon, 19 Dec 2016 22:06:30 +0000 (14:06 -0800)]
Fix issues with extractor dumpsys

Tracks and descriptions were added to their respective lists in
opposite order, so dumpsys could mix up the format and active
state for a given track. Also fix potential NULL pointer dereference.

Bug: 33179012
Change-Id: I700d535da0e72f5641bf9257a34fdb5d5d068b12

7 years agoMerge "Fix unused-parameter warnings"
Dan Willemsen [Thu, 15 Dec 2016 20:31:22 +0000 (20:31 +0000)]
Merge "Fix unused-parameter warnings"
am: f7f08afc8b

Change-Id: I9edd4a3f3dc7b68730e15fc38ed05218150869c5

7 years agoMerge "Fix CameraParameters2::OrderedKeyedVector::removeItem tautological-compare"
Dan Willemsen [Thu, 15 Dec 2016 20:31:04 +0000 (20:31 +0000)]
Merge "Fix CameraParameters2::OrderedKeyedVector::removeItem tautological-compare"
am: 2142e027a4

Change-Id: Ia1598e7f76d26e62bd23f700fc351bb6693bf669

7 years agoMerge "Fix unused-parameter warnings"
Treehugger Robot [Thu, 15 Dec 2016 20:24:16 +0000 (20:24 +0000)]
Merge "Fix unused-parameter warnings"

7 years agoMerge "Fix CameraParameters2::OrderedKeyedVector::removeItem tautological-compare"
Treehugger Robot [Thu, 15 Dec 2016 20:18:34 +0000 (20:18 +0000)]
Merge "Fix CameraParameters2::OrderedKeyedVector::removeItem tautological-compare"

7 years agoMerge "Fix mismatched-tags error"
Dan Willemsen [Thu, 15 Dec 2016 20:11:21 +0000 (20:11 +0000)]
Merge "Fix mismatched-tags error"
am: 604224ed40

Change-Id: If4e438ff18fd6035f26f5a2214f6b1f4a0fa2fb6

7 years agoMerge "Fix mismatched-tags error"
Treehugger Robot [Thu, 15 Dec 2016 20:05:26 +0000 (20:05 +0000)]
Merge "Fix mismatched-tags error"

7 years agoFix unused-parameter warnings
Dan Willemsen [Wed, 14 Dec 2016 04:34:11 +0000 (20:34 -0800)]
Fix unused-parameter warnings

These are exposed when frameworks/av/include is moved from being a
system include directory to a normal include directory.

Test: m -j checkbuild
Change-Id: I0e3787fbee70339f7dcbc979f448800ecfff0f17
Merged-In: I0e3787fbee70339f7dcbc979f448800ecfff0f17

7 years agoFix mismatched-tags error
Dan Willemsen [Wed, 14 Dec 2016 04:32:25 +0000 (20:32 -0800)]
Fix mismatched-tags error

These are exposed when frameworks/av/include is moved from being a
system include directory to a normal include directory.

Test: m -j checkbuild
Change-Id: Iaa8f3808d578ebedc75e863b9818cfbbec9080b2
Merged-In: Iaa8f3808d578ebedc75e863b9818cfbbec9080b2

7 years agoFix CameraParameters2::OrderedKeyedVector::removeItem tautological-compare
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

7 years agoMerge "Fix warning: Called C++ object pointer is null"
Yunlian Jiang [Wed, 14 Dec 2016 18:14:45 +0000 (18:14 +0000)]
Merge "Fix warning: Called C++ object pointer is null"
am: 5d26ace4fe

Change-Id: I0dc3cb0f848fd0b90a3e20993b64bcf899656e6e

7 years agoMerge "Fix warning: Called C++ object pointer is null"
Treehugger Robot [Wed, 14 Dec 2016 18:06:48 +0000 (18:06 +0000)]
Merge "Fix warning: Called C++ object pointer is null"

7 years agoMerge "Refactored Mtp driver interface into multiple classes."
Jerry Zhang [Tue, 13 Dec 2016 00:26:54 +0000 (00:26 +0000)]
Merge "Refactored Mtp driver interface into multiple classes."
am: 16b37bb469

Change-Id: Ia3a6af9ac64b902ba14d799efa3ecddd0f9d5aff

7 years agoRefactored Mtp driver interface into multiple classes.
Jerry Zhang [Tue, 13 Dec 2016 00:25:30 +0000 (00:25 +0000)]
Refactored Mtp driver interface into multiple classes.
am: 487be61fb0

Change-Id: I5990e904f26f458e80441ec52414a95980ff896f

7 years agoMerge "Refactored Mtp driver interface into multiple classes."
Jerry Zhang [Tue, 13 Dec 2016 00:12:04 +0000 (00:12 +0000)]
Merge "Refactored Mtp driver interface into multiple classes."

7 years agoRefactored 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.

7 years agodefault no ouput verbose message of APM::AudioPolicyEngine/PFWWrapper
Liu Changcheng [Wed, 7 Dec 2016 10:58:19 +0000 (18:58 +0800)]
default no ouput verbose message of APM::AudioPolicyEngine/PFWWrapper

The verbose output consume much time. Change ALOGD to ALOGV in info
function. Developer could define LOG_NDEBUG to be 0 if need verbose
message to debug system

Change-Id: Iecb621d0eb8ec6a058608bf1b695b5ebd889c802
Signed-off-by: Liu Changcheng <changcheng.liu@intel.com>
Signed-off-by: Jerry Liu <primerlink@gmail.com>
7 years agoMerge "Log correct reason for camera connect failures"
Tobias Lindskog [Thu, 8 Dec 2016 00:56:39 +0000 (00:56 +0000)]
Merge "Log correct reason for camera connect failures"
am: b985e3c6ba

Change-Id: Iea90914d040db44c1e6615da9975ec8ef13c4e0b

7 years agoMerge "Log correct reason for camera connect failures"
Treehugger Robot [Thu, 8 Dec 2016 00:47:11 +0000 (00:47 +0000)]
Merge "Log correct reason for camera connect failures"

7 years agoFix warning: Called C++ object pointer is null
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

7 years agoLog correct reason for camera connect failures
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

7 years agoMerge "Add a mechanism for Audio Feeding Parameters negotiation"
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

7 years agoMerge "Add a mechanism for Audio Feeding Parameters negotiation"
Treehugger Robot [Fri, 2 Dec 2016 07:25:29 +0000 (07:25 +0000)]
Merge "Add a mechanism for Audio Feeding Parameters negotiation"

7 years agoAdd 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

7 years agoMerge "Remove null-ptr deref compiler warning."
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

7 years agoMerge "Remove null-ptr deref compiler warning."
Treehugger Robot [Thu, 1 Dec 2016 21:10:12 +0000 (21:10 +0000)]
Merge "Remove null-ptr deref compiler warning."

7 years agoRemove 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

7 years agoMerge "Camera: fix camera facing override logic"
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

7 years agoMerge "Camera: fix camera facing override logic"
Treehugger Robot [Wed, 30 Nov 2016 19:00:16 +0000 (19:00 +0000)]
Merge "Camera: fix camera facing override logic"

7 years agoCamera: 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

7 years agoMerge "fix Potential leak of memory pointed to by 'sourcesLiteral'"
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

7 years agoMerge "Fix null-pointer derefernce warning."
Caroline Tice [Wed, 23 Nov 2016 04:24:30 +0000 (04:24 +0000)]
Merge "Fix null-pointer derefernce warning."
am: 955e85294d

Change-Id: I492db6e2ea9cbe052f4120aba3477052ad791a29

7 years agoMerge "fix Potential leak of memory pointed to by 'sourcesLiteral'"
Treehugger Robot [Wed, 23 Nov 2016 04:18:14 +0000 (04:18 +0000)]
Merge "fix Potential leak of memory pointed to by 'sourcesLiteral'"

7 years agoMerge "Fix null-pointer derefernce warning."
Treehugger Robot [Wed, 23 Nov 2016 04:17:17 +0000 (04:17 +0000)]
Merge "Fix null-pointer derefernce warning."

7 years agoMerge "framework/av: fixbug for mistake clear mainbuffer data, root cause by not...
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

7 years agoMerge "framework/av: fixbug for mistake clear mainbuffer data, root cause by not...
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"

7 years agoframework/av: fixbug for mistake clear mainbuffer data,
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

7 years agoMerge "Remove LOCAL_COPY_HEADERS from libparameter"
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

7 years agoMerge "Remove LOCAL_COPY_HEADERS from libparameter"
Treehugger Robot [Fri, 18 Nov 2016 23:19:25 +0000 (23:19 +0000)]
Merge "Remove LOCAL_COPY_HEADERS from libparameter"

7 years agoRemove 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

7 years agoMerge "Camera3: Add missing mTriggerMutex lock"
Jinguang Dong [Thu, 17 Nov 2016 19:12:18 +0000 (19:12 +0000)]
Merge "Camera3: Add missing mTriggerMutex lock"
am: ad4663c5a5

Change-Id: I59b7de9cdd9f608afa503293947a19d3f11d533b

7 years agoMerge "Camera3: Add missing mTriggerMutex lock"
Treehugger Robot [Thu, 17 Nov 2016 19:02:13 +0000 (19:02 +0000)]
Merge "Camera3: Add missing mTriggerMutex lock"

7 years agoMerge "httplive: fix overflow in BandwidthEstimator"
Robert Shih [Thu, 17 Nov 2016 17:54:42 +0000 (17:54 +0000)]
Merge "httplive: fix overflow in BandwidthEstimator"
am: 6cc43e10f4

Change-Id: I62c07442b4bcb05fa067e879c445bf19d4832b13

7 years agoMerge "httplive: fix overflow in BandwidthEstimator"
Robert Shih [Thu, 17 Nov 2016 17:43:36 +0000 (17:43 +0000)]
Merge "httplive: fix overflow in BandwidthEstimator"

7 years agoCamera3: Add missing mTriggerMutex lock
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

7 years agoMerge "fix Access to field 'targets' results in a dereference of a null pointer"
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

7 years agoMerge "fix Access to field 'targets' results in a dereference of a null pointer"
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"

7 years agoFix null-pointer derefernce warning.
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

7 years agofix Potential leak of memory pointed to by 'sourcesLiteral'
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

7 years agofix Access to field 'targets' results in a dereference of a null pointer
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

7 years agohttplive: fix overflow in BandwidthEstimator
Robert Shih [Mon, 14 Nov 2016 19:23:49 +0000 (11:23 -0800)]
httplive: fix overflow in BandwidthEstimator

Bug: 32424616
Change-Id: If857fec44c6466aaadbde8cccbbf95a98d231fa2

7 years agoMerge "Avoid crash for stss sync sample number 0"
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

7 years agoMerge "Avoid crash for stss sync sample number 0"
Treehugger Robot [Sat, 12 Nov 2016 02:22:29 +0000 (02:22 +0000)]
Merge "Avoid crash for stss sync sample number 0"

7 years agoMerge "mediacodec/mediaextractor: allow multiple Seccomp extensions"
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

7 years agoMerge "mediacodec/mediaextractor: allow multiple Seccomp extensions"
Treehugger Robot [Fri, 11 Nov 2016 17:29:02 +0000 (17:29 +0000)]
Merge "mediacodec/mediaextractor: allow multiple Seccomp extensions"

7 years agomediacodec/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>
7 years agoMerge "Override Auxiliary audio effect output as stereo"
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

7 years agoMerge "Override Auxiliary audio effect output as stereo"
Ricardo Garcia [Thu, 10 Nov 2016 15:04:10 +0000 (15:04 +0000)]
Merge "Override Auxiliary audio effect output as stereo"

7 years agoOverride 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

7 years agoAvoid crash for stss sync sample number 0
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

7 years agoMerge "Split libmedia into libmedia and libaudioclient"
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

7 years agoSplit libmedia into libmedia and libaudioclient
Marco Nelissen [Mon, 7 Nov 2016 17:21:49 +0000 (17:21 +0000)]
Split libmedia into libmedia and libaudioclient
am: 795a2a7554

Change-Id: Ic08eddc5650d3f5d344ebcf93ad98ae5bb236c8c

7 years agoMerge "Split libmedia into libmedia and libaudioclient"
Marco Nelissen [Mon, 7 Nov 2016 17:14:24 +0000 (17:14 +0000)]
Merge "Split libmedia into libmedia and libaudioclient"

7 years agoSplit 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

7 years agoMerge "Remove unused libraries from libstagefright_http_support"
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

7 years agoMerge "Remove unused libraries from libstagefright_http_support"
Treehugger Robot [Sat, 5 Nov 2016 01:16:49 +0000 (01:16 +0000)]
Merge "Remove unused libraries from libstagefright_http_support"

7 years agoMerge "Move IMediaLogService to libmedialogservice"
Marco Nelissen [Sat, 5 Nov 2016 00:02:25 +0000 (00:02 +0000)]
Merge "Move IMediaLogService to libmedialogservice"
am: 12dc4449ee

Change-Id: I78dd9164b47538205fbed6fe04fafb8bbcc55009

7 years agoMerge "Move IMediaLogService to libmedialogservice"
Treehugger Robot [Fri, 4 Nov 2016 23:56:10 +0000 (23:56 +0000)]
Merge "Move IMediaLogService to libmedialogservice"

7 years agoMerge "Remove unused libstagefright_yuv"
Marco Nelissen [Fri, 4 Nov 2016 22:52:36 +0000 (22:52 +0000)]
Merge "Remove unused libstagefright_yuv"
am: a4e77422c9

Change-Id: Ia23b671f54a2f8923e15311e0763fd10c2c469db

7 years agoMerge "Remove unneeded links with dynamic libraries"
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

7 years agoMerge "Remove unused libstagefright_yuv"
Treehugger Robot [Fri, 4 Nov 2016 22:46:14 +0000 (22:46 +0000)]
Merge "Remove unused libstagefright_yuv"

7 years agoMerge "Remove unneeded links with dynamic libraries"
Treehugger Robot [Fri, 4 Nov 2016 22:46:05 +0000 (22:46 +0000)]
Merge "Remove unneeded links with dynamic libraries"

7 years agoRemove unused libraries from libstagefright_http_support
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

7 years agoMove IMediaLogService to libmedialogservice
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

7 years agoRemove unused libstagefright_yuv
Marco Nelissen [Thu, 27 Oct 2016 17:54:27 +0000 (10:54 -0700)]
Remove unused libstagefright_yuv

Test: built and booted

Change-Id: I3db16c365b36143fee4aa532dc9cdec0bca612a5

7 years agoRemove unneeded links with dynamic libraries
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

7 years agoMerge "Revert "mediacodec/mediaextractor: allow multiple Seccomp extensions""
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

7 years agoMerge "Revert "mediacodec/mediaextractor: allow multiple Seccomp extensions""
Nick Kralevich [Wed, 2 Nov 2016 03:12:22 +0000 (03:12 +0000)]
Merge "Revert "mediacodec/mediaextractor: allow multiple Seccomp extensions""

7 years agoRevert "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

7 years agoMerge "mediacodec/mediaextractor: allow multiple Seccomp extensions"
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

7 years agoMerge "mediacodec/mediaextractor: allow multiple Seccomp extensions"
Treehugger Robot [Wed, 2 Nov 2016 00:54:34 +0000 (00:54 +0000)]
Merge "mediacodec/mediaextractor: allow multiple Seccomp extensions"