comparison rtsp.c @ 5819:53c5a5d40ee7 libavformat

RTSP muxer: Create the SDP with the numerical IP of the peer instead of using the original host name

5818:1a3c4f74f17d

        return AVERROR_INVALIDDATA;

    return 0;
}

static int rtsp_setup_output_streams(AVFormatContext *s)
{
    RTSPState *rt = s->priv_data;
    RTSPMessageHeader reply1, *reply = &reply1;
    char cmd[1024];
    int i;
    char *sdp;

    /* Announce the stream */
    snprintf(cmd, sizeof(cmd),
             "ANNOUNCE %s RTSP/1.0\r\n"
             "Content-Type: application/sdp\r\n",
             rt->control_uri);
    sdp = av_mallocz(8192);
    if (sdp == NULL)
        return AVERROR(ENOMEM);
    if (avf_sdp_create(&s, 1, sdp, 8192)) {
        av_free(sdp);
        return AVERROR_INVALIDDATA;
    }
    av_log(s, AV_LOG_INFO, "SDP:\n%s\n", sdp);
    ff_rtsp_send_cmd_with_content(s, cmd, reply, NULL, sdp, strlen(sdp));

    }

    if (s->iformat)
        err = rtsp_setup_input_streams(s);
    else
        err = rtsp_setup_output_streams(s);
    if (err)
        goto fail;

    do {
        int lower_transport = ff_log2_tab[lower_transport_mask &

5819:53c5a5d40ee7

        return AVERROR_INVALIDDATA;

    return 0;
}

static int rtsp_setup_output_streams(AVFormatContext *s, const char *addr)
{
    RTSPState *rt = s->priv_data;
    RTSPMessageHeader reply1, *reply = &reply1;
    char cmd[1024];
    int i;
    char *sdp;
    AVFormatContext sdp_ctx, *ctx_array[1];

    /* Announce the stream */
    snprintf(cmd, sizeof(cmd),
             "ANNOUNCE %s RTSP/1.0\r\n"
             "Content-Type: application/sdp\r\n",
             rt->control_uri);
    sdp = av_mallocz(8192);
    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, 8192)) {
        av_free(sdp);
        return AVERROR_INVALIDDATA;
    }
    av_log(s, AV_LOG_INFO, "SDP:\n%s\n", sdp);
    ff_rtsp_send_cmd_with_content(s, cmd, reply, NULL, sdp, strlen(sdp));

    }

    if (s->iformat)
        err = rtsp_setup_input_streams(s);
    else
        err = rtsp_setup_output_streams(s, host);
    if (err)
        goto fail;

    do {
        int lower_transport = ff_log2_tab[lower_transport_mask &