summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Check for duplicate uuids when parsing audio_effects.confMarco Nelissen2014-10-081-24/+83
* am d8713103: am 58202e1d: am ce26e9d1: Merge "AudioTrack: fix AudioTrackThrea...Eric Laurent2014-10-081-0/+3
|\
| * am 58202e1d: am ce26e9d1: Merge "AudioTrack: fix AudioTrackThread crash upon ...Eric Laurent2014-10-081-0/+3
| |\
| | * Merge "AudioTrack: fix AudioTrackThread crash upon exit" into lmp-devEric Laurent2014-10-081-0/+3
| | |\
| | | * AudioTrack: fix AudioTrackThread crash upon exitEric Laurent2014-10-071-0/+3
* | | | am 9da6c242: am 595a5c70: am 73d0a798: Merge "NuPlayer: wait for renderer flu...Andy Hung2014-10-073-52/+64
|\ \ \ \ | |/ / /
| * | | am 595a5c70: am 73d0a798: Merge "NuPlayer: wait for renderer flush before dec...Andy Hung2014-10-073-52/+64
| |\ \ \ | | |/ /
| | * | Merge "NuPlayer: wait for renderer flush before decoder shutdown" into lmp-devAndy Hung2014-10-073-52/+64
| | |\ \
| | | * | NuPlayer: wait for renderer flush before decoder shutdownAndy Hung2014-10-063-52/+64
* | | | | am 2d097456: am a130edc3: am 5002d02e: Merge "Recover from errors" into lmp-devMarco Nelissen2014-10-071-5/+14
|\ \ \ \ \ | |/ / / /
| * | | | am a130edc3: am 5002d02e: Merge "Recover from errors" into lmp-devMarco Nelissen2014-10-071-5/+14
| |\ \ \ \ | | |/ / /
| | * | | Merge "Recover from errors" into lmp-devMarco Nelissen2014-10-071-5/+14
| | |\ \ \
| | | * | | Recover from errorsMarco Nelissen2014-10-061-5/+14
* | | | | | am 9d06b802: am 42fc04ff: am 584c14c3: Merge "stagefright: do not allocate ou...Rachad2014-10-071-1/+28
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 42fc04ff: am 584c14c3: Merge "stagefright: do not allocate output buffers ...Rachad2014-10-071-1/+28
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "stagefright: do not allocate output buffers for tunneled playback" int...Rachad2014-10-071-1/+28
| | |\ \ \ \
| | | * | | | stagefright: do not allocate output buffers for tunneled playbackRachad2014-09-281-1/+28
* | | | | | | am 2d15fb26: am 566a6fba: am ae38d425: Merge "Add -no-integrated-as at local ...Chih-Hung Hsieh2014-10-071-0/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 566a6fba: am ae38d425: Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-061-0/+3
| |\ \ \ \ \ \
| | * \ \ \ \ \ am ae38d425: Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-061-0/+3
| | |\ \ \ \ \ \
| | | * | | | | | Add -no-integrated-as at local level.Chih-Hung Hsieh2014-10-061-0/+3
* | | | | | | | | am 0fe4c176: am 1318a608: am e48b90d6: Merge "StageFrightRecorder: Enable met...Chong Zhang2014-10-061-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 1318a608: am e48b90d6: Merge "StageFrightRecorder: Enable meta-data mode f...Chong Zhang2014-10-061-0/+1
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Merge "StageFrightRecorder: Enable meta-data mode for VP8 hardware encoder." ...Chong Zhang2014-10-061-0/+1
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | | * | | | | | StageFrightRecorder: Enable meta-data mode for VP8 hardware encoder.Praveen Chavan2014-10-061-0/+1
* | | | | | | | | am 5769ed50: am 658937e7: am c4da004d: Merge "NuPlayer: add audioDecoderStill...Ronghua Wu2014-10-062-3/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 658937e7: am c4da004d: Merge "NuPlayer: add audioDecoderStillNeeded." into...Ronghua Wu2014-10-062-3/+10
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "NuPlayer: add audioDecoderStillNeeded." into lmp-devRonghua Wu2014-10-062-3/+10
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | | * | | | | | NuPlayer: add audioDecoderStillNeeded.Ronghua Wu2014-10-032-3/+10
| | | | |_|_|_|/ | | | |/| | | |
* | | | | | | | am bb2c8147: am dfc2a8f8: am f0011d49: Merge "MediaRecorder: only dequeue ava...Chong Zhang2014-10-041-5/+14
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am dfc2a8f8: am f0011d49: Merge "MediaRecorder: only dequeue available buffer...Chong Zhang2014-10-041-5/+14
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "MediaRecorder: only dequeue available buffers from MediaCodec" into lm...Chong Zhang2014-10-041-5/+14
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | MediaRecorder: only dequeue available buffers from MediaCodecChong Zhang2014-10-031-5/+14
| | | |/ / / /
* | | | | | | am e38441d3: am acc8918e: am af1a4dc9: Merge "NuPlayer: don\'t restart AudioS...Ronghua Wu2014-10-043-5/+21
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am acc8918e: am af1a4dc9: Merge "NuPlayer: don\'t restart AudioSink when torn...Ronghua Wu2014-10-033-5/+21
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "NuPlayer: don't restart AudioSink when torn down due to pause timeout....Ronghua Wu2014-10-033-5/+21
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | NuPlayer: don't restart AudioSink when torn down due to pause timeout.Ronghua Wu2014-10-033-5/+21
* | | | | | | am 8c8b2e4d: am c4fd8b3b: am b220fe0e: Merge "stagefright: fix fake-stride ha...Ronghua Wu2014-10-032-3/+11
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am c4fd8b3b: am b220fe0e: Merge "stagefright: fix fake-stride handling for H2...Ronghua Wu2014-10-032-3/+11
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "stagefright: fix fake-stride handling for H263 SW decoder" into lmp-devRonghua Wu2014-10-032-3/+11
| | |\ \ \ \ \
| | | * | | | | stagefright: fix fake-stride handling for H263 SW decoderRonghua Wu2014-10-022-3/+11
| | | |/ / / /
* | | | | | | am 2cf3340d: resolved conflicts for merge of c51e512a to lmp-mr1-dev-plus-aospChih-Hung Hsieh2014-10-032-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | resolved conflicts for merge of c51e512a to lmp-mr1-dev-plus-aospChih-Hung Hsieh2014-10-032-2/+2
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | am c8871d2c: Merge "Fix struct vs. class mismatches"Chih-hung Hsieh2014-10-023-3/+3
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Fix struct vs. class mismatchesBernhard Rosenkraenzer2014-10-023-3/+3
* | | | | | | am 9b68037c: am f0d98899: am aaa527fb: Merge "send available codec buffer cou...Chong Zhang2014-10-032-6/+27
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am f0d98899: am aaa527fb: Merge "send available codec buffer count with codec...Chong Zhang2014-10-032-6/+27
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge "send available codec buffer count with codec notification" into lmp-devChong Zhang2014-10-032-6/+27
| | |\ \ \ \ \
| | | * | | | | send available codec buffer count with codec notificationChong Zhang2014-10-022-6/+27
* | | | | | | | am 9236887a: am 2e74aefd: am fc93499e: Merge "mediarecorder: set level if set...Lajos Molnar2014-10-032-0/+58
|\ \ \ \ \ \ \ \ | |/ / / / / / /