summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "MTP: Implement support for getting/setting device properties"Mike Lockwood2010-09-026-24/+332
|\
| * MTP: Implement support for getting/setting device propertiesMike Lockwood2010-09-026-24/+332
* | MTP: try to fix sim buildMike Lockwood2010-09-021-0/+2
|/
* am fd0eed00: am a2511da9: Merge "Better support for buffered streaming of rts...Andreas Huber2010-09-015-2/+77
|\
| * am a2511da9: Merge "Better support for buffered streaming of rtsp content, if...Andreas Huber2010-09-015-2/+77
| |\
| | * Merge "Better support for buffered streaming of rtsp content, if buffer drops...Andreas Huber2010-09-015-2/+77
| | |\
| | | * Better support for buffered streaming of rtsp content, if buffer drops below ...Andreas Huber2010-09-015-2/+77
* | | | am 3fd01c4d: am d3c1bae4: Merge "Make sure that if initialization fails, Audi...James Dong2010-09-011-4/+17
|\ \ \ \ | |/ / /
| * | | am d3c1bae4: Merge "Make sure that if initialization fails, AudioSource still...James Dong2010-09-011-4/+17
| |\ \ \ | | |/ /
| | * | Merge "Make sure that if initialization fails, AudioSource still behaves well...James Dong2010-09-011-4/+17
| | |\ \ | | | |/ | | |/|
| | | * Make sure that if initialization fails, AudioSource still behaves well.James Dong2010-09-011-4/+17
* | | | Merge "resolved conflicts for merge of 71c908c4 to master"Andreas Huber2010-09-012-17/+0
|\ \ \ \
| * \ \ \ resolved conflicts for merge of 71c908c4 to masterAndreas Huber2010-09-012-17/+0
| |\ \ \ \ | | |/ / /
| | * | | am 6c33904a: Merge "Now that AmrInputStream no longer relies on opencore, mak...Andreas Huber2010-09-012-17/+0
| | |\ \ \ | | | |/ /
| | | * | Merge "Now that AmrInputStream no longer relies on opencore, make sure it's r...Andreas Huber2010-09-012-17/+0
| | | |\ \
| | | | * | Now that AmrInputStream no longer relies on opencore, make sure it's register...Andreas Huber2010-09-012-17/+0
* | | | | | Merge "Support for auxiliary video parameters."Nipun Kwatra2010-09-012-13/+90
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Support for auxiliary video parameters.Nipun Kwatra2010-09-012-13/+90
* | | | | | Revert "Merge "Add the new Stagefright ANativeWindow OMX codec API.""Jamie Gennis2010-09-015-185/+3
* | | | | | Merge "Add the new Stagefright ANativeWindow OMX codec API."Jamie Gennis2010-09-015-3/+185
|\ \ \ \ \ \
| * | | | | | Add the new Stagefright ANativeWindow OMX codec API.Jamie Gennis2010-09-015-3/+185
* | | | | | | am 47f2cf62: am 412fc7cd: Merge "Keep gtalk video chat specific code consiste...Andreas Huber2010-09-011-0/+8
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | am 412fc7cd: Merge "Keep gtalk video chat specific code consistent with rtsp ...Andreas Huber2010-09-011-0/+8
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge "Keep gtalk video chat specific code consistent with rtsp changes." int...Andreas Huber2010-09-011-0/+8
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | | * | | | Keep gtalk video chat specific code consistent with rtsp changes.Andreas Huber2010-09-011-0/+8
* | | | | | | am 021a822e: am de2b1615: Merge "Properly extract all raw_data_blocks from an...Andreas Huber2010-09-012-5/+74
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am de2b1615: Merge "Properly extract all raw_data_blocks from an ADSP mpeg4 a...Andreas Huber2010-09-012-5/+74
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Properly extract all raw_data_blocks from an ADSP mpeg4 audio buffer.Andreas Huber2010-09-012-5/+74
* | | | | | | am 55e79374: am f560ceab: Merge "Audio Effects: fix problems in volume contro...Eric Laurent2010-08-311-8/+22
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am f560ceab: Merge "Audio Effects: fix problems in volume control." into ging...Eric Laurent2010-08-311-8/+22
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Audio Effects: fix problems in volume control.Eric Laurent2010-08-311-8/+22
| | |/ / / /
* | | | | | am 6b52911c: am 48ac68e1: Merge "Support for RFC3640 - mpeg4-generic RTP pack...Andreas Huber2010-08-314-6/+345
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 48ac68e1: Merge "Support for RFC3640 - mpeg4-generic RTP packet type, AAC-...Andreas Huber2010-08-314-6/+345
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-h...Andreas Huber2010-08-314-6/+345
| | |\ \ \ \
| | | * | | | Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr.Andreas Huber2010-08-314-6/+345
| | | | |_|/ | | | |/| |
* | | | | | am e1a3cddd: am 99fa510e: Merge "Better detection of connection problems - ti...Andreas Huber2010-08-312-43/+67
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 99fa510e: Merge "Better detection of connection problems - timeout if no r...Andreas Huber2010-08-312-43/+67
| |\ \ \ \ \ | | |/ / / /
| | * | | | Better detection of connection problems - timeout if no rtcp packets arrive w...Andreas Huber2010-08-312-43/+67
| | |/ / /
* | | | | Merge "MTP: Send an Intent after an MTP session that resulted in media databa...Mike Lockwood2010-08-314-0/+65
|\ \ \ \ \
| * | | | | MTP: Send an Intent after an MTP session that resulted in media database modi...Mike Lockwood2010-08-314-0/+65
* | | | | | Merge "Add settings option for running MTP server in PTP mode."Mike Lockwood2010-08-312-8/+48
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Add settings option for running MTP server in PTP mode.Mike Lockwood2010-08-312-8/+48
* | | | | | Added VideoSourceDownSamplerNipun Kwatra2010-08-312-0/+143
* | | | | | Added setAuxiliaryOutputFile to MediaRecorder and JNINipun Kwatra2010-08-316-0/+124
* | | | | | Adding support for parallel recording sessions.Nipun Kwatra2010-08-313-36/+198
| |/ / / / |/| | | |
* | | | | am 1577e629: am 12006013: fixedfft: Only includes cpu-features.h when __arm__...Chia-chi Yeh2010-08-311-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 12006013: fixedfft: Only includes cpu-features.h when __arm__ is defined.Chia-chi Yeh2010-08-301-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | fixedfft: Only includes cpu-features.h when __arm__ is defined.Chia-chi Yeh2010-08-311-1/+1
* | | | | Merge "Make sure we only reallocate buffers on a genuine port definition chan...Andreas Huber2010-08-311-1/+3
|\ \ \ \ \
| * | | | | Make sure we only reallocate buffers on a genuine port definition change.Andreas Huber2010-08-301-1/+3