summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Fix 64 bit long pointer size for media scanningAndy Hung2014-05-191-1/+1
| | | | | Bug: 14993718 Change-Id: I98989caddcca67c2b3257cead948382fddb066da
* Merge "Implements TtmlRenderer."Sungsoo Lim2014-05-161-0/+751
|\
| * Implements TtmlRenderer.Sungsoo Lim2014-05-141-0/+751
| | | | | | | | Change-Id: I99772745c5c005ee1eefbc29187116f0c2820988
* | Merge "Add UserRecords to separate user interactions"RoboErik2014-05-153-4/+69
|\ \
| * | Add UserRecords to separate user interactionsRoboErik2014-05-143-4/+69
| |/ | | | | | | | | | | | | | | | | | | | | Each user record maintains the list of sessions and providers that are running under that user. Lifecycle for providers has been modified to stop discovery when the user is no longer current but keep the binder connection open so long as there's a session that has selected a route from that provider. When a user is stopped all providers on that user will be unbound even if they were still in use. Change-Id: Iadf1efded3415f7ecf384d3a73513883de9c86b0
* | camera2: Use StreamConfigurationMap for format/size/duration lookupIgor Murashkin2014-05-141-78/+297
| | | | | | | | | | | | | | | | * Also @hide/@deprecate a bunch of other keys * Move some classes into android.hardware.camera2.params Bug: 14628001 Change-Id: I2db490a0849680a133a901403477a147b004fb28
* | camera2: Update native<->managed camera metadata marshalersIgor Murashkin2014-05-136-53/+881
|/ | | | | | | | | | | | | | | | | | | | | | | * Improve existing marshalers: - each managed/native type combination can be queried marshal support - marshalers can recursively call other marshalers for nested types - support marshaling/unmarshaling generic classes by using super type tokens * Add new marshalers for: - ColorSpaceTransform - MeteringRectangle - Parcelable - Range<T> - ReprocessFormatsMap - RggbChannelVector - SizeF - StreamConfiguration - StreamConfigurationDuration Batteries included; so are unit tests. Bug: 14628001 Change-Id: I38d3e646ccfb3953898cd6f750c33e4097328482
* Merge "Make sessions aware of user id"RoboErik2014-05-122-4/+38
|\
| * Make sessions aware of user idRoboErik2014-05-082-4/+38
| | | | | | | | | | | | | | | | | | | | This tags all sessions with the user id that they were created for. It also adds API for creating and querying sessions for a specific user. This does not wrap providers per user yet which will be done in a separate CL. Change-Id: Icdaf701b0614a95301657998602c45208d548c27
* | Define audio attributesJean-Michel Trivi2014-05-121-0/+444
| | | | | | | | | | | | | | AudioAttributes is a class to associate a collection of attributes describing information about an audio player. Change-Id: I031aca1c79353abdfa0d7272c5dee0c2376c519a
* | Added MediaCodec.releaseOutputBuffer() method with render timestampLajos Molnar2014-05-093-7/+65
| | | | | | | | Bug: 11784827 Change-Id: I67097c8e69b40ef3baa436f0e7731d28c696735c
* | Merge "Unhide AudioTrack support for ENCODING_PCM_FLOAT"Glenn Kasten2014-05-092-13/+12
|\ \
| * | Unhide AudioTrack support for ENCODING_PCM_FLOATGlenn Kasten2014-05-082-13/+12
| | | | | | | | | | | | Change-Id: I77423ff1845d0e05c117ab2a0b31699b32b871be
* | | Merge "AudioService/WireAccessoryManager: change boot completion detection ↵Eric Laurent2014-05-081-35/+46
|\ \ \ | |/ / |/| | | | | method"
| * | AudioService/WireAccessoryManager: change boot completion detection methodEric Laurent2014-05-061-35/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BOOT_COMPLETED intent is not a reliable way for system services to detect boot completion. The intent broadcast can be significantly delayed and there is no guaranty that system services receive it before apps. Use a systemReady() method called by SystemServer instead. Bug: 14323903. Change-Id: I781596a3545e7a1e719799982347cbcd9a4c9009
* | | Add hidden support for ENCODING_PCM_FLOAT to AudioTrackGlenn Kasten2014-05-081-6/+98
| |/ |/| | | | | Change-Id: I15e6d6ab34846366e7f5cbf948fd3cb327e72632
* | am db55bb06: am 4463cbc6: am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-081-2/+0
|\ \ | | | | | | | | | | | | * commit 'db55bb0622e9fbe4b858d59409f516de01c1f1fd': Remove unused LOCAL_LDLIBS.
| * \ am 4463cbc6: am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-081-2/+0
| |\ \ | | | | | | | | | | | | | | | | * commit '4463cbc61d0947eccb67a52f60661a92d0cad508': Remove unused LOCAL_LDLIBS.
| | * \ am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-081-2/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit '3b9600b673ad6a83481dcf88db6c9b2dc5bc9ba3': Remove unused LOCAL_LDLIBS.
| | | * | Remove unused LOCAL_LDLIBS.Ying Wang2014-05-071-2/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I01346e76f4ac6402af0ef33e3b2eef4a69e704a2
* | | | | Fix javadoc reference in AudioTrack write modesJean-Michel Trivi2014-05-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Javadoc for blocking/non blocking write modes was referring to the old signature of one of the write methods. Change-Id: Ie919e3e0a976b0c915dacd490ae66005703789a3
* | | | | Merge "Unhide AudioTrack.write() method for non-blocking and ByteBuffer"Jean-Michel Trivi2014-05-081-3/+0
|\ \ \ \ \
| * | | | | Unhide AudioTrack.write() method for non-blocking and ByteBufferJean-Michel Trivi2014-05-071-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unhide the write mode constants. Unhide the write method where data is stored in a ByteBuffer. Bug 7919023 Change-Id: Ie9e24c744067f164d1a3e3363c7718b0a70e1cae
* | | | | | 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