summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* stagefright: set scaling mode for blank frames in ACodecDima Zavin2013-07-181-0/+8
| | | | | | | | | | | | | | Analogous to 1d5ac80d0c6d3deabcc9e9b4abc9e3ef536aeb27 (by jgennis), this sets the scaling mode for the ANativeWindow to SCALE_TO_WINDOW prior to pushing the blank frames during decoder tear down. Without this, the window defaults to FREEZE and SF ignores the new frames. Bug: 9516405 Change-Id: I39ef30922d733034bf01100d7ff24ac9c0c33b7d Signed-off-by: Dima Zavin <dima@android.com>
* Merge "Fix indentation"Glenn Kasten2013-07-171-74/+74
|\
| * Fix indentationGlenn Kasten2013-07-101-74/+74
| | | | | | | | Change-Id: Ia28720a7d0fad8cf110c2448b967d5648d42e017
* | Merge "Add comments"Glenn Kasten2013-07-178-3/+34
|\ \
| * | Add commentsGlenn Kasten2013-07-108-3/+34
| |/ | | | | | | Change-Id: Ifbf3a46a4183c8abc0feee1c588953ab10303cc1
* | Merge "Fix typo in logs"Glenn Kasten2013-07-171-2/+2
|\ \
| * | Fix typo in logsGlenn Kasten2013-07-021-2/+2
| | | | | | | | | | | | Change-Id: I889e31ea3a45a3d8d34fdfb54ebc3947de51d2be
* | | Merge "always pass the BufferQueue explicitely to consumers"Mathias Agopian2013-07-168-8/+16
|\ \ \
| * | | always pass the BufferQueue explicitely to consumersMathias Agopian2013-07-128-8/+16
| | | | | | | | | | | | | | | | Change-Id: Ic2d9a9cf184a482b3c78a481ed693ee32df5ca13
* | | | camera2: Implement ICameraDeviceUser::getCameraInfoIgor Murashkin2013-07-154-30/+21
|/ / / | | | | | | | | | | | | Bug: 9529161 Change-Id: I927e39c124cd5fb19e38423506f4463acc381cb0
* | | Merge "AudioTrackShared cleanup"Glenn Kasten2013-07-112-33/+34
|\ \ \
| * | | AudioTrackShared cleanupGlenn Kasten2013-07-022-33/+34
| |/ / | | | | | | | | | | | | | | | | | | | | | Maintain unreleased frame count on client side also (was already there on server side). Assertion failure instead of BAD_VALUE status for incorrect usage of APIs. Clean up error handling code. Change-Id: I23ca2f6f8a7c18645309ee5d64fbc844429bcba8
* | | Merge "Fix AudioTrack::flush()"Glenn Kasten2013-07-111-0/+2
|\ \ \
| * | | Fix AudioTrack::flush()Glenn Kasten2013-07-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was only flushing at a surface level, and even then only the first time the server observed the client's flush request. Now it flushes at a deeper level, but there may be even deeper device-specific flushing. Bug: 9770947 Change-Id: I687cc3410ff9e5e5d4a5dcb9e3b129501e53d247
* | | | am 1bb59258: (-s ours) Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-07-110-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | * commit '1bb59258458350af518170558120783bc2f9e61d':
| * \ \ \ Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-07-100-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: Ie4a7e41d8d28b46966f6aadfd38af5516c082f04
| | * \ \ \ merge in jb-mr2-zeroday-release history after reset to jb-mr2-devThe Android Automerger2013-07-100-0/+0
| | |\ \ \ \
* | | \ \ \ \ am 0a95b17c: (-s ours) Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-07-110-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | * commit '0a95b17c93f8ca0a4ed46bdc5797aa81f46f028c':
| * | | | | | Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-07-090-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | Change-Id: I9a9eea4a01ba78b06cb79a26db9b0bcb52f5fd7b
| | * | | | | merge in jb-mr2-zeroday-release history after reset to jb-mr2-devThe Android Automerger2013-07-090-0/+0
| | |\ \ \ \ \
* | | \ \ \ \ \ Merge "Pass additional arg to acquireBuffer calls."Andy McFadden2013-07-115-7/+7
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Pass additional arg to acquireBuffer calls.Andy McFadden2013-07-085-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 7900302 Change-Id: I30b9cca783e0a48f77035b745b7d5e20edf10f27
* | | | | | | | am adaa78c9: am a2520db0: camera2/3: set preview callback oneshot flag ↵Zhijun He2013-07-111-0/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | during still capture * commit 'adaa78c901a2f2509965b7acc1cde848dfc6bafe': camera2/3: set preview callback oneshot flag during still capture
| * | | | | | | am a2520db0: camera2/3: set preview callback oneshot flag during still captureZhijun He2013-07-091-0/+1
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit 'a2520db02bead68d4980783c41500ae96511bdf8': camera2/3: set preview callback oneshot flag during still capture
| | * | | | | | camera2/3: set preview callback oneshot flag during still captureZhijun He2013-07-081-0/+1
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preview callback oneshot flag need set when a still picture is being captured and preview callback oneshot is enabled, otherwise, the callback enabling status could be lost when preview is restarted after still catpure. Bug 9742091 Change-Id: If9562369013e53727edfdd16f3d00d6a9392e70d
* | | | | | | Fix type error in AudioTrack::processAudioBufferGlenn Kasten2013-07-101-1/+2
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | It returned a bool instead of nsecs_t Change-Id: If0c096dac411afc0a4142ec1e59c1fdd36d4867c
* | | | | | am 06a4604e: am 4a5c009b: Camera2/3: As a fallback, unilaterally free old ↵Eino-Ville Talvala2013-07-082-14/+119
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recording buffers * commit '06a4604e77b5872857ef95fe712b6ce00c7aa506': Camera2/3: As a fallback, unilaterally free old recording buffers
| * | | | | am 4a5c009b: Camera2/3: As a fallback, unilaterally free old recording buffersEino-Ville Talvala2013-07-082-14/+119
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '4a5c009bc2389304cf078c270bceb656479367d2': Camera2/3: As a fallback, unilaterally free old recording buffers
| | * | | | Camera2/3: As a fallback, unilaterally free old recording buffersEino-Ville Talvala2013-07-082-14/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When starting a recording session, check for and clear out recording buffers still owned by stagefright from a previous recording session, if any. There should never be any, but in case they are due to a bug elsewhere in the system, clearing out the buffers makes recovery possible. Bug: 9591080 Change-Id: I3a2a1256860bd174381cd525948419f985c9b415
* | | | | | am 29196772: (-s ours) Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-07-080-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | * commit '291967728b02ad9a7d5545b0eb1ec0c4c3d664af':
| * | | | | Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-07-080-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | Change-Id: I13e45e13c3abf52cef3fb58de3f4707fb8fedaac
| | * | | | merge in jb-mr2-zeroday-release history after reset to jb-mr2-devThe Android Automerger2013-07-080-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| | |
* | | | | | am 1468dd9c: am c582fde9: resolved conflicts for merge of c158971f to ↵Jean-Baptiste Queru2013-07-081-1/+12
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master * commit '1468dd9cefe11d5938a5497688f99701b6b14706': Store rtsp accessunit until PLAY response parsed
| * | | | | am c582fde9: resolved conflicts for merge of c158971f to stage-aosp-masterJean-Baptiste Queru2013-07-081-1/+12
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c582fde93ded7219107157333a9e46d780adcf9c': Store rtsp accessunit until PLAY response parsed
| | * \ \ \ \ resolved conflicts for merge of c158971f to stage-aosp-masterJean-Baptiste Queru2013-07-081-1/+12
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3d77b86f7e616af62a826fc37126706ad8ff6158
| | | * \ \ \ \ Merge "Store rtsp accessunit until PLAY response parsed"Jean-Baptiste Queru2013-07-081-1/+12
| | | |\ \ \ \ \
| | | | * | | | | Store rtsp accessunit until PLAY response parsedYajun Zeng2013-05-131-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If RTP accessunit comes earlier than play response, the normal play time mapping posted in func onAccessUnitComplete is wrong. This leads wrong timestamp of the first few frames. This issue is found in the 3 CtsVerifier RTSP streaming cases. Change-Id: I640eea375b1f3f4730238f9d561c3b40ec682395 Signed-off-by: Yajun Zeng <beanz@marvell.com>
* | | | | | | | | am 8ebdfa8b: am 5de9ef20: am 365ed394: Merge "Typo in CameraParameters::set"Jean-Baptiste Queru2013-07-081-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8ebdfa8b021ed338f9916a1f30d756b989afa3bd': Typo in CameraParameters::set
| * | | | | | | | am 5de9ef20: am 365ed394: Merge "Typo in CameraParameters::set"Jean-Baptiste Queru2013-07-081-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5de9ef20d596bc20f53cba664f1ac7e358910ea2': Typo in CameraParameters::set
| | * | | | | | | am 365ed394: Merge "Typo in CameraParameters::set"Jean-Baptiste Queru2013-07-081-1/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '365ed394c4135d9d42082c85638c076aed4bd156': Typo in CameraParameters::set
| | | * | | | | | Merge "Typo in CameraParameters::set"Jean-Baptiste Queru2013-07-081-1/+1
| | | |\ \ \ \ \ \
| | | | * | | | | | Typo in CameraParameters::setYou Kim2012-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Typo: 'key' --> 'value' Change-Id: Idd0426263cf2125a796406abaf6f29f04f425fe4
* | | | | | | | | | am c26ab375: am 5d2ab2a6: am 8eef093c: Merge "libstagefright: Use LOG_BASIC ↵Jean-Baptiste Queru2013-07-081-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when use chromium http stack" * commit 'c26ab375ebb1bce6c3a99a46a72d8369170255ca': libstagefright: Use LOG_BASIC when use chromium http stack
| * | | | | | | | | 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 046d9c8d: am 06197925: am 267363ee: Merge "Prevent Media Server crash ↵Jean-Baptiste Queru2013-07-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | while the AwesomePlayer getBitrate return true with mBitrate equals to zero." * commit '046d9c8dad97118535778cf93efc662ceb5fec8d': Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero.
| * | | | | | | | | | 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.
generated by cgit v1.1 at 2024-06-29 15:08:58 +0000