summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | 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 57c27c55: am dc28fa7e: Merge "Add missing #includes"Dan Albert2014-10-044-2/+7
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | * commit '57c27c55006f0137a8ad5a87ec62eb89084dcdc6': Add missing #includes
| * | | | | | am dc28fa7e: Merge "Add missing #includes"Dan Albert2014-10-044-2/+7
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | * commit 'dc28fa7eb4a51ea77c095b0cb9fd757755525492': Add missing #includes
| | * | | | | Merge "Add missing #includes"Dan Albert2014-10-044-2/+7
| | |\ \ \ \ \
| | | * | | | | Add missing #includesBernhard Rosenkraenzer2014-09-274-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some header files in stagefright try to use DISALLOW_EVIL_CONSTRUCTORS (and even DISALLOW_IMPLICIT_CONSTRUCTORS, which isn't defined anywhere in stagefright) without including the proper header. With clang, this results in a build failure - with gcc, it results in DISALLOW_EVIL_CONSTRUCTORS/DISALLOW_IMPLICIT_CONSTRUCTORS not doing what they were intended to do, instead appearing as a method in the DWARF debug sections of files using the headers. Change-Id: Ie4e99affe98ed8fb1bfcf5ec604c19dcd5311c62 Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
* | | | | | | | am f0011d49: Merge "MediaRecorder: only dequeue available buffers from ↵Chong Zhang2014-10-042-6/+15
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaCodec" into lmp-dev * commit 'f0011d49c0f08753dc2dc254c5a70885a9986602': MediaRecorder: only dequeue available buffers from MediaCodec
| * | | | | | | Merge "MediaRecorder: only dequeue available buffers from MediaCodec" into ↵Chong Zhang2014-10-042-6/+15
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | lmp-dev
| | * | | | | | MediaRecorder: only dequeue available buffers from MediaCodecChong Zhang2014-10-032-6/+15
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17514968 Change-Id: If232f92d163deb2440b927315c69e0c4d51ca290
* | | | | | | am af1a4dc9: Merge "NuPlayer: don\'t restart AudioSink when torn down due to ↵Ronghua Wu2014-10-033-5/+21
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pause timeout." into lmp-dev * commit 'af1a4dc989d6707116eaefab300ad55124aace66': 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 2b217bb3: Merge "audioflinger: fix pre processing transfer between record ↵Eric Laurent2014-10-034-15/+76
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | threads." into lmp-dev * commit '2b217bb3aee87ce8486014f261c0f498f6209e80': audioflinger: fix pre processing transfer between record threads.
| * | | | | | | Merge "audioflinger: fix pre processing transfer between record threads." ↵Eric Laurent2014-10-034-15/+76
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | into lmp-dev
| | * | | | | | audioflinger: fix pre processing transfer between record threads.Eric Laurent2014-10-024-15/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix two problems remaining with pre processing effects transfer from one record thread to the next in case of tear down due to device connection: 1 - the enabled state of the effects was not communicated to the new HAL input stream. 2 - the effects saved in orphan chains list were not transfered to the new thread when a AudioRecord was created. Bug: 17757378. Change-Id: I0923c98470db3b51154dc89846157780a4c21e86
* | | | | | | | am b220fe0e: Merge "stagefright: fix fake-stride handling for H263 SW ↵Ronghua Wu2014-10-032-3/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | decoder" into lmp-dev * commit 'b220fe0e40bc3752b62a9576fc824634a16fc3ab': 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 be9ebd46: Merge "Fix uncertainty of one normal mix buffer in ↵Glenn Kasten2014-10-033-2/+29
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioTrack::getTimestamp" into lmp-dev * commit 'be9ebd46c1ec366dca5f142a36a71015b048c037': Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp
| * | | | | | | Merge "Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp" ↵Glenn Kasten2014-10-033-2/+29
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev
| | * | | | | | | Fix uncertainty of one normal mix buffer in AudioTrack::getTimestampGlenn Kasten2014-10-023-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The per-thread timestamp latch was not synchronized with the per-track released frames. Now the value of each track's released frames is latched along with the timestamp. Bug: 17531839 Bug: 17669342 Change-Id: I9d50c8c6a5de55a3f4561ac40e20d497376c1257
* | | | | | | | | am aaa527fb: Merge "send available codec buffer count with codec ↵Chong Zhang2014-10-032-6/+27
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notification" into lmp-dev * commit 'aaa527fbd790d30353d15608e54b5b94625b7b6d': 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 fc93499e: Merge "mediarecorder: set level if setting default profile" ↵Lajos Molnar2014-10-023-2/+66
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit 'fc93499e83403d5959693efa040cb29fd6825abb': mediarecorder: set level if setting default profile
| * | | | | | | | Merge "mediarecorder: set level if setting default profile" into lmp-devLajos Molnar2014-10-023-2/+66
| |\ \ \ \ \ \ \ \
| | * | | | | | | | mediarecorder: set level if setting default profileLajos Molnar2014-10-023-2/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17676461 Change-Id: If01ccd09935945d330de0842be95c3544951b6b9
* | | | | | | | | | am 6eff943c: Merge "NuPlayerDecoder: postpone input message processing when ↵Wei Jia2014-10-022-8/+31
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it\'s not dequeued." into lmp-dev * commit '6eff943c133903fcd9bdb7bb1812d7b383b090f8': NuPlayerDecoder: postpone input message processing when it's not dequeued.
| * | | | | | | | | Merge "NuPlayerDecoder: postpone input message processing when it's not ↵Wei Jia2014-10-022-8/+31
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | dequeued." into lmp-dev
| | * | | | | | | | NuPlayerDecoder: postpone input message processing when it's not dequeued.Wei Jia2014-10-022-8/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17622642 Change-Id: I67608121bf70d6acb152e4aa64892b11bf167e8c
* | | | | | | | | | resolved conflicts for merge of 8b76b592 to lmp-dev-plus-aospLajos Molnar2014-10-024-31/+195
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | Change-Id: I8f40237670ee7345abef562e7461391475787b3e
| * | | | | | | | | Merge "stagefright: move math templates into AUtils.h" into lmp-devLajos Molnar2014-10-024-35/+207
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| / / / / / / | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | stagefright: move math templates into AUtils.hLajos Molnar2014-10-014-35/+207
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add unit test for math templates Bug: 17676461 Change-Id: Ie964c5fcfcca1ec53b4538f8e577392e8fbb4319
* | | | | | | | | resolved conflicts for merge of c51e512a to lmp-dev-plus-aospChih-Hung Hsieh2014-10-022-2/+2
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | Change-Id: I84fae98361d1e2606e5ac2014ae9eef70c884d0e
| * | | | | | | | am c8871d2c: Merge "Fix struct vs. class mismatches"Chih-hung Hsieh2014-10-023-3/+3
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit 'c8871d2cce58f7fa0985d4ace5fec73d468b1afd': Fix struct vs. class mismatches
| | * | | | | | | Merge "Fix struct vs. class mismatches"Chih-hung Hsieh2014-10-023-3/+3
| | |\ \ \ \ \ \ \
| | | * | | | | | | 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 d8b03abf: Merge "NuPlayer: Fix flush mode decoder error handling" into ↵Andy Hung2014-10-026-28/+103
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit 'd8b03abf1d003e2940a19f0071ea2892689dd10e': NuPlayer: Fix flush mode decoder error handling
| * | | | | | | | Merge "NuPlayer: Fix flush mode decoder error handling" into lmp-devAndy Hung2014-10-026-28/+103
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | NuPlayer: Fix flush mode decoder error handlingAndy Hung2014-10-016-28/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly handle each flush mode upon decoder error. Do not clear out affected decoder immediately. Alter logcat messages for better diagnostics. Bug: 17638878 Bug: 17679341 Change-Id: I219796c04d65d7c4dd61c0d4f99f9f580241a68b
* | | | | | | | | am f916667a: Merge "camera2: Force DNG previews to render with LSC map." ↵Ruben Brunk2014-10-021-1/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit 'f916667a017a5a6763afc4808344778570312d5a': camera2: Force DNG previews to render with LSC map.
| * | | | | | | | Merge "camera2: Force DNG previews to render with LSC map." into lmp-devRuben Brunk2014-10-021-1/+3
| |\ \ \ \ \ \ \ \
| | * | | | | | | | camera2: Force DNG previews to render with LSC map.Ruben Brunk2014-10-011-1/+3
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17688063 Change-Id: I7f60a3465ab608a6b68d1e38493895cbd40bd7ae
* | | | | | | | | am cb4b6e9f: audioflinger: fix failure to indicate volume to effectEric Laurent2014-10-022-10/+23
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cb4b6e9f05d1c0b3fcc5be5ebe3f7d6f32669b1a': audioflinger: fix failure to indicate volume to effect
| * | | | | | | | audioflinger: fix failure to indicate volume to effectEric Laurent2014-10-012-10/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an effect is added and enabled after a track is started it will not receive current volume information because volume is indicated only to active effects and if there is a volume change. Add a flag to force EffectChain::setVolume_l() to pass volume indication to all effects each time an effect is enabled. Bug: 17572556. Change-Id: I6b68488c9aca8b2095fb210aa124d02e4f759660
* | | | | | | | | am a49c94ea: Merge "Revert "Fix uncertainty of one normal mix buffer in ↵Glenn Kasten2014-10-013-23/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioTrack::getTimestamp"" into lmp-dev * commit 'a49c94ea49c8329a1bdefe980e1f7d335c0d1ec5': Revert "Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp"
| * | | | | | | | Merge "Revert "Fix uncertainty of one normal mix buffer in ↵Glenn Kasten2014-10-013-23/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioTrack::getTimestamp"" into lmp-dev
| | * | | | | | | | Revert "Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp"Glenn Kasten2014-10-013-23/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 54464ba861aaafd11ee5645f5d1ecd1171c6e9fe. Bug: 17733142. Change-Id: I9886d40032b2f7d96bee03e600e14f78943d8052
* | | | | | | | | | am d0b9efe7: Merge "add AAC audio decoder params for PCM limiter enable" ↵Chong Zhang2014-10-013-3/+16
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit 'd0b9efe7d8300e48f7a99c1dd746d60060206b3c': add AAC audio decoder params for PCM limiter enable
| * | | | | | | | | Merge "add AAC audio decoder params for PCM limiter enable" into lmp-devChong Zhang2014-10-013-3/+16
| |\ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-01-26 22:02:11 +0000