summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Don't assert on unexpected surface flinger dequeue/enqueueBuffer errors, log ...Andreas Huber2010-09-071-2/+9
* Merge changes I71f5b0fc,I92c7accbNipun Kwatra2010-09-033-34/+45
|\
| * Moving decision to use still camera to CameraSourceTimeLapseNipun Kwatra2010-09-033-34/+45
* | am ef9e508c: am 7e427934: Merge "LVM release 1.08 delivery." into gingerbreadEric Laurent2010-09-035-41/+69
|\ \
| * \ am 7e427934: Merge "LVM release 1.08 delivery." into gingerbreadEric Laurent2010-09-035-41/+69
| |\ \
| | * \ Merge "LVM release 1.08 delivery." into gingerbreadEric Laurent2010-09-035-41/+69
| | |\ \
| | | * | LVM release 1.08 delivery.Eric Laurent2010-09-035-41/+69
* | | | | am d6fd133d: am 9077f8ec: Merge "Not all audio source has the drift time info...James Dong2010-09-033-12/+15
|\ \ \ \ \ | |/ / / /
| * | | | am 9077f8ec: Merge "Not all audio source has the drift time information" into...James Dong2010-09-033-12/+15
| |\ \ \ \ | | |/ / /
| | * | | Merge "Not all audio source has the drift time information" into gingerbreadJames Dong2010-09-033-12/+15
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Not all audio source has the drift time informationJames Dong2010-09-033-12/+15
* | | | | am 8e11c822: am 9fee0b2a: Ogg files can be tagged to be automatically looping...Andreas Huber2010-09-033-4/+16
|\ \ \ \ \ | |/ / / /
| * | | | am 9fee0b2a: Ogg files can be tagged to be automatically looping, this settin...Andreas Huber2010-09-033-4/+16
| |\ \ \ \ | | |/ / /
| | * | | Ogg files can be tagged to be automatically looping, this setting always over...Andreas Huber2010-09-033-4/+16
* | | | | Merge "Add the new Stagefright ANativeWindow OMX codec API."Jamie Gennis2010-09-035-3/+196
|\ \ \ \ \
| * | | | | Add the new Stagefright ANativeWindow OMX codec API.Jamie Gennis2010-09-035-3/+196
* | | | | | am af7a7c34: am cc4a38c6: Merge "Properly buffer a certain amount of data on ...Andreas Huber2010-09-032-88/+119
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am cc4a38c6: Merge "Properly buffer a certain amount of data on streaming sou...Andreas Huber2010-09-032-88/+119
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge "Properly buffer a certain amount of data on streaming sources before f...Andreas Huber2010-09-032-88/+119
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Properly buffer a certain amount of data on streaming sources before finishin...Andreas Huber2010-09-032-88/+119
* | | | | | am bc1452a3: am 7755cdd6: Remove unused/debugging code from MP4 file writerJames Dong2010-09-031-204/+47
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 7755cdd6: Remove unused/debugging code from MP4 file writerJames Dong2010-09-031-204/+47
| |\ \ \ \ \ | | |/ / / /
| | * | | | Remove unused/debugging code from MP4 file writerJames Dong2010-09-031-204/+47
* | | | | | am 3c3fc97e: am 46e63b34: Merge "Better file size estimate" into gingerbreadJames Dong2010-09-031-34/+103
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 46e63b34: Merge "Better file size estimate" into gingerbreadJames Dong2010-09-031-34/+103
| |\ \ \ \ \ | | |/ / / /
| | * | | | Better file size estimateJames Dong2010-09-021-34/+103
| | |/ / /
* | | | | am bb64e554: am 7ed7668b: Merge "Calculate audio media drift time from AudioS...James Dong2010-09-025-31/+60
|\ \ \ \ \ | |/ / / /
| * | | | am 7ed7668b: Merge "Calculate audio media drift time from AudioSource" into g...James Dong2010-09-025-31/+60
| |\ \ \ \ | | |/ / /
| | * | | Calculate audio media drift time from AudioSourceJames Dong2010-09-015-31/+60
* | | | | MTP: Implement support for getting/setting device propertiesMike Lockwood2010-09-024-7/+15
* | | | | 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 "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