summaryrefslogtreecommitdiffstats
path: root/include/media
Commit message (Expand)AuthorAgeFilesLines
* 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
* | ToneGenerator: fix truncated tonesEric Laurent2013-03-271-0/+1
|/
* Identify network servers and clients with a OS version related stringAndreas Huber2013-03-261-0/+3
* Load crypto plugins from additional shared librariesJeff Tinker2013-03-221-1/+1
* 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-135-8/+8
|\ \ \ | |_|/ |/| |
| * | remove uses of Surface in favor or IGraphicBufferProducerMathias Agopian2013-03-125-8/+8
| |/
* | Squashed commit of the following:Andreas Huber2013-03-121-0/+3
|/
* 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-061-0/+97
|\ \ \ | |/ / |/| |
| * | Add template class SingleStateQueueGlenn Kasten2013-03-051-0/+97
* | | 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
* Revert "Logging to investigate a crash"Glenn Kasten2013-02-271-11/+1
* CameraService and Stagefright: Support AppOpsEino-Ville Talvala2013-02-255-8/+28
* Merge "Revert "Temporary additional logging to investigate bug""Glenn Kasten2013-02-151-2/+2
|\
| * Revert "Temporary additional logging to investigate bug"Glenn Kasten2013-02-151-2/+2
* | Merge "Temporary additional logging to investigate bug"Glenn Kasten2013-02-151-2/+2
|\ \ | |/
| * Temporary additional logging to investigate bugGlenn Kasten2013-02-151-2/+2
* | Refactoring: Rename SurfaceTextureClient to SurfaceMathias Agopian2013-02-154-13/+13
|/
* Add support for fragmented mp4 to MPEG4ExtractorMarco Nelissen2013-02-151-0/+2
* Revert "Temporary additional logging to investigate bug"Glenn Kasten2013-02-141-2/+2
* Temporary additional logging to investigate bugGlenn Kasten2013-02-141-2/+2
* Add the native MediaMuxer support.ztenghui2013-02-122-0/+185
* Add support for querying if a stream is active remotelyJean-Michel Trivi2013-02-112-1/+8
* Allow for dynamic reconfiguration of the video bitrate usedAndreas Huber2013-02-072-0/+9
* Merge "Add media.log service based on NBLog"Glenn Kasten2013-02-011-0/+45
|\
| * Add media.log service based on NBLogGlenn Kasten2013-01-251-0/+45
* | Plumbing to reflect minor changes in the HDCP module API that allow forAndreas Huber2013-01-302-5/+21
|/
* Add non-blocking event logger NBLogGlenn Kasten2013-01-251-0/+188
* Merge "Start isolating control block accesses in a proxy"Glenn Kasten2012-12-212-0/+6
|\
| * Start isolating control block accesses in a proxyGlenn Kasten2012-12-122-0/+6
* | Merge "Remove unnecessary parameter"Glenn Kasten2012-12-212-6/+4
|\ \