summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/rtsp
Commit message (Collapse)AuthorAgeFilesLines
* 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
* 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
| * | | | Remove streaming URI from default logsDavid Williams2014-03-103-3/+3
| | |/ / | |/| | | | | | | | | | | | | | | | | | Streaming URI should not be visible in default logcat logs Change-Id: I104cc56b5335f8c5621013e4c5be8028f0379833
* | | | warnings be gone.Andreas Huber2014-02-115-6/+24
| | | | | | | | | | | | | | | | Change-Id: Ie3bae3f037730e316d7fca12e7a3527973f752ef
* | | | Remove no longer needed http proxy handling code, it's obsolete nowAndreas Huber2014-02-051-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since we started to use java's HTTPConnection instead of the native implementation. Also remove other remnants of the previous http implementation, such as accounting for the http user's uid. Change-Id: I60bfd31381ea40d2220db587ec5c433093b60034
* | | | FINAL ATTEMPT: HTTP services are now provided from JAVA and made available ↵Andreas Huber2014-02-044-11/+14
|/ / / | | | | | | | | | | | | | | | to media code Change-Id: I9f74a86e70422187c9cf0ca1318a29019700192d
* | | am 58dd0786: Merge "Send kWhatConnected in onTimeUpdate() before first ↵Chong Zhang2013-09-251-17/+23
|\ \ \ | | |/ | |/| | | | | | | | | | | | | access unit" into klp-dev * commit '58dd07863571951408b67fa0a7f17cb23606fb1c': Send kWhatConnected in onTimeUpdate() before first access unit
| * | Send kWhatConnected in onTimeUpdate() before first access unitChong Zhang2013-09-241-17/+23
| | | | | | | | | | | | | | | Bug: 10642588 Change-Id: If2b4fbbf250d5307e304f31c7aa4ac480e279484
* | | am af66fae1: am fb949d5d: Merge "Fix crash in MyHandler when sockets are not ↵Andreas Huber2013-08-282-17/+22
|\ \ \ | |/ / |/| | | | | | | | | | | | | | set." * commit 'af66fae15f8c386ad884e5fa83db4eaef4c4f2ee': Fix crash in MyHandler when sockets are not set.
| * | Merge "Fix crash in MyHandler when sockets are not set."Andreas Huber2013-08-282-17/+22
| |\ \
| | * | Fix crash in MyHandler when sockets are not set.Henrik Backlund2012-12-052-17/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -When going quickly in and out of the video view during an rtsp streaming session, a race condition occurs and MyHandler tries to connect to a socket that has been reset. To avoid this, checks are added. - If there are errors during setupTrack 1, it is no use setting up track 2. It will cause new errors. - No assert for socket connect since there is a normal status check already. Change-Id: Ie06221d6c0d78ce0449f76c782ed5120fa646bfd
* | | | am bcd86896: am d0f5664a: Merge "Handle undefined NAL type for h264 streaming"Andreas Huber2013-08-081-0/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'bcd86896e486e303d285e13477e0623b2a920e78': Handle undefined NAL type for h264 streaming
| * | | Merge "Handle undefined NAL type for h264 streaming"Andreas Huber2013-08-081-0/+7
| |\ \ \
| | * | | Handle undefined NAL type for h264 streamingPatrik2 Carlsson2013-07-271-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Packages of undefined NAL type (0) was observed but lead to deleting the subsequent package due to the current assembler implementation. Identifying and ignoring this package without returning an error handles undefined packages without side-effects. Change-Id: I02e15b8682bee3154b3c4acf82639a28417f0c85
* | | | | am b57fb786: am d0ef1ccd: Merge "rtsp handle response line ended with \'\n\'"Andreas Huber2013-07-311-0/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'b57fb786a32d4ea78cd8bbf24a65593353d87a88': rtsp handle response line ended with '\n'
generated by cgit v1.1 at 2024-05-17 21:51:40 +0000