- NUT-devel - lists.mplayerhq.hu

[nut]: r580 - src/trunk/nututils/nutparse.c
by ods15 04 Feb '08

04 Feb '08

Author: ods15 Date: Mon Feb 4 11:56:48 2008 New Revision: 580 Log: make nutparse a little more useful in finding the syncpoint a backptr is pointing to. Modified: src/trunk/nututils/nutparse.c Modified: src/trunk/nututils/nutparse.c ============================================================================== --- src/trunk/nututils/nutparse.c (original) +++ src/trunk/nututils/nutparse.c Mon Feb 4 11:56:48 2008 @@ -462,7 +462,7 @@ static void parse_stream_header(void) } } -static void parse_syncpoint(void) +static void parse_syncpoint(uint64_t pos) { uint64_t value, pts; int tbid, i; @@ -476,7 +476,7 @@ static void parse_syncpoint(void) for (i = 0; i < stream_count; ++i) streams[i].last_pts = convert_ts(pts, tbid, streams[i].time_base_id); value = read_var(); - printf(" back_ptr_div16: %"PRIu64" (%"PRIu64")\n", value, value * 16 + 15); + printf(" back_ptr_div16: %"PRIu64" (%"PRIu64") -> 0x%"PRIx64"\n", value, value * 16 + 15, pos - (value * 16 + 15)); } static void parse_index(void) @@ -623,6 +623,8 @@ static void parse_packet(void) uint64_t forward_ptr; uint32_t checksum, actual_checksum; uint64_t end_pos; + uint64_t packet_start = file_position - 1; + int i; /* TODO: check max_distance */ startcode = read_fixed(7) | ((uint64_t)'N' << 56); @@ -646,7 +648,9 @@ static void parse_packet(void) printf("unknown_packet"); break; } - printf(" at 0x%"PRIx64"\n", file_position - 8); + printf(" at 0x%"PRIx64" [0x%"PRIx64, packet_start, packet_start - 1); + for (i = 2; i < 16; i++) printf(" 0x%"PRIx64, packet_start - i); + printf("]\n"); printf(" startcode: 0x%016"PRIx64"\n", startcode); forward_ptr = read_var_restricted(); printf(" forward_ptr: %"PRIu64"\n", forward_ptr); @@ -667,7 +671,7 @@ static void parse_packet(void) parse_stream_header(); break; case SYNCPOINT_STARTCODE: - parse_syncpoint(); + parse_syncpoint(packet_start); break; case INDEX_STARTCODE: end_pos -= 8; /* special handling for index_ptr behind reserved_bytes */

1 0

[nut]: r579 - in src/trunk: Makefile nututils/demux_nut.c
by ods15 04 Feb '08

04 Feb '08

Author: ods15 Date: Mon Feb 4 11:55:34 2008 New Revision: 579 Log: remove demux_nut.c Removed: src/trunk/nututils/demux_nut.c Modified: src/trunk/Makefile Modified: src/trunk/Makefile ============================================================================== --- src/trunk/Makefile (original) +++ src/trunk/Makefile Mon Feb 4 11:55:34 2008 @@ -19,7 +19,7 @@ $(LIBNUT_OBJS): libnut/priv.h libnut/lib nututils: $(NUTUTILS_PROGS) -nututils/nutmerge: nututils/demux_avi.c nututils/demux_ogg.c nututils/framer_mp3.c nututils/framer_mpeg4.c nututils/framer_vorbis.c nututils/nutmerge.h libnut/libnut.a # nututils/demux_nut.c +nututils/nutmerge: nututils/demux_avi.c nututils/demux_ogg.c nututils/framer_mp3.c nututils/framer_mpeg4.c nututils/framer_vorbis.c nututils/nutmerge.h libnut/libnut.a $(NUTUTILS_PROGS): CFLAGS += -Ilibnut

1 0

multiple docs directories
by Diego Biurrun 04 Feb '08

04 Feb '08

In the repository we have multiple docs directories: ./docs: draft-niedermayer-nut-00.xml nut.txt oggless-xiph-codecs.txt ./src/trunk/docs: draft-xiph-oggless-00.xml nut-english.txt The latter one seems to be bogus and probably a remnant from before the repositories were merged. I suggest moving the two documents into the top-level docs/ directory and removing the docs directory below src/. Diego

1 1

[nut]: r578 - homepage/index.html
by diego 04 Feb '08

04 Feb '08

Author: diego Date: Mon Feb 4 11:43:58 2008 New Revision: 578 Log: Remove silly link pointing back to the index page. Modified: homepage/index.html Modified: homepage/index.html ============================================================================== --- homepage/index.html (original) +++ homepage/index.html Mon Feb 4 11:43:58 2008 @@ -16,7 +16,6 @@ <center> - [<a href="index.html">Main Page and News</a>] [<a href="http://svn.mplayerhq.hu/nut/docs/nut.txt?view=co">Specification</a>] [<a href="http://lists.mplayerhq.hu/mailman/listinfo/nut-devel">Mailing List</a>] </center> @@ -49,7 +48,6 @@ and dynamic index generation during play </p> <center> - [<a href="index.html">Main Page and News</a>] [<a href="http://svn.mplayerhq.hu/nut/docs/nut.txt?view=co">Specification</a>] [<a href="http://lists.mplayerhq.hu/mailman/listinfo/nut-devel">Mailing List</a>] </center>

1 0

[nut]: r577 - docs/draft-xiph-oggless-00.xml docs/nut-english.txt src/trunk/docs
by diego 04 Feb '08

04 Feb '08

Author: diego Date: Mon Feb 4 11:42:30 2008 New Revision: 577 Log: Merge both docs directories into one. Added: docs/draft-xiph-oggless-00.xml - copied unchanged from r573, /src/trunk/docs/draft-xiph-oggless-00.xml docs/nut-english.txt - copied unchanged from r573, /src/trunk/docs/nut-english.txt Removed: src/trunk/docs/

1 0

[nut]: r545 - src/trunk/nututils/nutparse.c
by ods15 04 Feb '08

04 Feb '08

Author: ods15 Date: Sat Feb 2 13:07:53 2008 New Revision: 545 Log: Warning fixes to nutparse.c Modified: src/trunk/nututils/nutparse.c Modified: src/trunk/nututils/nutparse.c ============================================================================== --- src/trunk/nututils/nutparse.c (original) +++ src/trunk/nututils/nutparse.c Sat Feb 2 13:07:53 2008 @@ -182,11 +182,6 @@ static int64_t read_svar(void) return convert_to_signed(read_var()); } -static int64_t read_svar_restricted(void) -{ - return convert_to_signed(read_var_restricted()); -} - static uint64_t convert_ts(uint64_t t, int tb_from, int tb_to) { uint64_t ln = time_bases[tb_from].num * time_bases[tb_to].denom; @@ -451,7 +446,7 @@ static void parse_stream_header(void) if (value && gcd(value, value2) != 1) error("sample_width/height must be relatively prime"); printf(" colorspace_type: %"PRIu64"\n", read_var()); - } else if (class = 1) { + } else if (class == 1) { value = read_var(); printf(" samplerate_num: %"PRIu64"\n", value); if (!value) @@ -491,7 +486,7 @@ static void parse_index(void) uint64_t last_pos; int64_t last_pts; uint64_t j, x, xx, n, a, b; - int tbid, i, type, flag, has_keyframe; + int tbid, i, type, flag = 0, has_keyframe; if (stream_count < 0) error("no main_header before index"); @@ -704,7 +699,7 @@ static void parse_frame(int frame_type) uint64_t value; uint64_t frame_flags; uint64_t stream_id; - uint64_t coded_pts; + uint64_t coded_pts = 0; int64_t pts_delta; uint64_t data_size_msb; uint64_t reserved_count;

3 2

[nut]: r568 - src/trunk/Makefile
by diego 03 Feb '08

03 Feb '08

Author: diego Date: Sat Feb 2 14:56:45 2008 New Revision: 568 Log: Install shared library as well. Modified: src/trunk/Makefile Modified: src/trunk/Makefile ============================================================================== --- src/trunk/Makefile (original) +++ src/trunk/Makefile Sat Feb 2 14:56:45 2008 @@ -27,7 +27,7 @@ install: install-libnut install-nututils install-libnut: libnut install -d $(prefix)/lib - install -m 644 libnut/libnut.a $(prefix)/lib + install -m 644 libnut/libnut.a libnut/libnut.so $(prefix)/lib install -d $(prefix)/include install -m 644 libnut/libnut.h $(prefix)/include

3 4

[nut]: r576 - src/trunk/Makefile
by diego 03 Feb '08

03 Feb '08

Author: diego Date: Sun Feb 3 20:13:25 2008 New Revision: 576 Log: Separate headers and shared library installation into their own targets. Modified: src/trunk/Makefile Modified: src/trunk/Makefile ============================================================================== --- src/trunk/Makefile (original) +++ src/trunk/Makefile Sun Feb 3 20:13:25 2008 @@ -25,10 +25,15 @@ $(NUTUTILS_PROGS): CFLAGS += -Ilibnut install: install-libnut install-nututils -install-libnut: libnut +install-libnut: libnut install-libnut-headers install -d $(prefix)/lib install -m 644 libnut/libnut.a $(prefix)/lib - test -e libnut/libnut.so && install -m 644 libnut/libnut.so $(prefix)/lib + +install-libnut-shared: libnut/libnut.so install-libnut-headers + install -d $(prefix)/lib + install -m 644 libnut/libnut.so $(prefix)/lib + +install-libnut-headers: install -d $(prefix)/include install -m 644 libnut/libnut.h $(prefix)/include

1 0

[nut]: r575 - src/trunk/Makefile
by diego 03 Feb '08

03 Feb '08

Author: diego Date: Sun Feb 3 20:04:02 2008 New Revision: 575 Log: Do not build shared lib by default and install shared lib only if they exist. Modified: src/trunk/Makefile Modified: src/trunk/Makefile ============================================================================== --- src/trunk/Makefile (original) +++ src/trunk/Makefile Sun Feb 3 20:04:02 2008 @@ -5,7 +5,7 @@ NUTUTILS_PROGS = nututils/nutmerge nutut all: libnut nututils -libnut: libnut/libnut.a libnut/libnut.so +libnut: libnut/libnut.a libnut/libnut.a: $(LIBNUT_OBJS) rm -f $@ @@ -27,7 +27,8 @@ install: install-libnut install-nututils install-libnut: libnut install -d $(prefix)/lib - install -m 644 libnut/libnut.a libnut/libnut.so $(prefix)/lib + install -m 644 libnut/libnut.a $(prefix)/lib + test -e libnut/libnut.so && install -m 644 libnut/libnut.so $(prefix)/lib install -d $(prefix)/include install -m 644 libnut/libnut.h $(prefix)/include

1 0

[nut]: r574 - src/trunk/Makefile
by diego 03 Feb '08

03 Feb '08

Author: diego Date: Sun Feb 3 19:55:28 2008 New Revision: 574 Log: Remove the shared lib upon uninstall. Modified: src/trunk/Makefile Modified: src/trunk/Makefile ============================================================================== --- src/trunk/Makefile (original) +++ src/trunk/Makefile Sun Feb 3 19:55:28 2008 @@ -39,6 +39,7 @@ uninstall: uninstall-libnut uninstall-nu uninstall-libnut: rm -f $(prefix)/lib/libnut.a + rm -f $(prefix)/lib/libnut.so rm -f $(prefix)/include/libnut.h uninstall-nututils:

1 0