summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Support multiple cameras in framework.Chih-Chung Chang2010-05-101-1/+1
* am 71bd9fc8: am 100ef9be: Merge "Disable vorbis seek when streaming from loca...Andreas Huber2010-05-068-5/+106
|\
| * Merge "Disable vorbis seek when streaming from localhost." into froyoAndreas Huber2010-05-068-5/+106
| |\
| | * Disable vorbis seek when streaming from localhost.Andreas Huber2010-05-068-5/+106
* | | am 2a1674b1: am 2d315667: For issue #2651381, allow library prelinking.Dan Bornstein2010-05-055-10/+0
|\ \ \ | |/ /
| * | For issue #2651381, allow library prelinking.Dan Bornstein2010-05-055-10/+0
| |/
* | Support audio and video track interleaving in the recorded mp4 fileJames Dong2010-05-054-48/+148
* | Merge "Support AAC recording" into krakenJames Dong2010-05-045-58/+380
|\ \
| * | Support AAC recordingJames Dong2010-05-035-58/+380
* | | am 8ea45aad: am e083d0a2: Merge "Support for Ogg Vorbis decoding in stagefrig...Andreas Huber2010-05-047-7/+413
|\ \ \ | |/ / |/| / | |/
| * Support for Ogg Vorbis decoding in stagefright.Andreas Huber2010-05-047-7/+413
* | Use timestamp from camera driver for CameraSourceJames Dong2010-04-285-68/+118
* | am 31431b34: am 374aee68: Switch to use software MP3 decoder Hardware MP3 dec...James Dong2010-04-261-1/+1
|\ \ | |/
| * Switch to use software MP3 decoderJames Dong2010-04-261-1/+1
* | am 89e28cbe: am 9e609b0d: Merge "Apparently select() does not immediately ret...Andreas Huber2010-04-202-27/+14
|\ \ | |/
| * Apparently select() does not immediately return if one of the masked socket d...Andreas Huber2010-04-202-27/+14
* | am 1e1edb2c: am 25dc5f30: Merge "Don\'t coalesce more than 250ms worth of enc...Andreas Huber2010-04-201-2/+12
|\ \ | |/
| * Don't coalesce more than 250ms worth of encoded data into a single codec inpu...Andreas Huber2010-04-201-2/+12
* | am 6852b198: am d3d445b1: Merge "Use PV_PLAYER to handle RTSP streaming" into...James Dong2010-04-141-0/+5
|\ \ | |/
| * Use PV_PLAYER to handle RTSP streamingJames Dong2010-04-141-0/+5
* | fix unintentional driftJean-Baptiste Queru2010-04-142-14/+23
* | am c33f583b: am 4f3257cf: am dd684af8: Merge "Snif more 3GPP file types accor...James Dong2010-04-131-0/+2
|\ \
| * \ am 4f3257cf: am dd684af8: Merge "Snif more 3GPP file types according to http:...James Dong2010-04-131-0/+2
| |\ \ | | |/
| | * Snif more 3GPP file types according to http://www.ftyps.com/3gpp.htmlJames Dong2010-04-131-0/+2
* | | am d760afc3: am 30e9c2d4: am db281311: Merge "Better diagnostics in the stage...Andreas Huber2010-04-131-1/+1
|\ \ \ | |/ /
| * | am 30e9c2d4: am db281311: Merge "Better diagnostics in the stagefright comman...Andreas Huber2010-04-131-1/+1
| |\ \ | | |/
| | * Merge "Better diagnostics in the stagefright commandline tool, support for pl...Andreas Huber2010-04-131-1/+1
| | |\
| | | * Better diagnostics in the stagefright commandline tool, support for playing s...Andreas Huber2010-04-131-1/+1
* | | | am ebaa935e: am 9bb8e65a: am c15f48d7: Merge "Don\'t set encoder component ro...James Dong2010-04-131-1/+1
|\ \ \ \ | |/ / /
| * | | am 9bb8e65a: am c15f48d7: Merge "Don\'t set encoder component role while we q...James Dong2010-04-131-1/+1
| |\ \ \ | | |/ /
| | * | Merge "Don't set encoder component role while we query decoders" into froyoJames Dong2010-04-131-1/+1
| | |\ \
| | | * | Don't set encoder component role while we query decodersJames Dong2010-04-131-1/+1
* | | | | am 465934d1: am d4c072d3: am b19da8e1: Fix for 2581725. Keep the last frame a...Gloria Wang2010-04-131-2/+14
|\ \ \ \ \ | |/ / / /
| * | | | am d4c072d3: am b19da8e1: Fix for 2581725. Keep the last frame after resume()...Gloria Wang2010-04-131-2/+14
| |\ \ \ \ | | |/ / /
| | * | | Fix for 2581725. Keep the last frame after resume(), and delete itGloria Wang2010-04-131-2/+14
| | | |/ | | |/|
* | | | am 445a9785: Merge "don\'t hardcode "mSurface" throughout our source code" in...Mathias Agopian2010-04-131-1/+1
|\ \ \ \ | |/ / /
| * | | Merge "don't hardcode "mSurface" throughout our source code" into krakenMathias Agopian2010-04-121-1/+1
| |\ \ \
| | * | | don't hardcode "mSurface" throughout our source codeMathias Agopian2010-04-121-1/+1
* | | | | am 7853c898: am 248ea4a9: am 5baa5e19: Merge "Distinguish QCELP audio from mp...Andreas Huber2010-04-125-11/+50
|\ \ \ \ \ | |/ / / /
| * | | | am 248ea4a9: am 5baa5e19: Merge "Distinguish QCELP audio from mpeg4 audio, ig...Andreas Huber2010-04-125-11/+50
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we ...Andreas Huber2010-04-125-11/+50
* | | | manual mergeJean-Baptiste Queru2010-04-128-84/+301
|\ \ \ \ | |/ / /
| * | | am 98c5bd55: am 6dbf80d0: Merge "Fix a race condition in TimedEventQueue, an ...Andreas Huber2010-04-122-9/+36
| |\ \ \ | | |/ /
| | * | Fix a race condition in TimedEventQueue, an event may be cancelled while we'r...Andreas Huber2010-04-122-9/+36
| | |/
| * | am f0a49f68: am 1d7a8b44: Merge "Fix a case where the aac hardware decoder is...Andreas Huber2010-04-121-1/+7
| |\ \ | | |/
| | * Merge "Fix a case where the aac hardware decoder is in a transition state and...Andreas Huber2010-04-121-1/+7
| | |\
| | | * Fix a case where the aac hardware decoder is in a transition state and refuse...Andreas Huber2010-04-121-1/+7
| |_|/ |/| |
| * | Merge "I accidentally broken passion encoding while working around problems w...Andreas Huber2010-04-121-8/+58
| |\ \
| | * | I accidentally broken passion encoding while working around problems with the...Andreas Huber2010-04-091-8/+58
| * | | Merge "Remove unnecessary lock from AMRWriter." into krakenAndreas Huber2010-04-121-21/+5
| |\ \ \ | | |/ /
generated by cgit v1.1 at 2024-06-01 02:02:39 +0000