summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "Expose latency methods through AudioManager and AudioTrack."Oliver Woodman2013-06-273-0/+26
|\
| * Expose latency methods through AudioManager and AudioTrack.Oliver Woodman2013-06-263-0/+26
* | ImageReader: Implementation of ImageReader and Image APIsZhijun He2013-06-265-41/+1066
* | Initial camera device implementationIgor Murashkin2013-06-266-95/+606
* | Partial CameraManager implementationIgor Murashkin2013-06-266-1/+469
|/
* Change the comments to incorporate change for VP9 decoder.hkuang2013-06-261-1/+2
* Merge "MediaRouter: grey out wifi displays that's in use"Chong Zhang2013-06-151-56/+68
|\
| * MediaRouter: grey out wifi displays that's in useChong Zhang2013-06-131-56/+68
* | am 3717cf6b: am 07d6d9e7: Merge "additional documentation for media codec inf...Scott Main2013-06-142-3/+38
|\ \
| * \ am 07d6d9e7: Merge "additional documentation for media codec info" into jb-mr...Scott Main2013-06-142-3/+38
| |\ \
| | * | additional documentation for media codec infoScott Main2013-06-142-3/+38
* | | | Make MediaPlayer.invoke() public-and-hidden againMarco Nelissen2013-06-143-2/+77
* | | | Forgot somethingMarco Nelissen2013-06-141-2/+0
* | | | Fix buildMarco Nelissen2013-06-141-71/+0
* | | | Remove unused MediaPlayer methodsMarco Nelissen2013-06-132-150/+2
| |_|/ |/| |
* | | am 36e90664: am bcc6ae88: Merge "Let RemoteControlDisplay know more about pla...Zhihai Xu2013-06-112-2/+52
|\ \ \ | |/ /
| * | am bcc6ae88: Merge "Let RemoteControlDisplay know more about playback positio...Zhihai Xu2013-06-112-2/+52
| |\ \ | | |/
| | * Merge "Let RemoteControlDisplay know more about playback position" into jb-mr...Zhihai Xu2013-06-112-2/+52
| | |\
| | | * Let RemoteControlDisplay know more about playback positionJean-Michel Trivi2013-06-072-2/+52
* | | | am 3826e8bd: am 37490462: Merge "Unhide MediaExtractor.getPsshInfo()" into jb...Marco Nelissen2013-06-111-2/+2
|\ \ \ \ | |/ / /
| * | | am 37490462: Merge "Unhide MediaExtractor.getPsshInfo()" into jb-mr2-devMarco Nelissen2013-06-111-2/+2
| |\ \ \ | | |/ /
| | * | Unhide MediaExtractor.getPsshInfo()Marco Nelissen2013-06-101-2/+2
| | |/
* | | Merge "camera: Add Java binder proxies for some existing binder interfaces"Igor Murashkin2013-06-115-2/+291
|\ \ \
| * | | camera: Add Java binder proxies for some existing binder interfacesIgor Murashkin2013-06-115-2/+291
* | | | Initial commit of new camera API, mostly just the interface.Eino-Ville Talvala2013-06-072-0/+355
* | | | am e125116f: am e4ef3849: Merge "javadoc cleanup for audioeffect" into jb-mr2...Scott Main2013-06-041-7/+25
|\ \ \ \ | | |/ / | |/| |
| * | | am e4ef3849: Merge "javadoc cleanup for audioeffect" into jb-mr2-devScott Main2013-06-041-7/+25
| |\ \ \ | | | |/ | | |/|
| | * | javadoc cleanup for audioeffectScott Main2013-06-031-7/+25
* | | | am c41a0eff: am be22605d: Merge "Listen for HTTP proxy changes and propagate ...Andreas Huber2013-06-032-3/+139
|\ \ \ \ | |/ / /
| * | | am be22605d: Merge "Listen for HTTP proxy changes and propagate the informati...Andreas Huber2013-06-032-3/+139
| |\ \ \ | | |/ /
| | * | Listen for HTTP proxy changes and propagate the information to the mediaAndreas Huber2013-05-312-3/+139
* | | | am 43590eb7: am 4f0002e6: Merge "MediaMuxer sample code update, no functional...ztenghui2013-05-311-8/+17
|\ \ \ \ | |/ / /
| * | | am 4f0002e6: Merge "MediaMuxer sample code update, no functional change" into...ztenghui2013-05-311-8/+17
| |\ \ \ | | |/ /
| | * | Merge "MediaMuxer sample code update, no functional change" into jb-mr2-devztenghui2013-05-311-8/+17
| | |\ \
| | | * | MediaMuxer sample code update, no functional changeztenghui2013-05-311-8/+17
* | | | | am 6474d840: am 636af7a1: Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity...Jeff Brown2013-05-301-5/+5
|\ \ \ \ \ | |/ / / /
| * | | | am 636af7a1: Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into jb-mr...Jeff Brown2013-05-301-5/+5
| |\ \ \ \ | | |/ / /
| | * | | Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into jb-mr2-devJeff Brown2013-05-311-5/+5
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity.Jeff Brown2013-05-301-5/+5
* | | | | am 7d2e3939: am c1d47c50: Merge "Monitor device rotation" into jb-mr2-devJean-Michel Trivi2013-05-301-6/+50
|\ \ \ \ \ | |/ / / /
| * | | | am c1d47c50: Merge "Monitor device rotation" into jb-mr2-devJean-Michel Trivi2013-05-301-6/+50
| |\ \ \ \ | | |/ / /
| | * | | Merge "Monitor device rotation" into jb-mr2-devJean-Michel Trivi2013-05-301-6/+50
| | |\ \ \
| | | * | | Monitor device rotationJean-Michel Trivi2013-05-281-6/+50
* | | | | | am b809577f: am b318f7b9: Merge "Refactor of camera stress test to add camera...Jason Noguchi2013-05-306-197/+995
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am b318f7b9: Merge "Refactor of camera stress test to add camera test helper....Jason Noguchi2013-05-296-197/+995
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Refactor of camera stress test to add camera test helper. Also add add...Jason Noguchi2013-05-306-197/+995
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Refactor of camera stress test to add camera test helper. Also addJason Noguchi2013-05-286-197/+995
* | | | | | am fabd32c1: am 673903a2: Merge "android.media.MediaMuxer: remove SAMPLE_SYNC...Lajos Molnar2013-05-291-11/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 673903a2: Merge "android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG" into j...Lajos Molnar2013-05-291-11/+4
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG" into jb-mr2-devLajos Molnar2013-05-291-11/+4
| | |\ \ \ \ | | | |_|/ / | | |/| | |