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

CVS: main/DOCS/Hungarian documentation.html,1.43,1.44
by Winner of tha face compo 13 Oct '01

13 Oct '01

Update of /cvsroot/mplayer/main/DOCS/Hungarian In directory mplayer:/var/tmp.root/cvs-serv22524/DOCS/Hungarian Modified Files: documentation.html Log Message: server names changed Index: documentation.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/Hungarian/documentation.html,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- documentation.html 13 Oct 2001 19:13:50 -0000 1.43 +++ documentation.html 13 Oct 2001 19:16:33 -0000 1.44 @@ -649,7 +649,7 @@ A DVB nevû hardveres dekóderkártyával kapcsolatos kérdések helye. </LI><LI>MPlayer CVS-log: -<A HREF="http://mp.dev.hu/mailman/listinfo/mplayer-cvslog">http://mp.dev.hu/mailman/listinfo/mplayer-cvslog</A> +<A HREF="http://mplayerhq.hu/mailman/listinfo/mplayer-cvslog">http://mplayerhq.hu/mailman/listinfo/mplayer-cvslog</A> CVS-beli változásokról kérdéseket ide küldj. (ha nem érted, mire kell egy változtatás, vagy jobb fixet tudsz) Bizonyosodj meg róla, hogy a kívánt fejlesztõ is olvassa a listát!

1 0

CVS: main/DOCS/German video.html,1.5,1.6
by Winner of tha face compo 13 Oct '01

13 Oct '01

Update of /cvsroot/mplayer/main/DOCS/German In directory mplayer:/var/tmp.root/cvs-serv16055/DOCS/German Modified Files: video.html Log Message: typoz fixed Index: video.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/German/video.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- video.html 10 Oct 2001 18:09:05 -0000 1.5 +++ video.html 13 Oct 2001 19:13:16 -0000 1.6 @@ -173,7 +173,7 @@ unterstützt auch XVideo) und schaue ob es funkioniert. Siehe <A HREF="#2.2.1.4">SDL Sektion</A> für Details. -Oder versuch den NEUEN -vo tdfxfb -Treiber! Siehe <A HREF=2.2.1.9>Sektion +Oder versuch den NEUEN -vo tdfxfb -Treiber! Siehe <A HREF="#2.2.1.9">Sektion 2.2.1.9</A>! <A NAME=2.2.1.2.2>2.2.1.2.2. S3 Karten</A>

1 0

CVS: main/DOCS/Hungarian documentation.html,1.42,1.43
by Winner of tha face compo 13 Oct '01

13 Oct '01

Update of /cvsroot/mplayer/main/DOCS/Hungarian In directory mplayer:/var/tmp.root/cvs-serv16055/DOCS/Hungarian Modified Files: documentation.html Log Message: typoz fixed Index: documentation.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/Hungarian/documentation.html,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- documentation.html 10 Oct 2001 16:24:51 -0000 1.42 +++ documentation.html 13 Oct 2001 19:13:50 -0000 1.43 @@ -415,7 +415,7 @@ Linux Infrared Remote Control - használj egy otthon is könnyen elkészíthetõ infravörös távirányítót, hogy irányítsd vele a géped! - Részletek a <A HREF="www.lirc.org">www.lirc.org</A> címen. + Részletek a <A HREF="http://www.lirc.org">www.lirc.org</A> címen. Ha felinstalláltad a lirc csomagot, így fordítsd az MPlayer-t : ./configure --enable-lirc

1 0

CVS: main configure,1.186,1.187
by pl 13 Oct '01

13 Oct '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv13919 Modified Files: configure Log Message: added functions : + cc_check() replaces "$_cc" "$TMPC" -o "$TMPO" "$@" >/dev/null 2>&1 + die() replaces echo "Error blah" / flush tempfiles / exit + boolean OS macros : linux() bsd() bsdos() freebsd() openbsd() (note: bsd = bsdos || freebsd || openbsd) changed handling of directories with "for" loops (tempdir && css detection) added XXX where things need to be checked for a particular OS removed unnecessary tempfile flush modified a few if... which were not obvious to read for more readability reidented the --help message for it to be more "80-char-wide-terms" aware changed a few echo ... echo ... echo ... to cat <<EOF enabled THREAD_SAFE's flags for BSD's and Linux (-D_REENTRANT) Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.186 retrieving revision 1.187 diff -u -r1.186 -r1.187 --- configure 13 Oct 2001 15:33:12 -0000 1.186 +++ configure 13 Oct 2001 16:53:37 -0000 1.187 @@ -107,6 +107,43 @@ # # -- +# SOME MACROS/USEFUL FUNCTIONS +# Returns error code only - NO displaye +function cc_check() { + "$_cc" "$TMPC" -o "$TMPO" "$@" >/dev/null 2>&1 + return "$?" +} + +# Display error message, flushes tempfile, exit [...1031 lines suppressed...] + ftp://thot.banki.hu/esp-team/linux/MPlayer/w32codec.zip +EOF + else + echo "Ok, found Win32 codecs directory at $_win32libdir." + fi else - echo "NOTE: WIN32 codec DLLs are not supported on your CPU ($host_arch)." - echo "You may encounter a few AVI files that cannot be played due to" - echo "missing opensource video/audio codec support." + cat <<EOF +NOTE: WIN32 codec DLLs are not supported on your CPU ($host_arch). +You may encounter a few AVI files that cannot be played due to missing +opensource video/audio codec support. +EOF fi # Last move: +rm -f "$TMPO" "$TMPC" "$TMPS" "$TMPCPP" -rm -f $TMPO $TMPC $TMPS

1 0

CVS: main/postproc postprocess.c,1.8,1.9 postprocess.h,1.6,1.7
by Arpi of Ize 13 Oct '01

13 Oct '01

Update of /cvsroot/mplayer/main/postproc In directory mplayer:/var/tmp.root/cvs-serv5260 Modified Files: postprocess.c postprocess.h Log Message: Cleanup: - TIMEING && MORE_TIMEING disabled by default - private stuff moved to postprocess.c to avoid possible conflicts Index: postprocess.c =================================================================== RCS file: /cvsroot/mplayer/main/postproc/postprocess.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- postprocess.c 13 Oct 2001 15:36:04 -0000 1.8 +++ postprocess.c 13 Oct 2001 15:53:24 -0000 1.9 @@ -90,6 +90,16 @@ //#undef HAVE_MMX #include "postprocess.h" +#define MIN(a,b) ((a) > (b) ? (b) : (a)) +#define MAX(a,b) ((a) < (b) ? (b) : (a)) +#define ABS(a) ((a) > 0 ? (a) : (-(a))) +#define SIGN(a) ((a) > 0 ? 1 : -1) + +#ifdef HAVE_MMX2 +#define PAVGB(a,b) "pavgb " #a ", " #b " \n\t" +#elif defined (HAVE_3DNOW) +#define PAVGB(a,b) "pavgusb " #a ", " #b " \n\t" +#endif static uint64_t packedYOffset= 0x0000000000000000LL; static uint64_t packedYScale= 0x0100010001000100LL; Index: postprocess.h =================================================================== RCS file: /cvsroot/mplayer/main/postproc/postprocess.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- postprocess.h 13 Oct 2001 15:38:19 -0000 1.6 +++ postprocess.h 13 Oct 2001 15:53:24 -0000 1.7 @@ -46,23 +46,13 @@ #define H_RK1_FILTER 0x1000 // 4096 #define H_X1_FILTER 0x2000 // 8192 +#define GET_PP_QUALITY_MAX 6 -#define TIMEING -#define MORE_TIMEING - -#define MIN(a,b) ((a) > (b) ? (b) : (a)) -#define MAX(a,b) ((a) < (b) ? (b) : (a)) -#define ABS(a) ((a) > 0 ? (a) : (-(a))) -#define SIGN(a) ((a) > 0 ? 1 : -1) +//#define TIMEING +//#define MORE_TIMEING #define QP_STORE_T int -#ifdef HAVE_MMX2 -#define PAVGB(a,b) "pavgb " #a ", " #b " \n\t" -#elif defined (HAVE_3DNOW) -#define PAVGB(a,b) "pavgusb " #a ", " #b " \n\t" -#endif - //#ifdef __cplusplus //#include <inttypes.h> @@ -74,15 +64,16 @@ //extern "C" //{ //#endif + void postprocess(unsigned char * src[], int src_stride, unsigned char * dst[], int dst_stride, int horizontal_size, int vertical_size, QP_STORE_T *QP_store, int QP_stride, int mode); + int getPpModeForQuality(int quality); + //#ifdef __cplusplus //} //#endif - -#define GET_PP_QUALITY_MAX 6 #endif

1 0

CVS: main cfg-mplayer.h,1.86,1.87
by Arpi of Ize 13 Oct '01

13 Oct '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv4120 Modified Files: cfg-mplayer.h Log Message: added -oldpp Index: cfg-mplayer.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- cfg-mplayer.h 12 Oct 2001 16:21:55 -0000 1.86 +++ cfg-mplayer.h 13 Oct 2001 15:45:01 -0000 1.87 @@ -67,6 +67,11 @@ extern char * skinName; #endif +#ifdef HAVE_ODIVX_POSTPROCESS +extern int use_old_pp; +#endif + + /* from libvo/aspect.c */ extern float monitor_aspect; @@ -204,6 +209,11 @@ {"divxq", "Option -divxq has been renamed to -pp (postprocessing), use -pp !\n", CONF_TYPE_PRINT, 0, 0, 0}, {"pp", &divx_quality, CONF_TYPE_INT, CONF_RANGE, 0, 63}, +#ifdef HAVE_ODIVX_POSTPROCESS + {"oldpp", &use_old_pp, CONF_TYPE_FLAG, 0, 0, 1}, +#else + {"oldpp", "MPlayer was compiled without opendivx library", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0}, +#endif {"autoq", &auto_quality, CONF_TYPE_INT, CONF_RANGE, 0, 100}, {"br", &encode_bitrate, CONF_TYPE_INT, CONF_RANGE, 10000, 10000000}, #ifdef HAVE_PNG

1 0

CVS: main/libmpeg2 decode.c,1.15,1.16
by Arpi of Ize 13 Oct '01

13 Oct '01

Update of /cvsroot/mplayer/main/libmpeg2 In directory mplayer:/var/tmp.root/cvs-serv3509 Modified Files: decode.c Log Message: postprocess fixes Index: decode.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpeg2/decode.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- decode.c 4 Oct 2001 18:26:44 -0000 1.15 +++ decode.c 13 Oct 2001 15:40:35 -0000 1.16 @@ -56,6 +56,7 @@ static int drop_frame = 0; #ifdef MPEG12_POSTPROC +#include "../postproc/postprocess.h" int quant_store[MBR+1][MBC+1]; // [Review] #endif @@ -186,7 +187,7 @@ { #ifdef MPEG12_POSTPROC if( (picture->pp_options) && (!framedrop) ){ - // apply OpenDivX postprocess filter + // apply postprocess filter int stride[3]; stride[0]=picture->coded_picture_width; stride[1]=stride[2]=stride[0]/2;

1 0

CVS: main/opendivx postprocess.c,1.4,1.5 postprocess.h,1.1.1.1,1.2
by Arpi of Ize 13 Oct '01

13 Oct '01

Update of /cvsroot/mplayer/main/opendivx In directory mplayer:/var/tmp.root/cvs-serv3043 Modified Files: postprocess.c postprocess.h Log Message: renamed to odivx_postprocess Index: postprocess.c =================================================================== RCS file: /cvsroot/mplayer/main/opendivx/postprocess.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- postprocess.c 27 Sep 2001 19:10:49 -0000 1.4 +++ postprocess.c 13 Oct 2001 15:38:45 -0000 1.5 @@ -597,7 +597,7 @@ } } -void postprocess(unsigned char * src[], int src_stride, +void odivx_postprocess(unsigned char * src[], int src_stride, unsigned char * dst[], int dst_stride, int horizontal_size, int vertical_size, QP_STORE_T *QP_store, int QP_stride, Index: postprocess.h =================================================================== RCS file: /cvsroot/mplayer/main/opendivx/postprocess.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- postprocess.h 24 Feb 2001 20:31:22 -0000 1.1.1.1 +++ postprocess.h 13 Oct 2001 15:38:45 -0000 1.2 @@ -77,7 +77,7 @@ #define PP_DERING_Y_MASK 0x000000ff /**** Function prototype - entry point for postprocessing ****/ -void postprocess(unsigned char * src[], int src_stride, +void odivx_postprocess(unsigned char * src[], int src_stride, unsigned char * dst[], int dst_stride, int horizontal_size, int vertical_size, QP_STORE_T *QP_store, int QP_stride,

1 0

CVS: main/postproc postprocess.h,1.5,1.6
by Arpi of Ize 13 Oct '01

13 Oct '01

Update of /cvsroot/mplayer/main/postproc In directory mplayer:/var/tmp.root/cvs-serv2937 Modified Files: postprocess.h Log Message: small changes for mplayer integration: - getModeForQuality -> getPpModeForQuality renamed - #define POSTPROCESS_H -> NEWPOSTPROCESS_H (to avoid conflicts) Index: postprocess.h =================================================================== RCS file: /cvsroot/mplayer/main/postproc/postprocess.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- postprocess.h 13 Oct 2001 02:31:15 -0000 1.5 +++ postprocess.h 13 Oct 2001 15:38:19 -0000 1.6 @@ -16,9 +16,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - -#ifndef POSTPROCESS_H -#define POSTPROCESS_H +// POSTPROCESS_H is defined by opendivx's postprocess.h +#ifndef NEWPOSTPROCESS_H +#define NEWPOSTPROCESS_H #define BLOCK_SIZE 8 #define TEMP_STRIDE 8 @@ -66,8 +66,8 @@ //#ifdef __cplusplus //#include <inttypes.h> -void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int dstStride, int width, int height, - QP_STORE_T QPs[], int QPStride, int isColor, int mode); +//void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int dstStride, int width, int height, +// QP_STORE_T QPs[], int QPStride, int isColor, int mode); //#endif //#ifdef __cplusplus @@ -77,13 +77,12 @@ void postprocess(unsigned char * src[], int src_stride, unsigned char * dst[], int dst_stride, int horizontal_size, int vertical_size, - QP_STORE_T *QP_store, int QP_stride, - int mode); - -int getModeForQuality(int quality); + QP_STORE_T *QP_store, int QP_stride, int mode); +int getPpModeForQuality(int quality); //#ifdef __cplusplus //} //#endif +#define GET_PP_QUALITY_MAX 6 #endif

1 0

CVS: main/postproc postprocess.c,1.7,1.8
by Arpi of Ize 13 Oct '01

13 Oct '01

Update of /cvsroot/mplayer/main/postproc In directory mplayer:/var/tmp.root/cvs-serv2162 Modified Files: postprocess.c Log Message: small changes for mplayer integration: - getModeForQuality -> getPpModeForQuality renamed - #define POSTPROCESS_H -> NEWPOSTPROCESS_H (to avoid conflicts) - added #ifdef'ed code for calling old postprocess (for testing/comparison) - #ifdef'ed some asm code to allow compilation on non-x86 platforms (untested) Index: postprocess.c =================================================================== RCS file: /cvsroot/mplayer/main/postproc/postprocess.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- postprocess.c 13 Oct 2001 11:58:41 -0000 1.7 +++ postprocess.c 13 Oct 2001 15:36:04 -0000 1.8 @@ -137,7 +137,7 @@ //FIXME can never make a movieŽs black brighter (anyone needs that?) int minAllowedY=0; - +#ifdef TIMEING static inline long long rdtsc() { long long l; @@ -147,7 +147,9 @@ // printf("%d\n", int(l/1000)); return l; } +#endif +#ifdef HAVE_MMX2 static inline void prefetchnta(void *p) { asm volatile( "prefetchnta (%0)\n\t" @@ -175,6 +177,7 @@ : : "r" (p) ); } +#endif //FIXME? |255-0| = 1 (shouldnt be a problem ...) /** @@ -1814,8 +1817,13 @@ #endif } +#ifdef HAVE_ODIVX_POSTPROCESS +#include "../opendivx/postprocess.h" +int use_old_pp=0; +#endif - +static void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int dstStride, int width, int height, + QP_STORE_T QPs[], int QPStride, int isColor, int mode); /** * ... @@ -1830,7 +1838,17 @@ int mode) { - if(mode<0) mode= getModeForQuality(-mode); +#ifdef HAVE_ODIVX_POSTPROCESS +// Note: I could make this shit outside of this file, but it would mean one +// more function call... + if(use_old_pp){ + odivx_postprocess(src,src_stride,dst,dst_stride,horizontal_size,vertical_size,QP_store,QP_stride,mode); + return; + } +#endif + + // I'm calling this from dec_video.c:video_set_postprocess() + // if(mode<0) mode= getModeForQuality(-mode); /* long long T= rdtsc(); @@ -1869,21 +1887,46 @@ memcpy(dst[2], src[2], src_stride*horizontal_size); } } + /** * gets the mode flags for a given quality (larger values mean slower but better postprocessing) - * 0 <= quality < 64 + * 0 <= quality <= 6 */ -int getModeForQuality(int quality){ - int modes[6]= { +int getPpModeForQuality(int quality){ + int modes[1+GET_PP_QUALITY_MAX]= { + 0, +#if 1 + // horizontal filters first + LUM_H_DEBLOCK, + LUM_H_DEBLOCK | LUM_V_DEBLOCK, + LUM_H_DEBLOCK | LUM_V_DEBLOCK | CHROM_H_DEBLOCK, + LUM_H_DEBLOCK | LUM_V_DEBLOCK | CHROM_H_DEBLOCK | CHROM_V_DEBLOCK, + LUM_H_DEBLOCK | LUM_V_DEBLOCK | CHROM_H_DEBLOCK | CHROM_V_DEBLOCK | LUM_DERING, + LUM_H_DEBLOCK | LUM_V_DEBLOCK | CHROM_H_DEBLOCK | CHROM_V_DEBLOCK | LUM_DERING | CHROM_DERING +#else + // vertical filters first LUM_V_DEBLOCK, LUM_V_DEBLOCK | LUM_H_DEBLOCK, LUM_V_DEBLOCK | LUM_H_DEBLOCK | CHROM_V_DEBLOCK, LUM_V_DEBLOCK | LUM_H_DEBLOCK | CHROM_V_DEBLOCK | CHROM_H_DEBLOCK, LUM_V_DEBLOCK | LUM_H_DEBLOCK | CHROM_V_DEBLOCK | CHROM_H_DEBLOCK | LUM_DERING, LUM_V_DEBLOCK | LUM_H_DEBLOCK | CHROM_V_DEBLOCK | CHROM_H_DEBLOCK | LUM_DERING | CHROM_DERING - }; +#endif + }; - return modes[ (quality*6) >>6 ]; +#ifdef HAVE_ODIVX_POSTPROCESS + int odivx_modes[1+GET_PP_QUALITY_MAX]= { + 0, + PP_DEBLOCK_Y_H, + PP_DEBLOCK_Y_H|PP_DEBLOCK_Y_V, + PP_DEBLOCK_Y_H|PP_DEBLOCK_Y_V|PP_DEBLOCK_C_H, + PP_DEBLOCK_Y_H|PP_DEBLOCK_Y_V|PP_DEBLOCK_C_H|PP_DEBLOCK_C_V, + PP_DEBLOCK_Y_H|PP_DEBLOCK_Y_V|PP_DEBLOCK_C_H|PP_DEBLOCK_C_V|PP_DERING_Y, + PP_DEBLOCK_Y_H|PP_DEBLOCK_Y_V|PP_DEBLOCK_C_H|PP_DEBLOCK_C_V|PP_DERING_Y|PP_DERING_C + }; + if(use_old_pp) return odivx_modes[quality]; +#endif + return modes[quality]; } //} // extern "C" @@ -2010,7 +2053,7 @@ /** * Filters array of bytes (Y or U or V values) */ -void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int dstStride, int width, int height, +static void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int dstStride, int width, int height, QP_STORE_T QPs[], int QPStride, int isColor, int mode) { int x,y;

1 0