comparison rtsp.c @ 5843:777a89fdb1c0 libavformat

RTSP: Synchronize the start time of the chained RTP muxers This makes sure that the streams get correctly synchronized when viewed, previously the streams were out of sync by as much time as it took between the initialization of the individual muxers.

5842:cc35562d3747

}

static void *rtsp_rtp_mux_open(AVFormatContext *s, AVStream *st,
                               URLContext *handle)
{
    AVFormatContext *rtpctx;
    int ret;
    AVOutputFormat *rtp_format = av_guess_format("rtp", NULL, NULL);

    if (!rtp_format)

    }
    /* Copy the max delay setting; the rtp muxer reads this. */
    rtpctx->max_delay = s->max_delay;
    /* Copy other stream parameters. */
    rtpctx->streams[0]->sample_aspect_ratio = st->sample_aspect_ratio;

    /* Remove the local codec, link to the original codec
     * context instead, to give the rtp muxer access to
     * codec parameters. */
    av_free(rtpctx->streams[0]->codec);

    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);

5843:777a89fdb1c0

}

static void *rtsp_rtp_mux_open(AVFormatContext *s, AVStream *st,
                               URLContext *handle)
{
    RTSPState *rt = s->priv_data;
    AVFormatContext *rtpctx;
    int ret;
    AVOutputFormat *rtp_format = av_guess_format("rtp", NULL, NULL);

    if (!rtp_format)

    }
    /* Copy the max delay setting; the rtp muxer reads this. */
    rtpctx->max_delay = s->max_delay;
    /* Copy other stream parameters. */
    rtpctx->streams[0]->sample_aspect_ratio = st->sample_aspect_ratio;

    /* Set the synchronized start time. */
    rtpctx->start_time_realtime = rt->start_time;

    /* Remove the local codec, link to the original codec
     * context instead, to give the rtp muxer access to
     * codec parameters. */
    av_free(rtpctx->streams[0]->codec);

    char cmd[1024];
    int i;
    char *sdp;
    AVFormatContext sdp_ctx, *ctx_array[1];

    rt->start_time = av_gettime();

    /* Announce the stream */
    snprintf(cmd, sizeof(cmd),
             "ANNOUNCE %s RTSP/1.0\r\n"
             "Content-Type: application/sdp\r\n",
             rt->control_uri);