summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "When deleting a db file, Context.deleteDatabase() has to be called ins...Marco Nelissen2013-08-071-1/+1
|\
| * When deleting a db file,jangwon.lee2013-07-311-1/+1
* | If media wants ASCII lowercasing, it needs to ask for it.Elliott Hughes2013-08-024-6/+10
* | Merge "MediaFormat: Explain that KEY_COLOR_FORMAT is used with decoders as well"Marco Nelissen2013-07-301-1/+2
|\ \
| * | MediaFormat: Explain that KEY_COLOR_FORMAT is used with decoders as wellMartin Storsjo2013-07-251-1/+2
* | | Merge "MediaFormat: Fix the documentation link to the AAC profile constants"Jean-Baptiste Queru2013-07-291-1/+1
|\ \ \
| * | | MediaFormat: Fix the documentation link to the AAC profile constantsMartin Storsjo2013-07-251-1/+1
| |/ /
* | | Fix NullpointerException in MediaMetadataRetrieverOscar Rydhé2013-07-261-0/+4
|/ /
* | am 9ad7b946: am 0661dd15: Merge "Expose latency methods through AudioManager ...Oliver Woodman2013-07-023-0/+26
|\ \
| * | Expose latency methods through AudioManager and AudioTrack.Oliver Woodman2013-07-013-0/+26
* | | 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
* | | 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 37490462: Merge "Unhide MediaExtractor.getPsshInfo()" into jb-mr2-devMarco Nelissen2013-06-111-2/+2
|\ \ \ \ | |/ / /
| * | | Unhide MediaExtractor.getPsshInfo()Marco Nelissen2013-06-101-2/+2
| |/ /
* | | 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 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 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 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 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 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 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
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | android.media.MediaMuxer: remove SAMPLE_SYNC_FLAGLajos Molnar2013-05-291-11/+4
* | | | | am b830d527: Merge "Update test with CamercorderProfile video size." into jb-...Yu Shan Emily Lau2013-05-241-16/+15
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Update test with CamercorderProfile video size." into jb-mr2-devYu Shan Emily Lau2013-05-251-16/+15
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Update test with CamercorderProfile video size.Yu Shan Emily Lau2013-05-231-16/+15
* | | | | am 606ab470: Merge "Improve exception error messages to help diagnose app err...Jeff Tinker2013-05-221-32/+70
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Improve exception error messages to help diagnose app errors" into jb-...Jeff Tinker2013-05-221-32/+70
| |\ \ \ \
| | * | | | Improve exception error messages to help diagnose app errorsJeff Tinker2013-05-211-32/+70
* | | | | | am 2161b7cb: Merge "Fix invalid keyType translation in MediaDrm.getKeyRequest...Jeff Tinker2013-05-221-5/+29
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix invalid keyType translation in MediaDrm.getKeyRequestJeff Tinker2013-05-211-5/+29
| |/ / / /
* | | | | am 50ab525a: Merge "Add route description API." into jb-mr2-devJeff Brown2013-05-171-7/+55
|\ \ \ \ \ | |/ / / /
| * | | | Add route description API.Jeff Brown2013-05-161-7/+55
| |/ / /
* | | | am 9766caed: Merge "Add an API to determine if a route is connecting." into j...Jeff Brown2013-05-101-1/+13
|\ \ \ \ | |/ / /
| * | | Merge "Add an API to determine if a route is connecting." into jb-mr2-devJeff Brown2013-05-101-1/+13
| |\ \ \
| | * | | Add an API to determine if a route is connecting.Jeff Brown2013-05-091-1/+13
* | | | | am 804e618d: Fix buildMarco Nelissen2013-05-101-0/+5
|\ \ \ \ \ | |/ / / /