|
|
@ -584,7 +584,13 @@ void ff_rtsp_close_streams(AVFormatContext *s) |
|
|
|
if (s->oformat) { |
|
|
|
if (s->oformat) { |
|
|
|
AVFormatContext *rtpctx = rtsp_st->transport_priv; |
|
|
|
AVFormatContext *rtpctx = rtsp_st->transport_priv; |
|
|
|
av_write_trailer(rtpctx); |
|
|
|
av_write_trailer(rtpctx); |
|
|
|
|
|
|
|
if (rt->lower_transport == RTSP_LOWER_TRANSPORT_TCP) { |
|
|
|
|
|
|
|
uint8_t *ptr; |
|
|
|
|
|
|
|
url_close_dyn_buf(rtpctx->pb, &ptr); |
|
|
|
|
|
|
|
av_free(ptr); |
|
|
|
|
|
|
|
} else { |
|
|
|
url_fclose(rtpctx->pb); |
|
|
|
url_fclose(rtpctx->pb); |
|
|
|
|
|
|
|
} |
|
|
|
av_metadata_free(&rtpctx->streams[0]->metadata); |
|
|
|
av_metadata_free(&rtpctx->streams[0]->metadata); |
|
|
|
av_metadata_free(&rtpctx->metadata); |
|
|
|
av_metadata_free(&rtpctx->metadata); |
|
|
|
av_free(rtpctx->streams[0]); |
|
|
|
av_free(rtpctx->streams[0]); |
|
|
@ -644,11 +650,20 @@ static void *rtsp_rtp_mux_open(AVFormatContext *s, AVStream *st, |
|
|
|
av_free(rtpctx->streams[0]->codec); |
|
|
|
av_free(rtpctx->streams[0]->codec); |
|
|
|
rtpctx->streams[0]->codec = st->codec; |
|
|
|
rtpctx->streams[0]->codec = st->codec; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (handle) { |
|
|
|
url_fdopen(&rtpctx->pb, handle); |
|
|
|
url_fdopen(&rtpctx->pb, handle); |
|
|
|
|
|
|
|
} else |
|
|
|
|
|
|
|
url_open_dyn_packet_buf(&rtpctx->pb, RTSP_TCP_MAX_PACKET_SIZE); |
|
|
|
ret = av_write_header(rtpctx); |
|
|
|
ret = av_write_header(rtpctx); |
|
|
|
|
|
|
|
|
|
|
|
if (ret) { |
|
|
|
if (ret) { |
|
|
|
|
|
|
|
if (handle) { |
|
|
|
url_fclose(rtpctx->pb); |
|
|
|
url_fclose(rtpctx->pb); |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
uint8_t *ptr; |
|
|
|
|
|
|
|
url_close_dyn_buf(rtpctx->pb, &ptr); |
|
|
|
|
|
|
|
av_free(ptr); |
|
|
|
|
|
|
|
} |
|
|
|
av_free(rtpctx->streams[0]); |
|
|
|
av_free(rtpctx->streams[0]); |
|
|
|
av_free(rtpctx); |
|
|
|
av_free(rtpctx); |
|
|
|
return NULL; |
|
|
|
return NULL; |
|
|
@ -1464,11 +1479,12 @@ redirect: |
|
|
|
lower_transport_mask = (1 << RTSP_LOWER_TRANSPORT_NB) - 1; |
|
|
|
lower_transport_mask = (1 << RTSP_LOWER_TRANSPORT_NB) - 1; |
|
|
|
|
|
|
|
|
|
|
|
if (s->oformat) { |
|
|
|
if (s->oformat) { |
|
|
|
/* Only UDP output is supported at the moment. */ |
|
|
|
/* Only UDP or TCP - UDP multicast isn't supported. */ |
|
|
|
lower_transport_mask &= 1 << RTSP_LOWER_TRANSPORT_UDP; |
|
|
|
lower_transport_mask &= (1 << RTSP_LOWER_TRANSPORT_UDP) | |
|
|
|
|
|
|
|
(1 << RTSP_LOWER_TRANSPORT_TCP); |
|
|
|
if (!lower_transport_mask) { |
|
|
|
if (!lower_transport_mask) { |
|
|
|
av_log(s, AV_LOG_ERROR, "Unsupported lower transport method, " |
|
|
|
av_log(s, AV_LOG_ERROR, "Unsupported lower transport method, " |
|
|
|
"only UDP is supported for output.\n"); |
|
|
|
"only UDP and TCP are supported for output.\n"); |
|
|
|
err = AVERROR(EINVAL); |
|
|
|
err = AVERROR(EINVAL); |
|
|
|
goto fail; |
|
|
|
goto fail; |
|
|
|
} |
|
|
|
} |
|
|
|