summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge "Remove timing jitter during startup of audio" into jb-mr2-devEric Laurent2013-05-031-0/+1
|\
| * Remove timing jitter during startup of audioGlenn Kasten2013-04-231-0/+1
* | Support MediaCodec::getOutputFormat for encodersAndreas Huber2013-04-301-0/+4
|/
* Merge "3rd time's the charm, right? Fix another instance where MediaCodec wou...Andreas Huber2013-04-221-0/+1
|\
| * 3rd time's the charm, right? Fix another instance where MediaCodec wouldAndreas Huber2013-04-191-0/+1
* | A flush of a video decoder connected to a native window must reclaimAndreas Huber2013-04-191-1/+5
|/
* Add new error codes for DRM to improve error reportingJeff Tinker2013-04-171-0/+2
* Merge "MediaMuxer prefer not to use the MPEG4Writer in real time recording mo...ztenghui2013-04-152-1/+9
|\
| * MediaMuxer prefer not to use the MPEG4Writer in real time recording mode.ztenghui2013-04-152-1/+9
* | ACodec now signals an error if the mediaserver died while it is inAndreas Huber2013-04-111-0/+2
* | Add support for common encryptionMarco Nelissen2013-04-083-0/+7
* | Merge "Implement async event callout from drm plugin to Java app" into jb-mr2...Jeff Tinker2013-04-052-0/+51
|\ \
| * | Implement async event callout from drm plugin to Java appJeff Tinker2013-04-032-0/+51
* | | Merge "MediaDrm API update" into jb-mr2-devJeff Tinker2013-04-021-13/+49
|\ \ \ | |/ / | | / | |/ |/|
| * MediaDrm API updateJeff Tinker2013-04-011-13/+49
* | Merge "Camera: Add input side to camera3 HAL device" into jb-mr2-devEino-Ville Talvala2013-03-281-1/+19
|\ \
| * | Camera: Add input side to camera3 HAL deviceEino-Ville Talvala2013-03-271-1/+19
* | | ToneGenerator: fix truncated tonesEric Laurent2013-03-271-0/+1
|/ /
* | Merge "Camera: Add hotplug support (for fixed # of cameras)" into jb-mr2-devIgor Murashkin2013-03-271-5/+6
|\ \ | |/ |/|
| * Camera: Add hotplug support (for fixed # of cameras)Igor Murashkin2013-03-261-5/+6
* | Identify network servers and clients with a OS version related stringAndreas Huber2013-03-261-0/+3
* | Merge "Load crypto plugins from additional shared libraries" into jb-mr2-devJeff Tinker2013-03-251-1/+1
|\ \ | |/ |/|
| * Load crypto plugins from additional shared librariesJeff Tinker2013-03-221-1/+1
* | Merge "ICameraServiceListener.h: Add STATUS_ENUMERATING enum" into jb-mr2-devIgor Murashkin2013-03-221-2/+21
|\ \ | |/ |/|
| * ICameraServiceListener.h: Add STATUS_ENUMERATING enumIgor Murashkin2013-03-211-2/+21
* | Merge "Add the presentation rotation support" into jb-mr2-devztenghui2013-03-201-2/+12
|\ \
| * | Add the presentation rotation supportztenghui2013-03-151-2/+12
| |/
* | Merge "Implementing MediaDrm APIs" into jb-mr2-devJeff Tinker2013-03-202-0/+91
|\ \ | |/ |/|
| * Implementing MediaDrm APIsJeff Tinker2013-03-132-0/+91
* | Merge "Make limitations of MPEG4Writer explicit" into jb-mr2-devTenghui Zhu2013-03-141-0/+6
|\ \
| * | Make limitations of MPEG4Writer explicitJames Dong2013-03-141-0/+6
* | | Merge "remove uses of Surface in favor or IGraphicBufferProducer" into jb-mr2...Mathias Agopian2013-03-137-14/+8
|\ \ \ | |_|/ |/| |
| * | remove uses of Surface in favor or IGraphicBufferProducerMathias Agopian2013-03-127-14/+8
* | | Squashed commit of the following:Andreas Huber2013-03-121-0/+3
|/ /
* | (Camera)ProCamera: Remove unused functions from binder interfaceIgor Murashkin2013-03-114-44/+18
|/
* Merge "Clean up the native code to match Java update" into jb-mr2-devztenghui2013-03-081-2/+17
|\
| * Clean up the native code to match Java updateztenghui2013-03-081-2/+17
* | Merge "Correct MediaCodec + Surface behavior" into jb-mr2-devAndy McFadden2013-03-062-0/+5
|\ \
| * | Correct MediaCodec + Surface behaviorAndy McFadden2013-03-052-0/+5
* | | Merge "Add template class SingleStateQueue" into jb-mr2-devGlenn Kasten2013-03-062-0/+132
|\ \ \ | |/ / |/| |
| * | Add template class SingleStateQueueGlenn Kasten2013-03-052-0/+132
* | | Merge "Implement Surface input to MediaCodec." into jb-mr2-devAndy McFadden2013-03-054-0/+65
|\ \ \ | |/ / |/| |
| * | Implement Surface input to MediaCodec.Andy McFadden2013-03-044-0/+65
| |/
* | Miscellaneous cleanupGlenn Kasten2013-03-041-1/+1
|/
* media.log cleanupGlenn Kasten2013-03-011-2/+2
* ProCamera: Add CpuConsumer asynchronous mode supportIgor Murashkin2013-02-281-0/+7
* Camera: Drop ProCamera connections when a Camera connection happensIgor Murashkin2013-02-284-3/+88
* Merge "camera_client: refactor Camera/ProCamera commonalities into BasicCamer...Igor Murashkin2013-02-274-106/+170
|\
| * camera_client: refactor Camera/ProCamera commonalities into BasicCameraIgor Murashkin2013-02-264-106/+170
* | Revert "Logging to investigate a crash"Glenn Kasten2013-02-271-11/+1
|/