Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Unified Diff: source/patched-ffmpeg-mt/libavformat/rtsp.h

Issue 3384002: ffmpeg source update for sep 09 (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: Created 10 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/patched-ffmpeg-mt/libavformat/rtpproto.c ('k') | source/patched-ffmpeg-mt/libavformat/rtsp.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/patched-ffmpeg-mt/libavformat/rtsp.h
===================================================================
--- source/patched-ffmpeg-mt/libavformat/rtsp.h (revision 59334)
+++ source/patched-ffmpeg-mt/libavformat/rtsp.h (working copy)
@@ -96,7 +96,8 @@
* packets will be allowed to make before being discarded. */
int ttl;
- uint32_t destination; /**< destination IP address */
+ struct sockaddr_storage destination; /**< destination IP address */
+ char source[INET6_ADDRSTRLEN + 1]; /**< source IP address */
/** data/packet transport protocol; e.g. RTP or RDT */
enum RTSPTransport transport;
@@ -267,8 +268,12 @@
/** stream setup during the last frame read. This is used to detect if
* we need to subscribe or unsubscribe to any new streams. */
- enum AVDiscard real_setup_cache[MAX_STREAMS];
+ enum AVDiscard *real_setup_cache;
+ /** current stream setup. This is a temporary buffer used to compare
+ * current setup to previous frame setup. */
+ enum AVDiscard *real_setup;
+
/** the last value of the "SET_PARAMETER Subscribe:" RTSP command.
* this is used to send the same "Unsubscribe:" if stream setup changed,
* before sending a new "Subscribe:" command. */
@@ -299,6 +304,11 @@
/** RTSP transport mode, such as plain or tunneled. */
enum RTSPControlTransport control_transport;
+
+ /* Number of RTCP BYE packets the RTSP session has received.
+ * An EOF is propagated back if nb_byes == nb_streams.
+ * This is reset after a seek. */
+ int nb_byes;
} RTSPState;
/**
@@ -323,7 +333,7 @@
/** The following are used only in SDP, not RTSP */
//@{
int sdp_port; /**< port (from SDP content) */
- struct in_addr sdp_ip; /**< IP address (from SDP content) */
+ struct sockaddr_storage sdp_ip; /**< IP address (from SDP content) */
int sdp_ttl; /**< IP Time-To-Live (from SDP content) */
int sdp_payload_type; /**< payload type */
//@}
« no previous file with comments | « source/patched-ffmpeg-mt/libavformat/rtpproto.c ('k') | source/patched-ffmpeg-mt/libavformat/rtsp.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698