November 2002 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main/postproc swscale.c,1.109,1.110
by Michael Niedermayer CVS 04 Nov '02

04 Nov '02

Update of /cvsroot/mplayer/main/postproc In directory mail:/var/tmp.root/cvs-serv7898 Modified Files: swscale.c Log Message: 10l Index: swscale.c =================================================================== RCS file: /cvsroot/mplayer/main/postproc/swscale.c,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- swscale.c 1 Nov 2002 17:46:45 -0000 1.109 +++ swscale.c 4 Nov 2002 15:56:38 -0000 1.110 @@ -2439,7 +2439,7 @@ inv= height/sum; for(i=0; i<a->length; i++) - a->coeff[i]*= height; + a->coeff[i]*= inv; } void scaleVec(SwsVector *a, double scalar){

1 0

CVS: main/postproc Makefile,1.10,1.11
by Michael Niedermayer CVS 04 Nov '02

04 Nov '02

Update of /cvsroot/mplayer/main/postproc In directory mail:/var/tmp.root/cvs-serv2246 Modified Files: Makefile Log Message: fixing dependancies removing stray tabs Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/postproc/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- Makefile 31 Oct 2002 10:21:44 -0000 1.10 +++ Makefile 4 Nov 2002 10:01:15 -0000 1.11 @@ -38,7 +38,7 @@ dep: depend depend: - $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend + $(CC) -MM $(CFLAGS) $(SWSSRCS) postprocess.c 1>.depend cs_test: $(CS_TEST_OBJS) $(CC) $(CS_TEST_OBJS) -o cs_test @@ -51,7 +51,7 @@ $(CC) -shared -Wl,-soname,$(SPPLIB).0 \ -o $(SPPLIB) $(SPPOBJS) endif - + $(PPLIB): $(PPOBJS) $(AR) r $(PPLIB) $(PPOBJS) @@ -65,7 +65,7 @@ install -m 644 postprocess.h $(prefix)/include/postproc/postprocess.h endif - + # # include dependency files if they exist #

1 0

CVS: main xvid_vbr.c,1.4,1.5
by R�mi Guyomarch CVS 03 Nov '02

03 Nov '02

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv18761 Modified Files: xvid_vbr.c Log Message: Shouldn't be there. Index: xvid_vbr.c =================================================================== RCS file: /cvsroot/mplayer/main/xvid_vbr.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- xvid_vbr.c 3 Nov 2002 15:56:58 -0000 1.4 +++ xvid_vbr.c 4 Nov 2002 02:16:00 -0000 1.5 @@ -777,8 +777,7 @@ */ state->keyframe_locations[c] = state->cur_frame; - /* Compensate AVI overhead */ - desired = state->desired_size - state->nb_frames*24; + desired = state->desired_size; switch(state->credits_mode) { case VBR_CREDITS_MODE_QUANT :

1 0

CVS: main/DOCS documentation.html,1.325,1.326
by Diego Biurrun CVS 03 Nov '02

03 Nov '02

Update of /cvsroot/mplayer/main/DOCS In directory mail:/var/tmp.root/cvs-serv17053/DOCS Modified Files: documentation.html Log Message: cosmetics Index: documentation.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/documentation.html,v retrieving revision 1.325 retrieving revision 1.326 diff -u -r1.325 -r1.326 --- documentation.html 3 Nov 2002 13:05:58 -0000 1.325 +++ documentation.html 4 Nov 2002 02:11:20 -0000 1.326 @@ -964,86 +964,60 @@ are just a few tips: <UL> - -<LI> -Choose some sane image dimensions. The dimensions of the resulting -image should be divisible by 16. -</LI> - -<LI>If you capture the video with the vertical resolution higher than -half of the full resolution (i.e. 288 for PAL or 240 for NTSC), make -sure you turned deinterlacing on. Otherwise you'll get a movie which -is distorted during fast-motion scenes and the bitrate controller will -be probably even unable to retain the specified bitrate as the -interlacing artifacts produce high amount of detail and thus consume -lot of bandwidth. You can enable deinterlacing with <CODE>-vop -pp=DEINT_TYPE</CODE>. Usually <CODE>pp=lb</CODE> does a good -job, but it can be matter of personal preference. See other -deinterlacing algorithms in the manual and give it a try.</LI> - -<LI> -Crop out the dead space. When you capture the video, the areas at the -edges are usually black or contain some noise. These again consume -lots of unnecessary bandwidth. More precisely it's not the black -areas themselves but the sharp transitions between the black and the -brighter video image which do but that's not important for now. Before -you start capturing, adjust the arguments of the <CODE>crop</CODE> -option so that all the crap at the margins is cropped out. Again, -don't forget to keep the resulting dimensions sane. -</LI> - -<LI> -Watch out for CPU load. It shouldn't cross the 90% boundary for most -of the time. If you have a large capture buffer, MEncoder can survive -an overload for few seconds but nothing more. It's better to turn off -the 3D OpenGL screensavers and similar stuff. -</LI> - -<LI> -Don't mess with the system clock. MEncoder uses the system clock for -doing A/V sync. If you adjust the system clock (especially backwards -in time), MEncoder gets confused and you will lose frames. This is an -important issue if you are hooked to a network and run some time -synchronization software like NTP. You have to turn NTP off during the -capture process if you want to capture reliably. -</LI> - -<LI> -Don't change the <CODE>outfmt</CODE> unless you know what you are -doing or your card/driver really doesn't support the default (YV12 -colorspace) . In the older versions of MPlayer/MEncoder it was necessary -to specify the output format. This issue should be fixed in the -current releases and <CODE>outfmt</CODE> isn't required anymore, and -the default suits the most purposes. For example, if you are capturing -into DivX using libavcodec and specify <CODE>outfmt=RGB24</CODE> in -order to increase the quality of the captured images, the captured -image will be actually later converted back into YV12 so the only -thing you achieve is a massive waste of CPU power. -</LI> - -<LI> -To specify the I420 colorspace (<CODE>outfmt=i420</CODE>), you have to -add an option <CODE>-vc rawi420</CODE> due to a fourcc conflict with -an Intel Indeo video codec. -</LI> - -<LI> -There are several ways of capturing audio. You can grab the sound -either using your soundcard via an external cable connection between -video card and line-in, or using the built-in ADC in the bt878 -chip. In the latter case, you have to load the <b>btaudio</b> -driver. Read the <CODE>linux/Documentation/sound/btaudio</CODE> file -(in the kernel tree, not MPlayer's) for some instructions on using this driver. -</LI> - -<LI> -If MEncoder cannot open the audio device, make sure that it is really -available. There can be some trouble with the sound servers like arts -(KDE) or esd (GNOME). If you have a full duplex soundcard (almost any -decent card supports it today), and you are using KDE, try to check -the "full duplex" option in the sound server preference menu. -</LI> - + <LI>Choose some sane image dimensions. The dimensions of the resulting image + should be divisible by 16.</LI> + <LI>If you capture the video with the vertical resolution higher than half of + the full resolution (i.e. 288 for PAL or 240 for NTSC), make sure you + turned deinterlacing on. Otherwise you'll get a movie which is distorted + during fast-motion scenes and the bitrate controller will be probably even + unable to retain the specified bitrate as the interlacing artifacts produce + high amount of detail and thus consume lot of bandwidth. You can enable + deinterlacing with <CODE>-vop pp=DEINT_TYPE</CODE>. Usually + <CODE>pp=lb</CODE> does a good job, but it can be matter of personal + preference. See other deinterlacing algorithms in the manual and give it a + try.</LI> + <LI>Crop out the dead space. When you capture the video, the areas at the + edges are usually black or contain some noise. These again consume lots of + unnecessary bandwidth. More precisely it's not the black areas themselves + but the sharp transitions between the black and the brighter video image + which do but that's not important for now. Before you start capturing, + adjust the arguments of the <CODE>crop</CODE> option so that all the crap + at the margins is cropped out. Again, don't forget to keep the resulting + dimensions sane.</LI> + <LI>Watch out for CPU load. It shouldn't cross the 90% boundary for most of + the time. If you have a large capture buffer, MEncoder can survive an + overload for few seconds but nothing more. It's better to turn off the 3D + OpenGL screensavers and similar stuff.</LI> + <LI>Don't mess with the system clock. MEncoder uses the system clock for + doing A/V sync. If you adjust the system clock (especially backwards in + time), MEncoder gets confused and you will lose frames. This is an + important issue if you are hooked to a network and run some time + synchronization software like NTP. You have to turn NTP off during the + capture process if you want to capture reliably.</LI> + <LI>Don't change the <CODE>outfmt</CODE> unless you know what you are doing + or your card/driver really doesn't support the default (YV12 colorspace). + In the older versions of MPlayer/MEncoder it was necessary to specify the + output format. This issue should be fixed in the current releases and + <CODE>outfmt</CODE> isn't required anymore, and the default suits the most + purposes. For example, if you are capturing into DivX using libavcodec and + specify <CODE>outfmt=RGB24</CODE> in order to increase the quality of the + captured images, the captured image will be actually later converted back + into YV12 so the only thing you achieve is a massive waste of CPU power. + </LI> + <LI>To specify the I420 colorspace (<CODE>outfmt=i420</CODE>), you have to + add an option <CODE>-vc rawi420</CODE> due to a fourcc conflict with an + Intel Indeo video codec.</LI> + <LI>There are several ways of capturing audio. You can grab the sound either + using your soundcard via an external cable connection between video card + and line-in, or using the built-in ADC in the bt878 chip. In the latter + case, you have to load the <b>btaudio</b> driver. Read the + <CODE>linux/Documentation/sound/btaudio</CODE> file (in the kernel tree, + not MPlayer's) for some instructions on using this driver.</LI> + <LI>If MEncoder cannot open the audio device, make sure that it is really + available. There can be some trouble with the sound servers like arts + (KDE) or esd (GNOME). If you have a full duplex soundcard (almost any + decent card supports it today), and you are using KDE, try to check the + "full duplex" option in the sound server preference menu.</LI> </UL> <H3><A NAME="tv_examples">2.5.3 Examples</A></H3> @@ -1085,9 +1059,7 @@ <CODE>-tv</CODE> option and omit the software scaling but this approach uses the maximum available information and is a little more resistant to noise. The bt8x8 chips can do the pixel averaging only - in the horizontal direction due to a hardware limitation. - -</P> + in the horizontal direction due to a hardware limitation.</P>

1 0

CVS: main/DOCS documentation.html,1.322,1.323
by Jindrich Makovicka CVS 03 Nov '02

03 Nov '02

Update of /cvsroot/mplayer/main/DOCS In directory mail:/var/tmp.root/cvs-serv26924 Modified Files: documentation.html Log Message: v4l update Index: documentation.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/documentation.html,v retrieving revision 1.322 retrieving revision 1.323 diff -u -r1.322 -r1.323 --- documentation.html 31 Oct 2002 05:07:43 -0000 1.322 +++ documentation.html 31 Oct 2002 11:30:09 -0000 1.323 @@ -1024,6 +1024,15 @@ </LI> <LI> +There are several ways of capturing audio. You can grab the sound +either using your soundcard via an external cable connection between +video card and line-in, or using the built-in ADC in the bt878 +chip. In the latter case, you have to load the <b>btaudio</b> +driver. Read the <CODE>linux/Documentation/sound/btaudio</CODE> file +(in the kernel tree, not MPlayer's) for some instructions on using this driver. +</LI> + +<LI> If MEncoder cannot open the audio device, make sure that it is really available. There can be some trouble with the sound servers like arts (KDE) or esd (GNOME). If you have a full duplex soundcard (almost any

2 1

CVS: main/libmpdemux demux_real.c,1.29,1.30
by Arpi of Ize 03 Nov '02

03 Nov '02

Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv28388/libmpdemux Modified Files: demux_real.c Log Message: - realaudio ATRC (sony atrac3) codec support - fixed passing of codecdata from demuxer to codec patch by Fabian Franz <FabianFranz(a)gmx.de> Index: demux_real.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_real.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- demux_real.c 1 Nov 2002 17:46:43 -0000 1.29 +++ demux_real.c 4 Nov 2002 00:23:53 -0000 1.30 @@ -8,6 +8,11 @@ TODO: fix the whole syncing mechanism $Log$ + Revision 1.30 2002/11/04 00:23:53 arpi + - realaudio ATRC (sony atrac3) codec support + - fixed passing of codecdata from demuxer to codec + patch by Fabian Franz <FabianFranz(a)gmx.de> + Revision 1.29 2002/11/01 17:46:43 arpi verbose can be negative @@ -902,6 +907,8 @@ int sub_packet_h; int version; int flavor; + int coded_frame_size; + int codecdata_length; mp_msg(MSGT_DEMUX,MSGL_V,"Found audio stream!\n"); version = stream_read_word(demuxer->stream); @@ -913,7 +920,8 @@ stream_skip(demuxer->stream, 2); /* version (4 or 5) */ stream_skip(demuxer->stream, 4); // header size == 0x4E flavor = stream_read_word(demuxer->stream);/* codec flavor id */ - stream_skip(demuxer->stream, 4); /* coded frame size */ + coded_frame_size = stream_read_dword(demuxer->stream);/* needed by codec */ + //stream_skip(demuxer->stream, 4); /* coded frame size */ stream_skip(demuxer->stream, 4); // big number stream_skip(demuxer->stream, 4); // bigger number stream_skip(demuxer->stream, 4); // 2 || -''- @@ -961,6 +969,23 @@ sh->wf->cbSize = 0; sh->format = MKTAG(buf[0], buf[1], buf[2], buf[3]); + switch (sh->format){ + case MKTAG('d', 'n', 'e', 't'): + mp_msg(MSGT_DEMUX,MSGL_V,"Audio: DNET (AC3 with low-bitrate extension)\n"); + break; + case MKTAG('s', 'i', 'p', 'r'): + mp_msg(MSGT_DEMUX,MSGL_V,"Audio: SiproLab's ACELP.net\n"); + break; + case MKTAG('c', 'o', 'o', 'k'): + mp_msg(MSGT_DEMUX,MSGL_V,"Audio: Real's GeneralCooker (?) (RealAudio G2?) (unsupported)\n"); + break; + case MKTAG('a', 't', 'r', 'c'): + mp_msg(MSGT_DEMUX,MSGL_V,"Audio: Sony ATRAC3 (RealAudio 8) (unsupported)\n"); + break; + default: + mp_msg(MSGT_DEMUX,MSGL_V,"Audio: Unknown (%s)\n", buf); + } + switch (sh->format) { case MKTAG('d', 'n', 'e', 't'): @@ -969,7 +994,6 @@ break; case MKTAG('s', 'i', 'p', 'r'): #if 0 - mp_msg(MSGT_DEMUX,MSGL_V,"Audio: SiproLab's ACELP.net\n"); sh->format = 0x130; /* for buggy directshow loader */ sh->wf->cbSize = 4; @@ -989,25 +1013,33 @@ // sh->wf[sizeof(WAVEFORMATEX)+4] = 0; break; #endif - case MKTAG('c', 'o', 'o', 'k'): - mp_msg(MSGT_DEMUX,MSGL_V,"Audio: Real's GeneralCooker (?) (RealAudio G2?) (unsupported)\n"); - sh->wf->cbSize = 4+2+24; - sh->wf = realloc(sh->wf, sizeof(WAVEFORMATEX)+sh->wf->cbSize); - ((short*)(sh->wf+1))[0]=sub_packet_size; - ((short*)(sh->wf+1))[1]=sub_packet_h; - ((short*)(sh->wf+1))[2]=flavor; - stream_read(demuxer->stream, ((char*)(sh->wf+1))+6, 24); // extras - break; case MKTAG('a', 't', 'r', 'c'): - mp_msg(MSGT_DEMUX,MSGL_V,"Audio: Sony ATRAC3 (RealAudio 8) (unsupported)\n"); +#if 0 sh->format = 0x270; /* 14 bytes extra header needed ! */ sh->wf->cbSize = 14; sh->wf = realloc(sh->wf, sizeof(WAVEFORMATEX)+sh->wf->cbSize); - sh->wf->nAvgBytesPerSec = 16537; // 8268 sh->wf->nBlockAlign = 384; // 192 sh->wf->wBitsPerSample = 0; /* from AVI created by VirtualDub */ + break; +#endif + case MKTAG('c', 'o', 'o', 'k'): + // realaudio codec plugins - common: +// sh->wf->cbSize = 4+2+24; + stream_skip(demuxer->stream,3); // Skip 3 unknown bytes + if (version==5) + stream_skip(demuxer->stream,1); // Skip 1 additional unknown byte + codecdata_length=stream_read_dword(demuxer->stream); + sh->wf->cbSize = 10+codecdata_length; + sh->wf = realloc(sh->wf, sizeof(WAVEFORMATEX)+sh->wf->cbSize); + ((short*)(sh->wf+1))[0]=sub_packet_size; + ((short*)(sh->wf+1))[1]=sub_packet_h; + ((short*)(sh->wf+1))[2]=flavor; + ((short*)(sh->wf+1))[3]=coded_frame_size; + ((short*)(sh->wf+1))[4]=codecdata_length; +// stream_read(demuxer->stream, ((char*)(sh->wf+1))+6, 24); // extras + stream_read(demuxer->stream, ((char*)(sh->wf+1))+10, codecdata_length); // extras break; default: mp_msg(MSGT_DEMUX,MSGL_V,"Audio: Unknown (%s)\n", buf);

1 0

CVS: main/libmpcodecs ad_realaud.c,1.18,1.19
by Arpi of Ize 03 Nov '02

03 Nov '02

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv28388/libmpcodecs Modified Files: ad_realaud.c Log Message: - realaudio ATRC (sony atrac3) codec support - fixed passing of codecdata from demuxer to codec patch by Fabian Franz <FabianFranz(a)gmx.de> Index: ad_realaud.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_realaud.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- ad_realaud.c 16 Oct 2002 15:59:04 -0000 1.18 +++ ad_realaud.c 4 Nov 2002 00:23:52 -0000 1.19 @@ -112,9 +112,9 @@ sh->wf->nSamplesPerSec,sh->wf->wBitsPerSample,sh->wf->nChannels, 100, // ??? ((short*)(sh->wf+1))[0], // subpacket size - sh->wf->nBlockAlign, - 16, // ?? - ((char*)(sh->wf+1))+6+8 + ((short*)(sh->wf+1))[3], // coded frame size + ((short*)(sh->wf+1))[4], // codec data length + ((char*)(sh->wf+1))+10 // extras }; result=raInitDecoder(sh->context,&init_data); if(result){

1 0

CVS: main/etc codecs.conf,1.242,1.243
by Arpi of Ize 03 Nov '02

03 Nov '02

Update of /cvsroot/mplayer/main/etc In directory mail:/var/tmp.root/cvs-serv28388/etc Modified Files: codecs.conf Log Message: - realaudio ATRC (sony atrac3) codec support - fixed passing of codecdata from demuxer to codec patch by Fabian Franz <FabianFranz(a)gmx.de> Index: codecs.conf =================================================================== RCS file: /cvsroot/mplayer/main/etc/codecs.conf,v retrieving revision 1.242 retrieving revision 1.243 diff -u -r1.242 -r1.243 --- codecs.conf 3 Nov 2002 23:28:48 -0000 1.242 +++ codecs.conf 4 Nov 2002 00:23:41 -0000 1.243 @@ -1197,6 +1197,13 @@ driver realaud dll "sipr.so.6.0" +audiocodec raatrc + info "RealAudio ATRAC3" + status working + format 0x63727461 ; "atrc" + driver realaud + dll "atrc.so.6.0" + audiocodec imaadpcm info "IMA ADPCM" status working

1 0

CVS: main/etc codecs.conf,1.241,1.242
by Arpi of Ize 03 Nov '02

03 Nov '02

Update of /cvsroot/mplayer/main/etc In directory mail:/var/tmp.root/cvs-serv5235 Modified Files: codecs.conf Log Message: XVIX added Index: codecs.conf =================================================================== RCS file: /cvsroot/mplayer/main/etc/codecs.conf,v retrieving revision 1.241 retrieving revision 1.242 diff -u -r1.241 -r1.242 --- codecs.conf 2 Nov 2002 23:33:51 -0000 1.241 +++ codecs.conf 3 Nov 2002 23:28:48 -0000 1.242 @@ -286,7 +286,7 @@ fourcc DIV1,div1 divx fourcc MP4S,mp4s ; ISO MPEG-4 Video V1 fourcc M4S2,m4s2 - fourcc xvid,XVID,XviD + fourcc xvid,XVID,XviD,XVIX fourcc DX50,BLZ0 DX50 fourcc mp4v format 0x4

1 0

CVS: main/DOCS/tech vop.txt,1.21,1.22
by Michael Niedermayer CVS 03 Nov '02

03 Nov '02

Update of /cvsroot/mplayer/main/DOCS/tech In directory mail:/var/tmp.root/cvs-serv14421/DOCS/tech Modified Files: vop.txt Log Message: pp docs Index: vop.txt =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/tech/vop.txt,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- vop.txt 31 Oct 2002 23:26:10 -0000 1.21 +++ vop.txt 3 Nov 2002 10:05:12 -0000 1.22 @@ -110,11 +110,10 @@ plugins format list. MPI: passthru --vop pp[=flags] +-vop pp=[<filterName>[:<option>[:<option>...]][/[-]<filterName>[:<option>...]]...] Postprocessing filter. (usefull for codecs without built-in postprocessing, like libmpeg12 or libavcodec) - Flags is a bitmask set of enabled filters (see manpage for -pp details), - defaults to the value of divx_quality (set by -pp commandline option) + see `mplayer -vop pp=help` MPI: DR (if possible) or TEMP Special: dec_video autoloads it if -pp option used but codec can't do pp.

4 4