summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* mediaeditor shouldn't depend on audioflinger.Narayan Kamath2014-03-191-1/+0
| | | | Change-Id: I7e1b999b03a3ee5eff2e10a460f64abeba16ba90
* Merge "Don't assume that size_t is 32-bit"Narayan Kamath2014-03-071-3/+3
|\
| * Don't assume that size_t is 32-bitAshok Bhat2014-03-061-3/+3
| | | | | | | | | | | | | | | | | | Crypto data was being copied to java jint array in chunks of size_t. This will not work on LP64 as size_t will be 64-bit. This patch changes copy to use int32_t chunks instead of size_t. Change-Id: I75d910a1182ad2f58f432cd172127f048b4c393b Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | Don't use size_t for variables that store uint32_t valueAshok Bhat2014-03-061-3/+3
|/ | | | | | | | | | | | | | | | | The local variables width, height, displayWidth and displayHeight are set to the corresponding members of VideoFrame class. As the members of VideoFrame are uint32_t, the local variables have been changed to uint32_t. As these local variables are passed to a java method, the change of size_t to uint32_t ensures that the size of the actual parameter (i.e uint32_t) is now same as the size of the formal parameter (i.e. jint) for all platforms. Change-Id: Icd14de0142bfd4e6ba52a3e6aff3d80b323a0de4 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* Fix in MediaMuxer's JNI codeAshok Bhat2014-02-071-2/+2
| | | | | | | | android_media_MediaMuxer_native_setup should return jlong. It was incorrectly returning jint. Change-Id: I31a475af0818f4d5dcbb39380b42612188cf3853 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* Merge "Release locked buffer when it fails to acquire graphics buffer"Zhijun He2014-01-301-0/+1
|\
| * Release locked buffer when it fails to acquire graphics bufferlina.x.pi2014-01-281-0/+1
| | | | | | | | | | | | | | | | | | | | The JNI buffer in ImageReader_imageSetup is not released when it fails to acquire graphics buffer. After all JNI buffers are exhausted, ACQUIRE_MAX_IMAGES will be returned and leads to error. The JNI buffer should be released when it fails to acquire graphics buffer. Change-Id: I3319a58ac44e36c8593b404672a685c4b589a735
* | AArch64: Make graphics classes 64-bit compatibleAshok Bhat2014-01-281-2/+2
|/ | | | | | | | | | | | | | | | | | | | | | Changes in this patch include [x] Long is used to store native pointers as they can be 64-bit. [x] Some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) [x] AssetAtlasManager is not completely 64-bit compatible yet. Specifically mAtlasMap member has to be converted to hold native pointer using long. Added a TODO to AssetAtlasManager.java to indicate the change required. Change-Id: I940433f601c6db998c1a8ffff338f5361200d5ed Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Craig Barber <craig.barber@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
* AArch64: Use long for pointers in media classesAshok Bhat2014-01-1524-153/+157
| | | | | | | | | | | | | | For storing pointers, long is used in media classes, as native pointers can be 64-bit. In addition, some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) Change-Id: Idc4ca0124d03df7f9cef412488abafd020e5e774 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
* Merge "Add NULL check in updateProxyConfig"Marco Nelissen2014-01-141-8/+11
|\
| * Add NULL check in updateProxyConfigOscar Rydhé2013-12-191-8/+11
| | | | | | | | | | | | | | | | If the exclusionList was null in updateProxyConfig the VM would crash when converting it to a UTF8 string. Avoid this by adding a null check. Change-Id: I0d8106fd54385bd9ae9c652a6c67d459a119cf2b
* | Merge "Fix a JNI local reference leak in MediaDrm"Jason Sams2014-01-111-0/+1
|\ \
| * | Fix a JNI local reference leak in MediaDrmPatrik2 Carlsson2013-12-191-0/+1
| |/ | | | | | | | | | | | | | | A reference leak was found in the subtitle usecase that also applies to android_media_MediaDrm.cpp (Code taken from the similar fix in android_media_MediaPlayer.cpp) Change-Id: Icc4b25e4adc9a600ff4ac99a7a8478bb55a6e348
* | AArch64: Use long for pointers in MTP classesAshok Bhat2014-01-076-27/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For storing pointers, long is used in MTP classes, as native pointers can be 64-bit. In addition, some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) Change-Id: I67805547251722e7b77611d47d0bb632a64d3e6d Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
* | AArch64: Use long for pointers in VideoEditor classesAshok Bhat2014-01-073-37/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For storing pointers, long is used in VideoEditor classes, as native pointers can be 64-bit. In addition, some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) Change-Id: Ifff3a28f2ab6774ee89d31770ad63451c8726431 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
* | AArch64: Use long for pointers in audio effect classesAshok Bhat2014-01-074-57/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For storing pointers, long is used in AudioEffect and Visualizer classes, as native pointers can be 64-bit. In addition, some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) Change-Id: Ief49bbe5baef663e268c7f6d70ac33a4df45621c Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
* | AArch64: Use long for pointers in AmrInputStreamAshok Bhat2014-01-072-20/+20
| | | | | | | | | | | | | | | | | | | | For storing pointers, long is used in AmrInputStream class, as native pointers can be 64-bit. Change-Id: I78fff3eb54fc7101746b0d693cbc4e923c2bad08 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
* | Merge "MediaDrm#mNativeContext is a long, not int."Narayan Kamath2013-12-191-1/+1
|\ \ | |/ |/|
| * MediaDrm#mNativeContext is a long, not int.Narayan Kamath2013-12-181-1/+1
| | | | | | | | | | | | Therefore, we must use SetLongField and not SetIntField. Change-Id: I2a805dd6b7c8e4905e742d8632d941f381a05930
* | Remove unused field from MediaMuxerNarayan Kamath2013-12-182-9/+0
|/ | | | Change-Id: If1ebb2302654b64924084a52425366f1b69c7c30
* Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"Elliott Hughes2013-12-164-29/+29
|\
| * AArch64: Use long for pointers in MediaDrm and MediaMuxerAshok Bhat2013-12-104-29/+29
| | | | | | | | | | | | | | | | For storing pointers, long is used in MediaDrm and MediaMuxer classes, as native pointers can be 64-bit. Change-Id: I77f26cde627baf0dce70b6aa3a4dbd974051d9a6 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | Use java.util.Objects instead on internal APIKenny Root2013-12-132-8/+7
|/ | | | | | | Not needed since java.util.Objects implements all the needed functionality. Change-Id: Icd31d49a9801d1705427f028e9ac927d58e7d34c
* am 5d0b18cd: am 3de885be: Merge "Disallow applications from initiating cast ↵Jeff Brown2013-11-152-8/+82
|\ | | | | | | | | | | | | screen." into klp-dev * commit '5d0b18cddfcb933d7960c5a6a820045d77a0285c': Disallow applications from initiating cast screen.
| * Disallow applications from initiating cast screen.Jeff Brown2013-11-152-8/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Only allow the system ui and settings to connect to a remote display. To do this, we essentially hide the remote displays from applications by using the ROUTE_TYPE_REMOTE_DISPLAY then add permission checks around the operations that connect to them. As a bonus, this may actually save power on devices since applications that use MediaRouter will not longer be performing discover on remote display routes at all. Bug: 11257292 Change-Id: I9ea8c568df4df5a0f0cf3d0f11b39c87e2110795
* | am dc6da58a: am 2a96fc1f: Merge "Fix RemoteController update in ↵Jean-Michel Trivi2013-11-141-3/+2
|\ \ | |/ | | | | | | | | | | RemoteControlClient registration" into klp-dev * commit 'dc6da58aa79f97d6bbd0fa8fd4e694f1e76973f0': Fix RemoteController update in RemoteControlClient registration
| * Fix RemoteController update in RemoteControlClient registrationJean-Michel Trivi2013-11-131-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A regression was introduced when trying to limit the number of internal synchronization generation IDs that caused RCC information to be shown only for applications that requested audio focus after media button receiver and RCC registration, (such as Play Music), not for applications that requested focus first (such as Play Movies). The correct behavior is to always check and update the RemoteControllers (seen by MediaFocusControl as RCD interfaces) whenever a RemoteControlClient is registered (even if it's a re-registration) when it is associated when an entry at the top of the remote control stack. Bug 11657655 Change-Id: I30716e2028f7f718a31e13401b191178735229ff
* | am 84f4ad80: am 87c5eeb4: Merge "Fix a JNI local reference leak in ↵Elliott Hughes2013-11-131-0/+1
|\ \ | |/ |/| | | | | | | | | JNIMediaPlayerListener::notify." * commit '84f4ad807152b6266431144425f153c48db28696': Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
| * am 87c5eeb4: Merge "Fix a JNI local reference leak in ↵Elliott Hughes2013-11-131-0/+1
| |\ | | | | | | | | | | | | | | | | | | JNIMediaPlayerListener::notify." * commit '87c5eeb48b1a0c498eae9bd2877fb33678d90b8a': Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
| | * Fix a JNI local reference leak in JNIMediaPlayerListener::notify.Elliott Hughes2013-11-131-0/+1
| | | | | | | | | | | | | | | Bug: https://code.google.com/p/android/issues/detail?id=62137 Change-Id: I776cd83a66de37fdbbe8af367bf1b26e5e0c7247
* | | UI tweaks.Jeff Brown2013-11-112-45/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide disabled routes from the chooser. Fix layout of chooser dialog when the settings button is visible and the list is very long to prevent truncation of the settings button. Fix an issue when we fake the route connecting status when a route is selected. The route changed notification needs to be propagated to apps. Fake it better. Immediately disconnect from a route when the connection is lost or a connection attempt fails. Added a few new test displays for this case. Bug: 11257292 Change-Id: I360ab5dc937ad60d97592eab54b19f034519645e
* | | Changes to support new screen cast settings screen.Jeff Brown2013-11-101-35/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed the Preference ordering code to consider the case where two preferences might have the same order. In that case, it falls back on the title to disambiguate. Previous behavior was undefined (and technically not stable). Expose the wifi display device address. Perform wifi display scans every 10 seconds instead of every 15 to improve reponsiveness. Make sure to define routes for wifi displays that we are connecting to even if they are not yet paired. Simplified the logic for adding and removing these routes to avoid possibly getting out of sync and leaving stale routes behind. Fix wifi display notification icon. Bug: 11257292 Change-Id: I8ac15fb17d83758c0bdce80399e12723c367b83c
* | | Merge "Update the media router dialogs and integrate into system UI." into ↵Jeff Brown2013-11-111-4/+74
|\ \ \ | | | | | | | | | | | | klp-dev
| * | | Update the media router dialogs and integrate into system UI.Jeff Brown2013-11-101-4/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port the new style UI back into the framework from the support library. There are now two dialogs: a chooser and a controller. We use the same dialogs for selecting routes within app and within quick settings. Note that the new UI does not support any grouping features since they are deprecated and unused. Bug: 11257292 Change-Id: I64e936a18d25ab75f0c470cbc1e7085f67004863
* | | | Fixed a bug updating presentation displays.Chong Zhang2013-11-082-54/+65
|/ / / | | | | | | | | | | | | | | | | | | Also made findRemoteDisplay public. Bug: 11257292 Change-Id: Ibc9bf3d8ee7c90293ffd8796270e8883ea458a65
* | | Merge "Add media router service and integrate with remote displays." into ↵Jeff Brown2013-11-085-93/+709
|\ \ \ | | | | | | | | | | | | klp-dev
| * | | Add media router service and integrate with remote displays.Jeff Brown2013-11-075-93/+709
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds a new media router service whose purpose is to track global state information associated with media routes. This service publishes routes to the media router instance in application processes and handles requested state changes such as selecting or unselecting global routes. The service also binds to remote display provider services which can offer new remote display routes to the system. Includes a test application for manually verifying certain aspects of the operation of the media router service. The remote display provider interface is essentially a stripped down media route provider interface as defined in the support library media router implementation. For now, it is designed to be used only by first parties to publish remote display routes to the system so it is not exposed as public API in the SDK. In the future, the remote display provider interface will most likely be deprecated and replaced with a more featureful media route provider interface for third party integration, similar to what is in the support library today. Further patch sets integrate these new capabilities into the System UI and Settings for connecting remote displays. Bug: 11257292 Change-Id: I31109f23f17b474d17534d0f5f4503e388b081c2
* | | | Merge "Add a platform library for remote display providers." into klp-devJeff Brown2013-11-089-0/+902
|\ \ \ \ | |/ / /
| * | | Add a platform library for remote display providers.Jeff Brown2013-11-079-0/+902
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This interface allows applications to register services that offer remote displays to the system. The system will then provide UI to allow user to connect to these displays and enable mirroring. Bug: 11257292 Change-Id: I34da5b9dfdaf71267bd3450c505bc1b7368d1b40
* | | | AudioService: fix notifications with A2DP abs volumeEric Laurent2013-11-041-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When A2DP absolute volume is enabled, the music stream software volume is maxed out because the headset applies the volume. We must also max out other streams playing over A2DP otherwise they are attenuated twice and are barely audible. Bug: 11316102. Change-Id: I7e58c74cb683ad1d6f3b68abb0ef967c817fbf4f
* | | | Merge "MediaPlayer: MTP: update state only based on source events" into klp-devLajos Molnar2013-10-281-2/+11
|\ \ \ \ | |/ / / |/| | |
| * | | MediaPlayer: MTP: update state only based on source eventsLajos Molnar2013-10-281-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | State only depends on events from the MediaPlayer (this includes the pseudo-event from MTP recovery mechanism.) Change-Id: Idd62a773d2386ad6bfbfe417412c2e2ff09b3600 Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 11412881
* | | | Merge "Limit RemoteControlClient generation ID changes" into klp-devJean-Michel Trivi2013-10-251-9/+15
|\ \ \ \
| * | | | Limit RemoteControlClient generation ID changesJean-Michel Trivi2013-10-241-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At the beginning of each song, the Music app re-registers its media button event and requests audio focus, which causes the reevaluation of each corresponding stack of clients. Each reevaluation is accompanied by the incrementation of the RemoteControlClient generation ID, which causes RemoteController to issue a notification that the client has changed. The lockscreen correctly interprets this as a reason to dump the current RemoteControlClient data (including the artwork) because it will receive the new data if new one is available. This is what causes the "flashing" of the wallpaper on the lockscreen: for an instant, no client data is available. The fix consists in not causing the client generation ID to be incremented when registrations don't cause any change in the RemoteControlClient stack. Even though Music re-registers everything, nothing has changed: it still is the current media button receiver, and it still has the same RemoteControlClient. Bug 11307382 Change-Id: I4d2404b571e88aeedb0eca6bd19d39f7ec4fc8b1
* | | | | Missing LoudnessEnhancer constructor and UUID in public APIJean-Michel Trivi2013-10-232-3/+0
|/ / / / | | | | | | | | | | | | | | | | | | | | Bug 11356672 Change-Id: Ia3d16712c8b9bb425a587acd87ba7fad6b4ce31c
* | | | Fix stale data in keyguard transport control displayAdam Powell2013-10-151-0/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that caches are cleared at the right times and views have their data populated correctly. Also fix a caching issue in RemoteController. Bug 11218218 Change-Id: Ieb833b5dc440ccd1b82050f12eb7059a4e0a412f
* | | Merge "DO NOT MERGE: Hide new camera API." into klp-devEino-Ville Talvala2013-10-132-13/+2
|\ \ \
| * | | DO NOT MERGE: Hide new camera API.Eino-Ville Talvala2013-10-112-13/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not yet ready. Bug: 11141002 Change-Id: I4704bffb9ba36af47a66dc5b49cbba00be623aae
* | | | Remote volume changesJean-Michel Trivi2013-10-113-23/+76
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the user plays media remotely, and presses on the volume keys with the screen off, verify whether not only local playback is active, but also if remote playback is active to see if the volume should be adjusted. When adjusting the volume with screen off, adjust the remote volume if applicable. When controlling volume, give priority to local media playback. Bug 11169862 Change-Id: I88a8c003969177d50d4c1569ec6cd2a7c153a341
* | | Make RemoteController weakly referenced by IRemoteControlDisplayJean-Michel Trivi2013-10-081-17/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the RemoteController implementation, the inner class that implements the IRemoteControlDisplay interface must have a weak link to the RemoteController instance with which it is associated, as MediaFocusControl and RemoteControlClient hold a strong reference to this binder object in a different remote process. Without a weak reference, any object referencing RemoteController couldn't be independently garbage collected without a garbage collection in the remote process. Bug 8209392 Change-Id: I29e4274c45249b3cb0d3d89417c69e8fe8f62fc4
generated by cgit v1.1 at 2025-02-04 21:13:39 +0000