From 8a70b9ad85eb4e8942dc6f70a4450b9bb24d98b2 Mon Sep 17 00:00:00 2001 From: compn Date: Tue, 13 Apr 2010 01:26:20 +0000 Subject: typo fix found by ubitux git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31035 b3059339-0415-0410-9bf9-f77b7e298cf2 --- spudec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spudec.c b/spudec.c index a79d708e38..97be17aff4 100644 --- a/spudec.c +++ b/spudec.c @@ -174,7 +174,7 @@ static inline unsigned char get_nibble(packet_t *packet) static inline int mkalpha(int i) { /* In mplayer's alpha planes, 0 is transparent, then 1 is nearly - opaque upto 255 which is transparent */ + opaque upto 255 which is fully opaque */ // extend 4 -> 8 bit i |= i << 4; return (uint8_t)(-i); -- cgit v1.2.3 From 3158a326fe31cc7b84e2c23c61266d50744aaf1d Mon Sep 17 00:00:00 2001 From: reimar Date: Tue, 13 Apr 2010 05:54:44 +0000 Subject: Open cutomtex file in binary mode to avoid potential issues on Windows. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31036 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/vo_gl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index 6c80eeddfc..b2e74c7bf7 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -240,7 +240,7 @@ static void update_yuvconv(void) { params.chrom_texh = params.texh >> ys; glSetupYUVConversion(¶ms); if (custom_prog) { - FILE *f = fopen(custom_prog, "r"); + FILE *f = fopen(custom_prog, "rb"); if (!f) mp_msg(MSGT_VO, MSGL_WARN, "[gl] Could not read customprog %s\n", custom_prog); -- cgit v1.2.3 From b76812099840c1d71b429584ebb857db282b6c17 Mon Sep 17 00:00:00 2001 From: cehoyos Date: Wed, 14 Apr 2010 08:53:19 +0000 Subject: Remove dead code. Patch by ubitux, ubitux gmail git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31037 b3059339-0415-0410-9bf9-f77b7e298cf2 --- spudec.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/spudec.c b/spudec.c index 97be17aff4..e4267bf49a 100644 --- a/spudec.c +++ b/spudec.c @@ -533,12 +533,6 @@ void spudec_assemble(void *this, unsigned char *packet, unsigned int len, int pt mp_msg(MSGT_SPUDEC,MSGL_WARN,"SPUasm: packet too short\n"); return; } -#if 0 - if ((spu->packet_pts + 10000) < pts100) { - // [cb] too long since last fragment: force new packet - spu->packet_offset = 0; - } -#endif spu->packet_pts = pts100; if (spu->packet_offset == 0) { unsigned int len2 = get_be16(packet); -- cgit v1.2.3 From c0aa5c32b2e1b20b72d1830757386755055d583e Mon Sep 17 00:00:00 2001 From: reimar Date: Thu, 15 Apr 2010 05:39:36 +0000 Subject: Move functions that really do not need to be inlined from the header to the .c file. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31038 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/mp_image.c | 105 +++++++++++++++++++++++++++++++++++++++++++++++ libmpcodecs/mp_image.h | 108 ++----------------------------------------------- 2 files changed, 108 insertions(+), 105 deletions(-) diff --git a/libmpcodecs/mp_image.c b/libmpcodecs/mp_image.c index ebc9e6a749..e71821129d 100644 --- a/libmpcodecs/mp_image.c +++ b/libmpcodecs/mp_image.c @@ -93,3 +93,108 @@ void copy_mpi(mp_image_t *dmpi, mp_image_t *mpi) { dmpi->stride[0],mpi->stride[0]); } } + +void mp_image_setfmt(mp_image_t* mpi,unsigned int out_fmt){ + mpi->flags&=~(MP_IMGFLAG_PLANAR|MP_IMGFLAG_YUV|MP_IMGFLAG_SWAPPED); + mpi->imgfmt=out_fmt; + // compressed formats + if(out_fmt == IMGFMT_MPEGPES || + out_fmt == IMGFMT_ZRMJPEGNI || out_fmt == IMGFMT_ZRMJPEGIT || out_fmt == IMGFMT_ZRMJPEGIB || + IMGFMT_IS_VDPAU(out_fmt) || IMGFMT_IS_XVMC(out_fmt)){ + mpi->bpp=0; + return; + } + mpi->num_planes=1; + if (IMGFMT_IS_RGB(out_fmt)) { + if (IMGFMT_RGB_DEPTH(out_fmt) < 8 && !(out_fmt&128)) + mpi->bpp = IMGFMT_RGB_DEPTH(out_fmt); + else + mpi->bpp=(IMGFMT_RGB_DEPTH(out_fmt)+7)&(~7); + return; + } + if (IMGFMT_IS_BGR(out_fmt)) { + if (IMGFMT_BGR_DEPTH(out_fmt) < 8 && !(out_fmt&128)) + mpi->bpp = IMGFMT_BGR_DEPTH(out_fmt); + else + mpi->bpp=(IMGFMT_BGR_DEPTH(out_fmt)+7)&(~7); + mpi->flags|=MP_IMGFLAG_SWAPPED; + return; + } + mpi->flags|=MP_IMGFLAG_YUV; + mpi->num_planes=3; + if (mp_get_chroma_shift(out_fmt, NULL, NULL)) { + mpi->flags|=MP_IMGFLAG_PLANAR; + mpi->bpp = mp_get_chroma_shift(out_fmt, &mpi->chroma_x_shift, &mpi->chroma_y_shift); + mpi->chroma_width = mpi->width >> mpi->chroma_x_shift; + mpi->chroma_height = mpi->height >> mpi->chroma_y_shift; + } + switch(out_fmt){ + case IMGFMT_I420: + case IMGFMT_IYUV: + mpi->flags|=MP_IMGFLAG_SWAPPED; + case IMGFMT_YV12: + return; + case IMGFMT_420A: + case IMGFMT_IF09: + mpi->num_planes=4; + case IMGFMT_YVU9: + case IMGFMT_444P: + case IMGFMT_422P: + case IMGFMT_411P: + case IMGFMT_440P: + case IMGFMT_444P16_LE: + case IMGFMT_444P16_BE: + case IMGFMT_422P16_LE: + case IMGFMT_422P16_BE: + case IMGFMT_420P16_LE: + case IMGFMT_420P16_BE: + return; + case IMGFMT_Y800: + case IMGFMT_Y8: + /* they're planar ones, but for easier handling use them as packed */ +// mpi->flags|=MP_IMGFLAG_PLANAR; + mpi->bpp=8; + mpi->num_planes=1; + return; + case IMGFMT_UYVY: + mpi->flags|=MP_IMGFLAG_SWAPPED; + case IMGFMT_YUY2: + mpi->bpp=16; + mpi->num_planes=1; + return; + case IMGFMT_NV12: + mpi->flags|=MP_IMGFLAG_SWAPPED; + case IMGFMT_NV21: + mpi->flags|=MP_IMGFLAG_PLANAR; + mpi->bpp=12; + mpi->num_planes=2; + mpi->chroma_width=(mpi->width>>0); + mpi->chroma_height=(mpi->height>>1); + mpi->chroma_x_shift=0; + mpi->chroma_y_shift=1; + return; + } + mp_msg(MSGT_DECVIDEO,MSGL_WARN,"mp_image: unknown out_fmt: 0x%X\n",out_fmt); + mpi->bpp=0; +} + +mp_image_t* new_mp_image(int w,int h){ + mp_image_t* mpi = malloc(sizeof(mp_image_t)); + if(!mpi) return NULL; // error! + memset(mpi,0,sizeof(mp_image_t)); + mpi->width=mpi->w=w; + mpi->height=mpi->h=h; + return mpi; +} + +void free_mp_image(mp_image_t* mpi){ + if(!mpi) return; + if(mpi->flags&MP_IMGFLAG_ALLOCATED){ + /* becouse we allocate the whole image in once */ + if(mpi->planes[0]) free(mpi->planes[0]); + if (mpi->flags & MP_IMGFLAG_RGB_PALETTE) + free(mpi->planes[1]); + } + free(mpi); +} + diff --git a/libmpcodecs/mp_image.h b/libmpcodecs/mp_image.h index 65b155e037..334b3c986d 100644 --- a/libmpcodecs/mp_image.h +++ b/libmpcodecs/mp_image.h @@ -122,111 +122,9 @@ typedef struct mp_image_s { void* priv; } mp_image_t; -#ifdef IMGFMT_YUY2 -static inline void mp_image_setfmt(mp_image_t* mpi,unsigned int out_fmt){ - mpi->flags&=~(MP_IMGFLAG_PLANAR|MP_IMGFLAG_YUV|MP_IMGFLAG_SWAPPED); - mpi->imgfmt=out_fmt; - // compressed formats - if(out_fmt == IMGFMT_MPEGPES || - out_fmt == IMGFMT_ZRMJPEGNI || out_fmt == IMGFMT_ZRMJPEGIT || out_fmt == IMGFMT_ZRMJPEGIB || - IMGFMT_IS_VDPAU(out_fmt) || IMGFMT_IS_XVMC(out_fmt)){ - mpi->bpp=0; - return; - } - mpi->num_planes=1; - if (IMGFMT_IS_RGB(out_fmt)) { - if (IMGFMT_RGB_DEPTH(out_fmt) < 8 && !(out_fmt&128)) - mpi->bpp = IMGFMT_RGB_DEPTH(out_fmt); - else - mpi->bpp=(IMGFMT_RGB_DEPTH(out_fmt)+7)&(~7); - return; - } - if (IMGFMT_IS_BGR(out_fmt)) { - if (IMGFMT_BGR_DEPTH(out_fmt) < 8 && !(out_fmt&128)) - mpi->bpp = IMGFMT_BGR_DEPTH(out_fmt); - else - mpi->bpp=(IMGFMT_BGR_DEPTH(out_fmt)+7)&(~7); - mpi->flags|=MP_IMGFLAG_SWAPPED; - return; - } - mpi->flags|=MP_IMGFLAG_YUV; - mpi->num_planes=3; - if (mp_get_chroma_shift(out_fmt, NULL, NULL)) { - mpi->flags|=MP_IMGFLAG_PLANAR; - mpi->bpp = mp_get_chroma_shift(out_fmt, &mpi->chroma_x_shift, &mpi->chroma_y_shift); - mpi->chroma_width = mpi->width >> mpi->chroma_x_shift; - mpi->chroma_height = mpi->height >> mpi->chroma_y_shift; - } - switch(out_fmt){ - case IMGFMT_I420: - case IMGFMT_IYUV: - mpi->flags|=MP_IMGFLAG_SWAPPED; - case IMGFMT_YV12: - return; - case IMGFMT_420A: - case IMGFMT_IF09: - mpi->num_planes=4; - case IMGFMT_YVU9: - case IMGFMT_444P: - case IMGFMT_422P: - case IMGFMT_411P: - case IMGFMT_440P: - case IMGFMT_444P16_LE: - case IMGFMT_444P16_BE: - case IMGFMT_422P16_LE: - case IMGFMT_422P16_BE: - case IMGFMT_420P16_LE: - case IMGFMT_420P16_BE: - return; - case IMGFMT_Y800: - case IMGFMT_Y8: - /* they're planar ones, but for easier handling use them as packed */ -// mpi->flags|=MP_IMGFLAG_PLANAR; - mpi->bpp=8; - mpi->num_planes=1; - return; - case IMGFMT_UYVY: - mpi->flags|=MP_IMGFLAG_SWAPPED; - case IMGFMT_YUY2: - mpi->bpp=16; - mpi->num_planes=1; - return; - case IMGFMT_NV12: - mpi->flags|=MP_IMGFLAG_SWAPPED; - case IMGFMT_NV21: - mpi->flags|=MP_IMGFLAG_PLANAR; - mpi->bpp=12; - mpi->num_planes=2; - mpi->chroma_width=(mpi->width>>0); - mpi->chroma_height=(mpi->height>>1); - mpi->chroma_x_shift=0; - mpi->chroma_y_shift=1; - return; - } - mp_msg(MSGT_DECVIDEO,MSGL_WARN,"mp_image: unknown out_fmt: 0x%X\n",out_fmt); - mpi->bpp=0; -} -#endif - -static inline mp_image_t* new_mp_image(int w,int h){ - mp_image_t* mpi = malloc(sizeof(mp_image_t)); - if(!mpi) return NULL; // error! - memset(mpi,0,sizeof(mp_image_t)); - mpi->width=mpi->w=w; - mpi->height=mpi->h=h; - return mpi; -} - -static inline void free_mp_image(mp_image_t* mpi){ - if(!mpi) return; - if(mpi->flags&MP_IMGFLAG_ALLOCATED){ - /* becouse we allocate the whole image in once */ - if(mpi->planes[0]) free(mpi->planes[0]); - if (mpi->flags & MP_IMGFLAG_RGB_PALETTE) - free(mpi->planes[1]); - } - free(mpi); -} +void mp_image_setfmt(mp_image_t* mpi,unsigned int out_fmt); +mp_image_t* new_mp_image(int w,int h); +void free_mp_image(mp_image_t* mpi); mp_image_t* alloc_mpi(int w, int h, unsigned long int fmt); void mp_image_alloc_planes(mp_image_t *mpi); -- cgit v1.2.3 From 2c26f9bde01798475b05ce5beeec028843c5c5f3 Mon Sep 17 00:00:00 2001 From: reimar Date: Thu, 15 Apr 2010 18:51:07 +0000 Subject: Mark ffaac as buggy (thus making faad default again) and document the know issues. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31039 b3059339-0415-0410-9bf9-f77b7e298cf2 --- etc/codecs.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/etc/codecs.conf b/etc/codecs.conf index 11e98810c6..5964c487b0 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -3904,7 +3904,9 @@ audiocodec ffdv audiocodec ffaac info "FFmpeg AAC (MPEG-2/MPEG-4 Audio)" - status working + comment "missing LATM support, some SBR in MKV play too slow" + ; see samples/Matroska/aac-sbr-ffaac-slow.mkv + status buggy fourcc mp4a,MP4A fourcc "VLB " ; Used in NSV, not really working fourcc "AAC " ; Used in NSV -- cgit v1.2.3 From 12d6f6b378872ca4c06a268dc33c4e045f4966e4 Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 15 Apr 2010 23:01:06 +0000 Subject: Remove commented-out and long-gone dapsync options. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31040 b3059339-0415-0410-9bf9-f77b7e298cf2 --- cfg-mplayer.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/cfg-mplayer.h b/cfg-mplayer.h index c1bfa57fcc..5a0ebe7bc0 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -339,8 +339,6 @@ const m_option_t mplayer_opts[]={ {"nocorrect-pts", &user_correct_pts, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"noautosync", &autosync, CONF_TYPE_FLAG, 0, 0, -1, NULL}, {"autosync", &autosync, CONF_TYPE_INT, CONF_RANGE, 0, 10000, NULL}, -// {"dapsync", &dapsync, CONF_TYPE_FLAG, 0, 0, 1, NULL}, -// {"nodapsync", &dapsync, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"softsleep", &softsleep, CONF_TYPE_FLAG, 0, 0, 1, NULL}, #ifdef HAVE_RTC -- cgit v1.2.3