comparison ffmenc.c @ 3442:a6f4d53b738d libavformat

pass dts and pts through ffm, should fix streaming b frames

3441:2d52ccde8f86

{
    FFMContext *ffm = s->priv_data;
    AVStream *st = s->streams[pkt->stream_index];
    int64_t pts;
    uint8_t header[FRAME_HEADER_SIZE];

    pts = s->timestamp + pkt->pts;
    /* packet size & key_frame */
    header[0] = pkt->stream_index;
    header[1] = 0;
    if (pkt->flags & PKT_FLAG_KEY)
        header[1] |= FLAG_KEY_FRAME;
    AV_WB24(header+2, pkt->size);
    AV_WB24(header+5, pkt->duration);
    ffm_write_data(s, header, FRAME_HEADER_SIZE, pts, 1);
    ffm_write_data(s, pkt->data, pkt->size, pts, 0);

    return 0;
}

3442:a6f4d53b738d

{
    FFMContext *ffm = s->priv_data;
    AVStream *st = s->streams[pkt->stream_index];
    int64_t pts;
    uint8_t header[FRAME_HEADER_SIZE];
    int header_size = FRAME_HEADER_SIZE;

    pts = s->timestamp + pkt->pts;
    /* packet size & key_frame */
    header[0] = pkt->stream_index;
    header[1] = 0;
    if (pkt->flags & PKT_FLAG_KEY)
        header[1] |= FLAG_KEY_FRAME;
    AV_WB24(header+2, pkt->size);
    AV_WB24(header+5, pkt->duration);
    AV_WB64(header+8, pts);
    if (pkt->pts != pkt->dts) {
        header[1] |= FLAG_DTS;
        AV_WB32(header+16, pkt->pts - pkt->dts);
        header_size += 4;
    }
    ffm_write_data(s, header, header_size, pts, 1);
    ffm_write_data(s, pkt->data, pkt->size, pts, 0);

    return 0;
}