March 2006 - NUT-devel - lists.mplayerhq.hu

[NUT] (ods15): r90 - /trunk/libnut/muxer.c
by syncmail＠mplayerhq.hu 11 Mar '06

11 Mar '06

Author: ods15 Date: Sat Mar 11 11:05:42 2006 New Revision: 90 Log: cosmetic, move around functions sync to spec, max_distance not higher than 65536 Modified: trunk/libnut/muxer.c Modified: trunk/libnut/muxer.c ============================================================================== --- trunk/libnut/muxer.c (original) +++ trunk/libnut/muxer.c Sat Mar 11 11:05:42 2006 @@ -105,150 +105,6 @@ static void put_vb(output_buffer_t * bc, int len, uint8_t * data) { put_v(bc, len); put_data(bc, len, data); -} - -static void put_syncpoint(nut_context_t * nut, output_buffer_t * bc) { - int i; - uint64_t pts = 0; - int stream = 0; - int back_ptr = 0; - int keys[nut->stream_count]; - syncpoint_list_t * s = &nut->syncpoints; - - nut->last_syncpoint = bctello(nut->o); - - for (i = 0; i < nut->stream_count; i++) { - if (nut->sc[i].last_dts > 0 && compare_ts(nut, nut->sc[i].last_dts, i, pts, stream) > 0) { - pts = nut->sc[i].last_dts; - stream = i; - } - } - - if (s->alloc_len <= s->len) { - s->alloc_len += PREALLOC_SIZE; - s->s = realloc(s->s, s->alloc_len * sizeof(syncpoint_t)); - s->pts = realloc(s->pts, s->alloc_len * nut->stream_count * sizeof(uint64_t)); - s->eor = realloc(s->eor, s->alloc_len * nut->stream_count * sizeof(uint64_t)); - } - - for (i = 0; i < nut->stream_count; i++) { - s->pts[s->len * nut->stream_count + i] = nut->sc[i].last_key; - s->eor[s->len * nut->stream_count + i] = nut->sc[i].eor > 0 ? nut->sc[i].eor : 0; - } - s->s[s->len].pos = nut->last_syncpoint; - s->len++; - - for (i = 0; i < nut->stream_count; i++) keys[i] = !!nut->sc[i].eor; - for (i = s->len; --i; ) { - int j; - int n = 1; - for (j = 0; j < nut->stream_count; j++) { - if (keys[j]) continue; - if (!s->pts[i * nut->stream_count + j]) continue; - if (compare_ts(nut, s->pts[i * nut->stream_count + j] - 1, j, pts, stream) <= 0) keys[j] = 1; - } - for (j = 0; j < nut->stream_count; j++) n &= keys[j]; - if (n) { i--; break; } - } - back_ptr = (nut->last_syncpoint - s->s[i].pos) / 8; - - for (i = 0; i < nut->stream_count; i++) { - nut->sc[i].last_pts = convert_ts(nut, pts, stream, i); - nut->sc[i].last_key = 0; - if (nut->sc[i].eor) nut->sc[i].eor = -1; // so we know to ignore this stream in future syncpoints - } - - put_bytes(bc, 8, SYNCPOINT_STARTCODE); - put_v(bc, pts * nut->stream_count + stream); - put_v(bc, back_ptr); - - nut->sync_overhead += bctello(bc) + 4/*checksum*/; -} - -static int frame_header(nut_context_t * nut, const nut_packet_t * fd, int * rftnum) { - int i, ftnum = -1, size = 0, coded_pts, pts_delta; - stream_context_t * sc = &nut->sc[fd->stream]; - pts_delta = fd->pts - sc->last_pts; - // ### check lsb pts - if (MAX(pts_delta, -pts_delta) < (1 << (sc->msb_pts_shift - 1)) - 1) - coded_pts = fd->pts & ((1 << sc->msb_pts_shift) - 1); - else - coded_pts = fd->pts + (1 << sc->msb_pts_shift); - for (i = 0; i < 256; i++) { - int len = 1; - if (nut->ft[i].flags & INVALID_FLAG) continue; - if (nut->ft[i].stream_plus1 && nut->ft[i].stream_plus1 - 1 != fd->stream) continue; - if (nut->ft[i].pts_delta && nut->ft[i].pts_delta != pts_delta) continue; - if (nut->ft[i].flags & MSB_CODED_FLAG) { - if ((fd->len - nut->ft[i].lsb) % nut->ft[i].mul) continue; - } else { - if (nut->ft[i].lsb != fd->len) continue; - } - if (!(nut->ft[i].flags & STREAM_CODED_FLAG) && (fd->flags & 3) != nut->ft[i].stream_flags) continue; - len += nut->ft[i].stream_plus1 ? 0 : v_len(fd->stream); - len += nut->ft[i].pts_delta ? 0 : v_len(coded_pts); - len += nut->ft[i].flags & MSB_CODED_FLAG ? v_len((fd->len - nut->ft[i].lsb) / nut->ft[i].mul) : 0; - len += nut->ft[i].flags & STREAM_CODED_FLAG ? v_len((fd->flags & 3) ^ nut->ft[i].stream_flags) : 0; - if (!size || len < size) { ftnum = i; size = len; } - } - assert(ftnum != -1); - if (rftnum) *rftnum = ftnum; - return size; -} - -static int put_frame_header(nut_context_t * nut, output_buffer_t * bc, const nut_packet_t * fd) { - stream_context_t * sc = &nut->sc[fd->stream]; - int ftnum = -1, coded_pts, pts_delta = fd->pts - sc->last_pts; - int size; - - if (ABS(pts_delta) < (1 << (sc->msb_pts_shift - 1)) - 1) - coded_pts = fd->pts & ((1 << sc->msb_pts_shift) - 1); - else - coded_pts = fd->pts + (1 << sc->msb_pts_shift); - - size = frame_header(nut, fd, &ftnum); - - put_bytes(bc, 1, ftnum); // frame_code - - if (!nut->ft[ftnum].stream_plus1) put_v(bc, fd->stream); - if (!nut->ft[ftnum].pts_delta) put_v(bc, coded_pts); - if (nut->ft[ftnum].flags & MSB_CODED_FLAG) - put_v(bc, (fd->len - nut->ft[ftnum].lsb) / nut->ft[ftnum].mul); - if (nut->ft[ftnum].flags & STREAM_CODED_FLAG) - put_v(bc, (fd->flags & 3) ^ nut->ft[ftnum].stream_flags); - - return size; -} - -static void put_frame(nut_context_t * nut, const nut_packet_t * fd, const uint8_t * data, int write_syncpoint) { - output_buffer_t * tmp = clear_buffer(nut->tmp_buffer); - stream_context_t * sc = &nut->sc[fd->stream]; - int i; - - if (write_syncpoint) put_syncpoint(nut, tmp); - - sc->overhead += put_frame_header(nut, tmp, fd); - - put_data(nut->o, tmp->buf_ptr - tmp->buf, tmp->buf); - - if (write_syncpoint) put_bytes(nut->o, 4, crc32(tmp->buf + 8, tmp->buf_ptr - tmp->buf - 8)); // not including startcode - - sc->total_frames++; - sc->tot_size += fd->len; - - for (i = 0; i < nut->stream_count; i++) { - if (nut->sc[i].last_dts == -1) continue; - if (compare_ts(nut, fd->pts, fd->stream, nut->sc[i].last_dts, i) < 0) - fprintf(stderr, "%lld %d (%f) %lld %d (%f) \n", - fd->pts, fd->stream, TO_DOUBLE(fd->stream, fd->pts), - nut->sc[i].last_dts, i, TO_DOUBLE(i, nut->sc[i].last_dts)); - assert(compare_ts(nut, fd->pts, fd->stream, nut->sc[i].last_dts, i) >= 0); - } - - put_data(nut->o, fd->len, data); - sc->last_pts = fd->pts; - sc->last_dts = get_dts(sc->sh.decode_delay, sc->pts_cache, fd->pts); - sc->sh.max_pts = MAX(sc->sh.max_pts, fd->pts); } static void put_header(output_buffer_t * bc, output_buffer_t * tmp, uint64_t startcode, int index_ptr) { @@ -393,6 +249,64 @@ put_main_header(nut); for (i = 0; i < nut->stream_count; i++) put_stream_header(nut, i); for (i = 0; i < nut->info_count; i++) put_info(nut, &nut->info[i]); +} + +static void put_syncpoint(nut_context_t * nut, output_buffer_t * bc) { + int i; + uint64_t pts = 0; + int stream = 0; + int back_ptr = 0; + int keys[nut->stream_count]; + syncpoint_list_t * s = &nut->syncpoints; + + nut->last_syncpoint = bctello(nut->o); + + for (i = 0; i < nut->stream_count; i++) { + if (nut->sc[i].last_dts > 0 && compare_ts(nut, nut->sc[i].last_dts, i, pts, stream) > 0) { + pts = nut->sc[i].last_dts; + stream = i; + } + } + + if (s->alloc_len <= s->len) { + s->alloc_len += PREALLOC_SIZE; + s->s = realloc(s->s, s->alloc_len * sizeof(syncpoint_t)); + s->pts = realloc(s->pts, s->alloc_len * nut->stream_count * sizeof(uint64_t)); + s->eor = realloc(s->eor, s->alloc_len * nut->stream_count * sizeof(uint64_t)); + } + + for (i = 0; i < nut->stream_count; i++) { + s->pts[s->len * nut->stream_count + i] = nut->sc[i].last_key; + s->eor[s->len * nut->stream_count + i] = nut->sc[i].eor > 0 ? nut->sc[i].eor : 0; + } + s->s[s->len].pos = nut->last_syncpoint; + s->len++; + + for (i = 0; i < nut->stream_count; i++) keys[i] = !!nut->sc[i].eor; + for (i = s->len; --i; ) { + int j; + int n = 1; + for (j = 0; j < nut->stream_count; j++) { + if (keys[j]) continue; + if (!s->pts[i * nut->stream_count + j]) continue; + if (compare_ts(nut, s->pts[i * nut->stream_count + j] - 1, j, pts, stream) <= 0) keys[j] = 1; + } + for (j = 0; j < nut->stream_count; j++) n &= keys[j]; + if (n) { i--; break; } + } + back_ptr = (nut->last_syncpoint - s->s[i].pos) / 8; + + for (i = 0; i < nut->stream_count; i++) { + nut->sc[i].last_pts = convert_ts(nut, pts, stream, i); + nut->sc[i].last_key = 0; + if (nut->sc[i].eor) nut->sc[i].eor = -1; // so we know to ignore this stream in future syncpoints + } + + put_bytes(bc, 8, SYNCPOINT_STARTCODE); + put_v(bc, pts * nut->stream_count + stream); + put_v(bc, back_ptr); + + nut->sync_overhead += bctello(bc) + 4/*checksum*/; } static void put_index(nut_context_t * nut) { @@ -462,6 +376,92 @@ put_header(nut->o, tmp, INDEX_STARTCODE, 1); } +static int frame_header(nut_context_t * nut, const nut_packet_t * fd, int * rftnum) { + int i, ftnum = -1, size = 0, coded_pts, pts_delta; + stream_context_t * sc = &nut->sc[fd->stream]; + pts_delta = fd->pts - sc->last_pts; + // ### check lsb pts + if (MAX(pts_delta, -pts_delta) < (1 << (sc->msb_pts_shift - 1)) - 1) + coded_pts = fd->pts & ((1 << sc->msb_pts_shift) - 1); + else + coded_pts = fd->pts + (1 << sc->msb_pts_shift); + for (i = 0; i < 256; i++) { + int len = 1; + if (nut->ft[i].flags & INVALID_FLAG) continue; + if (nut->ft[i].stream_plus1 && nut->ft[i].stream_plus1 - 1 != fd->stream) continue; + if (nut->ft[i].pts_delta && nut->ft[i].pts_delta != pts_delta) continue; + if (nut->ft[i].flags & MSB_CODED_FLAG) { + if ((fd->len - nut->ft[i].lsb) % nut->ft[i].mul) continue; + } else { + if (nut->ft[i].lsb != fd->len) continue; + } + if (!(nut->ft[i].flags & STREAM_CODED_FLAG) && (fd->flags & 3) != nut->ft[i].stream_flags) continue; + len += nut->ft[i].stream_plus1 ? 0 : v_len(fd->stream); + len += nut->ft[i].pts_delta ? 0 : v_len(coded_pts); + len += nut->ft[i].flags & MSB_CODED_FLAG ? v_len((fd->len - nut->ft[i].lsb) / nut->ft[i].mul) : 0; + len += nut->ft[i].flags & STREAM_CODED_FLAG ? v_len((fd->flags & 3) ^ nut->ft[i].stream_flags) : 0; + if (!size || len < size) { ftnum = i; size = len; } + } + assert(ftnum != -1); + if (rftnum) *rftnum = ftnum; + return size; +} + +static int put_frame_header(nut_context_t * nut, output_buffer_t * bc, const nut_packet_t * fd) { + stream_context_t * sc = &nut->sc[fd->stream]; + int ftnum = -1, coded_pts, pts_delta = fd->pts - sc->last_pts; + int size; + + if (ABS(pts_delta) < (1 << (sc->msb_pts_shift - 1)) - 1) + coded_pts = fd->pts & ((1 << sc->msb_pts_shift) - 1); + else + coded_pts = fd->pts + (1 << sc->msb_pts_shift); + + size = frame_header(nut, fd, &ftnum); + + put_bytes(bc, 1, ftnum); // frame_code + + if (!nut->ft[ftnum].stream_plus1) put_v(bc, fd->stream); + if (!nut->ft[ftnum].pts_delta) put_v(bc, coded_pts); + if (nut->ft[ftnum].flags & MSB_CODED_FLAG) + put_v(bc, (fd->len - nut->ft[ftnum].lsb) / nut->ft[ftnum].mul); + if (nut->ft[ftnum].flags & STREAM_CODED_FLAG) + put_v(bc, (fd->flags & 3) ^ nut->ft[ftnum].stream_flags); + + return size; +} + +static void put_frame(nut_context_t * nut, const nut_packet_t * fd, const uint8_t * data, int write_syncpoint) { + output_buffer_t * tmp = clear_buffer(nut->tmp_buffer); + stream_context_t * sc = &nut->sc[fd->stream]; + int i; + + if (write_syncpoint) put_syncpoint(nut, tmp); + + sc->overhead += put_frame_header(nut, tmp, fd); + + put_data(nut->o, tmp->buf_ptr - tmp->buf, tmp->buf); + + if (write_syncpoint) put_bytes(nut->o, 4, crc32(tmp->buf + 8, tmp->buf_ptr - tmp->buf - 8)); // not including startcode + + sc->total_frames++; + sc->tot_size += fd->len; + + for (i = 0; i < nut->stream_count; i++) { + if (nut->sc[i].last_dts == -1) continue; + if (compare_ts(nut, fd->pts, fd->stream, nut->sc[i].last_dts, i) < 0) + fprintf(stderr, "%lld %d (%f) %lld %d (%f) \n", + fd->pts, fd->stream, TO_DOUBLE(fd->stream, fd->pts), + nut->sc[i].last_dts, i, TO_DOUBLE(i, nut->sc[i].last_dts)); + assert(compare_ts(nut, fd->pts, fd->stream, nut->sc[i].last_dts, i) >= 0); + } + + put_data(nut->o, fd->len, data); + sc->last_pts = fd->pts; + sc->last_dts = get_dts(sc->sh.decode_delay, sc->pts_cache, fd->pts); + sc->sh.max_pts = MAX(sc->sh.max_pts, fd->pts); +} + void nut_write_frame(nut_context_t * nut, const nut_packet_t * fd, const uint8_t * buf) { stream_context_t * sc = &nut->sc[fd->stream]; int write_syncpoint = 0; @@ -498,6 +498,8 @@ nut->tmp_buffer = new_mem_buffer(); // general purpose buffer nut->max_distance = mopts->max_distance; nut->mopts = *mopts; + + if (nut->max_distance > 65536) nut->max_distance = 65536; { int j, n;

1 0

[NUT] (ods15): r89 - /trunk/libnut/demuxer.c
by syncmail＠mplayerhq.hu 11 Mar '06

11 Mar '06

Author: ods15 Date: Sat Mar 11 11:02:21 2006 New Revision: 89 Log: sync to spec, max_distance not higher than 65536 Modified: trunk/libnut/demuxer.c Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Sat Mar 11 11:02:21 2006 @@ -219,6 +219,7 @@ ERROR(i != NUT_VERSION, -ERR_BAD_VERSION); GET_V(tmp, nut->stream_count); GET_V(tmp, nut->max_distance); + if (nut->max_distance > 65536) nut->max_distance = 65536; for(i = 0; i < 256; ) { int scrap;

1 0

[NUT] (ods15): r88 - in /trunk/libnut: demuxer.c muxer.c
by syncmail＠mplayerhq.hu 11 Mar '06

11 Mar '06

Author: ods15 Date: Sat Mar 11 11:00:02 2006 New Revision: 88 Log: sync to spec, remove info crud from demuxer Modified: trunk/libnut/demuxer.c trunk/libnut/muxer.c Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Sat Mar 11 11:00:02 2006 @@ -811,31 +811,6 @@ } int nut_read_info(nut_context_t * nut, nut_info_packet_t * info []) { -#if 0 - BufferContext *tmp = new_mem_buffer(); - - for(;;){ - char * type; - int id = info[0].id; - put_v(tmp, id); - if (!id) break; - type = info_table[id].type; - if (!type) { - type = info[0].type.data; - put_vb(tmp, info[0].type.len, info[0].type.data); - } - if (!info_table[id].name) - put_vb(tmp, info[0].name.len, info[0].name.data); - if (!strcmp(type, "v")) - put_v(tmp, info[0].val.i); - else - put_vb(tmp, info[0].val.s.len, info[0].val.s.data); - id++; - } - - put_header(nut->i, tmp, INFO_STARTCODE, 1); - free_buffer(tmp); -#endif return 0; } Modified: trunk/libnut/muxer.c ============================================================================== --- trunk/libnut/muxer.c (original) +++ trunk/libnut/muxer.c Sat Mar 11 11:00:02 2006 @@ -354,10 +354,8 @@ put_v(tmp, info->stream_id_plus1); put_v(tmp, info->chapter_id); - if (info->chapter_id) { - put_v(tmp, info->chapter_start); - put_v(tmp, info->chapter_len); - } + put_v(tmp, info->chapter_start); + put_v(tmp, info->chapter_len); put_v(tmp, info->count); for(i = 0; i < info->count; i++){ @@ -368,8 +366,11 @@ } else if (!strcmp(field->type, "s")) { put_s(tmp, -3); put_s(tmp, field->val); + } else if (!strcmp(field->type, "t")) { + put_s(tmp, -4); + put_v(tmp, field->val); } else if (!strcmp(field->type, "r")) { - put_s(tmp, -(field->den + 3)); + put_s(tmp, -(field->den + 4)); put_s(tmp, field->val); } else { if (strcmp(field->type, "UTF-8")) {

1 0

[NUT] (ods15): r87 - /trunk/libnut/muxer.c
by syncmail＠mplayerhq.hu 11 Mar '06

11 Mar '06

Author: ods15 Date: Sat Mar 11 10:54:27 2006 New Revision: 87 Log: main header frame code generation on the fly... Modified: trunk/libnut/muxer.c Modified: trunk/libnut/muxer.c ============================================================================== --- trunk/libnut/muxer.c (original) +++ trunk/libnut/muxer.c Sat Mar 11 10:54:27 2006 @@ -270,43 +270,48 @@ static void put_main_header(nut_context_t * nut) { output_buffer_t * tmp = clear_buffer(nut->tmp_buffer); - int i, j, n; + int i; int flag, fields, sflag, timestamp = 0, mul = 1, stream = 0, size, count; put_v(tmp, NUT_VERSION); put_v(tmp, nut->stream_count); put_v(tmp, nut->max_distance); - for(n=i=0; i < 256; n++) { - assert(nut->mopts.fti[n].tmp_flag != -1); - put_v(tmp, flag = nut->mopts.fti[n].tmp_flag); - put_v(tmp, fields = nut->mopts.fti[n].tmp_fields); - if (fields > 0) put_v(tmp, sflag = nut->mopts.fti[n].tmp_sflag); - else sflag = 0; - if (fields > 1) put_s(tmp, timestamp = nut->mopts.fti[n].tmp_pts); - if (fields > 2) put_v(tmp, mul = nut->mopts.fti[n].tmp_mul); - if (fields > 3) put_v(tmp, stream = nut->mopts.fti[n].tmp_stream); - if (fields > 4) put_v(tmp, size = nut->mopts.fti[n].tmp_size); - else size = 0; + for(i = 0; i < 256; ) { + fields = 0; + flag = nut->ft[i].flags; + if (nut->ft[i].stream_flags != 0) fields = 1; + sflag = nut->ft[i].stream_flags; + if (nut->ft[i].pts_delta != timestamp) fields = 2; + timestamp = nut->ft[i].pts_delta; + if (nut->ft[i].mul != mul) fields = 3; + mul = nut->ft[i].mul; + if (nut->ft[i].stream_plus1 != stream) fields = 4; + stream = nut->ft[i].stream_plus1; + if (nut->ft[i].lsb != 0) fields = 5; + size = nut->ft[i].lsb; + + for (count = 0; i < 256; count++, i++) { + if (i == 'N') { count--; continue; } + if (nut->ft[i].flags != flag) break; + if (nut->ft[i].stream_flags != sflag) break; + if (nut->ft[i].stream_plus1 != stream) break; + if (nut->ft[i].mul != mul) break; + if (nut->ft[i].lsb != size + count) break; + if (nut->ft[i].pts_delta != timestamp) break; + } + if (count != mul - size) fields = 7; + + put_v(tmp, flag); + put_v(tmp, fields); + if (fields > 0) put_v(tmp, sflag); + if (fields > 1) put_s(tmp, timestamp); + if (fields > 2) put_v(tmp, mul); + if (fields > 3) put_v(tmp, stream); + if (fields > 4) put_v(tmp, size); if (fields > 5) put_v(tmp, 0); // reserved - if (fields > 6) put_v(tmp, count = nut->mopts.fti[n].count); - else count = mul - size; - - for(j = 0; j < count && i < 256; j++, i++) { - if (i == 'N') { - nut->ft[i].flags = INVALID_FLAG; - j--; - continue; - } - nut->ft[i].flags = flag; - nut->ft[i].stream_flags = sflag; - nut->ft[i].stream_plus1 = stream; - nut->ft[i].mul = mul; - nut->ft[i].lsb = size + j; - nut->ft[i].pts_delta = timestamp; - } - } - - assert(nut->mopts.fti[n].tmp_flag == -1); + if (fields > 6) put_v(tmp, count); + } + put_header(nut->o, tmp, MAIN_STARTCODE, 0); } @@ -493,9 +498,40 @@ nut->max_distance = mopts->max_distance; nut->mopts = *mopts; - for (i = 0; mopts->fti[i].tmp_flag != -1; i++); - nut->mopts.fti = malloc(++i * sizeof(frame_table_input_t)); - memcpy(nut->mopts.fti, mopts->fti, i * sizeof(frame_table_input_t)); + { + int j, n; + int flag, fields, sflag, timestamp = 0, mul = 1, stream = 0, size, count; + + for(n=i=0; i < 256; n++) { + assert(mopts->fti[n].tmp_flag != -1); + flag = mopts->fti[n].tmp_flag; + fields = mopts->fti[n].tmp_fields; + if (fields > 0) sflag = mopts->fti[n].tmp_sflag; + else sflag = 0; + if (fields > 1) timestamp = mopts->fti[n].tmp_pts; + if (fields > 2) mul = mopts->fti[n].tmp_mul; + if (fields > 3) stream = mopts->fti[n].tmp_stream; + if (fields > 4) size = mopts->fti[n].tmp_size; + else size = 0; + if (fields > 6) count = mopts->fti[n].count; + else count = mul - size; + + for(j = 0; j < count && i < 256; j++, i++) { + if (i == 'N') { + nut->ft[i].flags = INVALID_FLAG; + j--; + continue; + } + nut->ft[i].flags = flag; + nut->ft[i].stream_flags = sflag; + nut->ft[i].stream_plus1 = stream; + nut->ft[i].mul = mul; + nut->ft[i].lsb = size + j; + nut->ft[i].pts_delta = timestamp; + } + } + assert(mopts->fti[n].tmp_flag == -1); + } nut->sync_overhead = 0; @@ -610,7 +646,6 @@ free(nut->syncpoints.s); free(nut->syncpoints.pts); free(nut->syncpoints.eor); - free(nut->mopts.fti); free_buffer(nut->tmp_buffer); free_buffer(nut->o); // flushes file

1 0

[NUT] (ods15): r86 - in /trunk: libnut/demuxer.c libnut/muxer.c libnut/nut.h libnut/priv.h libnut/reorder.c nututils/demux_avi.c nututils/demux_ogg.c nututils/nutmerge.c
by syncmail＠mplayerhq.hu 11 Mar '06

11 Mar '06

Author: ods15 Date: Sat Mar 11 10:31:41 2006 New Revision: 86 Log: decode_delay, framecode table and max_distance are configurable via libnut api. some cleanup Modified: trunk/libnut/demuxer.c trunk/libnut/muxer.c trunk/libnut/nut.h trunk/libnut/priv.h trunk/libnut/reorder.c trunk/nututils/demux_avi.c trunk/nututils/demux_ogg.c trunk/nututils/nutmerge.c Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Sat Mar 11 10:31:41 2006 @@ -278,7 +278,7 @@ GET_V(tmp, sc->sh.timebase.den); GET_V(tmp, sc->msb_pts_shift); GET_V(tmp, sc->max_pts_distance); - GET_V(tmp, sc->decode_delay); + GET_V(tmp, sc->sh.decode_delay); CHECK(get_bytes(tmp, 1, &a)); sc->sh.fixed_fps = a & 1; CHECK(get_vb(tmp, &sc->sh.codec_specific_len, &sc->sh.codec_specific)); @@ -469,7 +469,7 @@ int i; for (i = 0; i < nut->stream_count; i++) { int j; - for (j = 0; j < nut->sc[i].decode_delay; j++) nut->sc[i].pts_cache[j] = -1; + for (j = 0; j < nut->sc[i].sh.decode_delay; j++) nut->sc[i].pts_cache[j] = -1; nut->sc[i].last_dts = -1; } } @@ -577,7 +577,7 @@ static void push_frame(nut_context_t * nut, nut_packet_t * pd) { stream_context_t * sc = &nut->sc[pd->stream]; sc->last_pts = pd->pts; - sc->last_dts = get_dts(sc->decode_delay, sc->pts_cache, pd->pts); + sc->last_dts = get_dts(sc->sh.decode_delay, sc->pts_cache, pd->pts); if (pd->flags & NUT_KEY_STREAM_FLAG && !sc->last_key) sc->last_key = pd->pts + 1; if (pd->flags & NUT_EOR_STREAM_FLAG) sc->eor = pd->pts + 1; else sc->eor = 0; @@ -728,13 +728,12 @@ if (tmp != STREAM_STARTCODE) return -ERR_NOSTREAM_STARTCODE; CHECK(get_stream_header(nut, i)); if (!nut->sc[i].pts_cache) { - nut->sc[i].pts_cache = malloc(nut->sc[i].decode_delay * sizeof(int64_t)); - for (j = 0; j < nut->sc[i].decode_delay; j++) + nut->sc[i].pts_cache = malloc(nut->sc[i].sh.decode_delay * sizeof(int64_t)); + for (j = 0; j < nut->sc[i].sh.decode_delay; j++) nut->sc[i].pts_cache[j] = -1; } } if (nut->dopts.read_index) { - off_t pos = bctello(nut->i); uint64_t tmp; CHECK(get_bytes(nut->i, 8, &tmp)); if (tmp == INDEX_STARTCODE) nut->seek_status = 2; @@ -1038,7 +1037,7 @@ stopper_syncpoint = buf_before; for (i = 0; i < nut->stream_count; i++) { if (!(pts[i] & 1)) { - if ((good_key[i]>>1) > (stopper->back_ptr>>1)) n = 0; + if (good_key[i]>>1) n = 0; else good_key[i] |= 1; // flag that we don't care about this stream } } @@ -1265,7 +1264,6 @@ nut->syncpoints.pts = NULL; nut->syncpoints.eor = NULL; - nut->fti = NULL; nut->sc = NULL; nut->last_headers = 0; nut->stream_count = 0; Modified: trunk/libnut/muxer.c ============================================================================== --- trunk/libnut/muxer.c (original) +++ trunk/libnut/muxer.c Sat Mar 11 10:31:41 2006 @@ -3,32 +3,6 @@ #include <stdio.h> #include "nut.h" #include "priv.h" - -frame_table_input_t ft_default[] = { - // There must be atleast this safety net: - //{ 3, 3, 0, 0, 1, 0, 0, 0 }, - //{ flag, fields, sflag, pts, mul, stream, size, count } - { 4, 0, 0, 0, 1, 0, 0, 0 }, // invalid 0x00 - { 1, 1, 1, 0, 1, 0, 0, 0 }, // safety net non key frame - { 1, 0, 0, 0, 1, 0, 0, 0 }, // safety net key frame - { 3, 0, 0, 0, 1, 0, 0, 0 }, // one more safety net - { 0, 5, 1, 1, 337, 2, 336, 0 }, // used 82427 times - { 0, 5, 1, 1, 385, 2, 384, 0 }, // used 56044 times - { 0, 5, 0, 2, 7, 1, 6, 0 }, // used 20993 times - { 0, 5, 0, 1, 7, 1, 6, 0 }, // used 10398 times - { 0, 5, 1, 1, 481, 2, 480, 0 }, // used 3527 times - { 0, 5, 1, 1, 289, 2, 288, 0 }, // used 2042 times - { 0, 5, 1, 1, 577, 2, 576, 0 }, // used 1480 times - { 0, 5, 1, 1, 673, 2, 672, 0 }, // used 862 times - { 0, 5, 1, 1, 769, 2, 768, 0 }, // used 433 times - { 0, 5, 1, 1, 961, 2, 960, 0 }, // used 191 times - { 1, 4, 0, 2, 104, 1, 0, 0 }, // "1.2.0" => 14187 - { 1, 4, 0, -1, 42, 1, 0, 0 }, // "1.-1.0" => 5707 - { 1, 4, 0, 1, 83, 1, 0, 0 }, // "1.1.0" => 11159 - { 1, 4, 1, 1, 11, 1, 0, 0 }, // "1.1.1" => 1409 - { 4, 3, 0, 0, 1, 0, 0, 0 }, // invalid 0xFF - { -1, 0, 0, 0, 0, 0, 0, 0 }, // end -}; static int stream_write(void * priv, size_t len, const uint8_t * buf) { return fwrite(buf, 1, len, priv); @@ -273,7 +247,7 @@ put_data(nut->o, fd->len, data); sc->last_pts = fd->pts; - sc->last_dts = get_dts(sc->decode_delay, sc->pts_cache, fd->pts); + sc->last_dts = get_dts(sc->sh.decode_delay, sc->pts_cache, fd->pts); sc->sh.max_pts = MAX(sc->sh.max_pts, fd->pts); } @@ -303,18 +277,18 @@ put_v(tmp, nut->stream_count); put_v(tmp, nut->max_distance); for(n=i=0; i < 256; n++) { - assert(nut->fti[n].tmp_flag != -1); - put_v(tmp, flag = nut->fti[n].tmp_flag); - put_v(tmp, fields = nut->fti[n].tmp_fields); - if (fields > 0) put_v(tmp, sflag = nut->fti[n].tmp_sflag); + assert(nut->mopts.fti[n].tmp_flag != -1); + put_v(tmp, flag = nut->mopts.fti[n].tmp_flag); + put_v(tmp, fields = nut->mopts.fti[n].tmp_fields); + if (fields > 0) put_v(tmp, sflag = nut->mopts.fti[n].tmp_sflag); else sflag = 0; - if (fields > 1) put_s(tmp, timestamp = nut->fti[n].tmp_pts); - if (fields > 2) put_v(tmp, mul = nut->fti[n].tmp_mul); - if (fields > 3) put_v(tmp, stream = nut->fti[n].tmp_stream); - if (fields > 4) put_v(tmp, size = nut->fti[n].tmp_size); + if (fields > 1) put_s(tmp, timestamp = nut->mopts.fti[n].tmp_pts); + if (fields > 2) put_v(tmp, mul = nut->mopts.fti[n].tmp_mul); + if (fields > 3) put_v(tmp, stream = nut->mopts.fti[n].tmp_stream); + if (fields > 4) put_v(tmp, size = nut->mopts.fti[n].tmp_size); else size = 0; if (fields > 5) put_v(tmp, 0); // reserved - if (fields > 6) put_v(tmp, count = nut->fti[n].count); + if (fields > 6) put_v(tmp, count = nut->mopts.fti[n].count); else count = mul - size; for(j = 0; j < count && i < 256; j++, i++) { @@ -332,7 +306,7 @@ } } - assert(nut->fti[n].tmp_flag == -1); + assert(nut->mopts.fti[n].tmp_flag == -1); put_header(nut->o, tmp, MAIN_STARTCODE, 0); } @@ -347,7 +321,7 @@ put_v(tmp, sc->sh.timebase.den); put_v(tmp, sc->msb_pts_shift); put_v(tmp, sc->max_pts_distance); - put_v(tmp, sc->decode_delay); + put_v(tmp, sc->sh.decode_delay); put_bytes(tmp, 1, sc->sh.fixed_fps ? 1 : 0); put_vb(tmp, sc->sh.codec_specific_len, sc->sh.codec_specific); @@ -516,9 +490,12 @@ nut->o = new_output_buffer(mopts->output); nut->tmp_buffer = new_mem_buffer(); // general purpose buffer - nut->max_distance = 32768; // TODO - nut->fti = ft_default; // TODO + nut->max_distance = mopts->max_distance; nut->mopts = *mopts; + + for (i = 0; mopts->fti[i].tmp_flag != -1; i++); + nut->mopts.fti = malloc(++i * sizeof(frame_table_input_t)); + memcpy(nut->mopts.fti, mopts->fti, i * sizeof(frame_table_input_t)); nut->sync_overhead = 0; @@ -540,7 +517,6 @@ nut->sc[i].last_dts = -1; nut->sc[i].msb_pts_shift = 7; // TODO nut->sc[i].max_pts_distance = (s[i].timebase.den + s[i].timebase.nom - 1) / s[i].timebase.nom; // TODO - nut->sc[i].decode_delay = !i; // ### TODO nut->sc[i].eor = 0; nut->sc[i].sh = s[i]; nut->sc[i].sh.max_pts = 0; @@ -551,11 +527,11 @@ nut->sc[i].sh.codec_specific = malloc(s[i].codec_specific_len); memcpy(nut->sc[i].sh.codec_specific, s[i].codec_specific, s[i].codec_specific_len); - nut->sc[i].pts_cache = malloc(nut->sc[i].decode_delay * sizeof(int64_t)); + nut->sc[i].pts_cache = malloc(nut->sc[i].sh.decode_delay * sizeof(int64_t)); // reorder.c - nut->sc[i].reorder_pts_cache = malloc(nut->sc[i].decode_delay * sizeof(int64_t)); - for (j = 0; j < nut->sc[i].decode_delay; j++) nut->sc[i].reorder_pts_cache[j] = nut->sc[i].pts_cache[j] = -1; + nut->sc[i].reorder_pts_cache = malloc(nut->sc[i].sh.decode_delay * sizeof(int64_t)); + for (j = 0; j < nut->sc[i].sh.decode_delay; j++) nut->sc[i].reorder_pts_cache[j] = nut->sc[i].pts_cache[j] = -1; nut->sc[i].next_pts = 0; nut->sc[i].packets = NULL; nut->sc[i].num_packets = 0; @@ -634,6 +610,7 @@ free(nut->syncpoints.s); free(nut->syncpoints.pts); free(nut->syncpoints.eor); + free(nut->mopts.fti); free_buffer(nut->tmp_buffer); free_buffer(nut->o); // flushes file Modified: trunk/libnut/nut.h ============================================================================== --- trunk/libnut/nut.h (original) +++ trunk/libnut/nut.h Sat Mar 11 10:31:41 2006 @@ -33,6 +33,7 @@ uint8_t * fourcc; nut_timebase_t timebase; int fixed_fps; + int decode_delay; int codec_specific_len; uint8_t * codec_specific; // video @@ -50,8 +51,21 @@ } nut_stream_header_t; typedef struct { + int tmp_flag; // 1 => use msb, 2 => coded sflags, 4 => invalid, -1 => end + int tmp_fields; + int tmp_sflag; // tmp_fields = 1 + int tmp_pts; // tmp_fields = 2 + int tmp_mul; // tmp_fields = 3 + int tmp_stream; // tmp_fields = 4 + int tmp_size; // tmp_fields = 5 + int count; // tmp_fields = 7 (6 is reserved) +} frame_table_input_t; + +typedef struct { nut_output_stream_t output; int write_index; + int max_distance; + frame_table_input_t * fti; } nut_muxer_opts_t; typedef struct { Modified: trunk/libnut/priv.h ============================================================================== --- trunk/libnut/priv.h (original) +++ trunk/libnut/priv.h Sat Mar 11 10:31:41 2006 @@ -98,7 +98,6 @@ int64_t last_dts; int msb_pts_shift; int max_pts_distance; - int decode_delay; nut_stream_header_t sh; int64_t * pts_cache; int64_t eor; @@ -112,17 +111,6 @@ int tot_size; int total_frames; } stream_context_t; - -typedef struct { - int tmp_flag; // 1 => use msb, 2 => coded sflags, 4 => invalid - int tmp_fields; - int tmp_sflag; // tmp_fields = 1 - int tmp_pts; // tmp_fields = 2 - int tmp_mul; // tmp_fields = 3 - int tmp_stream; // tmp_fields = 4 - int tmp_size; // tmp_fields = 5 - int count; // tmp_fields = 7 (6 is reserved) -} frame_table_input_t; struct nut_context_s { nut_muxer_opts_t mopts; @@ -138,7 +126,6 @@ nut_info_packet_t * info; int max_distance; - frame_table_input_t * fti; frame_table_t ft[256]; off_t last_syncpoint; // for checking corruption and putting syncpoints, also for back_ptr Modified: trunk/libnut/reorder.c ============================================================================== --- trunk/libnut/reorder.c (original) +++ trunk/libnut/reorder.c Sat Mar 11 10:31:41 2006 @@ -80,7 +80,7 @@ s->num_packets++; s->packets = realloc(s->packets, s->num_packets * sizeof(reorder_packet_t)); s->packets[s->num_packets - 1].p = *p; - s->packets[s->num_packets - 1].dts = get_dts(s->decode_delay, s->reorder_pts_cache, p->pts); + s->packets[s->num_packets - 1].dts = get_dts(s->sh.decode_delay, s->reorder_pts_cache, p->pts); s->packets[s->num_packets - 1].buf = malloc(p->len); // FIXME memcpy(s->packets[s->num_packets - 1].buf, buf, p->len); Modified: trunk/nututils/demux_avi.c ============================================================================== --- trunk/nututils/demux_avi.c (original) +++ trunk/nututils/demux_avi.c Sat Mar 11 10:31:41 2006 @@ -362,6 +362,7 @@ s[i].timebase.den = avi->stream[i].strh->dwRate; s[i].timebase.nom = avi->stream[i].strh->dwScale; s[i].fixed_fps = 1; + s[i].decode_delay = !i; // FIXME s[i].codec_specific_len = avi->stream[i].extra_len; s[i].codec_specific = avi->stream[i].extra; if (avi->stream[i].type == 0) { // video Modified: trunk/nututils/demux_ogg.c ============================================================================== --- trunk/nututils/demux_ogg.c (original) +++ trunk/nututils/demux_ogg.c Sat Mar 11 10:31:41 2006 @@ -40,6 +40,7 @@ int time_base_denom; int time_base_nom; int fixed_fps; + int decode_delay; int codec_specific_len; uint8_t * codec_specific; int width; @@ -262,6 +263,7 @@ os->time_base_denom = sample_rate / gcd(sample_rate, i); os->time_base_nom = i / gcd(sample_rate, i); os->fixed_fps = 0; + os->decode_delay = 0; os->codec_specific_len = 0; os->codec_specific = NULL; os->samplerate_nom = sample_rate; @@ -530,6 +532,7 @@ s[i].timebase.den = os->time_base_denom; s[i].timebase.nom = os->time_base_nom; s[i].fixed_fps = os->fixed_fps; + s[i].decode_delay = os->decode_delay; s[i].codec_specific = os->codec_specific; s[i].codec_specific_len = os->codec_specific_len; switch (os->oc->type) { Modified: trunk/nututils/nutmerge.c ============================================================================== --- trunk/nututils/nutmerge.c (original) +++ trunk/nututils/nutmerge.c Sat Mar 11 10:31:41 2006 @@ -13,6 +13,32 @@ &nut_demuxer, &ogg_demuxer, NULL +}; + +frame_table_input_t ft_default[] = { + // There must be atleast this safety net: + //{ 3, 3, 0, 0, 1, 0, 0, 0 }, + //{ flag, fields, sflag, pts, mul, stream, size, count } + { 4, 0, 0, 0, 1, 0, 0, 0 }, // invalid 0x00 + { 1, 1, 1, 0, 1, 0, 0, 0 }, // safety net non key frame + { 1, 0, 0, 0, 1, 0, 0, 0 }, // safety net key frame + { 3, 0, 0, 0, 1, 0, 0, 0 }, // one more safety net + { 0, 5, 1, 1, 337, 2, 336, 0 }, // used 82427 times + { 0, 5, 1, 1, 385, 2, 384, 0 }, // used 56044 times + { 0, 5, 0, 2, 7, 1, 6, 0 }, // used 20993 times + { 0, 5, 0, 1, 7, 1, 6, 0 }, // used 10398 times + { 0, 5, 1, 1, 481, 2, 480, 0 }, // used 3527 times + { 0, 5, 1, 1, 289, 2, 288, 0 }, // used 2042 times + { 0, 5, 1, 1, 577, 2, 576, 0 }, // used 1480 times + { 0, 5, 1, 1, 673, 2, 672, 0 }, // used 862 times + { 0, 5, 1, 1, 769, 2, 768, 0 }, // used 433 times + { 0, 5, 1, 1, 961, 2, 960, 0 }, // used 191 times + { 1, 4, 0, 2, 104, 1, 0, 0 }, // "1.2.0" => 14187 + { 1, 4, 0, -1, 42, 1, 0, 0 }, // "1.-1.0" => 5707 + { 1, 4, 0, 1, 83, 1, 0, 0 }, // "1.1.0" => 11159 + { 1, 4, 1, 1, 11, 1, 0, 0 }, // "1.1.1" => 1409 + { 4, 3, 0, 0, 1, 0, 0, 0 }, // invalid 0xFF + { -1, 0, 0, 0, 0, 0, 0, 0 }, // end }; int main(int argc, char * argv []) { @@ -56,6 +82,8 @@ if ((err = demuxer->read_headers(demuxer_priv, &nut_stream))) goto err_out; mopts.output = (nut_output_stream_t){ .priv = out, .write = NULL }; mopts.write_index = 1; + mopts.fti = ft_default; + mopts.max_distance = 32768; nut = nut_muxer_init(&mopts, nut_stream, NULL); for (i = 0; nut_stream[i].type >= 0; i++);

1 0

back_ptr_div8 -> 16
by Michael Niedermayer 10 Mar '06

10 Mar '06

Hi current syncpoints have 8(startcode)+1(forward_ptr)+1(back_ptr)+1(timestamp)+4(crc) = 15 so if we dissallow 2 consecutive syncpoints then we could drop 1 bit of the back ptr and still uniquely point to each comments? -- Michael

2 1

huge vs. damaged forward_ptrs in packets
by Michael Niedermayer 09 Mar '06

09 Mar '06

Hi $subj, and what about a change like: --- mpcf.txt 2006-03-08 13:36:02.000000000 +0100 +++ mncf.txt 2006-03-05 14:49:57.000000000 +0100 @@ -312,6 +306,8 @@ packet_header startcode f(64) forward_ptr v + if(forward_ptr>64k) + header_checksum u(32) packet_footer reserved_bytes @@ -591,6 +576,9 @@ for frame headers the checksum contains the framecode byte and all following bytes upto the checksum itself +header_checksum + checksum over the startcode and forward pointer + Syncpoint tags: --------------- -- Michael

3 11

Issues
by Oded Shimon 08 Mar '06

08 Mar '06

The controversies so far... 1. checksum in frame headers/syncpoints I did very much like the elegance with the syncpoints, however I did not like the hacks in code to accomplish this (frame header parser in find_syncpoint, put_frame using put_syncpoint to a temporary buffer, demuxing frame header is dependant of "saw syncpoint" context). So I have no strong feelings either way with this. I do have a small proposal for overhead reduction in new method (if it's stupid say so and I'll drop it) - has_checksum being implicit by the rules it is manditory for - so you can save frame codes or a byte for coded flags... Come to think of it, the frame header for a frame that needs has_checksum is large already anyway... 2. limiting max_distance, max_frame_size I say, keep them VLC, but add a MUST in spec regarding their value... Using 'u(16)' is as silly as using it for the 'tmp_mul' vars in the main header which also have a MUST restriction... 3. prefix/compression for frames Not sure if this is an actual controversy, possibly the flamewar going on has nothing to do with this (let's keep mplayer g5926 flames for another mailing list :). I'm quite against the prefix stuff, for a completely other reason - it's a silly complexity for something that does not belong in the container. If you're gonna do this, you might as well compress the frames with bzip2 while you're at it. underhead is nice, but not that nice, this will be nothing but a legacy feature in the future... 4. Info frames/streams/packets The first problem: limiting positions where info frames/packets should be Michael you said you're strongly against this, but you also said a muxer should place them sanely and the demuxer should not go crazy looking for them. IMO there should be rules that you can't just put the frames/packets all over the place as you please, and I'd like to find the best ones that stay fully featured while still allowing the demuxer to not have to search everywhere for them. Second problem: dump info streams? There is some advantage to this - info frames don't really have stream like behavior, unless you repeat them often. A NUT-aware streaming server could give the info frame relavent to current position just once, and not be wasteful and repeat often or at all... Info streams can work if you put an EOR closely after the frame, but that is not semantically correct... What I hate about dumping info streams though is some complication to my demuxer api (each call can give a frame or a packet, instead of always a frame), and, if we do dump info streams, I very much want a restriction that info packets that are global (chapter_id >=0 ?) can only come after main headers, and not wherever... Thinking again about my streaming example, the file isn't seekable anyway, and if you dump it, and you're still using the info frames instead of remuxing them to info packets, you deserve what you get of an unseekable/bad seekable file... (Which would nicely discourage using info frames in places where it is inappropiatte - not live streams..) - ods15

6 24

Suggestions [PATCH]
by Michael Niedermayer 05 Mar '06

05 Mar '06

Hi the Attached patch does the following: 1. cleanup packets so all have forward_ptr significantly improves extendability and simplifies stuff slightly larger overhead (~0.006% which is negligible) 2. split checksum into frame and syncpoint checksum simplification overhead changes by + 4byte for every packet >64kb (<0.006% worst case) overhead changes by - syncpoint size + 4 for every packet with dts_diff > 1sec overall this could even reduce the overhead, the worst case increase is also negligible 3. split index simplification for lavf muxer currently we just write the data out seek back and update the forward pointer, this is safe as long as the packet is < the io buffer size in lavf, if its larger we need to alloc&realloc a buffer and work within that or do 2 passes to find the forward ptr value, both are more messy index_ptr becomes unneccesary by this improves error resistance 4. always store chapter_start/len simplification 5. change file structure definion so extendability is restored 6. drop info streams i see no sense in them ... 7. dissalow width or height == 0 8. add leading coeff to the crc polynom -- Michael

3 19

[NUT-devel] Re: [MPlayer-cvslog] CVS: main/DOCS/tech mpcf.txt, 1.121, 1.122
by Oded Shimon 04 Mar '06

04 Mar '06

On Fri, Mar 03, 2006 at 11:33:33PM +0100, Michael Niedermayer CVS wrote: > CVS change done by Michael Niedermayer CVS > > Update of /cvsroot/mplayer/main/DOCS/tech > In directory mail:/var2/tmp/cvs-serv7350 > > Modified Files: > mpcf.txt > Log Message: > the return of the monolithic index May I further add... - ods15

2 1