February 2008 - NUT-devel - lists.mplayerhq.hu

[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

[nut]: r573 - docs/nut.txt
by diego 03 Feb '08

03 Feb '08

Author: diego Date: Sun Feb 3 17:59:52 2008 New Revision: 573 Log: wording improvements suggested by Mans Modified: docs/nut.txt Modified: docs/nut.txt ============================================================================== --- docs/nut.txt (original) +++ docs/nut.txt Sun Feb 3 17:59:52 2008 @@ -61,8 +61,8 @@ keyframe * Starting decoding at a subsequent frame would cause fewer frames to be decoded successfully. - Successful decoding here means that the specific frame is virtually - identical to what one would get if decoding would have begun from + Successful decoding here means that a specific decoded frame is + virtually identical to what one would get, had decoding begun from the very first frame. Note, "virtually identical" is used here instead of "identical" to allow codecs which converge toward the same output when started from different

1 0

[nut]: r572 - docs/nut.txt
by diego 03 Feb '08

03 Feb '08

Author: diego Date: Sun Feb 3 17:29:59 2008 New Revision: 572 Log: spelling/wording Modified: docs/nut.txt Modified: docs/nut.txt ============================================================================== --- docs/nut.txt (original) +++ docs/nut.txt Sun Feb 3 17:29:59 2008 @@ -54,18 +54,19 @@ keyframe A keyframe is a frame from which you can start decoding, a more exact definition is below - A frame in a stream is a keyframe if and only if all of the following are true - * Decoding can successfully begin using any standard compliant decoder without - requireing access to prior frames. - * Begining decoding instead at a subsequent frame would cause fewer frames + A frame in a stream is a keyframe if and only if all of the following + are true: + * Decoding can successfully begin using any standard-compliant decoder + without requiring access to prior frames. + * Starting decoding at a subsequent frame would cause fewer frames to be decoded successfully. - successfull decoding here means that the specific frame is virtually - identical to what one would get if decoding would have begun from the very - first frame - Note, "virtually identical" here is used instead of "identical" to allow + Successful decoding here means that the specific frame is virtually + identical to what one would get if decoding would have begun from + the very first frame. + Note, "virtually identical" is used here instead of "identical" to allow codecs which converge toward the same output when started from different - points but dont neccessarily ever reach exactly identical output. + points but do not necessarily ever reach exactly identical output. Every frame which is marked as a keyframe MUST be a keyframe according to the definition above, a muxer MUST mark every frame it knows is a keyframe

3 2

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

03 Feb '08

Author: diego Date: Fri Feb 1 20:17:05 2008 New Revision: 541 Log: Merge clean and distclean rules. Modified: src/trunk/Makefile Modified: src/trunk/Makefile ============================================================================== --- src/trunk/Makefile (original) +++ src/trunk/Makefile Fri Feb 1 20:17:05 2008 @@ -11,10 +11,7 @@ nututils: libnut install: $(MAKE) -C libnut install - -distclean: clean - -clean: +clean distclean: $(MAKE) -C libnut clean $(MAKE) -C nututils clean

2 1

[nut]: r549 - src/trunk/libnut/framecode.c
by ods15 02 Feb '08

02 Feb '08

Author: ods15 Date: Sat Feb 2 13:25:06 2008 New Revision: 549 Log: Warning fixes Modified: src/trunk/libnut/framecode.c Modified: src/trunk/libnut/framecode.c ============================================================================== --- src/trunk/libnut/framecode.c (original) +++ src/trunk/libnut/framecode.c Sat Feb 2 13:25:06 2008 @@ -41,11 +41,11 @@ void nut_framecode_generate(const nut_st 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)) { + if (s[i].fourcc_len == 4 && !strncmp((char*)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)) { + } else if (s[i].fourcc_len == 4 && !strncmp((char*)s[i].fourcc, "h264", 4)) { consume[i] = e_consume_h264; } else { consume[i] = e_consume_video; @@ -54,13 +54,13 @@ void nut_framecode_generate(const nut_st 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)) { + if (s[i].fourcc_len == 4 && !strncmp((char*)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)) { + } else if (s[i].fourcc_len == 4 && !strncmp((char*)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 };

3 3