*/
#include "nut.h"
-
-#define TRACE
+#include "tree.h"
static void build_frame_code(AVFormatContext *s){
NUTContext *nut = s->priv_data;
int end= 254;
int keyframe_0_esc= s->nb_streams > 2;
int pred_table[10];
+ FrameCode *ft;
+
+ ft= &nut->frame_code[start];
+ ft->flags= FLAG_CODED;
+ ft->size_mul=1;
+ ft->pts_delta=1;
+ start++;
if(keyframe_0_esc){
/* keyframe = 0 escape */
put_byte(bc, val&127);
}
+static void put_t(NUTContext *nut, StreamContext *nus, ByteIOContext *bc, uint64_t val){
+ val *= nut->time_base_count;
+ val += nus->time_base - nut->time_base;
+ put_v(bc, val);
+}
+
/**
- * stores a string as vb.
+ * Stores a string as vb.
*/
static void put_str(ByteIOContext *bc, const char *string){
int len= strlen(string);
#ifdef TRACE
static inline void put_v_trace(ByteIOContext *bc, uint64_t v, char *file, char *func, int line){
- printf("get_v %5"PRId64" / %"PRIX64" in %s %s:%d\n", v, v, file, func, line);
+ av_log(NULL, AV_LOG_DEBUG, "put_v %5"PRId64" / %"PRIX64" in %s %s:%d\n", v, v, file, func, line);
put_v(bc, v);
}
static inline void put_s_trace(ByteIOContext *bc, int64_t v, char *file, char *func, int line){
- printf("get_s %5"PRId64" / %"PRIX64" in %s %s:%d\n", v, v, file, func, line);
+ av_log(NULL, AV_LOG_DEBUG, "put_s %5"PRId64" / %"PRIX64" in %s %s:%d\n", v, v, file, func, line);
put_s(bc, v);
}
#define put_s(bc, v) put_s_trace(bc, v, __FILE__, __PRETTY_FUNCTION__, __LINE__)
#endif
-static int put_packetheader(NUTContext *nut, ByteIOContext *bc, int max_size, int calculate_checksum){
- put_flush_packet(bc);
- nut->packet_start= url_ftell(bc) - 8;
- nut->written_packet_size = max_size;
+//FIXME remove 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;
- /* packet header */
- put_v(bc, nut->written_packet_size); /* forward ptr */
+ if(forw_ptr > 4096)
+ 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));
if(calculate_checksum)
init_checksum(bc, av_crc04C11DB7_update, 0);
-
- return 0;
-}
-
-/**
- *
- * must not be called more then once per packet
- */
-static int update_packetheader(NUTContext *nut, ByteIOContext *bc, int additional_size, int calculate_checksum){
- int64_t start= nut->packet_start;
- int64_t cur= url_ftell(bc);
- int size= cur - start - get_length(nut->written_packet_size) - 8;
-
+ put_buffer(bc, dyn_buf, dyn_size);
if(calculate_checksum)
- size += 4;
-
- if(size != nut->written_packet_size){
- int i;
-
- assert( size <= nut->written_packet_size );
-
- url_fseek(bc, start + 8, SEEK_SET);
- for(i=get_length(size); i < get_length(nut->written_packet_size); i++)
- put_byte(bc, 128);
- put_v(bc, size);
-
- url_fseek(bc, cur, SEEK_SET);
- nut->written_packet_size= size; //FIXME may fail if multiple updates with differing sizes, as get_length may differ
+ put_le32(bc, get_checksum(bc));
- if(calculate_checksum)
- put_le32(bc, get_checksum(bc));
- }
-
- return 0;
+ av_free(dyn_buf);
}
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);
}else
return -1;
- put_v(bc, (nut->stream[i].time_base - nut->time_base)/sizeof(AVRational));
+ put_v(bc, nut->stream[i].time_base - nut->time_base);
put_v(bc, nut->stream[i].msb_pts_shift);
put_v(bc, nut->stream[i].max_pts_distance);
put_v(bc, codec->has_b_frames);
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;
+
+ 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;
- AVCodecContext *codec;
int i, j;
nut->avf= s;
put_buffer(bc, ID_STRING, strlen(ID_STRING));
put_byte(bc, 0);
- /* main header */
- put_be64(bc, MAIN_STARTCODE);
- put_packetheader(nut, bc, 120+5*256/*FIXME check*/, 1);
- write_mainheader(nut, bc);
- update_packetheader(nut, bc, 0, 1);
+ write_headers(nut, bc);
+
+ put_flush_packet(bc);
+
+ //FIXME index
- for (i=0; i < s->nb_streams; i++){
- codec = s->streams[i]->codec;
+ return 0;
+}
+
+static int get_needed_flags(NUTContext *nut, StreamContext *nus, FrameCode *fc, AVPacket *pkt){
+ int flags= 0;
- put_be64(bc, STREAM_STARTCODE);
- put_packetheader(nut, bc, 120/*FIXME check*/ + codec->extradata_size, 1);
- write_streamheader(nut, bc, codec, i);
- update_packetheader(nut, bc, 0, 1);
+ if(pkt->flags & PKT_FLAG_KEY ) flags |= FLAG_KEY;
+ if(pkt->stream_index != fc->stream_id ) flags |= FLAG_STREAM_ID;
+ if(pkt->size / fc->size_mul ) flags |= FLAG_SIZE_MSB;
+ if(pkt->pts - nus->last_pts != fc->pts_delta) flags |= FLAG_CODED_PTS;
+ if(pkt->size > 2*nut->max_distance ) flags |= FLAG_CHECKSUM;
+ if(FFABS(pkt->pts - nus->last_pts)
+ > nus->max_pts_distance) flags |= FLAG_CHECKSUM;
+
+ return flags | (fc->flags & FLAG_CODED);
+}
+
+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))
+ 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 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);
+ 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);
+
+ coded_pts = pkt->pts & ((1<<nus->msb_pts_shift)-1);
+ if(ff_lsb2full(nus, coded_pts) != pkt->pts)
+ coded_pts= pkt->pts + (1<<nus->msb_pts_shift);
+
+ best_length=INT_MAX;
+ frame_code= -1;
+ for(i=0; i<256; i++){
+ int length= 0;
+ FrameCode *fc= &nut->frame_code[i];
+ int flags= fc->flags;
+
+ if(flags & FLAG_INVALID)
+ continue;
+ needed_flags= get_needed_flags(nut, nus, fc, pkt);
+
+ if(flags & FLAG_CODED){
+ length++;
+ flags = needed_flags;
+ }
- put_flush_packet(bc);
+ if((flags & needed_flags) != needed_flags)
+ continue;
+
+ if((flags ^ needed_flags) & FLAG_KEY)
+ continue;
+
+ if(flags & FLAG_STREAM_ID)
+ length+= get_length(pkt->stream_index);
+
+ if(pkt->size % fc->size_mul != fc->size_lsb)
+ continue;
+ if(flags & FLAG_SIZE_MSB)
+ length += get_length(pkt->size / fc->size_mul);
+
+ if(flags & FLAG_CHECKSUM)
+ length+=4;
+
+ if(flags & FLAG_CODED_PTS)
+ length += get_length(coded_pts);
- //FIXME info header, header repeation, header packet CRC, ...
+ length*=4;
+ length+= !(flags & FLAG_CODED_PTS);
+ length+= !(flags & FLAG_CHECKSUM);
+
+ if(length < best_length){
+ best_length= length;
+ frame_code=i;
+ }
+ }
+ assert(frame_code != -1);
+ fc= &nut->frame_code[frame_code];
+ flags= fc->flags;
+ needed_flags= get_needed_flags(nut, nus, fc, pkt);
+
+ init_checksum(bc, av_crc04C11DB7_update, 0);
+ put_byte(bc, frame_code);
+ if(flags & FLAG_CODED){
+ put_v(bc, (flags^needed_flags) & ~(FLAG_CODED));
+ flags = needed_flags;
+ }
+ if(flags & FLAG_STREAM_ID) put_v(bc, pkt->stream_index);
+ if(flags & FLAG_CODED_PTS) put_v(bc, coded_pts);
+ if(flags & FLAG_SIZE_MSB) put_v(bc, pkt->size / fc->size_mul);
+
+ if(flags & FLAG_CHECKSUM) put_le32(bc, get_checksum(bc));
+ else get_checksum(bc);
+
+ 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_packet(AVFormatContext *s, AVPacket *pkt){
- //FIXME
+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