summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Camera2: Add flush support" into klp-devEino-Ville Talvala2013-08-271-0/+3
|\
| * Camera2: Add flush supportEino-Ville Talvala2013-08-231-0/+3
| | | | | | | | | | | | | | | | - On HAL2 devices, fall back to wait until idle - On HAL3 devices, call HAL flush method Bug: 9758581 Change-Id: Ie1c570a15f6590a1ee6c271e3b989c48079b468a
* | Merge "Enhancement for OnInfo callback on DRM Framework" into klp-devJeff Tinker2013-08-261-2/+115
|\ \
| * | Enhancement for OnInfo callback on DRM FrameworkTakeshi Aimi2013-08-231-2/+115
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | In DRM framework, plugins can transmit DrmInfoEvent to Java layer. Although DrmInfoEvent has several entries, current implementation can only convey integer and String. This change enables plugins uto propagate a hashmap to Java layer. The hashmap can have one or more Strings and one byte array as value. Changes are made by Sony Corporation. bug: 10459159 Change-Id: Ic19265d4ad3db4eda66a3c27e1e08873a8f2a4d7 (cherry picked from commit 4f782bf0cb69929ebf03de239e2c9bf8e82adf5e)
* | Merge "wifi-display: pass session info to wifi display settings" into klp-devChong Zhang2013-08-231-1/+1
|\ \
| * | wifi-display: pass session info to wifi display settingsChong Zhang2013-08-211-1/+1
| | | | | | | | | | | | | | | | | | Bug: 9371882 Change-Id: I9e4b8c2154b03ce8ff3e14c465a5224bb6e8db9a
* | | Merge "MediaPlayer: add listener for raw track data" into klp-devChong Zhang2013-08-231-0/+2
|\ \ \ | |_|/ |/| |
| * | MediaPlayer: add listener for raw track dataChong Zhang2013-08-191-0/+2
| | | | | | | | | | | | | | | | | | Bug: 10326117 Change-Id: I2c0bdf8adc67b11f8dc633423bee66897548f181
* | | Merge "Add ability to test supported content types to MediaDrm" into klp-devJeff Tinker2013-08-221-1/+1
|\ \ \
| * | | Add ability to test supported content types to MediaDrmJeff Tinker2013-08-221-1/+1
| | | | | | | | | | | | | | | | | | | | bug: 10244066 Change-Id: I317f05b146db962c271893f6208890a5a6c396f1
* | | | Camera1: Rename setPreviewTexture to ...Target for clarityEino-Ville Talvala2013-08-211-3/+3
| | | | | | | | | | | | | | | | | | | | Bug: 10312644 Change-Id: I19976188f0359bfd177209fb40145defdae9c740
* | | | Camera1: Set preview to be asynchronous, and remove dead codeEino-Ville Talvala2013-08-212-4/+4
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use the controlledByApp flag to make sure application-bound preview buffer queue is asynchronous as before - Remove setPreviewDisplay in service, since it is no longer in the binder interface - Rename setPreviewTexture to setPreviewTarget, to make it clear it's the only game in town now. Rename only on the binder level and service for now. Bug: 10312644 Change-Id: Icd33a462022f9729a63dc65c69b755cb7969857e
* | | AudioSystem: new audioflinger restart detectionEric Laurent2013-08-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add a specific method to AudioSystem for AudioService to poll for AudioFlinger service restart instead of relying on current callback mechanism which is flaky. Bug: 9693068. Change-Id: Ie88bc9d25033503bc5cd2fa9d8c754d0f8045b8f
* | | Merge "Refactor CameraService to handle errors properly." into klp-devRuben Brunk2013-08-174-9/+29
|\ \ \ | |_|/ |/| |
| * | Refactor CameraService to handle errors properly.Ruben Brunk2013-08-164-9/+29
| |/ | | | | | | | | | | | | | | Bug: 10361136 -Connect calls now return status_t error flags. Change-Id: Idca453b111e5df31327f6c99ebe853bb2e332b95
* | Merge "Add MEDIA_STARTED/PAUSED/STOPPED events to media players" into klp-devLajos Molnar2013-08-161-0/+3
|\ \ | |/ |/|
| * Add MEDIA_STARTED/PAUSED/STOPPED events to media playersLajos Molnar2013-08-151-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | This is needed for the MediaTimeProvider java interface, so it does not continually poll for current media time. Note: NuPlayer and AwesomePlayer do not correctly handle stop (pause instead), so for those we will signal PAUSED. Signed-off-by: Lajos Molnar <lajos@google.com> Change-Id: I3c61e1bda475f131323f475c18a42e3ec66c9ae1 Bug: 10326117
* | Merge "You can now opt-in to having the video decoder push blank buffers to ↵Andreas Huber2013-08-151-1/+2
|\ \ | | | | | | | | | the" into klp-dev
| * | You can now opt-in to having the video decoder push blank buffers to theAndreas Huber2013-08-141-1/+2
| | | | | | | | | | | | | | | | | | | | | surface on the transition from executing->idle by specifying the key "push-blank-buffers-on-shutdown" with a value of 1 in the call to configure. Change-Id: I1155fccf89f18e717728c985e590651597595515
* | | Merge "Check adaptive playback support via CodecCapabilities" into klp-devLajos Molnar2013-08-142-1/+7
|\ \ \ | |/ / |/| |
| * | Check adaptive playback support via CodecCapabilitiesLajos Molnar2013-08-132-1/+7
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added flags field to CodecCapabilities, so that applications can query whether codecs support various features. For now added one video-decoder feature: kFlagSupportsAdaptivePlayback Media playback applications can query it to see if a codec supports seamless resolution changes, such as by supporting dynamic output buffers. Signed-off-by: Lajos Molnar <lajos@google.com> Change-Id: I09da46e8ab6b8645fa2749e33128e49eda2e865b Related-to-bug: 7093648
* | Merge "Optionally repeat the previously submitted frame to the encoder" into ↵Andreas Huber2013-08-132-0/+3
|\ \ | | | | | | | | | klp-dev
| * | Optionally repeat the previously submitted frame to the encoderAndreas Huber2013-08-132-0/+3
| |/ | | | | | | | | | | | | if no new frame has been delivered by surface flinger within the timeout interval. Change-Id: I282f1b726dfe5646b178d7858d6f5d4f5a264fde
* | Fix potential leak of audio input handle.Jeff Brown2013-08-091-8/+1
|/ | | | | | | | | | | | | The audio input handle is ultimately owned by the audio recorder object but it could be dropped on the floor if an error occurred before that object was fully initialized. Rearranged some of the argument validation and merged getInput_l with openRecord_l to simplify the code and prevent such a leak from occurring. Bug: 10265163 Change-Id: I124dce344b1d11c2dd66ca5e2c9aec0c52c230e2
* Merge "Cleanup comments for the new control block implementation"Glenn Kasten2013-08-072-17/+4
|\
| * Cleanup comments for the new control block implementationGlenn Kasten2013-08-022-17/+4
| | | | | | | | | | | | | | | | There was some obsolete and incomplete text left over after the new control block code was submitted. This cleans up all those comments to be accurate again. Change-Id: Ic52f5869cb723cde25d709514d6deea6aa6f20aa
* | Merge "Adds a drm resource busy error, removes some deprecated errors"Jeff Tinker2013-08-071-4/+1
|\ \
| * | Adds a drm resource busy error, removes some deprecated errorsJeff Tinker2013-08-021-4/+1
| | | | | | | | | | | | | | | Change-Id: Id719fb6df9c9d955ac24803082d08f2a4a5bc766 related-to-bug: 9695816
* | | Merge "IOMX: add updateGraphicBufferInMeta method for metadata mode"Lajos Molnar2013-08-061-0/+4
|\ \ \
| * | | IOMX: add updateGraphicBufferInMeta method for metadata modeLajos Molnar2013-08-061-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is used to set the handle in the metadata buffer that is valid in the mediaserver process, as well as to keep a reference for the graphic buffers in BufferMeta. Change-Id: I46bb68d8bed894f357eeeb25368360d11b276634 Signed-off-by: Lajos Molnar <lajos@google.com>
* | | | separte producer and consumer interfacesMathias Agopian2013-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 9265647 Change-Id: Iefabc11e4bd2e2e8ffd31160476c450affe6629c
* | | | Merge "AudioRecord notification frames"Glenn Kasten2013-08-061-1/+4
|\ \ \ \
| * | | | AudioRecord notification framesGlenn Kasten2013-08-021-1/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I76ec536d1504eb9a558178b62bf225aace4b40d1
* | | | | Merge "AudioRecord::openRecord_l now take flags"Glenn Kasten2013-08-061-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | AudioRecord::openRecord_l now take flagsGlenn Kasten2013-08-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new parameter 'flags' of type audio_input_flags_t will be used for requesting a fast track, but is currently ignored. Change-Id: If68dfda8b2d4eaaca42927d721b4630c47f71f3b
* | | | | Merge "IAudioFlinger::openRecord track_flags_t flags is in/out"Glenn Kasten2013-08-051-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | IAudioFlinger::openRecord track_flags_t flags is in/outGlenn Kasten2013-08-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow AudioFlinger to tell client it is denying a request. Change-Id: Iff2be3ad6636371bbda9c9899a283c94620c1f06
* | | | | Merge "AudioRecord::set and constructor now take flags"Glenn Kasten2013-08-051-2/+6
|\ \ \ \ \ | |/ / / /
| * | | | AudioRecord::set and constructor now take flagsGlenn Kasten2013-08-021-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new optional parameter 'flags' of type audio_input_flags_t will be used for requesting a fast track. Change-Id: Ia7e070cb57c833e608352da354fb30dc26df6918
* | | | | Merge "Make AudioRecord and AudioTrack comments more similar"Glenn Kasten2013-08-052-3/+12
|\ \ \ \ \
| * | | | | Make AudioRecord and AudioTrack comments more similarGlenn Kasten2013-08-022-3/+12
| | |_|_|/ | |/| | | | | | | | | | | | | Change-Id: I122a7cf7bfc162090cb27f37c325db7a23985bc7
* | | | | Merge "AudioRecord callback thread waits for priority boost"Glenn Kasten2013-08-051-0/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | AudioRecord callback thread waits for priority boostGlenn Kasten2013-08-021-0/+1
| |/ / / | | | | | | | | | | | | Change-Id: Iae38fa4ac20a45751566169213a08a15deb0a2f6
* | | | Merge "Remove default parameters for AudioTrack"Glenn Kasten2013-08-051-11/+11
|\ \ \ \
| * | | | Remove default parameters for AudioTrackGlenn Kasten2013-08-021-11/+11
| |/ / / | | | | | | | | | | | | | | | | | | | | The defaults aren't needed; all users must know these values. Change-Id: I0c1c97cb80bfea8e69a7cfa53ec85a91a8d48bb5
* | | | AudioRecord has no default sample rateGlenn Kasten2013-08-021-2/+0
|/ / / | | | | | | | | | Change-Id: I72feefdd6f3a623fd3669b80d4b264518fdc0929
* | | Merge "Report underruns for fast tracks also"Glenn Kasten2013-08-021-0/+9
|\ \ \
| * | | Report underruns for fast tracks alsoGlenn Kasten2013-07-311-0/+9
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a regression that was introduced earlier by commit 9f80dd223d83d9bb9077fb6baee056cee4eaf7e5 called "New control block for AudioTrack and AudioRecord". That commit broke underrun reporting for fast tracks. Also remove Track::mUnderrunCount, which counted the number of underrun events, and was only used by dumpsys media.audio_flinger. Now dumpsys media.audio_flinger reports the number of underrun frames, Isolated underrun-related control block accesses via the proxy, so that the server is not directly poking around in the control block. The new proxy APIs are AudioTrackServerProxy::getUnderrunFrames() and AudioTrackServerProxy::tallyUnderrunFrames(). getUnderrunFrames() returns a rolling counter for streaming tracks, or zero for static buffer tracks which never underrun, but do a kind of 'pause' at end of buffer. tallyUnderrunFrames() increments the counter by a specified number of frames. Change-Id: Ib31fd73eb17cbb23888ce3af8ff29f471f5bd5a2
* | | Unregister any handlers still registered on now "dead" ALoopersAndreas Huber2013-07-311-0/+1
|/ / | | | | | | | | | | | | upon the death of an ALooper. Change-Id: I64c0835b8db04486204f3d0fa7173ee53708a116 related-to-bug: 10106648
* | Remove default channel mask in AudioRecord constructor and set()Glenn Kasten2013-07-301-8/+8
| | | | | | | | Change-Id: I22ad4ba8777842bf6705e79c6ad796fdb9a4104c