comparison rtsp.c @ 5333:715913c5514f libavformat

Support 3xx redirection in rtsp All the error codes 3xx got managed the same way. After setup/early play redirection will not be managed REDIRECT method is yet to be supported (if somebody knows a server implementing it please contact me)

5332:ff45ef768724

        skip_spaces(&p);
        av_strlcpy(reply->server, p, sizeof(reply->server));
    } else if (av_stristart(p, "Notice:", &p) ||
               av_stristart(p, "X-Notice:", &p)) {
        reply->notice = strtol(p, NULL, 10);
    }
}

/* skip a RTP/TCP interleaved packet */
static void rtsp_skip_packet(AVFormatContext *s)

    int port, ret, err;
    RTSPMessageHeader reply1, *reply = &reply1;
    unsigned char *content = NULL;
    int lower_transport_mask = 0;
    char real_challenge[64];

    /* extract hostname and port */
    url_split(NULL, 0, auth, sizeof(auth),
              host, sizeof(host), &port, path, sizeof(path), s->filename);
    if (*auth) {
        int auth_len = strlen(auth), b64_len = ((auth_len + 2) / 3) * 4 + 1;

 fail:
    rtsp_close_streams(rt);
    av_freep(&content);
    url_close(rt->rtsp_hd);
    av_freep(&rt->auth_b64);
    return err;
}

static int tcp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st,
                           uint8_t *buf, int buf_size)

5333:715913c5514f

        skip_spaces(&p);
        av_strlcpy(reply->server, p, sizeof(reply->server));
    } else if (av_stristart(p, "Notice:", &p) ||
               av_stristart(p, "X-Notice:", &p)) {
        reply->notice = strtol(p, NULL, 10);
    } else if (av_stristart(p, "Location:", &p)) {
        skip_spaces(&p);
        av_strlcpy(reply->location, p , sizeof(reply->location));
    }
}

/* skip a RTP/TCP interleaved packet */
static void rtsp_skip_packet(AVFormatContext *s)

    int port, ret, err;
    RTSPMessageHeader reply1, *reply = &reply1;
    unsigned char *content = NULL;
    int lower_transport_mask = 0;
    char real_challenge[64];
  redirect:
    /* extract hostname and port */
    url_split(NULL, 0, auth, sizeof(auth),
              host, sizeof(host), &port, path, sizeof(path), s->filename);
    if (*auth) {
        int auth_len = strlen(auth), b64_len = ((auth_len + 2) / 3) * 4 + 1;

 fail:
    rtsp_close_streams(rt);
    av_freep(&content);
    url_close(rt->rtsp_hd);
    av_freep(&rt->auth_b64);
    if (reply->status_code >=300 && reply->status_code < 400) {
        av_strlcpy(s->filename, reply->location, sizeof(s->filename));
        av_log(s, AV_LOG_INFO, "Status %d: Redirecting to %s\n",
               reply->status_code,
               s->filename);
        goto redirect;
    }
    return err;
}

static int tcp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st,
                           uint8_t *buf, int buf_size)