summaryrefslogtreecommitdiffstats
path: root/media/libmedia
Commit message (Expand)AuthorAgeFilesLines
* am e63f850b: am da0dc0af: Add liblogYing Wang2013-04-091-1/+1
|\
| * Add liblogYing Wang2013-04-091-1/+1
* | am c2ccb7d9: am d5ef30b2: Merge "Implement async event callout from drm plugi...Jeff Tinker2013-04-043-1/+100
|\ \ | |/
| * Merge "Implement async event callout from drm plugin to Java app" into jb-mr2...Jeff Tinker2013-04-053-1/+100
| |\
| | * Implement async event callout from drm plugin to Java appJeff Tinker2013-04-033-1/+100
* | | am 1ef63d1a: am a56e1506: Merge "MediaDrm API update" into jb-mr2-devJeff Tinker2013-04-021-119/+289
|\ \ \ | |/ /
| * | Merge "MediaDrm API update" into jb-mr2-devJeff Tinker2013-04-021-119/+289
| |\ \ | | |/
| | * MediaDrm API updateJeff Tinker2013-04-011-119/+289
* | | am 0a2d8961: am 0fb6aabf: Merge "ToneGenerator: fix overflow in stopTone" int...Eric Laurent2013-04-021-2/+2
|\ \ \ | |/ /
| * | ToneGenerator: fix overflow in stopToneEric Laurent2013-03-281-2/+2
* | | am 2a2f0ece: am 681be039: ToneGenerator: fix truncated tonesEric Laurent2013-03-271-1/+31
|\ \ \ | |/ /
| * | ToneGenerator: fix truncated tonesEric Laurent2013-03-271-1/+31
* | | am 7ffe7689: am 2d595c0e: Merge "ToneGenerator: fix stop/destroy concurrency"...Eric Laurent2013-03-271-5/+10
|\ \ \ | |/ /
| * | ToneGenerator: fix stop/destroy concurrencyEric Laurent2013-03-261-5/+10
| |/
* | am 44ae449b: am 6386b50b: ToneGenerator: fix AudioTrack pointer initEric Laurent2013-03-261-1/+1
|\ \ | |/
| * ToneGenerator: fix AudioTrack pointer initEric Laurent2013-03-261-1/+1
* | am ead8ae2a: am 19c11e1c: Merge "ToneGenerator: optimize silent tone" into jb...Eric Laurent2013-03-261-1/+5
|\ \ | |/
| * Merge "ToneGenerator: optimize silent tone" into jb-mr2-devEric Laurent2013-03-261-1/+5
| |\
| | * ToneGenerator: optimize silent toneEric Laurent2013-03-251-1/+5
* | | am d247aa8c: am 351f28e2: Merge "Load crypto plugins from additional shared l...Jeff Tinker2013-03-251-1/+1
|\ \ \ | |/ /
| * | Load crypto plugins from additional shared librariesJeff Tinker2013-03-221-1/+1
| |/
* | am 81c859d6: am de5cdcae: Merge "Implementing MediaDrm APIs" into jb-mr2-devJeff Tinker2013-03-203-0/+567
|\ \ | |/
| * Merge "Implementing MediaDrm APIs" into jb-mr2-devJeff Tinker2013-03-203-0/+567
| |\
| | * Implementing MediaDrm APIsJeff Tinker2013-03-133-0/+567
* | | am 1be720b5: am a32fd0e2: Merge "remove uses of Surface in favor or IGraphicB...Mathias Agopian2013-03-142-4/+4
|\ \ \ | |/ /
| * | remove uses of Surface in favor or IGraphicBufferProducerMathias Agopian2013-03-122-4/+4
| |/
* | Merge "Propose new interpretation for setPosition and setLoop"Glenn Kasten2013-03-091-0/+45
|\ \ | |/ |/|
| * Propose new interpretation for setPosition and setLoopGlenn Kasten2013-01-071-0/+45
* | Merge "Add template class SingleStateQueue" into jb-mr2-devGlenn Kasten2013-03-063-0/+140
|\ \
| * | Add template class SingleStateQueueGlenn Kasten2013-03-053-0/+140
* | | Merge "Implement Surface input to MediaCodec." into jb-mr2-devAndy McFadden2013-03-051-20/+93
|\ \ \ | |/ / |/| |
| * | Implement Surface input to MediaCodec.Andy McFadden2013-03-041-20/+93
* | | Miscellaneous cleanupGlenn Kasten2013-03-041-3/+3
|/ /
* | am c0048178: Merge "Avoid invalid memory access when using extractMetadata()"Marco Nelissen2013-03-011-1/+16
|\ \
| * \ Merge "Avoid invalid memory access when using extractMetadata()"Marco Nelissen2013-03-011-1/+16
| |\ \
| | * | Avoid invalid memory access when using extractMetadata()Sangkyu Lee2013-02-281-1/+16
* | | | CameraService and Stagefright: Support AppOpsEino-Ville Talvala2013-02-252-1/+39
* | | | Refactoring: Rename SurfaceTextureClient to SurfaceMathias Agopian2013-02-151-1/+1
* | | | Add support for querying if a stream is active remotelyJean-Michel Trivi2013-02-112-1/+30
* | | | Merge "Add media.log service based on NBLog"Glenn Kasten2013-02-012-0/+95
|\ \ \ \
| * | | | Add media.log service based on NBLogGlenn Kasten2013-01-252-0/+95
* | | | | Plumbing to reflect minor changes in the HDCP module API that allow forAndreas Huber2013-01-302-2/+53
|/ / / /
* | | | Fix AudioRecordGlenn Kasten2013-01-101-2/+2
* | | | Fix bug in AudioRecord() constructorGlenn Kasten2013-01-041-1/+1
| |_|/ |/| |
* | | Merge "Start isolating control block accesses in a proxy"Glenn Kasten2012-12-213-55/+103
|\ \ \
| * | | Start isolating control block accesses in a proxyGlenn Kasten2012-12-123-55/+103
* | | | Merge "Remove unnecessary parameter"Glenn Kasten2012-12-218-33/+18
|\ \ \ \
| * | | | Remove unnecessary parameterGlenn Kasten2012-12-188-33/+18
| |/ / /
* | | | Merge "Fix bug with discarded AudioRecord::read count"Glenn Kasten2012-12-201-1/+2
|\ \ \ \
| * | | | Fix bug with discarded AudioRecord::read countGlenn Kasten2012-12-171-1/+2
| |/ / /