summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 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 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 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 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 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
* | | | 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 d5018116: Merge "Fix typo."Glenn Kasten2013-06-141-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'd5018116252a3ecb491e2eaddad12180b85d1e78': Fix typo.
| * | | | Merge "Fix typo."Glenn Kasten2013-06-141-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix typo.Masaki Muranaka2013-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia72ed2bef54751dc2d6c3379a58de95a0e9ebfdd
* | | | | am 132bc5bd: Merge "Noise will be heard if audio sample rate not matched ↵Glenn Kasten2013-06-070-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | with audio track" * commit '132bc5bd1c68aa807a20e1655f009f74433be588': Noise will be heard if audio sample rate not matched with audio track
| * | | | Merge "Noise will be heard if audio sample rate not matched with audio track"Glenn Kasten2013-06-071-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Noise will be heard if audio sample rate not matched with audio trackMing Zhou2013-06-071-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When audio sample rate which set to audio track is not the same with the actual pcm data, noise will be heard. Fix the bug when write 8 bit pcm samples. Change-Id: Idcb0d7b0e9aaa250dd22b758c8337e23d1706049 Signed-off-by: Ming Zhou <b42586@freescale.com> Signed-off-by: guoyin.chen <guoyin.chen@freescale.com>
* | | | am 25b5617c: Merge "stagefright: Fix port-reconfiguration & ↵Lajos Molnar2013-06-031-6/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | output-buffer-filled race condition" into jb-mr2-dev * commit '25b5617c56488fe5413473ffae6b43f6c5bddc96': stagefright: Fix port-reconfiguration & output-buffer-filled race condition
| * \ \ \ Merge "stagefright: Fix port-reconfiguration & output-buffer-filled race ↵Lajos Molnar2013-06-031-6/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | condition" into jb-mr2-dev
| | * | | | stagefright: Fix port-reconfiguration & output-buffer-filled race conditionLajos Molnar2013-05-311-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the invalid assumption that when a port-reconfiguration event is received, buffers cannot be downstream (waiting to be rendered). Luckily, these buffers are properly handled (freed) after they are sent to be rendered. Change-Id: I1df39c1ffc2bfb96f8b7b4ee5be07cae654f956f Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 8736466
* | | | | | am b7319a7e: Update HTTP proxy configuration for all media playback inside ↵Andreas Huber2013-06-0316-2/+172
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stagefright. * commit 'b7319a7eb0a06ef4fd3a0c9157ee63e637ad7aa1': Update HTTP proxy configuration for all media playback inside stagefright.
| * | | | | Update HTTP proxy configuration for all media playback inside stagefright.Andreas Huber2013-05-3116-2/+172
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie0dd00045aba668d8b49da73224e7a7c9c04f69b related-to-bug: 8873723 (cherry picked from commit 2704965b8a1ff3b7450ff58ccecf86d8ec688c40)
* | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-300-0/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: Ia17841b4d49f0fe09e1034ff0b28efe55947f03a
| * \ \ \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-300-0/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | |
* | | | | | am 41688da2: Merge "MediaMuxer: Remove SAMPLE_FLAG_SYNC flag" into jb-mr2-devLajos Molnar2013-05-292-7/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '41688da226e91c97ea3b2fe096044e1e5b0520bc': MediaMuxer: Remove SAMPLE_FLAG_SYNC flag
| * | | | | Merge "MediaMuxer: Remove SAMPLE_FLAG_SYNC flag" into jb-mr2-devLajos Molnar2013-05-292-7/+1
| |\ \ \ \ \
| | * | | | | MediaMuxer: Remove SAMPLE_FLAG_SYNC flagLajos Molnar2013-05-282-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaMuxer.writeSampleData() uses MediaCodec.BufferInfo objects to specify the flags, so use directly the MediaCodec flags. This is more intuitive and avoids users of the MediaMuxer API having to create translations between MediaMuxer's and MediaCodec's flag constants. Change-Id: I18e12a6839ffb2c63da62516a4dc4c94e8bb3d17 Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 9169479
* | | | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-290-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | Change-Id: I55d8c1a91b9750864f82176768ea93bf11337726
| * | | | | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-290-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
* | | | | | | am 3c89a2e9: Merge "camera3: Don\'t try to disconnect stream native windows ↵Igor Murashkin2013-05-284-2/+15
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | more than once" into jb-mr2-dev * commit '3c89a2e9d4ee10b9e955783af2ab9e9dd137922f': camera3: Don't try to disconnect stream native windows more than once
| * | | | | | Merge "camera3: Don't try to disconnect stream native windows more than ↵Igor Murashkin2013-05-284-2/+15
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | once" into jb-mr2-dev
| | * | | | | camera3: Don't try to disconnect stream native windows more than onceIgor Murashkin2013-05-284-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the multiple-disconnect-from-BufferQueue bug. (In logs) BufferQueue: [SurfaceView] disconnect: connected to another api (cur=0, req=4) Bug: 9114681 Change-Id: I21ae1c5bd993701eea13648aa9994979a24eb210
* | | | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-280-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | Change-Id: Id0d9ce35d7c0fe8ec3d2edd00e42df41fba064ea
| * | | | | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-260-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
* | | | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-240-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | Change-Id: Icbc5d05e35b35baffce494c53fca9caf82658760
| * | | | | | Camera3: Fix the deadlock during recording pinch zoomingZhijun He2013-05-242-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When zooming during recording, hal callback thread and request update thread run into deadlock due to lock circular dependency. This change release lock during queuebuffer in callback thread to break the dependency. Bug: 9091576 Change-Id: Ia7b3f0ec17573cb32a5696dcde419ca28f42cfb8
| * | | | | | camera3: Disable ZSL for limited mode camera HALsIgor Murashkin2013-05-231-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9111852 Change-Id: Idad7e0d2f912341bd643d0ad1a0861fb2043aa90
| * | | | | | camera3: Fix zsl buffers released-while-in-use race conditionIgor Murashkin2013-05-232-12/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9007356 Change-Id: I0ced31020410978c549d408b2815f925e9c9ffcf
* | | | | | | am 6f6b31da: Merge "Camera3: Fix the deadlock during recording pinch ↵Zhijun He2013-05-242-3/+15
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | zooming" into jb-mr2-dev * commit '6f6b31da6097f1d770137ebadac5023dd8b79413': Camera3: Fix the deadlock during recording pinch zooming
| * | | | | | Merge "Camera3: Fix the deadlock during recording pinch zooming" into jb-mr2-devZhijun He2013-05-242-3/+15
| |\ \ \ \ \ \
generated by cgit v1.1 at 2024-08-20 22:50:08 +0000