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

[NUT] (ods15): r85 - /trunk/mplayer.diff
by syncmail＠mplayerhq.hu 04 Mar '06

04 Mar '06

Author: ods15 Date: Sat Mar 4 16:50:53 2006 New Revision: 85 Log: up to date patch... Modified: trunk/mplayer.diff Modified: trunk/mplayer.diff ============================================================================== --- trunk/mplayer.diff (original) +++ trunk/mplayer.diff Sat Mar 4 16:50:53 2006 @@ -1,26 +1,26 @@ Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/Makefile,v -retrieving revision 1.330 -diff -u -r1.330 Makefile ---- Makefile 19 Aug 2005 19:24:30 -0000 1.330 -+++ Makefile 13 Sep 2005 19:28:19 -0000 -@@ -109,6 +109,7 @@ - $(W32_LIB) \ - $(DS_LIB) \ - libaf/libaf.a \ -+ ../nut/libnut/demuxer.o \ - libmpdemux/libmpdemux.a \ - input/libinput.a \ - postproc/libswscale.a \ +retrieving revision 1.341 +diff -u -r1.341 Makefile +--- Makefile 16 Feb 2006 20:45:24 -0000 1.341 ++++ Makefile 4 Mar 2006 15:46:04 -0000 +@@ -42,6 +42,7 @@ + sub_cc.c \ + subreader.c \ + vobsub.c \ ++ ../nut/libnut/demuxer.c \ + + SRCS_MENCODER = mencoder.c \ + mp_msg-mencoder.c \ Index: libmpdemux/Makefile =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/Makefile,v -retrieving revision 1.96 -diff -u -r1.96 Makefile ---- libmpdemux/Makefile 1 Aug 2005 20:16:56 -0000 1.96 -+++ libmpdemux/Makefile 13 Sep 2005 19:28:42 -0000 -@@ -72,6 +72,7 @@ +retrieving revision 1.101 +diff -u -r1.101 Makefile +--- libmpdemux/Makefile 6 Feb 2006 16:04:17 -0000 1.101 ++++ libmpdemux/Makefile 4 Mar 2006 15:46:06 -0000 +@@ -70,6 +70,7 @@ demux_mpc.c \ demux_mpg.c \ demux_nsv.c \ @@ -28,7 +28,7 @@ demux_nuv.c \ demux_ogg.c \ demux_pva.c \ -@@ -148,7 +149,7 @@ +@@ -158,7 +159,7 @@ OBJS = $(SRCS:.c=.o) OBJS += $(CPLUSPLUSSRCS:.cpp=.o) @@ -40,19 +40,19 @@ Index: libmpdemux/demuxer.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.c,v -retrieving revision 1.199 -diff -u -r1.199 demuxer.c ---- libmpdemux/demuxer.c 26 Aug 2005 17:40:01 -0000 1.199 -+++ libmpdemux/demuxer.c 13 Sep 2005 19:28:53 -0000 -@@ -61,6 +61,7 @@ - extern demuxer_desc_t demuxer_desc_rtp; +retrieving revision 1.217 +diff -u -r1.217 demuxer.c +--- libmpdemux/demuxer.c 17 Feb 2006 01:57:41 -0000 1.217 ++++ libmpdemux/demuxer.c 4 Mar 2006 15:46:06 -0000 +@@ -66,6 +66,7 @@ extern demuxer_desc_t demuxer_desc_lavf; + #endif extern demuxer_desc_t demuxer_desc_aac; +extern demuxer_desc_t demuxer_desc_nut; demuxer_desc_t* demuxer_list[] = { &demuxer_desc_rawaudio, -@@ -119,6 +120,7 @@ +@@ -125,6 +126,7 @@ &demuxer_desc_lavf, #endif &demuxer_desc_aac, @@ -63,10 +63,10 @@ Index: libmpdemux/demuxer.h =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.h,v -retrieving revision 1.80 -diff -u -r1.80 demuxer.h ---- libmpdemux/demuxer.h 26 Aug 2005 17:40:02 -0000 1.80 -+++ libmpdemux/demuxer.h 13 Sep 2005 19:28:54 -0000 +retrieving revision 1.91 +diff -u -r1.91 demuxer.h +--- libmpdemux/demuxer.h 17 Feb 2006 01:57:41 -0000 1.91 ++++ libmpdemux/demuxer.h 4 Mar 2006 15:46:07 -0000 @@ -50,11 +50,12 @@ #define DEMUXER_TYPE_MPC 40 #define DEMUXER_TYPE_MPEG_PES 41

1 0

CVS: main/DOCS/tech mpcf.txt,1.117,1.118
by Oded Shimon 03 Mar '06

03 Mar '06

On Wed, Mar 01, 2006 at 03:19:40PM +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-serv10365 > > Modified Files: > mpcf.txt > Log Message: > add forward_ptr to syncpoint (+0.006% overhead) > give syncpoint and frameheader their own checksums (worst case overhead increase <0.006%) > fix filestructure so that extendability is restored > move index_ptr to the fileend so that index packets arent a special case with their reserved_bytes position > -> all packets follow the same structure now > > remove "optional" word from info packets, they are not more optional then index packets > > split index packets > note, this is entirely optional and a muxer which has difficulty with it can always output a single index packet > > remove the index MUST be at the file end if anywher rule, its not needed anymore as index_ptr will always be at the end > > info frames must be keyframes > > last info frame is the most correct > > comments, flames? I'm not strongly against anything here, but it would've been better if you would have showed the patch (and resolved conflicts) before committing... :/ > index: > - index_startcode f(64) > - forward_ptr v > max_pts v > + syncpoint_start v Is syncpoint_start necessary? Seems redundant to me. BTW, it is non obvious from this spec that the index is split by syncpoints and how to use, it should be elaborated better (by an entry for syncpoint_start perhaps..) > +file: > + file_id_string > + while(bytes_left > 8){ I'm a bit weirded out by this, In a very extreme and silly example, in a truncated NUT file you could loose the last frame because it (and the frame header) was smaller than 8 bytes... > @@ -474,12 +508,15 @@ > 1 is_key if set, frame is keyframe > 2 end_of_relevance if set, stream has no relevance on > presentation. (EOR) > + 4 has_checksum if set then the frame header contains a checksum Like I said, this should be a NUT flag... > EOR frames MUST be zero-length and must be set keyframe. > All streams SHOULD end with EOR, where the pts of the EOR indicates the > end presentation time of the final frame. > An EOR set stream is unset by the first content frames. > EOR can only be unset in streams with zero decode_delay . > + has_checksum must be set if the frame is larger then 2*max_distance or its I still feel this should be a seperate variable, the only reason you gave so far against it is that poor demuxers won't be able to decide... And IMO that's a very poor argument... > @@ -612,11 +645,8 @@ > that EOR. EOR is unset by the first keyframe after it. > > index_ptr > - Length in bytes of the entire index, from the first byte of the > - startcode until the last byte of the checksum. > - Note: A demuxer can use this to find the index when it is written at > - EOF, as index_ptr will always be 12 bytes before the end of file if > - there is an index at all. > + absolute location in the file of the first byte of the startcode of the > + first index packet, or 0 if there is no index This would be a silly argument, but it does limit the filesize to 64 bits... Doesn't matter, it's not very different from limiting the index to 64 bits... > Info tags: > ---------- > @@ -630,6 +660,8 @@ > file. Positive chapter_id's are real chapters and MUST NOT overlap. > Negative chapter_id indicate a sub region of file and not a real > chapter. chapter_id MUST be unique to the region it represents. > + chapter_id n MUST not be used unless there are at least n chapters in the > + file Could you explain this, I'm confused... - ods15

3 19

flags cleanup
by Michael Niedermayer 03 Mar '06

03 Mar '06

Hi $subj, patch attached -- Michael

2 3

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

01 Mar '06

Author: ods15 Date: Wed Mar 1 23:57:11 2006 New Revision: 84 Log: some cosmetics Modified: trunk/libnut/demuxer.c Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Wed Mar 1 23:57:11 2006 @@ -105,7 +105,7 @@ int i; if (ready_read_buf(bc, count) < count) return buf_eof(bc); *val = 0; - for(i = 0; i < count; i++){ + for (i = 0; i < count; i++) { *val = (*val << 8) | *(bc->buf_ptr++); } return 0; @@ -116,7 +116,7 @@ *val = 0; do { len = ready_read_buf(bc, 16); - for(i = 0; i < len; i++){ + for (i = 0; i < len; i++) { uint8_t tmp= *(bc->buf_ptr++); *val = (*val << 7) | (tmp & 0x7F); if (!(tmp & 0x80)) return 0; @@ -157,7 +157,7 @@ #define get_s_(bc, var, name) get_s(bc, var) #endif -#define CHECK(expr) do { int _a; if ((_a = (expr))) { err = _a; goto err_out; } } while(0) +#define CHECK(expr) do { if ((err = (expr))) goto err_out; } while(0) #define ERROR(expr, code) do { if (expr) { err = code; goto err_out; } } while(0) #define GET_V(bc, v) do { uint64_t _tmp; CHECK(get_v_((bc), &_tmp, #v)); (v) = _tmp; } while(0) #define GET_S(bc, v) do { int64_t _tmp; CHECK(get_s_((bc), &_tmp, #v)); (v) = _tmp; } while(0) @@ -569,7 +569,7 @@ ERROR(compare_ts(nut, pd->pts, pd->stream, nut->sc[i].last_dts, i) < 0, -ERR_OUT_OF_ORDER); } - if (saw_syncpoint) *saw_syncpoint = after_sync; + if (saw_syncpoint) *saw_syncpoint = !!after_sync; err_out: return err; } @@ -737,12 +737,8 @@ off_t pos = bctello(nut->i); uint64_t tmp; CHECK(get_bytes(nut->i, 8, &tmp)); - if (tmp == INDEX_STARTCODE) { - GET_V(nut->i, tmp); - nut->before_seek = bctello(nut->i) + tmp; - nut->seek_status = 2; - } - nut->i->buf_ptr -= bctello(nut->i) - pos; + if (tmp == INDEX_STARTCODE) nut->seek_status = 2; + nut->i->buf_ptr -= 8; flush_buf(nut->i); } nut->last_headers = 1; @@ -768,7 +764,7 @@ err = 0; } nut->seek_status = 0; - seek_buf(nut->i, nut->before_seek, SEEK_SET); + if (nut->before_seek) seek_buf(nut->i, nut->before_seek, SEEK_SET); nut->before_seek = 0; } *s = malloc(sizeof(nut_stream_header_t) * (nut->stream_count + 1));

1 0