diff options
| -rw-r--r-- | Changelog | 18 | ||||
| -rw-r--r-- | stream/cache2.c | 12 |
2 files changed, 17 insertions, 13 deletions
@@ -25,6 +25,9 @@ MPlayer (1.0) * fix length in ASF/WMV files * support ISDB-Tb DVB streams + Filters: + * remove vf_yuy2, functionality is replaced by -vf format=yuv2 + Drivers: * -vo md5sum md5 calculation changed so output matches FFmpeg's -f framemd5 * Support for more formats in OpenGL video output drivers (different YUV @@ -58,6 +61,8 @@ MPlayer (1.0) MEncoder: * add -tsprog for demuxer lavf + + rc3: "BikeshedCounter" March 27, 2009 Decoders: * support for X8 frames (fixes "J-type picture is not supported" for WMV2) @@ -78,7 +83,7 @@ MPlayer (1.0) * GeoVision Advanced MPEG-4 (GMP4, GM40) via binary DLL * Xiricam JPEG from Veo PC Camera (XJPG) via binary DLL * WorldConnect Wavelet Video (SMSV) via binary DLL - * VDOWave 3 advanced (VDO3,VDOM,VDOW) via binary DLL + * VDOWave 3 advanced (VDO3, VDOM, VDOW) via binary DLL * VoxWare MetaVoice (format 0x0074) via binary DLL * Ulead DV Audio (0x215,0x216) via binary DLL * GoToMeeting codec (G2M2,G2M3) via binary DLL @@ -87,10 +92,10 @@ MPlayer (1.0) * ZDSoft screen recorder (ZDSV) via binary DLL * WebTrain Communication lossless screen recorder (WTVC) via binary DLL * xfire video (XFR1) via binary DLL - * VFAPI rgb transcode (vifp) via binary DLL + * VFAPI RGB transcode (vifp) via binary DLL * ETI CamCorder EYECON (NUB0,NUB1,NUB2) via binary DLL * fox motion (FMVC) via binary DLL - * Trident video (TY2C,TY2N,TY0N) via binary DLL + * Trident video (TY2C, TY2N, TY0N) via binary DLL * 10-bit video (v210) via Cinewave binary DLL * Brooktree YUV 4:1:1 Raw (Y41P) via binary DLL * many rare/obscure fourccs for known formats added @@ -121,8 +126,7 @@ MPlayer (1.0) * change vf_screenshot dependency from libpng to lavc * add af_scaletempo which maintains audio pitch when changing playback speed * fix multi-channel reordering - * af_stats, filter to print information about the audio stream - * remove vf_yuy2, functionality is replaced by -vf format=yuv2 + * af_stats filter to print information about the audio stream Streaming: * tv:// support for Windows @@ -240,10 +244,10 @@ MPlayer (1.0) Ports: * small crash with vo_macosx fixed * AC3/DTS passthrough for ao_macosx - * fix frozen OSD on Mac OS X + * fix frozen OSD on OS X * vo_gl now works with -wid and nVidia drivers on Windows (this is a hack) * VIDIX on SuperH - * workarounds for AltiVec on Apple gcc 3.3 on Mac OS X dropped + * workarounds for AltiVec on Apple gcc 3.3 on OS X dropped * vo_macosx can now be compiled in 64-bits mode * allow multiple MPlayer instances with vo_macosx using buffer_name * OpenGL support for unmodified MinGW64 diff --git a/stream/cache2.c b/stream/cache2.c index 67c2b174c0..b9a1f15faa 100644 --- a/stream/cache2.c +++ b/stream/cache2.c @@ -19,11 +19,11 @@ #include "config.h" // Initial draft of my new cache system... -// Note it runs in 2 processes (using fork()), but doesn't requires locking!! +// Note it runs in 2 processes (using fork()), but doesn't require locking!! // TODO: seeking, data consistency checking #define READ_USLEEP_TIME 10000 -// These defines are used to reduce the cost of many succesive +// These defines are used to reduce the cost of many successive // seeks (e.g. when a file has no index) by spinning quickly at first. #define INITIAL_FILL_USLEEP_TIME 1000 #define INITIAL_FILL_USLEEP_COUNT 10 @@ -66,12 +66,12 @@ static void *ThreadProc(void *s); typedef struct { // constats: - unsigned char *buffer; // base pointer of the alllocated buffer memory - int buffer_size; // size of the alllocated buffer memory + unsigned char *buffer; // base pointer of the allocated buffer memory + int buffer_size; // size of the allocated buffer memory int sector_size; // size of a single sector (2048/2324) int back_size; // we should keep back_size amount of old bytes for backward seek int fill_limit; // we should fill buffer only if space>=fill_limit - int seek_limit; // keep filling cache if distanse is less that seek limit + int seek_limit; // keep filling cache if distance is less that seek limit // filler's pointers: int eof; off_t min_filepos; // buffer contain only a part of the file, from min-max pos @@ -392,7 +392,7 @@ int stream_enable_cache(stream_t *stream,int size,int min,int seek_limit){ //make sure that we won't wait from cache_fill - //more data than it is alowed to fill + //more data than it is allowed to fill if (s->seek_limit > s->buffer_size - s->fill_limit ){ s->seek_limit = s->buffer_size - s->fill_limit; } |