summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 5d2ab2a6: am 8eef093c: Merge "libstagefright: Use LOG_BASIC when use ↵Jean-Baptiste Queru2013-07-081-1/+1
|\ | | | | | | | | | | | | chromium http stack" * commit '5d2ab2a6d5e90c045d0989ef1be6c66a2295ee2d': libstagefright: Use LOG_BASIC when use chromium http stack
| * am 8eef093c: Merge "libstagefright: Use LOG_BASIC when use chromium http stack"Jean-Baptiste Queru2013-07-081-1/+1
| |\ | | | | | | | | | | | | * commit '8eef093c213094c7efb655ef4d9e31439646bd7f': libstagefright: Use LOG_BASIC when use chromium http stack
| | * Merge "libstagefright: Use LOG_BASIC when use chromium http stack"Jean-Baptiste Queru2013-07-081-1/+1
| | |\
| | | * libstagefright: Use LOG_BASIC when use chromium http stackXuefeng Deng2012-08-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using chromium http stack, the LogLevel is LOG_ALL, and in chromium_net, LOG_ALL will HexEncode all received data. thus playing a 10Mbps 1080P video stream will generate 20Mbps Hex Buffer for event logging. This is a heavy operation for logging. Change-Id: I28e8173e1aa806dd23014378d530d30187360060 Author: Xuefeng Deng <xuefeng.deng@intel.com> Singed-off-by: Shuo Gao <shuo.gao@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 35737
* | | | am 06197925: am 267363ee: Merge "Prevent Media Server crash while the ↵Jean-Baptiste Queru2013-07-081-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | AwesomePlayer getBitrate return true with mBitrate equals to zero." * commit '061979253985e59c4fcb82ede232717736e633b1': Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero.
| * | | am 267363ee: Merge "Prevent Media Server crash while the AwesomePlayer ↵Jean-Baptiste Queru2013-07-081-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | getBitrate return true with mBitrate equals to zero." * commit '267363ee2836ff9bc18d7fdd93aaedf19de546ad': Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero.
| | * | Merge "Prevent Media Server crash while the AwesomePlayer getBitrate return ↵Jean-Baptiste Queru2013-07-081-1/+1
| | |\ \ | | | | | | | | | | | | | | | true with mBitrate equals to zero."
| | | * | Prevent Media Server crash while the AwesomePlayer getBitrate return true ↵hovanchen2013-07-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with mBitrate equals to zero. [Cause] - getBitrate(int64_t *bitrate) will return true if mBitrate = 0. - Then, in getCachedDuration_l(int64_t *durationUs, bool *eos), we might execute the following function when getBitrate(&bitrate) = true and bitrate = 0. *durationUs = cachedDataRemaining * 8000000ll / bitrate; - Mediaserver will be crashed when divided by zero. - The mediaserver crash often occur when DLNA IOP tests on Golden DMS with AAC_ADTS_320 audio. [Solution] - Prevent the divide function executing when bitrate is zero. Change-Id: I4439d92cee5faec95df2109e9186c33b3fff6c66
* | | | | am 7266bc80: am ca7f1609: Merge "Prevent double disconnects in RTSPSource"Jean-Baptiste Queru2013-07-081-0/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '7266bc80850dc327e9f18c27b81613f959399630': Prevent double disconnects in RTSPSource
| * | | | am ca7f1609: Merge "Prevent double disconnects in RTSPSource"Jean-Baptiste Queru2013-07-081-0/+4
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'ca7f160921a4a1a5da32ebe8fab1067bd8998a1f': Prevent double disconnects in RTSPSource
| | * | | Merge "Prevent double disconnects in RTSPSource"Jean-Baptiste Queru2013-07-081-0/+4
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Prevent double disconnects in RTSPSourceFredrik Rosin2013-07-011-0/+4
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent a null pointer from occuring by checking that we are not already disconnected before performing a disconnect, in case multiple disconnects have been issued. Change-Id: Ib88800cd246086fd57f77d10748d41b1aefe2084
* | | | am eced745a: Merge "Part of fix for TEE resource leaks when app crashes" ↵Jeff Tinker2013-07-072-1/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr2-dev * commit 'eced745af7d2d27a8c45e04eb071d4fb30cd3e48': Part of fix for TEE resource leaks when app crashes
| * \ \ \ Merge "Part of fix for TEE resource leaks when app crashes" into jb-mr2-devJeff Tinker2013-07-072-1/+19
| |\ \ \ \
| | * | | | Part of fix for TEE resource leaks when app crashesJeff Tinker2013-07-032-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 9672606 Change-Id: I98cf65260d5e43d34e3897452f6f26ed2c89294e
* | | | | | am f59a4b39: fix scheduling policy service death detectionEric Laurent2013-07-032-13/+31
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'f59a4b393f4844c5bbc8d6212364bdddea33d232': fix scheduling policy service death detection
| * | | | | fix scheduling policy service death detectionEric Laurent2013-07-022-13/+31
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check status of transactions to scheduling policy service and re-acquire a binder interface in case of DEAD_OBJECT. Bug: 8875559. Change-Id: I1e00bd44e2d4723b3ec95d5c31d9652ba08e238a
| | | | |
| \ \ \ \
*-. \ \ \ \ Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-07-010-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: Idf0f0cdf02e6e94603ff003b6baf869b4414e1cf
| | * \ \ \ \ merge in jb-mr2-zeroday-release history after reset to jb-mr2-devThe Android Automerger2013-06-300-0/+0
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Update HTTP proxy configuration for all media playback inside stagefright.Andreas Huber2013-06-2816-2/+172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie0dd00045aba668d8b49da73224e7a7c9c04f69b related-to-bug: 8873723 (cherry picked from commit 2704965b8a1ff3b7450ff58ccecf86d8ec688c40)
* | | | | | | am 47a1fe04: am a9aa6baa: Merge "Set u.ext_data to null after it has been freed"Andreas Huber2013-06-281-0/+1
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | * commit '47a1fe04637793f48d808261b1fac47acc3de1e1': Set u.ext_data to null after it has been freed
| * | | | | | am a9aa6baa: Merge "Set u.ext_data to null after it has been freed"Andreas Huber2013-06-281-0/+1
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | * commit 'a9aa6baa5d86fc1a5bd37fc636d766d9e3ad2507': Set u.ext_data to null after it has been freed
| | * | | | | Merge "Set u.ext_data to null after it has been freed"Andreas Huber2013-06-281-0/+1
| | |\ \ \ \ \
| | | * | | | | Set u.ext_data to null after it has been freedChrister Fletcher2013-06-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SEGV_MAPPER crash could happen in MetaData::typed_data::freeStorage. The faulty address could be both random pointers and deadbaad. It seems like free could be called more than once on u.ext_data. Set u.ext_data to null after it has been freed as there already is a null check before trying to free it. Change-Id: I710c49f9c231bd8852159914c0b2add58a685f0e
* | | | | | | | am 83790fcc: am bdf33c98: Merge "Fix compilation warning: incorrect format ↵Glenn Kasten2013-06-281-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | specifier for type \'ssize_t\'." * commit '83790fcce4f5cda1e7c89f1cbed452426502f227': Fix compilation warning: incorrect format specifier for type 'ssize_t'.
| * | | | | | | am bdf33c98: Merge "Fix compilation warning: incorrect format specifier for ↵Glenn Kasten2013-06-281-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | type \'ssize_t\'." * commit 'bdf33c98912090176183d3e9b9a9217dbbdca6da': Fix compilation warning: incorrect format specifier for type 'ssize_t'.
| | * | | | | | Merge "Fix compilation warning: incorrect format specifier for type 'ssize_t'."Glenn Kasten2013-06-281-1/+1
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Fix compilation warning: incorrect format specifier for type 'ssize_t'.Scott Fan2013-06-271-1/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | warning: format '%ld' expects argument of type 'long int', but argument 7 has type 'ssize_t {aka int}' [-Wformat] Change-Id: I823835a26320a3abb82f8dff9fbe82e5132e7556 Signed-off-by: Scott Fan <fancp2007@gmail.com>
* | | | | | | am a691ff3c: Camera2/3: Don\'t allow recording and callbacks to coexist.Eino-Ville Talvala2013-06-282-29/+85
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | * commit 'a691ff3c03e38e148bbefed35ebb15e552a12613': Camera2/3: Don't allow recording and callbacks to coexist.
| * | | | | | Camera2/3: Don't allow recording and callbacks to coexist.Eino-Ville Talvala2013-06-272-29/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Tear down conflicting streams when necessary. - Shut down callbacks if recording starts - Do not allow callbacks to start if recording is active Per the current camera API, recording and preview callbacks cannot be active simultaneously. However, the framework did not explicitly disallow this, and in fact left the streams configured once they were created, even if switching between the two operational modes. In addition, no guards existed for trying to enable both recording and callbacks at the same time. Bug: 9423825 Change-Id: I7d6e6114c2e14fcfb5299b4c72ad557895cbf4b8
* | | | | | | Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-06-250-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | Change-Id: I4de46f3bfcfb80867bbeb52a76d383f5870e74f4
| * | | | | | merge in jb-mr2-zeroday-release history after reset to jb-mr2-devThe Android Automerger2013-06-240-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge remote-tracking branch 'origin/jb-mr2-zeroday-release' into HEADThe Android Automerger2013-06-240-0/+0
| | |\ \ \ \ \
* | | \ \ \ \ \ am 3a4ff0b8: am d74a9ee8: Merge "libstagefright: fix the duration "00:00" ↵Jean-Baptiste Queru2013-06-250-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for some httplive link" * commit '3a4ff0b8bf464c9c286d63326bea42609527051e': libstagefright: fix the duration "00:00" for some httplive link
| * | | | | | | am d74a9ee8: Merge "libstagefright: fix the duration "00:00" for some ↵Jean-Baptiste Queru2013-06-250-0/+0
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | httplive link" * commit 'd74a9ee83fd6e033fd2260ca3777390d7e5f817a': libstagefright: fix the duration "00:00" for some httplive link
| | * | | | | | Merge "libstagefright: fix the duration "00:00" for some httplive link"Jean-Baptiste Queru2013-06-251-3/+0
| | |\ \ \ \ \ \
| | | * | | | | | libstagefright: fix the duration "00:00" for some httplive linkywan1712012-08-241-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if the playlist does not end by '\n', player can not show the correction duration Change-Id: I6dd9abfce32a1ef7b7d6ed157c966fce3c190389 Author: Yi Wang <yi.a.wang@intel.com> Signed-off-by: Yi Wang <yi.a.wang@intel.com> Signed-off-by: Shuo Gao <shuo.gao@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 48555
* | | | | | | | | Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-06-210-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | Change-Id: Id1c9edbb5b7b398fb863cbbd79e673ab2c10df9a
| * | | | | | | | merge in jb-mr2-zeroday-release history after reset to jb-mr2-devThe Android Automerger2013-06-210-0/+0
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | / / / | | | |_|_|/ / / | | |/| | | | |
* | | | | | | | am 209bbbcf: Apply EQ and bass boost first in effect chainJean-Michel Trivi2013-06-201-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '209bbbcf4190231f9dede758cbe77d109919f9f1': Apply EQ and bass boost first in effect chain
| * | | | | | | Apply EQ and bass boost first in effect chainJean-Michel Trivi2013-06-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EQ and bass boost can improperly interact with other effects (e.g. virtualizer) outside of the bundle. Apply them first in an effect chain, which is equivalent to using them to affect the content of a track, rather than how a track is presented, when additional effects are cascaded behind EQ and BB. Bug 8589316 Change-Id: Ifb34e46bc1969f613cdc90ee2a79af677e2fad92
* | | | | | | | am f3e21c30: am 60f3f102: Merge "Prevent AudioCommands being freed before read"Glenn Kasten2013-06-201-6/+8
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * commit 'f3e21c301b8fef49eecf9c716373fcbfbaa47670': Prevent AudioCommands being freed before read
| * | | | | | | am 60f3f102: Merge "Prevent AudioCommands being freed before read"Glenn Kasten2013-06-201-6/+8
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit '60f3f102ba2973cc31e5c7ea00d95bbf19968e8b': Prevent AudioCommands being freed before read
| | * | | | | | Merge "Prevent AudioCommands being freed before read"Glenn Kasten2013-06-201-6/+8
| | |\ \ \ \ \ \
| | | * | | | | | Prevent AudioCommands being freed before readChrister Fletcher2013-06-201-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When AudioCommandThread::threadLoop process AudioCommands it was possible for it to delete a command where the posting thread still hadn't read that status from it. If a second command signaled the thread loop to continue after it had inserted a new command while the thread loop was actually waiting for the first command to report that it had read the status the thread loop would continue and delete the first command. Changed the wait condition when waiting for the calling thread to read status to use command->mCond instead of mWaitWorkCV. This way it's guaranteed that the signal to continue comes from the correct thread. Change-Id: Ia69b48cb4fdfaf8b4c83b56a197fb9f2058a92d1
* | | | | | | | | am e6478de7: Camera2/3: Avoid shutdown race in callback processor.Eino-Ville Talvala2013-06-191-1/+4
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e6478de72a8ae1d3abb3e8c20898977c45354a4f': Camera2/3: Avoid shutdown race in callback processor.
| * | | | | | | | Camera2/3: Avoid shutdown race in callback processor.Eino-Ville Talvala2013-06-191-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's possible, during shutdown, for callback processor's heap to be destroyed when it's about to send the callback back to the user. Properly copy the heap reference to a local variable before unlocking the mutex. Bug: 9485959 Change-Id: I301347b77145f19c7ac721b9127dc74f122acce2
* | | | | | | | | am 241b5279: Camera3: Power: Properly shut down unused thread.Eino-Ville Talvala2013-06-171-2/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '241b52798809d8db3d369af05ace1f73f723f29b': Camera3: Power: Properly shut down unused thread.
| * | | | | | | | Camera3: Power: Properly shut down unused thread.Eino-Ville Talvala2013-06-171-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9466221 Change-Id: I9ed0740561b2e04954eebc1b8aec89cfab40a3a0
* | | | | | | | | Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-06-160-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | Change-Id: I2ab98a5fccea49e0f4e6d22fddca485ad50b63b8
generated by cgit v1.1 at 2024-08-21 03:37:28 +0000