mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-28 10:22:10 +00:00
rtsp: Move rtsp_setup_output_streams into rtspenc.c
Originally committed as revision 25600 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
63e856df0a
commit
c2688f3ac8
@ -1269,78 +1269,6 @@ static int rtsp_setup_input_streams(AVFormatContext *s, RTSPMessageHeader *reply
|
||||
static int rtsp_setup_input_streams(AVFormatContext *s, RTSPMessageHeader *reply);
|
||||
#endif /* !CONFIG_RTSP_DEMUXER */
|
||||
|
||||
#if CONFIG_RTSP_MUXER
|
||||
static int rtsp_setup_output_streams(AVFormatContext *s, const char *addr)
|
||||
{
|
||||
RTSPState *rt = s->priv_data;
|
||||
RTSPMessageHeader reply1, *reply = &reply1;
|
||||
int i;
|
||||
char *sdp;
|
||||
AVFormatContext sdp_ctx, *ctx_array[1];
|
||||
|
||||
s->start_time_realtime = av_gettime();
|
||||
|
||||
/* Announce the stream */
|
||||
sdp = av_mallocz(SDP_MAX_SIZE);
|
||||
if (sdp == NULL)
|
||||
return AVERROR(ENOMEM);
|
||||
/* We create the SDP based on the RTSP AVFormatContext where we
|
||||
* aren't allowed to change the filename field. (We create the SDP
|
||||
* based on the RTSP context since the contexts for the RTP streams
|
||||
* don't exist yet.) In order to specify a custom URL with the actual
|
||||
* peer IP instead of the originally specified hostname, we create
|
||||
* a temporary copy of the AVFormatContext, where the custom URL is set.
|
||||
*
|
||||
* FIXME: Create the SDP without copying the AVFormatContext.
|
||||
* This either requires setting up the RTP stream AVFormatContexts
|
||||
* already here (complicating things immensely) or getting a more
|
||||
* flexible SDP creation interface.
|
||||
*/
|
||||
sdp_ctx = *s;
|
||||
ff_url_join(sdp_ctx.filename, sizeof(sdp_ctx.filename),
|
||||
"rtsp", NULL, addr, -1, NULL);
|
||||
ctx_array[0] = &sdp_ctx;
|
||||
if (avf_sdp_create(ctx_array, 1, sdp, SDP_MAX_SIZE)) {
|
||||
av_free(sdp);
|
||||
return AVERROR_INVALIDDATA;
|
||||
}
|
||||
av_log(s, AV_LOG_VERBOSE, "SDP:\n%s\n", sdp);
|
||||
ff_rtsp_send_cmd_with_content(s, "ANNOUNCE", rt->control_uri,
|
||||
"Content-Type: application/sdp\r\n",
|
||||
reply, NULL, sdp, strlen(sdp));
|
||||
av_free(sdp);
|
||||
if (reply->status_code != RTSP_STATUS_OK)
|
||||
return AVERROR_INVALIDDATA;
|
||||
|
||||
/* Set up the RTSPStreams for each AVStream */
|
||||
for (i = 0; i < s->nb_streams; i++) {
|
||||
RTSPStream *rtsp_st;
|
||||
AVStream *st = s->streams[i];
|
||||
|
||||
rtsp_st = av_mallocz(sizeof(RTSPStream));
|
||||
if (!rtsp_st)
|
||||
return AVERROR(ENOMEM);
|
||||
dynarray_add(&rt->rtsp_streams, &rt->nb_rtsp_streams, rtsp_st);
|
||||
|
||||
st->priv_data = rtsp_st;
|
||||
rtsp_st->stream_index = i;
|
||||
|
||||
av_strlcpy(rtsp_st->control_url, rt->control_uri, sizeof(rtsp_st->control_url));
|
||||
/* Note, this must match the relative uri set in the sdp content */
|
||||
av_strlcatf(rtsp_st->control_url, sizeof(rtsp_st->control_url),
|
||||
"/streamid=%d", i);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
#else /* !CONFIG_RTSP_MUXER */
|
||||
/* A declaration of this function is needed so that the function is
|
||||
* defined when parsing the call to it, even if dead code elimination
|
||||
* will remove the call later.
|
||||
*/
|
||||
static int rtsp_setup_output_streams(AVFormatContext *s, const char *addr);
|
||||
#endif /* !CONFIG_RTSP_MUXER */
|
||||
|
||||
void ff_rtsp_close_connections(AVFormatContext *s)
|
||||
{
|
||||
RTSPState *rt = s->priv_data;
|
||||
@ -1559,7 +1487,7 @@ redirect:
|
||||
if (s->iformat && CONFIG_RTSP_DEMUXER)
|
||||
err = rtsp_setup_input_streams(s, reply);
|
||||
else if (CONFIG_RTSP_MUXER)
|
||||
err = rtsp_setup_output_streams(s, host);
|
||||
err = ff_rtsp_setup_output_streams(s, host);
|
||||
if (err)
|
||||
goto fail;
|
||||
|
||||
|
@ -468,4 +468,10 @@ void ff_rtsp_close_streams(AVFormatContext *s);
|
||||
*/
|
||||
void ff_rtsp_close_connections(AVFormatContext *rt);
|
||||
|
||||
/**
|
||||
* Announce the stream to the server and set up the RTSPStream child
|
||||
* objects for each media stream.
|
||||
*/
|
||||
int ff_rtsp_setup_output_streams(AVFormatContext *s, const char *addr);
|
||||
|
||||
#endif /* AVFORMAT_RTSP_H */
|
||||
|
@ -29,6 +29,73 @@
|
||||
#include "rtsp.h"
|
||||
#include "internal.h"
|
||||
#include "libavutil/intreadwrite.h"
|
||||
#include "libavutil/avstring.h"
|
||||
|
||||
#define SDP_MAX_SIZE 16384
|
||||
|
||||
int ff_rtsp_setup_output_streams(AVFormatContext *s, const char *addr)
|
||||
{
|
||||
RTSPState *rt = s->priv_data;
|
||||
RTSPMessageHeader reply1, *reply = &reply1;
|
||||
int i;
|
||||
char *sdp;
|
||||
AVFormatContext sdp_ctx, *ctx_array[1];
|
||||
|
||||
s->start_time_realtime = av_gettime();
|
||||
|
||||
/* Announce the stream */
|
||||
sdp = av_mallocz(SDP_MAX_SIZE);
|
||||
if (sdp == NULL)
|
||||
return AVERROR(ENOMEM);
|
||||
/* We create the SDP based on the RTSP AVFormatContext where we
|
||||
* aren't allowed to change the filename field. (We create the SDP
|
||||
* based on the RTSP context since the contexts for the RTP streams
|
||||
* don't exist yet.) In order to specify a custom URL with the actual
|
||||
* peer IP instead of the originally specified hostname, we create
|
||||
* a temporary copy of the AVFormatContext, where the custom URL is set.
|
||||
*
|
||||
* FIXME: Create the SDP without copying the AVFormatContext.
|
||||
* This either requires setting up the RTP stream AVFormatContexts
|
||||
* already here (complicating things immensely) or getting a more
|
||||
* flexible SDP creation interface.
|
||||
*/
|
||||
sdp_ctx = *s;
|
||||
ff_url_join(sdp_ctx.filename, sizeof(sdp_ctx.filename),
|
||||
"rtsp", NULL, addr, -1, NULL);
|
||||
ctx_array[0] = &sdp_ctx;
|
||||
if (avf_sdp_create(ctx_array, 1, sdp, SDP_MAX_SIZE)) {
|
||||
av_free(sdp);
|
||||
return AVERROR_INVALIDDATA;
|
||||
}
|
||||
av_log(s, AV_LOG_VERBOSE, "SDP:\n%s\n", sdp);
|
||||
ff_rtsp_send_cmd_with_content(s, "ANNOUNCE", rt->control_uri,
|
||||
"Content-Type: application/sdp\r\n",
|
||||
reply, NULL, sdp, strlen(sdp));
|
||||
av_free(sdp);
|
||||
if (reply->status_code != RTSP_STATUS_OK)
|
||||
return AVERROR_INVALIDDATA;
|
||||
|
||||
/* Set up the RTSPStreams for each AVStream */
|
||||
for (i = 0; i < s->nb_streams; i++) {
|
||||
RTSPStream *rtsp_st;
|
||||
AVStream *st = s->streams[i];
|
||||
|
||||
rtsp_st = av_mallocz(sizeof(RTSPStream));
|
||||
if (!rtsp_st)
|
||||
return AVERROR(ENOMEM);
|
||||
dynarray_add(&rt->rtsp_streams, &rt->nb_rtsp_streams, rtsp_st);
|
||||
|
||||
st->priv_data = rtsp_st;
|
||||
rtsp_st->stream_index = i;
|
||||
|
||||
av_strlcpy(rtsp_st->control_url, rt->control_uri, sizeof(rtsp_st->control_url));
|
||||
/* Note, this must match the relative uri set in the sdp content */
|
||||
av_strlcatf(rtsp_st->control_url, sizeof(rtsp_st->control_url),
|
||||
"/streamid=%d", i);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int rtsp_write_record(AVFormatContext *s)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user