summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Cleanup unused parameters or variable in EffectBundleJean-Michel Trivi2014-07-081-4/+3
* Merge "MatroskaExtractor: track specific seeking"Robert Shih2014-07-023-26/+96
|\
| * MatroskaExtractor: track specific seekingRobert Shih2014-06-193-26/+96
* | Support for audio attributes on audio output of media playerJean-Michel Trivi2014-07-014-13/+137
* | Merge "Add HEVC encoder support to ACodec"Rachad2014-06-271-0/+60
|\ \
| * | Add HEVC encoder support to ACodecRachad2014-06-261-0/+60
* | | Fix AAC timestampsMarco Nelissen2014-06-262-13/+29
* | | Merge "HLS: only queue discontinuity for first block"Chong Zhang2014-06-261-0/+3
|\ \ \
| * | | HLS: only queue discontinuity for first blockChong Zhang2014-06-251-0/+3
* | | | ndk: 64-bit compile warningsMark Salyzyn2014-06-263-9/+12
* | | | libstagefright: 64-bit compile warningsMark Salyzyn2014-06-2628-136/+170
* | | | mtp: 64-bit compile warningsMark Salyzyn2014-06-252-5/+8
* | | | am 76e4e02d: am 940c688d: Merge "libmediaplayerservice: unused argument warni...Mark Salyzyn2014-06-244-29/+29
|\ \ \ \
| * \ \ \ am 940c688d: Merge "libmediaplayerservice: unused argument warning messages"Mark Salyzyn2014-06-244-29/+29
| |\ \ \ \
| | * | | | libmediaplayerservice: unused argument warning messagesMark Salyzyn2014-06-244-29/+29
* | | | | | Improve MTP error checkingMarco Nelissen2014-06-241-23/+42
* | | | | | am 620f348f: am da69fdbb: Merge "Fix buffer allocation"Marco Nelissen2014-06-231-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am da69fdbb: Merge "Fix buffer allocation"Marco Nelissen2014-06-231-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fix buffer allocationMarco Nelissen2014-06-231-1/+1
| * | | | | am 90732a3b: Merge "Remove dependency on Parcel::{read,write}IntPtr"Narayan Kamath2014-06-131-2/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Remove dependency on Parcel::{read,write}IntPtr"Narayan Kamath2014-06-101-2/+2
| | |\ \ \ \
| | | * | | | Remove dependency on Parcel::{read,write}IntPtrJeff Tinker2014-06-121-2/+2
| * | | | | | resolved conflicts for merge of cbd74fcb to klp-modular-dev-plus-aospNarayan Kamath2014-06-139-152/+251
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Update OMX messages for 64 bitAndy Hung2014-06-129-148/+234
| | |/ / / /
* | | | | | Merge "Parse trex and mehd boxes"Marco Nelissen2014-06-234-16/+141
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Parse trex and mehd boxesMarco Nelissen2014-06-234-16/+141
* | | | | | libeffects: 64-bit compile warningsMark Salyzyn2014-06-202-26/+32
* | | | | | libnbaio: 64-bit compile warningsMark Salyzyn2014-06-202-3/+5
* | | | | | libmediaplayerservice: 64-bit compile warningsMark Salyzyn2014-06-203-10/+10
* | | | | | libmedia: 64-bit compile warningsMark Salyzyn2014-06-2012-58/+76
* | | | | | AudioTrack: add support for compressed audioEric Laurent2014-06-191-15/+52
* | | | | | Merge changes I0fef0584,I322b91faJean-Michel Trivi2014-06-183-16/+247
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | AudioPolicyManager: return output for audio attributesJean-Michel Trivi2014-06-183-10/+88
| * | | | | AudioTrack construction with audio attributesJean-Michel Trivi2014-06-171-10/+163
* | | | | | Merge "Fail more gracefully on allocation failure"Marco Nelissen2014-06-171-7/+26
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fail more gracefully on allocation failureMarco Nelissen2014-06-171-7/+26
* | | | | | Merge "Fix logging"Marco Nelissen2014-06-161-4/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix loggingMarco Nelissen2014-06-131-4/+4
* | | | | | Merge "support for CEA-608 closed caption"Chong Zhang2014-06-146-3/+383
|\ \ \ \ \ \
| * | | | | | support for CEA-608 closed captionChong Zhang2014-06-136-3/+383
* | | | | | | Merge "refactor getTrackInfo()"Chong Zhang2014-06-1210-65/+154
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | |
| * | | | | refactor getTrackInfo()Chong Zhang2014-06-1310-65/+154
* | | | | | Merge "AudioSystem: remove unused stream type"Jean-Michel Trivi2014-06-122-17/+11
|\ \ \ \ \ \
| * | | | | | AudioSystem: remove unused stream typeJean-Michel Trivi2014-06-112-17/+11
* | | | | | | am 3bcffa13: force command flush after releasing a reference to shared memoryEric Laurent2014-06-132-2/+8
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | force command flush after releasing a reference to shared memoryEric Laurent2014-06-132-2/+8
| * | | | | | Merge "Added paused state to NuPlayerDecoder" into lmp-preview-devWei Jia2014-06-102-2/+20
| |\ \ \ \ \ \
| | * | | | | | Added paused state to NuPlayerDecoderWei Jia2014-06-102-2/+20
| * | | | | | | Guard against malformed filesMarco Nelissen2014-06-101-4/+28
| |/ / / / / /
* | | | | | | am 2a8270e6: am c323737d: Merge "Offer a type-safe album art interface."Elliott Hughes2014-06-124-23/+29
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |