summaryrefslogtreecommitdiffstats
path: root/media/libmedia
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Fix for security vulnerability in media serverJeff Tinker2015-08-271-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 23540426 Change-Id: Ifb12ac3350410a49ba7d81d1bde12822c3008cd5
* | | | | | | | am 608c349d: am 4e861bf5: am e1dc15ec: am 762c7139: am b04cfdf5: am ↵Nick Kralevich2015-08-271-0/+2
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d437c777: am 0981df6e: IMediaPlayer.cpp: make sure structures are initialized to 0 * commit '608c349d611e03e0143c23c3f77ddc62b137e354': IMediaPlayer.cpp: make sure structures are initialized to 0
| * | | | | | | am 4e861bf5: am e1dc15ec: am 762c7139: am b04cfdf5: am d437c777: am ↵Nick Kralevich2015-08-271-0/+2
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0981df6e: IMediaPlayer.cpp: make sure structures are initialized to 0 * commit '4e861bf5d43eae00ae4cb8727c5a408c3728288b': IMediaPlayer.cpp: make sure structures are initialized to 0
| | * | | | | | am 762c7139: am b04cfdf5: am d437c777: am 0981df6e: IMediaPlayer.cpp: make ↵Nick Kralevich2015-08-271-0/+2
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sure structures are initialized to 0 * commit '762c713900bd764570c8fda4e238497200da66d6': IMediaPlayer.cpp: make sure structures are initialized to 0
| | | * | | | | am d437c777: am 0981df6e: IMediaPlayer.cpp: make sure structures are ↵Nick Kralevich2015-08-271-0/+2
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initialized to 0 * commit 'd437c77716fcf454d99b8424bb01f37643b970cc': IMediaPlayer.cpp: make sure structures are initialized to 0
| | | | * | | | am 0981df6e: IMediaPlayer.cpp: make sure structures are initialized to 0Nick Kralevich2015-08-271-0/+2
| | | | |\ \ \ \ | | | | | | |/ / | | | | | |/| | | | | | | | | | | | | | | | | | * commit '0981df6e3db106bfb7a56a2b668c012fcc34dd2c': IMediaPlayer.cpp: make sure structures are initialized to 0
| | | | | * | | IMediaPlayer.cpp: make sure structures are initialized to 0Nick Kralevich2015-08-271-0/+2
| | | | | | |/ | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Credit https://code.google.com/p/android/issues/detail?id=183310 Bug: 23515142 Change-Id: Idbd66fb148bd0ac1dd78f8651d0164f2a41e2427 (cherry picked from commit b73b826cc16291b33649402497efbe0f946413bd)
| | | | * | | am 8de6d690: Fix build break DO NOT MERGEJeff Tinker2015-08-211-1/+1
| | | | |\ \ \ | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | * commit '8de6d690ae5843bd8e005deedea571596f79bbd3': Fix build break DO NOT MERGE
| | | | | * | Fix build break DO NOT MERGEJeff Tinker2015-08-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | related-to-bug: 23223325 Change-Id: I7b09712b5f18912abddd50b75f6edaf860e894c1
| | | | * | | am c2153d0d: DO NOT MERGE Part of fix for libmedia OOB write anywhereJeff Tinker2015-08-211-3/+3
| | | | |\ \ \ | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | * commit 'c2153d0dc800d0718788dccd0f2a2d29f4647c03': DO NOT MERGE Part of fix for libmedia OOB write anywhere
| | | | | * | DO NOT MERGE Part of fix for libmedia OOB write anywhereJeff Tinker2015-08-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify that decrypt destination is not a pointer for secure case. b/23223325 Change-Id: I642dcf790a9eb9e32175f3e0d8f040c82228e3ac (cherry picked from commit ed555d70d80964f40563d89a4e6d6a80f83f4b89)
| | | | * | | am dbe6c320: HDCP: buffer over flow check -- DO NOT MERGEChong Zhang2015-05-141-2/+24
| | | | |\ \ \ | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | * commit 'dbe6c320b414d8139c46aaf880d5f154ef4f9af8': HDCP: buffer over flow check -- DO NOT MERGE
| | | | | * | HDCP: buffer over flow check -- DO NOT MERGEChong Zhang2015-05-141-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 20222489 Change-Id: I3a64a5999d68ea243d187f12ec7717b7f26d93a3 (cherry picked from commit 532cd7b86a5fdc7b9a30a45d8ae2d16ef7660a72)
| * | | | | | am 0ea1da27: am 5f126c0d: am e93a33a8: am 8cc71bc8: Merge "DO NOT MERGE Part ↵Abhishek Arya2015-08-211-3/+3
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of fix for libmedia OOB write anywhere" into lmp-dev * commit '0ea1da27437575f6b075860fa858a257c806d5ef': DO NOT MERGE Part of fix for libmedia OOB write anywhere
| | * | | | | am e93a33a8: am 8cc71bc8: Merge "DO NOT MERGE Part of fix for libmedia OOB ↵Abhishek Arya2015-08-211-3/+3
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | write anywhere" into lmp-dev * commit 'e93a33a8f2706d3918634d17c33491f69060a62c': DO NOT MERGE Part of fix for libmedia OOB write anywhere
| | | * | | | DO NOT MERGE Part of fix for libmedia OOB write anywhereJeff Tinker2015-08-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify that decrypt destination is not a pointer for secure case. b/23223325 Change-Id: I642dcf790a9eb9e32175f3e0d8f040c82228e3ac (cherry picked from commit ed555d70d80964f40563d89a4e6d6a80f83f4b89)
| | | * | | | DO NOT MERGE - IAudioFlinger: add checks on binder callsEric Laurent2015-08-131-10/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit number of ports and patches listed by LIST_AUDIO_PATCHES and LIST_AUDIO_PORTS. Also fix typo causing wrong pointer to be used when writing to Parcel. Bug: 19573085. Change-Id: I41a9c710e45738a4f11990160587856c429a4646 (cherry picked from commit f75c2fef14354024ec27bff1444f9e50b5ef55a9)
| * | | | | | am f311db04: am 2517d62a: Merge "DO NOT MERGE - IAudioFlinger: add checks on ↵Eric Laurent2015-08-131-10/+36
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | binder calls" into lmp-mr1-dev * commit 'f311db04e72f66cb5b31d44e8780a1fcb88b3cdd': DO NOT MERGE - IAudioFlinger: add checks on binder calls
| | * | | | | Merge "DO NOT MERGE - IAudioFlinger: add checks on binder calls" into ↵Eric Laurent2015-08-131-10/+36
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| | | * | | | | DO NOT MERGE - IAudioFlinger: add checks on binder callsEric Laurent2015-04-171-10/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit number of ports and patches listed by LIST_AUDIO_PATCHES and LIST_AUDIO_PORTS. Also fix typo causing wring pointer to be used when writing to Parcel. Bug: 19573085. Change-Id: I41a9c710e45738a4f11990160587856c429a4646
| * | | | | | | am a6e9dd94: am 270caf9a: am 23d41fb1: am 2a9ccb66: am fd3a6e71: HDCP: ↵Chong Zhang2015-05-141-2/+24
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | buffer over flow check -- DO NOT MERGE * commit 'a6e9dd941a3055526f6e967017e91a76c153087a': HDCP: buffer over flow check -- DO NOT MERGE
| | * | | | | | am 2a9ccb66: am fd3a6e71: HDCP: buffer over flow check -- DO NOT MERGEChong Zhang2015-05-141-2/+24
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | * commit '2a9ccb66c052d16e870d2db1fa6edb9a39f6526b': HDCP: buffer over flow check -- DO NOT MERGE
| | | * | | | | HDCP: buffer over flow check -- DO NOT MERGEChong Zhang2015-05-141-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 20222489 Change-Id: I3a64a5999d68ea243d187f12ec7717b7f26d93a3 (cherry picked from commit 532cd7b86a5fdc7b9a30a45d8ae2d16ef7660a72)
* | | | | | | | libmedia: clear reply data for IEffect commandAndy Hung2015-08-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23540907 Change-Id: Ib89afc6b273b0eb310bbc5a1bd92b1e3d407c249
* | | | | | | | Merge "Part of fix for libmedia OOB write anywhere" into mnc-devJeff Tinker2015-08-191-3/+3
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Part of fix for libmedia OOB write anywhereJeff Tinker2015-08-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify that decrypt destination is not a pointer for secure case. b/23223325 Change-Id: I642dcf790a9eb9e32175f3e0d8f040c82228e3ac
* | | | | | | | NuPlayerRenderer: handle error when resuming an offloaded trackEric Laurent2015-08-121-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that an offloaded audio track is torn down if start() returns an error in onResume(). This makes sure that a track invalidated due to a potential audio path change while paused is re created on the correct output. Bug: 22256441. Change-Id: I6c7bfec6e7322415daffc0451bab46d0c558522a
* | | | | | | Merge "Explicitly disconnect in MediaPlayer::reset" into mnc-devRobert Shih2015-07-241-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Explicitly disconnect in MediaPlayer::resetRobert Shih2015-07-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even without calling disconnect in MediaPlayer::reset, MediaPlayerService::Client (which lives on the other side of a binder with MediaPlayer) would still perform a disconnect in its destructor. Object destruction across binder is not synchronous, but method calls are. This commit merely makes sure that the disconnect happens deterministically before reset returns. Bug: 22451733 Change-Id: Id9146a63a1872d68087a252aa614248b16d2556d
* | | | | | | | Merge "Fix restore position warning and static track adjustment" into mnc-devAndy Hung2015-07-241-9/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix restore position warning and static track adjustmentAndy Hung2015-07-241-9/+9
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary restoreTrack_l() position warning when AudioTrack output device changes. Also, fix rare getPosition() offset error if a static track is continuously playing a long time (> 24 hours at 48khz sampling) and its output device changes. Bug: 22524122 Bug: 21699132 Change-Id: I5a35c13d62ff9f0702b09d5cd9362c730364b18c
* | | | | | | | Fix race condition in AudioTrackThread::wakeAndy Hung2015-07-221-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22533684 Change-Id: I2f46770dca44fc9dae41e067d3bec893c42a826e
* | | | | | | | Fix race condition in AudioRecordThread::wakeAndy Hung2015-07-221-4/+8
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22533684 Change-Id: Iba73d633b088dbc84159ed692019da39cc8e2233
* | | | | | | Merge "mediaresourcemanager: add pid to removeResource method" into mnc-devRonghua Wu2015-07-181-2/+4
|\ \ \ \ \ \ \
| * | | | | | | mediaresourcemanager: add pid to removeResource methodRonghua Wu2015-07-171-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22496209 Change-Id: I73311573e8d1ac15fec668a9ef6e6af7a07a1d30
* | | | | | | | Fix buildGlenn Kasten2015-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I18b63d68d452c4ee7544ff1614f4e3f57f5a9e73
* | | | | | | | Merge "Fix AudioTrack flush pointer wrap" into mnc-devAndy Hung2015-07-171-1/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix AudioTrack flush pointer wrapAndy Hung2015-07-161-1/+13
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Occurs when read offset / write offset span the power of 2 mask boundary. Bug: 22513776 Change-Id: If863577dac6666e8b2083d78f78fe9b9490fcf76
* | | | | | | | mediaplayer: fix audio attributes override by stream typeEric Laurent2015-07-151-9/+14
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that when audio attributes are set, the stream type is always derived from them. Bug: 22481669. Change-Id: Ia10c7017eb27e7753faf97a42dd4f44e15f2c986
* | | | | | | audio: several fixes in audio routing callbacksEric Laurent2015-07-101-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - audio policy: Force device change to ensure new audio patch creation upon first track activity on a given output. Fix function device_distinguishes_on_address() which could mistake some output device with remote submix input device. - audio flinger: Reduce number of binder calls upon new client registration by only sending ioConfigChanged() callbacks to newly registered client. Fix first patch after output thread creation not triggering an ioConfigChanged() callback. -audio system: Force client registration upon routing callback installation to force new ioConfigChanged() callback from audio flinger. Bug: 22381136. Change-Id: Ieb0d9f92f563a40552eb31bc0499c8ac65f78ce4
* | | | | | | reduce number of binder calls from mediaserverEric Laurent2015-06-262-9/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce the number of audio port, audio patch and IO config changed binder calls from mediaserver to client processes: - Do not call IO config changed callback if selected device is the same as previously selected one on a given audio flinger playback or capture thread. - Do not call the audio port or audo patch list update callback on a client if this client as no listener registered. Bug: 22045560. Change-Id: If780e105404de79b7cb5c80c27b793ceb6b1c423
* | | | | | | Merge "Using centralized isAudioPlaybackRateValid to validate parameters" ↵Ricardo Garcia2015-06-231-12/+20
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev
| * | | | | | | Using centralized isAudioPlaybackRateValid to validate parametersRicardo Garcia2015-06-221-12/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Centralized validation code bug: 20701446 Change-Id: I9d9941c7639c05b2afe069ff4f858c693c910bfe
* | | | | | | | Merge "Fix for Visualizer release bug" into mnc-devRicardo Garcia2015-06-221-8/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix for Visualizer release bugRicardo Garcia2015-06-191-8/+4
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting callback reference to NULL before requesting exit. bug: 21804802 Change-Id: I54323959686880f4e7a10b766850f8c86c06edb6
* | | | | | | | Merge "Check binder transact status" into mnc-devJeff Tinker2015-06-191-30/+124
|\ \ \ \ \ \ \ \
| * | | | | | | | Check binder transact statusJeff Tinker2015-06-161-30/+124
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If mediaserver restarts, the binder transact methods return DEAD_OBJECT. This status wasn't being checked, so calls would proceed with unpredictable results. bug: 20614102 Change-Id: I11271974ef2ccf0129529d1f67204dff1f1d03b0
* | | | | | | | Merge "Return DEAD_OBJECT if getTimestamp cannot restore track" into mnc-devAndy Hung2015-06-191-1/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Return DEAD_OBJECT if getTimestamp cannot restore trackAndy Hung2015-06-181-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21699132 Change-Id: I90443f8674ed949e2546048b231be75cd6fe6615
* | | | | | | | | Merge "Fix AudioTrack comments relating to use of restoreTrack_l()" into mnc-devAndy Hung2015-06-181-4/+8
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
generated by cgit v1.1 at 2024-05-18 12:17:04 +0000