October 2003 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main/libmpdemux demux_mkv.cpp,1.44,1.45
by Moritz Bunkus CVS 30 Oct '03

30 Oct '03

Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv9532 Modified Files: demux_mkv.cpp Log Message: Fixed wrong allocation of the BITMAPINFOHEADER structure which would crash mplayer in some cases. Index: demux_mkv.cpp =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mkv.cpp,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- demux_mkv.cpp 29 Oct 2003 18:09:20 -0000 1.44 +++ demux_mkv.cpp 30 Oct 2003 14:50:04 -0000 1.45 @@ -2020,12 +2020,12 @@ BITMAPINFOHEADER *bih; idesc = NULL; - bih = (BITMAPINFOHEADER *)safemalloc(track->private_size); - memset(bih, 0, sizeof(BITMAPINFOHEADER)); if (track->ms_compat) { // MS compatibility mode BITMAPINFOHEADER *src; src = (BITMAPINFOHEADER *)track->private_data; + bih = (BITMAPINFOHEADER *)safemalloc(track->private_size); + memset(bih, 0, track->private_size); bih->biSize = get_uint32(&src->biSize); bih->biWidth = get_uint32(&src->biWidth); bih->biHeight = get_uint32(&src->biHeight); @@ -2042,6 +2042,8 @@ track->private_size - sizeof(BITMAPINFOHEADER)); } else { + bih = (BITMAPINFOHEADER *)safemalloc(sizeof(BITMAPINFOHEADER)); + memset(bih, 0, sizeof(BITMAPINFOHEADER)); bih->biSize = sizeof(BITMAPINFOHEADER); bih->biWidth = track->v_width; bih->biHeight = track->v_height;

1 0

CVS: main cfg-common.h,1.106,1.107
by Alex Beregszaszi 30 Oct '03

30 Oct '03

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv19786 Modified Files: cfg-common.h Log Message: Settled to CONF_TYPE_IMGFMT which simplified lot of things. Now there's no need to add new img formats to the source, instead you can try it out by providing it in hexa format, and if it isn't supported by the card, you get a nice error message. That's all. Index: cfg-common.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-common.h,v retrieving revision 1.106 retrieving revision 1.107 diff -u -r1.106 -r1.107 --- cfg-common.h 13 Aug 2003 16:29:00 -0000 1.106 +++ cfg-common.h 13 Aug 2003 18:56:02 -0000 1.107 @@ -302,7 +302,7 @@ {"width", &tv_param_width, CONF_TYPE_INT, 0, 0, 4096, NULL}, {"height", &tv_param_height, CONF_TYPE_INT, 0, 0, 4096, NULL}, {"input", &tv_param_input, CONF_TYPE_INT, 0, 0, 20, NULL}, - {"outfmt", &tv_param_outfmt, CONF_TYPE_STRING, 0, 0, 0, NULL}, + {"outfmt", &tv_param_outfmt, CONF_TYPE_IMGFMT, 0, 0, 0, NULL}, {"fps", &tv_param_fps, CONF_TYPE_FLOAT, 0, 0, 100.0, NULL}, {"channels", &tv_param_channels, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL}, {"brightness", &tv_param_brightness, CONF_TYPE_INT, CONF_RANGE, -100, 100, NULL},

3 6

CVS: main/libmpdemux demux_mkv.cpp,1.43,1.44
by Moritz Bunkus CVS 30 Oct '03

30 Oct '03

Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv10512 Modified Files: demux_mkv.cpp Log Message: VobSubs are stripped of their MPEG PS in the muxer already, and only the SPU packets remain. So no more need for mpeg_run in the demuxer. The muxer compresses each entry independently with a full deflateInit, deflateEnd. Index: demux_mkv.cpp =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mkv.cpp,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- demux_mkv.cpp 26 Oct 2003 21:09:37 -0000 1.43 +++ demux_mkv.cpp 29 Oct 2003 18:09:20 -0000 1.44 @@ -742,6 +742,10 @@ old_data = new_data; new_data = (unsigned char *)safemalloc(new_size * 20); + track->zstream.zalloc = (alloc_func)0; + track->zstream.zfree = (free_func)0; + track->zstream.opaque = (voidpf)0; + inflateInit(&track->zstream); track->zstream.next_in = (Bytef *)old_data; track->zstream.next_out = (Bytef *)new_data; track->zstream.avail_in = new_size; @@ -753,12 +757,14 @@ safefree(new_data); data = old_data; size = new_size; + inflateEnd(&track->zstream); return modified; } mp_msg(MSGT_DEMUX, MSGL_DBG2, "[mkv] zlib decompression: from %d to " "%d\n", new_size, 20 * new_size - track->zstream.avail_out); new_size = 20 * new_size - track->zstream.avail_out; + inflateEnd(&track->zstream); if (modified) safefree(old_data); @@ -811,14 +817,6 @@ "compression. Skipping track.\n", t->tnum); t->ok = 0; break; -#else - if (!t->zstream_initiated) { - t->zstream.zalloc = (alloc_func)0; - t->zstream.zfree = (free_func)0; - t->zstream.opaque = (voidpf)0; - inflateInit(&t->zstream); - t->zstream_initiated = true; - } #endif } else { mp_msg(MSGT_DEMUX, MSGL_WARN, "[mkv] Track %u has been compressed " @@ -1113,10 +1111,6 @@ safefree((*d->tracks[i]->c_encodings)[k].signature); } delete d->tracks[i]->c_encodings; -#ifdef HAVE_ZLIB - if (d->tracks[i]->zstream_initiated) - inflateEnd(&d->tracks[i]->zstream); -#endif free(d->tracks[i]); } @@ -2542,214 +2536,6 @@ found_data++; } -#define mpeg_read(buf, num) _mpeg_read(srcbuf, size, srcpos, buf, num) -static uint32_t _mpeg_read(unsigned char *srcbuf, uint32_t size, - uint32_t &srcpos, unsigned char *dstbuf, - uint32_t num) { - uint32_t real_num; - - if ((srcpos + num) >= size) - real_num = size - srcpos; - else - real_num = num; - memcpy(dstbuf, &srcbuf[srcpos], real_num); - srcpos += real_num; - - return real_num; -} - -#define mpeg_getc() _mpeg_getch(srcbuf, size, srcpos) -static int _mpeg_getch(unsigned char *srcbuf, uint32_t size, - uint32_t &srcpos) { - unsigned char c; - - if (mpeg_read(&c, 1) != 1) - return -1; - return (int)c; -} - -#define mpeg_seek(b, w) _mpeg_seek(size, srcpos, b, w) -static int _mpeg_seek(uint32_t size, uint32_t &srcpos, uint32_t num, - int whence) { - uint32_t new_pos; - - if (whence == SEEK_SET) - new_pos = num; - else if (whence == SEEK_CUR) - new_pos = srcpos + num; - else - abort(); - - if (new_pos >= size) { - srcpos = size; - return 1; - } - - srcpos = new_pos; - return 0; -} - -#define mpeg_tell() srcpos - -// Adopted from vobsub.c -static int mpeg_run(demuxer_t *demuxer, unsigned char *srcbuf, uint32_t size) { - uint32_t len, idx, version, srcpos, packet_size; - int c, aid; - float pts; - /* Goto start of a packet, it starts with 0x000001?? */ - const unsigned char wanted[] = { 0, 0, 1 }; - unsigned char buf[5]; - demux_packet_t *dp; - demux_stream_t *ds; - mkv_demuxer_t *mkv_d; - - mkv_d = (mkv_demuxer_t *)demuxer->priv; - ds = demuxer->sub; - - srcpos = 0; - packet_size = 0; - while (1) { - if (mpeg_read(buf, 4) != 4) - return -1; - while (memcmp(buf, wanted, sizeof(wanted)) != 0) { - c = mpeg_getc(); - if (c < 0) - return -1; - memmove(buf, buf + 1, 3); - buf[3] = c; - } - switch (buf[3]) { - case 0xb9: /* System End Code */ - return 0; - break; - - case 0xba: /* Packet start code */ - c = mpeg_getc(); - if (c < 0) - return -1; - if ((c & 0xc0) == 0x40) - version = 4; - else if ((c & 0xf0) == 0x20) - version = 2; - else { - mp_msg(MSGT_DEMUX, MSGL_ERR, "[mkv] VobSub: Unsupported MPEG " - "version: 0x%02x\n", c); - return -1; - } - - if (version == 4) { - if (mpeg_seek(9, SEEK_CUR)) - return -1; - } else if (version == 2) { - if (mpeg_seek(7, SEEK_CUR)) - return -1; - } else - abort(); - break; - - case 0xbd: /* packet */ - if (mpeg_read(buf, 2) != 2) - return -1; - len = buf[0] << 8 | buf[1]; - idx = mpeg_tell(); - c = mpeg_getc(); - if (c < 0) - return -1; - if ((c & 0xC0) == 0x40) { /* skip STD scale & size */ - if (mpeg_getc() < 0) - return -1; - c = mpeg_getc(); - if (c < 0) - return -1; - } - if ((c & 0xf0) == 0x20) { /* System-1 stream timestamp */ - /* Do we need this? */ - abort(); - } else if ((c & 0xf0) == 0x30) { - /* Do we need this? */ - abort(); - } else if ((c & 0xc0) == 0x80) { /* System-2 (.VOB) stream */ - uint32_t pts_flags, hdrlen, dataidx; - c = mpeg_getc(); - if (c < 0) - return -1; - pts_flags = c; - c = mpeg_getc(); - if (c < 0) - return -1; - hdrlen = c; - dataidx = mpeg_tell() + hdrlen; - if (dataidx > idx + len) { - mp_msg(MSGT_DEMUX, MSGL_ERR, "[mkv] VobSub: Invalid header " - "length: %d (total length: %d, idx: %d, dataidx: %d)\n", - hdrlen, len, idx, dataidx); - return -1; - } - if ((pts_flags & 0xc0) == 0x80) { - if (mpeg_read(buf, 5) != 5) - return -1; - if (!(((buf[0] & 0xf0) == 0x20) && (buf[0] & 1) && (buf[2] & 1) && - (buf[4] & 1))) { - mp_msg(MSGT_DEMUX, MSGL_ERR, "[mkv] VobSub PTS error: 0x%02x " - "%02x%02x %02x%02x \n", - buf[0], buf[1], buf[2], buf[3], buf[4]); - pts = 0; - } else - pts = ((buf[0] & 0x0e) << 29 | buf[1] << 22 | - (buf[2] & 0xfe) << 14 | buf[3] << 7 | (buf[4] >> 1)); - } else /* if ((pts_flags & 0xc0) == 0xc0) */ { - /* what's this? */ - /* abort(); */ - } - mpeg_seek(dataidx, SEEK_SET); - aid = mpeg_getc(); - if (aid < 0) { - mp_msg(MSGT_DEMUX, MSGL_ERR, "[mkv] VobSub: Bogus aid %d\n", aid); - return -1; - } - packet_size = len - ((unsigned int)mpeg_tell() - idx); - - dp = new_demux_packet(packet_size); - dp->flags = 1; - dp->pts = mkv_d->last_pts; - if (mpeg_read(dp->buffer, packet_size) != packet_size) { - mp_msg(MSGT_DEMUX, MSGL_ERR, "[mkv] VobSub: mpeg_read failure"); - packet_size = 0; - return -1; - } - ds_add_packet(ds, dp); - idx = len; - } - break; - - case 0xbe: /* Padding */ - if (mpeg_read(buf, 2) != 2) - return -1; - len = buf[0] << 8 | buf[1]; - if ((len > 0) && mpeg_seek(len, SEEK_CUR)) - return -1; - break; - - default: - if ((0xc0 <= buf[3]) && (buf[3] < 0xf0)) { - /* MPEG audio or video */ - if (mpeg_read(buf, 2) != 2) - return -1; - len = (buf[0] << 8) | buf[1]; - if ((len > 0) && mpeg_seek(len, SEEK_CUR)) - return -1; - - } - else { - mp_msg(MSGT_DEMUX, MSGL_ERR, "[mkv] VobSub: unknown header " - "0x%02X%02X%02X%02X\n", buf[0], buf[1], buf[2], buf[3]); - return -1; - } - } - } - return 0; -} - extern "C" int demux_mkv_fill_buffer(demuxer_t *d) { demux_packet_t *dp; demux_stream_t *ds; @@ -2976,10 +2762,6 @@ else if ((ds == d->audio) && mkv_d->audio->realmedia) handle_realaudio(d, re_buffer, re_size, block_bref == 0, found_data); - - else if ((ds == d->sub) && - (mkv_d->subtitle_type == MKV_SUBTYPE_VOBSUB)) - mpeg_run(d, re_buffer, re_size); else { dp = new_demux_packet(re_size);

3 2

CVS: main/libao2 ao_sgi.c,1.3,1.4
by Diego Biurrun CVS 30 Oct '03

30 Oct '03

Update of /cvsroot/mplayer/main/libao2 In directory mail:/var/tmp.root/cvs-serv14886 Modified Files: ao_sgi.c Log Message: A-V sync fix by Timo Kanera <timo(a)kanera.de>. Index: ao_sgi.c =================================================================== RCS file: /cvsroot/mplayer/main/libao2/ao_sgi.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ao_sgi.c 21 Mar 2003 16:42:50 -0000 1.3 +++ ao_sgi.c 30 Oct 2003 00:08:06 -0000 1.4 @@ -25,6 +25,8 @@ static ALconfig ao_config; static ALport ao_port; +static int sample_rate; +static int queue_size; // to set/get/query special features/parameters static int control(int cmd, void *arg){ @@ -54,7 +56,7 @@ } frate = rate; - + x[0].param = AL_RATE; x[0].value.ll = alDoubleToFixed(rate); x[1].param = AL_MASTER_CLOCK; @@ -76,7 +78,7 @@ if (frate != alFixedToDouble(x[0].value.ll)) { printf("ao_sgi, init: samplerate is now %lf (desired rate is %lf)\n", alFixedToDouble(x[0].value.ll), frate); } - + sample_rate = (int)frate; } ao_data.buffersize=131072; @@ -110,7 +112,7 @@ } // printf("ao_sgi, init: port %d config %d\n", ao_port, ao_config); - + queue_size = alGetQueueSize(ao_config); return 1; } @@ -181,8 +183,8 @@ // printf("ao_sgi, get_delay: (ao_buffersize %d)\n", ao_buffersize); - return 0; - + //return 0; + return (float)queue_size/((float)sample_rate); }

1 0

CVS: main/etc codecs.conf,1.307,1.308
by Alex Beregszaszi 29 Oct '03

29 Oct '03

Update of /cvsroot/mplayer/main/etc In directory mail:/var/tmp.root/cvs-serv8086 Modified Files: codecs.conf Log Message: added ffzygo Index: codecs.conf =================================================================== RCS file: /cvsroot/mplayer/main/etc/codecs.conf,v retrieving revision 1.307 retrieving revision 1.308 diff -u -r1.307 -r1.308 --- codecs.conf 29 Oct 2003 14:37:51 -0000 1.307 +++ codecs.conf 29 Oct 2003 18:01:00 -0000 1.308 @@ -811,6 +811,14 @@ dll h263 out YV12,I420,IYUV +videocodec ffzygo + info "FFmpeg ZyGo" + status untested + fourcc ZyGo + driver ffmpeg + dll h263 + out YV12,I420,IYUV flip + videocodec h263xa info "XAnim's CCITT H.263" status crashing

1 0

Re: [Mplayer-cvslog] CVS: main/DOCS/man/en mplayer.1,1.465, 1.466
by NAUJ27 29 Oct '03

29 Oct '03

On Thu, Oct 23, 2003 at 02:16:24PM +0200, Alex Beregszaszi wrote: > --- mplayer.1 22 Oct 2003 19:45:19 -0000 1.465 > +++ mplayer.1 23 Oct 2003 12:16:00 -0000 1.466 > @@ -889,6 +897,19 @@ >[...] What about the CVS log message from 1.465 to 1.466? I do not have it into my mailbox. The reply from Torinthiel it's the first message with this subject. Somebody can send me this email? ------------------------------- -Juan http://pagina.de/juanotura Registered User Linux #196702 Registered Machine Linux #87473 -------------------------------

3 2

CVS: main/etc codecs.conf,1.306,1.307
by Alex Beregszaszi 29 Oct '03

29 Oct '03

Update of /cvsroot/mplayer/main/etc In directory mail:/var/tmp.root/cvs-serv15389 Modified Files: codecs.conf Log Message: 10l Index: codecs.conf =================================================================== RCS file: /cvsroot/mplayer/main/etc/codecs.conf,v retrieving revision 1.306 retrieving revision 1.307 diff -u -r1.306 -r1.307 --- codecs.conf 29 Oct 2003 14:36:42 -0000 1.306 +++ codecs.conf 29 Oct 2003 14:37:51 -0000 1.307 @@ -636,7 +636,7 @@ status buggy fourcc mjpb ; Apple MJPEG-B (Quicktime) driver ffmpeg - dll mjpeg + dll mjpegb out 444P out 422P out YUY2 ; queryed (conversion from yuv422p)

1 0

CVS: main/etc codecs.conf,1.305,1.306
by Alex Beregszaszi 29 Oct '03

29 Oct '03

Update of /cvsroot/mplayer/main/etc In directory mail:/var/tmp.root/cvs-serv15141 Modified Files: codecs.conf Log Message: forgot to commit fftheora entry, but it's only support by g2 til now Index: codecs.conf =================================================================== RCS file: /cvsroot/mplayer/main/etc/codecs.conf,v retrieving revision 1.305 retrieving revision 1.306 diff -u -r1.305 -r1.306 --- codecs.conf 29 Oct 2003 14:34:04 -0000 1.305 +++ codecs.conf 29 Oct 2003 14:36:42 -0000 1.306 @@ -1053,6 +1053,15 @@ dll "vp3" out YV12 +videocodec fftheora + info "FFmpeg's Theora" + status untested + fourcc theo,Thra + format 0xFFFC + driver ffmpeg + dll "theora" + out YV12 + videocodec vp3 info "On2 OpenSource VP3-Codec" status working

1 0

CVS: main/etc codecs.conf,1.304,1.305
by Alex Beregszaszi 29 Oct '03

29 Oct '03

Update of /cvsroot/mplayer/main/etc In directory mail:/var/tmp.root/cvs-serv14775 Modified Files: codecs.conf Log Message: ultimotion vfw decoder Index: codecs.conf =================================================================== RCS file: /cvsroot/mplayer/main/etc/codecs.conf,v retrieving revision 1.304 retrieving revision 1.305 diff -u -r1.304 -r1.305 --- codecs.conf 25 Oct 2003 18:37:56 -0000 1.304 +++ codecs.conf 29 Oct 2003 14:34:04 -0000 1.305 @@ -1101,6 +1101,15 @@ out UYVY out BGR32,BGR24,BGR15 flip +videocodec ultimotion + info "IBM Ultimotion" + status working + fourcc ULTI + driver vfw + dll "ultimo.dll" + out YUY2,UYVY + out BGR32,BGR24,BGR15 flip + videocodec mss1 info "Windows Screen Video" status working

1 0

CVS: main/mp3lib decode_MMX.c,1.8,1.9
by Alex Beregszaszi 29 Oct '03

29 Oct '03

Update of /cvsroot/mplayer/main/mp3lib In directory mail:/var/tmp.root/cvs-serv19861 Modified Files: decode_MMX.c Log Message: reverting my last change as buggy gcc 3.x fails with it :( Index: decode_MMX.c =================================================================== RCS file: /cvsroot/mplayer/main/mp3lib/decode_MMX.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- decode_MMX.c 23 Oct 2003 00:01:23 -0000 1.8 +++ decode_MMX.c 25 Oct 2003 23:13:54 -0000 1.9 @@ -47,10 +47,10 @@ 1060439283, }; +static int temp; // buggy gcc 3.x fails if this is moved into the function :( void synth_1to1_MMX_s(real *bandPtr, int channel, short *samples, short *buffs, int *bo) { -int temp; __asm __volatile( "movl %1,%%ecx\n\t"

6 10