summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Extend downsampling ratios greater than 2:1" into lmp-devAndy Hung2014-08-114-8/+37
|\
| * Extend downsampling ratios greater than 2:1Andy Hung2014-08-114-8/+37
* | Merge "camera: Allow Camera#getParameters to be called by mediaserver anytime...Igor Murashkin2014-08-112-2/+4
|\ \
| * | camera: Allow Camera#getParameters to be called by mediaserver anytimeIgor Murashkin2014-08-072-2/+4
* | | Merge "Camera2/3: Cleanup the jpeg buffer size calcaulation logic" into lmp-devZhijun He2014-08-1111-56/+45
|\ \ \
| * | | Camera2/3: Cleanup the jpeg buffer size calcaulation logicZhijun He2014-08-1111-56/+45
* | | | Merge "Update audio ports with profile capabilities" into lmp-devJean-Michel Trivi2014-08-112-8/+78
|\ \ \ \ | |/ / / |/| | |
| * | | Update audio ports with profile capabilitiesJean-Michel Trivi2014-08-102-8/+78
* | | | Merge changes Idc9808f7,If7bc8e5b into lmp-devDan Albert2014-08-098-0/+33
|\ \ \ \
| * | | | Fix the build after -Bsymbolic fix.Dan Albert2014-08-081-0/+4
| * | | | Fix PIC relocations for non-Bsymbolic buildsArd Biesheuvel2014-08-087-0/+29
* | | | | Merge "Added Tunneled video playback support to ACodec" into lmp-devRachad2014-08-099-57/+214
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Added Tunneled video playback support to ACodecRachad2014-08-089-57/+214
* | | | | Merge "stagefright: set crop rect in SoftwareRenderer" into lmp-devLajos Molnar2014-08-091-0/+11
|\ \ \ \ \
| * | | | | stagefright: set crop rect in SoftwareRendererLajos Molnar2014-08-081-0/+11
* | | | | | Merge "Fix WAVExtractor to output full audio frames only" into lmp-devLajos Molnar2014-08-091-0/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix WAVExtractor to output full audio frames onlyAndy Hung2014-08-081-0/+4
* | | | | | Merge "NuPlayer: getSelectedTrack" into lmp-devRobert Shih2014-08-095-1/+53
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | NuPlayer: getSelectedTrackRobert Shih2014-08-085-1/+53
* | | | | | Merge "audio policy: enable more than one sink per audio patch." into lmp-devEric Laurent2014-08-092-84/+126
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | audio policy: enable more than one sink per audio patch.Eric Laurent2014-08-082-84/+126
| |/ / / /
* | | | | Merge "some clean up of video size change notification" into lmp-devChong Zhang2014-08-087-97/+109
|\ \ \ \ \
| * | | | | some clean up of video size change notificationChong Zhang2014-08-087-97/+109
| * | | | | delay data source creation for GenericSource prepare timeChong Zhang2014-08-083-21/+80
| * | | | | Revert "NuPlayer: don't feed decoder input data during flushing."Wei Jia2014-08-071-5/+5
| * | | | | merge in lmp-release history after reset to 0893eaf7d21e3a50b81324673eaa91a6b...The Android Automerger2014-08-070-0/+0
| |\ \ \ \ \
| | * | | | | some fixes for crash when extractor creation failsChong Zhang2014-08-067-56/+161
| | * | | | | merge in lmp-release history after reset to 92ce4715315bddd158c7d4028556632f0...The Android Automerger2014-08-060-0/+0
| | |\ \ \ \ \
| | | * \ \ \ \ merge in lmp-release history after reset to d0fded31e473e909c018f534d3019fb51...The Android Automerger2014-08-050-0/+0
| | | |\ \ \ \ \
| | | | * \ \ \ \ merge in lmp-release history after reset to 678792e362c4cd70640934049491d9f21...The Android Automerger2014-08-040-0/+0
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ merge in lmp-release history after reset to facd8cf2651f7fcf7225e735cae5f5d4e...The Android Automerger2014-08-030-0/+0
| | | | | |\ \ \ \ \
| | | | | | * \ \ \ \ merge in lmp-release history after reset to facd8cf2651f7fcf7225e735cae5f5d4e...The Android Automerger2014-08-020-0/+0
| | | | | | |\ \ \ \ \ | | | | | |/ / / / / /
| | | | | | * | | | | Revert GenericSource track selection changesWei Jia2014-07-304-452/+65
| | | | | | * | | | | GenericSource: start/stop tracks correctly on selectionRobert Shih2014-07-291-1/+11
| | | | | | * | | | | merge in lmp-release history after reset to 4dc680607181e6a76f4e91a39366c4f5d...The Android Automerger2014-07-290-0/+0
| | | | | | |\ \ \ \ \
| | | | | | | * | | | | CameraService: Clean up availability listeners and HAL error codesEino-Ville Talvala2014-07-286-61/+68
| | | | | | | * | | | | merge in lmp-release history after reset to f5bdd770d509373cc4174a55d0b81b223...The Android Automerger2014-07-280-0/+0
| | | | | | | |\ \ \ \ \
| | | | | | | | * \ \ \ \ merge in lmp-release history after reset to 03c556ae1eb409ad088c49037e185946c...The Android Automerger2014-07-270-0/+0
| | | | | | | | |\ \ \ \ \
| | | | | | | | | * \ \ \ \ merge in lmp-release history after reset to 03c556ae1eb409ad088c49037e185946c...The Android Automerger2014-07-260-0/+0
| | | | | | | | | |\ \ \ \ \ | | | | | | | | |/ / / / / /
| | | | | | | | | * | | | | StagefrightRecorder: check for WEBM format instead of MP4Robert Shih2014-07-251-5/+5
| | | | | | | | | * | | | | merge in lmp-release history after reset to 83b8808faad1e91690c64d7007348be8d...The Android Automerger2014-07-240-0/+0
| | | | | | | | | |\ \ \ \ \
| | | | | | | | | | * \ \ \ \ merge in lmp-release history after reset to dc042ce074ea2cb6063f3e154da26f42b...The Android Automerger2014-07-230-0/+0
| | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | * \ \ \ \ merge in lmp-release history after reset to eeaf40a8e413780bd2aacde172ac820e2...The Android Automerger2014-07-220-0/+0
| | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | * | | | | stagefright: handle seeking to before first cue-point.Lajos Molnar2014-07-212-13/+17
| | | | | | | | | | | | * | | | | merge in lmp-release history after reset to 8bce84142802ecdc1794d59488ede6298...The Android Automerger2014-07-210-0/+0
| | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | * \ \ \ \ merge in lmp-release history after reset to cf1f53baa636f1782ff924d6003c70c6b...The Android Automerger2014-07-200-0/+0
| | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | * \ \ \ \ merge in lmp-release history after reset to 2096abe982891b641f6117811dae41923...The Android Automerger2014-07-190-0/+0
| | | | | | | | | | | | | | |\ \ \ \ \
* | | | | | | | | | | | | | | \ \ \ \ \ Merge "AAC decoder: add support for controlling presentation parameters" into...Jean-Michel Trivi2014-08-083-6/+121
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | AAC decoder: add support for controlling presentation parametersJean-Michel Trivi2014-08-083-6/+121
* | | | | | | | | | | | | | | | | | | | | Merge "libstagefright: foundation: Add syntactic sugar to the cast." into lmp...Sasha Levitskiy2014-08-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | |