Commit a488c070 authored by michael's avatar michael

header repeation


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@10051 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 90fbb956
...@@ -88,6 +88,7 @@ typedef struct { ...@@ -88,6 +88,7 @@ typedef struct {
unsigned int max_distance; unsigned int max_distance;
unsigned int time_base_count; unsigned int time_base_count;
int64_t last_syncpoint_pos; int64_t last_syncpoint_pos;
int header_count;
AVRational *time_base; AVRational *time_base;
struct AVTreeNode *syncpoints; struct AVTreeNode *syncpoints;
} NUTContext; } NUTContext;
......
...@@ -365,6 +365,9 @@ static void write_headers(NUTContext *nut, ByteIOContext *bc){ ...@@ -365,6 +365,9 @@ static void write_headers(NUTContext *nut, ByteIOContext *bc){
url_open_dyn_buf(&dyn_bc); url_open_dyn_buf(&dyn_bc);
write_globalinfo(nut, &dyn_bc); write_globalinfo(nut, &dyn_bc);
put_packet(nut, bc, &dyn_bc, 1, INFO_STARTCODE); put_packet(nut, bc, &dyn_bc, 1, INFO_STARTCODE);
nut->last_syncpoint_pos= INT_MIN;
nut->header_count++;
} }
static int write_header(AVFormatContext *s){ static int write_header(AVFormatContext *s){
...@@ -416,7 +419,7 @@ static int write_header(AVFormatContext *s){ ...@@ -416,7 +419,7 @@ static int write_header(AVFormatContext *s){
put_flush_packet(bc); put_flush_packet(bc);
//FIXME header repeation, index //FIXME index
return 0; return 0;
} }
...@@ -445,6 +448,9 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt){ ...@@ -445,6 +448,9 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt){
int key_frame = !!(pkt->flags & PKT_FLAG_KEY); int key_frame = !!(pkt->flags & PKT_FLAG_KEY);
int store_sp=0; 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)) if(key_frame && !!(nus->last_flags & FLAG_KEY))
store_sp= 1; store_sp= 1;
...@@ -563,7 +569,8 @@ static int write_trailer(AVFormatContext *s){ ...@@ -563,7 +569,8 @@ static int write_trailer(AVFormatContext *s){
NUTContext *nut= s->priv_data; NUTContext *nut= s->priv_data;
ByteIOContext *bc= &s->pb; ByteIOContext *bc= &s->pb;
write_headers(nut, bc); while(nut->header_count<3)
write_headers(nut, bc);
put_flush_packet(bc); put_flush_packet(bc);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment