summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "AudioSystem: refactor audio config cache and callbacks" into mnc-devEric Laurent2015-05-012-141/+118
|\
| * AudioSystem: refactor audio config cache and callbacksEric Laurent2015-05-012-141/+118
* | stagefright: remove NativeWindowWrapperLajos Molnar2015-04-306-66/+47
* | Merge "GenericSource: reply mime information for *all* track types" into mnc-devRobert Shih2015-05-012-6/+5
|\ \
| * | GenericSource: reply mime information for *all* track typesRobert Shih2015-04-302-6/+5
* | | stagefright: support setting/getting playback/sync config in MediaSyncLajos Molnar2015-04-3018-104/+907
* | | AudioTrack: fix buildPhil Burk2015-04-301-4/+2
* | | Merge "MediaSync: map returned output buffers to previously received input bu...Wei Jia2015-04-301-2/+21
|\ \ \
| * | | MediaSync: map returned output buffers to previously received input buffers.Wei Jia2015-04-301-2/+21
* | | | Merge "AudioTrack: fix spurious retrograde messages" into mnc-devPhil Burk2015-04-301-0/+44
|\ \ \ \
| * | | | AudioTrack: fix spurious retrograde messagesPhil Burk2015-04-291-0/+44
* | | | | Merge "audio policy: session routes continued." into mnc-devEric Laurent2015-04-304-5/+14
|\ \ \ \ \
| * | | | | audio policy: session routes continued.Eric Laurent2015-04-304-5/+14
| | |_|_|/ | |/| | |
* | | | | Merge "MPEG2PSExtractor: check number of bits left before skipping" into mnc-devRobert Shih2015-04-301-0/+4
|\ \ \ \ \
| * | | | | MPEG2PSExtractor: check number of bits left before skippingRobert Shih2015-04-291-0/+4
| | |_|_|/ | |/| | |
* | | | | Merge "AudioSystem callback for dynamic policy mix activity" into mnc-devJean-Michel Trivi2015-04-302-5/+21
|\ \ \ \ \
| * | | | | AudioSystem callback for dynamic policy mix activityJean-Michel Trivi2015-04-292-5/+21
* | | | | | Merge "libstagefright: add xml parsing for measured-frame-rate and measured-b...Ronghua Wu2015-04-301-2/+4
|\ \ \ \ \ \
| * | | | | | libstagefright: add xml parsing for measured-frame-rate and measured-blocks-p...Ronghua Wu2015-04-291-2/+4
| |/ / / / /
* | | | | | Merge "Don't use the bitrate of the xing header" into mnc-devMarco Nelissen2015-04-301-23/+35
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Don't use the bitrate of the xing headerMarco Nelissen2015-04-291-23/+35
| | |_|/ / | |/| | |
* | | | | Merge "NdkMediaCodec: Return NULL if the MediaCodec cannot be created" into m...Andy Hung2015-04-301-9/+17
|\ \ \ \ \
| * | | | | NdkMediaCodec: Return NULL if the MediaCodec cannot be createdAndy Hung2015-04-291-9/+17
* | | | | | 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 "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-2920-45/+87
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Respect the record audio app op - mediaSvet Ganov2015-04-2920-45/+87
| | |_|/ / / | |/| | | |
* | | | | | MatroskaExtractor: skip track when codec id is NULL in addTracksRobert Shih2015-04-281-4/+6
| |_|_|_|/ |/| | | |
* | | | | Check allocationMarco Nelissen2015-04-281-3/+9
|/ / / /
* | | | Explicit routing in AudioRecordPaul McLean2015-04-283-7/+30
| |_|/ |/| |
* | | 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-278-0/+62
|\ \ \
| * | | DO NOT MERGE libmediaplayerservice: set priority and operating rate for the c...Ronghua Wu2015-04-278-0/+62
| | |/ | |/|
* | | DO NOT MERGE libmedia: add sub resource type audio-codec and video-codec.Ronghua Wu2015-04-272-7/+18
|/ /
* | 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-242-0/+35
|\ \ \ | |_|/ |/| |
| * | mediaresourcemanager: add dumpsys support.Ronghua Wu2015-04-232-0/+35
* | | 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
|\ \ \