summaryrefslogtreecommitdiffstats
path: root/media/java
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Inform AudioFlinger of device's low RAM attributeGlenn Kasten2013-07-182-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to help it configure it's memory Bug: 9798886 Change-Id: Ia2df59cfcb76f5ff48cca92b107915e2adde899c
* | | | | Add FX_KEYPRESS_INVALID constant to AudioManager.Justin Koh2013-07-181-1/+9
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Add FX_KEYPRESS_INVALID constant to AudioManager. This is a sound which should play if the user tries to click or press on an element which is disabled. Change-Id: Idd8953abeddd1afb51f7f190f9fb612ef672defa
* | | | Add a keycode to switch audio tracks (1/2)Jaekyun Seok2013-07-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | A key to switch audio tracks is general on media devices like blu-ray. Bug: 9728155 Change-Id: Ib61822b8aa9c143a8febc3cff4707fa775119448
* | | | Merge "Expose latency methods through AudioManager and AudioTrack."Oliver Woodman2013-06-273-0/+26
|\ \ \ \
| * | | | Expose latency methods through AudioManager and AudioTrack.Oliver Woodman2013-06-263-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's a longer term plan to fix audio/video sync, but this gets the Java level to parity with the native level, and allows applications in Java to achieve sync in the same way as the native media player. APIs are left as hidden for now. Change-Id: Iaf70baac1ffb50ef48e03355163158568fbd0fe9
* | | | | ImageReader: Implementation of ImageReader and Image APIsZhijun He2013-06-262-41/+312
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Used for direct image data access from producer like camera or video decoder. Bug: 9254294 Change-Id: I1853af03f4487ac3585d86202f6140854471fa89
* | | | Change the comments to incorporate change for VP9 decoder.hkuang2013-06-261-1/+2
| | | | | | | | | | | | | | | | Change-Id: I9a4f3af9278c90962856516df5930e8924c28f9d
* | | | Merge "MediaRouter: grey out wifi displays that's in use"Chong Zhang2013-06-151-56/+68
|\ \ \ \
| * | | | MediaRouter: grey out wifi displays that's in useChong Zhang2013-06-131-56/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug 9229799 Change-Id: I9f5fd2107f60c492d42c74e575e6483838a51267
* | | | | am 3717cf6b: am 07d6d9e7: Merge "additional documentation for media codec ↵Scott Main2013-06-142-3/+38
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | info" into jb-mr2-dev * commit '3717cf6bc2e92d58d8de9f039165d1e6c73de8a0': additional documentation for media codec info
| * | | | am 07d6d9e7: Merge "additional documentation for media codec info" into ↵Scott Main2013-06-142-3/+38
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit '07d6d9e74c1f79de791b37b1cb738fa398915879': additional documentation for media codec info
| | * | | additional documentation for media codec infoScott Main2013-06-142-3/+38
| | | | | | | | | | | | | | | | | | | | Change-Id: I3b4e5baccab6da2dfc8dff8d03872bb5b346a4ad
* | | | | Make MediaPlayer.invoke() public-and-hidden againMarco Nelissen2013-06-141-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's used in a bunch of other places in other repos that I don't want to touch. Change-Id: I6f2ec6f8066286de9b52499fc71f3f08953c3cb4
* | | | | Remove unused MediaPlayer methodsMarco Nelissen2013-06-131-106/+2
| |_|/ / |/| | | | | | | | | | | Change-Id: Id63fdde7d0e4f096d3bb9eb4da5e0f37eb9dea21
* | | | am 36e90664: am bcc6ae88: Merge "Let RemoteControlDisplay know more about ↵Zhihai Xu2013-06-112-2/+52
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | playback position" into jb-mr2-dev * commit '36e90664c7b74bd90b56b17afb407729f7949108': Let RemoteControlDisplay know more about playback position
| * | | am bcc6ae88: Merge "Let RemoteControlDisplay know more about playback ↵Zhihai Xu2013-06-112-2/+52
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | position" into jb-mr2-dev * commit 'bcc6ae88f97caa7591a7507a90ec1152ee7cab7a': Let RemoteControlDisplay know more about playback position
| | * | Merge "Let RemoteControlDisplay know more about playback position" into ↵Zhihai Xu2013-06-112-2/+52
| | |\ \ | | | | | | | | | | | | | | | jb-mr2-dev
| | | * | Let RemoteControlDisplay know more about playback positionJean-Michel Trivi2013-06-072-2/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The BT stack needs to differentiate between applications that use the new RemoteControlClient APIs to pass a playback position but don't have one yet, and applications that use the legacy API and will never pass a position. Bug 9294855 Change-Id: I05cba82a073e6e0aaea1d8bbf9cc8c99da715f58
* | | | | am 3826e8bd: am 37490462: Merge "Unhide MediaExtractor.getPsshInfo()" into ↵Marco Nelissen2013-06-111-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit '3826e8bd6e30dbda90f330e4b3facbccc8c4bb9e': Unhide MediaExtractor.getPsshInfo()
| * | | | am 37490462: Merge "Unhide MediaExtractor.getPsshInfo()" into jb-mr2-devMarco Nelissen2013-06-111-2/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '374904621a79eb12416da4a26be515ae9a2d243a': Unhide MediaExtractor.getPsshInfo()
| | * | | Unhide MediaExtractor.getPsshInfo()Marco Nelissen2013-06-101-2/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | b/9373882 Change-Id: I2af42656d6a7eb19e8e9ec798b615dab0d9d33cb
* | | | Initial commit of new camera API, mostly just the interface.Eino-Ville Talvala2013-06-072-0/+355
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - New core API classes in android.hardware.photography - android.media.Image and android.media.ImageReader classes for application access to direct hardware image buffers. - Additions to android.graphics.ImageFormat to describe new image types needed by new camera API. - Some documentation included; very little implementation. Bug: 9111736 Change-Id: I0680f35944d1cb8845b7dc0c67edc8c0f0864573
* | | | am e125116f: am e4ef3849: Merge "javadoc cleanup for audioeffect" into ↵Scott Main2013-06-041-7/+25
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit 'e125116fc8767ecf431c80f5659a8a90032acb97': javadoc cleanup for audioeffect
| * | | am e4ef3849: Merge "javadoc cleanup for audioeffect" into jb-mr2-devScott Main2013-06-041-7/+25
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'e4ef3849c58225206fd5cba1b33c08968c5e6021': javadoc cleanup for audioeffect
| | * | javadoc cleanup for audioeffectScott Main2013-06-031-7/+25
| | | | | | | | | | | | | | | | Change-Id: I87917309d1da6529e16d72ad2b4ec9ce04d10569
* | | | am c41a0eff: am be22605d: Merge "Listen for HTTP proxy changes and propagate ↵Andreas Huber2013-06-031-2/+76
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | the information to the media" into jb-mr2-dev * commit 'c41a0eff938f825ef235b92efa7a31c3b7f8bfb4': Listen for HTTP proxy changes and propagate the information to the media
| * | | am be22605d: Merge "Listen for HTTP proxy changes and propagate the ↵Andreas Huber2013-06-031-2/+76
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | information to the media" into jb-mr2-dev * commit 'be22605d1eacfb4137b6984b72a3eda004b911a1': Listen for HTTP proxy changes and propagate the information to the media
| | * | Listen for HTTP proxy changes and propagate the information to the mediaAndreas Huber2013-05-311-2/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | framework. related-to-bug: 8873723 Change-Id: I2a34343f8006fa1b1448a1f047458fd58fe14fda (cherry picked from commit bfe9154142428aa8abecaf943dfeffc55f411ea7)
* | | | am 43590eb7: am 4f0002e6: Merge "MediaMuxer sample code update, no ↵ztenghui2013-05-311-8/+17
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | functional change" into jb-mr2-dev * commit '43590eb76cac78f780dd318492c5fe6093e2fa88': MediaMuxer sample code update, no functional change
| * | | am 4f0002e6: Merge "MediaMuxer sample code update, no functional change" ↵ztenghui2013-05-311-8/+17
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | into jb-mr2-dev * commit '4f0002e6de601f6727475a3296618120b62d7f12': MediaMuxer sample code update, no functional change
| | * | Merge "MediaMuxer sample code update, no functional change" into jb-mr2-devztenghui2013-05-311-8/+17
| | |\ \
| | | * | MediaMuxer sample code update, no functional changeztenghui2013-05-311-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:9213533 Change-Id: I0d42ec58576d9fd797dba9c9c9f5ebed1170a818
* | | | | am 6474d840: am 636af7a1: Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for ↵Jeff Brown2013-05-301-5/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | clarity." into jb-mr2-dev * commit '6474d8407cb1551608fc403861e11cf514f8558e': Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity.
| * | | | am 636af7a1: Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into ↵Jeff Brown2013-05-301-5/+5
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit '636af7a1cb90bb2f422bc85356d30f5b4e9342e6': Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity.
| | * | | Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into jb-mr2-devJeff Brown2013-05-311-5/+5
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity.Jeff Brown2013-05-301-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9210033 Change-Id: I973c03b3a37e12af72a27c46d7da7fb59a30b606
* | | | | am 7d2e3939: am c1d47c50: Merge "Monitor device rotation" into jb-mr2-devJean-Michel Trivi2013-05-301-6/+50
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '7d2e3939964fb6512f370059a33206d2c9ec7a0e': Monitor device rotation
| * | | | am c1d47c50: Merge "Monitor device rotation" into jb-mr2-devJean-Michel Trivi2013-05-301-6/+50
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'c1d47c50d61063dc41214beb93aeea32f77f2550': Monitor device rotation
| | * | | Merge "Monitor device rotation" into jb-mr2-devJean-Michel Trivi2013-05-301-6/+50
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Monitor device rotationJean-Michel Trivi2013-05-281-6/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If requested by ro.audio.monitorOrientation property, set orientation information as audio system parameter on configuration changes. Bug 9095903 Change-Id: I669d4084eade3c14feb63f644bdd5b74fddc8857
* | | | | am fabd32c1: am 673903a2: Merge "android.media.MediaMuxer: remove ↵Lajos Molnar2013-05-291-11/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | SAMPLE_SYNC_FLAG" into jb-mr2-dev * commit 'fabd32c1fb353c4e1437f1472de5ec2810bda329': android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG
| * | | | am 673903a2: Merge "android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG" into ↵Lajos Molnar2013-05-291-11/+4
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit '673903a2759067b29bed7e309211000d365e0ad3': android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG
| | * | | android.media.MediaMuxer: remove SAMPLE_SYNC_FLAGLajos Molnar2013-05-291-11/+4
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SAMPLE_SYNC_FLAG is not used by MediaMuxer; instead, MediaCodec.BUFFER_FLAG_SYNC_FRAME is used, which has the same value. Remove this now, so that users will not have to translate MediaCodec flags to MediaMuxer flags, even though MediaMuxer takes in MediaCodec.BufferInfo objects to specify these flags. Change-Id: I4b2f2039ca16debf4788a530a36bdd06d516f417 Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 9169479
* | | | am b7871af2: am 50ab525a: Merge "Add route description API." into jb-mr2-devJeff Brown2013-05-171-7/+55
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'b7871af2fbde70c7cf4812d5710b2729588bac54': Add route description API.
| * | | am 50ab525a: Merge "Add route description API." into jb-mr2-devJeff Brown2013-05-171-7/+55
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '50ab525af62ef5e1f9cf3433a161f2e874da6116': Add route description API.
| | * | Add route description API.Jeff Brown2013-05-161-7/+55
| | | | | | | | | | | | | | | | | | | | Bug: 8175766 Change-Id: I65dbc10fc04f9ff8f6abc1bda23fbf5baa227737
* | | | am f8e54846: am 9766caed: Merge "Add an API to determine if a route is ↵Jeff Brown2013-05-101-1/+13
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | connecting." into jb-mr2-dev * commit 'f8e54846146c234aa9a201f54eea70df93ee56e2': Add an API to determine if a route is connecting.
| * | | am 9766caed: Merge "Add an API to determine if a route is connecting." into ↵Jeff Brown2013-05-101-1/+13
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit '9766caedf0657615f739d4e441ab9f2fa71aa709': Add an API to determine if a route is connecting.
| | * | Add an API to determine if a route is connecting.Jeff Brown2013-05-091-1/+13
| | | | | | | | | | | | | | | | | | | | Bug: 8175766 Change-Id: I54d5f31d4e7d79c471c0e1bbc438cd8ebb4f8a1e
* | | | am da58f92b: am b2f6842d: Merge "Add an API to allow a callback to request ↵Jeff Brown2013-05-091-28/+143
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | active scans." into jb-mr2-dev * commit 'da58f92bfaf875074656a55103c819e6f4dda341': Add an API to allow a callback to request active scans.