- MPlayer-cvslog - lists.mplayerhq.hu

r38430 - trunk/gui/dialog/menu.c
by ib 27 Jun '23

27 Jun '23

Author: ib Date: Tue Jun 27 17:18:19 2023 New Revision: 38430 Log: Add original but obsolete DVD language codes. The language codes to be used instead already exist. Modified: trunk/gui/dialog/menu.c Modified: trunk/gui/dialog/menu.c ============================================================================== --- trunk/gui/dialog/menu.c Tue Jun 27 17:17:08 2023 (r38429) +++ trunk/gui/dialog/menu.c Tue Jun 27 17:18:19 2023 (r38430) @@ -294,6 +294,7 @@ static const Languages_t Languages[] = { lng( 'm','k' ), "mac", "Македонски јазик" }, { lng( 'm','l' ), "mal", "മലയാളം" }, { lng( 'm','n' ), "mon", "ᠮᠣᠨᠭᠭᠣᠯ" }, + { lng( 'm','o' ), "mol", "Moldovenesc" }, { lng( 'm','r' ), "mar", "मराठी" }, { lng( 'm','s' ), "msa", "Bahasa Melayu" }, { lng( 'm','s' ), "may", "Bahasa Melayu" }, @@ -328,6 +329,7 @@ static const Languages_t Languages[] = { lng( 's','c' ), "srd", "Sardu" }, { lng( 's','d' ), "snd", "‏سنڌي‎" }, { lng( 's','g' ), "sag", "Sängö" }, + { lng( 's','h' ), "scr", "Srpskohrvatski" }, { lng( 's','i' ), "sin", "සිංහල" }, { lng( 's','k' ), "slk", "Slovenčina" }, { lng( 's','k' ), "slo", "Slovenčina" },

1 0

r38429 - trunk/gui/dialog/menu.c
by ib 27 Jun '23

27 Jun '23

Author: ib Date: Tue Jun 27 17:17:08 2023 New Revision: 38429 Log: Add original DVD language codes changed or withdrawn later in ISO 639-1. The language codes to be used instead already exist. Modified: trunk/gui/dialog/menu.c Modified: trunk/gui/dialog/menu.c ============================================================================== --- trunk/gui/dialog/menu.c Tue Jun 6 17:06:10 2023 (r38428) +++ trunk/gui/dialog/menu.c Tue Jun 27 17:17:08 2023 (r38429) @@ -257,12 +257,16 @@ static const Languages_t Languages[] = { lng( 'h','y' ), "arm", "Հայերեն" }, { lng( 'h','z' ), "her", "Otjiherero" }, { lng( 'i','d' ), "ind", "Bahasa Indonesia" }, + { lng( 'i','n' ), "ind", "Bahasa Indonesia" }, { lng( 'i','s' ), "isl", "Íslenska" }, { lng( 'i','s' ), "ice", "Íslenska" }, { lng( 'i','t' ), "ita", "Italiano" }, { lng( 'i','u' ), "iku", "ᐃᓄᒃᑎᑐᑦ" }, + { lng( 'i','w' ), "heb", "עִבְרִית" }, { lng( 'j','a' ), "jpn", "日本語" }, + { lng( 'j','i' ), "yid", "יידיש" }, { lng( 'j','v' ), "jav", "Basa Jawa" }, + { lng( 'j','w' ), "jav", "Basa Jawa" }, { lng( 'k','a' ), "kat", "ქართული" }, { lng( 'k','a' ), "geo", "ქართული" }, { lng( 'k','i' ), "kik", "Gĩkũyũ" },

1 0

r38428 - in trunk/libvo: gl_common.c x11_common.c
by reimar 06 Jun '23

06 Jun '23

Author: reimar Date: Tue Jun 6 17:06:10 2023 New Revision: 38428 Log: libvo: improve error handling for had -wid. Avoids crashes if -wid specifies a window ID that is not or no longer valid. Improves behaviour reported in trac issue #2411. Modified: trunk/libvo/gl_common.c trunk/libvo/x11_common.c Modified: trunk/libvo/gl_common.c ============================================================================== --- trunk/libvo/gl_common.c Tue Jun 6 16:56:37 2023 (r38427) +++ trunk/libvo/gl_common.c Tue Jun 6 17:06:10 2023 (r38428) @@ -2238,7 +2238,8 @@ static XVisualInfo *getWindowVisualInfo( XWindowAttributes xw_attr; XVisualInfo vinfo_template; int tmp; - XGetWindowAttributes(mDisplay, win, &xw_attr); + if (!XGetWindowAttributes(mDisplay, win, &xw_attr)) + return DefaultVisual(mDisplay, 0); vinfo_template.visualid = XVisualIDFromVisual(xw_attr.visual); return XGetVisualInfo(mDisplay, VisualIDMask, &vinfo_template, &tmp); } Modified: trunk/libvo/x11_common.c ============================================================================== --- trunk/libvo/x11_common.c Tue Jun 6 16:56:37 2023 (r38427) +++ trunk/libvo/x11_common.c Tue Jun 6 17:06:10 2023 (r38428) @@ -1397,16 +1397,19 @@ static int vo_x11_get_fs_type(int suppor * \return returns current color depth of vo_window */ int vo_x11_update_geometry(void) { - unsigned depth, w, h; + unsigned depth, w = 0, h = 0; int dummy_int; Window dummy_win; XGetGeometry(mDisplay, vo_window, &dummy_win, &dummy_int, &dummy_int, &w, &h, &dummy_int, &depth); - if (w <= INT_MAX && h <= INT_MAX) { + if (w > 0 && h > 0 && w <= INT_MAX && h <= INT_MAX) { vo_dwidth = w; vo_dheight = h; vo_x11_update_fs_borders(); } + // ensure minimum value of 1, to avoid e.g. division by 0. + if (vo_dwidth <= 0) vo_dwidth = 1; + if (vo_dheight <= 0) vo_dheight = 1; XTranslateCoordinates(mDisplay, vo_window, mRootWin, 0, 0, &vo_dx, &vo_dy, &dummy_win);

1 0

r38426 - trunk/configure
by reimar 06 Jun '23

06 Jun '23

Author: reimar Date: Tue Jun 6 16:39:45 2023 New Revision: 38426 Log: configure: some FFmpeg compile fixes. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Mon Jun 5 22:25:17 2023 (r38425) +++ trunk/configure Tue Jun 6 16:39:45 2023 (r38426) @@ -3412,7 +3412,7 @@ if arm ; then fi intrinsics="none" -cpuexts_all='ALTIVEC XOP AVX AVX2 AVX512 AVX512ICL FMA3 FMA4 MMX MMX2 MMXEXT AMD3DNOW AMD3DNOWEXT SSE SSE2 SSE3 SSSE3 SSE4 SSE42 FAST_CMOV I686 FAST_CLZ ARMV5TE ARMV6 ARMV6T2 ARMV8 VFP VFPV3 SETEND NEON INTRINSICS_NEON IWMMXT MMI VIS MVI LASX LSX' +cpuexts_all='ALTIVEC XOP AVX AVX2 AVX512 AVX512ICL FMA3 FMA4 MMX MMX2 MMXEXT AMD3DNOW AMD3DNOWEXT SSE SSE2 SSE3 SSSE3 SSE4 SSE42 FAST_CMOV I686 FAST_CLZ ARMV5TE ARMV6 ARMV6T2 ARMV8 VFP VFPV3 SETEND NEON INTRINSICS_NEON I8MM IWMMXT MMI VIS MVI LASX LSX' test "$_altivec" = yes && cpuexts="ALTIVEC $cpuexts" test "$_mmx" = yes && cpuexts="MMX $cpuexts" test "$_mmxext" = yes && cpuexts="MMX2 $cpuexts" @@ -6794,7 +6794,7 @@ if test "$_zlib" = yes ; then mplayer_encoders="$mplayer_encoders PNG_ENCODER" else def_zlib='#define CONFIG_ZLIB 0' - libavdecoders=$(filter_out_component decoder 'APNG FLASHSV FLASHSV2 PNG ZMBV ZLIB DXA EXR G2M LSCR MSCC MVHA MWSC RASC RSCC SCREENPRESSO SRGC TDSC TSCC ZEROCODEC WCMV') + libavdecoders=$(filter_out_component decoder 'APNG FLASHSV FLASHSV2 PNG ZMBV ZLIB DXA EXR G2M LSCR MSCC MVHA MWSC PDV RASC RSCC SCREENPRESSO SRGC TDSC TSCC ZEROCODEC WCMV') libavencoders=$(filter_out_component encoder 'APNG EXR FLASHSV FLASHSV2 PNG ZMBV ZLIB') libavwrappers=$(filter_out_component wrapper 'DEFLATE INFLATE') fi @@ -9616,6 +9616,7 @@ $def_openssl #define HAVE_ALIGNED_STACK 1 #define HAVE_AS_ARCH_DIRECTIVE 1 +#define AS_ARCH_LEVEL armv8-a #define HAVE_AS_DN_DIRECTIVE 1 #define HAVE_AS_FPU_DIRECTIVE 1 $def_as_func

1 0

r38425 - in trunk: etc/codecs.conf libmpdemux/mp_taglists.c
by reimar 05 Jun '23

05 Jun '23

Author: reimar Date: Mon Jun 5 22:25:17 2023 New Revision: 38425 Log: mp_taglists: Add AV_CODEC_ID_GIF to 'gif ' tag mapping. Allows playing back gif files. Not sure if FFmpeg should have this mapping itself, given that this seems to be a FOURCC already established by QuickTime... Fixes trac issue #2413 Modified: trunk/etc/codecs.conf trunk/libmpdemux/mp_taglists.c Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Mon Jun 5 21:44:35 2023 (r38424) +++ trunk/etc/codecs.conf Mon Jun 5 22:25:17 2023 (r38425) @@ -776,7 +776,7 @@ videocodec ffgif fourcc "gif " ; for GIF-encoded QuickTime files driver ffmpeg dll gif - out BGR8 + out BGR8,BGRA videocodec fftiff info "FFmpeg TIFF" Modified: trunk/libmpdemux/mp_taglists.c ============================================================================== --- trunk/libmpdemux/mp_taglists.c Mon Jun 5 21:44:35 2023 (r38424) +++ trunk/libmpdemux/mp_taglists.c Mon Jun 5 22:25:17 2023 (r38425) @@ -165,6 +165,7 @@ static const struct AVCodecTag mp_bmp_ta { AV_CODEC_ID_DSICINVIDEO, MKTAG('D', 'C', 'I', 'V') }, { AV_CODEC_ID_DXA, MKTAG('D', 'X', 'A', '1') }, { AV_CODEC_ID_FLIC, MKTAG('f', 'l', 'i', 'c') }, + { AV_CODEC_ID_GIF, MKTAG('g', 'i', 'f', ' ') }, { AV_CODEC_ID_HEVC, MKTAG('H', 'E', 'V', 'C') }, { AV_CODEC_ID_HNM4_VIDEO, MKTAG('H', 'N', 'M', '4') }, { AV_CODEC_ID_IDCIN, MKTAG('I', 'D', 'C', 'I') },

1 0

r38424 - trunk/configure
by reimar 05 Jun '23

05 Jun '23

Author: reimar Date: Mon Jun 5 21:44:35 2023 New Revision: 38424 Log: configure: Add LSX cpuext, fixing FFmpeg compile error. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Tue May 16 15:17:48 2023 (r38423) +++ trunk/configure Mon Jun 5 21:44:35 2023 (r38424) @@ -3412,7 +3412,7 @@ if arm ; then fi intrinsics="none" -cpuexts_all='ALTIVEC XOP AVX AVX2 AVX512 AVX512ICL FMA3 FMA4 MMX MMX2 MMXEXT AMD3DNOW AMD3DNOWEXT SSE SSE2 SSE3 SSSE3 SSE4 SSE42 FAST_CMOV I686 FAST_CLZ ARMV5TE ARMV6 ARMV6T2 ARMV8 VFP VFPV3 SETEND NEON INTRINSICS_NEON IWMMXT MMI VIS MVI LASX' +cpuexts_all='ALTIVEC XOP AVX AVX2 AVX512 AVX512ICL FMA3 FMA4 MMX MMX2 MMXEXT AMD3DNOW AMD3DNOWEXT SSE SSE2 SSE3 SSSE3 SSE4 SSE42 FAST_CMOV I686 FAST_CLZ ARMV5TE ARMV6 ARMV6T2 ARMV8 VFP VFPV3 SETEND NEON INTRINSICS_NEON IWMMXT MMI VIS MVI LASX LSX' test "$_altivec" = yes && cpuexts="ALTIVEC $cpuexts" test "$_mmx" = yes && cpuexts="MMX $cpuexts" test "$_mmxext" = yes && cpuexts="MMX2 $cpuexts"

1 0

r38419 - in trunk: gui/wm/ws.c libvo/vo_x11.c libvo/vo_xv.c libvo/vo_xvmc.c
by ib 22 Apr '23

22 Apr '23

Author: ib Date: Sun Apr 23 01:58:52 2023 New Revision: 38419 Log: Use appropriate shared memory permissions. An umask setting does not affect the permissions assigned to System V IPC objects created by the process using shmget(). Original patch by Vladimir D. Seleznev, vseleznv altlinux org, slightly modified by committer. Reported by Wladmis, dev wladmis org. Modified: trunk/gui/wm/ws.c trunk/libvo/vo_x11.c trunk/libvo/vo_xv.c trunk/libvo/vo_xvmc.c Modified: trunk/gui/wm/ws.c ============================================================================== --- trunk/gui/wm/ws.c Wed Apr 19 22:50:12 2023 (r38418) +++ trunk/gui/wm/ws.c Sun Apr 23 01:58:52 2023 (r38419) @@ -1357,7 +1357,7 @@ void wsImageCreate(wsWindow *win, int w, mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0); } - win->Shminfo.shmid = shmget(IPC_PRIVATE, win->xImage->bytes_per_line * win->xImage->height, IPC_CREAT | 0777); + win->Shminfo.shmid = shmget(IPC_PRIVATE, win->xImage->bytes_per_line * win->xImage->height, IPC_CREAT | SHM_R | SHM_W); if (win->Shminfo.shmid < 0) { XDestroyImage(win->xImage); Modified: trunk/libvo/vo_x11.c ============================================================================== --- trunk/libvo/vo_x11.c Wed Apr 19 22:50:12 2023 (r38418) +++ trunk/libvo/vo_x11.c Sun Apr 23 01:58:52 2023 (r38419) @@ -150,7 +150,7 @@ static void getMyXImage(void) } Shminfo[0].shmid = shmget(IPC_PRIVATE, myximage->bytes_per_line * - myximage->height, IPC_CREAT | 0777); + myximage->height, IPC_CREAT | SHM_R | SHM_W); if (Shminfo[0].shmid < 0) { XDestroyImage(myximage); Modified: trunk/libvo/vo_xv.c ============================================================================== --- trunk/libvo/vo_xv.c Wed Apr 19 22:50:12 2023 (r38418) +++ trunk/libvo/vo_xv.c Sun Apr 23 01:58:52 2023 (r38419) @@ -279,7 +279,7 @@ static void allocate_xvimage(int foo) &Shminfo[foo]); Shminfo[foo].shmid = - shmget(IPC_PRIVATE, xvimage[foo]->data_size, IPC_CREAT | 0777); + shmget(IPC_PRIVATE, xvimage[foo]->data_size, IPC_CREAT | SHM_R | SHM_W); Shminfo[foo].shmaddr = (char *) shmat(Shminfo[foo].shmid, 0, 0); Shminfo[foo].readOnly = False; Modified: trunk/libvo/vo_xvmc.c ============================================================================== --- trunk/libvo/vo_xvmc.c Wed Apr 19 22:50:12 2023 (r38418) +++ trunk/libvo/vo_xvmc.c Sun Apr 23 01:58:52 2023 (r38419) @@ -203,7 +203,7 @@ static int allocate_xvimage(int xvimage_ if (!xvimage->data_size) goto shmgetfail; - Shminfo.shmid = shmget(IPC_PRIVATE, xvimage->data_size, IPC_CREAT | 0777); + Shminfo.shmid = shmget(IPC_PRIVATE, xvimage->data_size, IPC_CREAT | SHM_R | SHM_W); if (Shminfo.shmid == -1) goto shmgetfail; Shminfo.shmaddr = (char *) shmat(Shminfo.shmid, 0, 0);

1 0

r38418 - trunk/configure
by reimar 19 Apr '23

19 Apr '23

Author: reimar Date: Wed Apr 19 22:50:12 2023 New Revision: 38418 Log: configure: remove libopenjpeg_decoder It was removed from FFmpeg. Fixes compilation against newer FFmpeg versions. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Wed Apr 19 22:42:04 2023 (r38417) +++ trunk/configure Wed Apr 19 22:50:12 2023 (r38418) @@ -5618,7 +5618,6 @@ fi echores "$libopenjpeg" if test "$libopenjpeg" = yes ; then def_libopenjpeg='#define CONFIG_LIBOPENJPEG 1' - libavdecoders="$libavdecoders LIBOPENJPEG_DECODER" libavencoders="$libavencoders LIBOPENJPEG_ENCODER" codecmodules="OpenJPEG $codecmodules" else

1 0

r38417 - trunk/libao2/ao_coreaudio.c
by reimar 19 Apr '23

19 Apr '23

Author: reimar Date: Wed Apr 19 22:42:04 2023 New Revision: 38417 Log: ao_coreaudio.c: Avoid random hangs at end of file. Calling audio_pause from different threads leads to deadlocks. Change how an empty audio buffer is handled to avoid the need for audio_pause and thus avoid the hangs. Also remove some duplicated code during uninit (re-use audio_pause instead) and make audio_pause not do anything if audio is already paused. Fixes trac issue #2410 Modified: trunk/libao2/ao_coreaudio.c Modified: trunk/libao2/ao_coreaudio.c ============================================================================== --- trunk/libao2/ao_coreaudio.c Sat Apr 8 22:54:00 2023 (r38416) +++ trunk/libao2/ao_coreaudio.c Wed Apr 19 22:42:04 2023 (r38417) @@ -159,13 +159,21 @@ int req=(inNumFrames)*ao->packetSize; if(amt>req) amt=req; + // clear whole buffer since coreaudio seems to have + // issues handling data amounts smaller than it requested + if (amt < req) + memset(ioData->mBuffers[0].mData + amt, 0, req - amt); if(amt) read_buffer((unsigned char *)ioData->mBuffers[0].mData, amt); - else audio_pause(); ioData->mBuffers[0].mDataByteSize = amt; - return noErr; + // In theory it might be nicer to call audio_pause if + // there is no data, as the code originally did. + // However since this runs in a separate thread, this can + // trigger a race condition if MPlayer calls AudioOutputUnitStop + // for example during uninit, which then causes a hang. + return amt ? noErr : kAudioFileEndOfFileError; } static int control(int cmd,void *arg){ @@ -1146,17 +1154,12 @@ static void uninit(int immed) usec_sleep((int)timeleft); } + audio_pause(); if (!ao->b_digital) { - AudioOutputUnitStop(ao->theOutputUnit); AudioUnitUninitialize(ao->theOutputUnit); CloseComponent(ao->theOutputUnit); } else { - /* Stop device. */ - err = AudioDeviceStop(ao->i_selected_dev, ao->renderCallback); - if (err != noErr) - ao_msg(MSGT_AO, MSGL_WARN, "AudioDeviceStop failed: [%4.4s]\n", (char *)&err); - /* Remove IOProc callback. */ err = AudioDeviceDestroyIOProcID(ao->i_selected_dev, ao->renderCallback); if (err != noErr) @@ -1207,6 +1210,9 @@ static void audio_pause(void) { OSErr err=noErr; + if (ao->paused) + return; + /* Stop callback. */ if (!ao->b_digital) {

1 0

r38416 - trunk/mplayer.c
by al 08 Apr '23

08 Apr '23

Author: al Date: Sat Apr 8 22:54:00 2023 New Revision: 38416 Log: mplayer: Do not un-initialize components before exit_player_with_rc After we finished all play tree items, we will call exit_player_with_rc. When calling exit_player_with_rc, internally the routine will try to uninit everything by itself. More important: This way we unmute the AO if it's muted. This avoids the regression introduced by the previous commit (r38415) for typical usage, but it won't help for all potential cases. We still fail to unmute correctly if one is using multiple AOs like this: mplayer file1 -ao pulse file2 -ao alsa file3 -ao pulse It can even bite with one AO if there is a change to a file without audio in as the last play tree item: ./mplayer file1 file2-without-audio-streams Modified: trunk/mplayer.c Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Sat Apr 8 22:47:31 2023 (r38415) +++ trunk/mplayer.c Sat Apr 8 22:54:00 2023 (r38416) @@ -4123,9 +4123,6 @@ goto_next_file: // don't jump here afte (total_time_usage > 0.5) ? (total_frame_cnt / total_time_usage) : 0); } - // time to uninit all, except global stuff: - uninit_player(INITIALIZED_ALL - (INITIALIZED_GUI + INITIALIZED_INPUT + (fixed_vo ? INITIALIZED_VO : 0))); - if (mpctx->eof == PT_NEXT_ENTRY || mpctx->eof == PT_PREV_ENTRY) { mpctx->eof = mpctx->eof == PT_NEXT_ENTRY ? 1 : -1; if (play_tree_iter_step(mpctx->playtree_iter, mpctx->play_tree_step, 0) == PLAY_TREE_ITER_ENTRY) { @@ -4179,6 +4176,10 @@ goto_next_file: // don't jump here afte if (!mpctx->playtree_iter && !use_gui) filename = NULL; mpctx->eof = 0; + + // time to uninit all, except global stuff: + uninit_player(INITIALIZED_ALL - (INITIALIZED_GUI + INITIALIZED_INPUT + (fixed_vo ? INITIALIZED_VO : 0))); + goto play_next_file; }

1 0