summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* am 0f95fadb: am 7e2c0a15: Merge "Support querying active record sources" ↵Jean-Michel Trivi2012-10-102-0/+3
|\ | | | | | | | | | | | | into jb-mr1-dev * commit '0f95fadb8a3ee402f2c51a932a06f1f685ab2d35': Support querying active record sources
| * Support querying active record sourcesJean-Michel Trivi2012-10-102-0/+3
| | | | | | | | | | | | | | | | | | Add support for querying whether there is currently a recording underway from the specified audio source. Bug 7314859 Change-Id: I986b231a10ffd368b08ec2f9c7f348d28eaeb892
* | am ce42b94a: am 4401091b: Merge "Better power savings with wifi display ↵Andreas Huber2012-10-031-16/+26
|\ \ | |/ | | | | | | | | | | code." into jb-mr1-dev * commit 'ce42b94ae4363c97945732fb8698675fa8b0861a': Better power savings with wifi display code.
| * Better power savings with wifi display code.Andreas Huber2012-10-031-16/+26
| | | | | | | | | | | | | | | | No more polling the encoder for work to do, the encoder instead notifies if there's activity. Change-Id: Ia707211b4f5c5a6e6b70d750233d204a2d6bb778 related-to-bug: 7248248
* | am 4cb8a163: am 1c730d33: Merge "ALooper::GetNowUs() now relies on ↵Andreas Huber2012-10-012-10/+0
|\ \ | |/ | | | | | | | | | | systemTime instead of gettimeofday." into jb-mr1-dev * commit '4cb8a16365e2342e1ee99906d406de939023f389': ALooper::GetNowUs() now relies on systemTime instead of gettimeofday.
| * ALooper::GetNowUs() now relies on systemTime instead of gettimeofday.Andreas Huber2012-10-012-10/+0
| | | | | | | | | | Change-Id: Ia31eb0940b02581327a8bf51af6df135f9ab6de3 related-to-bug: 7266324
* | am 5db05850: am 1a0d1670: Merge "Optionally have SurfaceMediaSource return ↵Andreas Huber2012-10-011-0/+5
|\ \ | |/ | | | | | | | | | | absolute timestamps" into jb-mr1-dev * commit '5db05850d02939e63800ae5b1fcf53a767f2e895': Optionally have SurfaceMediaSource return absolute timestamps
| * Optionally have SurfaceMediaSource return absolute timestampsAndreas Huber2012-10-011-0/+5
| | | | | | | | | | | | | | based on systemTime(). Change-Id: I2eff15dd149a4b737d6e7473d1907cf0c80b6b38 related-to-bug: 7266706
* | am c57979de: am 0e1d7164: Remove double negatives from SurfaceMediaSourceAndreas Huber2012-10-011-2/+2
|\ \ | |/ | | | | | | * commit 'c57979deb28e8c4e4809796eebdc92820ed461e2': Remove double negatives from SurfaceMediaSource
| * Remove double negatives from SurfaceMediaSourceAndreas Huber2012-10-011-2/+2
| | | | | | | | | | | | | | ensure mStarted actually reflects the state of SurfaceMediaSource Change-Id: I92557896993ad8da23fe6940e997402ad63b8cbc related-to-bug: 7258622
* | am 558301cb: am d13df246: Merge "Enable write side of MonoPipe to be ↵Glenn Kasten2012-10-011-0/+13
|\ \ | |/ | | | | | | | | | | shutdown" into jb-mr1-dev * commit '558301cb1ecc3679997593905230bd3589e736a4': Enable write side of MonoPipe to be shutdown
| * Merge "Enable write side of MonoPipe to be shutdown" into jb-mr1-devGlenn Kasten2012-09-301-0/+13
| |\
| | * Enable write side of MonoPipe to be shutdownGlenn Kasten2012-09-281-0/+13
| |/ |/| | | | | | | Bug: 7253033 Change-Id: Iea8390763b59ffa7a8e2a6b77dd04ea23442698f
| * DO NOT MERGE: Remove experimental parameters for burst modeJames Painter2012-09-281-10/+0
|/ | | | | Bug: 7248756 Change-Id: I3aaf2da4791b2a13e1e788b2914e4c51c529a75d
* Various improvements to a cleaner shutdown of the wifi display connection.Andreas Huber2012-09-281-0/+6
| | | | | Change-Id: Id029a89939e53c2bd1d20e572d3975ec2795c239 related-to-bug: 7247918
* Implement android.media.AudioManager.getProperty()Glenn Kasten2012-09-252-0/+11
| | | | | Bug: 6635041 Change-Id: I3386a4a6c226bc4eceaf65556119e4fb15f73224
* Remove legacy code and APIs in wifi display related code.Andreas Huber2012-09-211-6/+0
| | | | Change-Id: Ia010e7a00534f9356b3247369d0ffd65591d91aa
* HDCP module binderizedAndreas Huber2012-09-191-0/+2
| | | | Change-Id: I866768b1e3f3b232f1934a35b65f66befc12f3f6
* Now we only support a single client connectionAndreas Huber2012-09-171-2/+0
| | | | | | | | | | | and it cannot be initiated from the local interface address for security reasons. Also, there's at most one playback session active at any time, and when it dies we shutdown the client connection altogether and signal an error to the listener. related-to-bug: 7139784 Change-Id: Ia8d02bc994ce9986936947ddda1f2a3dddbf5714
* Merge "Allow OMXCodec to specify an output color format for OMX decoder ↵James Dong2012-09-141-1/+1
|\ | | | | | | component" into jb-mr1-dev
| * Allow OMXCodec to specify an output color format for OMX decoder componentJames Dong2012-09-101-1/+1
| | | | | | | | | | | | | | | | The output color format is specified via the meta argument in OMXCodec::Create() o related-to-bug: 7122195 Change-Id: Id3247686b893af25cc190685201e53ad34b0399c
* | Support IDR requests in wifi display, MediaCodec and ACodec.Andreas Huber2012-09-132-0/+8
| | | | | | | | Change-Id: I596cf8dd61b63465437f78413186fad2be287244
* | Throttle SurfaceMediaSource.Andreas Huber2012-09-131-0/+6
| | | | | | | | Change-Id: I214ce60f8d94df9c07041577e34ed1ad5e199fdb
* | Camera: Add HDR scene mode constants.Eino-Ville Talvala2012-09-101-0/+4
| | | | | | | | Change-Id: I78b1f8ca3c1a03222ed363db26d9a09cf0b13528
* | Camera2: Add a burst mode skeleton.James Painter2012-09-071-2/+12
| | | | | | | | | | Bug: 6243944 Change-Id: I7f496ca1051571c68fdd99a6f85bf6a908a4e29a
* | Add a small hook to support gapless in AAH.John Grossman2012-09-061-4/+4
| | | | | | | | Change-Id: Ie07eca6b45142bdd83412ee0e38d732a4c355630
* | Merge "Update remote display API." into jb-mr1-devJeff Brown2012-09-062-7/+6
|\ \ | |/ |/|
| * Update remote display API.Jeff Brown2012-09-052-7/+6
| | | | | | | | | | | | | | | | | | | | | | Renamed disconnect() to dispose() to emphasize the fact that this method is intended to clean up the IRemoteDisplay completely, not just temporarily disconnect the current client (which might be useful someday). Other minor tweaks. Change-Id: I1209639eb0cd8af09c724206642d7e52aab48257
* | Merge "Fragmented mp4 extractor" into jb-mr1-devMarco Nelissen2012-09-051-0/+2
|\ \ | |/ |/|
| * Fragmented mp4 extractorMarco Nelissen2012-09-051-0/+2
| | | | | | | | | | | | | | Still experimental. Set property "media.stagefright.use-fragmp4" to true to enable. Change-Id: I210b9c5b5164b5c5eefc31309845ee881ac7db8e
* | Implement remote display service stubs.Jeff Brown2012-09-053-0/+154
|/ | | | Change-Id: I582ed000026bba6d116db8304e15a3c52f8a9a01
* Configure the SurfaceMediaSource to emit the same number of buffersAndreas Huber2012-09-041-0/+3
| | | | | | | as the video encoder allocates for its input. Do this before connecting the bufferqueue through surface flinger. Change-Id: Ibc81db1359afe2d88fdb75b23fadae65c8a6f7cc
* Merge "Added an additional virtual method IStreamSource::flags()." into ↵Andreas Huber2012-08-311-0/+6
|\ | | | | | | jb-mr1-dev
| * Added an additional virtual method IStreamSource::flags().Andreas Huber2012-08-311-0/+6
| | | | | | | | Change-Id: I89e62d84328e12f08c8f73cbfd53cfb42569de97
* | Update audio commentsGlenn Kasten2012-08-301-1/+1
|/ | | | Change-Id: Ie7504d0ddb252f7e4d4f99ed0b44cfc7b1049816
* Merge "Only run the wifi display RTSP server on demand, and only on the wifi ↵Andreas Huber2012-08-301-1/+5
|\ | | | | | | direct" into jb-mr1-dev
| * Only run the wifi display RTSP server on demand, and only on the wifi directAndreas Huber2012-08-301-1/+5
| | | | | | | | | | | | interface. Change-Id: I7d3c44cb79cd40e73499f2d7ccf35c69b628e6d7
* | Merge "Move libnbaio out of AudioFlinger" into jb-mr1-devGlenn Kasten2012-08-3014-0/+1100
|\ \ | |/ |/|
| * Move libnbaio out of AudioFlingerGlenn Kasten2012-08-3014-0/+1100
| | | | | | | | | | | | | | | | | | | | libnbaio is now a separate shared library from AudioFlinger, rather than a static library used only by AudioFlinger. AudioBufferProvider interface is now also independent of AudioFlinger, moved to include/media/ Change-Id: I9bb62ffbc38d42a38b0af76e66da5e9ab1e0e21b
* | Prepare for transmitting audio through AudioSource.Andreas Huber2012-08-301-5/+14
| | | | | | | | | | | | | | | | AudioSource can now be configured to output buffers timestamped based on looper time (absolute) instead of based on systemTime() relative to start time. Change-Id: I8eca42648eb50033ac4aafbe5daac64a98a40690
* | Merge "Initial checkin of support for acting as a wifi display source" into ↵Andreas Huber2012-08-292-0/+13
|\ \ | | | | | | | | | jb-mr1-dev
| * | Initial checkin of support for acting as a wifi display sourceAndreas Huber2012-08-292-0/+13
| |/ | | | | | | Change-Id: I08f17efa0c7d007e17408feb7d4fbef0a19f531a
* | Preliminary support for HDCP as a binder service for wifi display support.Andreas Huber2012-08-291-0/+78
|/ | | | Change-Id: Ie0de1c086c629a668d1c7863992eef56fb94157c
* Merge "Fixed a native crash due to unexpected state at destroy time when ↵James Dong2012-08-271-0/+2
|\ | | | | | | encoder component's source fails to start" into jb-mr1-dev
| * Fixed a native crash due to unexpected state at destroy time when encoder ↵James Dong2012-08-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | component's source fails to start o Encoder component initializes to be in the state of EXECUTING before its source gets started, because we wanted to be able to configure the source to use the advertised number of input buffers. However, if the source fails to start, then the encoder ends up in the state of EXECUTING when OMXCodec object gets destroyed. As a result, the assertion on the expected state in OMXCodec's constructor fails. The fix is to stop the video encoder component right way when its source fails to start so to bring the state of the encoder component back to the expected state. o related-to-bug: 7045494 Change-Id: I6d4a221eb809d7137f53e58098a04816998f7a25
* | SurfaceMediaSource: a few fixes / cleanupsJamie Gennis2012-08-261-6/+3
| | | | | | | | | | | | | | | | - Remove the setting of mStopped to true in onBuffersReleased - Cleaned up a few function call logs - Removed the 'reset' method. Change-Id: I56bab1d5cb2f3e6d59d54698c2e045d796d1849f
* | Allow directly setting a DataSource for NuMediaExtractorMarco Nelissen2012-08-241-0/+2
|/ | | | | | | | This adds NuMediaExtractor::setDataSource(const sp<DataSource> &source), which some new code under frameworks/av will use to let applications provide a custom data source for extractors. Change-Id: I8fb743441d04b4eadbda3c2d76858c3d60e2a3b2
* Merge "Let getOriginalMimeType() take a fd passed from drm java ↵James Dong2012-08-221-1/+2
|\ | | | | | | applications" into jb-mr1-dev
| * Let getOriginalMimeType() take a fd passed from drm java applicationsJames Dong2012-08-101-1/+2
| | | | | | | | | | | | | | | | | | This patch enables the drm framework to avoid opening files directly. As a result, the drm framework no longer needs the sdcard read permision. o related-to-bug: 6426185 Change-Id: Ib176c35ef4b1a1a405e8e954f19a7985266f2510
* | Merge "Revert "Swap the order of creating IAudioTrack and thread"" into ↵Glenn Kasten2012-08-201-1/+1
|\ \ | | | | | | | | | jb-mr1-dev