summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | Merge "stagefright: make BufferQueueProducer not re-allocate buffer when tryi...Wei Jia2015-04-301-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | stagefright: make BufferQueueProducer not re-allocate buffer when trying to d...Wei Jia2015-04-291-0/+10
* | | | | | | | | | | | | | | | | Merge "Omx: Return an error if no IOMX is available" into mnc-devAndy Hung2015-04-304-4/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Omx: Return an error if no IOMX is availableAndy Hung2015-04-294-4/+21
* | | | | | | | | | | | | | | | | Merge "Harden drmserver process against fuzzing attacks" into mnc-devJeff Tinker2015-04-301-10/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Harden drmserver process against fuzzing attacksJeff Tinker2015-04-291-10/+46
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge "DO NOT MERGE: Prevent crash at erroneous MPEG2TS bitstream" into mnc-devJinsuk Kim2015-04-295-125/+320
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | DO NOT MERGE: Prevent crash at erroneous MPEG2TS bitstreamJinsuk Kim2015-04-295-125/+320
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge "stagefright: convert kKeyFrameRate between msg and meta" into mnc-devChong Zhang2015-04-291-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | stagefright: convert kKeyFrameRate between msg and metaChong Zhang2015-04-291-0/+10
* | | | | | | | | | | | | | | | Fix build.Dianne Hackborn2015-04-291-1/+1
* | | | | | | | | | | | | | | | Merge "Respect the record audio app op - media" into mnc-devSvet Ganov2015-04-2934-75/+209
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Respect the record audio app op - mediaSvet Ganov2015-04-2934-75/+209
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | MatroskaExtractor: skip track when codec id is NULL in addTracksRobert Shih2015-04-281-4/+6
| |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "Check allocation" into mnc-devMarco Nelissen2015-04-281-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Check allocationMarco Nelissen2015-04-281-3/+9
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge "DO NOT MERGE: The preview frame data is broken when sending via Binder...Eino-Ville Talvala2015-04-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | DO NOT MERGE: The preview frame data is broken when sending via Binderdaisuke jinno2015-04-281-1/+1
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Explicit routing in AudioRecordPaul McLean2015-04-2813-70/+193
|/ / / / / / / / / / /
* | | | | | | | | | | Merge "HDCP: buffer over flow check" into mnc-devChong Zhang2015-04-281-2/+24
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | HDCP: buffer over flow checkChong Zhang2015-04-271-2/+24
* | | | | | | | | | | Merge "DO NOT MERGE libmediaplayerservice: set priority and operating rate fo...Ronghua Wu2015-04-279-0/+63
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | DO NOT MERGE libmediaplayerservice: set priority and operating rate for the c...Ronghua Wu2015-04-279-0/+63
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | DO NOT MERGE libmedia: add sub resource type audio-codec and video-codec.Ronghua Wu2015-04-274-8/+21
|/ / / / / / / / / /
* | | | | | | | | | Merge "Revert "Add a configurable version of the policy engine based on PFW""Eric Laurent2015-04-2564-9242/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Revert "Add a configurable version of the policy engine based on PFW"Eric Laurent2015-04-2564-9242/+2
* | | | | | | | | | | Merge "Revert "Fix M Issue on configurable policy engine version.""Eric Laurent2015-04-257-29/+38
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Revert "Fix M Issue on configurable policy engine version."Eric Laurent2015-04-257-29/+38
* | | | | | | | | | | | Merge "Fix M Issue on configurable policy engine version."Eric Laurent2015-04-257-38/+29
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Fix M Issue on configurable policy engine version.François Gaffie2015-04-247-38/+29
| |/ / / / / / / / / /
* | | | | | | | | | | Merge "Add a configurable version of the policy engine based on PFW"Eric Laurent2015-04-2564-2/+9242
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Add a configurable version of the policy engine based on PFWFrançois Gaffie2015-04-2464-2/+9242
* | | | | | | | | | | Merge "Lock drm plugin API calls globally, not per MediaDrm instance"Jeff Tinker2015-04-252-1/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Lock drm plugin API calls globally, not per MediaDrm instanceJeff Tinker2015-04-222-1/+2
* | | | | | | | | | | | MatroskaExtractor: skip track when codec id is NULL in addTracksRobert Shih2015-04-241-1/+4
| |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge "mediaresourcemanager: add dumpsys support."Ronghua Wu2015-04-246-0/+88
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | mediaresourcemanager: add dumpsys support.Ronghua Wu2015-04-236-0/+88
* | | | | | | | | | | | Merge "AudioPolicyManager: notification of dynamic policy mix activity (input)"Jean-Michel Trivi2015-04-241-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | AudioPolicyManager: notification of dynamic policy mix activity (input)Jean-Michel Trivi2015-04-211-0/+13
* | | | | | | | | | | | Merge "MediaCodec: ignore error when linkToDeath to batterystats"Chong Zhang2015-04-241-8/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | MediaCodec: ignore error when linkToDeath to batterystatsChong Zhang2015-04-241-8/+5
* | | | | | | | | | | | | Merge "HLS: make disconnect faster to prevent ANR"Chong Zhang2015-04-248-330/+510
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | HLS: make disconnect faster to prevent ANRChong Zhang2015-04-238-330/+510
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge "Copy sei offset/size during ABuffer/MediaBuffer conversion"Robert Shih2015-04-243-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Copy sei offset/size during ABuffer/MediaBuffer conversionRobert Shih2015-04-233-0/+16
* | | | | | | | | | | | | | Merge "MediaSync: allow users to query play time for pending audio frames."Wei Jia2015-04-242-0/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | MediaSync: allow users to query play time for pending audio frames.Wei Jia2015-04-232-0/+39
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "RadioService: fix error handling in attach()."Eric Laurent2015-04-241-4/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | RadioService: fix error handling in attach().Eric Laurent2015-04-231-4/+3
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Fix format sorting order in AudioPortAndy Hung2015-04-232-12/+22
|/ / / / / / / / / / / / /