summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/rtsp
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r66' into HEADJessica Wagantall2016-09-071-5/+9
|\ | | | | | | | | | | Android 6.0.1 release 66 Change-Id: I1d3eb6b66b7482149fe93647c278065fa46dc518
| * Fix corruption via buffer overflow in mediaserverRay Essick2016-07-211-5/+9
| | | | | | | | | | | | | | | | | | | | change unbound sprintf() to snprintf() so network-provided values can't overflow the buffers. Applicable to all K/L/M/N branches. Bug: 25747670 Change-Id: Id6a5120c2d08a6fbbd47deffb680ecf82015f4f6
* | frameworks/av: Fix LOG_NDEBUG compilation issuesLeena Winterrowd2016-04-131-0/+2
| | | | | | | | | | | | Fix compilation issues that appear when enabling LOG_NDEBUG. Change-Id: I87e9e5ac66157759dd6f521fab0dd346089a011a
* | Handle malformed audio packets received during RTSP stream switchingSunil Shah2015-12-011-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | During RTSP stream switching (for example channel switching in a Mobile TV application) we occasionally receive packets that don't contain valid data, so we cannot remove LATM framing (as per the MPEG4 Audio Assembler). This fix allows the frame remover to exit gracefully (instead of crashing), when such frames are encountered, and as a consequence, Mobile TV apps can change channels properly. Change-Id: Ie4c3d2766c87b43f31624192de96bc47180ca514
* | libstagefright: Handle MPEG4 DP playbackLeena Winterrowd2015-11-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the HW decoder doesn't support MPEG4 DP clips, detect DP format clips in the parser and report a new MIME: video/mpeg4-esdp. This MIME is only registered to the SW decoder which supports DP clips. Merges the following change from kitkat: libstagefright: Fix DP Parsing issue with mpeg4 SP,ASP (Change-Id: I69c719011e1a0d2a0b0ae5a9b504b7cce443866b) CRs-Fixed: 722066 Change-Id: I7bc3a7a9f4a6d37e046ed9c8008cb27fb3bc665d
* | rtsp: notify the client when receiving BYE message in RTCPLi Sun2015-10-061-0/+8
| | | | | | | | | | | | | | RTSP stack would parse "BYE" message from RTCP packets and notify NuPlayer which will send the notification to the client. Change-Id: I461960f28610f998b71a6e1322fe79f9856c7a92
* | rtsp: do not drop early access units of seekable rtspLubin Yin2015-10-061-1/+1
| | | | | | | | | | | | | | | | | | Access units of seekable RTSP will be mapped to normal playtime in RTSPSource, so the negative media time can be adjusted and played normally. Change-Id: I12793dbbf367650e66532195324adb5b5ad8fe85 CRs-Fixed: 866580
* | NuPlayer: Fix ANR while resetting RTSP playbacklubiny2015-10-061-0/+11
| | | | | | | | | | | | | | | | | | | | - When network is poor, the response of RTSP teardown won't be received in time, so ANR will happen. - With this patch, a teardown message will be sent when timeout expires, in order to avoid ANR. Change-Id: I3f9efd9fefa66104ad452559ced5ff5218d73a66 CRs-Fixed: 650866
* | rtsp: Limit subframe processing to available buffer rangelubiny2015-10-061-0/+5
| | | | | | | | | | | | | | | | | | | | With some RTSP servers, the mpeg4 audio subframe count is inconsistent with the available data. When attempting to process subframes that would exceed that available buffer boundaries, this causes a memory access violation. Add buffer size checks to avoid this crash. Change-Id: I030c6f02c478e216c20d9b24fbd6b3a9c1530889 CRs-Fixed: 737819
* | rtsp: Don't post AUTimeout check during pause when EOS is nearingLi Sun2015-10-061-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix crash issues while repeated pause/resume. The root cause is: While doing repeated pause-resume operation in RTSP streaming, some times, the accessunit timeout check is being posted when the streaming paused, and even after receving the EOS. Due to this check, after the EOS, the number of packets received will be zero and the session gets Teardown while the streaming is paused. Upon resume, it leads to check failure and crash. Cancel the timeout check if pause is not issued to MyHandler when nearing EOS. Change-Id: I897d8e18b0dbc29fc1099e7b3d1b5ccc16426a4d CRs-Fixed: 636312, 676054
* | rtsp: Add a property "rtsp.transport.TCP"Surajit Podder2015-10-061-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add property "rtsp.transport.TCP" Value "true" - TCP Value "false" - UDP default value - false - This property can be used to test rtsp streaming over TCP directly for network compatibility testing Change-Id: Ic27b440067af49e7e3bcc45d86eb7a17ae9db54f CRs-Fixed: 435538
* | RTSP: add RTSP extensions for customization supportLi Sun2015-10-063-4/+12
| | | | | | | | | | | | | | | | Add extensions for customization support in rtsp stack. Provide default implementations in AVMediaServiceUtils. Change-Id: I67adeb54b35d1f01911625bb9bad27e94ad0caf0
* | frameworks/av: Changes related to DASHManikanta Sivapala2015-10-061-2/+3
| | | | | | | | | | | | | | | | | | 1) Add MEDIA_QOE event type 2) Open certain methods for extension by declaring them as virtual 3) Add DASH_PLAYER as a new player type 4) Creating DASH Player factory Change-Id: I0376841530218703fabd9d4f45d2c9a32a1f52b2
* | RTSP: add RTSP extensions for IPV6 supportLi Sun2015-10-066-14/+44
|/ | | | | | | | | | | Change access modifiers and add overridables in rtsp stack. Make ARTSPConnection/ARTPConnection extensible for IPV6 support. Provide default implementations in AVMediaServiceExensions and AVMediaServiceFactory. Change-Id: Iaa67070d1832d56e0569dabfd8327c1998f04493
* am 99187615: am d3b6f9c1: am c5b9a48f: am a27fe8d7: am 2fd79fa3: am ↵Abhishek Arya2015-08-201-2/+3
|\ | | | | | | | | | | | | cb2acbfe: am 635d38a8: Merge "Check RTSP payload length" into klp-dev * commit '99187615b2cb42e39842083c2998a97e8277a5d5': Check RTSP payload length
| * am d3b6f9c1: am c5b9a48f: am a27fe8d7: am 2fd79fa3: am cb2acbfe: am ↵Abhishek Arya2015-08-201-2/+3
| |\ | | | | | | | | | | | | | | | | | | 635d38a8: Merge "Check RTSP payload length" into klp-dev * commit 'd3b6f9c17ed10df01d682b0fac6b13fca396e5fb': Check RTSP payload length
| | * am cb2acbfe: am 635d38a8: Merge "Check RTSP payload length" into klp-devAbhishek Arya2015-08-201-2/+3
| | |\ | | | | | | | | | | | | | | | | * commit 'cb2acbfed69d18aa4693c03d8a77cd45daf8af8d': Check RTSP payload length
| | | * am 635d38a8: Merge "Check RTSP payload length" into klp-devAbhishek Arya2015-08-201-2/+3
| | | |\ | | | | | | | | | | | | | | | | | | | | * commit '635d38a84414e26aaf6c4b5df7859fde196adeaf': Check RTSP payload length
| | | | * Check RTSP payload lengthMarco Nelissen2015-08-191-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23346388 Change-Id: Ifd918cefc90527c2f52177c3ce0da7a13259ad08
* | | | | RTSP: clear data/eos status before returning from seekRobert Shih2015-07-161-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original RTSP seek implementation involves pausing and restarting a session. This change clears data/eos status after an rtsp session is paused for a seek, and delays the seek to return after data/eos status are cleared. Bug: 22207372 Change-Id: I1bdf65653f90436f7ee5d7fe85eeadc1598a0d56
* | | | | RTSPSource: Do not update time when there are no tracks, i.e., when aborted.Wei Jia2015-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17474566 Change-Id: I0dbd7a6a54edaf5b4fe5bd324d38f791a346b2fd
* | | | | RTSP: append track URL to base URLChong Zhang2015-05-041-13/+3
| | | | | | | | | | | | | | | | | | | | | | | | | bug: 17310253 Change-Id: I6ce8c4740a3509d82323ccc05f82cb842368caee
* | | | | Merge "libmediaplayerservice: fix warnings, make warnings errors, use clang"Lajos Molnar2015-04-171-8/+8
|\ \ \ \ \
| * | | | | libmediaplayerservice: fix warnings, make warnings errors, use clangLajos Molnar2015-04-171-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1b2f6b65c5abbc366068a60b8909104f31b94228
* | | | | | stagefright: make more warnings errorsLajos Molnar2015-04-171-2/+2
|/ / / / / | | | | | | | | | | | | | | | Change-Id: I9b1ad60fbfb866dbf9c00843e06553c3eb25c113
* | | | | stagefright: warnings be gone, some are now errors, use clangLajos Molnar2015-04-172-2/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I81f438ae444f04c12ae27ae4ef6d073033de172c
* | | | | media: switch to new AMessage handlingLajos Molnar2015-03-058-78/+78
|/ / / / | | | | | | | | | | | | | | | | Bug: 19607784 Change-Id: I94cddcb81f671422ad4982a23dc4acfe57a9f1aa
* | | | Move AString's StringPrintf out of the way.Elliott Hughes2015-02-043-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should come back and replace AString with std::string and switch to the "real" StringPrintf family, but this fixes the ODR violation that was preventing us from booting. Bug: 19265750 Change-Id: I798eb9ca5dd634e44625af5e583439ef9f0cdc35
* | | | Remove superfluous OpenSSL include paths.Adam Langley2015-01-221-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The libcrypto and libssl modules (and their respective static and host versions) use LOCAL_EXPORT_C_INCLUDE_DIRS thus just including the module is sufficient. Change-Id: If9df76e6fefb7419cbb2fb33a0264626c748561e
* | | | Fix print format mismatches.Chih-Hung Hsieh2014-12-092-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Clang complains about mismatch of argument type and print format. Change-Id: Ib07da09d8b1b62b3018033f9eaf7aa01bf7f7f9c
* | | | Stagefright: Fix unused variables, functions, valuesAndreas Gampe2014-11-254-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For build-system CFLAGS clean-up, remove unused functions and variables. Change-Id: Ic3dee56b589ea9a693efa1d72ba394036efff168
* | | | Fix uninitialized variableBernhard Rosenkränzer2014-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case of !(err == OK && !mCancelled), sdpSize is used uninitialized. Change-Id: I33c6365ca6df13b0051491771d3eee3e35346b6d Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | Fix struct vs. class mismatchesBernhard Rosenkränzer2014-11-172-2/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix something being declared a struct and forward-declared a class and vice versa. gcc doesn't care, clang complains about the mismatch. Change-Id: I7a7a8e9040e3c86fa1d73eb112631ea140861657 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | MyHandler: set ip address to an invalid one when getsockname() returns error.Wei Jia2014-09-221-1/+3
| | | | | | | | | | | | | | | Bug: 17556472 Change-Id: I0387c78727d9a18abddcfdb4b480f4b1412bbc9f
* | | ASessionDescription: allow open-ended NTP range.Wei Jia2014-09-151-0/+5
| | | | | | | | | | | | | | | Bug: 17435211 Change-Id: I450d512abdc4368f5180d9859f3b4e207e3b5591
* | | print warning if offset != buffer sizeChong Zhang2014-08-191-0/+5
| | | | | | | | | | | | | | | Bug: 17110981 Change-Id: Iacceca203372f4c06ff5ef7ce98edd5554727b64
* | | Don't crash for bitstream errors in AMPEG4ElementaryAssemblerChong Zhang2014-08-191-5/+10
| | | | | | | | | | | | | | | Bug: 17110981 Change-Id: I0d0960fa12f2ad179231494be29af307de217b2a
* | | am ca44dc79: am 8d6d8f54: Merge "Add libcrypto for users of libstagefright."Christopher Ferris2014-06-111-3/+0
|\ \ \ | | | | | | | | | | | | | | | | * commit 'ca44dc79b5a163030ab0963f80aa771871de092d': Add libcrypto for users of libstagefright.
| * | | Add libcrypto for users of libstagefright.Christopher Ferris2014-06-101-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libstagefright_rtsp uses some MD5 functions that used to be in bionic, but it was removed recently. As an initial fix, I statically linked in libcrypto_static to the libstagefright_rtsp library. However, I think it's better to modify the single user of this library to link against the shared libcrypto library. Change-Id: Iaf2e1aeea32fd8af038f6e77bf58ea7df50d807a
* | | | resolved conflicts for merge of 281b884c to masterChristopher Ferris2014-06-111-0/+7
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: If8924939bdf54d3a9e6a4876a05d0672c27cf8ef
| * | | Link libcrypto for MD5_* functions.Christopher Ferris2014-06-091-0/+7
| | | | | | | | | | | | | | | | Change-Id: I5dce8f041b9faf035161b82d5e46bd46166bd05c
| * | | media: 64 bit compile issuesMark Salyzyn2014-04-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - change internal sized types to use stdint.h - printf & scanf formats - size_t or unsigned int for iterators Change-Id: Id993a70d8bf54c667c5d652b34179a2c727ed446
| * | | libstagefright: fix 64-bit warningsColin Cross2014-04-144-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | %lld -> %" PRId64 " for int64_t %d -> %zu for size_t Also fixes some casts from void* to integer types, and some comparisons between signed and unsigned. (cherry picked from commit b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81) Change-Id: I76ba94d0b67776fd7abdc83b43d47c61d6c32f4c
| * | | warnings be gone.Andreas Huber2014-04-113-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36) Modified by Mark Salyzyn <salyzyn@google.com> to keep merge conflicts or errors downstream to a minimum. Change-Id: Ic3b272f9cbf3155001aabd2f79728f1bc31de613
* | | | stagefright: log uri protocols, and opt-in to log full uriLajos Molnar2014-04-042-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added property media.stagefright.log-uri. Set it to true or 1 to log uris by AwesomePlayer. Added utility function to get uri debug string based on incognito and log opt-in status. Change-Id: I5ccc23079ddfb120dd9703a3ed651a162ed5acec Related-Bug: 6994761
* | | | libstagefright: fix 64-bit warningsColin Cross2014-03-195-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | %lld -> %" PRId64 " for int64_t %d -> %zu for size_t Also fixes some casts from void* to integer types, and some comparisons between signed and unsigned. Change-Id: I9c52f76240e39399da252c66459042a6fc626a90
* | | | am f1ac623f: am 4a67fc49: Merge "Implemented support for RTSP 301 Redirect"Andreas Huber2014-03-141-11/+22
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'f1ac623fcc6bbda2faff9752cd611182a897afe1': Implemented support for RTSP 301 Redirect
| * | | Merge "Implemented support for RTSP 301 Redirect"Andreas Huber2014-03-141-11/+22
| |\ \ \
| | * | | Implemented support for RTSP 301 RedirectDavid Williams2012-12-031-11/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RTSP 301 (Permament Redirect) support has been implemented. Change-Id: If82ffc87f4e7dcbdf98e0a662a35cc086750fc1b
* | | | | am f4431278: am 19afb386: Merge "Remove streaming URI from default logs"Marco Nelissen2014-03-123-3/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'f4431278a9613f55ecd944ab2e3eb615b372f269': Remove streaming URI from default logs