summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | am c323737d: Merge "Offer a type-safe album art interface."Elliott Hughes2014-06-124-23/+29
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge "Offer a type-safe album art interface."Elliott Hughes2014-06-114-23/+29
| | |\ \ \ \
| | | * | | | Offer a type-safe album art interface.Elliott Hughes2014-06-114-23/+29
* | | | | | | Merge "Remove dependency on Parcel::{read,write}IntPtr"Jeff Tinker2014-06-111-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Remove dependency on Parcel::{read,write}IntPtrJeff Tinker2014-06-101-2/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | am ca44dc79: am 8d6d8f54: Merge "Add libcrypto for users of libstagefright."Christopher Ferris2014-06-112-3/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | am 8d6d8f54: Merge "Add libcrypto for users of libstagefright."Christopher Ferris2014-06-102-3/+1
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Add libcrypto for users of libstagefright.Christopher Ferris2014-06-102-3/+1
| | | |/ / / | | |/| | |
* | | | | | Merge "MediaProfiles: Add 4K video related constants"Zhijun He2014-06-101-0/+2
|\ \ \ \ \ \
| * | | | | | MediaProfiles: Add 4K video related constantsZhijun He2014-06-101-0/+2
| | |_|_|_|/ | |/| | | |
* | | | | | resolved conflicts for merge of 281b884c to masterChristopher Ferris2014-06-111-0/+7
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am d3af4265: Merge "Link libcrypto for MD5_* functions."Christopher Ferris2014-06-101-0/+7
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Link libcrypto for MD5_* functions.Christopher Ferris2014-06-091-0/+7
| * | | | | am 17a6dd60: DO NOT MERGE: MediaCodecList: remove force-added codecs for vide...Lajos Molnar2014-06-051-9/+0
| |\ \ \ \ \
| | * | | | | DO NOT MERGE: MediaCodecList: remove force-added codecs for videoeditorLajos Molnar2014-05-291-9/+0
* | | | | | | Log an error when audio/video encoder failed to createChong Zhang2014-06-111-1/+5
| |_|_|/ / / |/| | | | |