summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* remove files that moved to frameworks/nativeMathias Agopian2012-03-0798-13287/+0
| | | | Change-Id: I140d291e520097b1148930f736823650e08488f7
* IAudioFlingerClient::ioConfigChanged param2 constGlenn Kasten2012-03-062-3/+3
| | | | | | | | | The 3rd parameter (param2) to AudioFlingerClient::ioConfigChanged is used as an input. So changed it from void * to const void *. It is then cast to const OutputDescriptor * or const audio_stream_type_t * depending on the event. Change-Id: Ieec0d284f139b74b3389b5ef69c7935a8e5650ee
* Merge "AudioTrack: relax check on minimum buffer size"Eric Laurent2012-03-061-2/+4
|\
| * AudioTrack: relax check on minimum buffer sizeEric Laurent2012-03-051-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | Current AudioTrack implementation enforces that the requested audio buffer size is at least corresponding the audio latency. This requirement is too strong and leads to problems with current stagefright and AudioSink implementations when playing over output streams with long latency. Ultimately, the AudioSink design should be changed to specify a minimum buffer size in time or frames units but not in buffer count units. Change-Id: I8ba603956f92ac49143a8249572665aa548f2f0f
* | Merge "Remove unused code - MediaSourceSplitter"James Dong2012-03-061-193/+0
|\ \
| * | Remove unused code - MediaSourceSplitterJames Dong2012-03-051-193/+0
| |/ | | | | | | Change-Id: Icf37832a1c234501ee3ff91ff13eece2242425ae
* | Merge "Add channel mask in AudioSink"Jean-Michel Trivi2012-03-052-1/+4
|\ \ | |/ |/|
| * Add channel mask in AudioSinkJean-Michel Trivi2012-03-022-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for specifying a channel mask when opening an AudioSink. This parameter does not replace the channel count parameter in order to not have to duplicate the logic to derive a mask from the channel count everywhere an AudioSink is used without a known mask. A mask of 0 (CHANNEL_MASK_USE_CHANNEL_ORDER) means a mask will be automatically derived from the number of channels. Update existing AudioSink implementations to use the channel mask, and users of AudioSink to specify the mask if available, and CHANNEL_MASK_USE_CHANNEL_ORDER otherwise. Change-Id: Ifa9bd259874816dbc25ead2b03ea52e873cff474
* | Merge "Fix typos and line length in AudioRecord comments"Glenn Kasten2012-03-021-5/+6
|\ \ | |/ |/|
| * Fix typos and line length in AudioRecord commentsGlenn Kasten2012-02-241-5/+6
| | | | | | | | Change-Id: I85cfb9a2b9b3ade098161aa7687b4d4f7eb226ea
* | Switch the way we configure for MediaPlayer retransmission.John Grossman2012-03-013-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a cherry-pick of I6ab07d89b2eeb0650e634b8c3b7a0b36aba4e7dd with merge conflicts addressed by hand and additional changes made in response to code review feedback. Move in the direction of a more publishable API for configuring a media player for retransmission. It used to be that we used a custom invoke and a modified URL (prefixed with aahTX://). There are many issues with this technique and it was never meant to stand the test of time. This CL gets rid of all that. A new (but currently hidden) method was introduced to the java level MediaPlayer API, called setRetransmitTarget(InetSocketAddress), which allows an app writer to set the retransmit target. For now, this method needs to be called before a call to setDataSource (which is pretty unusual for the MediaPlayer API) because this mid level code uses this as a cue to instantiate an aahTX player instead of relying on the data source to select a player. When retranmit functionality becomes part of the existing android player implemenation, this set-retrans-before-set-data-source behavior can go away, along with the aahTX player itself. Change-Id: I3b46c5227bbf69acb2f3cc4f93cfccad9777be98 Signed-off-by: John Grossman <johngro@google.com>
* | Merge "Instead of hardcoding OMX component names in our code, support"Andreas Huber2012-03-014-23/+123
|\ \
| * | Instead of hardcoding OMX component names in our code, supportAndreas Huber2012-03-014-23/+123
| | | | | | | | | | | | | | | | | | a config file instead. Change-Id: I5835903ab9f1c4a22ccc605ca99ed966767adf57
* | | Merge "renamed audio policy output flag."Eric Laurent2012-03-012-2/+2
|\ \ \ | |/ / |/| |
| * | renamed audio policy output flag.Eric Laurent2012-03-012-2/+2
| | | | | | | | | | | | | | | | | | | | | Renamed AUDIO_POLICY_OUTPUT_FLAG_INDIRECT to AUDIO_POLICY_OUTPUT_FLAG_NONE which is more appropriate. Change-Id: Ia14d60397df0f2dcd9bea0186400a09da35bc104
* | | Merge "Added permission check for all sensitive drm API calls"James Dong2012-02-291-0/+1
|\ \ \ | |/ / |/| |
| * | Added permission check for all sensitive drm API callsJames Dong2012-02-281-0/+1
| | | | | | | | | | | | | | | | | | o all drm calls using a DecryptHandle now check the permission before proceeding Change-Id: Ic992a991357876c6e4bfbfab4f5eec1fa0634a13
* | | Merge "AudioRecord const methods"Glenn Kasten2012-02-291-8/+8
|\ \ \
| * | | AudioRecord const methodsGlenn Kasten2012-02-281-8/+8
| |/ / | | | | | | | | | Change-Id: Ifae4fd7820b650aaca2b13c8658c292db1c46c0f
* | | Merge "get rid of MemoryHeapPmem"Mathias Agopian2012-02-291-79/+0
|\ \ \
| * | | get rid of MemoryHeapPmemMathias Agopian2012-02-271-79/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MemoryHeapPmem is not used any longer. PMEM is not a supported type of memory by the system anymore. a particular device might use PMEM and need something like MemoryHeapPmem, in this case this should be implemented in device specific code (HAL). This will most likely break older no longer supported targets. Change-Id: I434e4291219950018de8b793b0403bb2d92dd5cc
* | | Merge "Separate the notion of "stop" from that of "release", i.e."Andreas Huber2012-02-292-1/+18
|\ \ \
| * | | Separate the notion of "stop" from that of "release", i.e.Andreas Huber2012-02-282-1/+18
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | stop - means transition back to LOADED state and keeping the component instance allocated. release - means we get rid of the component completely. Change-Id: I40ad01ce70821faaad43f57999249904f9144924
* | | Merge "Moves TimedTextDriver.h into include/media/stagefright/timedtext."James Dong2012-02-281-0/+81
|\ \ \ | |/ / |/| |
| * | Moves TimedTextDriver.h into include/media/stagefright/timedtext.Insun Kang2012-02-271-0/+81
| | | | | | | | | | | | | | | | | | So that other players can include TimedTextDriver.h properly. Change-Id: I15e72bf655de8555eef6244a6c853c27a0828a1d
* | | move CursorWindow from libbinder to libandroidfwMathias Agopian2012-02-271-0/+0
| | | | | | | | | | | | Change-Id: I3b304e4f74e0d0ec8b20c57296c62449c9a0f792
* | | Removed dependecies between BufferQueue and SurfaceTextureDaniel Lam2012-02-272-21/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | Refactored SurfaceTexture and BufferQueue such that share no protected members. Created an consumer facing interface for BufferQueue in preparation of connecting SurfaceTexture and BufferQueue through a binder. Change-Id: I938e63e085128148c58d0e26c7213b30145c109f
* | | Merge "libutils: add a system-wide tracing utility"Jamie Gennis2012-02-271-0/+166
|\ \ \
| * | | libutils: add a system-wide tracing utilityJamie Gennis2012-02-261-0/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds some utility functionality for doing userland tracing into the kernel trace log. Change-Id: Id0a8cee9ea515b1d8765afd1cecf472a88b4b9e8
* | | | Merge "Revert "Removed dependecies between BufferQueue and SurfaceTexture""Jamie Gennis2012-02-272-152/+21
|\ \ \ \
| * | | | Revert "Removed dependecies between BufferQueue and SurfaceTexture"Daniel Lam2012-02-272-152/+21
| | | | | | | | | | | | | | | This reverts commit a631399f71dbc7659d2f241968f85d337726ae61
* | | | | fix libgui header locationMathias Agopian2012-02-2710-32/+30
| | | | | | | | | | | | | | | | | | | | Change-Id: Iec71706cdd4f29c6904993648ce873e83ef9cafe
* | | | | split utils/threads.h into multiple headersMathias Agopian2012-02-277-544/+779
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AndroidDefs.h - C/C++ enums and types Mutex.h - Mutex class declaration Condition.h - Condition class declaration RWLock.h - RWLock class declaration Thread.h - Thread class declaration AndroidThreads.h - low-level thread creation functions threads.h - includes all the above for backward source compatibility Change-Id: Ia2f80c175333b59a41d1720985810bb2346e94cb Note: implementations are still in Threads.cpp
* | | | | libagl shouldn't export anythingMathias Agopian2012-02-271-640/+0
| |_|/ / |/| | | | | | | | | | | Change-Id: Ia823dbc56aab2a0b8a6063df4348fe6baac124c6
* | | | Merge "Removed dependecies between BufferQueue and SurfaceTexture"Jamie Gennis2012-02-262-21/+152
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Removed dependecies between BufferQueue and SurfaceTextureDaniel Lam2012-02-222-21/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | Refactored SurfaceTexture and BufferQueue such that share no protected members. Created an consumer facing interface for BufferQueue in preparation of connecting SurfaceTexture and BufferQueue through a binder. Change-Id: Iff55e740e36a7f70c9f7a17ee7a5af38e3d21f0f
* | | remove dependency on android_native{s_priv|buffer}.hMathias Agopian2012-02-249-115/+16
| | | | | | | | | | | | Change-Id: Ie4b95f7061c240f37c504414259f92d72c4ffc89
* | | remove libui dependency on libEGLMathias Agopian2012-02-241-53/+0
| | | | | | | | | | | | Change-Id: I1194f04085637d5c384e134967249430cc43b6ee
* | | deprecate L_8, LA_88 and RGB_332 in sdkMathias Agopian2012-02-241-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | re-add support for pixelformats L_8, LA_88 and RGB_332 in libui for backward compatibility. This may or may not fix 6058926 Bug: 6049685 Change-Id: Ic1b8b4cc994522f7fe664da64c0ef76b98bc6d53
* | | am 32916f7a: am fc4215ee: am 2d03a93e: Merge "Xcode 4.3 compatibility checkin"Jean-Baptiste Queru2012-02-231-3/+3
|\ \ \ | | | | | | | | | | | | | | | | * commit '32916f7a22f2abf5c1e7021f44c2337ca172f2e5': Xcode 4.3 compatibility checkin
| * | | Xcode 4.3 compatibility checkinAl Sutton2012-02-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The update compiler in Xcode 4.3 (and 4.4) requires lookups into dependant bases of class templates to be qualified. This checkin fixes the issues raised by the compiler by implementing the this-> recommendation from the llvm page at http://clang.llvm.org/compatibility.html#dep_lookup_bases Signed-off-by: Al Sutton <al@funkyandroid.com>
| * | | Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)Steve Block2012-01-191-5/+5
| | | | | | | | | | | | | | | | Change-Id: I26f76452ac49e2890b14d133c065493d8df0fb4a
| * | | Rename (IF_)LOG() to (IF_)ALOG()Steve Block2012-01-181-2/+2
| | | | | | | | | | | | | | | | Change-Id: If49c81a2793182771c6160fbca93905daa6f44c1
* | | | Add new APIs AMessage::(set|find)Buffer to make it safer to passAndreas Huber2012-02-221-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | ABuffer objects through messages. Change-Id: I9f8b4e4c4767d0d70a0105e0c0813b754379b49d
* | | | Implementation of a java media codec interface and associated tools.Andreas Huber2012-02-226-30/+316
| |_|/ |/| | | | | | | | Change-Id: I13e54062d4de584355c5d82bb027a68aeaf2923b
* | | remove libui's dependency on libpixelflingerMathias Agopian2012-02-211-10/+2
| | | | | | | | | | | | | | | | | | this also remove support for unused pixelformats. Change-Id: I2c759a6d2daa740f3786ed62095def8047ae933d
* | | Merge "Limit the amount of audio record data in each buffer"James Dong2012-02-211-0/+1
|\ \ \
| * | | Limit the amount of audio record data in each bufferJames Dong2012-02-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | o The size of each input buffer should be less than or equal to kMaxBufferSize o related-to-bug: 5977032 Change-Id: I04343169aac3df56694aad4ba7967ec45337ad7e
* | | | frameworks/base refactoring.Mathias Agopian2012-02-1712-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | step 2: move libutils headers to their new home: androidfw Change-Id: I14624ba23db92a81f2cb929f104386e1fab293ef
* | | | frameworks/base refactoring.Mathias Agopian2012-02-179-29/+30
| | | | | | | | | | | | | | | | | | | | | | | | First step. Move libui includes to their new home: androidfw. Change-Id: Ic042b52fdba72f30edc3cc6339bf30b4c1b99662