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

[nut]: r141 - trunk/libnut/Makefile
by ods15 22 Sep '06

22 Sep '06

Author: ods15 Date: Fri Sep 22 12:08:40 2006 New Revision: 141 Modified: trunk/libnut/Makefile Log: update make clean to libnut.a Modified: trunk/libnut/Makefile ============================================================================== --- trunk/libnut/Makefile (original) +++ trunk/libnut/Makefile Fri Sep 22 12:08:40 2006 @@ -12,5 +12,6 @@ .c.o: priv.h nut.h ${CC} ${CFLAGS} $^ -c -o $@ + clean: - rm -f *\~ libnut.so *.o + rm -f *\~ libnut.so libnut.a *.o

1 0

[nut]: r140 - trunk/libnut/Makefile
by ods15 22 Sep '06

22 Sep '06

Author: ods15 Date: Fri Sep 22 12:08:10 2006 New Revision: 140 Modified: trunk/libnut/Makefile Log: keep the option for libnut.so Modified: trunk/libnut/Makefile ============================================================================== --- trunk/libnut/Makefile (original) +++ trunk/libnut/Makefile Fri Sep 22 12:08:10 2006 @@ -7,6 +7,9 @@ ${AR} rc $@ $^ $(RANLIB) $@ +libnut.so: muxer.o demuxer.o reorder.o + ${CC} ${CFLAGS} -shared $^ -o $@ + .c.o: priv.h nut.h ${CC} ${CFLAGS} $^ -c -o $@ clean:

1 0

[nut]: r139 - in trunk: config.mak libnut/Makefile nututils/Makefile
by ods15 22 Sep '06

22 Sep '06

Author: ods15 Date: Fri Sep 22 12:06:34 2006 New Revision: 139 Modified: trunk/config.mak trunk/libnut/Makefile trunk/nututils/Makefile Log: default to static compilation Modified: trunk/config.mak ============================================================================== --- trunk/config.mak (original) +++ trunk/config.mak Fri Sep 22 12:06:34 2006 @@ -5,5 +5,5 @@ CFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 CC = cc - - +RANLIB = ranlib +AR = ar Modified: trunk/libnut/Makefile ============================================================================== --- trunk/libnut/Makefile (original) +++ trunk/libnut/Makefile Fri Sep 22 12:06:34 2006 @@ -1,10 +1,13 @@ include ../config.mak -all: libnut.so +all: libnut.a + +libnut.a: muxer.o demuxer.o reorder.o + rm -f $@ + ${AR} rc $@ $^ + $(RANLIB) $@ -libnut.so: muxer.o demuxer.o reorder.o - ${CC} ${CFLAGS} -shared $^ -o $@ .c.o: priv.h nut.h - ${CC} ${CFLAGS} -fPIC $^ -c -o $@ + ${CC} ${CFLAGS} $^ -c -o $@ clean: rm -f *\~ libnut.so *.o Modified: trunk/nututils/Makefile ============================================================================== --- trunk/nututils/Makefile (original) +++ trunk/nututils/Makefile Fri Sep 22 12:06:34 2006 @@ -8,7 +8,7 @@ ${CC} ${CFLAGS} -DAVI_PROG $^ -o $@ oggreader: demux_ogg.c ${CC} ${CFLAGS} -DOGG_PROG $^ -o $@ -nutmerge: demux_ogg.c demux_avi.c framer_vorbis.c framer_mpeg4.c nutmerge.c ../libnut/libnut.so # demux_nut.c +nutmerge: demux_ogg.c demux_avi.c framer_vorbis.c framer_mpeg4.c nutmerge.c ../libnut/libnut.a # demux_nut.c ${CC} ${CFLAGS} $^ -o $@ nutindex: nutindex.c ${CC} ${CFLAGS} $^ -o $@

1 0

Not to be mistaken ...
by Jörg Hartmann 18 Sep '06

18 Sep '06

I did not say that mpeg-ts would be great or that there was no need for a better transport stream. I only said that you guys should take the protocol part of is seriously into consideration -- already when designing the container that shall later on be extended (well, yes -- that's what you'll come to do) for true live streaming. Because there simple is no protocol that can efficiently translate a container into a good live stream. And there will never be, unless both are designed together or as one. You have two choices: Create two (compatible) NUT variants (one container and one true transport stream, where the latter should be easily translatable into the container-only variant) or create a pair container and protocol (designed from the ground to add up to an efficient transport stream).

1 0

[nut]: r138 - in trunk: demux_nut.c mplayer.diff
by ods15 17 Sep '06

17 Sep '06

Author: ods15 Date: Sun Sep 17 11:53:35 2006 New Revision: 138 Removed: trunk/demux_nut.c trunk/mplayer.diff Log: moved demux_nut to MPlayer repo

1 0

[nut]: r137 - in trunk/nututils: demux_avi.c demux_nut.c demux_ogg.c framer_mpeg4.c framer_vorbis.c nutindex.c nutmerge.c nutmerge.h
by ods15 17 Sep '06

17 Sep '06

Author: ods15 Date: Sun Sep 17 11:46:03 2006 New Revision: 137 Modified: trunk/nututils/demux_avi.c trunk/nututils/demux_nut.c trunk/nututils/demux_ogg.c trunk/nututils/framer_mpeg4.c trunk/nututils/framer_vorbis.c trunk/nututils/nutindex.c trunk/nututils/nutmerge.c trunk/nututils/nutmerge.h Log: Add license headers to nututils.. Modified: trunk/nututils/demux_avi.c ============================================================================== --- trunk/nututils/demux_avi.c (original) +++ trunk/nututils/demux_avi.c Sun Sep 17 11:46:03 2006 @@ -1,3 +1,6 @@ +// (C) 2005-2006 Oded Shimon +// This file is available under the MIT/X license, see LICENSE + #include "nutmerge.h" #include <string.h> Modified: trunk/nututils/demux_nut.c ============================================================================== --- trunk/nututils/demux_nut.c (original) +++ trunk/nututils/demux_nut.c Sun Sep 17 11:46:03 2006 @@ -1,3 +1,6 @@ +// (C) 2005-2006 Oded Shimon +// This file is available under the MIT/X license, see LICENSE + #include "nutmerge.h" #define ABS(x) MAX(x,-x) Modified: trunk/nututils/demux_ogg.c ============================================================================== --- trunk/nututils/demux_ogg.c (original) +++ trunk/nututils/demux_ogg.c Sun Sep 17 11:46:03 2006 @@ -1,3 +1,6 @@ +// (C) 2005-2006 Oded Shimon +// This file is available under the MIT/X license, see LICENSE + #include <stdio.h> #include <string.h> #include <inttypes.h> Modified: trunk/nututils/framer_mpeg4.c ============================================================================== --- trunk/nututils/framer_mpeg4.c (original) +++ trunk/nututils/framer_mpeg4.c Sun Sep 17 11:46:03 2006 @@ -1,3 +1,6 @@ +// (C) 2005-2006 Oded Shimon +// This file is available under the MIT/X license, see LICENSE + #include "nutmerge.h" struct framer_priv_s { Modified: trunk/nututils/framer_vorbis.c ============================================================================== --- trunk/nututils/framer_vorbis.c (original) +++ trunk/nututils/framer_vorbis.c Sun Sep 17 11:46:03 2006 @@ -1,3 +1,6 @@ +// (C) 2005-2006 Oded Shimon +// This file is available under the MIT/X license, see LICENSE + #include <string.h> #include "nutmerge.h" Modified: trunk/nututils/nutindex.c ============================================================================== --- trunk/nututils/nutindex.c (original) +++ trunk/nututils/nutindex.c Sun Sep 17 11:46:03 2006 @@ -1,3 +1,6 @@ +// (C) 2005-2006 Oded Shimon +// This file is available under the MIT/X license, see LICENSE + #include <stdio.h> #include <stdlib.h> #include <inttypes.h> Modified: trunk/nututils/nutmerge.c ============================================================================== --- trunk/nututils/nutmerge.c (original) +++ trunk/nututils/nutmerge.c Sun Sep 17 11:46:03 2006 @@ -1,3 +1,6 @@ +// (C) 2005-2006 Oded Shimon +// This file is available under the MIT/X license, see LICENSE + #include "nutmerge.h" #include <math.h> #include <string.h> Modified: trunk/nututils/nutmerge.h ============================================================================== --- trunk/nututils/nutmerge.h (original) +++ trunk/nututils/nutmerge.h Sun Sep 17 11:46:03 2006 @@ -1,3 +1,6 @@ +// (C) 2005-2006 Oded Shimon +// This file is available under the MIT/X license, see LICENSE + #include <inttypes.h> #include <stdlib.h> #include <stdio.h>

1 0

[nut]: r136 - in trunk/libnut: demuxer.c muxer.c nut.h priv.h reorder.c
by ods15 17 Sep '06

17 Sep '06

Author: ods15 Date: Sun Sep 17 11:25:23 2006 New Revision: 136 Modified: trunk/libnut/demuxer.c trunk/libnut/muxer.c trunk/libnut/nut.h trunk/libnut/priv.h trunk/libnut/reorder.c Log: add license headers in libnut files make seek output a bit more mplayer friendly Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Sun Sep 17 11:25:23 2006 @@ -1,3 +1,6 @@ +// (C) 2005-2006 Oded Shimon +// This file is available under the MIT/X license, see LICENSE + #include <inttypes.h> #include <stdlib.h> #include <stdio.h> @@ -1208,7 +1211,7 @@ } if (start == 0) CHECK(binary_search_syncpoint(nut, time_pos, &start, &end, &stopper)); - else fprintf(stderr, "============= NO BINARY SEARCH\n"); + else fprintf(stderr, "============= NO BINARY SEARCH \n"); if (start) { // "unsuccessful" seek needs no linear search if (!(flags & 2)) { // regular seek Modified: trunk/libnut/muxer.c ============================================================================== --- trunk/libnut/muxer.c (original) +++ trunk/libnut/muxer.c Sun Sep 17 11:25:23 2006 @@ -1,3 +1,6 @@ +// (C) 2005-2006 Oded Shimon +// This file is available under the MIT/X license, see LICENSE + #include <inttypes.h> #include <stdlib.h> #include <stdio.h> Modified: trunk/libnut/nut.h ============================================================================== --- trunk/libnut/nut.h (original) +++ trunk/libnut/nut.h Sun Sep 17 11:25:23 2006 @@ -1,3 +1,6 @@ +// (C) 2005-2006 Oded Shimon +// This file is available under the MIT/X license, see LICENSE + #ifndef _NUT_H #define _NUT_H Modified: trunk/libnut/priv.h ============================================================================== --- trunk/libnut/priv.h (original) +++ trunk/libnut/priv.h Sun Sep 17 11:25:23 2006 @@ -1,3 +1,6 @@ +// (C) 2005-2006 Oded Shimon +// This file is available under the MIT/X license, see LICENSE + #ifndef _NUT_PRIV_H #define _NUT_PRIV_H Modified: trunk/libnut/reorder.c ============================================================================== --- trunk/libnut/reorder.c (original) +++ trunk/libnut/reorder.c Sun Sep 17 11:25:23 2006 @@ -1,3 +1,6 @@ +// (C) 2005-2006 Oded Shimon +// This file is available under the MIT/X license, see LICENSE + #include <inttypes.h> #include <stdlib.h> #include <stdio.h>

1 0

[nut]: r135 - trunk/LICENSE
by ods15 16 Sep '06

16 Sep '06

Author: ods15 Date: Sat Sep 16 21:13:49 2006 New Revision: 135 Added: trunk/LICENSE Log: might as well add this. MIT license, at least, I think? If anybody has any strong feelings or arguments for a better/different license for this library, I don't mind a license change. Added: trunk/LICENSE ============================================================================== --- (empty file) +++ trunk/LICENSE Sat Sep 16 21:13:49 2006 @@ -0,0 +1,20 @@ +Copyright (c) 2005 Oded Shimon + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. +

1 0

[nut]: r134 - trunk/libnut/muxer.c
by ods15 16 Sep '06

16 Sep '06

Author: ods15 Date: Sat Sep 16 21:11:02 2006 New Revision: 134 Modified: trunk/libnut/muxer.c Log: not crash with none FILE* stuff Modified: trunk/libnut/muxer.c ============================================================================== --- trunk/libnut/muxer.c (original) +++ trunk/libnut/muxer.c Sat Sep 16 21:11:02 2006 @@ -651,8 +651,8 @@ free_buffer(nut->tmp_buffer); free_buffer(nut->tmp_buffer2); - free_buffer(nut->o); // flushes file fprintf(stderr, "TOTAL: %d bytes data, %d bytes overhead, %.2lf%% overhead\n", total, - (int)ftell(nut->mopts.output.priv) - total, (double)(ftell(nut->mopts.output.priv) - total) / total*100); + (int)bctello(nut->o) - total, (double)(bctello(nut->o) - total) / total*100); + free_buffer(nut->o); // flushes file free(nut); }

1 0

[nut]: r133 - trunk/demux_nut.c
by ods15 15 Sep '06

15 Sep '06

Author: ods15 Date: Fri Sep 15 15:58:11 2006 New Revision: 133 Modified: trunk/demux_nut.c Log: cosmetic, wrap at 80 Modified: trunk/demux_nut.c ============================================================================== --- trunk/demux_nut.c (original) +++ trunk/demux_nut.c Fri Sep 15 15:58:11 2006 @@ -29,7 +29,8 @@ static off_t mp_seek(void * h, long long pos, int whence) { stream_t * stream = (stream_t*)h; - if (stream->end_pos < stream_tell(stream)) stream->end_pos = stream_tell(stream); + if (stream->end_pos < stream_tell(stream)) + stream->end_pos = stream_tell(stream); if (whence == SEEK_CUR) pos += stream_tell(stream); else if (whence == SEEK_END) pos += stream->end_pos; @@ -75,7 +76,8 @@ int i; if ((ret = nut_read_headers(nut, &s))) { - if (ret < 0) mp_msg(MSGT_HEADER, MSGL_ERR, "NUT error: %s\n", nut_error(-ret)); + if (ret < 0) mp_msg(MSGT_HEADER, MSGL_ERR, "NUT error: %s\n", + nut_error(-ret)); nut_demuxer_uninit(nut); free(priv); return NULL; @@ -85,8 +87,10 @@ for (i = 0; s[i].type != -1 && i < 2; i++) switch(s[i].type) { case NUT_AUDIO_CLASS: { - WAVEFORMATEX *wf= calloc(sizeof(WAVEFORMATEX) + s[i].codec_specific_len, 1); - sh_audio_t* sh_audio=new_sh_audio(demuxer, i); + WAVEFORMATEX *wf = + calloc(sizeof(WAVEFORMATEX) + + s[i].codec_specific_len, 1); + sh_audio_t* sh_audio = new_sh_audio(demuxer, i); int j; sh_audio->wf= wf; sh_audio->ds = demuxer->audio; @@ -94,27 +98,33 @@ sh_audio->audio.dwScale = s[i].time_base.nom; sh_audio->audio.dwRate = s[i].time_base.den; sh_audio->format = 0; - for (j = 0; j < s[i].fourcc_len && j < 4; j++) sh_audio->format |= s[i].fourcc[j]<<(j*8); + for (j = 0; j < s[i].fourcc_len && j < 4; j++) + sh_audio->format |= s[i].fourcc[j]<<(j*8); sh_audio->channels = s[i].channel_count; - sh_audio->samplerate = s[i].samplerate_nom / s[i].samplerate_denom; + sh_audio->samplerate = + s[i].samplerate_nom / s[i].samplerate_denom; sh_audio->i_bps = 0; // FIXME wf->wFormatTag = sh_audio->format; wf->nChannels = s[i].channel_count; - wf->nSamplesPerSec = s[i].samplerate_nom / s[i].samplerate_denom; + wf->nSamplesPerSec = + s[i].samplerate_nom / s[i].samplerate_denom; wf->nAvgBytesPerSec = 0; // FIXME wf->nBlockAlign = 0; // FIXME wf->wBitsPerSample = 0; // FIXME wf->cbSize = s[i].codec_specific_len; if (s[i].codec_specific_len) - memcpy(wf + 1, s[i].codec_specific, s[i].codec_specific_len); + memcpy(wf + 1, s[i].codec_specific, + s[i].codec_specific_len); demuxer->audio->id = i; demuxer->audio->sh= demuxer->a_streams[i]; break; } case NUT_VIDEO_CLASS: { - BITMAPINFOHEADER * bih = calloc(sizeof(BITMAPINFOHEADER) + s[i].codec_specific_len, 1); + BITMAPINFOHEADER * bih = + calloc(sizeof(BITMAPINFOHEADER) + + s[i].codec_specific_len, 1); sh_video_t * sh_video = new_sh_video(demuxer, i); int j; @@ -125,15 +135,19 @@ sh_video->video.dwScale = s[i].time_base.nom; sh_video->video.dwRate = s[i].time_base.den; - sh_video->fps=(float)sh_video->video.dwRate/(float)sh_video->video.dwScale; - sh_video->frametime=(float)sh_video->video.dwScale/(float)sh_video->video.dwRate; + sh_video->fps = sh_video->video.dwRate/ + (float)sh_video->video.dwScale; + sh_video->frametime = 1./sh_video->fps; sh_video->format = 0; - for (j = 0; j < s[i].fourcc_len && j < 4; j++) sh_video->format |= s[i].fourcc[j]<<(j*8); + for (j = 0; j < s[i].fourcc_len && j < 4; j++) + sh_video->format |= s[i].fourcc[j]<<(j*8); if (!s[i].sample_height) sh_video->aspect = 0; - else sh_video->aspect = (float)s[i].sample_width / s[i].sample_height; + else sh_video->aspect = + s[i].sample_width / (float)s[i].sample_height; sh_video->i_bps = 0; // FIXME - bih->biSize = sizeof(BITMAPINFOHEADER) + s[i].codec_specific_len; + bih->biSize = sizeof(BITMAPINFOHEADER) + + s[i].codec_specific_len; bih->biWidth = s[i].width; bih->biHeight = s[i].height; bih->biBitCount = 0; // FIXME @@ -141,7 +155,8 @@ bih->biCompression = sh_video->format; if (s[i].codec_specific_len) - memcpy(bih + 1, s[i].codec_specific, s[i].codec_specific_len); + memcpy(bih + 1, s[i].codec_specific, + s[i].codec_specific_len); demuxer->video->id = i; demuxer->video->sh = demuxer->v_streams[i]; @@ -166,20 +181,26 @@ while (1) { ret = nut_read_next_packet(nut, &pd); - if (ret < 0) { mp_msg(MSGT_HEADER, MSGL_ERR, "NUT error: %s\n", nut_error(-ret)); continue; } + if (ret < 0) { + mp_msg(MSGT_HEADER, MSGL_ERR, "NUT error: %s\n", + nut_error(-ret)); + continue; + } if (ret == 1) return 0; // EOF if (pd.type == e_frame) break; // else, skip this packet while ((ret = nut_skip_packet(nut, &pd.len))) { if (ret < 0) { - mp_msg(MSGT_HEADER, MSGL_ERR, "NUT error: %s\n", nut_error(-ret)); + mp_msg(MSGT_HEADER, MSGL_ERR, + "NUT error: %s\n", nut_error(-ret)); break; } if (ret == 1) return 0; // EOF } } - pts = (double)pd.pts * priv->s[pd.stream].time_base.nom / priv->s[pd.stream].time_base.den; + pts = (double)pd.pts * priv->s[pd.stream].time_base.nom / + priv->s[pd.stream].time_base.den; if (pd.stream == demuxer->audio->id) { ds = demuxer->audio; @@ -193,7 +214,8 @@ else { while ((ret = nut_skip_packet(nut, &pd.len))) { if (ret < 0) { - mp_msg(MSGT_HEADER, MSGL_ERR, "NUT error: %s\n", nut_error(-ret)); + mp_msg(MSGT_HEADER, MSGL_ERR, + "NUT error: %s\n", nut_error(-ret)); break; } if (ret == 1) return 0; // EOF @@ -212,7 +234,8 @@ while ((ret = nut_read_frame(nut, &pd.len, dp->buffer))) { if (ret < 0) { - mp_msg(MSGT_HEADER, MSGL_ERR, "NUT error: %s\n", nut_error(-ret)); + mp_msg(MSGT_HEADER, MSGL_ERR, + "NUT error: %s\n", nut_error(-ret)); break; } if (ret == 1) return 0; // EOF @@ -236,10 +259,12 @@ if (flags & 2) // percent time_pos *= priv->s[0].max_pts * - (double)priv->s[0].time_base.nom / priv->s[0].time_base.den; + (double)priv->s[0].time_base.nom / + priv->s[0].time_base.den; ret = nut_seek(nut, time_pos, nutflags, tmp); - if (ret < 0) mp_msg(MSGT_HEADER, MSGL_ERR, "NUT error: %s\n", nut_error(-ret)); + if (ret < 0) + mp_msg(MSGT_HEADER, MSGL_ERR, "NUT error: %s\n", nut_error(-ret)); if (sh_audio) resync_audio_stream(sh_audio); } @@ -248,11 +273,14 @@ switch (cmd) { case DEMUXER_CTRL_GET_TIME_LENGTH: *((double *)arg) = priv->s[0].max_pts * - (double)priv->s[0].time_base.nom / priv->s[0].time_base.den; + (double)priv->s[0].time_base.nom / + priv->s[0].time_base.den; return DEMUXER_CTRL_OK; case DEMUXER_CTRL_GET_PERCENT_POS: - if (priv->s[0].max_pts == 0) return DEMUXER_CTRL_DONTKNOW; - *((int *)arg) = priv->last_pts * 100 / (double)priv->s[0].max_pts; + if (priv->s[0].max_pts == 0) + return DEMUXER_CTRL_DONTKNOW; + *((int *)arg) = priv->last_pts * 100 / + (double)priv->s[0].max_pts; return DEMUXER_CTRL_OK; default: return DEMUXER_CTRL_NOTIMPL;

1 0