summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* MTP: Add support for PTP variant of GetDeviceInfo result.Mike Lockwood2011-06-212-4/+19
* Merge "OGG: To prevent mediaserver from crash by SIGFPE (divide by zero) and ...Andreas Huber2011-06-201-2/+3
|\
| * OGG: To prevent mediaserver from crash by SIGFPE (divide by zero) and more gu...Dongwon Kang2011-06-201-2/+3
* | Merge "When a recording session is stopped, no outstanding input video frames...James Dong2011-06-201-6/+13
|\ \
| * | When a recording session is stopped, no outstanding input video frames exist ...James Dong2011-06-201-6/+13
* | | Merge "Remove unneeded #include <sys/resource.h>"Glenn Kasten2011-06-207-7/+0
|\ \ \ | |_|/ |/| |
| * | Remove unneeded #include <sys/resource.h>Glenn Kasten2011-06-157-7/+0
* | | Merge "MTP: Fix some problems with GetObjectHandles and GetNumObjects commands"Mike Lockwood2011-06-171-6/+2
|\ \ \ | |_|/ |/| |
| * | MTP: Fix some problems with GetObjectHandles and GetNumObjects commandsMike Lockwood2011-06-171-6/+2
| |/
* | Merge "Use system property to control whether we will enable B frame support ...James Dong2011-06-171-1/+11
|\ \
| * | Use system property to control whether we will enable B frame support in MPEG...James Dong2011-06-171-1/+11
| |/
* | Fix regression in audio effect factoryEric Laurent2011-06-161-1/+1
|/
* Merge "Merge chromium to r11.0.672.0: Compile fix"Kristian Monsen2011-06-142-4/+4
|\
| * Merge chromium to r11.0.672.0: Compile fixKristian Monsen2011-06-072-4/+4
* | Merge "Bug 4608375"Glenn Kasten2011-06-143-4/+3
|\ \
| * | Bug 4608375Glenn Kasten2011-06-143-4/+3
* | | Merge "Enforce the rule that the timestamp from timelapse video source monoti...James Dong2011-06-141-1/+2
|\ \ \
| * | | Enforce the rule that the timestamp from timelapse video source monotically i...James Dong2011-06-131-1/+2
| |/ /
* | | Merge "audio: update for audio/audio_policy header names/locations"Dima Zavin2011-06-131-1/+1
|\ \ \
| * | | audio: update for audio/audio_policy header names/locationsDima Zavin2011-06-131-1/+1
| |/ /
* | | Add B frame support for MPEG4WriterJames Dong2011-06-132-9/+142
|/ /
* | Merge "Avoid duplicated code calculating the stts sample duration"James Dong2011-06-101-22/+21
|\ \
| * | Avoid duplicated code calculating the stts sample durationJames Dong2011-06-101-22/+21
* | | am 15e9d474: am 88748e6d: am d86302df: Quiet the log.Dianne Hackborn2011-06-101-1/+1
|\ \ \ | |/ / |/| |
| * | am 88748e6d: am d86302df: Quiet the log.Dianne Hackborn2011-06-101-1/+1
| |\ \
| | * \ am d86302df: Quiet the log.Dianne Hackborn2011-06-091-1/+1
| | |\ \
| | | * | Quiet the log.Dianne Hackborn2011-06-091-1/+1
| * | | | am 2488a943: am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 s...James Dong2011-06-092-12/+0
| |\ \ \ \ | | |/ / /
| | * | | am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 seconds - do n...James Dong2011-06-092-12/+0
| | |\ \ \ | | | |/ /
| | | * | Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" i...James Dong2011-06-092-12/+0
| | | |\ \
| | | | * | Revert "Add avg bandwidth estimate every 2 seconds - do not merge."James Dong2011-05-192-12/+0
| * | | | | am 644f36ea: am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line br...Conley Owens2011-06-09185-30089/+30089
| |\ \ \ \ \
| | * \ \ \ \ am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix ...Conley Owens2011-06-09185-30089/+30089
| | |\ \ \ \ \
| | | * \ \ \ \ Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"Conley Owens2011-06-09185-30089/+30089
| | | |\ \ \ \ \
| | | | * | | | | stagefright aacenc/amrwbenc: Convert line breaks to Unix styleMans Rullgard2011-04-23185-30089/+30089
* | | | | | | | | Merge "Call storeMetaDataInVideoBuffers() before get/setParameters() on index...James Dong2011-06-101-9/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Call storeMetaDataInVideoBuffers() before get/setParameters() on index OMX_In...James Dong2011-06-081-9/+10
* | | | | | | | | | Merge "Correctly handle crop rect event in SoftAVC.cpp"James Dong2011-06-102-8/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Correctly handle crop rect event in SoftAVC.cppJames Dong2011-06-092-8/+11
* | | | | | | | | | | Merge "Make dumpsys(media.player) more useful by having AwesomePlayer populat...Andreas Huber2011-06-105-44/+251
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Make dumpsys(media.player) more useful by having AwesomePlayer populate it.Andreas Huber2011-06-085-44/+251
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | am 6a91953c: am 90dc22fa: am a02d9bf9: Make sure we don\'t read from invalid fdsMarco Nelissen2011-06-091-0/+3
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | am 90dc22fa: am a02d9bf9: Make sure we don\'t read from invalid fdsMarco Nelissen2011-06-091-0/+3
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | / / / / | | |_|_|_|_|/ / / / | |/| | | | | | | |
| | * | | | | | | | am a02d9bf9: Make sure we don\'t read from invalid fdsMarco Nelissen2011-06-091-0/+3
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Make sure we don't read from invalid fdsMarco Nelissen2011-06-091-0/+3
| | * | | | | | | | | am 8050a02b: DO NOT MERGE: Linux sockets are odd, closing a socket descriptor...Andreas Huber2011-06-021-17/+79
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | / / / / / | | | |_|_|/ / / / / | | |/| | | | | | |
| | | * | | | | | | DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abo...Andreas Huber2011-06-011-17/+79
| | * | | | | | | | am f0f1ceeb: DO NOT MERGE: Make sure we restart the prefetcher immediately wh...Andreas Huber2011-04-183-12/+26
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to ...Andreas Huber2011-04-143-12/+26
| | * | | | | | | | am ea5d2c58: Merge "When read() from AudioRecord returns 0 or negative value,...James Dong2011-04-041-2/+3
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /