comparison rtsp.c @ 5572:820f0889bc45 libavformat

Remove reply and content_ptr arguments from rtsp_send_cmd_async(), since they are unused.

5571:3fd13093ca7c

        return AVERROR(EPERM);

    return 0;
}

static void rtsp_send_cmd_async(AVFormatContext *s,
                                const char *cmd, RTSPMessageHeader *reply,
                                unsigned char **content_ptr)
{
    RTSPState *rt = s->priv_data;
    char buf[4096], buf1[1024];

    rt->seq++;

static void rtsp_send_cmd(AVFormatContext *s,
                          const char *cmd, RTSPMessageHeader *reply,
                          unsigned char **content_ptr)
{
    rtsp_send_cmd_async(s, cmd, reply, content_ptr);

    rtsp_read_reply(s, reply, content_ptr, 0);
}

/**

        (av_gettime() - rt->last_cmd_time) / 1000000 >= rt->timeout / 2) {
        if (rt->server_type == RTSP_SERVER_WMS) {
            snprintf(cmd, sizeof(cmd) - 1,
                     "GET_PARAMETER %s RTSP/1.0\r\n",
                     s->filename);
            rtsp_send_cmd_async(s, cmd, reply, NULL);
        } else {
            rtsp_send_cmd_async(s, "OPTIONS * RTSP/1.0\r\n",
                                reply, NULL);
        }
    }

    return 0;
}

}

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

#if 0
    /* NOTE: it is valid to flush the buffer here */
    if (rt->lower_transport == RTSP_LOWER_TRANSPORT_TCP) {

    }
#endif
    snprintf(cmd, sizeof(cmd),
             "TEARDOWN %s RTSP/1.0\r\n",
             s->filename);
    rtsp_send_cmd_async(s, cmd, reply, NULL);

    rtsp_close_streams(rt);
    url_close(rt->rtsp_hd);
    return 0;
}

5572:820f0889bc45

        return AVERROR(EPERM);

    return 0;
}

static void rtsp_send_cmd_async(AVFormatContext *s, const char *cmd)
{
    RTSPState *rt = s->priv_data;
    char buf[4096], buf1[1024];

    rt->seq++;

static void rtsp_send_cmd(AVFormatContext *s,
                          const char *cmd, RTSPMessageHeader *reply,
                          unsigned char **content_ptr)
{
    rtsp_send_cmd_async(s, cmd);

    rtsp_read_reply(s, reply, content_ptr, 0);
}

/**

        (av_gettime() - rt->last_cmd_time) / 1000000 >= rt->timeout / 2) {
        if (rt->server_type == RTSP_SERVER_WMS) {
            snprintf(cmd, sizeof(cmd) - 1,
                     "GET_PARAMETER %s RTSP/1.0\r\n",
                     s->filename);
            rtsp_send_cmd_async(s, cmd);
        } else {
            rtsp_send_cmd_async(s, "OPTIONS * RTSP/1.0\r\n");
        }
    }

    return 0;
}

}

static int rtsp_read_close(AVFormatContext *s)
{
    RTSPState *rt = s->priv_data;
    char cmd[1024];

#if 0
    /* NOTE: it is valid to flush the buffer here */
    if (rt->lower_transport == RTSP_LOWER_TRANSPORT_TCP) {

    }
#endif
    snprintf(cmd, sizeof(cmd),
             "TEARDOWN %s RTSP/1.0\r\n",
             s->filename);
    rtsp_send_cmd_async(s, cmd);

    rtsp_close_streams(rt);
    url_close(rt->rtsp_hd);
    return 0;
}