summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Merge "NuPlayerRenderer: Do not deliver audio too soon after stop" into ↵Andy Hung2015-09-142-1/+19
|\ | | | | | | mnc-dr-dev
| * NuPlayerRenderer: Do not deliver audio too soon after stopAndy Hung2015-09-012-1/+19
| | | | | | | | | | | | | | | | | | | | For non-offloaded audio, do not deliver audio data too soon after stop when in paused mode. Otherwise the audio MixerThread will keep the track playing, instead of inactivating the track. Bug: 23167401 Change-Id: If376148c742fde2d20dc5d23bf0b894fe378e71a (cherry picked from commit b03dcb34cd44d77e5fe1559e72323e03c59931db)
* | am 4374b187: Merge "NuCachedSource2: fix possible erroneous early free" into ↵Wonsik Kim2015-09-144-7/+21
|\ \ | | | | | | | | | | | | | | | | | | mnc-dev * commit '4374b187e5e72056f8e814dae752b62cb60fc9a4': NuCachedSource2: fix possible erroneous early free
| * \ Merge "NuCachedSource2: fix possible erroneous early free" into mnc-devWonsik Kim2015-09-144-7/+21
| |\ \
| | * | NuCachedSource2: fix possible erroneous early freeWonsik Kim2015-09-094-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because the constructor of NuCachedSource2 sent a message to AHandlerReflector object, AHandlerReflector::onMessageReceived could have executed just before the object gets wrapped in a strong pointer, resulting in erroneous early free. Fix the issue by using static Create function to ensure the message is sent after the object is wrapped in a sp. Bug: 23882800 Change-Id: I38a9d7a3083f184b4c81d0b00ba1661721278855
* | | | am 393eb647: Merge "Avoid size_t overflow in base64 decoding once again" ↵Wonsik Kim2015-09-112-93/+20
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into mnc-dev * commit '393eb6471e08dd0c2f9b8187721d02e978491cba': Avoid size_t overflow in base64 decoding once again
| * | | Merge "Avoid size_t overflow in base64 decoding once again" into mnc-devWonsik Kim2015-09-112-93/+20
| |\ \ \
| | * | | Avoid size_t overflow in base64 decoding once againWonsik Kim2015-09-072-93/+20
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch to foundation base64 function in OggExtractor and fix the issue there. Bug: 23707088 Change-Id: I999ae911177c88dc13f9ee9796ca93c5928b20b0
* | | | Merge "libstagefright: Do not add audio codecs to resource manager. They are ↵Ronghua Wu2015-09-111-2/+5
|\ \ \ \ | | | | | | | | | | | | | | | too small anyhow." into mnc-dr-dev
| * | | | libstagefright: Do not add audio codecs to resource manager. They are too ↵Ronghua Wu2015-09-101-2/+5
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | small anyhow. Bug: 23703241 Change-Id: I3c2882a1d6736bb8a4099289d8bab4974343586d
* | | | am 7a2ffb90: Merge "IAudioFlinger: clear config before reading it from ↵Wei Jia2015-09-102-15/+29
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | parcel." into mnc-dev * commit '7a2ffb90ff8c8d6d8d32f44b8fe0f79bc608f1f1': IAudioFlinger: clear config before reading it from parcel.
| * | | Merge "IAudioFlinger: clear config before reading it from parcel." into mnc-devWei Jia2015-09-102-15/+29
| |\ \ \
| | * | | IAudioFlinger: clear config before reading it from parcel.Wei Jia2015-09-092-15/+29
| | | |/ | | |/| | | | | | | | | | | | | | | | | Bug: 23905951 Bug: 23912202 Change-Id: Id13a9d3cae2c09e7381b841e67ddfb188274d74c
* | | | am b946648c: Protect data source access with mutex during disconnectRobert Shih2015-09-092-8/+24
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'b946648cc63a4d328318b56215214ead575bc54a': Protect data source access with mutex during disconnect
| * | | Protect data source access with mutex during disconnectRobert Shih2015-09-082-8/+24
| | | | | | | | | | | | | | | | | | | | Bug: 23658148 Change-Id: Ic37cac7b5d166143e0b77e9919b0aaef486e4fdd
* | | | am c336136d: Merge "libstagefright: fix A_Refl to return immediately when ↵Wei Jia2015-09-082-2/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | there is an error." into mnc-dev * commit 'c336136d8a86a8a95047949955a9bb749af247ab': libstagefright: fix A_Refl to return immediately when there is an error.
| * | | Merge "libstagefright: fix A_Refl to return immediately when there is an ↵Wei Jia2015-09-082-2/+5
| |\ \ \ | | |/ / | |/| | | | | | error." into mnc-dev
| | * | libstagefright: fix A_Refl to return immediately when there is an error.Wei Jia2015-09-042-2/+5
| | | | | | | | | | | | | | | | | | | | Bug: 23609206 Change-Id: I2ad25fb208df17f5a5b6d6b356eff2f400627f22
* | | | am 35e03636: am becceb11: am b57ffbb5: am d021f7e5: am b18c0276: am ↵Robert Shih2015-09-042-3/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | 2b63b91b: am c1e989e7: am 13ff64c2: Merge "Zero out return values in media binder calls" into klp-dev * commit '35e03636d6fa0c7c33c67e10686657849a61aff8': Zero out return values in media binder calls
| * | | am becceb11: am b57ffbb5: am d021f7e5: am b18c0276: am 2b63b91b: am ↵Robert Shih2015-09-042-3/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c1e989e7: am 13ff64c2: Merge "Zero out return values in media binder calls" into klp-dev * commit 'becceb1136e7eb01db7dd865cb98a57117212879': Zero out return values in media binder calls
| | * \ \ am b57ffbb5: am d021f7e5: am b18c0276: am 2b63b91b: am c1e989e7: am ↵Robert Shih2015-09-042-3/+3
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 13ff64c2: Merge "Zero out return values in media binder calls" into klp-dev * commit 'b57ffbb5486a58e0dbb03466e9f3a5e51d6cf0f3': Zero out return values in media binder calls
| | | * \ \ am b18c0276: am 2b63b91b: am c1e989e7: am 13ff64c2: Merge "Zero out return ↵Robert Shih2015-09-042-3/+3
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | values in media binder calls" into klp-dev * commit 'b18c02761fe357599f9dad17355e38ec1d3226f2': Zero out return values in media binder calls
| | | | * \ \ am 2b63b91b: am c1e989e7: am 13ff64c2: Merge "Zero out return values in ↵Robert Shih2015-09-042-3/+3
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | media binder calls" into klp-dev * commit '2b63b91b84c75afdef4213aa11b0dcc8e7d735a3': Zero out return values in media binder calls
| | | | | * \ \ am c1e989e7: am 13ff64c2: Merge "Zero out return values in media binder ↵Robert Shih2015-09-032-3/+3
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | calls" into klp-dev * commit 'c1e989e76a461ea69e293839b3c29b634a462bd5': Zero out return values in media binder calls
| | | | | | * \ \ am 13ff64c2: Merge "Zero out return values in media binder calls" into klp-devRobert Shih2015-09-032-3/+3
| | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '13ff64c2db84f4e7cac3396700e333b48c42c7ee': Zero out return values in media binder calls
| | | | | | | * \ \ Merge "Zero out return values in media binder calls" into klp-devRobert Shih2015-09-032-3/+3
| | | | | | | |\ \ \
| | | | | | | | * | | Zero out return values in media binder callsRobert Shih2015-09-022-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More specifically when handling: * GET_STREAM_VOLUME in IAudioPolicyService, and * GET_CURRENT_POSITION and GET_DURATION in IMediaPlayer This prevents leaking uninitialized values across binder in error cases. Bug: 23756261 Change-Id: I0ffd900ab12b685b0611259ade4a3efb1ec5defe
* | | | | | | | | | | am 7ecf6369: am 7734e37e: am a1179678: am be695f0a: am 5e193041: am ↵Andy Hung2015-09-041-7/+20
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 52a4fc09: am 3732a3ac: am ab203130: Merge "Make IEffect command more robust (second try)" into klp-dev * commit '7ecf636997b812ff5ae87ea9e146707d37d1b78a': Make IEffect command more robust (second try)
| * | | | | | | | | | am 7734e37e: am a1179678: am be695f0a: am 5e193041: am 52a4fc09: am ↵Andy Hung2015-09-041-7/+20
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3732a3ac: am ab203130: Merge "Make IEffect command more robust (second try)" into klp-dev * commit '7734e37efe4ad47d91cdc5cfa6703d77a7a2ac0c': Make IEffect command more robust (second try)
| | * | | | | | | | | am a1179678: am be695f0a: am 5e193041: am 52a4fc09: am 3732a3ac: am ↵Andy Hung2015-09-041-7/+20
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ab203130: Merge "Make IEffect command more robust (second try)" into klp-dev * commit 'a1179678752e5755297a2bb66c730f4fd22856e3': Make IEffect command more robust (second try)
| | | * | | | | | | | am 5e193041: am 52a4fc09: am 3732a3ac: am ab203130: Merge "Make IEffect ↵Andy Hung2015-09-041-7/+20
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | command more robust (second try)" into klp-dev * commit '5e193041ab8a541b478dd1b61c8c8cd24bca2ab5': Make IEffect command more robust (second try)
| | | | * | | | | | | am 52a4fc09: am 3732a3ac: am ab203130: Merge "Make IEffect command more ↵Andy Hung2015-09-041-7/+20
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | robust (second try)" into klp-dev * commit '52a4fc09b483a20ee7d5970be01598ee262f7088': Make IEffect command more robust (second try)
| | | | | * | | | | | am 3732a3ac: am ab203130: Merge "Make IEffect command more robust (second ↵Andy Hung2015-09-031-7/+20
| | | | | |\ \ \ \ \ \ | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | try)" into klp-dev * commit '3732a3acafa7eb621bc26cca3eb00150ea12d2e2': Make IEffect command more robust (second try)
| | | | | | * | | | | am ab203130: Merge "Make IEffect command more robust (second try)" into klp-devAndy Hung2015-09-031-7/+20
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ab20313074bb109f29f677c3f09d5da1a48c94e7': Make IEffect command more robust (second try)
| | | | | | | * | | | Merge "Make IEffect command more robust (second try)" into klp-devAndy Hung2015-09-031-7/+20
| | | | | | | |\ \ \ \
| | | | | | | | * | | | Make IEffect command more robust (second try)Andy Hung2015-09-021-7/+20
| | | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23540907 Change-Id: If30cfa535ad51521053706fc40fc98d893db5bc7 (cherry picked from commit 10e6660cc5da65b027c90489ba7ac55d1504e012)
* | | | | | | | | | | am 3af22d1f: am a6e476cb: am 2cec2b4c: am 9bbc490e: am facd279e: am ↵Marco Nelissen2015-09-042-254/+377
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7d34959b: am 16e12007: am 74888428: Merge "Fix timedtext parsing" into klp-dev * commit '3af22d1fea1abc4b1cc1c682e4ffaa9e6462a173': Fix timedtext parsing
| * | | | | | | | | | am a6e476cb: am 2cec2b4c: am 9bbc490e: am facd279e: am 7d34959b: am ↵Marco Nelissen2015-09-042-254/+377
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | / / | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 16e12007: am 74888428: Merge "Fix timedtext parsing" into klp-dev * commit 'a6e476cb04dfccd5adde467b9b55ecb1f48dff58': Fix timedtext parsing
| | * | | | | | | | am 2cec2b4c: am 9bbc490e: am facd279e: am 7d34959b: am 16e12007: am ↵Marco Nelissen2015-09-042-254/+377
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 74888428: Merge "Fix timedtext parsing" into klp-dev * commit '2cec2b4c179b1a946b6f745a8404bf1ee70f825c': Fix timedtext parsing
| | | * | | | | | | am facd279e: am 7d34959b: am 16e12007: am 74888428: Merge "Fix timedtext ↵Marco Nelissen2015-09-042-254/+377
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parsing" into klp-dev * commit 'facd279ed552416adcf0ff4ef22b7a9cd166ccea': Fix timedtext parsing
| | | | * | | | | | am 7d34959b: am 16e12007: am 74888428: Merge "Fix timedtext parsing" into ↵Marco Nelissen2015-09-042-254/+377
| | | | |\ \ \ \ \ \ | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev * commit '7d34959b10e0e8a9ac4cdd5e10a6d016513aa03f': Fix timedtext parsing
| | | | | * | | | | am 16e12007: am 74888428: Merge "Fix timedtext parsing" into klp-devMarco Nelissen2015-09-032-254/+377
| | | | | |\ \ \ \ \ | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '16e12007ab1581e1b6aa973f3c83b2a45a816881': Fix timedtext parsing
| | | | | | * | | | am 74888428: Merge "Fix timedtext parsing" into klp-devMarco Nelissen2015-09-032-254/+377
| | | | | | |\ \ \ \ | | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '74888428e51a2aa123e301912d09973bd9310c33': Fix timedtext parsing
| | | | | | | * | | Merge "Fix timedtext parsing" into klp-devMarco Nelissen2015-09-032-254/+377
| | | | | | | |\ \ \
| | | | | | | | * | | Fix timedtext parsingMarco Nelissen2015-08-312-254/+377
| | | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add bounds checking and fix other bugs. Bug: 23284974 Bug: 23541506 Bug: 23542351 Bug: 23542352 Change-Id: I53551efdf109ce1833e0c361efaf4cee7a851023
| | | | | | * | | | am 9d916c77: DO NOT MERGE - libstagefright: sanity check size before ↵Wei Jia2015-09-031-5/+16
| | | | | | |\ \ \ \ | | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dereferencing pointer in Utils.cpp * commit '9d916c771ca32cb2d0df27b85ce3e17bb6b48eaf': DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
| | | | | | | * | | DO NOT MERGE - libstagefright: sanity check size before dereferencing ↵Wei Jia2015-09-031-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pointer in Utils.cpp Also remove some CHECK's. Bug: 23680780 Change-Id: I62d0941e203e40209fa6fbe3f923f3efdc5a6c23 (cherry picked from commit 7bb772e0c643ff3292599cf485b9dbf232bf39a4)
| | * | | | | | | | resolved conflicts for 3b8747ca to lmp-mr1-ub-devWei Jia2015-09-041-8/+28
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '3b8747ca601175da0c94537e49f3097769a09501' into HEAD libstagefright: sanity check size before dereferencing pointer in Utils.cpp Also remove some CHECK's. Bug: 23680780 (cherry picked from commit 7bb772e0c643ff3292599cf485b9dbf232bf39a4) Change-Id: I5b919716178eb3ba844b21e497b792e6ac61554d
| | | * | | | | | | am 7ea22fce: am c6a2815e: DO NOT MERGE - libstagefright: sanity check size ↵Wei Jia2015-09-041-8/+28
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before dereferencing pointer in Utils.cpp * commit '7ea22fce4fe6ac361fce1df3b583366933848b17': DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
| | | | * | | | | | am c6a2815e: DO NOT MERGE - libstagefright: sanity check size before ↵Wei Jia2015-09-041-8/+28
| | | | |\ \ \ \ \ \ | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dereferencing pointer in Utils.cpp * commit 'c6a2815eadfce62702d58b3fa3887f24c49e1864': DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
generated by cgit v1.1 at 2024-05-20 14:09:53 +0000