summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Fix buildSelim Gurun2014-05-071-2/+2
| | | | | | Fix the java reflection to have the devices boot again. Change-Id: Ibd24b1e43e5c8385aa9372f8e22133b6eb85cd2b
* Merge "Add a class for managing Session priority"RoboErik2014-05-073-52/+57
|\
| * Add a class for managing Session priorityRoboErik2014-05-063-52/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Priority is given first to the system priorty session, then to active local sessions, then to active remote sessions, then to the rest of the sessions. Ordering within categories is by whoever last performed an action we associate with the user. The stack has methods for getting filtered sets of this priority. This also: -Changes publish to setActive(boolean) -Adds a flag for handling media buttons. -Adds a flag for transport controls instead of enabling once. -Unhides the setFlags API. -Updates the legacy helper to use the flags. Change-Id: I6ebeb27410de1b24149fd6e1785613ac444f0774
* | Merge "Add APIs for creating a system priority session and getting controllers"RoboErik2014-05-075-12/+61
|\ \ | |/
| * Add APIs for creating a system priority session and getting controllersRoboErik2014-05-065-12/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | This adds a hidden call to set flags and a flag for making a session an exclusive high priority session. This will cause all media button events to be sent to that session as long as it is stillr egistered. This requires the MODIFY_PHONE_STATE permission like the old forCalls API. This also adds a way to get controllers for all the ongoing sessions. This is protected by the MEDIA_CONTENT_CONTROL permission like the old RemoteController APIs. Change-Id: I51540e8dcf3a7dbe02a0f8ee003821e40af653a3
* | Add AudioFormat.ENCODING_PCM_FLOATGlenn Kasten2014-05-061-1/+3
| | | | | | | | Change-Id: I030d2c74224ac8573a4d30d980ae94fa4e280aeb
* | Add AudioFormat.getBytesPerSample and use itGlenn Kasten2014-05-064-4/+21
|/ | | | Change-Id: I90a40987ea99006af4a6e31136078c04976eb54d
* Merge "Add playback state and metadata to dump"RoboErik2014-05-022-0/+23
|\
| * Add playback state and metadata to dumpRoboErik2014-05-012-0/+23
| | | | | | | | Change-Id: I813ff23c496f75776c8bd63f78bbe87683b19bc0
* | Merge "MediaHTTPConnection: support header android-allow-cross-domain-redirect"Lajos Molnar2014-05-021-12/+97
|\ \ | |/ |/|
| * MediaHTTPConnection: support header android-allow-cross-domain-redirectLajos Molnar2014-04-291-12/+97
| | | | | | | | | | | | | | | | | | | | | | | | If present and set to false, media http redirects across domains will not be followed. As long as domains are identical, redirects across protocols or ports will still be followed. Also fail more seriously if redirection fails or is not supported, so that media client does not keep retrying the connection. Bug: 12573548 Change-Id: Ifd2539ad3a90f669d43bd0e82845dbc8ae0b4a3e
* | Fix sdk buildRoboErik2014-05-011-2/+1
| | | | | | | | | | | | Missed a doc tag. Change-Id: Ic02c5fe83a28055bde544434c7b9f3e0c7060191
* | Merge "Bounds Check in onPlaySoundEffect"Natalie Silvanovich2014-05-011-0/+5
|\ \
| * | Bounds Check in onPlaySoundEffectNatalie Silvanovich2014-05-011-0/+5
| | | | | | | | | | | | | | | | | | | | | Prevents system crash Bug: 13514877 Change-Id: Id03561779611d9eb7402ff206fd877b39bb2f035
* | | Merge "Add Session API calls to RCC and AudioManager"RoboErik2014-05-017-73/+598
|\ \ \
| * | | Add Session API calls to RCC and AudioManagerRoboErik2014-05-017-73/+598
| | | | | | | | | | | | | | | | | | | | This makes RCC and MediaButtonReceiver (via AudioManager) also use the new Session APIs in parallel to their existing code. This will allow us to bring up the Session compatibility pieces without disrupting the old behavior and then switch everything over to just using the new APIs when ready. Change-Id: I33ce0a044dea3ec763f2302b91a5e415be27d4a4
* | | | Merge "Add dump to MediaSessionService"RoboErik2014-05-012-0/+18
|\ \ \ \ | |_|/ / |/| | |
| * | | Add dump to MediaSessionServiceRoboErik2014-04-292-0/+18
| |/ / | | | | | | | | | | | | | | | | | | Adds a dump implementation for debugging MediaSessionService. Also fixes some synchronize calls that weren't using the same lock object. Change-Id: I14343f853398749c8ce7ebf91f72729abc9132d9
* | | am 4375e848: am ab962b54: am ab3977d2: Merge "MetadataRetriever: Check null ↵Marco Nelissen2014-05-011-0/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | pointer to avoid tombstone crash." * commit '4375e84882a9a84b0012cf9504a30ede6ef72c1f': MetadataRetriever: Check null pointer to avoid tombstone crash.
| * \ \ am ab962b54: am ab3977d2: Merge "MetadataRetriever: Check null pointer to ↵Marco Nelissen2014-05-011-0/+7
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | avoid tombstone crash." * commit 'ab962b54e3eac4ffadb5ea4e4948df10e6201468': MetadataRetriever: Check null pointer to avoid tombstone crash.
| | * \ \ am ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombstone ↵Marco Nelissen2014-05-011-0/+7
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | crash." * commit 'ab3977d21161815c130bdedf21e2571382d208da': MetadataRetriever: Check null pointer to avoid tombstone crash.
| | | * \ \ Merge "MetadataRetriever: Check null pointer to avoid tombstone crash."Marco Nelissen2014-05-011-0/+7
| | | |\ \ \
| | | | * | | MetadataRetriever: Check null pointer to avoid tombstone crash.wang, biao2014-04-091-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the app's vm-heap is not enough, memory allocation for big object like bitmap may failed. This patch add protection for bitmap creating to avoid segment fault error in the following GetIntField function. Change-Id: I63977dc602f4ed395afd11004a0ed027173fb685 Signed-off-by: wang, biao <biao.wang@intel.com> Signed-off-by: TingX Li <tingx.li@intel.com> Signed-off-by: Wang LiangX <liangx.wang@intel.com>
* | | | | | | Merge "Fix MediaFocusControl index management for PlayerRecord"Jean-Michel Trivi2014-04-301-7/+13
|\ \ \ \ \ \ \
| * | | | | | | Fix MediaFocusControl index management for PlayerRecordJean-Michel Trivi2014-04-301-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When updating the PlayerRecord stack on playstate changes and media button event receiver registrations, evaluate the index of the stack entry to remove against the index of the last playing entry as this index was valid before the entry was removed. This affects the insertion index. Change-Id: Iec58d2df6bcbd8f55925e9e0f9d48f698f7cf4e5
* | | | | | | | am 21ccb07f: am 414d9405: am 56cd8dbf: Merge "Cast CallVoidMethod\'s size_t ↵Narayan Kamath2014-04-301-1/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | / | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | parameters to jint" * commit '21ccb07fbe97097b6540097d89dd456447779178': Cast CallVoidMethod's size_t parameters to jint
| * | | | | | am 414d9405: am 56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to ↵Narayan Kamath2014-04-301-1/+1
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jint" * commit '414d94059f3559b67b4da25a34de6d5312abe06f': Cast CallVoidMethod's size_t parameters to jint
| | * | | | | am 56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to jint"Narayan Kamath2014-04-301-1/+1
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | * commit '56cd8dbfbdeebc36ccbd5b2beedaaaa3f13c8b07': Cast CallVoidMethod's size_t parameters to jint
| | | * | | | Merge "Cast CallVoidMethod's size_t parameters to jint"Narayan Kamath2014-04-301-1/+1
| | | |\ \ \ \
| | | | * | | | Cast CallVoidMethod's size_t parameters to jintAshok Bhat2014-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | offset and size variables are passed to set method of MediaCodec.BufferInfo java class. The corresponding actual parameters of set method are of int type in java. These variables are expected to fit in jint as they indicate the offset and size of data in a media codec buffer. The variables are cast to jint, prior to passing to java method, to avoid problems caused by automatic type promotion of parameters when passed to a variadic function, CallVoidMethod. Change-Id: I39e202306f1b7122448c947f6d275f00251bb33a Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
| | * | | | | | Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEADBill Yi2014-04-299-72/+131
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | am a3dc076d: am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger."Glenn Kasten2014-03-191-1/+0
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a3dc076d2dda77d8891fcd83f6f4056d15bbf2fc': mediaeditor shouldn't depend on audioflinger.
| | | * \ \ \ \ \ am 0dc08486: am f7b33e86: Merge "MediaPlayer: fix int overflow issue in ↵Lajos Molnar2014-03-191-1/+1
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaTimeProvider" into klp-dev * commit '0dc084865313a416246915c72b29c13cc3f404d4': MediaPlayer: fix int overflow issue in MediaTimeProvider
| | | * \ \ \ \ \ \ am 105c4792: am 10a07a04: Merge "Verify certificates" into klp-devMarco Nelissen2014-03-142-0/+46
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '105c47924f7af9319ec9242b952b4bf074585229': Verify certificates
| | | * \ \ \ \ \ \ \ am bdd4c31a: am 60d7c995: Merge "DO NOT MERGE setAvrcpAbsoluteVolume is ↵Zhihai Xu2014-03-141-1/+1
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | passed wrong unit parameter from AudioManager" into klp-dev * commit 'bdd4c31a22b9a5395e9d727e9f39ce1dc689c0a7': DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager
| | | * \ \ \ \ \ \ \ \ am 51ec4ec5: am 5de03b18: Merge "Don\'t assume that size_t is 32-bit"Narayan Kamath2014-03-111-3/+3
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '51ec4ec51f88d854b182547405e37f3ae74c35bd': Don't assume that size_t is 32-bit
| | | * \ \ \ \ \ \ \ \ \ am 6ac6263d: am 28ccb4f7: Merge "Don\'t use size_t for variables that store ↵Narayan Kamath2014-03-111-3/+3
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uint32_t value" * commit '6ac6263dcc55a4a93647cc1307c901a01c06d89c': Don't use size_t for variables that store uint32_t value
| | | * \ \ \ \ \ \ \ \ \ \ am ac875878: am 9823a170: Merge "Make MtpDatabase use libexif instead of ↵Marco Nelissen2014-03-082-34/+46
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libjhead" into klp-dev * commit 'ac87587875f1dfade5e06a82ccc009d0f0170569': Make MtpDatabase use libexif instead of libjhead
| | | * \ \ \ \ \ \ \ \ \ \ \ am 233e7e9f: am 98a6bcf4: Merge "ExifInterface: fix class load failure" into ↵Marco Nelissen2014-03-071-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev * commit '233e7e9f64be5e85196dd959824bce9a69b2fd99': ExifInterface: fix class load failure
| | | * \ \ \ \ \ \ \ \ \ \ \ \ am 4f36104f: am e29c96e7: Merge "libexif is now libjhead" into klp-devMarco Nelissen2014-03-071-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4f36104f06755dc2c95b3d7c8bac5312d7572199': libexif is now libjhead
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aosp" into ↵Leon Scroggins III2014-03-071-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev-plus-aosp
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aospLeon Scroggins III2014-03-061-2/+2
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If2855ff4f7a1e7645c69af378955868f44187376
| | | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code"Narayan Kamath2014-03-071-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | / / / / | | | | | |_|_|_|_|_|_|_|_|_|/ / / / | | | | |/| | | | | | | | | | | | | * commit '860bba68a1d65534ce6aec6ba8c0b0a736b18ccc': Fix in MediaMuxer's JNI code
| | | * | | | | | | | | | | | | | | am 5901ddeb: am 0a1b64fe: Merge "Release locked buffer when it fails to ↵Zhijun He2014-03-071-0/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | acquire graphics buffer" * commit '5901ddeb525ed7691c382e8d17f47055d7d1e5db': Release locked buffer when it fails to acquire graphics buffer
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am eac19754: am 617e715a: Merge "Fix RemoteController synchronization mode" ↵Eric Laurent2014-03-061-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit 'eac19754ca0822e4c1c50c436affbf5cbf7e08d3': Fix RemoteController synchronization mode
* | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Add CHANNEL_OUT_QUAD_SIDE and CHANNEL_OUT_5POINT1_SIDE"Glenn Kasten2014-04-291-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Add CHANNEL_OUT_QUAD_SIDE and CHANNEL_OUT_5POINT1_SIDEGlenn Kasten2014-04-151-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6d5ff001ee55399a67380a4f63b037f367b93b1f
* | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of 3ce4f3d0 to masterElliott Hughes2014-04-281-4/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id5c5997ad8f801b32e1dbd97413ea42e38c27210
| * | | | | | | | | | | | | | | | | | | am 685a0a72: am bbd87eb9: Merge "Track libcore.os\' move to android.system."Elliott Hughes2014-04-281-4/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '685a0a72d445515167a2071330679cdf9b53a62d': Track libcore.os' move to android.system.
| | * | | | | | | | | | | | | | | | | | Track libcore.os' move to android.system.Elliott Hughes2014-04-281-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (This is partial, but should cover everything in AOSP master except for the zygote.) Change-Id: I1042c99245765746a744c44e714095cb2c6cb75d
generated by cgit v1.1 at 2025-01-26 20:26:36 +0000