git.osdn.net Git - android-x86/frameworks-av.git/log

(root) / android-x86 / frameworks-av.git / log

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

commit | commitdiff | tree

Marco Nelissen [Mon, 16 Jun 2014 22:10:47 +0000 (22:10 +0000)]

Merge "Fix logging"

commit | commitdiff | tree

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

commit | commitdiff | tree

Glenn Kasten [Mon, 16 Jun 2014 21:52:27 +0000 (21:52 +0000)]

Merge "Fix deadlock" into lmp-preview-dev

commit | commitdiff | tree

Glenn Kasten [Mon, 16 Jun 2014 17:25:20 +0000 (10:25 -0700)]

Fix deadlock

Bug: 15591052
Change-Id: I76154e1640646d2ae8fae65e163e1f3ed1be17dc

commit | commitdiff | tree

Ruben Brunk [Mon, 16 Jun 2014 20:41:38 +0000 (20:41 +0000)]

Merge "camera2: Add jpeg sizes to legacy mode static characteristics."

commit | commitdiff | tree

Chong Zhang [Mon, 16 Jun 2014 18:13:39 +0000 (18:13 +0000)]

Merge "support for CEA-608 closed caption"

commit | commitdiff | tree

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

commit | commitdiff | tree

Chong Zhang [Wed, 11 Jun 2014 21:49:23 +0000 (14:49 -0700)]

support for CEA-608 closed caption

Bug: 15470448

Change-Id: Ic6a527f5c35a8ee0a08a5b043336e4d193216083

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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].

commit | commitdiff | tree

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].

commit | commitdiff | tree

Narayan Kamath [Fri, 13 Jun 2014 10:32:15 +0000 (10:32 +0000)]

am ba7a4e11: am 90732a3b: Merge "Remove dependency on Parcel::{read,write}IntPtr"

* commit 'ba7a4e11a66a7044dbbd767983865e1774092dc6':
Remove dependency on Parcel::{read,write}IntPtr

commit | commitdiff | tree

Narayan Kamath [Fri, 13 Jun 2014 10:32:14 +0000 (10:32 +0000)]

am 8b8e5d45: (-s ours) resolved conflicts for merge of cbd74fcb to klp-modular-dev-plus-aosp

* commit '8b8e5d45928aed8592d321fe55f560e35a4fece8':
Update OMX messages for 64 bit

commit | commitdiff | tree

Narayan Kamath [Fri, 13 Jun 2014 10:22:28 +0000 (10:22 +0000)]

am 90732a3b: Merge "Remove dependency on Parcel::{read,write}IntPtr"

* commit '90732a3be5e70156486aca94bde8aa81106329ba':
Remove dependency on Parcel::{read,write}IntPtr

commit | commitdiff | tree

Narayan Kamath [Fri, 13 Jun 2014 10:19:14 +0000 (11:19 +0100)]

resolved conflicts for merge of cbd74fcb to klp-modular-dev-plus-aosp

Change-Id: I00270ef6fe813c0d3649483cbc3aba6af789e033

commit | commitdiff | tree

Ruben Brunk [Fri, 13 Jun 2014 02:11:45 +0000 (19:11 -0700)]

camera2: Add jpeg sizes to legacy mode static characteristics.

Bug: 15116722

- Adds jpeg size mapping to available output formats.

Change-Id: I73e46dd4309767ba41156d9ba03c4724bf234758

commit | commitdiff | tree

Elliott Hughes [Fri, 13 Jun 2014 15:27:25 +0000 (15:27 +0000)]

Merge "Use char x[] rather than char x[0]."

commit | commitdiff | tree

Elliott Hughes [Fri, 13 Jun 2014 01:17:11 +0000 (18:17 -0700)]

Use char x[] rather than char x[0].

Bug: 15514223
Change-Id: I895ea8ef7e391fd14cdf8976e048385e01c90f8f

commit | commitdiff | tree

Chong Zhang [Mon, 16 Jun 2014 18:11:22 +0000 (18:11 +0000)]

Merge "refactor getTrackInfo()"

commit | commitdiff | tree

Bryant Liu [Thu, 12 Jun 2014 14:02:41 +0000 (22:02 +0800)]

frameworks: av: fix bug in the volume management

which can cause volume levels to be applied twice. After applying volume
in the effect chain, the remaining volume needs to be converted back to
floating point before providing to mAudioMixer.

Bug: 15583440
Change-Id: I3c884f95b0fa9ad1b554285b069601c850c54776
Signed-off-by: Glenn Kasten <gkasten@google.com>

commit | commitdiff | tree

Jean-Michel Trivi [Fri, 13 Jun 2014 21:37:58 +0000 (21:37 +0000)]

Merge "AudioSystem: remove unused stream type"

commit | commitdiff | tree

Eric Laurent [Fri, 13 Jun 2014 19:20:41 +0000 (19:20 +0000)]

am 3bcffa13: force command flush after releasing a reference to shared memory

* commit '3bcffa136909c1fb6e88ee4efd12ccac18360a85':
force command flush after releasing a reference to shared memory

commit | commitdiff | tree

Elliott Hughes [Thu, 12 Jun 2014 00:15:39 +0000 (00:15 +0000)]

am 2a8270e6: am c323737d: Merge "Offer a type-safe album art interface."

* commit '2a8270e6944fb3addfcba87f6885aaad196b8b88':
Offer a type-safe album art interface.

commit | commitdiff | tree

Elliott Hughes [Thu, 12 Jun 2014 00:06:25 +0000 (00:06 +0000)]

am c323737d: Merge "Offer a type-safe album art interface."

* commit 'c323737dd46d724b4c1ec230b283f26ae2a22b4f':
Offer a type-safe album art interface.

commit | commitdiff | tree

Glenn Kasten [Thu, 12 Jun 2014 00:03:41 +0000 (00:03 +0000)]

am 0ac53364: Merge "Fix non-monotonic AudioTrack::getTimestamp after pause" into lmp-preview-dev

* commit '0ac53364b79dc72ee0c09f0efc46a22ab4374dbf':
Fix non-monotonic AudioTrack::getTimestamp after pause

commit | commitdiff | tree

Andy Hung [Thu, 12 Jun 2014 00:03:35 +0000 (00:03 +0000)]

am 421c34ef: Merge "Update resampler to fetch exactly the frames needed" into lmp-preview-dev

* commit '421c34ef58f89f4cc39737118bb58b762e84e1c9':
Update resampler to fetch exactly the frames needed

commit | commitdiff | tree

Christopher Ferris [Wed, 11 Jun 2014 19:20:18 +0000 (12:20 -0700)]

resolved conflicts for merge of 281b884c to master

Change-Id: If8924939bdf54d3a9e6a4876a05d0672c27cf8ef

commit | commitdiff | tree

Jean-Michel Trivi [Wed, 11 Jun 2014 17:05:30 +0000 (10:05 -0700)]

AudioSystem: remove unused stream type

The audio stream type is not used in the getSampleRate() and
getFrameCount() methods.

Change-Id: I3d065ae272bd039204cd323cdab9b60460034f2d

commit | commitdiff | tree

Narayan Kamath [Fri, 13 Jun 2014 08:55:13 +0000 (08:55 +0000)]

Merge "Update OMX messages for 64 bit"

commit | commitdiff | tree

Andy Hung [Fri, 2 May 2014 18:05:04 +0000 (11:05 -0700)]

Update OMX messages for 64 bit

Change node_id and buffer_id to uint32_t.
Ensure IOMX messages are fixed size.
Remove 64 bit compile warnings in associated files.

Change-Id: Icdbef00aca575e5dc502ebb52e3ce7d0d7883203
Signed-off-by: Andy Hung <hunga@google.com>

commit | commitdiff | tree

Elliott Hughes [Wed, 11 Jun 2014 23:59:18 +0000 (23:59 +0000)]

Merge "Offer a type-safe album art interface."

commit | commitdiff | tree

Elliott Hughes [Tue, 10 Jun 2014 23:55:38 +0000 (16:55 -0700)]

Offer a type-safe album art interface.

Bug: 15514223
Change-Id: Iddfc33a00e6cd3779ca09c01a55f62b151f6ec95

commit | commitdiff | tree

Christopher Ferris [Tue, 10 Jun 2014 23:46:41 +0000 (23:46 +0000)]

am 8d6d8f54: Merge "Add libcrypto for users of libstagefright."

* commit '8d6d8f546c1d6c55b79b454c720c03a80c738444':
Add libcrypto for users of libstagefright.

commit | commitdiff | tree

Christopher Ferris [Tue, 10 Jun 2014 23:42:20 +0000 (23:42 +0000)]

Merge "Add libcrypto for users of libstagefright."

commit | commitdiff | tree

Christopher Ferris [Tue, 10 Jun 2014 22:15:04 +0000 (15:15 -0700)]

Add libcrypto for users of libstagefright.

libstagefright_rtsp uses some MD5 functions that used to be in bionic,
but it was removed recently. As an initial fix, I statically linked in
libcrypto_static to the libstagefright_rtsp library. However, I think
it's better to modify the single user of this library to link against
the shared libcrypto library.

Change-Id: Iaf2e1aeea32fd8af038f6e77bf58ea7df50d807a

commit | commitdiff | tree

Chong Zhang [Wed, 11 Jun 2014 18:26:07 +0000 (18:26 +0000)]

Merge "Log an error when audio/video encoder failed to create"

commit | commitdiff | tree

Mark Salyzyn [Wed, 11 Jun 2014 18:18:54 +0000 (18:18 +0000)]

am dd80baf5: am 1f15b117: Merge "libcamera_client: 64-bit compile issue"

* commit 'dd80baf5413e3fb5ce5e1282ce9c0badd0b081f1':
libcamera_client: 64-bit compile issue

commit | commitdiff | tree

Chong Zhang [Wed, 11 Jun 2014 17:27:28 +0000 (10:27 -0700)]

Log an error when audio/video encoder failed to create

Change-Id: I493981cddeb9452c533e2917d8c440897d5e6b49
related-to-bug: 15106730

commit | commitdiff | tree

Ruben Brunk [Wed, 11 Jun 2014 17:03:20 +0000 (17:03 +0000)]

am 42092d70: (-s ours) Merge "DO NOT MERGE: camera2: Disallow connectDevice for all old HALs." into lmp-preview-dev

* commit '42092d7015b078a09c36de107d924fc8139ccf50':
DO NOT MERGE: camera2: Disallow connectDevice for all old HALs.

commit | commitdiff | tree

Yin-Chia Yeh [Wed, 11 Jun 2014 17:03:13 +0000 (17:03 +0000)]

am 3416f9ac: Merge "Camera2: Add null check to createStream" into lmp-preview-dev

* commit '3416f9ac471f97e9544ee821a97a101cbdd25b11':
Camera2: Add null check to createStream

commit | commitdiff | tree

Wei Jia [Wed, 11 Jun 2014 17:02:47 +0000 (17:02 +0000)]

am 8756d415: Merge "Added paused state to NuPlayerDecoder" into lmp-preview-dev

* commit '8756d415b6c31ec72caf912910248fa7ab709d25':
Added paused state to NuPlayerDecoder

commit | commitdiff | tree

Marco Nelissen [Wed, 11 Jun 2014 17:02:40 +0000 (17:02 +0000)]

am d7e8d9a7: Guard against malformed files

* commit 'd7e8d9a7393b5429f8f13a6794b9b04d37390fb5':
Guard against malformed files

commit | commitdiff | tree

Ruben Brunk [Wed, 11 Jun 2014 00:09:41 +0000 (00:09 +0000)]

Merge "DO NOT MERGE: camera2: Disallow connectDevice for all old HALs." into lmp-preview-dev

commit | commitdiff | tree

Glenn Kasten [Wed, 11 Jun 2014 17:10:46 +0000 (17:10 +0000)]

Merge "Fix non-monotonic AudioTrack::getTimestamp after pause" into lmp-preview-dev

commit | commitdiff | tree

Glenn Kasten [Tue, 10 Jun 2014 00:12:32 +0000 (17:12 -0700)]

Fix non-monotonic AudioTrack::getTimestamp after pause

Bug: 15523502
Change-Id: Ifd4aa7fca197bc041c1620fc3f7d953a8902551a

commit | commitdiff | tree

Andy Hung [Wed, 11 Jun 2014 16:59:03 +0000 (16:59 +0000)]

Merge "Update resampler to fetch exactly the frames needed" into lmp-preview-dev

commit | commitdiff | tree

Andy Hung [Tue, 3 Jun 2014 01:54:08 +0000 (18:54 -0700)]

Update resampler to fetch exactly the frames needed

This avoids unnecessary overfetching/releasing, which
could cause problems with the upstream AudioBufferProvider.
A one input sample delay is placed on the stream compared
with the previous implementation.

This change only affects the Dynamic resampler.

Bug: 15548547
Change-Id: Ic7fcff130e0081b4724cfb5a00dc8e8b4a8b1af3
(cherry picked from commit 717007429a50c02d2acc704a8c1ebbe6760a2c22)

commit | commitdiff | tree

Yin-Chia Yeh [Wed, 11 Jun 2014 00:04:28 +0000 (00:04 +0000)]

Merge "Camera2: Add null check to createStream" into lmp-preview-dev

commit | commitdiff | tree

Yin-Chia Yeh [Tue, 10 Jun 2014 23:05:44 +0000 (16:05 -0700)]

Camera2: Add null check to createStream

Prevent a native null dereference crash.

bug: 15332257
Change-Id: I10c4053a0b4f07fbf52c37dd2f2853b501def669

commit | commitdiff | tree

Wei Jia [Tue, 10 Jun 2014 23:07:46 +0000 (23:07 +0000)]

Merge "Added paused state to NuPlayerDecoder" into lmp-preview-dev

commit | commitdiff | tree

Zhijun He [Wed, 11 Jun 2014 22:52:23 +0000 (22:52 +0000)]

Merge "Camera3: Separate the video and preview size filtering"

commit | commitdiff | tree

Jeff Tinker [Wed, 11 Jun 2014 22:42:18 +0000 (22:42 +0000)]

Merge "Remove dependency on Parcel::{read,write}IntPtr"

commit | commitdiff | tree

Christopher Ferris [Wed, 11 Jun 2014 20:49:48 +0000 (20:49 +0000)]

am ca44dc79: am 8d6d8f54: Merge "Add libcrypto for users of libstagefright."

* commit 'ca44dc79b5a163030ab0963f80aa771871de092d':
Add libcrypto for users of libstagefright.

commit | commitdiff | tree

Eric Laurent [Tue, 10 Jun 2014 22:48:36 +0000 (22:48 +0000)]

Merge "audio policy: use factory to create audio policy manager"

commit | commitdiff | tree

Zhijun He [Wed, 11 Jun 2014 20:38:02 +0000 (20:38 +0000)]

Merge "MediaProfiles: Add 4K video related constants"

commit | commitdiff | tree

Zhijun He [Tue, 10 Jun 2014 15:26:33 +0000 (08:26 -0700)]

MediaProfiles: Add 4K video related constants

Bug: 15287656
Change-Id: I4c49640a349afb336f52db1636902fc216bff6ad

commit | commitdiff | tree

Marco Nelissen [Thu, 5 Jun 2014 17:37:26 +0000 (10:37 -0700)]

Guard against malformed files

b/15433074

Change-Id: I35363def42d38eba49dd5aece566fd345743937e

commit | commitdiff | tree

Narayan Kamath [Fri, 13 Jun 2014 09:26:30 +0000 (09:26 +0000)]

Merge "Remove dependency on Parcel::{read,write}IntPtr"

commit | commitdiff | tree

Jeff Tinker [Mon, 9 Jun 2014 22:51:38 +0000 (15:51 -0700)]

Remove dependency on Parcel::{read,write}IntPtr

bug: 15424960
bug: 15107693

(cherry picked from commit bcca9e072c1f288a53ce6862936f57dc36488f96)

Change-Id: I3ba59fccb184e99a07f6f82ccdbd00e5204901f6

commit | commitdiff | tree

Jeff Tinker [Mon, 9 Jun 2014 22:51:38 +0000 (15:51 -0700)]

Remove dependency on Parcel::{read,write}IntPtr

bug: 15424960
bug: 15107693

Change-Id: Ic3bf37f591e620985c37f345f9a5544fd20ec4a1

commit | commitdiff | tree

Ruben Brunk [Tue, 10 Jun 2014 19:56:42 +0000 (12:56 -0700)]

DO NOT MERGE: camera2: Disallow connectDevice for all old HALs.

(preview only)

Bug: 15515564

Change-Id: I14ab73b130ee5355d9cc8b3602738022a5a18710

commit | commitdiff | tree

Eric Laurent [Tue, 10 Jun 2014 03:01:29 +0000 (20:01 -0700)]

audio policy: use factory to create audio policy manager

Use the class factory to create the audio policy mamager
instead of AudioPolicyManager class constructor and
use a pointer to an AudioPolicyInterface.

Change-Id: Ibb5a8eee5d597db67cf13f279c909181cfee9949

commit | commitdiff | tree

Wei Jia [Wed, 4 Jun 2014 23:21:56 +0000 (16:21 -0700)]

Added paused state to NuPlayerDecoder

This prevents decoder from requesting new buffer until the decoder
is resumed, and prevents processing a potential DISCONTINUITY while
the player is still flushing.

Bug: 13133027

Change-Id: I2f9fa9f00c8583aa6908809cb7c31ddde07cfaf0
(cherry picked from commit 704e72658b1082264a26a83c50046da34f07d1a1)

commit | commitdiff | tree

Adam Lesinski [Tue, 10 Jun 2014 18:41:50 +0000 (18:41 +0000)]

am 4299a7c2: am 940f8be3: Merge "Implement a NoOp DrmManagerClientImpl when no DRM service exists" into klp-modular-dev

* commit '4299a7c2b049b07b3456a81a4c2b1030523c08ca':
Implement a NoOp DrmManagerClientImpl when no DRM service exists

commit | commitdiff | tree

Marco Nelissen [Tue, 10 Jun 2014 17:47:16 +0000 (17:47 +0000)]

Merge "Remove unneeded code"

commit | commitdiff | tree

Marco Nelissen [Fri, 6 Jun 2014 21:36:23 +0000 (14:36 -0700)]

Remove unneeded code

Change-Id: I33c7424f1858e9f3f7f7ab5fb46db09c2714e02e

commit | commitdiff | tree

Eric Laurent [Tue, 10 Jun 2014 17:22:13 +0000 (17:22 +0000)]

am d8754e07: (-s ours) DO NOT MERGE - AudioFlinger: increase per client memory pool

* commit 'd8754e07e23eecb68068c0c392aeb0428c529e4e':
DO NOT MERGE - AudioFlinger: increase per client memory pool

commit | commitdiff | tree

Zhijun He [Wed, 28 May 2014 21:57:54 +0000 (14:57 -0700)]

Camera3: Separate the video and preview size filtering

Supported video sizes were generated from supported preview sizes, which
effectively filtered out sizes larger than 1080p. This change filters the
supported video sizes based on the media profiles supported h.264 max video
frame width and height.

Bug: 15287656

Change-Id: Ifbd9d37fb775371e2a4ee5cf80abbf83a75ffd65

commit | commitdiff | tree

Christopher Ferris [Tue, 10 Jun 2014 03:11:18 +0000 (03:11 +0000)]

am d3af4265: Merge "Link libcrypto for MD5_* functions."

* commit 'd3af4265dca4c8ebcead5376f1c73a5dafc34778':
Link libcrypto for MD5_* functions.

commit | commitdiff | tree

Christopher Ferris [Tue, 10 Jun 2014 03:03:50 +0000 (03:03 +0000)]

Merge "Link libcrypto for MD5_* functions."

commit | commitdiff | tree

Christopher Ferris [Tue, 10 Jun 2014 02:35:17 +0000 (19:35 -0700)]

Link libcrypto for MD5_* functions.

Change-Id: I5dce8f041b9faf035161b82d5e46bd46166bd05c

commit | commitdiff | tree

Eric Laurent [Tue, 10 Jun 2014 02:18:54 +0000 (02:18 +0000)]

Merge "sound trigger: stop recognition on sound model unload"

commit | commitdiff | tree

Eric Laurent [Tue, 10 Jun 2014 00:31:51 +0000 (17:31 -0700)]

DO NOT MERGE - AudioFlinger: increase per client memory pool

Temporary workaround for issue 14057166 allowing
AudioTracks from a given client to use up to 4MB
of shared memory.

Bug: 14057166.
Change-Id: I19adb8d424ed170df61c1cd706be3d10788edfc1

commit | commitdiff | tree

Mark Salyzyn [Mon, 9 Jun 2014 23:34:58 +0000 (16:34 -0700)]

libcamera_client: 64-bit compile issue (part deux)

- %p print warning message
- size_t print warning messages
- unused parameter warning messages

Change-Id: I5de3564b27c65fe1a27c0bcc18ac1b72fca040e2

commit | commitdiff | tree

Mark Salyzyn [Mon, 9 Jun 2014 23:41:55 +0000 (23:41 +0000)]

am 1f15b117: Merge "libcamera_client: 64-bit compile issue"

* commit '1f15b117db93c664de935be7a369878a5bc78bb9':
libcamera_client: 64-bit compile issue

commit | commitdiff | tree

Mark Salyzyn [Mon, 9 Jun 2014 23:36:17 +0000 (23:36 +0000)]

Merge "libcamera_client: 64-bit compile issue"

commit | commitdiff | tree

Mark Salyzyn [Mon, 9 Jun 2014 23:28:21 +0000 (16:28 -0700)]

libcamera_client: 64-bit compile issue

- size_t print format
- some unused parameter warning messages

Change-Id: I2c0f50dda7e810f3f60603fd9d8c62c5b8767528

commit | commitdiff | tree

Eric Laurent [Mon, 9 Jun 2014 23:20:05 +0000 (16:20 -0700)]

sound trigger: stop recognition on sound model unload

Force a stop recognition command to the HAL when
unloading a sound model and recognition is still active.

Change-Id: I7379a64a37bbc3eeea08e0e1d59e427de9544a10

commit | commitdiff | tree

Adam Lesinski [Mon, 9 Jun 2014 21:12:44 +0000 (21:12 +0000)]

am 940f8be3: Merge "Implement a NoOp DrmManagerClientImpl when no DRM service exists" into klp-modular-dev

* commit '940f8be3619cecda66dad33f995904795df88c2d':
Implement a NoOp DrmManagerClientImpl when no DRM service exists

commit | commitdiff | tree

Andy Hung [Mon, 9 Jun 2014 17:57:29 +0000 (17:57 +0000)]

Merge "Add tests directory for AudioFlinger"

commit | commitdiff | tree

Eric Laurent [Sun, 8 Jun 2014 21:14:17 +0000 (14:14 -0700)]

audio policy service: fix potential deadlock in destructor

In the AudioCommandThread loop, release mLock before releasing
the strong reference on the service as AudioPolicyService destructor
calls AudioCommandThread::exit() which acquires mLock.

Also check exiPending in thread loop before processing pending
commands or sleeping.

Bug: 15449050.

Change-Id: I148bf21bd67ef721b5b5ee2c1a6afb185c59daa3

commit | commitdiff | tree

Eric Laurent [Sat, 7 Jun 2014 10:01:16 +0000 (10:01 +0000)]

am 318cd78e: Merge "audio policy: added audio HAL version in audio_policy.conf" into lmp-preview-dev

* commit '318cd78e3b8503113919191b3711eb8be5d23d35':
audio policy: added audio HAL version in audio_policy.conf

commit | commitdiff | tree

Lajos Molnar [Sat, 7 Jun 2014 03:05:27 +0000 (20:05 -0700)]

add back HEVC SoftOMX decoder

Bug: 14571712
Change-Id: Iea399e0cfec1f78584c74089f01821d8552ced40

commit | commitdiff | tree

Lajos Molnar [Sat, 7 Jun 2014 00:11:02 +0000 (17:11 -0700)]

Remove SoftOMX HEVC decoder

Bug: 14571712
Change-Id: Ie3fb3743ec27a0cfdea612052ba15a06f2c891db

commit | commitdiff | tree

Eric Laurent [Sat, 7 Jun 2014 00:01:42 +0000 (00:01 +0000)]

Merge "audio policy: added audio HAL version in audio_policy.conf" into lmp-preview-dev

commit | commitdiff | tree

Lajos Molnar [Fri, 6 Jun 2014 23:03:30 +0000 (23:03 +0000)]

am 8a454611: Merge "stagefright: added support, and SoftOMX decoder, for HEVC" into lmp-preview-dev

* commit '8a45461198c69e9e15f133c2e11ded47fc4c708b':
stagefright: added support, and SoftOMX decoder, for HEVC

commit | commitdiff | tree

Eric Laurent [Fri, 6 Jun 2014 21:56:52 +0000 (14:56 -0700)]

audio policy: added audio HAL version in audio_policy.conf

Each hardware module section in audio_policy.conf indicates
the audio HAL version it implements.

Also added a template audio_policy.conf file with examples
of device and gain descriptors added for audio HAL version3.0.

Bug: 14815883.
Change-Id: Id219d121f81f687363f6c18f2d1684b2448dcdf4

commit | commitdiff | tree

Lajos Molnar [Fri, 6 Jun 2014 22:59:08 +0000 (22:59 +0000)]

Merge "stagefright: added support, and SoftOMX decoder, for HEVC" into lmp-preview-dev

commit | commitdiff | tree

Harish Mahendrakar [Tue, 20 May 2014 16:30:59 +0000 (09:30 -0700)]

stagefright: added support, and SoftOMX decoder, for HEVC

also fixed QuerySupportedProfileLevels in
SoftVideoDecoderOMXComponent.cpp

Bug: 14571712
Change-Id: Ifa3793f7c1b18ac5e8c0a096848c998cabd9e777

commit | commitdiff | tree

Marco Nelissen [Fri, 6 Jun 2014 21:37:32 +0000 (21:37 +0000)]

Merge "Guard against malformed files"

commit | commitdiff | tree

Chong Zhang [Fri, 6 Jun 2014 21:34:32 +0000 (21:34 +0000)]

Merge "do not drop TS packet on discontinuity at payload start"

commit | commitdiff | tree

Adam Lesinski [Fri, 6 Jun 2014 21:13:00 +0000 (21:13 +0000)]

Merge "Implement a NoOp DrmManagerClientImpl when no DRM service exists" into klp-modular-dev

commit | commitdiff | tree

Adam Lesinski [Wed, 4 Jun 2014 22:14:03 +0000 (15:14 -0700)]

Implement a NoOp DrmManagerClientImpl when no DRM service exists

Change-Id: Ib06f429102a51c540c8132f3397130328279e03a