summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Merge changes Ia0f54124,I1e085f5e,Ic0a3ff0a,I141847df,I8ae4efa2 into ↵Eino-Ville Talvala2014-05-281-0/+64
|\ | | | | | | | | | | | | | | | | | | | | lmp-preview-dev * changes: camera2: Update native/managed key mappings. Camera2: switch API interface to java classses Camera2: Use ColorSpaceTransform and RggbChannelVector, replace enum byte[] camera2: Add new metadata keys, change types for existing range keys Camera2: Replace int[] by MeteringRectangle
| * Camera2: switch API interface to java classsesYin-Chia Yeh2014-05-281-0/+22
| | | | | | | | | | | | | | | | | | android.sensor.info.physicalSize: float[] -> SizeF android.statistics.hotPixelMap: int[] -> Point[] android.tonemap.curve[Red|Green|Blue]: float[] -> TonemapCurve Bug: 14628001 Change-Id: I1e085f5e640a059852fcb504b6dd5f884039e653
| * camera2: Add new metadata keys, change types for existing range keysIgor Murashkin2014-05-281-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adds the following keys: * android.control.maxRegionsAe * android.control.maxRegionsAwb * android.control.maxRegionsAf * android.request.maxNumOutputRaw * android.request.maxNumOutputProc * android.request.maxNumOutputProcStalling Changes the following keys' type generations: * android.control.aeTargetFpsRange * (Range<Integer>) * android.control.aeAvailableTargetFpsRanges * (Range<Integer>[]) * android.control.aeCompensationRange * (Range<Integer>) * android.lens.focusRange * (Range<Float>) Bug: 14628001 Change-Id: I141847dffc4b0d89cea37c19a54d6d5faf24a9bb
* | DO NOT MERGE temporary hide of AudioAttributesJean-Michel Trivi2014-05-271-0/+1
|/ | | | | | Bug 15089989 Change-Id: I6077d4906d5624be4dd2b8a5c3378a04c848b6d8
* VolumeZen: combine ringer/notification volume and zen.John Spurlock2014-05-271-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Implement a new volume panel widget, combining volume and zen mode + conditions. - Show zen mode + conditions when modifying ringer or notification streams. - Host the volume panel widget in a dialog when being controlled by the audio service / volume keys. - Remove support for multiple sliders in the volume panel. - Remove support for separate ringer + notification volumes in the volume panel. - Move volume panel resources up to SystemUI. - Create a new combined Notifications quick settings tile. - Host the volume panel widget in the quick settings panel under Notifications. - When the quick settings detail panel is visible, route the volume keys to the embedded widget instead of showing a redundant dialog. - Create common styles for quick settings text to be closer to spec. - Update the framework resources for the ringer stream. - Show the ringer icons in global actions. - Add "until you turn this off" back as a separate zen condition. - Disable time condition buttons when they are N/A. - Don't allow volume changes to set ringer mode silent. Bug:15186070 Change-Id: Id5e321dd1d5e7c4cf3917027ffbdf7e80d38b00d
* Merge "camera2: Move DngCreator to hardware/camera2." into lmp-preview-devRuben Brunk2014-05-244-1149/+0
|\
| * camera2: Move DngCreator to hardware/camera2.Ruben Brunk2014-05-224-1149/+0
| | | | | | | | | | Bug: 15091253 Change-Id: Ibe2ee376436e5c796e33c0b782ea68278589f2e6
* | camera2: Refactor CameraMetadata.Key out into 3 key classesIgor Murashkin2014-05-231-4/+37
|/ | | | | | | | | | | | | | | | | | | | Before: * CameraMetadata.Key<T> After: * CameraCharacteristics.Key<T> * CaptureResult.Key<T> * CaptureRequest.Key<T> CameraMetadata#get has been removed (each metadata subclass has its own #get now) due to java generic limitations (in particular a type bound <T1<T2> extends Key<T2>> is an illegal bound). CameraMetadataNative gets a new #dumpToLog function to dump the native metadata to logcat. Bug: 15091017 Change-Id: Ic56c54c0d184e209e20de374dc8a6d79527c209f
* Merge "camera2: Add HAL1 compatibility shim skeleton."Ruben Brunk2014-05-221-15/+24
|\
| * camera2: Add HAL1 compatibility shim skeleton.Ruben Brunk2014-05-211-15/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds basic support for running the Camera2 API on a device running a camera HAL version lower than CAMERA_MODULE_API_VERSION_2_0. This CL includes support for: - N-way preview output streams - N-way jpeg output streams - CameraDevice emulation at the binder interface - Basic camera metadata querying in the CameraManager Bug: 15117269 Bug: 15116722 Change-Id: I8322955034c91f34bb348d4b28c2b774dbef38f6
* | Switch to using int stream instead of AudioAttributesRoboErik2014-05-211-8/+7
| | | | | | | | | | | | | | This is an alternate to the submitted API which doesn't use the new AudioAttributes class and just takes the AudioManager.STREAM instead. Change-Id: I0365bc6fb9196fc33852ba6b202ca553efe0cc85
* | Add stream/volume apis to sessionsRoboErik2014-05-212-1/+131
|/ | | | | | | | | | | This adds RemoteVolumeProviders which handle volume change events and a way to switch a session between local stream playback and remote playback handling. This also adds a way for an app to specify the PendingIntent to launch when we want to show their ongoing playback UI. Change-Id: I3a72bf2ec7ca55f61f50859ddc2988eebd491e9d
* Merge changes I1cbdff1d,I23906b4cRoboErik2014-05-213-14/+12
|\ | | | | | | | | | | * changes: Handle headsethook voice launching Add 5s timeout to wakelock
| * Add 5s timeout to wakelockRoboErik2014-05-203-14/+12
| | | | | | | | | | | | | | Also filed a b/15110168 to anr the app if it doesn't finish with the button event in 5s. Change-Id: I23906b4c7f17d3d3a29eef92b523d8653c87017e
* | Merge "Update android.media.AudioTrack.getTimestamp API documentation"Glenn Kasten2014-05-211-4/+12
|\ \
| * | Update android.media.AudioTrack.getTimestamp API documentationGlenn Kasten2014-05-211-4/+12
| | | | | | | | | | | | Change-Id: I0928c73c147ce843ae46565883da209b278fb3b4
* | | Build cast v2 mediadrm signer library as non-staticJeff Tinker2014-05-211-1/+1
|/ / | | | | | | | | bug: 13988104 Change-Id: Ie94074dd46e4489c7d4e0f378d1e35b14bb0c0ac
* | VolumeZen: SystemUI now hosts the volume dialog.John Spurlock2014-05-215-19/+297
|/ | | | | | | | | - Allow SystemUI to set the volume controller interface using a new binder call to audio service. - Remove VolumePanel's dependency on AudioService. - Host the base VolumePanel in the SystemUI process. Change-Id: I095d5a1a579d42b68d0f81abb4087bd0c754b876
* Merge "AudioSystem: add new audio device definitions"Eric Laurent2014-05-203-28/+206
|\
| * AudioSystem: add new audio device definitionsEric Laurent2014-05-193-28/+206
| | | | | | | | Change-Id: Ib7675bc33771365b2dbb7694c522469317b11457
* | Merge "Add getMediaSession to RCC"RoboErik2014-05-201-0/+13
|\ \
| * | Add getMediaSession to RCCRoboErik2014-05-201-0/+13
| | | | | | | | | | | | | | | | | | This is to make integration with Media notifications easier. Change-Id: I783ae5c2620ff0e11bf5584604b9c9623850e2f0
* | | Merge "Fix 64 bit long pointer size for media scanning"Andy Hung2014-05-201-1/+1
|\ \ \
| * | | Fix 64 bit long pointer size for media scanningAndy Hung2014-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 14993718 Change-Id: I98989caddcca67c2b3257cead948382fddb066da
* | | | Merge "Add HEVC decoder support ot MediaCodec bug: 14571712"Rachad2014-05-192-0/+32
|\ \ \ \ | |_|/ / |/| | |
| * | | Add HEVC decoder support ot MediaCodecRachad2014-05-142-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | bug: 14571712 Change-Id: Ic65e1ffd7583f7286728332686dbb92090b5a413
* | | | Merge "Rename session classes to have media prefix, hide routes"RoboErik2014-05-1927-130/+155
|\ \ \ \
| * | | | Rename session classes to have media prefix, hide routesRoboErik2014-05-1627-130/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This renames several of the core session classes to be prefixed with Media. It also adds @hide to all route references for now. Change-Id: Idb42897d490cf24626e4e93ca975b2cb93ec054c
* | | | | Merge "Move media key processing to sessions"RoboErik2014-05-197-37/+166
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | Move media key processing to sessionsRoboErik2014-05-167-37/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send all media key events over to the MediaSessionService instead of AudioManager. This does not affect volume handling yet, so it is possible to get into a state where volume will be handled by a different thing than media buttons. Except for corner cases this shouldn't be noticable. Change-Id: I00a576175d9c82937f0836e509b9a98d5cb77b83
* | | | camera2: Plumb DngCreator to native library.Ruben Brunk2014-05-164-27/+922
| | | | | | | | | | | | | | | | Change-Id: Ic58bf6cf5086808b503460ef8e451fc0d6f1f850
* | | | AudioSystem: native to JAVA status translationEric Laurent2014-05-163-12/+23
|/ / / | | | | | | | | | | | | | | | | | | | | | Regroup status code translation from native to JAVA in AudioSystem. The same codes will be used by AudioTrack, AudioRecord, AudioManager and defined in a single place in AudioSystem. Change-Id: I7d3f39f30e3bb8e53f33f4408bcb0672df8af42b
* | | Merge "camera2: Move parameters around to different packages"Igor Murashkin2014-05-164-9/+9
|\ \ \ | |_|/ |/| |
| * | camera2: Move parameters around to different packagesIgor Murashkin2014-05-144-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | * Camera-specific params to android.hardware.camera2.params * Remove android.hardware.camera2.Size * Move Rational to android.util Bug: 14628001 Change-Id: Ie7a82bf9f4a0d8c18e0dc3a1581123c0d95da3f0
* | | 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.