April 2018 - MPlayer-cvslog - lists.mplayerhq.hu

r38104 - trunk/gui/dialog/menu.c
by ib 26 Apr '18

26 Apr '18

Author: ib Date: Thu Apr 26 07:01:01 2018 New Revision: 38104 Log: Cosmetic: Adjust indent. Modified: trunk/gui/dialog/menu.c Modified: trunk/gui/dialog/menu.c ============================================================================== --- trunk/gui/dialog/menu.c Thu Apr 26 06:59:00 2018 (r38103) +++ trunk/gui/dialog/menu.c Thu Apr 26 07:01:01 2018 (r38104) @@ -728,17 +728,17 @@ GtkWidget * CreatePopUpMenu( int wType ) if (guiInfo.AudioStreams > 1) { - DVDAudioLanguageMenu=AddSubMenu( Menu, audio_track_png, MSGTR_GUI_AudioTracks ); + DVDAudioLanguageMenu=AddSubMenu( Menu, audio_track_png, MSGTR_GUI_AudioTracks ); - for ( i=0;i < guiInfo.AudioStreams;i++ ) - { - snprintf( tmp, sizeof(tmp), "%s - %s", - ChannelNumbers[ guiInfo.AudioStream[i].channels ], - GetLanguage( &guiInfo.AudioStream[i].language, GET_LANG_INT )); - AddMenuCheckItem( DVDAudioLanguageMenu, ChannelTypes[ guiInfo.AudioStream[i].type ], tmp, - demuxer->audio->id == guiInfo.AudioStream[i].id, - ( guiInfo.AudioStream[i].id << 16 ) + ivSetDVDAudio ); - } + for ( i=0;i < guiInfo.AudioStreams;i++ ) + { + snprintf( tmp, sizeof(tmp), "%s - %s", + ChannelNumbers[ guiInfo.AudioStream[i].channels ], + GetLanguage( &guiInfo.AudioStream[i].language, GET_LANG_INT )); + AddMenuCheckItem( DVDAudioLanguageMenu, ChannelTypes[ guiInfo.AudioStream[i].type ], tmp, + demuxer->audio->id == guiInfo.AudioStream[i].id, + ( guiInfo.AudioStream[i].id << 16 ) + ivSetDVDAudio ); + } } }

1 0

r38103 - trunk/gui/dialog/menu.c
by ib 26 Apr '18

26 Apr '18

Author: ib Date: Thu Apr 26 06:59:00 2018 New Revision: 38103 Log: Revise DVD audio track selection. Check whether there are at least two DVD audio tracks before offering the user an audio track selection. It makes no sense to have that selection menu for just one audio track. This is consistent with the audio track selection menu for all other stream types now. Modified: trunk/gui/dialog/menu.c Modified: trunk/gui/dialog/menu.c ============================================================================== --- trunk/gui/dialog/menu.c Thu Apr 26 05:38:52 2018 (r38102) +++ trunk/gui/dialog/menu.c Thu Apr 26 06:59:00 2018 (r38103) @@ -726,6 +726,8 @@ GtkWidget * CreatePopUpMenu( int wType ) { char tmp[64]; int i; + if (guiInfo.AudioStreams > 1) + { DVDAudioLanguageMenu=AddSubMenu( Menu, audio_track_png, MSGTR_GUI_AudioTracks ); for ( i=0;i < guiInfo.AudioStreams;i++ ) @@ -737,6 +739,7 @@ GtkWidget * CreatePopUpMenu( int wType ) demuxer->audio->id == guiInfo.AudioStream[i].id, ( guiInfo.AudioStream[i].id << 16 ) + ivSetDVDAudio ); } + } } if ( guiInfo.Subtitles && ( guiInfo.StreamType == STREAMTYPE_DVD ) )

1 0

r38102 - trunk/gui/ui/actions.c
by ib 26 Apr '18

26 Apr '18

Author: ib Date: Thu Apr 26 05:38:52 2018 New Revision: 38102 Log: Reset track on CD, VCD or DVD playback change. The track may already be set by the (current) playback of an other stream type, so reset it when starting a CD, VCD or DVD playback. Modified: trunk/gui/ui/actions.c Modified: trunk/gui/ui/actions.c ============================================================================== --- trunk/gui/ui/actions.c Wed Apr 18 00:39:31 2018 (r38101) +++ trunk/gui/ui/actions.c Thu Apr 26 05:38:52 2018 (r38102) @@ -134,6 +134,8 @@ void uiEvent(int ev, float param) guiInfo.Track = iparam; case evPlayCD: + if (guiInfo.StreamType != STREAMTYPE_CDDA) + guiInfo.Track = 0; guiInfo.StreamType = STREAMTYPE_CDDA; goto play; #endif @@ -142,6 +144,8 @@ void uiEvent(int ev, float param) guiInfo.Track = iparam; case evPlayVCD: + if (guiInfo.StreamType != STREAMTYPE_VCD) + guiInfo.Track = 0; guiInfo.StreamType = STREAMTYPE_VCD; goto play; #endif @@ -171,6 +175,8 @@ void uiEvent(int ev, float param) case evPlayDVD: guiInfo.Chapter = 1; guiInfo.Angle = 1; + if (guiInfo.StreamType != STREAMTYPE_DVD) + guiInfo.Track = 0; case ivPlayDVD: guiInfo.StreamType = STREAMTYPE_DVD;

1 0

r38101 - trunk/configure
by reimar 17 Apr '18

17 Apr '18

Author: reimar Date: Wed Apr 18 00:39:31 2018 New Revision: 38101 Log: configure: add some defines for less noisy FFmpeg compilation. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Wed Apr 18 00:39:30 2018 (r38100) +++ trunk/configure Wed Apr 18 00:39:31 2018 (r38101) @@ -2053,9 +2053,7 @@ fi def_fast_64bit='#define HAVE_FAST_64BIT 0' def_fast_unaligned='#define HAVE_FAST_UNALIGNED 0' def_av_fast_unaligned='#define AV_HAVE_FAST_UNALIGNED 0' -def_local_aligned_8='#define HAVE_LOCAL_ALIGNED_8 0' -def_local_aligned_16='#define HAVE_LOCAL_ALIGNED_16 0' -def_local_aligned_32='#define HAVE_LOCAL_ALIGNED_32 0' +def_local_aligned='#define HAVE_LOCAL_ALIGNED 0' def_vsx='#define HAVE_VSX 0' arch_all='X86 IA64 SPARC ARM AVR32 SH4 PPC ALPHA MIPS PA_RISC S390 S390X VAX BFIN XTENSA TOMI GENERIC AARCH64' subarch_all='X86_32 X86_64 PPC64' @@ -2065,9 +2063,7 @@ case "$host_arch" in subarch='x86_32' def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1' def_av_fast_unaligned='#define AV_HAVE_FAST_UNALIGNED 1' - def_local_aligned_8='#define HAVE_LOCAL_ALIGNED_8 1' - def_local_aligned_16='#define HAVE_LOCAL_ALIGNED_16 1' - def_local_aligned_32='#define HAVE_LOCAL_ALIGNED_32 1' + def_local_aligned='#define HAVE_LOCAL_ALIGNED 1' iproc=486 proc=i486 @@ -2320,9 +2316,7 @@ case "$host_arch" in subarch='x86_64' def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1' def_av_fast_unaligned='#define AV_HAVE_FAST_UNALIGNED 1' - def_local_aligned_8='#define HAVE_LOCAL_ALIGNED_8 1' - def_local_aligned_16='#define HAVE_LOCAL_ALIGNED_16 1' - def_local_aligned_32='#define HAVE_LOCAL_ALIGNED_32 1' + def_local_aligned='#define HAVE_LOCAL_ALIGNED 1' def_fast_64bit='#define HAVE_FAST_64BIT 1' iproc='x86_64' @@ -2465,9 +2459,7 @@ case "$host_arch" in iproc='arm' def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1' def_av_fast_unaligned='#define AV_HAVE_FAST_UNALIGNED 1' - def_local_aligned_8='#define HAVE_LOCAL_ALIGNED_8 1' - def_local_aligned_16='#define HAVE_LOCAL_ALIGNED_16 1' - def_local_aligned_32='#define HAVE_LOCAL_ALIGNED_32 1' + def_local_aligned='#define HAVE_LOCAL_ALIGNED 1' test $_fast_clz = "auto" && _fast_clz=yes ;; @@ -2490,9 +2482,7 @@ case "$host_arch" in def_vsx='#define HAVE_VSX 0' def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1' def_av_fast_unaligned='#define AV_HAVE_FAST_UNALIGNED 1' - def_local_aligned_8='#define HAVE_LOCAL_ALIGNED_8 1' - def_local_aligned_16='#define HAVE_LOCAL_ALIGNED_16 1' - def_local_aligned_32='#define HAVE_LOCAL_ALIGNED_32 1' + def_local_aligned='#define HAVE_LOCAL_ALIGNED 1' iproc='ppc' if test "$host_arch" = "ppc64" ; then @@ -9210,9 +9200,7 @@ $def_fast_64bit $def_fast_unaligned $def_gnu_as $def_ibm_asm -$def_local_aligned_8 -$def_local_aligned_16 -$def_local_aligned_32 +$def_local_aligned $def_os2threads $def_pic $def_pthreads @@ -9286,6 +9274,7 @@ $def_openssl #define CONFIG_GRAY 0 #define CONFIG_LIBMODPLUG 0 #define CONFIG_LIBVORBIS 0 +#define CONFIG_LINUX_PERF 0 #define CONFIG_MEMORY_POISONING 0 #define CONFIG_POWERPC_PERF 0 /* For now prefer speed over avoiding potential invalid reads */ @@ -9314,6 +9303,7 @@ $def_openssl #define HAVE_ISATTY 0 #define HAVE_LDBRX 0 #define HAVE_LIBC_MSVCRT 0 +#define HAVE_MACH_ABSOLUTE_TIME 0 #define HAVE_MACH_MACH_TIME_H 0 #define HAVE_MAPVIEWOFFILE 0 #define HAVE_MIPSDSP 0 @@ -9325,6 +9315,7 @@ $def_openssl #define HAVE_SECTION_DATA_REL_RO 0 #define HAVE_SIMD_ALIGN_16 1 $def_simd_align_32 +#define HAVE_SIMD_ALIGN_64 0 #define HAVE_STRERROR_R 0 #define HAVE_STRPTIME 0 #define HAVE_STRUCT_POLLFD 0

1 0

r38100 - trunk/configure
by reimar 17 Apr '18

17 Apr '18

Author: reimar Date: Wed Apr 18 00:39:30 2018 New Revision: 38100 Log: configure: fix --enable-ffmpeg_so It needs to set "$ffmpeg" to yes even though we run no auto-detection. Fixes issue #2339. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun Apr 15 13:45:22 2018 (r38099) +++ trunk/configure Wed Apr 18 00:39:30 2018 (r38100) @@ -7211,10 +7211,9 @@ echores "$_librtmp" echocheck "FFmpeg" -ffmpeg=no if test "$ffmpeg_a" = auto ; then ffmpeg_a=no - test -d ffmpeg/libavcodec && ffmpeg_a=yes && ffmpeg_so=no && ffmpeg=yes + test -d ffmpeg/libavcodec && ffmpeg_a=yes && ffmpeg_so=no fi if test "$ffmpeg_so" = auto ; then ffmpeg_so=no @@ -7227,10 +7226,13 @@ if test "$ffmpeg_so" = auto ; then elif header_check libavutil/avutil.h -lswscale -lswresample -lavformat -lavcodec -lavutil ; then extra_ldflags="$extra_ldflags -lswscale -lswresample -lavformat -lavcodec -lavutil" ffmpeg_so=yes - ffmpeg=yes fi fi +ffmpeg=no +test "$ffmpeg_a" = yes && ffmpeg=yes +test "$ffmpeg_so" = yes && ffmpeg=yes + if test "$ffmpeg" = yes; then test -e config.h || touch config.h def_ffmpeg='#define CONFIG_FFMPEG 1'

1 0

r38099 - trunk/Changelog
by ib 15 Apr '18

15 Apr '18

Author: ib Date: Sun Apr 15 13:45:22 2018 New Revision: 38099 Log: Update Changelog. Modified: trunk/Changelog Modified: trunk/Changelog ============================================================================== --- trunk/Changelog Sun Apr 15 13:36:51 2018 (r38098) +++ trunk/Changelog Sun Apr 15 13:45:22 2018 (r38099) @@ -36,6 +36,9 @@ MPlayer * New configuration file: gui.gain * Modern new icons for the (default) menu, the file selector, the playlist and the message boxes + * Rearrangement of some items of the (default) menu + * Fix of broken evLoadAudioFile, evLoadSubtitle and evDropSubtitle + * Skin support for 8-bit PNGs with palette 1.3.0: "worksforme" February 16, 2016

1 0

r38097 - trunk/gui/util/bitmap.c
by ib 15 Apr '18

15 Apr '18

Author: ib Date: Sun Apr 15 13:12:15 2018 New Revision: 38097 Log: Cosmetic: Adjust indent. Modified: trunk/gui/util/bitmap.c Modified: trunk/gui/util/bitmap.c ============================================================================== --- trunk/gui/util/bitmap.c Sun Apr 15 13:10:28 2018 (r38096) +++ trunk/gui/util/bitmap.c Sun Apr 15 13:12:15 2018 (r38097) @@ -231,8 +231,8 @@ static int convert_ARGB(guiImage *img, i *(uint32_t *)&img->Image[i] = palette[orgImage[c]]; if (pix_fmt == AV_PIX_FMT_RGB24) - for (i = 0, c = 0; i < img->ImageSize; i += 4, c += 3) - *(uint32_t *)&img->Image[i] = ALPHA_OPAQUE | AV_RB24(&orgImage[c]); + for (i = 0, c = 0; i < img->ImageSize; i += 4, c += 3) + *(uint32_t *)&img->Image[i] = ALPHA_OPAQUE | AV_RB24(&orgImage[c]); free(orgImage); } else if (pix_fmt == AV_PIX_FMT_RGBA) {

1 0

r38096 - trunk/gui/util/bitmap.c
by ib 15 Apr '18

15 Apr '18

Author: ib Date: Sun Apr 15 13:10:28 2018 New Revision: 38096 Log: Support AV_PIX_FMT_PAL8. This typically is the output format of PNG optimizers like optipng or zopflipng. Modified: trunk/gui/util/bitmap.c Modified: trunk/gui/util/bitmap.c ============================================================================== --- trunk/gui/util/bitmap.c Sun Apr 15 13:01:56 2018 (r38095) +++ trunk/gui/util/bitmap.c Sun Apr 15 13:10:28 2018 (r38096) @@ -36,6 +36,8 @@ #include "libavutil/intreadwrite.h" #include "libvo/fastmemcpy.h" +static uint32_t palette[256]; + /** * @brief Check whether a (PNG) file exists. * @@ -140,9 +142,15 @@ static int pngRead(const char *fname, gu avcodec_decode_video2(avctx, frame, &decode_ok, &pkt); memset(img, 0, sizeof(*img)); + memset(palette, 0, sizeof(palette)); + *pix_fmt = avctx->pix_fmt; switch (*pix_fmt) { + case AV_PIX_FMT_PAL8: + img->Bpp = 8; + break; + case AV_PIX_FMT_RGB24: img->Bpp = 24; break; @@ -169,9 +177,12 @@ static int pngRead(const char *fname, gu img->Image = malloc(img->ImageSize); - if (img->Image) + if (img->Image) { memcpy_pic(img->Image, frame->data[0], bpl, img->Height, bpl, frame->linesize[0]); - else + + if (frame->data[1]) + memcpy(palette, frame->data[1], sizeof(palette)); + } else decode_ok = False; } @@ -195,10 +206,12 @@ static int pngRead(const char *fname, gu */ static int convert_ARGB(guiImage *img, int pix_fmt) { + unsigned int orgSize; unsigned char *orgImage; unsigned int i, c; - if (pix_fmt == AV_PIX_FMT_RGB24) { + if (pix_fmt == AV_PIX_FMT_PAL8 || pix_fmt == AV_PIX_FMT_RGB24) { + orgSize = img->ImageSize; orgImage = img->Image; img->Bpp = 32; @@ -213,6 +226,11 @@ static int convert_ARGB(guiImage *img, i mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] 32 bpp conversion size: %u\n", img->ImageSize); + if (pix_fmt == AV_PIX_FMT_PAL8) + for (i = 0, c = 0; c < orgSize; i += 4, c++) + *(uint32_t *)&img->Image[i] = palette[orgImage[c]]; + + if (pix_fmt == AV_PIX_FMT_RGB24) for (i = 0, c = 0; i < img->ImageSize; i += 4, c += 3) *(uint32_t *)&img->Image[i] = ALPHA_OPAQUE | AV_RB24(&orgImage[c]);

1 0

r38095 - trunk/gui/util/bitmap.c
by ib 15 Apr '18

15 Apr '18

Author: ib Date: Sun Apr 15 13:01:56 2018 New Revision: 38095 Log: Pass pixel format information. Rather than the bpp, the pixel format determines the later conversion to ARGB, so receive the format from pngRead() to utilize it in convert_ARGB(). Modified: trunk/gui/util/bitmap.c Modified: trunk/gui/util/bitmap.c ============================================================================== --- trunk/gui/util/bitmap.c Sun Apr 15 12:48:00 2018 (r38094) +++ trunk/gui/util/bitmap.c Sun Apr 15 13:01:56 2018 (r38095) @@ -67,12 +67,13 @@ static const char *fExist(const char *fn * * @param fname filename (with path) * @param img memory location to store the image data + * @param pix_fmt pointer to the location to store the pixel format * * @return 0 (ok), 1 (decoding error), 2 (file open error), 3 (file too big), * 4 (out of memory), 5 (read error), 6 (avcodec alloc error), * 7 (avcodec open error) */ -static int pngRead(const char *fname, guiImage *img) +static int pngRead(const char *fname, guiImage *img, int *pix_fmt) { FILE *file; size_t len, l; @@ -139,8 +140,9 @@ static int pngRead(const char *fname, gu avcodec_decode_video2(avctx, frame, &decode_ok, &pkt); memset(img, 0, sizeof(*img)); + *pix_fmt = avctx->pix_fmt; - switch (avctx->pix_fmt) { + switch (*pix_fmt) { case AV_PIX_FMT_RGB24: img->Bpp = 24; break; @@ -151,7 +153,7 @@ static int pngRead(const char *fname, gu default: img->Bpp = 0; - mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] unsupported pixel format: %d\n", avctx->pix_fmt); + mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] unsupported pixel format: %d\n", *pix_fmt); break; } @@ -191,12 +193,12 @@ static int pngRead(const char *fname, gu * @note This is an in-place conversion, * new memory will be allocated for @a img if necessary. */ -static int convert_ARGB(guiImage *img) +static int convert_ARGB(guiImage *img, int pix_fmt) { unsigned char *orgImage; unsigned int i, c; - if (img->Bpp == 24) { + if (pix_fmt == AV_PIX_FMT_RGB24) { orgImage = img->Image; img->Bpp = 32; @@ -215,7 +217,7 @@ static int convert_ARGB(guiImage *img) *(uint32_t *)&img->Image[i] = ALPHA_OPAQUE | AV_RB24(&orgImage[c]); free(orgImage); - } else if (img->Bpp == 32) { + } else if (pix_fmt == AV_PIX_FMT_RGBA) { mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] 32 bpp ARGB conversion\n"); for (i = 0; i < img->ImageSize; i += 4) @@ -237,14 +239,14 @@ static int convert_ARGB(guiImage *img) */ int bpRead(const char *fname, guiImage *img) { - int r; + int r, pix_fmt; fname = fExist(fname); if (!fname) return -2; - r = pngRead(fname, img); + r = pngRead(fname, img, &pix_fmt); if (r != 0) { mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] read error #%d: %s\n", r, fname); @@ -254,7 +256,7 @@ int bpRead(const char *fname, guiImage * if (!img->Bpp) return -1; - if (!convert_ARGB(img)) + if (!convert_ARGB(img, pix_fmt)) return -8; return 0;

1 0

r38094 - trunk/gui/util/bitmap.c
by ib 15 Apr '18

15 Apr '18

Author: ib Date: Sun Apr 15 12:48:00 2018 New Revision: 38094 Log: Remove checks for unsupported pixel formats. It makes no sense to check for pixel formats and copy images which will be rejected later in bpRead() anyway. Additionally, change the debug message. Modified: trunk/gui/util/bitmap.c Modified: trunk/gui/util/bitmap.c ============================================================================== --- trunk/gui/util/bitmap.c Fri Apr 13 17:08:24 2018 (r38093) +++ trunk/gui/util/bitmap.c Sun Apr 15 12:48:00 2018 (r38094) @@ -141,14 +141,6 @@ static int pngRead(const char *fname, gu memset(img, 0, sizeof(*img)); switch (avctx->pix_fmt) { - case AV_PIX_FMT_GRAY8: - img->Bpp = 8; - break; - - case AV_PIX_FMT_GRAY16BE: - img->Bpp = 16; - break; - case AV_PIX_FMT_RGB24: img->Bpp = 24; break; @@ -159,6 +151,7 @@ static int pngRead(const char *fname, gu default: img->Bpp = 0; + mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] unsupported pixel format: %d\n", avctx->pix_fmt); break; } @@ -258,10 +251,8 @@ int bpRead(const char *fname, guiImage * return -5; } - if (img->Bpp < 24) { - mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] bpp too low: %u\n", img->Bpp); + if (!img->Bpp) return -1; - } if (!convert_ARGB(img)) return -8;

1 0