summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 33010b80: am a911f51c: Pass subtitle track properties to getTrackInfoChong Zhang2013-09-111-0/+7
|\
| * am a911f51c: Pass subtitle track properties to getTrackInfoChong Zhang2013-09-111-0/+7
| |\
| | * Pass subtitle track properties to getTrackInfoChong Zhang2013-09-111-0/+7
* | | am 1024ffd7: am 7f9551f7: MediaMuxer: Hook up setLocation methodZhijun He2013-09-101-0/+10
|\ \ \ | |/ /
| * | am 7f9551f7: MediaMuxer: Hook up setLocation methodZhijun He2013-09-101-0/+10
| |\ \ | | |/
| | * MediaMuxer: Hook up setLocation methodZhijun He2013-09-091-0/+10
* | | Merge "HDCP: use getCaps() to query HDCP caps"Chong Zhang2013-09-101-5/+1
|\ \ \
| * | | HDCP: use getCaps() to query HDCP capsChong Zhang2013-09-071-5/+1
* | | | am a28539b0: am 60c60df7: Effect Offload Proxy for effects offloadjpadmana2013-09-064-1/+408
|\ \ \ \ | | |/ / | |/| |
| * | | am 60c60df7: Effect Offload Proxy for effects offloadjpadmana2013-09-064-1/+408
| |\ \ \ | | | |/ | | |/|
| | * | Effect Offload Proxy for effects offloadjpadmana2013-09-064-1/+408
* | | | am c2cfaf78: am a82975e0: Merge "Effects Factory changes for effects offload"...Eric Laurent2013-09-063-2/+274
|\ \ \ \ | |/ / /
| * | | am a82975e0: Merge "Effects Factory changes for effects offload" into klp-devEric Laurent2013-09-063-2/+274
| |\ \ \ | | |/ /
| | * | Merge "Effects Factory changes for effects offload" into klp-devEric Laurent2013-09-063-2/+274
| | |\ \
| | | * | Effects Factory changes for effects offloadjpadmana2013-09-063-2/+274
| | | |/
* | | | am e0fdfdd5: am c23981d9: Merge "Better workaround for slow decoders." into k...Marco Nelissen2013-09-061-4/+19
|\ \ \ \ | |/ / /
| * | | am c23981d9: Merge "Better workaround for slow decoders." into klp-devMarco Nelissen2013-09-061-4/+19
| |\ \ \ | | |/ /
| | * | Merge "Better workaround for slow decoders." into klp-devMarco Nelissen2013-09-061-4/+19
| | |\ \ | | | |/ | | |/|
| | | * Better workaround for slow decoders.Marco Nelissen2013-09-041-4/+19
* | | | Merge "Fix decoder EOS handling"Marco Nelissen2013-09-056-203/+213
|\ \ \ \
| * | | | Fix decoder EOS handlingMarco Nelissen2013-09-046-203/+213
* | | | | am c74630bc: am a1991255: Merge "wifi-display: do not use HDCP\'s encryptNati...Chong Zhang2013-09-044-1/+33
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | am a1991255: Merge "wifi-display: do not use HDCP\'s encryptNative method if ...Chong Zhang2013-09-044-1/+33
| |\ \ \ | | |/ /
| | * | Merge "wifi-display: do not use HDCP's encryptNative method if its unsupporte...Chong Zhang2013-09-044-1/+33
| | |\ \
| | | * | wifi-display: do not use HDCP's encryptNative method if its unsupportedChong Zhang2013-09-034-1/+33
* | | | | am 86df9e10: am c85d6196: Merge " Fixed timestamp handling in ESQueue Access...Rachad2013-09-041-6/+1
|\ \ \ \ \ | |/ / / /
| * | | | am c85d6196: Merge " Fixed timestamp handling in ESQueue Access Unit parser....Rachad2013-09-041-6/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge " Fixed timestamp handling in ESQueue Access Unit parser. This fixes...Rachad2013-09-041-6/+1
| | |\ \ \
| | | * | | Fixed timestamp handling in ESQueue Access Unit parser.Rachad2013-08-301-6/+1
* | | | | | am b9ab60c0: am df60eff8: Merge "Work around decoder slowness" into klp-devMarco Nelissen2013-09-031-0/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am df60eff8: Merge "Work around decoder slowness" into klp-devMarco Nelissen2013-09-031-0/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Work around decoder slowness" into klp-devMarco Nelissen2013-09-041-0/+2
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Work around decoder slownessMarco Nelissen2013-09-031-0/+2
| | | |/ /
* | | | | am 55817ab9: am fe346c70: Fix miscellanous AudioTrack::getTimestamp() bugsGlenn Kasten2013-09-032-1/+15
|\ \ \ \ \ | |/ / / /
| * | | | am fe346c70: Fix miscellanous AudioTrack::getTimestamp() bugsGlenn Kasten2013-09-032-1/+15
| |\ \ \ \ | | |/ / /
| | * | | Fix miscellanous AudioTrack::getTimestamp() bugsGlenn Kasten2013-09-032-1/+15
* | | | | am 6c993a96: am 4d0815d6: Implement MonoPipe::getTimestampGlenn Kasten2013-09-031-0/+3
|\ \ \ \ \ | |/ / / /
| * | | | am 4d0815d6: Implement MonoPipe::getTimestampGlenn Kasten2013-09-031-0/+3
| |\ \ \ \ | | |/ / /
| | * | | Implement MonoPipe::getTimestampGlenn Kasten2013-09-031-0/+3
* | | | | am a4a82c5f: am 6466c9e6: Add ExtendedAudioBufferProvider::framesReleased and...Glenn Kasten2013-09-031-1/+12
|\ \ \ \ \ | |/ / / /
| * | | | am 6466c9e6: Add ExtendedAudioBufferProvider::framesReleased and onTimestampGlenn Kasten2013-09-031-1/+12
| |\ \ \ \ | | |/ / /
| | * | | Add ExtendedAudioBufferProvider::framesReleased and onTimestampGlenn Kasten2013-09-031-1/+12
* | | | | am a071bf88: am 894d6be4: Add NBAIO_Source::onTimestamp()Glenn Kasten2013-09-031-0/+5
|\ \ \ \ \ | |/ / / /
| * | | | am 894d6be4: Add NBAIO_Source::onTimestamp()Glenn Kasten2013-09-031-0/+5
| |\ \ \ \ | | |/ / /
| | * | | Add NBAIO_Source::onTimestamp()Glenn Kasten2013-09-031-0/+5
* | | | | am 1a3a8078: am a07a1c2c: Instantiate SingleStateQueue<AudioTimestamp>Glenn Kasten2013-09-034-2/+11
|\ \ \ \ \ | |/ / / /
| * | | | am a07a1c2c: Instantiate SingleStateQueue<AudioTimestamp>Glenn Kasten2013-09-034-2/+11
| |\ \ \ \ | | |/ / /
| | * | | Instantiate SingleStateQueue<AudioTimestamp>Glenn Kasten2013-09-034-2/+11
* | | | | am f81d5fc1: am 943ba3cc: Merge "Add NBAIO_Sink::getTimestamp()" into klp-devGlenn Kasten2013-09-032-0/+17
|\ \ \ \ \ | |/ / / /
| * | | | am 943ba3cc: Merge "Add NBAIO_Sink::getTimestamp()" into klp-devGlenn Kasten2013-09-032-0/+17
| |\ \ \ \ | | |/ / /