*/
#include "nut.h"
-
-#define TRACE
+#include "tree.h"
static void build_frame_code(AVFormatContext *s){
NUTContext *nut = s->priv_data;
}
/**
- * stores a string as vb.
+ * Stores a string as vb.
*/
static void put_str(ByteIOContext *bc, const char *string){
int len= strlen(string);
#endif
//FIXME remove calculate_checksum
-static void put_packet(NUTContext *nut, ByteIOContext *bc, ByteIOContext *dyn_bc, int calculate_checksum){
+static void put_packet(NUTContext *nut, ByteIOContext *bc, ByteIOContext *dyn_bc, int calculate_checksum, uint64_t startcode){
uint8_t *dyn_buf=NULL;
int dyn_size= url_close_dyn_buf(dyn_bc, &dyn_buf);
int forw_ptr= dyn_size + 4*calculate_checksum;
if(forw_ptr > 4096)
- init_checksum(bc, av_crc04C11DB7_update, 0); //FIXME this is supposed to include the start code
+ init_checksum(bc, av_crc04C11DB7_update, 0);
+ put_be64(bc, startcode);
put_v(bc, forw_ptr);
if(forw_ptr > 4096)
put_le32(bc, get_checksum(bc));
static void write_mainheader(NUTContext *nut, ByteIOContext *bc){
int i, j, tmp_pts, tmp_flags, tmp_stream, tmp_mul, tmp_size, tmp_fields;
- put_v(bc, 2); /* version */
+ put_v(bc, 3); /* version */
put_v(bc, nut->avf->nb_streams);
put_v(bc, MAX_DISTANCE);
put_v(bc, nut->time_base_count);
case CODEC_TYPE_VIDEO:
put_v(bc, codec->width);
put_v(bc, codec->height);
- put_v(bc, codec->sample_aspect_ratio.num);
- put_v(bc, codec->sample_aspect_ratio.den);
+
+ if(codec->sample_aspect_ratio.num<=0 || codec->sample_aspect_ratio.den<=0){
+ put_v(bc, 0);
+ put_v(bc, 0);
+ }else{
+ put_v(bc, codec->sample_aspect_ratio.num);
+ put_v(bc, codec->sample_aspect_ratio.den);
+ }
put_v(bc, 0); /* csp type -- unknown */
break;
default:
return 0;
}
+static int add_info(ByteIOContext *bc, char *type, char *value){
+ put_str(bc, type);
+ 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;
- put_be64(bc, MAIN_STARTCODE);
url_open_dyn_buf(&dyn_bc);
write_mainheader(nut, &dyn_bc);
- put_packet(nut, bc, &dyn_bc, 1);
+ 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;
- put_be64(bc, STREAM_STARTCODE);
url_open_dyn_buf(&dyn_bc);
write_streamheader(nut, &dyn_bc, codec, i);
- put_packet(nut, bc, &dyn_bc, 1);
+ 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){
put_flush_packet(bc);
- //FIXME info header, header repeation, ...
+ //FIXME index
return 0;
}
if(FFABS(pkt->pts - nus->last_pts)
> nus->max_pts_distance) flags |= FLAG_CHECKSUM;
- return flags;
+ return flags | (fc->flags & FLAG_CODED);
}
static int write_packet(AVFormatContext *s, AVPacket *pkt){
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))
store_sp= 1;
if(pkt->size + 30/*FIXME check*/ + url_ftell(bc) >= nut->last_syncpoint_pos + nut->max_distance)
store_sp= 1;
-//FIXME ensure store_sp is 1 for the first thing
+//FIXME: Ensure store_sp is 1 in the first place.
if(store_sp){
+ syncpoint_t *sp, dummy= {.pos= INT64_MAX};
+
ff_nut_reset_ts(nut, *nus->time_base, pkt->dts);
+ for(i=0; i<s->nb_streams; i++){
+ AVStream *st= s->streams[i];
+ int index= av_index_search_timestamp(st, pkt->dts, AVSEEK_FLAG_BACKWARD);
+ if(index<0) dummy.pos=0;
+ 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);
- put_be64(bc, SYNCPOINT_STARTCODE);
url_open_dyn_buf(&dyn_bc);
put_t(nut, nus, &dyn_bc, pkt->dts);
- put_v(&dyn_bc, 0); //FIXME back_ptr_div16
- put_packet(nut, bc, &dyn_bc, 1);
+ 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);
if(flags & FLAG_CODED){
length++;
- flags &= ~needed_flags;
- flags |= needed_flags;
+ flags = needed_flags;
}
if((flags & needed_flags) != needed_flags)
put_buffer(bc, pkt->data, pkt->size);
nus->last_flags= flags;
+
+ //FIXME just store one per syncpoint
+ if(flags & FLAG_KEY)
+ av_add_index_entry(
+ s->streams[pkt->stream_index],
+ nut->last_syncpoint_pos,
+ pkt->pts,
+ 0,
+ 0,
+ AVINDEX_KEYFRAME);
+
+ 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);
+
return 0;
}
CODEC_ID_MPEG4,
write_header,
write_packet,
-// write_trailer,
+ write_trailer,
.flags = AVFMT_GLOBALHEADER,
.codec_tag= (const AVCodecTag*[]){codec_bmp_tags, codec_wav_tags, 0},
};
projects / ffmpeg / blobdiff