comparison flvenc.c @ 468:60f897e8dd2d libavformat

pass AVPacket into av_write_frame() fixes the random dts/pts during encoding asf preroll fix no more initial zero frames for b frame encoding mpeg-es dts during demuxing fixed .ffm timestamp scale fixed, ffm is still broken though

467:40069a91d1a0

    put_byte(pb,flags);
    url_fseek(pb, file_size, SEEK_SET);
    return 0;
}

static int flv_write_packet(AVFormatContext *s, int stream_index,
                            const uint8_t *buf, int size, int64_t timestamp)
{
    ByteIOContext *pb = &s->pb;
    AVCodecContext *enc = &s->streams[stream_index]->codec;
    FLVContext *flv = s->priv_data;
    FLVFrame *frame = av_malloc(sizeof(FLVFrame));

    frame->next = 0;
    frame->size = size;
    frame->data = av_malloc(size);
    frame->timestamp = timestamp;
    frame->reserved= flv->reserved;
    memcpy(frame->data,buf,size);
    
//    av_log(s, AV_LOG_DEBUG, "type:%d pts: %lld size:%d\n", enc->codec_type, timestamp, size);
    
    if (enc->codec_type == CODEC_TYPE_VIDEO) {
        frame->type = 9;
        frame->flags = 2; // choose h263
        frame->flags |= enc->coded_frame->key_frame ? 0x10 : 0x20; // add keyframe indicator
        //frame->timestamp = ( ( flv->frameCount * (int64_t)FRAME_RATE_BASE * (int64_t)1000 ) / (int64_t)enc->frame_rate );
        //printf("%08x %f %f\n",frame->timestamp,(double)enc->frame_rate/(double)FRAME_RATE_BASE,1000*(double)FRAME_RATE_BASE/(double)enc->frame_rate);
        flv->hasVideo = 1;

        InsertSorted(flv,frame);

            assert(0);
        }

        assert(size);
        if ( flv->initDelay == -1 ) {
            flv->initDelay = timestamp;
        }

        frame->type = 8;
        frame->flags = soundFormat;

468:60f897e8dd2d

    put_byte(pb,flags);
    url_fseek(pb, file_size, SEEK_SET);
    return 0;
}

static int flv_write_packet(AVFormatContext *s, AVPacket *pkt)
{
    ByteIOContext *pb = &s->pb;
    AVCodecContext *enc = &s->streams[pkt->stream_index]->codec;
    FLVContext *flv = s->priv_data;
    FLVFrame *frame = av_malloc(sizeof(FLVFrame));
    int size= pkt->size;
    uint8_t *buf= pkt->data;

    frame->next = 0;
    frame->size = size;
    frame->data = av_malloc(size);
    frame->timestamp = pkt->pts;
    frame->reserved= flv->reserved;
    memcpy(frame->data,buf,size);
    
//    av_log(s, AV_LOG_DEBUG, "type:%d pts: %lld size:%d\n", enc->codec_type, timestamp, size);
    
    if (enc->codec_type == CODEC_TYPE_VIDEO) {
        frame->type = 9;
        frame->flags = 2; // choose h263
        frame->flags |= pkt->flags & PKT_FLAG_KEY ? 0x10 : 0x20; // add keyframe indicator
        //frame->timestamp = ( ( flv->frameCount * (int64_t)FRAME_RATE_BASE * (int64_t)1000 ) / (int64_t)enc->frame_rate );
        //printf("%08x %f %f\n",frame->timestamp,(double)enc->frame_rate/(double)FRAME_RATE_BASE,1000*(double)FRAME_RATE_BASE/(double)enc->frame_rate);
        flv->hasVideo = 1;

        InsertSorted(flv,frame);

            assert(0);
        }

        assert(size);
        if ( flv->initDelay == -1 ) {
            flv->initDelay = pkt->pts;
        }

        frame->type = 8;
        frame->flags = soundFormat;