#include "libavcodec/mpegaudiodata.h"
#include "nut.h"
#include "internal.h"
+#include "avio_internal.h"
static int find_expected_header(AVCodecContext *c, int size, int key_frame, uint8_t out[64]){
int sample_rate= c->sample_rate;
nut->frame_code['N'].flags= FLAG_INVALID;
}
-static void put_tt(NUTContext *nut, StreamContext *nus, AVIOContext *bc, uint64_t val){
+static void put_tt(NUTContext *nut, AVRational *time_base, AVIOContext *bc, uint64_t val){
val *= nut->time_base_count;
- val += nus->time_base - nut->time_base;
+ val += time_base - nut->time_base;
ff_put_v(bc, val);
}
int len= strlen(string);
ff_put_v(bc, len);
- put_buffer(bc, string, len);
+ avio_write(bc, string, len);
}
static void put_s(AVIOContext *bc, int64_t val){
//FIXME remove calculate_checksum
static void put_packet(NUTContext *nut, AVIOContext *bc, AVIOContext *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 dyn_size= avio_close_dyn_buf(dyn_bc, &dyn_buf);
int forw_ptr= dyn_size + 4*calculate_checksum;
if(forw_ptr > 4096)
- init_checksum(bc, ff_crc04C11DB7_update, 0);
- put_be64(bc, startcode);
+ ffio_init_checksum(bc, ff_crc04C11DB7_update, 0);
+ avio_wb64(bc, startcode);
ff_put_v(bc, forw_ptr);
if(forw_ptr > 4096)
- put_le32(bc, get_checksum(bc));
+ avio_wl32(bc, ffio_get_checksum(bc));
if(calculate_checksum)
- init_checksum(bc, ff_crc04C11DB7_update, 0);
- put_buffer(bc, dyn_buf, dyn_size);
+ ffio_init_checksum(bc, ff_crc04C11DB7_update, 0);
+ avio_write(bc, dyn_buf, dyn_size);
if(calculate_checksum)
- put_le32(bc, get_checksum(bc));
+ avio_wl32(bc, ffio_get_checksum(bc));
av_free(dyn_buf);
}
ff_put_v(bc, nut->header_count-1);
for(i=1; i<nut->header_count; i++){
ff_put_v(bc, nut->header_len[i]);
- put_buffer(bc, nut->header[i], nut->header_len[i]);
+ avio_write(bc, nut->header[i], nut->header_len[i]);
}
}
}
ff_put_v(bc, 4);
if (codec->codec_tag){
- put_le32(bc, codec->codec_tag);
+ avio_wl32(bc, codec->codec_tag);
} else {
av_log(avctx, AV_LOG_ERROR, "No codec tag defined for stream %d\n", i);
return AVERROR(EINVAL);
ff_put_v(bc, nut->stream[i].msb_pts_shift);
ff_put_v(bc, nut->stream[i].max_pts_distance);
ff_put_v(bc, codec->has_b_frames);
- put_byte(bc, 0); /* flags: 0x1 - fixed_fps, 0x2 - index_present */
+ avio_w8(bc, 0); /* flags: 0x1 - fixed_fps, 0x2 - index_present */
ff_put_v(bc, codec->extradata_size);
- put_buffer(bc, codec->extradata, codec->extradata_size);
+ avio_write(bc, codec->extradata, codec->extradata_size);
switch(codec->codec_type){
case AVMEDIA_TYPE_AUDIO:
AVIOContext *dyn_bc;
uint8_t *dyn_buf=NULL;
int count=0, dyn_size;
- int ret = url_open_dyn_buf(&dyn_bc);
+ int ret = avio_open_dyn_buf(&dyn_bc);
if(ret < 0)
return ret;
ff_put_v(bc, count);
- dyn_size= url_close_dyn_buf(dyn_bc, &dyn_buf);
- put_buffer(bc, dyn_buf, dyn_size);
+ dyn_size= avio_close_dyn_buf(dyn_bc, &dyn_buf);
+ avio_write(bc, dyn_buf, dyn_size);
av_free(dyn_buf);
return 0;
}
AVIOContext *dyn_bc;
uint8_t *dyn_buf=NULL;
int count=0, dyn_size, i;
- int ret = url_open_dyn_buf(&dyn_bc);
+ int ret = avio_open_dyn_buf(&dyn_bc);
if(ret < 0)
return ret;
if (st->disposition & ff_nut_dispositions[i].flag)
count += add_info(dyn_bc, "Disposition", ff_nut_dispositions[i].str);
}
- dyn_size = url_close_dyn_buf(dyn_bc, &dyn_buf);
+ dyn_size = avio_close_dyn_buf(dyn_bc, &dyn_buf);
if (count) {
ff_put_v(bc, stream_id + 1); //stream_id_plus1
ff_put_v(bc, count);
- put_buffer(bc, dyn_buf, dyn_size);
+ avio_write(bc, dyn_buf, dyn_size);
}
av_free(dyn_buf);
return count;
}
+static int write_chapter(NUTContext *nut, AVIOContext *bc, int id)
+{
+ AVIOContext *dyn_bc;
+ uint8_t *dyn_buf = NULL;
+ AVMetadataTag *t = NULL;
+ AVChapter *ch = nut->avf->chapters[id];
+ int ret, dyn_size, count = 0;
+
+ ret = avio_open_dyn_buf(&dyn_bc);
+ if (ret < 0)
+ return ret;
+
+ ff_put_v(bc, 0); // stream_id_plus1
+ put_s(bc, id + 1); // chapter_id
+ put_tt(nut, nut->chapter[id].time_base, bc, ch->start); // chapter_start
+ ff_put_v(bc, ch->end - ch->start); // chapter_len
+
+ while ((t = av_metadata_get(ch->metadata, "", t, AV_METADATA_IGNORE_SUFFIX)))
+ count += add_info(dyn_bc, t->key, t->value);
+
+ ff_put_v(bc, count);
+
+ dyn_size = avio_close_dyn_buf(dyn_bc, &dyn_buf);
+ avio_write(bc, dyn_buf, dyn_size);
+ av_freep(&dyn_buf);
+ return 0;
+}
+
static int write_headers(AVFormatContext *avctx, AVIOContext *bc){
NUTContext *nut = avctx->priv_data;
AVIOContext *dyn_bc;
ff_metadata_conv_ctx(avctx, ff_nut_metadata_conv, NULL);
- ret = url_open_dyn_buf(&dyn_bc);
+ ret = avio_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++){
- ret = url_open_dyn_buf(&dyn_bc);
+ ret = avio_open_dyn_buf(&dyn_bc);
if(ret < 0)
return ret;
if ((ret = write_streamheader(avctx, dyn_bc, nut->avf->streams[i], i)) < 0)
put_packet(nut, bc, dyn_bc, 1, STREAM_STARTCODE);
}
- ret = url_open_dyn_buf(&dyn_bc);
+ ret = avio_open_dyn_buf(&dyn_bc);
if(ret < 0)
return ret;
write_globalinfo(nut, dyn_bc);
put_packet(nut, bc, dyn_bc, 1, INFO_STARTCODE);
for (i = 0; i < nut->avf->nb_streams; i++) {
- ret = url_open_dyn_buf(&dyn_bc);
+ ret = avio_open_dyn_buf(&dyn_bc);
if(ret < 0)
return ret;
ret = write_streaminfo(nut, dyn_bc, i);
put_packet(nut, bc, dyn_bc, 1, INFO_STARTCODE);
else {
uint8_t* buf;
- url_close_dyn_buf(dyn_bc, &buf);
+ avio_close_dyn_buf(dyn_bc, &buf);
av_free(buf);
}
}
+ for (i = 0; i < nut->avf->nb_chapters; i++) {
+ ret = avio_open_dyn_buf(&dyn_bc);
+ if (ret < 0)
+ return ret;
+ ret = write_chapter(nut, dyn_bc, i);
+ if (ret < 0) {
+ uint8_t *buf;
+ avio_close_dyn_buf(dyn_bc, &buf);
+ av_freep(&buf);
+ return ret;
+ }
+ put_packet(nut, bc, dyn_bc, 1, INFO_STARTCODE);
+ }
+
nut->last_syncpoint_pos= INT_MIN;
nut->header_count++;
return 0;
nut->avf= s;
nut->stream = av_mallocz(sizeof(StreamContext)*s->nb_streams);
- nut->time_base= av_mallocz(sizeof(AVRational )*s->nb_streams);
+ nut->chapter = av_mallocz(sizeof(ChapterContext)*s->nb_chapters);
+ nut->time_base= av_mallocz(sizeof(AVRational )*(s->nb_streams +
+ s->nb_chapters));
for(i=0; i<s->nb_streams; i++){
AVStream *st= s->streams[i];
nut->stream[i].max_pts_distance= FFMAX(time_base.den, time_base.num) / time_base.num;
}
+ for (i = 0; i < s->nb_chapters; i++) {
+ AVChapter *ch = s->chapters[i];
+
+ for (j = 0; j < nut->time_base_count; j++) {
+ if (!memcmp(&ch->time_base, &nut->time_base[j], sizeof(AVRational)))
+ break;
+ }
+
+ nut->time_base[j] = ch->time_base;
+ nut->chapter[i].time_base = &nut->time_base[j];
+ if(j == nut->time_base_count)
+ nut->time_base_count++;
+ }
+
nut->max_distance = MAX_DISTANCE;
build_elision_headers(s);
build_frame_code(s);
assert(nut->frame_code['N'].flags == FLAG_INVALID);
- put_buffer(bc, ID_STRING, strlen(ID_STRING));
- put_byte(bc, 0);
+ avio_write(bc, ID_STRING, strlen(ID_STRING));
+ avio_w8(bc, 0);
if ((ret = write_headers(s, bc)) < 0)
return ret;
- put_flush_packet(bc);
+ avio_flush(bc);
//FIXME index
if(pkt->pts < 0)
return -1;
- if(1LL<<(20+3*nut->header_count) <= url_ftell(bc))
+ if(1LL<<(20+3*nut->header_count) <= avio_tell(bc))
write_headers(s, 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)
+ if(pkt->size + 30/*FIXME check*/ + avio_tell(bc) >= nut->last_syncpoint_pos + nut->max_distance)
store_sp= 1;
//FIXME: Ensure store_sp is 1 in the first place.
sp= av_tree_find(nut->syncpoints, &dummy, (void *) ff_nut_sp_pos_cmp,
NULL);
- nut->last_syncpoint_pos= url_ftell(bc);
- ret = url_open_dyn_buf(&dyn_bc);
+ nut->last_syncpoint_pos= avio_tell(bc);
+ ret = avio_open_dyn_buf(&dyn_bc);
if(ret < 0)
return ret;
- put_tt(nut, nus, dyn_bc, pkt->dts);
+ put_tt(nut, nus->time_base, dyn_bc, pkt->dts);
ff_put_v(dyn_bc, sp ? (nut->last_syncpoint_pos - sp->pos)>>4 : 0);
put_packet(nut, bc, dyn_bc, 1, SYNCPOINT_STARTCODE);
needed_flags= get_needed_flags(nut, nus, fc, pkt);
header_idx= fc->header_idx;
- init_checksum(bc, ff_crc04C11DB7_update, 0);
- put_byte(bc, frame_code);
+ ffio_init_checksum(bc, ff_crc04C11DB7_update, 0);
+ avio_w8(bc, frame_code);
if(flags & FLAG_CODED){
ff_put_v(bc, (flags^needed_flags) & ~(FLAG_CODED));
flags = needed_flags;
if(flags & FLAG_SIZE_MSB) ff_put_v(bc, pkt->size / fc->size_mul);
if(flags & FLAG_HEADER_IDX) ff_put_v(bc, header_idx= best_header_idx);
- if(flags & FLAG_CHECKSUM) put_le32(bc, get_checksum(bc));
- else get_checksum(bc);
+ if(flags & FLAG_CHECKSUM) avio_wl32(bc, ffio_get_checksum(bc));
+ else ffio_get_checksum(bc);
- put_buffer(bc, pkt->data + nut->header_len[header_idx], pkt->size - nut->header_len[header_idx]);
+ avio_write(bc, pkt->data + nut->header_len[header_idx], pkt->size - nut->header_len[header_idx]);
nus->last_flags= flags;
nus->last_pts= pkt->pts;
while(nut->header_count<3)
write_headers(s, bc);
- put_flush_packet(bc);
+ avio_flush(bc);
ff_nut_free_sp(nut);
av_freep(&nut->stream);
+ av_freep(&nut->chapter);
av_freep(&nut->time_base);
return 0;