summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fix failure from setDataSource(String path) when path is a local file"James Dong2012-04-122-11/+20
|\
| * Fix failure from setDataSource(String path) when path is a local fileJames Dong2012-04-122-11/+20
* | Fix thumbnail generation failureJames Dong2012-04-112-10/+19
|/
* audio preprocessing: added static factory methodEric Laurent2012-04-104-23/+136
* Merge "Added support for USB audio devices"Eric Laurent2012-04-093-118/+90
|\
| * Added support for USB audio devicesEric Laurent2012-04-063-118/+90
* | New JAVA API to support submitting encrypted buffers of input data.Andreas Huber2012-04-063-1/+186
|/
* am db9b114b: Merge "Adds flag argument to setMasterMute." into ics-aahJustin Koh2012-04-053-4/+13
|\
| * Adds flag argument to setMasterMute.Justin Koh2012-04-043-4/+13
* | Merge "Insert the 2 seconds before test start to workaround the race conditon...Yu Shan Emily Lau2012-04-041-16/+19
|\ \
| * | Insert the 2 seconds before test start toYu Shan Emily Lau2012-04-041-16/+19
* | | Fix the build.Justin Koh2012-04-041-1/+1
* | | Merge "resolved conflicts for merge of bff6a514 to master"Justin Koh2012-04-041-5/+18
|\ \ \
| * \ \ resolved conflicts for merge of bff6a514 to masterJustin Koh2012-04-041-5/+18
| |\ \ \ | | | |/ | | |/|
| | * | Merge "Persists the master mute volume setting." into ics-aahJustin Koh2012-04-041-5/+18
| | |\ \
| | | * | Persists the master mute volume setting.Justin Koh2012-04-031-5/+18
| | * | | am a784b3de: Fix build break introduced by missing parenthesis in camera stre...Jason Noguchi2012-04-031-1/+1
| | |\ \ \
| | * \ \ \ am 6e6d8df5: Merge "Adding camera zoom test to mediaframework stress suite." ...Jason Noguchi2012-04-033-7/+331
| | |\ \ \ \ | | | |_|/ / | | |/| | |
* | | | | | Store video width/height when scanningMarco Nelissen2012-04-041-1/+9
* | | | | | New Crypto JAVA class to facilitate decryption via MediaCodec.Andreas Huber2012-04-049-10/+430
|/ / / / /
* | | | | am a72a06f3: am f5693a6a: am a784b3de: Fix build break introduced by missing ...Jason Noguchi2012-04-031-1/+1
|\ \ \ \ \
| * \ \ \ \ am a784b3de: Fix build break introduced by missing parenthesis in camera stre...Jason Noguchi2012-04-031-1/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Fix build break introduced by missing parenthesis in camera stress test.Jason Noguchi2012-04-031-1/+1
| | | |/ / | | |/| |
* | | | | am a5408a8c: am 34a4e519: am 6e6d8df5: Merge "Adding camera zoom test to medi...Jason Noguchi2012-04-033-7/+331
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | am 6e6d8df5: Merge "Adding camera zoom test to mediaframework stress suite." ...Jason Noguchi2012-04-033-7/+331
| |\ \ \ | | |/ /
| | * | Merge "Adding camera zoom test to mediaframework stress suite." into ics-mr1Jason Noguchi2012-04-033-7/+331
| | |\ \
| | | * | Adding camera zoom test to mediaframework stress suite.Jason Noguchi2012-03-223-7/+331
| * | | | am 2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1Eric Laurent2012-03-163-5/+9
| |\ \ \ \ | | |/ / /
| * | | | resolved conflicts for merge of 3fe7ee65 to ics-mr1-plus-aospEric Laurent2012-03-161-6/+3
| |\ \ \ \
* | \ \ \ \ Merge "More DRM/crypto support."Andreas Huber2012-04-032-3/+3
|\ \ \ \ \ \
| * | | | | | More DRM/crypto support.Andreas Huber2012-04-032-3/+3
* | | | | | | Merge commit '7f71d01'Mike Lockwood2012-04-031-1/+2
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Broadcast mastervolume regardless of change.Justin Koh2012-04-021-1/+2
* | | | | | | Merge commit '830ad08'Mike Lockwood2012-04-031-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | |
| * | | | | Merge "b/6232528 Reduce volume persist delay to 500ms" into ics-aahRoboErik2012-03-281-1/+1
| |\ \ \ \ \
| | * | | | | b/6232528 Reduce volume persist delay to 500msRoboErik2012-03-271-1/+1
| * | | | | | Merge "Do not call stop() on the MediaSource if it hasn't been started." into...Jason Simmons2012-03-271-3/+0
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Do not call stop() on the MediaSource if it hasn't been started.Jason Simmons2012-03-261-3/+0
| * | | | | | LibAAH_RTP: Release TX Group on error.John Grossman2012-03-232-42/+52
| |/ / / / /
| * | | | | LibAAH_RTP: Fix handling of PCM format changes.John Grossman2012-03-231-3/+44
| * | | | | LibAAH_RTP: Fix an issue which crept in during code review.John Grossman2012-03-221-1/+1
| * | | | | LibAAH_RTP: Properly handle EOS conditions.John Grossman2012-03-215-50/+160
| * | | | | LibAAH_RTP: Get rid of PipeEventJohn Grossman2012-03-219-158/+38
| * | | | | LibAAH_RTP: Add unicast mode support to the RXPlayerJohn Grossman2012-03-218-110/+225
| * | | | | LibAAH_RTP: Fix a stuttering audio bug.John Grossman2012-03-2113-243/+555
| * | | | | LibAAH_RTP: Refactor TXGroup code, add unicast mode.John Grossman2012-03-217-529/+1343
| * | | | | LibAAH_RTP: Change names to prepare for refactor.John Grossman2012-03-215-72/+72
| * | | | | am 2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1Eric Laurent2012-03-163-5/+9
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | MediaPlayerService: fix AudioSink latencyEric Laurent2012-03-163-5/+9
| | | |/ / | | |/| |
| * | | | am 3fe7ee65: Merge "AudioTrack: relax check on minimum buffer size" into ics-mr1Eric Laurent2012-03-161-6/+3
| |\ \ \ \ | | |/ / /