comparison rtsp.c @ 3150:095003bbe73e libavformat

Change protocol_mask into protocol, since we always just try a single one per iteration in make_setup_request(), and cycling between the different protocols is now done in the calling function, therefore the need for a mask goes away. This also makes the function somewhat simpler to read. Discussed and approved in "[PATCH] RTSP alternate protocol 3/4".

3149:5a7a7406ab1f

/**
 * @returns 0 on success, <0 on error, 1 if protocol is unavailable.
 */
static int
make_setup_request (AVFormatContext *s, const char *host, int port, int protocol_mask)
{
    RTSPState *rt = s->priv_data;
    int j, i, err;
    RTSPStream *rtsp_st;
    AVStream *st;

        /* compute available transports */
        transport[0] = '\0';

        /* RTP/UDP */
        if (protocol_mask & (1 << RTSP_PROTOCOL_RTP_UDP)) {
            char buf[256];

            /* first try in specified port range */
            if (RTSP_RTP_PORT_MIN != 0) {
                while(j <= RTSP_RTP_PORT_MAX) {

                     "RTP/AVP/UDP;unicast;client_port=%d-%d",
                     port, port + 1);
        }

        /* RTP/TCP */
        else if (protocol_mask & (1 << RTSP_PROTOCOL_RTP_TCP)) {
            if (transport[0] != '\0')
                av_strlcat(transport, ",", sizeof(transport));
            snprintf(transport + strlen(transport), sizeof(transport) - strlen(transport) - 1,
                     "RTP/AVP/TCP");
        }

        else if (protocol_mask & (1 << RTSP_PROTOCOL_RTP_UDP_MULTICAST)) {
            if (transport[0] != '\0')
                av_strlcat(transport, ",", sizeof(transport));
            snprintf(transport + strlen(transport),
                     sizeof(transport) - strlen(transport) - 1,
                     "RTP/AVP/UDP;multicast");

            rt->protocol = reply->transports[0].protocol;
        }

        /* close RTP connection if not choosen */
        if (reply->transports[0].protocol != RTSP_PROTOCOL_RTP_UDP &&
            (protocol_mask & (1 << RTSP_PROTOCOL_RTP_UDP))) {
            url_close(rtsp_st->rtp_handle);
            rtsp_st->rtp_handle = NULL;
        }

        switch(reply->transports[0].protocol) {

        err = AVERROR_INVALIDDATA;
        goto fail;
    }

    do {
        int protocol = protocol_mask & ~(protocol_mask - 1);

        err = make_setup_request(s, host, port, protocol);
        if (err < 0)
        goto fail;
        protocol_mask &= ~protocol;
        if (protocol_mask == 0 && err == 1) {
            err = AVERROR(EPROTONOSUPPORT);
            goto fail;
        }
    } while (err);

3150:095003bbe73e

/**
 * @returns 0 on success, <0 on error, 1 if protocol is unavailable.
 */
static int
make_setup_request (AVFormatContext *s, const char *host, int port, int protocol)
{
    RTSPState *rt = s->priv_data;
    int j, i, err;
    RTSPStream *rtsp_st;
    AVStream *st;

        /* compute available transports */
        transport[0] = '\0';

        /* RTP/UDP */
        if (protocol == RTSP_PROTOCOL_RTP_UDP) {
            char buf[256];

            /* first try in specified port range */
            if (RTSP_RTP_PORT_MIN != 0) {
                while(j <= RTSP_RTP_PORT_MAX) {

                     "RTP/AVP/UDP;unicast;client_port=%d-%d",
                     port, port + 1);
        }

        /* RTP/TCP */
        else if (protocol == RTSP_PROTOCOL_RTP_TCP) {
            if (transport[0] != '\0')
                av_strlcat(transport, ",", sizeof(transport));
            snprintf(transport + strlen(transport), sizeof(transport) - strlen(transport) - 1,
                     "RTP/AVP/TCP");
        }

        else if (protocol == RTSP_PROTOCOL_RTP_UDP_MULTICAST) {
            if (transport[0] != '\0')
                av_strlcat(transport, ",", sizeof(transport));
            snprintf(transport + strlen(transport),
                     sizeof(transport) - strlen(transport) - 1,
                     "RTP/AVP/UDP;multicast");

            rt->protocol = reply->transports[0].protocol;
        }

        /* close RTP connection if not choosen */
        if (reply->transports[0].protocol != RTSP_PROTOCOL_RTP_UDP &&
            (protocol == RTSP_PROTOCOL_RTP_UDP)) {
            url_close(rtsp_st->rtp_handle);
            rtsp_st->rtp_handle = NULL;
        }

        switch(reply->transports[0].protocol) {

        err = AVERROR_INVALIDDATA;
        goto fail;
    }

    do {
        int protocol = ff_log2_tab[protocol_mask & ~(protocol_mask - 1)];

        err = make_setup_request(s, host, port, protocol);
        if (err < 0)
        goto fail;
        protocol_mask &= ~(1 << protocol);
        if (protocol_mask == 0 && err == 1) {
            err = AVERROR(EPROTONOSUPPORT);
            goto fail;
        }
    } while (err);