virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

Rename "tx_ctx" and "cur_tx" variables to "transport_priv" and

Browse Source 
"cur_transport_priv", as discussed in the "[PATCH] rtsp.h: rename tx
variables" thread.

Originally committed as revision 17012 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Ronald S. Bultje 2009-02-05 22:34:55 +00:00
parent f5b288902e
commit 0a861b6f8b
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libavformat/rtsp.c
View File

@ -829,11 +829,11 @@ static void rtsp_close_streams(RTSPState *rt)
for(i=0;i<rt->nb_rtsp_streams;i++) { for(i=0;i<rt->nb_rtsp_streams;i++) {
rtsp_st = rt->rtsp_streams[i]; rtsp_st = rt->rtsp_streams[i];
if (rtsp_st) { if (rtsp_st) {
if (rtsp_st->tx_ctx) { if (rtsp_st->transport_priv) {
if (rt->transport == RTSP_TRANSPORT_RDT) if (rt->transport == RTSP_TRANSPORT_RDT)
ff_rdt_parse_close(rtsp_st->tx_ctx); ff_rdt_parse_close(rtsp_st->transport_priv);
else else
rtp_parse_close(rtsp_st->tx_ctx); rtp_parse_close(rtsp_st->transport_priv);
} }
if (rtsp_st->rtp_handle) if (rtsp_st->rtp_handle)
url_close(rtsp_st->rtp_handle); url_close(rtsp_st->rtp_handle);
@ -857,19 +857,19 @@ rtsp_open_transport_ctx(AVFormatContext *s, RTSPStream *rtsp_st)
s->ctx_flags |= AVFMTCTX_NOHEADER; s->ctx_flags |= AVFMTCTX_NOHEADER;
if (rt->transport == RTSP_TRANSPORT_RDT) if (rt->transport == RTSP_TRANSPORT_RDT)
rtsp_st->tx_ctx = ff_rdt_parse_open(s, st->index, rtsp_st->transport_priv = ff_rdt_parse_open(s, st->index,
rtsp_st->dynamic_protocol_context, rtsp_st->dynamic_protocol_context,
rtsp_st->dynamic_handler); rtsp_st->dynamic_handler);
else else
rtsp_st->tx_ctx = rtp_parse_open(s, st, rtsp_st->rtp_handle, rtsp_st->transport_priv = rtp_parse_open(s, st, rtsp_st->rtp_handle,
rtsp_st->sdp_payload_type, rtsp_st->sdp_payload_type,
&rtsp_st->rtp_payload_data); &rtsp_st->rtp_payload_data);
if (!rtsp_st->tx_ctx) { if (!rtsp_st->transport_priv) {
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} else if (rt->transport != RTSP_TRANSPORT_RDT) { } else if (rt->transport != RTSP_TRANSPORT_RDT) {
if(rtsp_st->dynamic_handler) { if(rtsp_st->dynamic_handler) {
rtp_parse_set_dynamic_protocol(rtsp_st->tx_ctx, rtp_parse_set_dynamic_protocol(rtsp_st->transport_priv,
rtsp_st->dynamic_protocol_context, rtsp_st->dynamic_protocol_context,
rtsp_st->dynamic_handler); rtsp_st->dynamic_handler);
} }
@ -1374,18 +1374,18 @@ static int rtsp_read_packet(AVFormatContext *s,
} }
/* get next frames from the same RTP packet */ /* get next frames from the same RTP packet */
if (rt->cur_tx) { if (rt->cur_transport_priv) {
if (rt->transport == RTSP_TRANSPORT_RDT) if (rt->transport == RTSP_TRANSPORT_RDT)
ret = ff_rdt_parse_packet(rt->cur_tx, pkt, NULL, 0); ret = ff_rdt_parse_packet(rt->cur_transport_priv, pkt, NULL, 0);
else else
ret = rtp_parse_packet(rt->cur_tx, pkt, NULL, 0); ret = rtp_parse_packet(rt->cur_transport_priv, pkt, NULL, 0);
if (ret == 0) { if (ret == 0) {
rt->cur_tx = NULL; rt->cur_transport_priv = NULL;
return 0; return 0;
} else if (ret == 1) { } else if (ret == 1) {
return 0; return 0;
} else { } else {
rt->cur_tx = NULL; rt->cur_transport_priv = NULL;
} }
} }
@ -1399,21 +1399,21 @@ static int rtsp_read_packet(AVFormatContext *s,
case RTSP_LOWER_TRANSPORT_UDP: case RTSP_LOWER_TRANSPORT_UDP:
case RTSP_LOWER_TRANSPORT_UDP_MULTICAST: case RTSP_LOWER_TRANSPORT_UDP_MULTICAST:
len = udp_read_packet(s, &rtsp_st, buf, sizeof(buf)); len = udp_read_packet(s, &rtsp_st, buf, sizeof(buf));
if (len >=0 && rtsp_st->tx_ctx && rt->transport == RTSP_TRANSPORT_RTP) if (len >=0 && rtsp_st->transport_priv && rt->transport == RTSP_TRANSPORT_RTP)
rtp_check_and_send_back_rr(rtsp_st->tx_ctx, len); rtp_check_and_send_back_rr(rtsp_st->transport_priv, len);
break; break;
} }
if (len < 0) if (len < 0)
return len; return len;
if (rt->transport == RTSP_TRANSPORT_RDT) if (rt->transport == RTSP_TRANSPORT_RDT)
ret = ff_rdt_parse_packet(rtsp_st->tx_ctx, pkt, buf, len); ret = ff_rdt_parse_packet(rtsp_st->transport_priv, pkt, buf, len);
else else
ret = rtp_parse_packet(rtsp_st->tx_ctx, pkt, buf, len); ret = rtp_parse_packet(rtsp_st->transport_priv, pkt, buf, len);
if (ret < 0) if (ret < 0)
goto redo; goto redo;
if (ret == 1) { if (ret == 1) {
/* more packets may follow, so we save the RTP context */ /* more packets may follow, so we save the RTP context */
rt->cur_tx = rtsp_st->tx_ctx; rt->cur_transport_priv = rtsp_st->transport_priv;
} }
return 0; return 0;
} }

4
libavformat/rtsp.h
View File

@ -104,7 +104,7 @@ typedef struct RTSPState {
enum RTSPLowerTransport lower_transport; enum RTSPLowerTransport lower_transport;
enum RTSPServerType server_type; enum RTSPServerType server_type;
char last_reply[2048]; /* XXX: allocate ? */ char last_reply[2048]; /* XXX: allocate ? */
void *cur_tx; void *cur_transport_priv;
int need_subscription; int need_subscription;
enum AVDiscard real_setup_cache[MAX_STREAMS]; enum AVDiscard real_setup_cache[MAX_STREAMS];
char last_subscription[1024]; char last_subscription[1024];
@ -112,7 +112,7 @@ typedef struct RTSPState {
typedef struct RTSPStream { typedef struct RTSPStream {
URLContext *rtp_handle; /* RTP stream handle */ URLContext *rtp_handle; /* RTP stream handle */
void *tx_ctx; /* RTP/RDT parse context */ void *transport_priv; /* RTP/RDT parse context */
int stream_index; /* corresponding stream index, if any. -1 if none (MPEG2TS case) */ int stream_index; /* corresponding stream index, if any. -1 if none (MPEG2TS case) */
int interleaved_min, interleaved_max; /* interleave ids, if TCP transport */ int interleaved_min, interleaved_max; /* interleave ids, if TCP transport */