OSDN Git Service
Edwin Wong [Tue, 1 Jul 2014 15:43:12 +0000 (08:43 -0700)]
Fix build target path.
Change-Id: I45ee7efb13ffaff8c15ce6b2aea3076db713c73e
John "Juce" Bruce [Mon, 23 Jun 2014 19:11:56 +0000 (12:11 -0700)]
Add Unit Tests for ClearKey Plugin
Change-Id: I0008a01d29ade169df9a0fd30ca0303adf9ecad3
John "Juce" Bruce [Wed, 14 May 2014 05:22:44 +0000 (22:22 -0700)]
ClearKey Implementation of DRM Plugin APIs
Adds shared-object entry points and interface implementations that
implement the Android ClearKey DRM Plugin API.
Change-Id: Ie889747492cf85efe883149833105538faaa4cfe
Edwin Wong [Fri, 16 May 2014 00:24:57 +0000 (17:24 -0700)]
JsonWebKey support.
Parses JSON Web Key Set in the response data; extracts and base64 decode
key id(s) and key(s).
bug:
12035506
Change-Id: Ib71bce942d6eca1e569dfad0a9adb6dee1cdf75e
John "Juce" Bruce [Wed, 11 Jun 2014 04:12:56 +0000 (21:12 -0700)]
Implement ClearKey Init Data Parser
Implements an object that can convert ISO-CENC or WebM initialization
data into a ClearKey license request.
Change-Id: Ib95012afcf40fc9e3f45510a468c305fb7bc216e
John "Juce" Bruce [Wed, 11 Jun 2014 04:12:37 +0000 (21:12 -0700)]
Implement OpenSSL-Based Decryptor
Implements an object that does AES-CTR-128 by invoking OpenSSL.
Change-Id: I8457899ec8b69bd8f0d727029985c9580911cf99
John "Juce" Bruce [Thu, 15 May 2014 23:37:05 +0000 (16:37 -0700)]
Add ClearKey Utilities
Adds some utility functionality that is shared by multiple parts of
the ClearKey code.
Change-Id: I33a896eb68b2937918f145c9bd27174a119294b9
Andy Hung [Mon, 30 Jun 2014 18:17:03 +0000 (18:17 +0000)]
Merge "Add enabling variable for extended precision audio"
Gaurav Batra [Thu, 19 Jun 2014 23:47:07 +0000 (16:47 -0700)]
Camera API1/2: don't register the same listener multiple times
FrameProcessorBase allows register the same metadata result listener multiple
times with the same range IDs, which causes the same metadata result is
delivered multiple times for the same listener. This is problematic as client
like ZslProcessor's updateStream is called multiple times between captures, and
each updateStream calls registerListener unconditionally. The the ZSL metadata
result queue will be flooded with same metadata result multiple times and the
number of same result will keep growing until the queue is full.
Change-Id: I2ff7808e5dce61068a7111e7fbbce2aba95198cd
Zhijun He [Sat, 28 Jun 2014 00:55:16 +0000 (00:55 +0000)]
Merge "Camera1: Don't send partial results to ZSL clients"
Zhijun He [Wed, 25 Jun 2014 18:40:02 +0000 (11:40 -0700)]
Camera1: Don't send partial results to ZSL clients
ZSL clients expect each received result as a complete result, and send back to
HAL as a reprocess capture request. CaptureSequencer client assumes results to
be non-partial too, it need look into some metadata that may not be present in
partial results.
Change-Id: Id716913fd6e1c914726abd6610fddf91141783c2
Rachad [Sat, 28 Jun 2014 00:34:55 +0000 (00:34 +0000)]
Merge "Add HEVC encoder support to ACodec"
Marco Nelissen [Fri, 27 Jun 2014 16:54:39 +0000 (16:54 +0000)]
Merge "Fix AAC timestamps"
Marco Nelissen [Thu, 26 Jun 2014 14:49:02 +0000 (07:49 -0700)]
Fix AAC timestamps
When playing an mpeg-2 transport stream with AAC audio, there will be
more than one packet per input buffer, resulting in multiple output
buffers for each input buffers. Additional timestamps needs to be
generated in that case.
b/
15755476
Change-Id: I2df50b0cb3690eb36d56871daa1263de0028db06
Paul McLean [Fri, 27 Jun 2014 16:05:57 +0000 (16:05 +0000)]
Merge "Enabling USB Device and Android Device Vol inc/dec functionality for USB Audio Output"
Paul McLean [Thu, 26 Jun 2014 20:16:44 +0000 (13:16 -0700)]
Enabling USB Device and Android Device Vol inc/dec functionality for USB Audio Output
Bug:
13747844
Change-Id: Ied5bb44f63a4e7183c52f8111e9a389b60ffe75f
Chong Zhang [Thu, 26 Jun 2014 18:50:41 +0000 (18:50 +0000)]
Merge "HLS: only queue discontinuity for first block"
Mark Salyzyn [Wed, 18 Jun 2014 23:32:50 +0000 (16:32 -0700)]
ndk: 64-bit compile warnings
Change-Id: I214973a97547bf714e56e4596359cb2bd9cdea9c
Mark Salyzyn [Wed, 18 Jun 2014 23:34:45 +0000 (16:34 -0700)]
libstagefright: 64-bit compile warnings
Change-Id: I3d1146714fa23be3d4e696599b6f70cac1f9d28b
Chong Zhang [Thu, 26 Jun 2014 01:06:53 +0000 (18:06 -0700)]
HLS: only queue discontinuity for first block
Bug:
15020526
Change-Id: I15f9ab0f38dc510e584c668eea73ece61844d413
Rachad [Tue, 20 May 2014 01:01:41 +0000 (18:01 -0700)]
Add HEVC encoder support to ACodec
Bug:
14571712
Change-Id: Idaec2394d569541f3963befe722f46f6b0007937
Andy Hung [Tue, 18 Mar 2014 18:56:15 +0000 (11:56 -0700)]
Add enabling variable for extended precision audio
Set AudioFlinger::kEnableExtendedPrecision = true to enable
extended precision. Enabling will be required for devices (such as
USB) which report 24 bit or 32 bit sink formats.
Change-Id: I0dc1d7a4f7607086d7b536ea0e43aef0e696f2ee
Yin-Chia Yeh [Wed, 25 Jun 2014 18:04:02 +0000 (18:04 +0000)]
Merge "cameraservice: Deprecate triggerId tags"
Mark Salyzyn [Wed, 18 Jun 2014 23:32:27 +0000 (16:32 -0700)]
mtp: 64-bit compile warnings
Change-Id: I9ebc270c990d2f83311cec8fef8f1d2842ebf291
Eric Laurent [Wed, 25 Jun 2014 15:57:06 +0000 (15:57 +0000)]
Merge "audio policy: fix several issues on routing APIs."
Dan Stoza [Wed, 25 Jun 2014 17:03:52 +0000 (17:03 +0000)]
Merge "GLConsumer: Stop using default constructor params"
Eric Laurent [Mon, 23 Jun 2014 15:46:27 +0000 (08:46 -0700)]
audio policy: fix several issues on routing APIs.
- Do not list duplicated outputs in listAudioPorts(): duplicated
outputs are not valid sources for audio patches.
Also add asserts to make sure that an audio port with no valid profile
is never used by audio routing APIs.
- Fix typos causing the wrong device type to be used
when creating an audio patch.
- Fix error in building config mask in toAudioPortConfig().
Change-Id: I4505891dbed2c2fa92804d45505c3c2deb921f3e
Yin-Chia Yeh [Mon, 23 Jun 2014 21:07:56 +0000 (14:07 -0700)]
cameraservice: Deprecate triggerId tags
The following two tags are deprecated from HAL 3.2:
ANDROID_CONTROL_AF_TRIGGER_ID
ANDROID_CONTROL_AE_PRECAPTURE_ID
Trigger IDs are now internal to camera service.
Change-Id: Iaebd62ecb0905a811fa37fe7850e0221c38a0006
Dan Stoza [Tue, 24 Jun 2014 20:04:08 +0000 (13:04 -0700)]
GLConsumer: Stop using default constructor params
Removes the dependency on default constructor parameters for
GLConsumer so that a different constructor prototype can safely be
added.
Change-Id: I0da924bbd4c141edbf305598c1be8bc575654680
Glenn Kasten [Tue, 24 Jun 2014 22:06:56 +0000 (22:06 +0000)]
Merge "Use sp<> instead of raw pointer for FastMixer"
Glenn Kasten [Tue, 13 May 2014 17:39:51 +0000 (10:39 -0700)]
Use sp<> instead of raw pointer for FastMixer
This avoids worry about the thread lifetime during tear-down.
Bug:
15858655
Change-Id: I896d24317bd6f53a574645cdf4cd514eaa205dd5
Lajos Molnar [Tue, 24 Jun 2014 19:42:44 +0000 (19:42 +0000)]
am
32f212ea: (-s ours) am
87c47b0d: (-s ours) am
bc0c2c2d: (-s ours) Merge "DO NOT MERGE: Fix for SW video decoder OMX profile/level query"
* commit '
32f212ead657617df00c948448680b7ff7d11146':
DO NOT MERGE: Fix for SW video decoder OMX profile/level query
Mark Salyzyn [Tue, 24 Jun 2014 19:42:42 +0000 (19:42 +0000)]
am
76e4e02d: am
940c688d: Merge "libmediaplayerservice: unused argument warning messages"
* commit '
76e4e02d6b6c1da140b8cbe48fc58035d2b7d311':
libmediaplayerservice: unused argument warning messages
Lajos Molnar [Tue, 24 Jun 2014 19:35:30 +0000 (19:35 +0000)]
am
87c47b0d: (-s ours) am
bc0c2c2d: (-s ours) Merge "DO NOT MERGE: Fix for SW video decoder OMX profile/level query"
* commit '
87c47b0d1c2df3e8630eb1b78fe303cfb24b3ad5':
DO NOT MERGE: Fix for SW video decoder OMX profile/level query
Mark Salyzyn [Tue, 24 Jun 2014 19:35:26 +0000 (19:35 +0000)]
am
940c688d: Merge "libmediaplayerservice: unused argument warning messages"
* commit '
940c688d76828ffd83929c661e75b5197903d30f':
libmediaplayerservice: unused argument warning messages
Lajos Molnar [Tue, 24 Jun 2014 18:00:29 +0000 (18:00 +0000)]
am
bc0c2c2d: (-s ours) Merge "DO NOT MERGE: Fix for SW video decoder OMX profile/level query"
* commit '
bc0c2c2d2a4cc058ab404f940f0ca65f595e047b':
DO NOT MERGE: Fix for SW video decoder OMX profile/level query
Lajos Molnar [Tue, 24 Jun 2014 17:56:00 +0000 (17:56 +0000)]
Merge "DO NOT MERGE: Fix for SW video decoder OMX profile/level query"
Xiaosong Wei [Tue, 17 Dec 2013 15:05:29 +0000 (23:05 +0800)]
DO NOT MERGE: Fix for SW video decoder OMX profile/level query
get the correct profile index from the input param and pass it to
profileLevel array to get the corresponding profile/level
Change-Id: I582961c0afb53c1781af7fb94226a23e5fdb96cf
Signed-off-by: Xiaosong Wei <xiaosong.wei@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Marco Nelissen [Tue, 24 Jun 2014 18:16:13 +0000 (18:16 +0000)]
Merge "Improve MTP error checking"
Marco Nelissen [Tue, 24 Jun 2014 17:49:08 +0000 (10:49 -0700)]
Improve MTP error checking
Change-Id: I1ab02ca0e99a1c284411fb368a773fb481d72ab2
Mark Salyzyn [Tue, 24 Jun 2014 17:12:19 +0000 (17:12 +0000)]
Merge "libmediaplayerservice: unused argument warning messages"
Mark Salyzyn [Mon, 23 Jun 2014 21:14:40 +0000 (14:14 -0700)]
libmediaplayerservice: unused argument warning messages
Change-Id: I7dbf62858114ac9b8de6d7b66cc00e002769a5cf
Marco Nelissen [Mon, 23 Jun 2014 19:54:07 +0000 (19:54 +0000)]
am
620f348f: am
da69fdbb: Merge "Fix buffer allocation"
* commit '
620f348faf3ce0c39e71338a005f1528765f4d1e':
Fix buffer allocation
Marco Nelissen [Mon, 23 Jun 2014 19:48:55 +0000 (19:48 +0000)]
am
da69fdbb: Merge "Fix buffer allocation"
* commit '
da69fdbbeb79885a3c063a2017bd6d2848fcc312':
Fix buffer allocation
Zhijun He [Mon, 23 Jun 2014 22:04:11 +0000 (22:04 +0000)]
Merge "Camera: Clear ZSL buffer queue when jpeg size is changed"
Zhijun He [Mon, 23 Jun 2014 17:22:37 +0000 (10:22 -0700)]
Camera: Clear ZSL buffer queue when jpeg size is changed
Bug:
15284653
Change-Id: I4778e8443945d918801102ba600874568bde12dc
Marco Nelissen [Mon, 23 Jun 2014 18:11:53 +0000 (18:11 +0000)]
Merge "Parse trex and mehd boxes"
Marco Nelissen [Tue, 17 Jun 2014 21:48:32 +0000 (14:48 -0700)]
Parse trex and mehd boxes
Also get duration from mvhd if available, use that in addition to track
durations to determine total length of file, clear track header
struct so we don't read uninitialized garbage from it, and take
composition time offset into account for proper ordering when B frames
are used.
b/
15669839
Change-Id: Ibf3e35b5c7299bac11d0e78a391545fc325dd2d0
Andy Hung [Mon, 23 Jun 2014 16:44:53 +0000 (16:44 +0000)]
Merge "Add test-mixer AudioMixer test program"
Andy Hung [Tue, 17 Jun 2014 22:10:51 +0000 (15:10 -0700)]
Add test-mixer AudioMixer test program
The shell script mixer_to_wav_tests.sh shows how to use
test-mixer.
Change-Id: Ia7f1a368972c9c33fadc96df4cb1fc8b22446c8c
Yin-Chia Yeh [Wed, 18 Jun 2014 17:51:34 +0000 (10:51 -0700)]
Camera2: get stream configs by device verison
Starting from device version 3.2, the following tags:
ANDROID_SCALER_AVAILABLE_FORMATS
ANDROID_SCALER_AVAILABLE_JPEG_MIN_DURATIONS
ANDROID_SCALER_AVAILABLE_JPEG_SIZES
ANDROID_SCALER_AVAILABLE_PROCESSED_MIN_DURATIONS
ANDROID_SCALER_AVAILABLE_PROCESSED_SIZES
ANDROID_SCALER_AVAILABLE_RAW_MIN_DURATIONS
ANDROID_SCALER_AVAILABLE_RAW_SIZES
are deprecated and replaced by:
ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS
Change-Id: Iadc34af0ea985a16a25759d7a9a3eb4845c486fd
Marco Nelissen [Mon, 23 Jun 2014 18:23:22 +0000 (18:23 +0000)]
Merge "Fix buffer allocation"
Marco Nelissen [Mon, 23 Jun 2014 15:15:13 +0000 (08:15 -0700)]
Fix buffer allocation
b/
15293123
Change-Id: Icb3ceabf02a55bc931baaf388ce125db6332de0e
Mark Salyzyn [Fri, 20 Jun 2014 21:59:17 +0000 (21:59 +0000)]
Merge "libeffects: 64-bit compile warnings"
Mark Salyzyn [Fri, 20 Jun 2014 20:29:08 +0000 (13:29 -0700)]
libeffects: 64-bit compile warnings
Change-Id: I210129f5742b046f7ceef48194f039352eff596d
Eino-Ville Talvala [Fri, 20 Jun 2014 19:48:21 +0000 (19:48 +0000)]
am
06508824: am
f0d8468d: DO NOT MERGE: CameraService: Fix permissions check issues
* commit '
06508824dc699c566bc4ffbd816b2227fba15379':
DO NOT MERGE: CameraService: Fix permissions check issues
Yin-Chia Yeh [Fri, 20 Jun 2014 21:57:51 +0000 (21:57 +0000)]
Merge "Camera2: Fix lastFrameNumber counter in flush case"
Yin-Chia Yeh [Fri, 13 Jun 2014 21:53:05 +0000 (14:53 -0700)]
Camera2: Fix lastFrameNumber counter in flush case
Decrement the counter for those repeating requests never
sent to device.
Change-Id: I2064e51cb5d509d86dbde4a89e8157de33f574b0
Zhijun He [Fri, 20 Jun 2014 21:50:17 +0000 (21:50 +0000)]
Merge "Camera2/3: Don't release recording buffer when stream is active"
Mark Salyzyn [Wed, 18 Jun 2014 23:33:43 +0000 (16:33 -0700)]
libcameraservice: 64-bit compile warnings
Change-Id: I168332a0d4699f6f5597d4883342aa7af7ed92c6
Mark Salyzyn [Wed, 18 Jun 2014 23:33:15 +0000 (16:33 -0700)]
audiopolicy: 64-bit compile warnings
Change-Id: I71db11499c4b0c434df8144c633d42282f5823c2
Mark Salyzyn [Fri, 20 Jun 2014 21:32:59 +0000 (21:32 +0000)]
Merge "libnbaio: 64-bit compile warnings"
Mark Salyzyn [Fri, 20 Jun 2014 21:07:06 +0000 (21:07 +0000)]
Merge "libmediaplayerservice: 64-bit compile warnings"
Jeff Tinker [Fri, 20 Jun 2014 20:45:14 +0000 (20:45 +0000)]
Merge "Fix Externally reported security issue"
Eino-Ville Talvala [Fri, 20 Jun 2014 19:56:38 +0000 (19:56 +0000)]
am
7f76c502: (-s ours) am
06508824: am
f0d8468d: DO NOT MERGE: CameraService: Fix permissions check issues
* commit '
7f76c50257f131cb26c1c21ede2622cb7ad534bf':
DO NOT MERGE: CameraService: Fix permissions check issues
Mark Salyzyn [Wed, 18 Jun 2014 23:32:00 +0000 (16:32 -0700)]
libnbaio: 64-bit compile warnings
Change-Id: I9517c32193031dcc7af7b2104e985d66805b84aa
Mark Salyzyn [Wed, 18 Jun 2014 23:31:32 +0000 (16:31 -0700)]
libmediaplayerservice: 64-bit compile warnings
Change-Id: I333e52dc377becc774f3fa971c230ecb55ea8d7b
Jeff Tinker [Tue, 17 Jun 2014 23:45:46 +0000 (16:45 -0700)]
Fix Externally reported security issue
bug:
12724697
Change-Id: I57f37dbb3b01c0c3d3256be67c395352dd6ada13
Igor Murashkin [Fri, 20 Jun 2014 18:49:55 +0000 (18:49 +0000)]
Merge "camera: Let #connectLegacy calls through with unspecified HAL version"
Igor Murashkin [Fri, 20 Jun 2014 18:27:03 +0000 (11:27 -0700)]
camera: Let #connectLegacy calls through with unspecified HAL version
This enables the camera2 shim to open a camera1 device without
turning the error codes into a RuntimeException.
Change-Id: I08d9d1e30e72025c41bd54b702d7ae95b32257be
Andy Hung [Fri, 20 Jun 2014 16:22:28 +0000 (16:22 +0000)]
Merge "Extract out test utility functions from resampler_tests"
Mark Salyzyn [Wed, 18 Jun 2014 23:30:56 +0000 (16:30 -0700)]
libmedia: 64-bit compile warnings
Change-Id: I600f062fa7148c01851023c1240c39939e648002
Eino-Ville Talvala [Thu, 19 Jun 2014 23:33:15 +0000 (23:33 +0000)]
am
f0d8468d: DO NOT MERGE: CameraService: Fix permissions check issues
* commit '
f0d8468dcec08e1ac4edf62ec7da5782a0b84d93':
DO NOT MERGE: CameraService: Fix permissions check issues
Zhijun He [Thu, 19 Jun 2014 23:27:56 +0000 (23:27 +0000)]
Merge "cameraservice: Implement HAL1 and higher HAL API coexistence"
Zhijun He [Mon, 16 Jun 2014 23:38:35 +0000 (16:38 -0700)]
cameraservice: Implement HAL1 and higher HAL API coexistence
A higher hal version device like HAL3.2 can be opened as HAL1.0 device
if HAL supports it. This only applies to camera API1.
Change-Id: I4ae9f59f4317158cc1bd7ed7726e4032cdd1fa07
Mark Salyzyn [Wed, 18 Jun 2014 23:30:26 +0000 (16:30 -0700)]
screenrecord: 64-bit compile warnings
Change-Id: I708e48e24719b2c4bb023069164aafd4c2ad639b
Eric Laurent [Tue, 10 Jun 2014 00:22:27 +0000 (17:22 -0700)]
AudioTrack: add support for compressed audio
Add support for compressed audio playback by use
of an AudioTrack attached to a direct output thread.
Bug:
9428304.
Change-Id: I4a61be9cf0e31003ca85935d6e0ee38ca8192e03
Andy Hung [Tue, 17 Jun 2014 21:33:39 +0000 (14:33 -0700)]
Extract out test utility functions from resampler_tests
These will be used for mixer tests later.
Change-Id: I22b1c89857058cfb2450afe15e80d6c9306a31f1
Zhijun He [Wed, 18 Jun 2014 18:43:02 +0000 (11:43 -0700)]
Camera2/3: Don't release recording buffer when stream is active
It is dangerous to release all recording buffers when recording stream is
actively sending buffer to encoder. This change only releases all buffers when
recording stream is idle and recording stream is about to start.
Bug:
15667833
Change-Id: Ia4a84cac84a2062c13333467c66698273ffb0e23
Jean-Michel Trivi [Thu, 19 Jun 2014 15:33:55 +0000 (15:33 +0000)]
Merge changes I0fef0584,I322b91fa
* changes:
AudioPolicyManager: return output for audio attributes
AudioTrack construction with audio attributes
Jean-Michel Trivi [Fri, 13 Jun 2014 23:06:54 +0000 (16:06 -0700)]
AudioPolicyManager: return output for audio attributes
In AudioPolicyManager, support querying an output
or playback strategy for audio attributes,
instead of a stream type,
In AudioTrack creation, use the output returned
for the track's attributes.
Change-Id: I0fef05845ba676404775e2e338c10e6a96237268
Jean-Michel Trivi [Wed, 11 Jun 2014 23:55:06 +0000 (16:55 -0700)]
AudioTrack construction with audio attributes
Store audio attributes in AudioTrack class.
When an AudioTrack is "set" with non null audio
attributes, derive a stream type that reflects
the attributes.
When an AudioTrack is "set" without attributes,
and only has a stream type, derive default
audio attributes.
Change-Id: I322b91fa9a7e193118960c5e78cdddd85d66f9ad
Marco Nelissen [Wed, 18 Jun 2014 14:52:11 +0000 (14:52 +0000)]
Merge "Fail more gracefully on allocation failure"
Marco Nelissen [Fri, 13 Jun 2014 21:13:44 +0000 (14:13 -0700)]
Fail more gracefully on allocation failure
Check allocations when the size is read from a file and might therefore
be invalid.
b/
14388161
Change-Id: Ia08cc0a6107f275a70e793ef3b50c0ce16ceeee0
Igor Murashkin [Tue, 17 Jun 2014 22:55:54 +0000 (22:55 +0000)]
Merge "camera: Add #getLegacyParameters, #supportsCameraApi to ICameraService"
Igor Murashkin [Tue, 17 Jun 2014 19:03:20 +0000 (12:03 -0700)]
camera: Add #getLegacyParameters, #supportsCameraApi to ICameraService
Change-Id: Ic86c8df3d703e7cf89caa856387e2c0a1b977401
Eino-Ville Talvala [Tue, 17 Jun 2014 02:21:12 +0000 (19:21 -0700)]
CameraService: Fix permissions check issues
Bug:
15677063
Change-Id: I012c111fff90fefd9eb0fef7c9d6034f00c9c6df
Eino-Ville Talvala [Tue, 17 Jun 2014 02:21:12 +0000 (19:21 -0700)]
DO NOT MERGE: CameraService: Fix permissions check issues
Bug:
15677063
Change-Id: I012c111fff90fefd9eb0fef7c9d6034f00c9c6df
Marco Nelissen [Mon, 16 Jun 2014 22:10:47 +0000 (22:10 +0000)]
Merge "Fix logging"
Glenn Kasten [Mon, 16 Jun 2014 21:57:26 +0000 (21:57 +0000)]
am
a3603693: Merge "Fix deadlock" into lmp-preview-dev
* commit '
a3603693fb784d7e1a820ee4629a69730a0bb424':
Fix deadlock
Glenn Kasten [Mon, 16 Jun 2014 21:52:27 +0000 (21:52 +0000)]
Merge "Fix deadlock" into lmp-preview-dev
Glenn Kasten [Mon, 16 Jun 2014 17:25:20 +0000 (10:25 -0700)]
Fix deadlock
Bug:
15591052
Change-Id: I76154e1640646d2ae8fae65e163e1f3ed1be17dc
Ruben Brunk [Mon, 16 Jun 2014 20:41:38 +0000 (20:41 +0000)]
Merge "camera2: Add jpeg sizes to legacy mode static characteristics."
Chong Zhang [Mon, 16 Jun 2014 18:13:39 +0000 (18:13 +0000)]
Merge "support for CEA-608 closed caption"
Marco Nelissen [Tue, 10 Jun 2014 21:24:40 +0000 (14:24 -0700)]
Fix logging
Make the log message specify whether it was an encoder or a decoder
that failed to instantiate.
Change-Id: Ie357775114c8dea722d87381c13affdfb19dcde4
Chong Zhang [Wed, 11 Jun 2014 21:49:23 +0000 (14:49 -0700)]
support for CEA-608 closed caption
Bug:
15470448
Change-Id: Ic6a527f5c35a8ee0a08a5b043336e4d193216083
Chong Zhang [Wed, 11 Jun 2014 21:45:31 +0000 (14:45 -0700)]
refactor getTrackInfo()
(this is in preparation for supporting other cc source)
- split into two methods: getTrackCount() and getTrackInfo()
- move track info parcelling to NuPlayer
- parcel in the mime type of the subtitle format
Bug:
15470448
Change-Id: If00724d8c3a2b2319cb9c5f29d3fe76347bfe947
Eric Laurent [Fri, 13 Jun 2014 01:38:45 +0000 (18:38 -0700)]
force command flush after releasing a reference to shared memory
After releasing a reference to a shared memory interface,
IPCThreadState::self()->flushCommands() must be called to ensure
that the corresponding reference is also cleared immediately in the
remote process. Otherwise the binder implementaiton will not
push the clear systematically causing the memory region not to be freed.
See issues
10711502 and
2801375.
Bug:
14057166.
Change-Id: If55f36f00d452d6cf00cf83bd2fba1c8f3abcb57
Elliott Hughes [Fri, 13 Jun 2014 15:38:03 +0000 (15:38 +0000)]
am
6bf02664: am
ccaffa8d: Merge "Use char x[] rather than char x[0]."
* commit '
6bf02664bbe4955d4818fe308b00ce0d97f38c8f':
Use char x[] rather than char x[0].
Elliott Hughes [Fri, 13 Jun 2014 15:34:16 +0000 (15:34 +0000)]
am
ccaffa8d: Merge "Use char x[] rather than char x[0]."
* commit '
ccaffa8df0e201da6bfabb6d616e62904cfb5534':
Use char x[] rather than char x[0].