summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Check for duplicate uuids when parsing audio_effects.confMarco Nelissen2014-10-081-24/+83
| | | | | | | | | uuids need to be unique, and things don't work properly when they're not. Also fix/enhance/extend the dumpEffectDescriptor() method, and include a list of effects in audioflinger dumpsys. Change-Id: I3dfbc5ed0f7272c7809e337f2929212ece047ee4
* am d8713103: am 58202e1d: am ce26e9d1: Merge "AudioTrack: fix ↵Eric Laurent2014-10-081-0/+3
|\ | | | | | | | | | | | | AudioTrackThread crash upon exit" into lmp-dev * commit 'd87131038bf79473998e9bf73a2710b5b6c65070': AudioTrack: fix AudioTrackThread crash upon exit
| * am 58202e1d: am ce26e9d1: Merge "AudioTrack: fix AudioTrackThread crash upon ↵Eric Laurent2014-10-081-0/+3
| |\ | | | | | | | | | | | | | | | | | | exit" into lmp-dev * commit '58202e1d7e4d244e1d93699c840d200a6056d918': AudioTrack: fix AudioTrackThread crash upon exit
| | * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case of error during createTrack_l(), there is a possibility that a newly created AudioTrackThread is resumed by requestExit() just after entering the Thread class _threadLoop() but before entering the class threadLoop(). In this case, processAudioBuffer() is executed once with mCblk == 0 and we assert. Bug: 17894033. Change-Id: I93d0d0d4dbf14bcb88dad23e6ad49d2ecd47badd
* | | | am 9da6c242: am 595a5c70: am 73d0a798: Merge "NuPlayer: wait for renderer ↵Andy Hung2014-10-073-52/+64
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | flush before decoder shutdown" into lmp-dev * commit '9da6c242c6979a52bccb60776b993b2282461b0c': NuPlayer: wait for renderer flush before decoder shutdown
| * | | am 595a5c70: am 73d0a798: Merge "NuPlayer: wait for renderer flush before ↵Andy Hung2014-10-073-52/+64
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | decoder shutdown" into lmp-dev * commit '595a5c7062c2d7b6cee4251e5e50766ca166f103': NuPlayer: wait for renderer flush before decoder shutdown
| | * | 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
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17679341 Change-Id: Ie3883686891e7ee6fb45ceb01af1eb60b559d3a0
* | | | | am 2d097456: am a130edc3: am 5002d02e: Merge "Recover from errors" into lmp-devMarco Nelissen2014-10-071-5/+14
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '2d09745626af3f3c052da58df5507f92d9244e3a': Recover from errors
| * | | | am a130edc3: am 5002d02e: Merge "Recover from errors" into lmp-devMarco Nelissen2014-10-071-5/+14
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'a130edc34859cc27b258de865551b1b62b920e5c': Recover from errors
| | * | | Merge "Recover from errors" into lmp-devMarco Nelissen2014-10-071-5/+14
| | |\ \ \
| | | * | | Recover from errorsMarco Nelissen2014-10-061-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the AAC decoder encounters an error, the lists of submitted and consumed sizes need to be resynchronized, to prevent timestamp drift. Bug: 17638652 Change-Id: Ia6d5f48dc36be355803589e4a5796b01559942b8
* | | | | | am 9d06b802: am 42fc04ff: am 584c14c3: Merge "stagefright: do not allocate ↵Rachad2014-10-071-1/+28
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | output buffers for tunneled playback" into lmp-dev * commit '9d06b8026d551c24527d6f72f134046d94068c46': stagefright: do not allocate output buffers for tunneled playback
| * | | | | am 42fc04ff: am 584c14c3: Merge "stagefright: do not allocate output buffers ↵Rachad2014-10-071-1/+28
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for tunneled playback" into lmp-dev * commit '42fc04ff4db20f2de12834818a73778ec9ede052': stagefright: do not allocate output buffers for tunneled playback
| | * | | | Merge "stagefright: do not allocate output buffers for tunneled playback" ↵Rachad2014-10-071-1/+28
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into lmp-dev
| | | * | | | stagefright: do not allocate output buffers for tunneled playbackRachad2014-09-281-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not allocate native window buffers for tunneled video playback codecs. Bug: 17112525 Change-Id: I262d8030a9df6188938fde5d62ebce8faf7dba1f
* | | | | | | am 2d15fb26: am 566a6fba: am ae38d425: Merge "Add -no-integrated-as at local ↵Chih-Hung Hsieh2014-10-071-0/+3
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | level." * commit '2d15fb26bb0f03623127ed4cde9d546b5d42884e': Add -no-integrated-as at local level.
| * | | | | | am 566a6fba: am ae38d425: Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-061-0/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '566a6fba127771c752fd40db84f1e7aafa520ea6': Add -no-integrated-as at local level.
| | * \ \ \ \ \ am ae38d425: Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-061-0/+3
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ae38d425fdb3e3fea015c161d635d631172350c3': Add -no-integrated-as at local level.
| | | * | | | | | Add -no-integrated-as at local level.Chih-Hung Hsieh2014-10-061-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Later we will enable integrated-as as default at the global level. BUG: 17820427 Change-Id: I8e67a152f82afdd1d6b81793ee7dd721ab2b59df
* | | | | | | | | am 0fe4c176: am 1318a608: am e48b90d6: Merge "StageFrightRecorder: Enable ↵Chong Zhang2014-10-061-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | meta-data mode for VP8 hardware encoder." into lmp-dev * commit '0fe4c176fbf52af74f6b0ea0d422621193618d01': StageFrightRecorder: Enable meta-data mode for VP8 hardware encoder.
| * | | | | | | | am 1318a608: am e48b90d6: Merge "StageFrightRecorder: Enable meta-data mode ↵Chong Zhang2014-10-061-0/+1
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for VP8 hardware encoder." into lmp-dev * commit '1318a60824c4f787e54fbbc8a388c6be5146f220': StageFrightRecorder: Enable meta-data mode for VP8 hardware encoder.
| | * | | | | | | Merge "StageFrightRecorder: Enable meta-data mode for VP8 hardware encoder." ↵Chong Zhang2014-10-061-0/+1
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | into lmp-dev
| | | * | | | | | StageFrightRecorder: Enable meta-data mode for VP8 hardware encoder.Praveen Chavan2014-10-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Meta-data mode for input is preferred (rather required) for recording with camera v1. This capability is queried and enabled per codec; enable it for VP8 hardware encoder. Bug: 17664960 Change-Id: I4735c61670ebe0a555002cc25ef3ed823ab02f1f
* | | | | | | | | am 5769ed50: am 658937e7: am c4da004d: Merge "NuPlayer: add ↵Ronghua Wu2014-10-062-3/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | audioDecoderStillNeeded." into lmp-dev * commit '5769ed50bfcb88e2613a8616a5f4cf9f99ea2ecf': NuPlayer: add audioDecoderStillNeeded.
| * | | | | | | | am 658937e7: am c4da004d: Merge "NuPlayer: add audioDecoderStillNeeded." ↵Ronghua Wu2014-10-062-3/+10
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '658937e7a61957de6d40d3e46f80c076e891a4ce': NuPlayer: add audioDecoderStillNeeded.
| | * | | | | | | Merge "NuPlayer: add audioDecoderStillNeeded." into lmp-devRonghua Wu2014-10-062-3/+10
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | | * | | | | | NuPlayer: add audioDecoderStillNeeded.Ronghua Wu2014-10-032-3/+10
| | | | |_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17752358 Change-Id: Ia3b3ee4df65e5564afd0723943d2d747f3a604af
* | | | | | | | am bb2c8147: am dfc2a8f8: am f0011d49: Merge "MediaRecorder: only dequeue ↵Chong Zhang2014-10-041-5/+14
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | available buffers from MediaCodec" into lmp-dev * commit 'bb2c8147452144a19f45bc2e58f1885cec40b8dc': MediaRecorder: only dequeue available buffers from MediaCodec
| * | | | | | | am dfc2a8f8: am f0011d49: Merge "MediaRecorder: only dequeue available ↵Chong Zhang2014-10-041-5/+14
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | buffers from MediaCodec" into lmp-dev * commit 'dfc2a8f8a7d5062ecb2af4b940e54c3ce52795e3': MediaRecorder: only dequeue available buffers from MediaCodec
| | * | | | | | Merge "MediaRecorder: only dequeue available buffers from MediaCodec" into ↵Chong Zhang2014-10-041-5/+14
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | lmp-dev
| | | * | | | | MediaRecorder: only dequeue available buffers from MediaCodecChong Zhang2014-10-031-5/+14
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17514968 Change-Id: If232f92d163deb2440b927315c69e0c4d51ca290
* | | | | | | am e38441d3: am acc8918e: am af1a4dc9: Merge "NuPlayer: don\'t restart ↵Ronghua Wu2014-10-043-5/+21
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioSink when torn down due to pause timeout." into lmp-dev * commit 'e38441d377ae9bdd5a00cbc2351c95cc8d5efdfb': NuPlayer: don't restart AudioSink when torn down due to pause timeout.
| * | | | | | am acc8918e: am af1a4dc9: Merge "NuPlayer: don\'t restart AudioSink when ↵Ronghua Wu2014-10-033-5/+21
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | torn down due to pause timeout." into lmp-dev * commit 'acc8918e034e4715319f388f2c214118671aa674': NuPlayer: don't restart AudioSink when torn down due to pause timeout.
| | * | | | | Merge "NuPlayer: don't restart AudioSink when torn down due to pause ↵Ronghua Wu2014-10-033-5/+21
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | timeout." into lmp-dev
| | | * | | | NuPlayer: don't restart AudioSink when torn down due to pause timeout.Ronghua Wu2014-10-033-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17752358 Change-Id: I232d105480139bfc0b991bcd8e001930e577cf30
* | | | | | | am 8c8b2e4d: am c4fd8b3b: am b220fe0e: Merge "stagefright: fix fake-stride ↵Ronghua Wu2014-10-032-3/+11
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handling for H263 SW decoder" into lmp-dev * commit '8c8b2e4ddbae88751f47f1bc9d4e9e159d61ef24': stagefright: fix fake-stride handling for H263 SW decoder
| * | | | | | am c4fd8b3b: am b220fe0e: Merge "stagefright: fix fake-stride handling for ↵Ronghua Wu2014-10-032-3/+11
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | H263 SW decoder" into lmp-dev * commit 'c4fd8b3b7fc24932626143ea45ab75192cc247c2': stagefright: fix fake-stride handling for H263 SW decoder
| | * | | | | 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
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use outputBufferWidth/Height to init H263 decoder. - Handle stride change when using fake stride. Bug: 17773094 Bug: 17326758 Change-Id: I66ce7b9c650383456923d75417c590e3a8a814e7
* | | | | | | am 2cf3340d: resolved conflicts for merge of c51e512a to lmp-mr1-dev-plus-aospChih-Hung Hsieh2014-10-032-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '2cf3340ddeb5d406909710ac8b74ff59d3451586': Fix struct vs. class mismatches
| * | | | | | resolved conflicts for merge of c51e512a to lmp-mr1-dev-plus-aospChih-Hung Hsieh2014-10-032-2/+2
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | Change-Id: I281f72a222fccd7eb663b878a8c717b3f95baddd
| | * | | | | am c8871d2c: Merge "Fix struct vs. class mismatches"Chih-hung Hsieh2014-10-023-3/+3
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | * commit 'c8871d2cce58f7fa0985d4ace5fec73d468b1afd': Fix struct vs. class mismatches
| | | * | | | Fix struct vs. class mismatchesBernhard Rosenkraenzer2014-10-023-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix class vs. struct mismatches clang whines about. Change-Id: Ia551c796b6a5df8317943715447d0c28cdbf465a Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
* | | | | | | am 9b68037c: am f0d98899: am aaa527fb: Merge "send available codec buffer ↵Chong Zhang2014-10-032-6/+27
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | count with codec notification" into lmp-dev * commit '9b68037c1f3fcf2a390dd796fb31b1d873fe4bea': send available codec buffer count with codec notification
| * | | | | | am f0d98899: am aaa527fb: Merge "send available codec buffer count with ↵Chong Zhang2014-10-032-6/+27
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | codec notification" into lmp-dev * commit 'f0d98899b13c2f5735f1a2b8d0b7254b975b7860': send available codec buffer count with codec notification
| | * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14679336 Change-Id: Id927c96a9a14dd6ecd72540f0037d5841aa32154
* | | | | | | | am 9236887a: am 2e74aefd: am fc93499e: Merge "mediarecorder: set level if ↵Lajos Molnar2014-10-032-0/+58
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setting default profile" into lmp-dev * commit '9236887ac5dfa526d1a90dd5e0a3c3095f443e70': mediarecorder: set level if setting default profile
generated by cgit v1.1 at 2024-06-08 17:17:16 +0000