summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Merge "MediaSync: address API review." into mnc-devWei Jia2015-05-0812-283/+277
|\
| * MediaSync: address API review.Wei Jia2015-05-0812-283/+277
| | | | | | | | | | | | | | | | Rename *Settings to *Params; Remove size parameter from MediaSync.queueAudio(); Bug: 20887706 Change-Id: I4c572da92ada51458031a482b96b3f624224e608
* | Merge "media: merge CodecException's getErrorCode and getReason." into mnc-devRonghua Wu2015-05-082-37/+35
|\ \
| * | media: merge CodecException's getErrorCode and getReason.Ronghua Wu2015-05-082-37/+35
| | | | | | | | | | | | | | | | | | | | | And unhide getErrorCode. Bug: 20950388 Change-Id: I19c5ddaadfcdd446777e341f73edb75ca184d32f
* | | Merge "BluetoothMidiDevice: Cleanup and error handling improvements" into ↵Mike Lockwood2015-05-081-15/+19
|\ \ \ | | | | | | | | | | | | mnc-dev
| * | | BluetoothMidiDevice: Cleanup and error handling improvementsMike Lockwood2015-05-071-15/+19
| | | | | | | | | | | | | | | | Change-Id: I8b932f73e0230adfe576d1fc6735bd7b41e84010
* | | | Merge "AudioManager: add previous AudioPort list" into mnc-devEric Laurent2015-05-082-11/+53
|\ \ \ \ | |_|/ / |/| | |
| * | | AudioManager: add previous AudioPort listEric Laurent2015-05-082-11/+53
| | |/ | |/| | | | | | | | | | | | | | | | | | | Maintain a cache of previously attached audio ports used to create lists of added and removed devices following a port list update callback. Change-Id: Iad1c95b85c8ae9bdbed79eb0cdc46aeedeafccea
* | | MediaPlayer: pause media time when bufferingChong Zhang2015-05-071-1/+20
| | | | | | | | | | | | | | | bug: 20500732 Change-Id: Ife7f75f5cc587af56451c85ea8adbdc380f38348
* | | Merge "MidiManager: Improve output of "dumpsys midi"" into mnc-devMike Lockwood2015-05-072-2/+4
|\ \ \ | | |/ | |/|
| * | MidiManager: Improve output of "dumpsys midi"Mike Lockwood2015-05-072-2/+4
| |/ | | | | | | | | | | | | - Include each device's port status from MidiDeviceStatus - MidiDeviceInfo.toString() now outputs all the names and values in the properties Bundle Change-Id: Ic9329153e4ae4d5619e274d27a420943473377e5
* | Fix clang warnings on unused variable, mismatched tag, print format.Chih-Hung Hsieh2015-05-071-1/+1
|/ | | | | BUG: 20890093 Change-Id: I91588f481d80b69823bc9d104b8bd09167ee5373
* Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS.Jeff Brown2015-05-061-1/+1
| | | | | Bug: 20641986 Change-Id: I137dfc7ef41bdda2ce3e81c164767319c88159f1
* Revert "Initial draft of new MediaRouter APIs."Jeff Brown2015-05-0620-3748/+0
| | | | | | | This reverts commit 1a937b04e63539cb1fab1bde601031d415c7156f. Bug: 20641986 Change-Id: I035d945d1561e5fc7c914aa9362635f763c83cfd
* Merge "Implement audio routing callbacks" into mnc-devEric Laurent2015-05-068-37/+146
|\
| * Implement audio routing callbacksEric Laurent2015-05-068-37/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement JNI for AudioTrack and AudioRecord routing callbacks: - Added files core/jni/android_media_DeviceCallback.cpp/.h for JNI callback implementation used by both AudioTrack and AudioRecord. - Made AudioManager AudioPort and AudioPatch methods static in order to call them without context. Also added IO handle information to AudioMixPort. Change-Id: Icee182aa68310d4b12fd1469f48e78110889acf1
* | Merge "Clarify wording of MediaCrypto exception "ERROR_NO_KEY"" into mnc-devJeff Tinker2015-05-061-3/+3
|\ \
| * | Clarify wording of MediaCrypto exception "ERROR_NO_KEY"Jeff Tinker2015-05-051-3/+3
| | | | | | | | | | | | | | | related-to-bug: 20857014 Change-Id: I13204528ec44cda76a721f4d9f6021c1435921ac
* | | TIF: Make all the parameters for UNRATED nullJae Seo2015-05-053-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UNRATED is equivalent to Java null in its meaning and usage, thus it is not appropriate to use non-trivial strings such as "com.android.tv" and "UNRATED" to create this constant. Replaced them with the string "null", which is commonly used in other parts of Android and also modified the documentation to clarify its usage. Bug: 19102311 Change-Id: I28ac8da3584eb2cc6dfd7284e2b88873fd4e9d13
* | | media: Added MPEG2 profile/levels and testsHarish Mahendrakar2015-05-054-5/+101
| | | | | | | | | | | | | | | Bug: 20852831 Change-Id: I172f2f08c30d12bf684f32a52db64823cc286d35
* | | Merge changes from topic 'mwd-merge-050415' into mnc-devPrerepa Viswanadham2015-05-052-28/+135
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Merge commit 'b6f59f4' into master_merge Merge commit 'f6db0ce' into master_merge Merge commit '17455a3' into master_merge Merge commit 'b4d5b32' into master_merge Merge commit 'a1a2fa7' into master_merge Merge commit '8dfdb98' into master_merge Merge commit 'eba66c3' into master_merge
| * \ \ am 4816ebe8: am e8a8440d: am f1207122: Merge "MediaPlayer: provide mime type ↵Robert Shih2015-05-011-10/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for all track types" into mnc-dev * commit '4816ebe8c2f312bca44d95abdfec0dba137c4fd4': MediaPlayer: provide mime type for all track types
| | * \ \ am e8a8440d: am f1207122: Merge "MediaPlayer: provide mime type for all ↵Robert Shih2015-05-011-10/+5
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | track types" into mnc-dev * commit 'e8a8440d70222750ad9b8563cbc80ca5c563b9c1': MediaPlayer: provide mime type for all track types
| * | \ \ \ am 0486d03d: am 607dab36: am 05ebffe6: media: Hook up MediaPlayer and ↵Lajos Molnar2015-05-016-133/+283
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaSync to new settings * commit '0486d03dc0c843f31852afc2812c934f10aeb21e': media: Hook up MediaPlayer and MediaSync to new settings
| | * | | | am 607dab36: am 05ebffe6: media: Hook up MediaPlayer and MediaSync to new ↵Lajos Molnar2015-05-016-133/+283
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | settings * commit '607dab369580d8510f42b1a796ee623eaf4b2adf': media: Hook up MediaPlayer and MediaSync to new settings
| * | \ \ \ \ am 0385dc8d: am 1d8aae3b: am db672b03: Merge "Change how Java Bitmaps are ↵John Reck2015-05-011-4/+5
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | accessed in a few places" into mnc-dev * commit '0385dc8d12088d98ab76de86db4cd8e1ffa34af7': Change how Java Bitmaps are accessed in a few places
| | * | | | | am 1d8aae3b: am db672b03: Merge "Change how Java Bitmaps are accessed in a ↵John Reck2015-04-301-4/+5
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | few places" into mnc-dev * commit '1d8aae3b1924b2340250bdffe491819a26eea5fe': Change how Java Bitmaps are accessed in a few places
| | * \ \ \ \ \ am f7de1bc8: am 2757fed2: Merge "Clarifying which receiver method to call." ↵Glenn Kasten2015-04-301-0/+4
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev * commit 'f7de1bc8f11aeb133bc916f020c6c6bb5eb859bf': Clarifying which receiver method to call.
| * | \ \ \ \ \ \ Merge "Clarifying which receiver method to call."Peter Brinkmann2015-04-301-0/+4
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Clarifying which receiver method to call.Peter Brinkmann2015-04-301-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iaf89e1ff27e257fd25c54e189e8fcd1b10e8edfc
| * | | | | | | | | am c8efc449: am 3d42d238: am f764d219: Merge "AudioService receives callback ↵Jean-Michel Trivi2015-04-305-4/+113
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for dynamic policy mix state changes" into mnc-dev * commit 'c8efc4490df6fb58bf333540cf746c68070345f5': AudioService receives callback for dynamic policy mix state changes
| | * | | | | | | | am 3d42d238: am f764d219: Merge "AudioService receives callback for dynamic ↵Jean-Michel Trivi2015-04-305-4/+113
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | policy mix state changes" into mnc-dev * commit '3d42d2380f5af53ce299610e27f40a8d88930c89': AudioService receives callback for dynamic policy mix state changes
| * | \ \ \ \ \ \ \ \ am 5054f906: am c98070a4: am 1b12db9e: Merge "media: set codec exception ↵Ronghua Wu2015-04-301-2/+2
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reason." into mnc-dev * commit '5054f906170f343312a299ec9e72aefb2ac24b7a': media: set codec exception reason.
| | * | | | | | | | | am c98070a4: am 1b12db9e: Merge "media: set codec exception reason." into ↵Ronghua Wu2015-04-301-2/+2
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev * commit 'c98070a46168c14e54899bfca69889154e3a565d': media: set codec exception reason.
| * | \ \ \ \ \ \ \ \ \ am 426a0c33: am f388c9e6: am f3d3856f: Merge "Check for null codec from ↵Andy Hung2015-04-301-4/+5
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AMediaCodec_createDecoderByType" into mnc-dev * commit '426a0c3358099b909f72a34e04af4b0758d28b21': Check for null codec from AMediaCodec_createDecoderByType
| | * | | | | | | | | | am f388c9e6: am f3d3856f: Merge "Check for null codec from ↵Andy Hung2015-04-301-4/+5
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AMediaCodec_createDecoderByType" into mnc-dev * commit 'f388c9e654781c26debe53a0eecce5b6d9234373': Check for null codec from AMediaCodec_createDecoderByType
| * | \ \ \ \ \ \ \ \ \ \ am edcf5e1e: am f17dd0b4: am 1afdbe3b: Merge "Pass PlaybackSettings as class ↵Andy Hung2015-04-301-30/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | object for AudioTrack JNI" into mnc-dev * commit 'edcf5e1e05b7c258665476a75af8440b12050ace': Pass PlaybackSettings as class object for AudioTrack JNI
| | * | | | | | | | | | | am f17dd0b4: am 1afdbe3b: Merge "Pass PlaybackSettings as class object for ↵Andy Hung2015-04-301-30/+4
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioTrack JNI" into mnc-dev * commit 'f17dd0b48c894fda00b1d2068ef54b05221b1d7a': Pass PlaybackSettings as class object for AudioTrack JNI
| * | \ \ \ \ \ \ \ \ \ \ \ am 62b4cbce: am bcec6a49: am e1d00395: Merge "MidiDeviceInfo: Add version ↵Mike Lockwood2015-04-291-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | string property" into mnc-dev * commit '62b4cbceb33dc657cfaee2971ad6bc3d1aab3fbb': MidiDeviceInfo: Add version string property
| | * | | | | | | | | | | | am bcec6a49: am e1d00395: Merge "MidiDeviceInfo: Add version string ↵Mike Lockwood2015-04-291-0/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | property" into mnc-dev * commit 'bcec6a4980366f10182c8dc09ec1eff6f78d7043': MidiDeviceInfo: Add version string property
| * | \ \ \ \ \ \ \ \ \ \ \ \ am 0dbaba6c: am 5e47c802: am 56867804: Merge "Respect the record audio app ↵Svet Ganov2015-04-298-22/+92
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | op - framework" into mnc-dev * commit '0dbaba6c3a7ae0a45e2305a21b0ef5decbde59a4': Respect the record audio app op - framework
| | * | | | | | | | | | | | | am 5e47c802: am 56867804: Merge "Respect the record audio app op - ↵Svet Ganov2015-04-298-22/+92
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | framework" into mnc-dev * commit '5e47c802ef1ac9437b012bc70701ffaf048cb399': Respect the record audio app op - framework
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ am 23e46a4e: am 2d67b288: am 8dbcda1b: Merge "Volume: Simple dialog footer, ↵John Spurlock2015-04-291-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DND in quick settings." into mnc-dev * commit '23e46a4e8d9405e24169a0bb38ff6dc5b8d99ff2': Volume: Simple dialog footer, DND in quick settings.
| | * | | | | | | | | | | | | | am 2d67b288: am 8dbcda1b: Merge "Volume: Simple dialog footer, DND in quick ↵John Spurlock2015-04-291-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | settings." into mnc-dev * commit '2d67b2887c0a279aa182646f0e23b176783a1aca': Volume: Simple dialog footer, DND in quick settings.
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d3fad391: am 633a45a0: am 25466e0a: Merge "TIF: throw an exception if an ↵Dongwon Kang2015-04-291-5/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | operation takes too long." into mnc-dev * commit 'd3fad391e1ccc79fbd0b9330f2aab60bf5b2075b': TIF: throw an exception if an operation takes too long.
| | * | | | | | | | | | | | | | | am 633a45a0: am 25466e0a: Merge "TIF: throw an exception if an operation ↵Dongwon Kang2015-04-291-5/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | takes too long." into mnc-dev * commit '633a45a0d4e095ae81fc2c3e882c23a6513bbaee': TIF: throw an exception if an operation takes too long.
| * | | | | | | | | | | | | | | | Merge "TIF: Put comments for the newly added US and Canadian rating strings"Jae Seo2015-04-291-0/+87
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | TIF: Put comments for the newly added US and Canadian rating stringsJae Seo2015-03-171-0/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18433516 Change-Id: Iff7a100edd82cc4195239cac8d6ac7b8fed4b8b5
| * | | | | | | | | | | | | | | | resolved conflicts for merge of 375e21f8 to mnc-dev-plus-aospMarco Nelissen2015-04-281-28/+48
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5681890381beed09e8719b066d0c37accae1658d
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Sometimes the application context is null"Marco Nelissen2015-04-281-35/+55
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-01-07 05:18:40 +0000