comparison sdp.c @ 2317:2adc9f64ecfb libavformat

Change avf_sdp_create() to get a pre-allocated buffer as input, and to return an integer (0 if the SDP has been succesfully created, < 0 in case of error)

2316:5a4914f78109

    dest_write(buff, size, dest_addr, ttl);

    sdp_media_attributes(buff, size, c, payload_type);
}

#define SDP_BUFFER_SIZE 2048
char *avf_sdp_create(AVFormatContext *ac[], int n_files)
{
    char *buff;
    struct sdp_session_level s;
    int i, j, port, ttl;
    char dst[32];

    buff = av_mallocz(SDP_BUFFER_SIZE);
    if (buff == NULL) {
        return NULL;
    }

    memset(&s, 0, sizeof(struct sdp_session_level));
    s.user = "-";
    s.src_addr = "127.0.0.1";    /* FIXME: Properly set this */
    s.name = ac[0]->title;

        if (port > 0) {
            s.dst_addr = dst;
            s.ttl = ttl;
        }
    }
    sdp_write_header(buff, SDP_BUFFER_SIZE, &s);

    dst[0] = 0;
    for (i = 0; i < n_files; i++) {
        if (n_files != 1) {
            port = get_address(dst, sizeof(dst), &ttl, ac[i]->filename);
        }
        for (j = 0; j < ac[i]->nb_streams; j++) {
            sdp_write_media(buff, SDP_BUFFER_SIZE,
                                  ac[i]->streams[j]->codec, dst[0] ? dst : NULL,
                                  (port > 0) ? port + j * 2 : 0, ttl);
            if (port <= 0) {
                av_strlcatf(buff, SDP_BUFFER_SIZE,
                                   "a=control:streamid=%d\r\n", i + j);
            }
        }
    }

    return buff;
}
#else
char *avf_sdp_create(AVFormatContext *ac[], int n_files)
{
    return NULL;
}
#endif

2317:2adc9f64ecfb

    dest_write(buff, size, dest_addr, ttl);

    sdp_media_attributes(buff, size, c, payload_type);
}

int avf_sdp_create(AVFormatContext *ac[], int n_files, char *buff, int size)
{
    struct sdp_session_level s;
    int i, j, port, ttl;
    char dst[32];

    memset(&s, 0, sizeof(struct sdp_session_level));
    s.user = "-";
    s.src_addr = "127.0.0.1";    /* FIXME: Properly set this */
    s.name = ac[0]->title;

        if (port > 0) {
            s.dst_addr = dst;
            s.ttl = ttl;
        }
    }
    sdp_write_header(buff, size, &s);

    dst[0] = 0;
    for (i = 0; i < n_files; i++) {
        if (n_files != 1) {
            port = get_address(dst, sizeof(dst), &ttl, ac[i]->filename);
        }
        for (j = 0; j < ac[i]->nb_streams; j++) {
            sdp_write_media(buff, size,
                                  ac[i]->streams[j]->codec, dst[0] ? dst : NULL,
                                  (port > 0) ? port + j * 2 : 0, ttl);
            if (port <= 0) {
                av_strlcatf(buff, size,
                                   "a=control:streamid=%d\r\n", i + j);
            }
        }
    }

    return 0;
}
#else
int avf_sdp_create(AVFormatContext *ac[], int n_files, char *buff, int size)
{
    return AVERROR(ENOSYS);
}
#endif