- NUT-devel - lists.mplayerhq.hu

[nut]: r226 - trunk/libnut/demuxer.c
by ods15 17 Nov '06

17 Nov '06

Author: ods15 Date: Fri Nov 17 18:21:40 2006 New Revision: 226 Modified: trunk/libnut/demuxer.c Log: Some EAGAIN fixes Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Fri Nov 17 18:21:40 2006 @@ -792,8 +792,6 @@ uint64_t tmp; off_t ptr = 0; assert(!backwards || !stop); // can't have both - - if (backwards) seek_buf(nut->i, -nut->max_distance, SEEK_CUR); retry: read = nut->max_distance; if (stop) read = MIN(read, stop - bctello(nut->i)); @@ -978,7 +976,7 @@ // find last syncpoint if it's not already found if (!sl->s[sl->len-1].seen_next) { // searching bakwards from EOF - if (!nut->seek_status) seek_buf(nut->i, 0, SEEK_END); + if (!nut->seek_status) seek_buf(nut->i, -nut->max_distance, SEEK_END); nut->seek_status = 1; CHECK(find_syncpoint(nut, 1, &s, 0)); CHECK(add_syncpoint(nut, s, NULL, NULL, &i)); @@ -1080,6 +1078,7 @@ *end = sl->s[i+1].pos; *stopper = sl->s[i+1]; err_out: + if (err == NUT_ERR_EAGAIN) nut->i->buf_ptr = nut->i->buf; return err; }

1 0

[nut]: r225 - in trunk: libnut/Makefile libnut/framecode.c libnut/libnut.h libnut/muxer.c nututils/nutmerge.c
by ods15 17 Nov '06

17 Nov '06

Author: ods15 Date: Fri Nov 17 17:52:04 2006 New Revision: 225 Added: trunk/libnut/framecode.c Modified: trunk/libnut/Makefile trunk/libnut/libnut.h trunk/libnut/muxer.c trunk/nututils/nutmerge.c Log: Add framecode table generator, based on guesses on codecs Modified: trunk/libnut/Makefile ============================================================================== --- trunk/libnut/Makefile (original) +++ trunk/libnut/Makefile Fri Nov 17 17:52:04 2006 @@ -1,5 +1,7 @@ include ../config.mak +OBJS = muxer.o demuxer.o reorder.o framecode.o + all: libnut.a install: @@ -12,12 +14,12 @@ rm -f $(prefix)/lib/libnut.a rm -f $(prefix)/include/libnut.h -libnut.a: muxer.o demuxer.o reorder.o +libnut.a: ${OBJS} rm -f $@ ${AR} rc $@ $^ $(RANLIB) $@ -libnut.so: muxer.o demuxer.o reorder.o +libnut.so: ${OBJS} ${CC} ${CFLAGS} -shared $^ -o $@ .c.o: priv.h nut.h Added: trunk/libnut/framecode.c ============================================================================== --- (empty file) +++ trunk/libnut/framecode.c Fri Nov 17 17:52:04 2006 @@ -0,0 +1,127 @@ +// (C) 2005-2006 Oded Shimon +// This file is available under the MIT/X license, see COPYING + +#include <inttypes.h> +#include <stdlib.h> +#include <stdio.h> +#include "libnut.h" +#include "priv.h" + +typedef nut_frame_table_input_t fti_t; // just a shortcut + +static int count_streams(const nut_stream_header_t * s) { + int i; + for (i = 0; s[i].type != -1; i++); + return i; +} + +void nut_framecode_generate(const nut_stream_header_t s[], nut_frame_table_input_t fti[256]) { + int stream_count = count_streams(s); + int i, n = 0, m = 0, tot_con = 0; + enum { + e_consume_none = 0, + e_consume_mpeg4, + e_consume_h264, + e_consume_video, + e_consume_vorbis, + } consume[stream_count]; + + for (i = 0; i < stream_count; i++) consume[i] = e_consume_none; + + // the basic framecodes. flag, pts, stream, mul, size, count + fti[n++] = (fti_t){ /*invalid 0x00*/ FLAG_INVALID, 0, 0, 1, 0, 1 }; + fti[n++] = (fti_t){ NUT_FLAG_KEY|FLAG_CODED_PTS|FLAG_STREAM_ID|FLAG_SIZE_MSB, 0, 0, 1, 0, 1 }; + fti[n++] = (fti_t){ FLAG_CODED_PTS|FLAG_STREAM_ID|FLAG_SIZE_MSB, 0, 0, 1, 0, 1 }; + fti[n++] = (fti_t){ /*extreme fallback*/ FLAG_CODED, 1, 0, 1, 0, 1 }; + + for (i = 0; i < stream_count; i++) { + if (n + m > 230) break; // that's enough! don't overflow + switch (s[i].type) { + case NUT_VIDEO_CLASS: + fti[n++] = (fti_t){ NUT_FLAG_KEY| FLAG_SIZE_MSB, 1, i, 1, 0, 1 }; + fti[n++] = (fti_t){ NUT_FLAG_KEY|FLAG_CHECKSUM|FLAG_SIZE_MSB, 1, i, 1, 0, 1 }; + fti[n++] = (fti_t){ FLAG_CODED_PTS|FLAG_SIZE_MSB, 0, i, 1, 0, 1 }; + if (s[i].fourcc_len == 4 && !strncmp(s[i].fourcc, "mp4v", 4)) { + fti[n++] = (fti_t){ 0, 1, i, 7, 6, 1 }; + fti[n++] = (fti_t){ 0, 2, i, 7, 6, 1 }; + consume[i] = e_consume_mpeg4; + } else if (s[i].fourcc_len == 4 && !strncmp(s[i].fourcc, "h264", 4)) { + consume[i] = e_consume_h264; + } else { + consume[i] = e_consume_video; + } + break; + case NUT_AUDIO_CLASS: + fti[n++] = (fti_t){NUT_FLAG_KEY| FLAG_SIZE_MSB, 1, i, 1, 0, 1 }; + fti[n++] = (fti_t){NUT_FLAG_KEY|FLAG_CODED_PTS|FLAG_SIZE_MSB, 0, i, 1, 0, 1 }; + if (s[i].fourcc_len == 4 && !strncmp(s[i].fourcc, "mp3 ", 4)) { + int j, a[] = {288,336,384,480,576,672,768,960}; + for (j = 0; j < sizeof a/sizeof*a; j++) + fti[n++] = (fti_t){ NUT_FLAG_KEY, 1, i, a[j]+1, a[j], 1 }; + fti[n++] = (fti_t){ NUT_FLAG_KEY|FLAG_SIZE_MSB, 1, i, 4, 0, 1 }; + fti[n++] = (fti_t){ NUT_FLAG_KEY|FLAG_SIZE_MSB, 1, i, 4, 2, 1 }; + } else if (s[i].fourcc_len == 4 && !strncmp(s[i].fourcc, "vrbs", 4)) { + fti[n++] = (fti_t){ NUT_FLAG_KEY|FLAG_SIZE_MSB, 2, i, 1, 0, 1 }; + fti[n++] = (fti_t){ NUT_FLAG_KEY|FLAG_SIZE_MSB, 9, i, 1, 0, 1 }; + fti[n++] = (fti_t){ NUT_FLAG_KEY|FLAG_SIZE_MSB, 23, i, 1, 0, 1 }; + fti[n++] = (fti_t){ NUT_FLAG_KEY|FLAG_SIZE_MSB, 16, i, 6, 0, 6 }; m+=5; + consume[i] = e_consume_vorbis; + } + break; + case NUT_SUBTITLE_CLASS: + fti[n++] = (fti_t){NUT_FLAG_KEY|FLAG_SIZE_MSB|FLAG_CODED_PTS, 0, i, 5, 0, 5 }; m+=4; + fti[n++] = (fti_t){NUT_FLAG_KEY|NUT_FLAG_EOR| FLAG_CODED_PTS, 0, i, 1, 0, 1 }; + break; + case NUT_USERDATA_CLASS: + fti[n++] = (fti_t){NUT_FLAG_KEY|FLAG_SIZE_MSB|FLAG_CODED_PTS, 0, i, 1, 0, 1 }; + fti[n++] = (fti_t){ FLAG_SIZE_MSB|FLAG_CODED_PTS, 0, i, 1, 0, 1 }; + break; + default: + assert(0); + } + } + + for (i = 0; i < stream_count; i++) if (consume[i]) tot_con++; + if (tot_con) for (i = 0; i < stream_count; i++) { + int al = (254 - (n+m))/tot_con; // 256 - 'N' - 0xFF invalids + switch (consume[i]) { + case e_consume_none: + break; + case e_consume_mpeg4: { + int al1 = al*35/100; + int al2 = al*45/100; + int al3 = al-al1-al2; + fti[n++] = (fti_t){ FLAG_SIZE_MSB, 1, i, al1, 0, al1 }; m+=al1-1; + fti[n++] = (fti_t){ FLAG_SIZE_MSB, 2, i, al2, 0, al2 }; m+=al2-1; + fti[n++] = (fti_t){ FLAG_SIZE_MSB, -1, i, al3, 0, al3 }; m+=al3-1; + break; + } + case e_consume_h264: { + int al1 = al*35/100; + int al2 = al*35/100; + int al3 = al*20/100; + int al4 = al-al1-al2-al3; + fti[n++] = (fti_t){ FLAG_SIZE_MSB, 1, i, al1, 0, al1 }; m+=al1-1; + fti[n++] = (fti_t){ FLAG_SIZE_MSB, 2, i, al2, 0, al2 }; m+=al2-1; + fti[n++] = (fti_t){ FLAG_SIZE_MSB, -1, i, al3, 0, al3 }; m+=al3-1; + fti[n++] = (fti_t){ FLAG_CODED_PTS|FLAG_SIZE_MSB, 0, i, al4, 0, al4 }; m+=al4-1; + break; + } + case e_consume_video: + fti[n++] = (fti_t){ FLAG_SIZE_MSB, 1, i, al, 0, al }; m+=al-1; + break; + case e_consume_vorbis: { + int al1 = al*70/100; + int al2 = al-al1; + al1 /= 2; al2 /= 2; + fti[n++] = (fti_t){ NUT_FLAG_KEY, 16, i,240+al1,240-al1, al1*2 }; m+=al1*2-1; + fti[n++] = (fti_t){ NUT_FLAG_KEY, 2, i, 65+al2, 65-al2, al2*2 }; m+=al2*2-1; + break; + } + } + } + i = 255-n-m; + fti[n++] = (fti_t){ /*invalid 0xFF*/ FLAG_INVALID, 0, 0, i, 0, i }; + // the final framecode. flag, pts, stream, mul, size, count + fti[n++] = (fti_t){ -1 }; +} Modified: trunk/libnut/libnut.h ============================================================================== --- trunk/libnut/libnut.h (original) +++ trunk/libnut/libnut.h Fri Nov 17 17:52:04 2006 @@ -155,6 +155,9 @@ void nut_write_frame_reorder(nut_context_t * nut, const nut_packet_t * p, const uint8_t * buf); void nut_muxer_uninit_reorder(nut_context_t * nut); +/** generate framecode table input for the muxer. the fallback for the muxer if the muxer option is NULL */ +void nut_framecode_generate(const nut_stream_header_t s[], nut_frame_table_input_t fti[256]); + // Demuxer /** Just inits stuff, can never fail, except memory error... */ Modified: trunk/libnut/muxer.c ============================================================================== --- trunk/libnut/muxer.c (original) +++ trunk/libnut/muxer.c Fri Nov 17 17:52:04 2006 @@ -523,6 +523,7 @@ nut_context_t * nut_muxer_init(const nut_muxer_opts_t * mopts, const nut_stream_header_t s[], const nut_info_packet_t info[]) { nut_context_t * nut; + nut_frame_table_input_t * fti = mopts->fti, mfti[256]; int i, n; // TODO check that all input is valid @@ -549,24 +550,31 @@ if (nut->max_distance > 65536) nut->max_distance = 65536; + if (!fti) { + nut_framecode_generate(s, mfti); + fti = mfti; + } + fprintf(stderr, "/""/ { %4s, %3s, %6s, %3s, %4s, %5s },\n", "flag", "pts", "stream", "mul", "size", "count"); for (n=i=0; i < 256; n++) { int j; - assert(mopts->fti[n].flag != -1); + assert(fti[n].flag != -1); - for(j = 0; j < mopts->fti[n].count && i < 256; j++, i++) { + fprintf(stderr, " { %4d, %3d, %6d, %3d, %4d, %5d },\n", fti[n].flag, fti[n].pts, fti[n].stream, fti[n].mul, fti[n].size, fti[n].count); + for(j = 0; j < fti[n].count && i < 256; j++, i++) { if (i == 'N') { nut->ft[i].flags = FLAG_INVALID; j--; continue; } - nut->ft[i].flags = mopts->fti[n].flag; - nut->ft[i].pts_delta = mopts->fti[n].pts; - nut->ft[i].mul = mopts->fti[n].mul; - nut->ft[i].stream = mopts->fti[n].stream; - nut->ft[i].lsb = mopts->fti[n].size + j; + nut->ft[i].flags = fti[n].flag; + nut->ft[i].pts_delta = fti[n].pts; + nut->ft[i].mul = fti[n].mul; + nut->ft[i].stream = fti[n].stream; + nut->ft[i].lsb = fti[n].size + j; } } - assert(mopts->fti[n].flag == -1); + fprintf(stderr, " { %4d, %3d, %6d, %3d, %4d, %5d },\n", fti[n].flag, fti[n].pts, fti[n].stream, fti[n].mul, fti[n].size, fti[n].count); + assert(fti[n].flag == -1); nut->sync_overhead = 0; Modified: trunk/nututils/nutmerge.c ============================================================================== --- trunk/nututils/nutmerge.c (original) +++ trunk/nututils/nutmerge.c Fri Nov 17 17:52:04 2006 @@ -29,34 +29,6 @@ NULL }; -nut_frame_table_input_t ft_default[] = { - // There must be atleast this safety net: - //{ 4128, 0, 0, 1, 0, 1 }, - //{ flag, pts, stream, mul, size, count } - { 8192, 0, 0, 1, 0, 1 }, // invalid 0x00 - { 56, 0, 0, 1, 0, 1 }, // safety net non key frame - { 57, 0, 0, 1, 0, 1 }, // safety net key frame - { 4128, 0, 0, 1, 0, 1 }, // one more safety net - { 27, 0, 0, 1, 0, 1 }, // EOR frame - { 1, 1, 1, 337, 336, 1 }, // used 82427 times - { 1, 1, 1, 385, 384, 1 }, // used 56044 times - { 0, 2, 0, 7, 6, 1 }, // used 20993 times - { 0, 1, 0, 7, 6, 1 }, // used 10398 times - { 1, 1, 1, 481, 480, 1 }, // used 3527 times - { 1, 1, 1, 289, 288, 1 }, // used 2042 times - { 1, 1, 1, 577, 576, 1 }, // used 1480 times - { 1, 1, 1, 673, 672, 1 }, // used 862 times - { 1, 1, 1, 769, 768, 1 }, // used 433 times - { 1, 1, 1, 961, 960, 1 }, // used 191 times - { 32, 2, 0, 101, 0, 101 }, // "1.2.0" => 14187 - { 32, -1, 0, 40, 0, 40 }, // "1.-1.0" => 5707 - { 32, 1, 0, 81, 0, 81 }, // "1.1.0" => 11159 - { 33, 1, 0, 11, 0, 11 }, // "1.1.1" => 1409 - { 105, 0, 0, 6, 0, 6 }, // checksum for video - { 8192, 0, 0, 1, 0, 1 }, // invalid 0xFF - { -1, 0, 0, 0, 0, 0 }, // end -}; - void push_packet(stream_t * stream, packet_t * p) { if (stream->npackets == stream->packets_alloc) { stream->packets_alloc += 20; @@ -128,7 +100,7 @@ mopts.output = (nut_output_stream_t){ .priv = out, .write = NULL }; mopts.write_index = 1; mopts.realtime_stream = 0; - mopts.fti = ft_default; + mopts.fti = NULL; mopts.max_distance = 32768; mopts.alloc.malloc = NULL; nut = nut_muxer_init(&mopts, nut_stream, NULL);

1 0

[nut]: r224 - trunk/nututils/demux_avi.c
by ods15 17 Nov '06

17 Nov '06

Author: ods15 Date: Fri Nov 17 17:46:25 2006 New Revision: 224 Modified: trunk/nututils/demux_avi.c Log: make mpeg-4 fourcc mp4v in demux_avi Modified: trunk/nututils/demux_avi.c ============================================================================== --- trunk/nututils/demux_avi.c (original) +++ trunk/nututils/demux_avi.c Fri Nov 17 17:46:25 2006 @@ -368,7 +368,7 @@ avi->s[i].sh.codec_specific = avi->stream[i].extra; if (avi->stream[i].type == 0) { // video avi->s[i].sh.fourcc_len = 4; - avi->s[i].sh.fourcc = avi->stream[i].video->biCompression; + avi->s[i].sh.fourcc = (uint8_t*)"mp4v"; avi->s[i].codec_id = e_mpeg4; avi->s[i].sh.decode_delay = 1;

1 0

[nut]: r223 - in trunk/libnut: demuxer.c priv.h
by ods15 17 Nov '06

17 Nov '06

Author: ods15 Date: Fri Nov 17 16:25:44 2006 New Revision: 223 Modified: trunk/libnut/demuxer.c trunk/libnut/priv.h Log: get rid of nut->seek_state, keep in stream context Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Fri Nov 17 16:25:44 2006 @@ -1083,7 +1083,7 @@ return err; } -static int linear_search_seek(nut_context_t * nut, int backwards, seek_state_t * state, off_t start, off_t end, syncpoint_t * stopper) { +static int linear_search_seek(nut_context_t * nut, int backwards, off_t start, off_t end, syncpoint_t * stopper) { syncpoint_list_t * sl = &nut->syncpoints; int i, err = 0; off_t min_pos = 0; @@ -1129,7 +1129,7 @@ if (stopper && !stopper_syncpoint && buf_before > stopper->pos - stopper->back_ptr + 15) { int n = 1; stopper_syncpoint = buf_before; - for (i = 0; i < nut->stream_count; i++) if (!state[i].active && state[i].good_key) n = 0; + for (i = 0; i < nut->stream_count; i++) if (!nut->sc[i].state.active && nut->sc[i].state.good_key) n = 0; if (n) break; // no inactive streams have keyframes between stopper and stopper_syncpoint, stop now } if (buf_before != stopper_syncpoint) { // flush at every syncpoint - except stopper_syncpoint @@ -1141,19 +1141,19 @@ } } - if (state[pd.stream].active) { - if (end && pd.pts > state[pd.stream].pts) { // higher than requested pts + if (nut->sc[pd.stream].state.active) { + if (end && pd.pts > nut->sc[pd.stream].state.pts) { // higher than requested pts int n = 1; - state[pd.stream].pts_higher = 1; - for (i = 0; i < nut->stream_count; i++) if (state[i].active && !state[i].pts_higher) n = 0; + nut->sc[pd.stream].state.pts_higher = 1; + for (i = 0; i < nut->stream_count; i++) if (nut->sc[i].state.active && !nut->sc[i].state.pts_higher) n = 0; if (n) break; // pts for all active streams higher than requested pts } if (pd.flags & NUT_FLAG_KEY) { - if (pd.pts <= state[pd.stream].pts) { - state[pd.stream].good_key = buf_before; - if (pd.flags & NUT_FLAG_EOR) state[pd.stream].good_key = 0; + if (pd.pts <= nut->sc[pd.stream].state.pts) { + nut->sc[pd.stream].state.good_key = buf_before; + if (pd.flags & NUT_FLAG_EOR) nut->sc[pd.stream].state.good_key = 0; } - if (!end && pd.pts >= state[pd.stream].pts) { // forward seek end + if (!end && pd.pts >= nut->sc[pd.stream].state.pts) { // forward seek end nut->i->buf_ptr -= bctello(nut->i) - buf_before; break; } @@ -1163,11 +1163,11 @@ TO_PTS(stopper, stopper->pts) // only relavent if pts is smaller than stopper, and we passed stopper's back_ptr if (compare_ts(pd.pts, TO_TB(pd.stream), stopper_p, nut->tb[stopper_t]) < 0 && buf_before >= back_ptr) { - if (!stopper_syncpoint) state[pd.stream].good_key = 1; - else if (state[pd.stream].good_key) { + if (!stopper_syncpoint) nut->sc[pd.stream].state.good_key = 1; + else if (nut->sc[pd.stream].state.good_key) { int n = 1; - state[pd.stream].good_key = 0; - for (i = 0; i < nut->stream_count; i++) if (!state[i].active && state[i].good_key) n = 0; + nut->sc[pd.stream].state.good_key = 0; + for (i = 0; i < nut->stream_count; i++) if (!nut->sc[i].state.active && nut->sc[i].state.good_key) n = 0; // smart linear search stop // keyframe for every inactive stream (which had a keyframe in stopper area), after stopper_syncpoint if (n) break; @@ -1175,7 +1175,7 @@ } } // dts higher than requested pts - if (end && peek_dts(nut->sc[pd.stream].sh.decode_delay, nut->sc[pd.stream].pts_cache, pd.pts) > (int64_t)state[pd.stream].pts) break; + if (end && peek_dts(nut->sc[pd.stream].sh.decode_delay, nut->sc[pd.stream].pts_cache, pd.pts) > (int64_t)nut->sc[pd.stream].state.pts) break; CHECK(skip_buffer(nut->i, pd.len)); push_frame(nut, &pd); @@ -1183,12 +1183,12 @@ if (!end) goto err_out; // forward seek for (i = 0; i < nut->stream_count; i++) { - if (!state[i].active) continue; - if (state[i].good_key && (!min_pos || state[i].good_key < min_pos)) min_pos = state[i].good_key; + if (!nut->sc[i].state.active) continue; + if (nut->sc[i].state.good_key && (!min_pos || nut->sc[i].state.good_key < min_pos)) min_pos = nut->sc[i].state.good_key; } if (!min_pos) { fprintf(stderr, "BIG FAT WARNING\n"); - for (i = 0; i < nut->stream_count; i++) fprintf(stderr, "%d: %d\n", i, (int)state[i].good_key); + for (i = 0; i < nut->stream_count; i++) fprintf(stderr, "%d: %d\n", i, (int)nut->sc[i].state.good_key); min_pos = nut->seek_status >> 1; } @@ -1217,7 +1217,7 @@ if (err != NUT_ERR_EAGAIN) { // unless EAGAIN if (err) { if (err == NUT_ERR_NOT_SEEKABLE) { // a failed seek - then go back to before everything started - for (i = 0; i < nut->stream_count; i++) nut->sc[i].last_pts = state[i].old_last_pts; + for (i = 0; i < nut->stream_count; i++) nut->sc[i].last_pts = nut->sc[i].state.old_last_pts; seek_buf(nut->i, nut->before_seek, SEEK_SET); } else { // some NUT error, let's just go back to last good syncpoint err = 0; @@ -1237,29 +1237,28 @@ int nut_seek(nut_context_t * nut, double time_pos, int flags, const int * active_streams) { int err = 0; off_t start = 0, end = 0; - seek_state_t state[nut->stream_count]; int backwards = flags & 1 ? time_pos < 0 : 1; syncpoint_t stopper = { 0, 0, 0, 0, 0 }; if (!nut->i->isc.seek) return NUT_ERR_NOT_SEEKABLE; - if (!nut->before_seek) nut->before_seek = bctello(nut->i); - - if (!nut->seek_state) { + if (!nut->before_seek) { int i; + nut->before_seek = bctello(nut->i); + for (i = 0; i < nut->stream_count; i++) { - state[i].old_last_pts = nut->sc[i].last_pts; - state[i].active = active_streams ? 0 : 1; - state[i].good_key = state[i].pts_higher = 0; + nut->sc[i].state.old_last_pts = nut->sc[i].last_pts; + nut->sc[i].state.active = active_streams ? 0 : 1; + nut->sc[i].state.good_key = nut->sc[i].state.pts_higher = 0; } - if (active_streams) for (i = 0; active_streams[i] != -1; i++) state[active_streams[i]].active = 1; + if (active_streams) for (i = 0; active_streams[i] != -1; i++) nut->sc[active_streams[i]].state.active = 1; if (flags & 1) { // relative seek uint64_t orig_pts = 0; int orig_timebase = 0; for (i = 0; i < nut->stream_count; i++) { uint64_t dts = nut->sc[i].last_dts != -1 ? nut->sc[i].last_dts : nut->sc[i].last_pts; - if (!state[i].active) continue; + if (!nut->sc[i].state.active) continue; if (compare_ts(orig_pts, nut->tb[orig_timebase], dts, TO_TB(i)) < 0) { orig_pts = dts; orig_timebase = nut->sc[i].timebase_id; @@ -1269,11 +1268,10 @@ } if (time_pos < 0.) time_pos = 0.; - for (i = 0; i < nut->stream_count; i++) state[i].pts = (uint64_t)(time_pos / TO_TB(i).nom * TO_TB(i).den); + for (i = 0; i < nut->stream_count; i++) nut->sc[i].state.pts = (uint64_t)(time_pos / TO_TB(i).nom * TO_TB(i).den); nut->seek_time_pos = time_pos; nut->dopts.cache_syncpoints |= 2; } else { - memcpy(state, nut->seek_state, sizeof state); time_pos = nut->seek_time_pos; } @@ -1291,18 +1289,18 @@ if (!sl->s[i].pts_valid) continue; for (j = 0; j < nut->stream_count; j++) { uint64_t tmp; - if (!state[j].active) continue; + if (!nut->sc[j].state.active) continue; tmp = sl->pts[i * nut->stream_count + j]; if (tmp--) { // -- because all pts array is off-by-one. zero indicate no keyframe. - if (tmp > state[j].pts) { if (!last_sync) last_sync = i; } + if (tmp > nut->sc[j].state.pts) { if (!last_sync) last_sync = i; } else sync[j] = (i-1); } tmp = sl->eor[i * nut->stream_count + j]; - if (tmp--) if (tmp <= state[j].pts) sync[j] = -(i+1); // flag stream eor + if (tmp--) if (tmp <= nut->sc[j].state.pts) sync[j] = -(i+1); // flag stream eor } } for (i = 0; i < nut->stream_count; i++) { - if (!state[i].active) continue; + if (!nut->sc[i].state.active) continue; if (sync[i] < -1) { backup = MAX(backup, -sync[i] - 1); continue; } // eor stream if (good_sync == -2 || good_sync > sync[i]) good_sync = sync[i]; } @@ -1324,9 +1322,9 @@ if (start) { // "unsuccessful" seek needs no linear search if (!(flags & 2)) { // regular seek - CHECK(linear_search_seek(nut, backwards, state, start, end, stopper.pos ? &stopper : NULL)); + CHECK(linear_search_seek(nut, backwards, start, end, stopper.pos ? &stopper : NULL)); } else { // forwards seek, find keyframe - CHECK(linear_search_seek(nut, backwards, state, end, 0, NULL)); + CHECK(linear_search_seek(nut, backwards, end, 0, NULL)); } } fprintf(stderr, "DONE SEEK\n"); @@ -1335,18 +1333,12 @@ syncpoint_list_t * sl = &nut->syncpoints; flush_buf(nut->i); nut->before_seek = 0; - nut->alloc->free(nut->seek_state); - nut->seek_state = NULL; nut->dopts.cache_syncpoints &= ~2; if (!nut->dopts.cache_syncpoints && sl->len > 1) { sl->s[1] = sl->s[sl->len - 1]; sl->len = 2; sl->s[0].seen_next = 0; } - } else { - if (!nut->seek_state) nut->seek_state = nut->alloc->malloc(sizeof state); - if (!nut->seek_state) return NUT_ERR_OUT_OF_MEM; - memcpy(nut->seek_state, state, sizeof state); } return err; } @@ -1376,7 +1368,6 @@ nut->seek_status = 0; nut->before_seek = 0; nut->last_syncpoint = 0; - nut->seek_state = NULL; nut->alloc = &nut->dopts.alloc; @@ -1422,7 +1413,6 @@ nut->alloc->free(nut->tmp_buffer); // the caller's allocated stream list nut->alloc->free(nut->info); nut->alloc->free(nut->tb); - nut->alloc->free(nut->seek_state); free_buffer(nut->i); nut->alloc->free(nut); } Modified: trunk/libnut/priv.h ============================================================================== --- trunk/libnut/priv.h (original) +++ trunk/libnut/priv.h Fri Nov 17 16:25:44 2006 @@ -90,6 +90,14 @@ } reorder_packet_t; typedef struct { + int active; + uint64_t pts; // requested pts; + uint64_t old_last_pts; + off_t good_key; + int pts_higher; // for active streams +} seek_state_t; + +typedef struct { uint64_t last_key; // muxer.c, re-set to 0 on every keyframe uint64_t last_pts; int64_t last_dts; @@ -99,6 +107,7 @@ nut_stream_header_t sh; int64_t * pts_cache; int64_t eor; + seek_state_t state; // reorder.c int64_t next_pts; reorder_packet_t * packets; @@ -110,14 +119,6 @@ int total_frames; } stream_context_t; -typedef struct { - int active; - uint64_t pts; // requested pts; - uint64_t old_last_pts; - off_t good_key; - int pts_higher; // for active streams -} seek_state_t; - struct nut_context_s { nut_muxer_opts_t mopts; nut_demuxer_opts_t dopts; @@ -145,7 +146,6 @@ off_t before_seek; // position before any seek mess off_t seek_status; - seek_state_t * seek_state; // array per stream count double seek_time_pos; syncpoint_list_t syncpoints;

1 0

[nut]: r222 - in trunk: libnut/libnut.h libnut/muxer.c nututils/nutmerge.c
by ods15 17 Nov '06

17 Nov '06

Author: ods15 Date: Fri Nov 17 15:41:18 2006 New Revision: 222 Modified: trunk/libnut/libnut.h trunk/libnut/muxer.c trunk/nututils/nutmerge.c Log: some cleanups/changes to frame_table_input code Modified: trunk/libnut/libnut.h ============================================================================== --- trunk/libnut/libnut.h (original) +++ trunk/libnut/libnut.h Fri Nov 17 15:41:18 2006 @@ -56,14 +56,13 @@ } nut_stream_header_t; typedef struct { - int tmp_flag; // -1 => end - int tmp_fields; - int tmp_pts; // tmp_fields = 1 - int tmp_mul; // tmp_fields = 2 - int tmp_stream; // tmp_fields = 3 - int tmp_size; // tmp_fields = 4 - int count; // tmp_fields = 6 (5 is reserved) -} frame_table_input_t; + int flag; // -1 => end + int pts; + int stream; + int mul; + int size; + int count; +} nut_frame_table_input_t; typedef struct { void * (*malloc)(size_t size); @@ -105,7 +104,7 @@ int write_index; int realtime_stream; // implies no write_index int max_distance; - frame_table_input_t * fti; + nut_frame_table_input_t * fti; } nut_muxer_opts_t; typedef struct { Modified: trunk/libnut/muxer.c ============================================================================== --- trunk/libnut/muxer.c (original) +++ trunk/libnut/muxer.c Fri Nov 17 15:41:18 2006 @@ -523,7 +523,7 @@ nut_context_t * nut_muxer_init(const nut_muxer_opts_t * mopts, const nut_stream_header_t s[], const nut_info_packet_t info[]) { nut_context_t * nut; - int i; + int i, n; // TODO check that all input is valid if (mopts->alloc.malloc) nut = mopts->alloc.malloc(sizeof(nut_context_t)); @@ -549,37 +549,24 @@ if (nut->max_distance > 65536) nut->max_distance = 65536; - { - int j, n; - int flag, fields, 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) timestamp = mopts->fti[n].tmp_pts; - if (fields > 1) mul = mopts->fti[n].tmp_mul; - if (fields > 2) stream = mopts->fti[n].tmp_stream; - if (fields > 3) size = mopts->fti[n].tmp_size; - else size = 0; - if (fields > 5) count = mopts->fti[n].count; - else count = mul - size; + for (n=i=0; i < 256; n++) { + int j; + assert(mopts->fti[n].flag != -1); - for(j = 0; j < count && i < 256; j++, i++) { + for(j = 0; j < mopts->fti[n].count && i < 256; j++, i++) { if (i == 'N') { nut->ft[i].flags = FLAG_INVALID; j--; continue; } - nut->ft[i].flags = flag; - nut->ft[i].stream = stream; - nut->ft[i].mul = mul; - nut->ft[i].lsb = size + j; - nut->ft[i].pts_delta = timestamp; + nut->ft[i].flags = mopts->fti[n].flag; + nut->ft[i].pts_delta = mopts->fti[n].pts; + nut->ft[i].mul = mopts->fti[n].mul; + nut->ft[i].stream = mopts->fti[n].stream; + nut->ft[i].lsb = mopts->fti[n].size + j; } } - assert(mopts->fti[n].tmp_flag == -1); - } + assert(mopts->fti[n].flag == -1); nut->sync_overhead = 0; Modified: trunk/nututils/nutmerge.c ============================================================================== --- trunk/nututils/nutmerge.c (original) +++ trunk/nututils/nutmerge.c Fri Nov 17 15:41:18 2006 @@ -29,32 +29,32 @@ NULL }; -frame_table_input_t ft_default[] = { +nut_frame_table_input_t ft_default[] = { // There must be atleast this safety net: - //{ 4128, 3, 0, 1, 0, 0, 0 }, - //{ flag, fields, pts, mul, stream, size, count } - { 8192, 0, 0, 1, 0, 0, 0 }, // invalid 0x00 - { 56, 0, 0, 1, 0, 0, 0 }, // safety net non key frame - { 56, 0, 0, 1, 0, 0, 0 }, // safety net key frame - { 4128, 0, 0, 1, 0, 0, 0 }, // one more safety net - { 27, 0, 0, 1, 0, 0, 0 }, // EOR frame - { 1, 4, 1, 337, 1, 336, 0 }, // used 82427 times - { 1, 4, 1, 385, 1, 384, 0 }, // used 56044 times - { 0, 4, 2, 7, 0, 6, 0 }, // used 20993 times - { 0, 4, 1, 7, 0, 6, 0 }, // used 10398 times - { 1, 4, 1, 481, 1, 480, 0 }, // used 3527 times - { 1, 4, 1, 289, 1, 288, 0 }, // used 2042 times - { 1, 4, 1, 577, 1, 576, 0 }, // used 1480 times - { 1, 4, 1, 673, 1, 672, 0 }, // used 862 times - { 1, 4, 1, 769, 1, 768, 0 }, // used 433 times - { 1, 4, 1, 961, 1, 960, 0 }, // used 191 times - { 32, 3, 2, 101, 0, 0, 0 }, // "1.2.0" => 14187 - { 32, 3, -1, 40, 0, 0, 0 }, // "1.-1.0" => 5707 - { 32, 3, 1, 81, 0, 0, 0 }, // "1.1.0" => 11159 - { 33, 3, 1, 11, 0, 0, 0 }, // "1.1.1" => 1409 - { 105, 3, 0, 6, 0, 0, 0 }, // checksum for video - { 8192, 2, 0, 1, 0, 0, 0 }, // invalid 0xFF - { -1, 0, 0, 0, 0, 0, 0 }, // end + //{ 4128, 0, 0, 1, 0, 1 }, + //{ flag, pts, stream, mul, size, count } + { 8192, 0, 0, 1, 0, 1 }, // invalid 0x00 + { 56, 0, 0, 1, 0, 1 }, // safety net non key frame + { 57, 0, 0, 1, 0, 1 }, // safety net key frame + { 4128, 0, 0, 1, 0, 1 }, // one more safety net + { 27, 0, 0, 1, 0, 1 }, // EOR frame + { 1, 1, 1, 337, 336, 1 }, // used 82427 times + { 1, 1, 1, 385, 384, 1 }, // used 56044 times + { 0, 2, 0, 7, 6, 1 }, // used 20993 times + { 0, 1, 0, 7, 6, 1 }, // used 10398 times + { 1, 1, 1, 481, 480, 1 }, // used 3527 times + { 1, 1, 1, 289, 288, 1 }, // used 2042 times + { 1, 1, 1, 577, 576, 1 }, // used 1480 times + { 1, 1, 1, 673, 672, 1 }, // used 862 times + { 1, 1, 1, 769, 768, 1 }, // used 433 times + { 1, 1, 1, 961, 960, 1 }, // used 191 times + { 32, 2, 0, 101, 0, 101 }, // "1.2.0" => 14187 + { 32, -1, 0, 40, 0, 40 }, // "1.-1.0" => 5707 + { 32, 1, 0, 81, 0, 81 }, // "1.1.0" => 11159 + { 33, 1, 0, 11, 0, 11 }, // "1.1.1" => 1409 + { 105, 0, 0, 6, 0, 6 }, // checksum for video + { 8192, 0, 0, 1, 0, 1 }, // invalid 0xFF + { -1, 0, 0, 0, 0, 0 }, // end }; void push_packet(stream_t * stream, packet_t * p) {

1 0

r20982 - trunk/DOCS/tech/nut.txt
by michael 17 Nov '06

17 Nov '06

Author: michael Date: Fri Nov 17 14:32:45 2006 New Revision: 20982 Modified: trunk/DOCS/tech/nut.txt Log: clarify syncpoint placement recommanditions (note i would also like to add a "there MUST be 1 syncpoint per second" rule) Modified: trunk/DOCS/tech/nut.txt ============================================================================== --- trunk/DOCS/tech/nut.txt (original) +++ trunk/DOCS/tech/nut.txt Fri Nov 17 14:32:45 2006 @@ -920,9 +920,19 @@ Note, more complicated seeking methods exist which are capable of quickly seeking to the optimal point in the presence of an index even if only a -subset of all streams are active but a muxer SHOULD place syncpoints, -and keyframes if it can affect the placement of keyframes so that simple -low complexity seeking works with fine granularity +subset of all streams is active + +A muxer SHOULD place syncpoints so that that simple low complexity seeking +works with fine granularity, that is syncpoints should be placed prior +to keyframes instead of non keyframes and with high enough frequency +(once per second unless there are no keyframes between this and the previous +syncpoint) + +encoders SHOULD place keyframes so that the number of points where all +streams have a keyframe at the same time is maximized, this ensures that +seeking (complicated or not) does not need to demux and decode significant +amounts of data to reach a point where a presentable frame for each stream +is available after seeking Semantic requirements:

1 0

r20981 - trunk/DOCS/tech/nut.txt
by michael 17 Nov '06

17 Nov '06

Author: michael Date: Fri Nov 17 13:44:10 2006 New Revision: 20981 Modified: trunk/DOCS/tech/nut.txt Log: seeking Modified: trunk/DOCS/tech/nut.txt ============================================================================== --- trunk/DOCS/tech/nut.txt (original) +++ trunk/DOCS/tech/nut.txt Fri Nov 17 13:44:10 2006 @@ -901,6 +901,29 @@ search at a particular offset when any startcode is found (including syncpoint) +Seeking without an index (non-normative): +----------------------------------------- +A. backward seeking + 1. perform a binary search on the syncpoint timestamps finding the one + which is largest and <= the target timestamp +B. forward seeking + 1a. perform a binary search on the syncpoint timestamps finding the one + which is smallest and >= the target timestamp + 1b. perform a binary search on the syncpoint back pointers finding the + smallest one which has a back ptr >= the position of what was found in 1. +2. follow the back pointer to the correspoding syncpoint + +Seeking with an index (non-normative): +-------------------------------------- +The demuxer only has to find the appropriate keyframe in the index and +start demuxing from the previous syncpoint + +Note, more complicated seeking methods exist which are capable of quickly +seeking to the optimal point in the presence of an index even if only a +subset of all streams are active but a muxer SHOULD place syncpoints, +and keyframes if it can affect the placement of keyframes so that simple +low complexity seeking works with fine granularity + Semantic requirements: ======================

2 1

r20980 - trunk/DOCS/tech/nut.txt
by michael 17 Nov '06

17 Nov '06

Author: michael Date: Fri Nov 17 13:27:39 2006 New Revision: 20980 Modified: trunk/DOCS/tech/nut.txt Log: dts & synchronous decoder Modified: trunk/DOCS/tech/nut.txt ============================================================================== --- trunk/DOCS/tech/nut.txt (original) +++ trunk/DOCS/tech/nut.txt Fri Nov 17 13:27:39 2006 @@ -72,7 +72,8 @@ presentation time of the first frame/sample that is completed by decoding the coded frame. dts - of a frame is the time when it is input into the decoder + of a frame is the time when it is input into a synchronous 1-in-1-out + decoder Syntax:

1 0

[nut]: r221 - trunk/libnut/demuxer.c
by ods15 17 Nov '06

17 Nov '06

Author: ods15 Date: Fri Nov 17 13:06:20 2006 New Revision: 221 Modified: trunk/libnut/demuxer.c Log: add a FIXME note Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Fri Nov 17 13:06:20 2006 @@ -441,6 +441,7 @@ for (j = 0; j < nut->sc[i].sh.decode_delay; j++) nut->sc[i].pts_cache[j] = -1; } if (read_info) { + // FIXME this skip_reserved_headers() will skip INDEX_STARTCODE CHECK(skip_reserved_headers(nut, INFO_STARTCODE)); CHECK(get_bytes(nut->i, 8, &tmp)); while (tmp == INFO_STARTCODE) {

1 0

r20926 - trunk/DOCS/tech/nut.txt
by ods15 17 Nov '06

17 Nov '06

Author: ods15 Date: Tue Nov 14 18:03:33 2006 New Revision: 20926 Modified: trunk/DOCS/tech/nut.txt Log: allow info packets to appear in mid-stream, outside of main headers. these SHOULD NOT appear in non-realtime-streams Modified: trunk/DOCS/tech/nut.txt ============================================================================== --- trunk/DOCS/tech/nut.txt (original) +++ trunk/DOCS/tech/nut.txt Tue Nov 14 18:03:33 2006 @@ -187,11 +187,15 @@ packet_header, index_packet, packet_footer } if (!eof) while(next_code != main_startcode){ - if(next_code == syncpoint_startcode){ - packet_header, syncpoint, packet_footer - } - frame + packet_header, syncpoint, packet_footer + do{ + frame + }while(next_code == framecode); reserved_headers + while(next_code == info_startcode){ + packet_header, info_packet, packet_footer + reserved_headers + } } } @@ -883,9 +887,15 @@ Info: ----- -If a info packet is stored anywhere then a muxer MUST also store an identical +All info packets stored after a main header set MUST also have an identical info packet after every main-stream-header set +All info packets not stored after a main header set MUST have +chapter_id!=0 . + +Info packets SHOULD be written after main header sets in non realtime +streams. + If a demuxer has seen several info packets with the same chapter_id and stream_id then it MUST ignore all but the one with the highest position in the file

6 14