comparison nutenc.c @ 2771:d52c718e83f9 libavformat

Use dynamically allocated ByteIOContext in AVFormatContext patch by: Bj�«Órn Axelsson, bjorn d axelsson a intinor d se thread: [PATCH] Remove static ByteIOContexts, 06 nov 2007

2770:a7e42cf4b364

    put_s(bc, -1);
    put_str(bc, value);
    return 1;
}

static void write_globalinfo(NUTContext *nut, ByteIOContext *bc){
    AVFormatContext *s= nut->avf;
    ByteIOContext dyn_bc;
    uint8_t *dyn_buf=NULL;
    int count=0, dyn_size;

    url_open_dyn_buf(&dyn_bc);

    if(s->title    [0]) count+= add_info(&dyn_bc, "Title"    , s->title);
    if(s->author   [0]) count+= add_info(&dyn_bc, "Author"   , s->author);
    if(s->copyright[0]) count+= add_info(&dyn_bc, "Copyright", s->copyright);
    if(!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT))
                        count+= add_info(&dyn_bc, "Encoder"  , LIBAVFORMAT_IDENT);

    put_v(bc, 0); //stream_if_plus1
    put_v(bc, 0); //chapter_id
    put_v(bc, 0); //timestamp_start
    put_v(bc, 0); //length

    put_v(bc, count);

    dyn_size= url_close_dyn_buf(&dyn_bc, &dyn_buf);
    put_buffer(bc, dyn_buf, dyn_size);
    av_free(dyn_buf);
}

static void write_headers(NUTContext *nut, ByteIOContext *bc){
    ByteIOContext dyn_bc;
    int i;

    url_open_dyn_buf(&dyn_bc);
    write_mainheader(nut, &dyn_bc);
    put_packet(nut, bc, &dyn_bc, 1, MAIN_STARTCODE);

    for (i=0; i < nut->avf->nb_streams; i++){
        AVCodecContext *codec = nut->avf->streams[i]->codec;

        url_open_dyn_buf(&dyn_bc);
        write_streamheader(nut, &dyn_bc, codec, i);
        put_packet(nut, bc, &dyn_bc, 1, STREAM_STARTCODE);
    }

    url_open_dyn_buf(&dyn_bc);
    write_globalinfo(nut, &dyn_bc);
    put_packet(nut, bc, &dyn_bc, 1, INFO_STARTCODE);

    nut->last_syncpoint_pos= INT_MIN;
    nut->header_count++;
}

static int write_header(AVFormatContext *s){
    NUTContext *nut = s->priv_data;
    ByteIOContext *bc = &s->pb;
    int i, j;

    nut->avf= s;

    nut->stream   = av_mallocz(sizeof(StreamContext)*s->nb_streams);

}

static int write_packet(AVFormatContext *s, AVPacket *pkt){
    NUTContext *nut = s->priv_data;
    StreamContext *nus= &nut->stream[pkt->stream_index];
    ByteIOContext *bc = &s->pb, dyn_bc;
    FrameCode *fc;
    int64_t coded_pts;
    int best_length, frame_code, flags, needed_flags, i;
    int key_frame = !!(pkt->flags & PKT_FLAG_KEY);
    int store_sp=0;

    if(1LL<<(20+3*nut->header_count) <= url_ftell(bc))
        write_headers(nut, bc);

    if(key_frame && !!(nus->last_flags & FLAG_KEY))

            else        dummy.pos= FFMIN(dummy.pos, st->index_entries[index].pos);
        }
        sp= av_tree_find(nut->syncpoints, &dummy, ff_nut_sp_pos_cmp, NULL);

        nut->last_syncpoint_pos= url_ftell(bc);
        url_open_dyn_buf(&dyn_bc);
        put_t(nut, nus, &dyn_bc, pkt->dts);
        put_v(&dyn_bc, sp ? (nut->last_syncpoint_pos - sp->pos)>>4 : 0);
        put_packet(nut, bc, &dyn_bc, 1, SYNCPOINT_STARTCODE);

        ff_nut_add_sp(nut, nut->last_syncpoint_pos, 0/*unused*/, pkt->dts);
    }
    assert(nus->last_pts != AV_NOPTS_VALUE);

    return 0;
}

static int write_trailer(AVFormatContext *s){
    NUTContext *nut= s->priv_data;
    ByteIOContext *bc= &s->pb;

    while(nut->header_count<3)
        write_headers(nut, bc);
    put_flush_packet(bc);

2771:d52c718e83f9

    put_s(bc, -1);
    put_str(bc, value);
    return 1;
}

static int write_globalinfo(NUTContext *nut, ByteIOContext *bc){
    AVFormatContext *s= nut->avf;
    ByteIOContext *dyn_bc;
    uint8_t *dyn_buf=NULL;
    int count=0, dyn_size;
    int ret = url_open_dyn_buf(&dyn_bc);
    if(ret < 0)
        return ret;

    if(s->title    [0]) count+= add_info(dyn_bc, "Title"    , s->title);
    if(s->author   [0]) count+= add_info(dyn_bc, "Author"   , s->author);
    if(s->copyright[0]) count+= add_info(dyn_bc, "Copyright", s->copyright);
    if(!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT))
                        count+= add_info(dyn_bc, "Encoder"  , LIBAVFORMAT_IDENT);

    put_v(bc, 0); //stream_if_plus1
    put_v(bc, 0); //chapter_id
    put_v(bc, 0); //timestamp_start
    put_v(bc, 0); //length

    put_v(bc, count);

    dyn_size= url_close_dyn_buf(dyn_bc, &dyn_buf);
    put_buffer(bc, dyn_buf, dyn_size);
    av_free(dyn_buf);
    return 0;
}

static int write_headers(NUTContext *nut, ByteIOContext *bc){
    ByteIOContext *dyn_bc;
    int i, ret;

    ret = url_open_dyn_buf(&dyn_bc);
    if(ret < 0)
        return ret;
    write_mainheader(nut, dyn_bc);
    put_packet(nut, bc, dyn_bc, 1, MAIN_STARTCODE);

    for (i=0; i < nut->avf->nb_streams; i++){
        AVCodecContext *codec = nut->avf->streams[i]->codec;

        ret = url_open_dyn_buf(&dyn_bc);
        if(ret < 0)
            return ret;
        write_streamheader(nut, dyn_bc, codec, i);
        put_packet(nut, bc, dyn_bc, 1, STREAM_STARTCODE);
    }

    ret = url_open_dyn_buf(&dyn_bc);
    if(ret < 0)
        return ret;
    write_globalinfo(nut, dyn_bc);
    put_packet(nut, bc, dyn_bc, 1, INFO_STARTCODE);

    nut->last_syncpoint_pos= INT_MIN;
    nut->header_count++;
    return 0;
}

static int write_header(AVFormatContext *s){
    NUTContext *nut = s->priv_data;
    ByteIOContext *bc = s->pb;
    int i, j;

    nut->avf= s;

    nut->stream   = av_mallocz(sizeof(StreamContext)*s->nb_streams);

}

static int write_packet(AVFormatContext *s, AVPacket *pkt){
    NUTContext *nut = s->priv_data;
    StreamContext *nus= &nut->stream[pkt->stream_index];
    ByteIOContext *bc = s->pb, *dyn_bc;
    FrameCode *fc;
    int64_t coded_pts;
    int best_length, frame_code, flags, needed_flags, i;
    int key_frame = !!(pkt->flags & PKT_FLAG_KEY);
    int store_sp=0;
    int ret;

    if(1LL<<(20+3*nut->header_count) <= url_ftell(bc))
        write_headers(nut, bc);

    if(key_frame && !!(nus->last_flags & FLAG_KEY))

            else        dummy.pos= FFMIN(dummy.pos, st->index_entries[index].pos);
        }
        sp= av_tree_find(nut->syncpoints, &dummy, ff_nut_sp_pos_cmp, NULL);

        nut->last_syncpoint_pos= url_ftell(bc);
        ret = url_open_dyn_buf(&dyn_bc);
        if(ret < 0)
            return ret;
        put_t(nut, nus, dyn_bc, pkt->dts);
        put_v(dyn_bc, sp ? (nut->last_syncpoint_pos - sp->pos)>>4 : 0);
        put_packet(nut, bc, dyn_bc, 1, SYNCPOINT_STARTCODE);

        ff_nut_add_sp(nut, nut->last_syncpoint_pos, 0/*unused*/, pkt->dts);
    }
    assert(nus->last_pts != AV_NOPTS_VALUE);

    return 0;
}

static int write_trailer(AVFormatContext *s){
    NUTContext *nut= s->priv_data;
    ByteIOContext *bc= s->pb;

    while(nut->header_count<3)
        write_headers(nut, bc);
    put_flush_packet(bc);