April 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] DJGPP support
by Fabrizio Gennari 17 May '13

17 May '13

Hello. This patch allows compilation of MPlayer for MS-DOS using DJGPP dev environment. It applies to latest SVN rev 35946, and is based on one made by Khusraw of bttr-software.de forum, who ported SVN rev 34661 (available at http://omploader.org/vY3A4Mg) Cross-compilation is made by adding --target=i386-DJGPP to configure's parameters. In order to play sounds, it needs a special version of the WSS library, that can be found at http://rayer.g6.cz/download/wss.zip (plus the relevant --extra-cflags and --extra-ldflags so configure can detect it). A patch also needs to be applied to FFmpeg as well, see https://lists.ffmpeg.org/pipermail/ffmpeg-devel/2013-March/140219.html Regards, Fabrizio

4 5

va-api support
by Igor Gnatenko 16 May '13

16 May '13

Hi all! How is the inclusion of va-api into the master branch mplayer? -- Best Regards, Igor Gnatenko

6 7

Patch for build failure with clang, lvvm, etc. on Mac OSX > 10.6
by Aubin Paul 16 May '13

16 May '13

Submitted this via Bugzilla but not sure if that's the right place anymore: http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2134#c0 Darwin-specific changes to fix compilation on current Mac OS X/Xcode/clang It is not possible to build Mplayer on Mac OS X > 10.6 due to a few errors in the build system. The following changes (all can be implemented in configure for the darwin/x86_64 target) allow mplayer to build properly. 1. using -DPIC with YASM to allow ffmpeg to compile properly 2. Using -Wl,-pie to fix linking since -pie -fpie is incorrect under Darwin's clang 3. --mdynamic-no-pic breaks compilation due to security features in newer versions of Mac OS X Clang does support PIC but the configure check breaks due to the inclusion of -fpie -pie so I added a separate check for clang and darwin to include the right flags. After that, PIC is successfully detected and works fine. Attached a patch which fixes the issue and should not affect any other platforms.

2 1

Improve bluray chapter support
by Olivier Rolland 16 May '13

16 May '13

Hello, Here are some patches to improve chapter support for bluray. The 2 following patches fix issues in the current code. 0001-Fix-chapter-selection.patch: According to the documentation, -bluray-chapter indicates the chapter to start playing from, the default being 1. However, manually specifying -bluray-chapter 1 starts playing from chapter 2 (-bluray-chapter 0 starts playing from chapter 1). Moreover, specifying a chapter number greater than or equal to the number of chapters starts playing at position -1 because the chapter number is not clamped correctly. This patch fixes all that. 0002-Fix-current-chapter.patch: The current chapter is always the start chapter. With this patch, it is indeed the chapter currently playing. The 3 following patches add support for a chapter to stop playing at. For that, it is necessary to make stream_bluray.c use the same variables for chapters as stream_dvd.c, namely dvd_chapter and dvd_last_chapter. It then has to use the same function to parse chapter ranges. 0003-Extract-chapter-parsing.patch: This patch moves the chapter parsing function from stream_dvd.c/h to stream.c/h. 0004-Add-last-chapter-support.patch: This patch replaces bluray specific chapter variables with dvd variables, makes use of the same command line option for dvd and bluray chapter selection, keeps the bluray specific command line option for compatibility sake and adds full support for end chapter of bluray. It also updates the man page. 0005-Remove-bluray-chapter.patch: This patch removes the bluray specific command line option for chapter selection from the code and the man page. Please, review and comment. Olivier

3 7

[PATCH] Fix capture width/height selection in tvi_dshow
by Vladimir Voroshilov 04 May '13

04 May '13

Hi, All Attached patch fixes capture resolution selection in tvi_dshow by specifying width/height via -tv argument in command line. Problem was fixed by implementing TVI_CONTROL_VID_SET_WIDTH_HEIGHT ioctl. Existing code is not able to change resolution if driver presents supported modes (format+resolution) as separate format structures with fixed width/height each. It tries to change width or height in bounds of provided min/max values within the same format. New ioctl searches is all detected formats for one with the same FourCC (as was set previously by TVI_SET_FORMAT ioctl) and appropriate width/height bounds (according to requested width/height). If no such format found it leaves selected format untouched. Patch was tested under Windows 7 with noname Video Webcam (vid 0x04F2 pid 0xB044) and Philips SPC 1030NC Webcam. I'm not sure about formatting/spaces in the patch since wrote it under windows box. Please review -- Vladimir Voroshilovmailto:voroshil@gmail.com Jabber:voroshil@gmail.com ICQ: 95587719

2 4

[PATCH] demux_lavf: add an option to use the new seek API.
by Nicolas George 30 Apr '13

30 Apr '13

--- DOCS/man/en/mplayer.1 | 4 ++++ libmpdemux/demux_lavf.c | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 9000f34..500c9fb 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -11758,6 +11758,10 @@ This is the raw binary data of the key converted to a hexadecimal string. Prefix prepended to URL passed to libavformat. The default is "mp:". . +.TP +.B newseekapi=<value> +If set to 1, enable using libavformat's new seek API. +. . .SS FFmpeg libavformat muxers (\-lavfopts) (also see \-of lavf) . diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index ef623e8..a14a560 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -51,6 +51,7 @@ static unsigned int opt_probesize = 0; static unsigned int opt_analyzeduration = 0; +static unsigned int opt_newseekapi = 0; static char *opt_format; static char *opt_cryptokey; static char *opt_avopt = NULL; @@ -62,6 +63,7 @@ const m_option_t lavfdopts_conf[] = { {"analyzeduration", &(opt_analyzeduration), CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL}, {"cryptokey", &(opt_cryptokey), CONF_TYPE_STRING, 0, 0, 0, NULL}, {"urlprefix", &(opt_urlprefix), CONF_TYPE_STRING, M_OPT_MIN,0, 0, NULL}, + {"newseekapi", &(opt_newseekapi), CONF_TYPE_INT, CONF_RANGE, 0, 1, NULL}, {"o", &opt_avopt, CONF_TYPE_STRING, 0, 0, 0, NULL}, {NULL, NULL, 0, 0, 0, 0, NULL} }; @@ -704,6 +706,10 @@ static void demux_seek_lavf(demuxer_t *demuxer, float rel_seek_secs, float audio } else { priv->last_pts += rel_seek_secs * AV_TIME_BASE; } + if (opt_newseekapi) { + avformat_seek_file(priv->avfc, -1, INT64_MIN, priv->last_pts, INT64_MAX, avsflags); + return; + } if (av_seek_frame(priv->avfc, -1, priv->last_pts, avsflags) < 0) { avsflags ^= AVSEEK_FLAG_BACKWARD; av_seek_frame(priv->avfc, -1, priv->last_pts, avsflags); -- 1.7.10.4

3 7

[PATCH] demux_lavf: add urlprefix suboption.
by Nicolas George 30 Apr '13

30 Apr '13

Setting it to an empty string may be necessary when using special formats that use the given URL or file name as a base path for other files. Change the option parser to accept empty strings if M_OPT_MIN is set and min = 0. --- DOCS/man/en/mplayer.1 | 5 +++++ libmpdemux/demux_lavf.c | 5 +++++ m_option.c | 2 ++ 3 files changed, 12 insertions(+) diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index d424589..c59c784 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -11753,6 +11753,11 @@ of TS packets to scan. Encryption key the demuxer should use. This is the raw binary data of the key converted to a hexadecimal string. . +.TP +.B urlprefix=string +Prefix prepended to URL passed to libavformat. +The default is "mp:". +. . .SS FFmpeg libavformat muxers (\-lavfopts) (also see \-of lavf) . diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index 7ce3f32..ef623e8 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -54,12 +54,14 @@ static unsigned int opt_analyzeduration = 0; static char *opt_format; static char *opt_cryptokey; static char *opt_avopt = NULL; +static char *opt_urlprefix; const m_option_t lavfdopts_conf[] = { {"probesize", &(opt_probesize), CONF_TYPE_INT, CONF_RANGE, 32, INT_MAX, NULL}, {"format", &(opt_format), CONF_TYPE_STRING, 0, 0, 0, NULL}, {"analyzeduration", &(opt_analyzeduration), CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL}, {"cryptokey", &(opt_cryptokey), CONF_TYPE_STRING, 0, 0, 0, NULL}, + {"urlprefix", &(opt_urlprefix), CONF_TYPE_STRING, M_OPT_MIN,0, 0, NULL}, {"o", &opt_avopt, CONF_TYPE_STRING, 0, 0, 0, NULL}, {NULL, NULL, 0, 0, 0, 0, NULL} }; @@ -511,6 +513,9 @@ static demuxer_t* demux_open_lavf(demuxer_t *demuxer){ int i; char mp_filename[256]="mp:"; + if (opt_urlprefix) + av_strlcpy(mp_filename, opt_urlprefix, sizeof(mp_filename)); + stream_seek(demuxer->stream, 0); avfc = avformat_alloc_context(); diff --git a/m_option.c b/m_option.c index 6814579..2335cb2 100644 --- a/m_option.c +++ b/m_option.c @@ -386,6 +386,8 @@ const m_option_type_t m_option_type_position = { static int parse_str(const m_option_t* opt,const char *name, const char *param, void* dst, int src) { + if (param == NULL && (opt->flags & M_OPT_MIN) && opt->min == 0) + param = ""; if (param == NULL) return M_OPT_MISSING_PARAM; -- 1.7.10.4

2 4