July 2013 - MPlayer-dev-eng - lists.mplayerhq.hu

Homepage skin download issue
by Ingo Brückl 09 Sep '15

09 Sep '15

Yesterday, I updated hwswskin to 1.3, but it still isn't downloadable. Is the generation of the skin download tarballs working? Ingo

3 8

Homepage DOCS needs update
by Ingo Brückl 24 Apr '14

24 Apr '14

If it's already on the to-do list ignore, but the documentation on the homepage doesn't get updated. Ingo

3 12

[PATCH] xvmc: handle shm xvimage allocation error
by Marcin Slusarz 06 Jan '14

06 Jan '14

- handle xvimage/shm allocation failure and fallback to non-shm xv - assert xvimage->data_size!=0 because 0 size will lead to memory corruptions (I hit it because of bug in Nouveau's early xvmc implementation) Index: libvo/vo_xvmc.c =================================================================== --- libvo/vo_xvmc.c (wersja 34098) +++ libvo/vo_xvmc.c (kopia robocza) @@ -181,6 +181,15 @@ return cur_render->state || (cur_render->mpi && cur_render->mpi->usage_count); } +static void allocate_xvimage_non_shm(int xvimage_width, int xvimage_height, int xv_format) +{ + xvimage = (XvImage *) XvCreateImage(mDisplay, xv_port, xv_format, NULL, + xvimage_width, xvimage_height); + assert(xvimage->data_size); + xvimage->data = malloc(xvimage->data_size); + XSync(mDisplay,False); +} + static void allocate_xvimage(int xvimage_width,int xvimage_height,int xv_format) { /* @@ -188,7 +197,8 @@ * mit-shm this will bomb... trzing to fix ::atmos */ #ifdef HAVE_SHM - if ( mLocalDisplay && XShmQueryExtension( mDisplay ) ) Shmem_Flag = 1; + if ( mLocalDisplay && XShmQueryExtension( mDisplay ) ) + Shmem_Flag = 0; else { Shmem_Flag = 0; @@ -198,25 +208,41 @@ { xvimage = (XvImage *) XvShmCreateImage(mDisplay, xv_port, xv_format, NULL, xvimage_width, xvimage_height, &Shminfo); + if (!xvimage) + goto noshmimage; + assert(xvimage->data_size); Shminfo.shmid = shmget(IPC_PRIVATE, xvimage->data_size, IPC_CREAT | 0777); + if (Shminfo.shmid == -1) + goto shmgetfail; + Shminfo.shmaddr = (char *) shmat(Shminfo.shmid, 0, 0); + if ((long)Shminfo.shmaddr == -1) + goto shmatfail; + Shminfo.readOnly = False; xvimage->data = Shminfo.shmaddr; - XShmAttach(mDisplay, &Shminfo); + if (!XShmAttach(mDisplay, &Shminfo)) + goto shmattachfail; + XSync(mDisplay, False); shmctl(Shminfo.shmid, IPC_RMID, 0); } else #endif - { - xvimage = (XvImage *) XvCreateImage(mDisplay, xv_port, xv_format, NULL, xvimage_width, xvimage_height); - xvimage->data = malloc(xvimage->data_size); - XSync(mDisplay,False); - } -// memset(xvimage->data,128,xvimage->data_size); + allocate_xvimage_non_shm(xvimage_width, xvimage_height, xv_format); return; + +shmattachfail: + shmdt(Shminfo.shmaddr); +shmatfail: + shmctl(Shminfo.shmid, IPC_RMID, 0); +shmgetfail: + XFree(xvimage); +noshmimage: + Shmem_Flag = 0; + allocate_xvimage_non_shm(xvimage_width, xvimage_height, xv_format); } static void deallocate_xvimage(void)

4 6

[PATCH] Update vo_png to use updated API
by Jiang Jiang 14 Aug '13

14 Aug '13

avcodec_encode_video is deprecated. --- libvo/vo_png.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libvo/vo_png.c b/libvo/vo_png.c index ae93dcf..3556c81 100644 --- a/libvo/vo_png.c +++ b/libvo/vo_png.c @@ -146,9 +146,10 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin static uint32_t draw_image(mp_image_t* mpi){ AVFrame pic; int buffersize; - int res; + int res, got_pkt; char buf[100]; FILE *outfile; + AVPacket pkt; // if -dr or -slices then do nothing: if(mpi->flags&(MP_IMGFLAG_DIRECT|MP_IMGFLAG_DRAW_CALLBACK)) return VO_TRUE; @@ -170,7 +171,10 @@ static uint32_t draw_image(mp_image_t* mpi){ outbuffer = av_malloc(buffersize); outbuffer_size = buffersize; } - res = avcodec_encode_video(avctx, outbuffer, outbuffer_size, &pic); + av_init_packet(&pkt); + pkt.data = outbuffer; + pkt.size = outbuffer_size; + res = avcodec_encode_video2(avctx, &pkt, &pic, &got_pkt); if(res < 0){ mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_PNG_ErrorInCreatePng); @@ -178,7 +182,7 @@ static uint32_t draw_image(mp_image_t* mpi){ return 1; } - fwrite(outbuffer, res, 1, outfile); + fwrite(outbuffer, pkt.size, 1, outfile); fclose(outfile); return VO_TRUE; -- 1.8.3.1 (Apple Git-46)

2 3

Move Bugzilla to another server
by Moritz Bunkus 04 Aug '13

04 Aug '13

Hey, Quite a long time ago I was involved in mplayer's development, and since then I've been hosting mplayer's Bugzilla installation at http://bugzilla.mplayerhq.hu (the domain name is an alias for bugzilla.bunkus.org which is my domain). Unfortunately I'm not really doing a good job of administering it -- keeping it up to date is only done sporadically, and to be honest I don't want to do it anymore (having way too many things to administer already). I would therefore ask you guys to move the Bugzilla to a different server of your chosing. I'm not switching the installation off over night, don't worry, but I'd like to have this done within three months' time. I can provide you with a full MySQL database dump and a tarball of the installation directory -- which is essentially all there is to a Bugzilla installation. You already own and control the official domain name, so you can simply point it to a different address once the move's been completed (and I can set up a 301 redirect for the day or two it may take DNS caches to get the news). What I'd like you to do is come to some kind of conclusion where to move the server to and then to coordinate the move with me. Depending on how little downtime you're trying to achieve we can certainly agree on a date and time on which I'll turn it off, dump the database, create a tarball and provide you with a download location -- should be done within a couple of minutes. Maybe you don't use Bugzilla all that much anymore, but it's at least still mentioned in the official documentation reachable from http://www.mplayerhq.hu so I guess it's not completely unused. Anyway, I'll turn off the installation on 2013-11-01, preferably as soon as possible, though. Thanks. Kind regards, mosu

6 8

[PATCH 1/3] Fix build with libdvdnav due to missing files
by Jiang Jiang 29 Jul '13

29 Jul '13

--- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index 4e03120..e8d5868 100644 --- a/Makefile +++ b/Makefile @@ -51,8 +51,11 @@ SRCS_COMMON-$(DVDNAV_INTERNAL) += libdvdnav/dvdnav.c \ libdvdnav/searching.c \ libdvdnav/settings.c \ libdvdnav/vm/decoder.c \ + libdvdnav/vm/getset.c \ + libdvdnav/vm/play.c \ libdvdnav/vm/vm.c \ libdvdnav/vm/vmcmd.c \ + libdvdnav/vm/vmget.c \ SRCS_COMMON-$(DVDREAD) += stream/stream_dvd.c \ stream/stream_dvd_common.c -- 1.8.3.1 (Apple Git-46)

6 25

[PATCH] Do not close feed in the middle of decoding.
by Reimar Döffinger 29 Jul '13

29 Jul '13

Since there is no logic to try and open it again, its only effect will be that MPlayer is permanently stuck in an error state. With some libmpg123 versions it even seems to cause a crash, see bugzilla #2149. --- libmpcodecs/ad_mpg123.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libmpcodecs/ad_mpg123.c b/libmpcodecs/ad_mpg123.c index e303f74..2073e85 100644 --- a/libmpcodecs/ad_mpg123.c +++ b/libmpcodecs/ad_mpg123.c @@ -293,7 +293,6 @@ static int decode_a_bit(sh_audio_t *sh, unsigned char *buf, int count) if (ret == MPG123_ERR) { mp_msg(MSGT_DECAUDIO, MSGL_ERR, "mpg123 decoding failed: %s\n", mpg123_strerror(con->handle)); - mpg123_close(con->handle); return -1; } @@ -319,7 +318,6 @@ static int reopen_stream(sh_audio_t *sh) mp_msg(MSGT_DECAUDIO, MSGL_ERR, "mpg123 failed to reopen stream: %s\n", mpg123_strerror(con->handle)); - mpg123_close(con->handle); return 0; } } -- 1.8.3.2

2 7

Bug with the switch_ratio command
by Ingo Brückl 29 Jul '13

29 Jul '13

When playing an (probably anamorphic widescreen) DVD, the "switch_ratio -1" command doesn't reset to correct movie aspect, but to raw anamorphic aspect ratio. Ingo

4 9

[PATCH] GUI: Once more aspect ratio
by Hans-Dieter Kosch 29 Jul '13

29 Jul '13

Hi Ingo, attached some patches on the recent revision of aspect ratio selection. aspect1.patch: Revert to using the special value -1 for original aspect and additionally retain it in command.c; otherwise, a next stream would not play with its own original aspect, but with that of the current one. (The patch in command.c is not exclusively related to the GUI). Files: gui/ui/actions.c, gui/win32/gui.c, command.c aspect2.patch: Don't reset aspect after playing stream in win32, so as it's handled elsewhere. Files: gui/win32/interface.c aspect3.patch: Keep paused state when changing the aspect ratio. Files: gui/ui/actions.c, gui/win32/gui.c aspect4.patch: Add check marks to the aspect menu items, analogous to the video size menu (depends on special value -1 for original aspect). Files: gui/dialog/menu.c Hans-Dieter

2 3

[PATCH v2] Support newer GIFLIB versions
by Alexander Strasser 27 Jul '13

27 Jul '13

Work with GIFLIB version >= 4.2 Several functions have been renamed or changed in signature. GIFLIB is used by vo gif89a and demuxer gif. Signed-off-by: Alexander Strasser <eclipse7(a)gmx.net> --- This is in the same spirit as the previous patch. It keeps backward compatibility. Only 3 things changed: 1) vo gif89a: Write the loop extension when compiled against GIFLIB >= 5 2) demux gif: GifError() macro: check pointer to a GifFileType is non-NULL => if it is NULL use 0 as error code which is an invalid GIFLIB error => only possible with GIFLIB >= 5 and only when calling DGifOpen* 3) demux gif: Use mp_msg instead of printf in PrintGifError replacement configure | 1 + libmpdemux/demux_gif.c | 44 +++++++++++++++++++++++++++++++++++--------- libvo/vo_gif89a.c | 31 ++++++++++++++++++++++--------- 3 files changed, 58 insertions(+), 18 deletions(-) diff --git a/configure b/configure index 6f62eaa..47debc1 100755 --- a/configure +++ b/configure @@ -5091,6 +5091,7 @@ if test "$_gif" = auto ; then _gif=no for ld_gif in "-lungif" "-lgif" ; do statement_check gif_lib.h 'QuantizeBuffer(0, 0, 0, 0, 0, 0, 0, 0)' $ld_gif && _gif=yes && break + statement_check gif_lib.h 'GifQuantizeBuffer(0, 0, 0, 0, 0, 0, 0, 0)' $ld_gif && _gif=yes && break done fi diff --git a/libmpdemux/demux_gif.c b/libmpdemux/demux_gif.c index 804ce8c..f887a26 100644 --- a/libmpdemux/demux_gif.c +++ b/libmpdemux/demux_gif.c @@ -45,6 +45,32 @@ typedef struct { #define GIF_SIGNATURE (('G' << 16) | ('I' << 8) | 'F') +#if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 5 +#define DGifOpen(a, b) DGifOpen(a, b, NULL) +#define DGifOpenFileHandle(a) DGifOpenFileHandle(a, NULL) +#define GifError() (gif ? gif->Error : 0) +#define GifErrorString() GifErrorString(gif->Error) +#endif + +/* >= 4.2 prior GIFLIB did not have MAJOR/MINOR defines */ +#if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 4 +static void print_gif_error(GifFileType * gif) +{ + int err = GifError(); + char *err_str = GifErrorString(); + + if (err_str) + mp_msg(MSGT_DEMUX, MSGL_ERR, "\n[gif] GIF-LIB error: %s.\n", err_str); + else + mp_msg(MSGT_DEMUX, MSGL_ERR, "\n[gif] GIF-LIB undefined error %d.\n", err); +} +#else +static void print_gif_error(GifFileType * gif) +{ + PrintGifError(); +} +#endif + #ifndef CONFIG_GIF_TVT_HACK // not supported by certain versions of the library static int my_read_gif(GifFileType *gif, uint8_t *buf, int len) @@ -94,14 +120,14 @@ static int demux_gif_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds) while (type != IMAGE_DESC_RECORD_TYPE) { if (DGifGetRecordType(gif, &type) == GIF_ERROR) { - PrintGifError(); + print_gif_error(priv->gif); return 0; // oops } if (type == TERMINATE_RECORD_TYPE) return 0; // eof if (type == SCREEN_DESC_RECORD_TYPE) { if (DGifGetScreenDesc(gif) == GIF_ERROR) { - PrintGifError(); + print_gif_error(priv->gif); return 0; // oops } } @@ -109,7 +135,7 @@ static int demux_gif_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds) int code; unsigned char *p = NULL; if (DGifGetExtension(gif, &code, &p) == GIF_ERROR) { - PrintGifError(); + print_gif_error(priv->gif); return 0; // oops } if (code == 0xF9) { @@ -138,7 +164,7 @@ static int demux_gif_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds) comments[length] = 0; printf("%s", comments); if (DGifGetExtensionNext(gif, &p) == GIF_ERROR) { - PrintGifError(); + print_gif_error(priv->gif); return 0; // oops } } @@ -146,7 +172,7 @@ static int demux_gif_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds) } while (p != NULL) { if (DGifGetExtensionNext(gif, &p) == GIF_ERROR) { - PrintGifError(); + print_gif_error(priv->gif); return 0; // oops } } @@ -154,7 +180,7 @@ static int demux_gif_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds) } if (DGifGetImageDesc(gif) == GIF_ERROR) { - PrintGifError(); + print_gif_error(priv->gif); return 0; // oops } @@ -167,7 +193,7 @@ static int demux_gif_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds) memset(dp->buffer, gif->SBackGroundColor, priv->w * priv->h); if (DGifGetLine(gif, buf, len) == GIF_ERROR) { - PrintGifError(); + print_gif_error(priv->gif); free(buf); free_demux_packet(dp); return 0; // oops @@ -261,7 +287,7 @@ static demuxer_t* demux_open_gif(demuxer_t* demuxer) gif = DGifOpen(demuxer->stream, my_read_gif); #endif if (!gif) { - PrintGifError(); + print_gif_error(NULL); free(priv); return NULL; } @@ -303,7 +329,7 @@ static void demux_close_gif(demuxer_t* demuxer) gif_priv_t *priv = demuxer->priv; if (!priv) return; if (priv->gif && DGifCloseFile(priv->gif) == GIF_ERROR) - PrintGifError(); + print_gif_error(priv->gif); free(priv->refimg); free(priv); } diff --git a/libvo/vo_gif89a.c b/libvo/vo_gif89a.c index b808f81..27eec25 100644 --- a/libvo/vo_gif89a.c +++ b/libvo/vo_gif89a.c @@ -69,6 +69,12 @@ static const vo_info_t info = { const LIBVO_EXTERN(gif89a) +#if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 5 +#define EGifOpenFileName(a, b) EGifOpenFileName(a, b, NULL) +#define MakeMapObject GifMakeMapObject +#define FreeMapObject GifFreeMapObject +#define QuantizeBuffer GifQuantizeBuffer +#endif // how many frames per second we are aiming for during output. static float target_fps; @@ -156,7 +162,7 @@ static int config(uint32_t s_width, uint32_t s_height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format) { -#ifdef CONFIG_GIF_4 +#if defined CONFIG_GIF_4 || GIFLIB_MAJOR >= 5 // these are control blocks for the gif looping extension. char LB1[] = "NETSCAPE2.0"; char LB2[] = { 1, 0, 0 }; @@ -185,23 +191,25 @@ static int config(uint32_t s_width, uint32_t s_height, uint32_t d_width, return 1; } + new_gif = EGifOpenFileName(gif_filename, 0); + if (new_gif == NULL) { + mp_msg(MSGT_VO, MSGL_ERR, "GIF89a: error opening file \"%s\" for output.\n", gif_filename); + return 1; + } + +#if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 5 + EGifSetGifVersion(new_gif, 1); +#elif defined CONFIG_GIF_4 // the EGifSetGifVersion line causes segfaults in certain // earlier versions of libungif. i don't know exactly which, // but certainly in all those before v4. if you have problems, // you need to upgrade your gif library. -#ifdef CONFIG_GIF_4 EGifSetGifVersion("89a"); #else mp_msg(MSGT_VO, MSGL_ERR, "GIF89a: Your version of libungif needs to be upgraded.\n"); mp_msg(MSGT_VO, MSGL_ERR, "GIF89a: Some functionality has been disabled.\n"); #endif - new_gif = EGifOpenFileName(gif_filename, 0); - if (new_gif == NULL) { - mp_msg(MSGT_VO, MSGL_ERR, "GIF89a: error opening file \"%s\" for output.\n", gif_filename); - return 1; - } - slice_data = malloc(img_width * img_height * 3); if (slice_data == NULL) { mp_msg(MSGT_VO, MSGL_ERR, "GIF89a: malloc failed.\n"); @@ -231,7 +239,12 @@ static int config(uint32_t s_width, uint32_t s_height, uint32_t d_width, // set the initial width and height info. EGifPutScreenDesc(new_gif, s_width, s_height, 256, 0, reduce_cmap); -#ifdef CONFIG_GIF_4 +#if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 5 + EGifPutExtensionLeader(new_gif, 0xFF); + EGifPutExtensionBlock(new_gif, 11, LB1); + EGifPutExtensionBlock(new_gif, 3, LB2); + EGifPutExtensionTrailer(new_gif); +#elif defined CONFIG_GIF_4 // version 3 of libungif does not support multiple control blocks. // looping requires multiple control blocks. // therefore, looping is only enabled for v4 and up. --

2 3