comparison ffmenc.c @ 3440:f9cf53254a61 libavformat

remove ugly ffm_nopts hack, use AVFormatContext->timestamp

3439:0dfc37ba9453

 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

#include "avformat.h"
#include "ffm.h"

/* disable pts hack for testing */
int ffm_nopts = 0;

static void flush_packet(AVFormatContext *s)
{
    FFMContext *ffm = s->priv_data;
    int fill_size, h;

        default:
            return -1;
        }
    }

    /* hack to have real time */
    if (ffm_nopts)
        ffm->start_time = 0;
    else
        ffm->start_time = av_gettime();

    /* flush until end of block reached */
    while ((url_ftell(pb) % ffm->packet_size) != 0)
        put_byte(pb, 0);

    put_flush_packet(pb);

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

    pts = ffm->start_time + 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;

3440:f9cf53254a61

 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

#include "avformat.h"
#include "ffm.h"

static void flush_packet(AVFormatContext *s)
{
    FFMContext *ffm = s->priv_data;
    int fill_size, h;

        default:
            return -1;
        }
    }

    /* flush until end of block reached */
    while ((url_ftell(pb) % ffm->packet_size) != 0)
        put_byte(pb, 0);

    put_flush_packet(pb);

    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;