From efea0f64d08052b0189d962101e1a3634d4adfc8 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 12 Aug 2001 18:00:00 +0200 Subject: Version 0.91 - Fixed displaying colored button texts that are too long. - Suppressing replay progress display when replaying a DVD. - Updated channels.conf.cable (thanks to Uwe Scheffler). - Updated French OSD texts (thanks to Jean-Claude Repetto). - Improved AC3 decoding when replaying DVDs (thanks to Matjaz Thaler). - Fixed handling DVB card indexes when using only one card in a multi-card system. - Changed the 'Eject DVD' button text to a simple 'Eject' (the German text was too long...). - Made the font file generation more stable (thanks to Artur Skawina). - Changed the default value for the "DiSEqC" setup parameter to "off". - The new command line option '-E' can be used to define where the EPG data shall be written to. This is especially useful if VDR runs in a system that turns off the video disk when it is not used, and therefore needs to write the EPG file to a ramdisk (or turn off writing it alltogether). See 'vdr --help' for details. - Making sure the disk is up and running before starting recording (this is important for systems that turn off the video disk when it is not used). - Added the "Jump" function in replay mode (thanks to Stefan Huelswitt). See the description of the "Red" key in MANUAL under "Replay Control" for details. - Fixed displaying editing marks when toggling a mark in "pause" mode. - If there is no free DVB device to record, the log message will now be given only once. - Made I/O more robust by handling EINTR (thanks to Werner Fink). --- ac3dec/rematrix.c | 54 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 23 deletions(-) (limited to 'ac3dec/rematrix.c') diff --git a/ac3dec/rematrix.c b/ac3dec/rematrix.c index caa7094..f1df19b 100644 --- a/ac3dec/rematrix.c +++ b/ac3dec/rematrix.c @@ -28,52 +28,60 @@ #include "ac3_internal.h" -#include "decode.h" #include "rematrix.h" + struct rematrix_band_s { - uint_32 start; - uint_32 end; + uint32_t start; + uint32_t end; +} rematrix_band[] = { + {13, 24}, + {25, 36}, + {37, 60}, + {61, 252} }; -struct rematrix_band_s rematrix_band[] = { {13,24}, {25,36}, {37 ,60}, {61,252}}; -static inline uint_32 min(uint_32 a,uint_32 b); +/** + * + **/ -static inline uint_32 -min(uint_32 a,uint_32 b) +inline uint32_t min (uint32_t a, uint32_t b) { - return (a < b ? a : b); + return (a < b) ? a : b; } -/* This routine simply does stereo rematixing for the 2 channel - * stereo mode */ -void rematrix(audblk_t *audblk, stream_samples_t samples) + +/** + * This routine simply does stereo remartixing for the 2 channel + * stereo mode + **/ + +void rematrix (audblk_t *audblk, stream_samples_t samples) { - uint_32 num_bands; - uint_32 start; - uint_32 end; - uint_32 i,j; - float left,right; + uint32_t num_bands; + uint32_t start; + uint32_t end; + int i,j; - if(!audblk->cplinu || audblk->cplbegf > 2) + if (!audblk->cplinu || audblk->cplbegf > 2) num_bands = 4; else if (audblk->cplbegf > 0) num_bands = 3; else num_bands = 2; - for(i=0;i < num_bands; i++) - { - if(!audblk->rematflg[i]) + for (i=0; i < num_bands; i++) { + if (!audblk->rematflg[i]) continue; start = rematrix_band[i].start; - end = min(rematrix_band[i].end ,12 * audblk->cplbegf + 36); + end = min (rematrix_band[i].end ,12 * audblk->cplbegf + 36); - for(j=start;j < end; j++) - { + for (j=start;j < end; j++) { + float left,right; + left = samples[0][j] + samples[1][j]; right = samples[0][j] - samples[1][j]; samples[0][j] = left; -- cgit v1.2.3