summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | am ddc1216d: Merge "MPEG4Extractor: more NULL derefernce fixes in ↵Robert Shih2015-01-231-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parseChunk" into lmp-mr1-dev * commit 'ddc1216dcf8f9dc1a1340ed4bc6c6f28f29b1076': MPEG4Extractor: more NULL derefernce fixes in parseChunk do not use paused postition if it's not available Use aligned width and height to compute size.
| | * | | | | Merge "MPEG4Extractor: more NULL derefernce fixes in parseChunk" into ↵Robert Shih2015-01-231-1/+1
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | lmp-mr1-dev
| | | * | | | MPEG4Extractor: more NULL derefernce fixes in parseChunkRobert Shih2015-01-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18771789 Change-Id: Ie0511ed3a885dbf64a7472e8fa74d15b0e87778d
| | | * | | | merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-190-0/+0
| | | |\ \ \ \
| | | | * | | | do not use paused postition if it's not availableChong Zhang2015-01-161-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 18896133 bug: 18996505 Change-Id: I1e24fabe3fe8f2275b1ccc0df100cb2c4ba2264b
| | | | * | | | merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-150-0/+0
| | | | |\ \ \ \
| | | | | * \ \ \ merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-140-0/+0
| | | | | |\ \ \ \
| | | | | | * \ \ \ merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-120-0/+0
| | | | | | |\ \ \ \
| | | | | | | * | | | Use aligned width and height to compute size.Ronghua Wu2015-01-081-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18528130 Change-Id: I4d2304d8c8919c1cde60676848cfe2e4f2061a87
| | | | | | | * | | | merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-080-0/+0
| | | | | | | |\ \ \ \
| | | | | | | | * \ \ \ merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-070-0/+0
| | | | | | | | |\ \ \ \
* | | | | | | | | \ \ \ \ am 0fe24de8: am c0c2366c: Merge "stagefright: do not reject SPL4 files ↵Ronghua Wu2015-01-231-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | outright in SoftMpeg4 decoder" into lmp-mr1-dev * commit '0fe24de8e5a077a8220542db282c06852aaff109': stagefright: do not reject SPL4 files outright in SoftMpeg4 decoder
| * | | | | | | | | | | | am c0c2366c: Merge "stagefright: do not reject SPL4 files outright in ↵Ronghua Wu2015-01-231-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SoftMpeg4 decoder" into lmp-mr1-dev * commit 'c0c2366c180e06f03cbd1c1a4020bdc26f1002f7': stagefright: do not reject SPL4 files outright in SoftMpeg4 decoder
| | * | | | | | | | | | | Merge "stagefright: do not reject SPL4 files outright in SoftMpeg4 decoder" ↵Ronghua Wu2015-01-231-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev
| | | * | | | | | | | | | | stagefright: do not reject SPL4 files outright in SoftMpeg4 decoderRonghua Wu2015-01-221-0/+4
| | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19014147 Change-Id: Ie90e8fc69e9ac2cb34d6362e67ad289d002a2c14
* | | | | | | | | | | | | am b3e1f71b: am 841d22b0: libstagefright: Use aligned width and height.Ronghua Wu2015-01-231-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b3e1f71bbc154f35a5c0b113bb923ac9bf9d33dd': libstagefright: Use aligned width and height.
| * | | | | | | | | | | | am 841d22b0: libstagefright: Use aligned width and height.Ronghua Wu2015-01-231-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '841d22b0645ff48a03e7f500f95458f3d70a0a61': libstagefright: Use aligned width and height.
| | * | | | | | | | | | | libstagefright: Use aligned width and height.Ronghua Wu2015-01-221-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19014147 Change-Id: I33314b02448e436c43fcfad086b5edfa650dcf83
* | | | | | | | | | | | | am a789e519: am 0c4e56d0: Camera: make sure jpeg buffer size isn\'t too smallYin-Chia Yeh2015-01-201-4/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a789e51942c7572e0c9f54326d6d9d0ff65d6941': Camera: make sure jpeg buffer size isn't too small
| * | | | | | | | | | | | am 0c4e56d0: Camera: make sure jpeg buffer size isn\'t too smallYin-Chia Yeh2015-01-201-4/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0c4e56d0baaa19fcf17234b38d634b7281e2ae37': Camera: make sure jpeg buffer size isn't too small
| | * | | | | | | | | | | Camera: make sure jpeg buffer size isn't too smallYin-Chia Yeh2015-01-201-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assuming the jpeg header can take up to 256KB, make sure we always allocate enough size for the image data. Bug: 18962703 Change-Id: I08eb3d198d12f71f3ab7266324e80fe7410bdc89
* | | | | | | | | | | | | am bf2751a5: am 7ccc6b9b: Merge "fix audio patch leak." into lmp-mr1-devEric Laurent2015-01-201-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bf2751a5ea6a306c2ba51a0658ec10aa889a81fa': fix audio patch leak.
| * | | | | | | | | | | | am 7ccc6b9b: Merge "fix audio patch leak." into lmp-mr1-devEric Laurent2015-01-201-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7ccc6b9baf2f568a0a8c6e27dcd4195645a6361d': fix audio patch leak.
| | * | | | | | | | | | | Merge "fix audio patch leak." into lmp-mr1-devEric Laurent2015-01-201-2/+4
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | fix audio patch leak.Eric Laurent2015-01-151-2/+4
| | | | |/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always wait for status when executing a create audio patch command in audio policy service command thread. The returned patch handle must be passed back to audio policy manager so that the patch can be modified later. Failing to do so causes a leak of patch descriptors in audio flinger. Bug: 19032387. Change-Id: I5462d1437fac244d9c5e38f2c7b8e1a4c01d2b75
* | | | | | | | | | | | am 252a9101: (-s ours) am 1ed13b3b: (-s ours) Merge "DO NOT MERGE - audio ↵Eric Laurent2015-01-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | policy: fix output device command after clearing audio patch" * commit '252a9101480d7a554476f0f680710fcab13d1369': DO NOT MERGE - audio policy: fix output device command after clearing audio patch
| * | | | | | | | | | | am 1ed13b3b: (-s ours) Merge "DO NOT MERGE - audio policy: fix output device ↵Eric Laurent2015-01-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | command after clearing audio patch" * commit '1ed13b3b443735e7f7b5002954f31741b0b1c572': DO NOT MERGE - audio policy: fix output device command after clearing audio patch
| | * | | | | | | | | | Merge "DO NOT MERGE - audio policy: fix output device command after clearing ↵Eric Laurent2015-01-201-4/+8
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | audio patch"
| | | * | | | | | | | | | DO NOT MERGE - audio policy: fix output device command after clearing audio ↵Eric Laurent2015-01-201-4/+8
| | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | patch Make sure that a valid audio patch is created again on an output stream following the disconnection and reconnection of the same output device. Bug: 18144611. Change-Id: I72387ad8e93f8fb2571da2a6c58a6e167ac7fc4d
* | | | | | | | | | | | am 9e308de9: am 4d4ea7f7: Merge "do not use paused postition if it\'s not ↵Chong Zhang2015-01-161-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | available" into lmp-mr1-dev * commit '9e308de9214e55dd0d102484ea44b117ec050540': do not use paused postition if it's not available
| * | | | | | | | | | | am 4d4ea7f7: Merge "do not use paused postition if it\'s not available" into ↵Chong Zhang2015-01-161-2/+8
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '4d4ea7f7ca04cfe70ecf6f35658389f52ae6d3c1': do not use paused postition if it's not available
| | * | | | | | | | | | Merge "do not use paused postition if it's not available" into lmp-mr1-devChong Zhang2015-01-161-2/+8
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | do not use paused postition if it's not availableChong Zhang2015-01-151-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 18896133 bug: 18996505 Change-Id: I1e24fabe3fe8f2275b1ccc0df100cb2c4ba2264b
* | | | | | | | | | | | | am 65cb339d: am 21291a42: Merge "fix leak in audio policy effect config ↵Eric Laurent2015-01-151-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parser" into lmp-mr1-dev * commit '65cb339de0f628c82bdd5c68d868b6f3dc83cf04': fix leak in audio policy effect config parser
| * | | | | | | | | | | | am 21291a42: Merge "fix leak in audio policy effect config parser" into ↵Eric Laurent2015-01-151-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '21291a420e11ccdf23e955c3dc390304230ddce3': fix leak in audio policy effect config parser
| | * | | | | | | | | | | Merge "fix leak in audio policy effect config parser" into lmp-mr1-devEric Laurent2015-01-151-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | fix leak in audio policy effect config parserEric Laurent2015-01-151-0/+4
| | | | |_|_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Free temporary effect descriptors created in loadAudioEffectConfig(). Bug 19021726. Change-Id: Icd44216e25df3fe683a01763d7e8a7b84f367a1a
* | | | | | | | | | | | am e680491e: am 1efe46de: Merge "Fix id3 parser crash"Marco Nelissen2015-01-151-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e680491ef752256d0d0d39fc77cd7495e580adea': Fix id3 parser crash
| * | | | | | | | | | | am 1efe46de: Merge "Fix id3 parser crash"Marco Nelissen2015-01-151-2/+9
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1efe46deb86b8ca246e2486ec16d88efd9e1e657': Fix id3 parser crash
| | * | | | | | | | | | Merge "Fix id3 parser crash"Marco Nelissen2015-01-151-2/+9
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Fix id3 parser crashMarco Nelissen2015-01-151-2/+9
| | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18872896 Change-Id: I953f58f35a76590701234d5707e060499acfc069
* | | | | | | | | | | | am eed5e4bd: am 5b578bec: Merge " [FM]There is no sound output from BT ↵Leo Wang2015-01-151-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | earphone while BT earphone is connected" into lmp-mr1-dev * commit 'eed5e4bd2b25da3e1965f4ab360f3cea1ccbcc2c': [FM]There is no sound output from BT earphone while BT earphone is connected
| * | | | | | | | | | | am 5b578bec: Merge " [FM]There is no sound output from BT earphone while ↵Leo Wang2015-01-151-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BT earphone is connected" into lmp-mr1-dev * commit '5b578beca7c835c0c49f8f93219cf4d2f82057e3': [FM]There is no sound output from BT earphone while BT earphone is connected
| | * | | | | | | | | | Merge " [FM]There is no sound output from BT earphone while BT earphone ↵Leo Wang2015-01-151-4/+4
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | is connected" into lmp-mr1-dev
| | | * | | | | | | | | [FM]There is no sound output from BT earphone while BT earphone is connectedHochi Huang2015-01-131-4/+4
| | | | |_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18847131 Review: https://partner-android-review.git.corp.google.com/#/c/193318 Signed-off-by: Hochi Huang <hochi.huang@mediatek.com> Change-Id: I79703ba4ceb67ca3b95fbc71444dd3b116ba4131
* | | | | | | | | | | resolved conflicts for merge of 9e5929ad to lmp-mr1-dev-plus-aospMarco Nelissen2015-01-140-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4c4c4a035cd4761b7b891c277a0a88229e3c4e87
| * | | | | | | | | | am 5f3194c9: MidiFile: report correct state during transient period when ↵Wei Jia2015-01-141-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | start() is called first time. * commit '5f3194c9efeadc200c89d9e2b00a19f1afeac55d': MidiFile: report correct state during transient period when start() is called first time.
| | * | | | | | | | | MidiFile: report correct state during transient period when start() is ↵Wei Jia2015-01-141-1/+1
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | called first time. Bug: 18905421 Bug: 18994222 Change-Id: Iee47043e60740fab9e62aa28db4cbcec4f339c22
* | | | | | | | | | am cec272df: am 724b9ea5: Merge "Replace MidiFile player with a Midi extractor"Marco Nelissen2015-01-1319-942/+446
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cec272dfe2cf6bf6cdb8a4afa5afdd0e910c915f': Replace MidiFile player with a Midi extractor
| * | | | | | | | | am 724b9ea5: Merge "Replace MidiFile player with a Midi extractor"Marco Nelissen2015-01-1319-942/+446
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '724b9ea51db0c191cc3184319719a38b5a1f6502': Replace MidiFile player with a Midi extractor
generated by cgit v1.1 at 2025-02-15 19:32:48 +0000