summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Make track informational event optional, depending on system propertyJames Dong2011-05-172-0/+34
* am c9eb18bb: (-s ours) am bf81d4be: am c56e81c8: Merge "DO NOT MERGE: Properl...Andreas Huber2011-05-170-0/+0
|\
| * am bf81d4be: am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS me...Andreas Huber2011-05-171-1/+7
| |\
| | * am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS metadata even i...Andreas Huber2011-05-171-1/+7
| | |\
| | | * Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(code...Andreas Huber2011-05-171-1/+7
| | | |\
| | | | * DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-speci...Andreas Huber2011-05-041-1/+7
* | | | | Claim support for .3gpp2 A/B files.Andreas Huber2011-05-171-0/+3
* | | | | Disable yuv->yuv mode and external display support until various driver fixes...Andreas Huber2011-05-162-1/+11
* | | | | Merge "Instead of using an RGB surface and conversion yuv420->rgb565"Andreas Huber2011-05-161-7/+58
|\ \ \ \ \
| * | | | | Instead of using an RGB surface and conversion yuv420->rgb565Andreas Huber2011-05-051-7/+58
* | | | | | resolved conflicts for merge of b107f4de to masterMike Lockwood2011-05-162-4/+8
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am e23639e0: am 15afd076: Merge "MTP: Have GetStorageInfo command return corr...Mike Lockwood2011-05-162-4/+8
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | am 15afd076: Merge "MTP: Have GetStorageInfo command return correct storage t...Mike Lockwood2011-05-162-4/+8
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | MTP: Have GetStorageInfo command return correct storage type for removable st...Mike Lockwood2011-05-162-4/+8
| | | | |/ | | | |/|
* | | | | Merge "Fix module tags on stagefright software decoders."Andreas Huber2011-05-168-8/+8
|\ \ \ \ \
| * | | | | Fix module tags on stagefright software decoders.Andreas Huber2011-05-168-8/+8
* | | | | | Support platform and camera dependent recording start time offsetJames Dong2011-05-144-10/+37
|/ / / / /
* | | | | Merge "Add support for platform-specific recording start time offset"James Dong2011-05-132-0/+32
|\ \ \ \ \
| * | | | | Add support for platform-specific recording start time offsetJames Dong2011-05-102-0/+32
* | | | | | Support for storing geo information in the recorded mp4/3gpp file.James Dong2011-05-134-2/+156
* | | | | | Track id really starts with 1, not 0James Dong2011-05-131-1/+1
* | | | | | Merge "Add one more DRM error code. For bug 4422428."Gloria Wang2011-05-132-0/+2
|\ \ \ \ \ \
| * | | | | | Add one more DRM error code. For bug 4422428.Gloria Wang2011-05-132-0/+2
* | | | | | | Merge "Fix audio effect framework issues"Eric Laurent2011-05-132-28/+55
|\ \ \ \ \ \ \
| * | | | | | | Fix audio effect framework issuesEric Laurent2011-05-132-28/+55
* | | | | | | | Merge from honeycomb-plus-aospJean-Baptiste Queru2011-05-120-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | am 20fd3f0d: am 4770c79c: Merge "Tweak audio APIs for better forward/backward...Jean-Baptiste Queru2011-05-122-7/+7
| |\ \ \ \ \ \ \
| | * | | | | | | Tweak audio APIs for better forward/backward/sideways compatibility.Jean-Baptiste Queru2011-05-122-7/+7
* | | | | | | | | update for new audio.h header locationDima Zavin2011-05-1220-20/+20
* | | | | | | | | Merge "A fix to the MPEG4Extractor to support 16-bit sample sizes."Andreas Huber2011-05-121-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | A fix to the MPEG4Extractor to support 16-bit sample sizes.Andreas Huber2011-05-121-1/+1
* | | | | | | | | | The decoder wrapper is no longer needed. Also disable building old-style deco...Andreas Huber2011-05-126-692/+5
|/ / / / / / / / /
* | | | | | | | | Squashed commit of the following:Andreas Huber2011-05-1146-218/+6062
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Merge "Leave the number of output buffers up to surface flinger and friends."Andreas Huber2011-05-111-2/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Leave the number of output buffers up to surface flinger and friends.Andreas Huber2011-05-101-2/+0
* | | | | | | | | Make sure the ogg extractor returns appropriate error codes.Andreas Huber2011-05-101-6/+13
|/ / / / / / / /
* | | | | | | | Properly honour any pending seek request when reading the first buffer afterAndreas Huber2011-05-103-1/+21
| |_|_|/ / / / |/| | | | | |
* | | | | | | Add send session recording summary report to applicationJames Dong2011-05-093-15/+75
* | | | | | | Add const to the finders method in MetaData.cppJames Dong2011-05-094-14/+14
| |_|/ / / / |/| | | | |
* | | | | | Add end of recording summary track infoJames Dong2011-05-092-3/+40
* | | | | | Merge "Refactor MPEG4Writer::writeTrackHeader() method"James Dong2011-05-092-420/+523
|\ \ \ \ \ \
| * | | | | | Refactor MPEG4Writer::writeTrackHeader() methodJames Dong2011-05-092-420/+523
* | | | | | | am bdaa3abd: (-s ours) am 44e39d60: Merge remote branch \'goog/honeycomb-mr2\...The Android Automerger2011-05-090-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | am 44e39d60: Merge remote branch \'goog/honeycomb-mr2\' into honeycomb-LTEThe Android Automerger2011-05-090-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge remote branch 'goog/honeycomb-mr2' into honeycomb-LTEThe Android Automerger2011-05-080-0/+0
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | DO NOT MERGE MediaScanner: Fix bug in "no media" handling logicMike Lockwood2011-05-031-3/+4
| | | * | | DO NOT MERGE MTP: Implement GetThumb commandMike Lockwood2011-05-035-1/+34
| | | * | | DO NOT MERGE MTP: Fix file descriptor leak in file editing extensionsMike Lockwood2011-05-032-24/+29
| | | * | | DO NOT MERGE MTP: Add extended operations to support in-place editing of filesMike Lockwood2011-05-035-8/+268
| | | * | | DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding file...Mike Lockwood2011-05-032-16/+13