summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Merge "ANetworkSession and ParsedMessage are now part of stagefright ↵Andreas Huber2013-07-1822-233/+224
|\ | | | | | | foundation."
| * ANetworkSession and ParsedMessage are now part of stagefright foundation.Andreas Huber2013-07-1822-233/+224
| | | | | | | | | | | | | | | | Also fixes some bugs in ParseMessage and adds "WebSocket" mode to ANetworkSession, something that's opt-in and should not affect existing clients of the API. Change-Id: I86d5748e0d818231d85d3590d86c2b41d4f8b1f1
* | Merge "stagefright: set scaling mode for blank frames in ACodec"Dima Zavin2013-07-181-0/+8
|\ \ | |/ |/|
| * 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 "Clean up references to AUDIO_FORMAT_PCM_8_24_BIT"Glenn Kasten2013-07-172-2/+2
|\ \
| * | Clean up references to AUDIO_FORMAT_PCM_8_24_BITGlenn Kasten2013-07-102-2/+2
| | | | | | | | | | | | Change-Id: I08771eb2664b7082561a40937218c7f4414e2cce
* | | Merge "Support "suspension" of a video encoder in "surface-input" mode."Andreas Huber2013-07-179-14/+177
|\ \ \
| * | | Support "suspension" of a video encoder in "surface-input" mode.Andreas Huber2013-07-179-14/+177
| | | | | | | | | | | | | | | | | | | | | | | | i.e. feed no more input frames to the encoder while suspended. Change-Id: I51391e18c1517548e869f8ddece19f4af37e78f9
* | | | Merge "Experimental support for enabling the use of "surface input" mode"Andreas Huber2013-07-173-21/+158
|\ \ \ \
| * | | | Experimental support for enabling the use of "surface input" modeAndreas Huber2013-07-173-21/+158
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | even with the software VP8 encoder. This relies heavily on the fact that the "Nexus" devices use ARGB32 as the colorspace for the data underlying a surface provided by SurfaceFlinger (mirroring). Generally there are no such guarantees. Change-Id: I1de32f591a3bb935ca76151816b3a02665bec40b
* | | | Merge "Output more detailed error message if loading library fails"leozwang@google.com2013-07-173-1/+9
|\ \ \ \ | |_|_|/ |/| | |
| * | | Output more detailed error message if loading library failsleozwang@google.com2013-07-173-1/+9
| |/ / | | | | | | | | | | | | | | | Bug: 9805979 Change-Id: I77b19d6a65ff9fb72e7428ce79b117628e4c8658
* | | Merge "Add comments"Glenn Kasten2013-07-173-1/+10
|\ \ \
| * | | Add commentsGlenn Kasten2013-07-103-1/+10
| | |/ | |/| | | | | | | 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 "AudioTrackShared cleanup"Glenn Kasten2013-07-111-31/+32
|\ \ \
| * | | AudioTrackShared cleanupGlenn Kasten2013-07-021-31/+32
| |/ / | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "Pass additional arg to acquireBuffer calls."Andy McFadden2013-07-112-3/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Pass additional arg to acquireBuffer calls.Andy McFadden2013-07-082-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Bug 7900302 Change-Id: I30b9cca783e0a48f77035b745b7d5e20edf10f27
* | | | Fix type error in AudioTrack::processAudioBufferGlenn Kasten2013-07-101-1/+2
| |_|/ |/| | | | | | | | | | | | | | It returned a bool instead of nsecs_t Change-Id: If0c096dac411afc0a4142ec1e59c1fdd36d4867c
* | | 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 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.
| | | * | | | | 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 9f0e0597: am 7266bc80: am ca7f1609: Merge "Prevent double disconnects in ↵Jean-Baptiste Queru2013-07-081-0/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | / / | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | RTSPSource" * commit '9f0e05978e236352fd2a4a7c6dce909755c36ead': Prevent double disconnects in RTSPSource
| * | | | | | | 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
| | | * | | | | 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
* | | | | | | Merge "Explicitly compare raw pointers to NULL"Glenn Kasten2013-07-081-18/+20
|\ \ \ \ \ \ \
| * | | | | | | Explicitly compare raw pointers to NULLGlenn Kasten2013-07-021-18/+20
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Change-Id: Id2c7828a36a6912333465475b21fa87e294c83c7
* | | | | | | Merge "mv libcpustats from frameworks/native to frameworks/av"Glenn Kasten2013-07-083-0/+347
|\ \ \ \ \ \ \
| * | | | | | | mv libcpustats from frameworks/native to frameworks/avGlenn Kasten2013-06-183-0/+347
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OK to lose history Change-Id: Ieca78edc5dfe479dd7ea48fe7e0f3c164356cee3
* | | | | | | | am 9a25c012: am eced745a: Merge "Part of fix for TEE resource leaks when app ↵Jeff Tinker2013-07-072-1/+19
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | crashes" into jb-mr2-dev * commit '9a25c012915f2209fff1479b246ae8eba38c3eff': Part of fix for TEE resource leaks when app crashes
| * | | | | | | 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
| | * | | | | | | Part of fix for TEE resource leaks when app crashesJeff Tinker2013-07-032-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 9672606 Change-Id: I98cf65260d5e43d34e3897452f6f26ed2c89294e
* | | | | | | | | Include what is neededGlenn Kasten2013-07-029-17/+4
| |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove old includes. Header files only include other header files that they directly need themselves. Change-Id: Ic471386808d9f42ea19ccbd59cb50a5f83a89dd0
generated by cgit v1.1 at 2024-09-22 16:37:06 +0000