head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.52 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.50 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.48 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.46 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.44 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.42 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.40 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.38 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.36 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.34 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.32 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.30 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.28 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.26 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.24 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.22 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.20 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.18 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.16 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.14 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.12 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.10 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.8 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.6 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.4 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.2 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.1.0.2 pkgsrc-2003Q4-base:1.1; locks; strict; comment @# @; 1.3 date 2004.01.26.12.26.40; author jmmv; state dead; branches; next 1.2; 1.2 date 2003.12.08.19.20.49; author wiz; state Exp; branches; next 1.1; 1.1 date 2003.05.25.07.12.55; author dan; state Exp; branches; next ; desc @@ 1.3 log @Moved to the multimedia category. @ text @$NetBSD: patch-ae,v 1.2 2003/12/08 19:20:49 wiz Exp $ --- libmpdemux/tvi_bsdbt848.c.orig Sat Oct 4 19:29:01 2003 +++ libmpdemux/tvi_bsdbt848.c @@@@ -41,6 +41,7 @@@@ #ifdef __NetBSD__ #include +#include #else #include #include @@@@ -785,14 +786,29 @@@@ return(priv->dspbytesread * 1.0 / priv-> static int get_audio_framesize(priv_t *priv) { int bytesavail; +#ifdef __NetBSD__ +struct audio_info auinf; +#endif if(priv->dspready == FALSE) return 0; +#ifdef __NetBSD__ +if(ioctl(priv->dspfd, AUDIO_GETINFO, &auinf) < 0) + { + perror("AUDIO_GETINFO"); + return(TVI_CONTROL_FALSE); + } +else + { + bytesavail = auinf.record.seek; /* * priv->dspsamplesize; */ + } +#else if(ioctl(priv->dspfd, FIONREAD, &bytesavail) < 0) { perror("FIONREAD"); return(TVI_CONTROL_FALSE); } +#endif /* When mencoder wants audio data, it wants data.. it won't go do anything else until it gets it :( */ @ 1.2 log @Update to 1.0pre2 (rc2). Changes: DOCS: * Spanish and Russian translations almost finished * French, Hungarian, Polish translations updated * New Romanian translation started * numerous sections updated Ports: * initial Amiga/MorphOS (through GeekGadgets) support * FreeBSD 5.x (libkse/libthr) support in win32 DLL loader * finally fixed the compilation on non-mvi capable alpha CPUs * OSD menu now works on MinGW * slave mode, vobsub and MEncoder support on Windows * MinGW 3.1.0 supports MPlayer out of the box! Codecs and demuxers: * support for QuickTime version 6.3 DLLs * fixed some bugs in imported FAAD * disabled internal FAAD when using buggy GCC * --enable-externalfaad option to force using external FAAD library * imaadpcm bug fixed * ViVD v2 codec support (DLL only) * QuickTime codecs support inside Matroska * improved seeking inside Matroska * some bugs with DMO codecs have been fixed * fix for MOV files with bogus user data length * fixed some demuxers which read after the EOF * better RTP synchronisation * FLAC support through imported libmpflac Filters: * new delogo filter (for removing TV channel logos) * presets support in swscaler filter * new audio filter export, for supporting visual effect applications * correct select handling in bmovl filter FFmpeg/libavcodec: * better divx/xvid bug detection code * Id RoQ decoder * Interplay MVE decoder * WC3/Xan video decoder * Xan DPCM, DK3 & DK4 ADPCM audio decoders * detect old xvid with fourcc=DIVX * vp3 decoder fixes * improved the Alpha optimizations * x86 optimizations are threadsafe now * settable scene change threshold * better MPEG1/MPEG2 conformance encoder * quality improvement for high bitrate videos with trellis quantization * indeo3 decoder fixed * new options: mv0, cbp * DV video encoder * MPEG1 now works with Trellis quantization Faad2: * synced to latest CVS * HE_AAC profile added * SBR QMF improvements * DRM updates * Covariance speedup * reduced memory usage * overall cleanups and fixes Drivers: * VIDIX driver for nVidia cards * VIDIX and libdha ported to Windows * SDL on IRIX support * directfb2 fixed for latest directfb * opengl video output for Windows * smoother audio playback with alsa9 * fullscreen and geometry support in directx * fullscreen support with opengl drivers * OSD fixed with svga * new cvidix and winvidix drivers * user settable colorkey Others: * several leak fixes * selecting optimizations for PPC 7455 CPU * CPU detection code now measures speed on x86 * unrarlib cleaned up a bit * updated the list of known x86 CPUs (including Opteron!) * alignment and smart line splitting option on subtitles @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @make audio capture for -tv work on NetBSD. We don't provide FIONREAD for /dev/audio, so use the seek field from AUDIO_GETINFO instead. XXX: by my calculations, the number of samples in seek should be multiplied by the sample size to get number of bytes to read, but this results in mencoder being very choppy, presumably because its blocking for audio. I've left the multiplication in the patch, commented out. The present patch works just fine, so probably my calculations are wrong. This bumps all of the mplayer variants, because -tv -dumpaudio might be used even with the players. @ text @d3 2 a4 2 --- libmpdemux/tvi_bsdbt848.c.orig 2003-01-15 05:20:17.000000000 +1100 +++ libmpdemux/tvi_bsdbt848.c 2003-05-25 16:40:00.000000000 +1000 d13 1 a13 1 @@@@ -777,14 +778,29 @@@@ d42 1 a42 1 it wont go do anything else until it gets it :( */ @