March 2011 - MPlayer-cvslog - lists.mplayerhq.hu

r33118 - trunk/mplayer.c
by reimar 26 Mar '11

26 Mar '11

Author: reimar Date: Sat Mar 26 17:11:18 2011 New Revision: 33118 Log: Do not do A-V sync correction if one of the pts values is bogus (NOPTS_VALUE) since that will actually cause desync. Modified: trunk/mplayer.c Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Sat Mar 26 17:02:44 2011 (r33117) +++ trunk/mplayer.c Sat Mar 26 17:11:18 2011 (r33118) @@ -2042,6 +2042,9 @@ static void adjust_sync_and_print_status static int drop_message=0; double AV_delay = a_pts - audio_delay - v_pts; double x; + // not a good idea to do A-V correction with with bogus values + if (a_pts == MP_NOPTS_VALUE || v_pts == MP_NOPTS_VALUE) + AV_delay = 0; if (AV_delay>0.5 && drop_frame_cnt>50 && drop_message==0){ ++drop_message; mp_msg(MSGT_AVSYNC,MSGL_WARN,MSGTR_SystemTooSlow);

1 0

r33117 - trunk/mplayer.c
by reimar 26 Mar '11

26 Mar '11

Author: reimar Date: Sat Mar 26 17:02:44 2011 New Revision: 33117 Log: Generalize previous commit: assume that a 0 frame time is always wrong and replace it with a fps-based value. Modified: trunk/mplayer.c Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Sat Mar 26 17:01:00 2011 (r33116) +++ trunk/mplayer.c Sat Mar 26 17:02:44 2011 (r33117) @@ -2460,7 +2460,7 @@ static double update_video(int *blit_fra mp_msg(MSGT_CPLAYER, MSGL_V, "pts value < previous\n"); } frame_time = sh_video->pts - sh_video->last_pts; - if (sh_video->last_pts == MP_NOPTS_VALUE) + if (!frame_time) frame_time = sh_video->frametime; sh_video->last_pts = sh_video->pts; sh_video->timer += frame_time;

1 0

r33116 - trunk/mplayer.c
by reimar 26 Mar '11

26 Mar '11

Author: reimar Date: Sat Mar 26 17:01:00 2011 New Revision: 33116 Log: For a stream without pts values time video frames based on fps value. Modified: trunk/mplayer.c Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Sat Mar 26 14:00:11 2011 (r33115) +++ trunk/mplayer.c Sat Mar 26 17:01:00 2011 (r33116) @@ -2460,6 +2460,8 @@ static double update_video(int *blit_fra mp_msg(MSGT_CPLAYER, MSGL_V, "pts value < previous\n"); } frame_time = sh_video->pts - sh_video->last_pts; + if (sh_video->last_pts == MP_NOPTS_VALUE) + frame_time = sh_video->frametime; sh_video->last_pts = sh_video->pts; sh_video->timer += frame_time; if(mpctx->sh_audio)

1 0

r33115 - in trunk/libmpcodecs: vd_ffmpeg.c ve_lavc.c
by reimar 26 Mar '11

26 Mar '11

Author: reimar Date: Sat Mar 26 14:00:11 2011 New Revision: 33115 Log: Enable both frame and slice threading. Modified: trunk/libmpcodecs/vd_ffmpeg.c trunk/libmpcodecs/ve_lavc.c Modified: trunk/libmpcodecs/vd_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/vd_ffmpeg.c Sat Mar 26 13:43:19 2011 (r33114) +++ trunk/libmpcodecs/vd_ffmpeg.c Sat Mar 26 14:00:11 2011 (r33115) @@ -439,6 +439,7 @@ static int init(sh_video_t *sh){ avctx->bits_per_coded_sample= sh->bih->biBitCount; avctx->thread_count = lavc_param_threads; + avctx->thread_type = FF_THREAD_FRAME | FF_THREAD_SLICE; /* open it */ if (avcodec_open(avctx, lavc_codec) < 0) { mp_msg(MSGT_DECVIDEO, MSGL_ERR, MSGTR_CantOpenCodec); Modified: trunk/libmpcodecs/ve_lavc.c ============================================================================== --- trunk/libmpcodecs/ve_lavc.c Sat Mar 26 13:43:19 2011 (r33114) +++ trunk/libmpcodecs/ve_lavc.c Sat Mar 26 14:00:11 2011 (r33115) @@ -690,6 +690,7 @@ static int config(struct vf_instance *vf } lavc_venc_context->thread_count = lavc_param_threads; + lavc_venc_context->thread_type = FF_THREAD_FRAME | FF_THREAD_SLICE; if (avcodec_open(lavc_venc_context, vf->priv->codec) != 0) { mp_msg(MSGT_MENCODER,MSGL_ERR,MSGTR_CantOpenCodec);

1 0

r33114 - in trunk/libmpcodecs: vd_ffmpeg.c ve_lavc.c
by reimar 26 Mar '11

26 Mar '11

Author: reimar Date: Sat Mar 26 13:43:19 2011 New Revision: 33114 Log: Do not use deprecated avcodec_thread_init, it is broken and does nothing currently. Set thread_count directly instead. Modified: trunk/libmpcodecs/vd_ffmpeg.c trunk/libmpcodecs/ve_lavc.c Modified: trunk/libmpcodecs/vd_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/vd_ffmpeg.c Fri Mar 25 14:58:26 2011 (r33113) +++ trunk/libmpcodecs/vd_ffmpeg.c Sat Mar 26 13:43:19 2011 (r33114) @@ -438,8 +438,7 @@ static int init(sh_video_t *sh){ if(sh->bih) avctx->bits_per_coded_sample= sh->bih->biBitCount; - if(lavc_param_threads > 1) - avcodec_thread_init(avctx, lavc_param_threads); + avctx->thread_count = lavc_param_threads; /* open it */ if (avcodec_open(avctx, lavc_codec) < 0) { mp_msg(MSGT_DECVIDEO, MSGL_ERR, MSGTR_CantOpenCodec); Modified: trunk/libmpcodecs/ve_lavc.c ============================================================================== --- trunk/libmpcodecs/ve_lavc.c Fri Mar 25 14:58:26 2011 (r33113) +++ trunk/libmpcodecs/ve_lavc.c Sat Mar 26 13:43:19 2011 (r33114) @@ -689,8 +689,7 @@ static int config(struct vf_instance *vf vf->priv->pic->quality = (int)(FF_QP2LAMBDA * lavc_param_vqscale + 0.5); } - if(lavc_param_threads > 1) - avcodec_thread_init(lavc_venc_context, lavc_param_threads); + lavc_venc_context->thread_count = lavc_param_threads; if (avcodec_open(lavc_venc_context, vf->priv->codec) != 0) { mp_msg(MSGT_MENCODER,MSGL_ERR,MSGTR_CantOpenCodec);

1 0

r33113 - trunk/etc/codecs.conf
by compn 25 Mar '11

25 Mar '11

Author: compn Date: Fri Mar 25 14:58:26 2011 New Revision: 33113 Log: cleanup/unify hdv* fourccs, except vdpau Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Fri Mar 25 13:40:20 2011 (r33112) +++ trunk/etc/codecs.conf Fri Mar 25 14:58:26 2011 (r33113) @@ -184,15 +184,13 @@ videocodec ffmpeg2 format 0x10000002 ; MPEG-2 fourcc mpg2,MPG2 fourcc "DVR " - fourcc hdv1 - fourcc hdv2 fourcc MPEG - fourcc hdv3 ; HDV 1080i50 - fourcc hdv5 ; HDV 720p25 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) fourcc MMES,mmes ; matrox mpeg2 in avi fourcc M701 ; matrox mpeg2 intra-only - fourcc hdv6,hdv7,hdv8 + fourcc hdv1,hdv2,hdv3 + fourcc hdv4,hdv5,hdv6 + fourcc hdv7,hdv8,hdv9 fourcc xdv1,xdv2,xdv3 fourcc xdv4,xdv5,xdv6 fourcc xdv7,xdv8,xdv9 @@ -226,15 +224,13 @@ videocodec ffmpeg12 fourcc PIM2 ; Pinnacle hardware-MPEG-2 fourcc VCR2 fourcc "DVR " - fourcc hdv2 fourcc MPEG - fourcc hdv1 - fourcc hdv3 ; HDV 1080i50 - fourcc hdv5 ; HDV 720p25 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) fourcc MMES,mmes ; matrox mpeg2 in avi fourcc M701 ; matrox mpeg2 intra-only - fourcc hdv6,hdv7,hdv8 + fourcc hdv1,hdv2,hdv3 + fourcc hdv4,hdv5,hdv6 + fourcc hdv7,hdv8,hdv9 fourcc xdv1,xdv2,xdv3 fourcc xdv4,xdv5,xdv6 fourcc xdv7,xdv8,xdv9 @@ -262,19 +258,17 @@ videocodec mpeg12 format 0x10000001 ; MPEG-1 format 0x10000002 ; MPEG-2 fourcc "DVR " - fourcc hdv2 fourcc mpg1 fourcc PIM1 ; Pinnacle hardware-MPEG-1 fourcc PIM2 ; Pinnacle hardware-MPEG-2 fourcc mpg2,MPG2 fourcc MPEG - fourcc hdv1 - fourcc hdv3 ; HDV 1080i50 - fourcc hdv5 ; HDV 720p25 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) fourcc MMES,mmes ; matrox mpeg2 in avi fourcc M701 ; matrox mpeg2 intra-only - fourcc hdv6,hdv7,hdv8 + fourcc hdv1,hdv2,hdv3 + fourcc hdv4,hdv5,hdv6 + fourcc hdv7,hdv8,hdv9 fourcc xdv1,xdv2,xdv3 fourcc xdv4,xdv5,xdv6 fourcc xdv7,xdv8,xdv9 @@ -301,17 +295,15 @@ videocodec ffmpeg12mc format 0x10000002 ; MPEG-2 fourcc mpg1,mpg2,MPG2 fourcc "DVR " - fourcc hdv1 - fourcc hdv2 fourcc PIM1 ; Pinnacle hardware-MPEG-1 fourcc PIM2 ; Pinnacle hardware-MPEG-2 fourcc VCR2 fourcc MPEG - fourcc hdv3 ; HDV 1080i50 - fourcc hdv5 ; HDV 720p25 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) fourcc MMES,mmes ; matrox mpeg2 in avi - fourcc hdv6,hdv7,hdv8 + fourcc hdv1,hdv2,hdv3 + fourcc hdv4,hdv5,hdv6 + fourcc hdv7,hdv8,hdv9 fourcc xdv1,xdv2,xdv3 fourcc xdv4,xdv5,xdv6 fourcc xdv7,xdv8,xdv9 @@ -369,15 +361,13 @@ videocodec ffmpeg2crystalhd format 0x10000002 ; MPEG-2 fourcc mpg2,MPG2 fourcc "DVR " - fourcc hdv1 - fourcc hdv2 fourcc MPEG - fourcc hdv3 ; HDV 1080i50 - fourcc hdv5 ; HDV 720p25 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) fourcc MMES,mmes ; matrox mpeg2 in avi fourcc M701 ; matrox mpeg2 intra-only - fourcc hdv6,hdv7,hdv8 + fourcc hdv1,hdv2,hdv3 + fourcc hdv4,hdv5,hdv6 + fourcc hdv7,hdv8,hdv9 fourcc xdv1,xdv2,xdv3 fourcc xdv4,xdv5,xdv6 fourcc xdv7,xdv8,xdv9 @@ -408,8 +398,8 @@ videocodec mpegpes fourcc mpg1,MPG1,mpg2,MPG2 fourcc MPEG fourcc hdv1,hdv2,hdv3 - fourcc hdv5 - fourcc hdv6,hdv7,hdv8 + fourcc hdv4,hdv5,hdv6 + fourcc hdv7,hdv8,hdv9 fourcc xdv1,xdv2,xdv3 fourcc xdv4,xdv5,xdv6 fourcc xdv7,xdv8,xdv9

1 0

r33112 - in trunk: gui/interface.c help/help_mp-bg.h help/help_mp-cs.h help/help_mp-de.h help/help_mp-dk.h help/help_mp-el.h help/help_mp-en.h help/help_mp-es.h help/help_mp-fr.h help/help_mp-hu.h ...
by ib 25 Mar '11

25 Mar '11

Author: ib Date: Fri Mar 25 13:40:20 2011 New Revision: 33112 Log: Revise some GUI error message texts. Modified: trunk/gui/interface.c Changes in other areas also in this revision: Modified: trunk/help/help_mp-bg.h trunk/help/help_mp-cs.h trunk/help/help_mp-de.h trunk/help/help_mp-dk.h trunk/help/help_mp-el.h trunk/help/help_mp-en.h trunk/help/help_mp-es.h trunk/help/help_mp-fr.h trunk/help/help_mp-hu.h trunk/help/help_mp-it.h trunk/help/help_mp-ja.h trunk/help/help_mp-ko.h trunk/help/help_mp-mk.h trunk/help/help_mp-nb.h trunk/help/help_mp-nl.h trunk/help/help_mp-pl.h trunk/help/help_mp-pt_BR.h trunk/help/help_mp-ru.h trunk/help/help_mp-sk.h trunk/help/help_mp-sv.h trunk/help/help_mp-tr.h trunk/help/help_mp-uk.h trunk/help/help_mp-zh_CN.h trunk/help/help_mp-zh_TW.h Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Fri Mar 25 12:28:25 2011 (r33111) +++ trunk/gui/interface.c Fri Mar 25 13:40:20 2011 (r33112) @@ -223,7 +223,7 @@ void guiInit(void) exit_player(EXIT_ERROR); case -2: - gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_SKIN_SKINCFG_SkinCfgReadError, skinName); + gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_SKIN_SKINCFG_SkinCfgError, skinName); exit_player(EXIT_ERROR); }

1 0

r33111 - in trunk/gui: interface.c mplayer/pb.c
by ib 25 Mar '11

25 Mar '11

Author: ib Date: Fri Mar 25 12:28:25 2011 New Revision: 33111 Log: Show GUI message when GUI must exit. Besides, change exit() to exit_player(). Modified: trunk/gui/interface.c trunk/gui/mplayer/pb.c Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Fri Mar 25 11:33:48 2011 (r33110) +++ trunk/gui/interface.c Fri Mar 25 12:28:25 2011 (r33111) @@ -219,12 +219,12 @@ void guiInit(void) switch (i) { case -1: - mp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_SKIN_SKINCFG_SkinNotFound, skinName); - exit(0); + gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_SKIN_SKINCFG_SkinNotFound, skinName); + exit_player(EXIT_ERROR); case -2: - mp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_SKIN_SKINCFG_SkinCfgReadError, skinName); - exit(0); + gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_SKIN_SKINCFG_SkinCfgReadError, skinName); + exit_player(EXIT_ERROR); } // initialize windows @@ -232,8 +232,8 @@ void guiInit(void) mplDrawBuffer = malloc(appMPlayer.main.Bitmap.ImageSize); if (!mplDrawBuffer) { - fprintf(stderr, MSGTR_NEMDB); // NOTE TO MYSELF: (g)mp_msg this - exit(0); + gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_NEMDB); + exit_player(EXIT_ERROR); } if (gui_save_pos) { @@ -887,7 +887,7 @@ int guiGetEvent(int type, void *arg) } if (!video_driver_list && !video_driver_list[0]) { - gtkMessageBox(GTK_MB_FATAL, MSGTR_IDFGCVD); + gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_IDFGCVD); exit_player(EXIT_ERROR); } Modified: trunk/gui/mplayer/pb.c ============================================================================== --- trunk/gui/mplayer/pb.c Fri Mar 25 11:33:48 2011 (r33110) +++ trunk/gui/mplayer/pb.c Fri Mar 25 12:28:25 2011 (r33111) @@ -32,6 +32,7 @@ #include "gui/wm/ws.h" #include "help_mp.h" +#include "mp_core.h" #include "libvo/x11_common.h" #include "libvo/fastmemcpy.h" @@ -243,8 +244,8 @@ void mplPBInit( void ) if ( ( mplPBDrawBuffer = malloc( appMPlayer.bar.Bitmap.ImageSize ) ) == NULL ) { - mp_msg( MSGT_GPLAYER,MSGL_FATAL,MSGTR_NEMDB ); - exit( 0 ); + gmp_msg( MSGT_GPLAYER,MSGL_FATAL,MSGTR_NEMDB ); + exit_player( EXIT_ERROR ); } appMPlayer.barWindow.Parent=appMPlayer.subWindow.WindowID;

1 0

r33110 - in trunk/gui: interface.c interface.h skin/skin.c
by ib 25 Mar '11

25 Mar '11

Author: ib Date: Fri Mar 25 11:33:48 2011 New Revision: 33110 Log: Add message showing function. In some cases it is necessary to show messages to the GUI users as well or they will wonder why the GUI didn't show up. Modified: trunk/gui/interface.c trunk/gui/interface.h trunk/gui/skin/skin.c Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Fri Mar 25 10:26:00 2011 (r33109) +++ trunk/gui/interface.c Fri Mar 25 11:33:48 2011 (r33110) @@ -1491,3 +1491,25 @@ int import_playtree_playlist_into_gui(pl return result; } + +// NOTE TO MYSELF: This function is nonsense. +// MPlayer should pass messages to the GUI +// which must decide then which message has +// to be shown (MSGL_FATAL, for example). +// But with this function it is at least +// possible to show GUI's very critical or +// abort messages. +void gmp_msg(int mod, int lev, const char *format, ...) +{ + char msg[512]; + va_list va; + + va_start(va, format); + vsnprintf(msg, sizeof(msg), format, va); + va_end(va); + + mp_msg(mod, lev, msg); + + if (mp_msg_test(mod, lev)) + gtkMessageBox(GTK_MB_FATAL, msg); +} Modified: trunk/gui/interface.h ============================================================================== --- trunk/gui/interface.h Fri Mar 25 10:26:00 2011 (r33109) +++ trunk/gui/interface.h Fri Mar 25 11:33:48 2011 (r33110) @@ -232,6 +232,7 @@ extern float gtkEquChannels[6][10]; void gaddlist(char ***list, const char *entry); void gfree(void **p); +void gmp_msg(int mod, int lev, const char *format, ...); char *gstrchr(char *str, int c); int gstrcmp(const char *a, const char *b); char *gstrdup(const char *str); Modified: trunk/gui/skin/skin.c ============================================================================== --- trunk/gui/skin/skin.c Fri Mar 25 10:26:00 2011 (r33109) +++ trunk/gui/skin/skin.c Fri Mar 25 11:33:48 2011 (r33110) @@ -23,6 +23,7 @@ #include "cut.h" #include "font.h" #include "gui/app.h" +#include "gui/interface.h" #include "gui/mplayer/widgets.h" #include "config.h" @@ -49,19 +50,13 @@ static wItem *currWinItems; static void skin_error(const char *format, ...) { char p[512]; - char tmp[512]; va_list ap; va_start(ap, format); vsnprintf(p, sizeof(p), format, ap); va_end(ap); - mp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_SKIN_ERRORMESSAGE, linenumber, p); - - if (mp_msg_test(MSGT_GPLAYER, MSGL_ERR)) { - snprintf(tmp, sizeof(tmp), MSGTR_SKIN_ERRORMESSAGE, linenumber, p); - gtkMessageBox(GTK_MB_FATAL, tmp); - } + gmp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_SKIN_ERRORMESSAGE, linenumber, p); } #define CHECKDEFLIST(str) \

1 0

r33109 - trunk/gui/skin/skin.c
by ib 25 Mar '11

25 Mar '11

Author: ib Date: Fri Mar 25 10:26:00 2011 New Revision: 33109 Log: Cosmetic: Rename ERRORMESSAGE() skin_error(). The new name is more appropriate and isn't unnecessarily upper-case. Modified: trunk/gui/skin/skin.c Modified: trunk/gui/skin/skin.c ============================================================================== --- trunk/gui/skin/skin.c Fri Mar 25 10:16:57 2011 (r33108) +++ trunk/gui/skin/skin.c Fri Mar 25 10:26:00 2011 (r33109) @@ -46,7 +46,7 @@ static wItem *currWin; static int *currWinItemIdx; static wItem *currWinItems; -static void ERRORMESSAGE(const char *format, ...) +static void skin_error(const char *format, ...) { char p[512]; char tmp[512]; @@ -68,7 +68,7 @@ static void ERRORMESSAGE(const char *for { \ if (skin == NULL) \ { \ - ERRORMESSAGE(MSGTR_SKIN_ERROR_SECTION, str); \ + skin_error(MSGTR_SKIN_ERROR_SECTION, str); \ return 1; \ } \ } @@ -77,7 +77,7 @@ static void ERRORMESSAGE(const char *for { \ if (!currWinName[0]) \ { \ - ERRORMESSAGE(MSGTR_SKIN_ERROR_WINDOW, str); \ + skin_error(MSGTR_SKIN_ERROR_WINDOW, str); \ return 1; \ } \ } @@ -86,7 +86,7 @@ static void ERRORMESSAGE(const char *for { \ if (!strcmp(currWinName, name)) \ { \ - ERRORMESSAGE(MSGTR_SKIN_ERROR_IN_WINDOW, name); \ + skin_error(MSGTR_SKIN_ERROR_IN_WINDOW, name); \ return 1; \ } \ } @@ -111,35 +111,35 @@ int skinBPRead(char *fname, txSample *bf switch (i) { case -1: - ERRORMESSAGE(MSGTR_SKIN_BITMAP_16bit, fname); + skin_error(MSGTR_SKIN_BITMAP_16bit, fname); break; case -2: - ERRORMESSAGE(MSGTR_SKIN_BITMAP_FileNotFound, fname); + skin_error(MSGTR_SKIN_BITMAP_FileNotFound, fname); break; case -3: - ERRORMESSAGE(MSGTR_SKIN_BITMAP_BMPReadError, fname); + skin_error(MSGTR_SKIN_BITMAP_BMPReadError, fname); break; case -4: - ERRORMESSAGE(MSGTR_SKIN_BITMAP_TGAReadError, fname); + skin_error(MSGTR_SKIN_BITMAP_TGAReadError, fname); break; case -5: - ERRORMESSAGE(MSGTR_SKIN_BITMAP_PNGReadError, fname); + skin_error(MSGTR_SKIN_BITMAP_PNGReadError, fname); break; case -6: - ERRORMESSAGE(MSGTR_SKIN_BITMAP_RLENotSupported, fname); + skin_error(MSGTR_SKIN_BITMAP_RLENotSupported, fname); break; case -7: - ERRORMESSAGE(MSGTR_SKIN_BITMAP_UnknownFileType, fname); + skin_error(MSGTR_SKIN_BITMAP_UnknownFileType, fname); break; case -8: - ERRORMESSAGE(MSGTR_SKIN_BITMAP_ConversionError, fname); + skin_error(MSGTR_SKIN_BITMAP_ConversionError, fname); break; } @@ -212,7 +212,7 @@ static int cmd_window(char *in) currWinItemIdx = &appMPlayer.IndexOfMenuItems; currWinItems = appMPlayer.menuItems; } else - ERRORMESSAGE(MSGTR_UNKNOWNWINDOWTYPE); + skin_error(MSGTR_UNKNOWNWINDOWTYPE); mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] window: %s\n", currWinName); @@ -390,7 +390,7 @@ static int cmd_button(char *in) mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] button image: %s %d,%d\n", fname, x, y); if ((currWinItems[*currWinItemIdx].message = appFindMessage(msg)) == -1) { - ERRORMESSAGE(MSGTR_SKIN_BITMAP_UnknownMessage, msg); + skin_error(MSGTR_SKIN_BITMAP_UnknownMessage, msg); return 0; } @@ -482,7 +482,7 @@ static int cmd_menu(char *in) mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] item #%d: %d,%d %dx%d\n", skin->IndexOfMenuItems, x, y, sx, sy); if ((skin->menuItems[skin->IndexOfMenuItems].message = message) == -1) - ERRORMESSAGE(MSGTR_SKIN_BITMAP_UnknownMessage, tmp); + skin_error(MSGTR_SKIN_BITMAP_UnknownMessage, tmp); mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] message: %s (#%d)\n", tmp, skin->menuItems[skin->IndexOfMenuItems].message); @@ -650,19 +650,19 @@ static int cmd_font(char *in) switch (item->fontid) { case -1: - ERRORMESSAGE(MSGTR_SKIN_FONT_NotEnoughtMemory); + skin_error(MSGTR_SKIN_FONT_NotEnoughtMemory); return 1; case -2: - ERRORMESSAGE(MSGTR_SKIN_FONT_TooManyFontsDeclared); + skin_error(MSGTR_SKIN_FONT_TooManyFontsDeclared); return 1; case -3: - ERRORMESSAGE(MSGTR_SKIN_FONT_FontFileNotFound); + skin_error(MSGTR_SKIN_FONT_FontFileNotFound); return 1; case -4: - ERRORMESSAGE(MSGTR_SKIN_FONT_FontImageNotFound); + skin_error(MSGTR_SKIN_FONT_FontImageNotFound); return 1; } @@ -697,7 +697,7 @@ static int cmd_slabel(char *in) id = fntFindID(sid); if (id < 0) { - ERRORMESSAGE(MSGTR_SKIN_FONT_NonExistentFontID, sid); + skin_error(MSGTR_SKIN_FONT_NonExistentFontID, sid); return 1; } @@ -714,7 +714,7 @@ static int cmd_slabel(char *in) item->label = strdup(tmp); if (!item->label) { - ERRORMESSAGE(MSGTR_SKIN_FONT_NotEnoughtMemory); + skin_error(MSGTR_SKIN_FONT_NotEnoughtMemory); return 1; } @@ -750,7 +750,7 @@ static int cmd_dlabel(char *in) id = fntFindID(sid); if (id < 0) { - ERRORMESSAGE(MSGTR_SKIN_FONT_NonExistentFontID, sid); + skin_error(MSGTR_SKIN_FONT_NonExistentFontID, sid); return 1; } @@ -768,7 +768,7 @@ static int cmd_dlabel(char *in) item->label = strdup(tmp); if (!item->label) { - ERRORMESSAGE(MSGTR_SKIN_FONT_NotEnoughtMemory); + skin_error(MSGTR_SKIN_FONT_NotEnoughtMemory); return 1; } @@ -791,7 +791,7 @@ static int cmd_decoration(char *in) cutItem(in, tmp, ',', 0); if (strcmp(tmp, "enable") != 0 && strcmp(tmp, "disable") != 0) { - ERRORMESSAGE(MSGTR_SKIN_UnknownParameter, tmp); + skin_error(MSGTR_SKIN_UnknownParameter, tmp); return 1; }

1 0

r33108 - trunk/gui/interface.h
by ib 25 Mar '11

25 Mar '11

Author: ib Date: Fri Mar 25 10:16:57 2011 New Revision: 33108 Log: Cosmetic: Move supportive stuff at top of file. Variable use_gui isn't defined in interface.c. Modified: trunk/gui/interface.h Modified: trunk/gui/interface.h ============================================================================== --- trunk/gui/interface.h Thu Mar 24 23:46:22 2011 (r33107) +++ trunk/gui/interface.h Fri Mar 25 10:16:57 2011 (r33108) @@ -24,11 +24,15 @@ #include "playtree.h" #include "stream/stream.h" -// these are in support of the non-GUI files that interact with -// the GUI and that only need to include interface.h for this +// These are in support of the non-GUI files that interact with +// the GUI and that only need to include interface.h for this. +// ------------------------------------------------------------ #include "cfg.h" #include "mplayer/play.h" +extern int use_gui; // this is defined in mplayer.c +// ------------------------------------------------------------ + #define guiXEvent 0 #define guiCEvent 1 #define guiIEvent 2 @@ -210,7 +214,6 @@ typedef struct urlItem { extern guiInterface_t guiIntfStruct; -extern int use_gui; // this is defined in mplayer.c extern int guiWinID; extern char *skinName;

1 0

r33106 - in trunk: input/input.c mp_fifo.c
by reimar 24 Mar '11

24 Mar '11

Author: reimar Date: Thu Mar 24 23:34:23 2011 New Revision: 33106 Log: Allow mouse wheel to work with a key fifo size of 2. Modified: trunk/input/input.c trunk/mp_fifo.c Modified: trunk/input/input.c ============================================================================== --- trunk/input/input.c Thu Mar 24 23:28:17 2011 (r33105) +++ trunk/input/input.c Thu Mar 24 23:34:23 2011 (r33106) @@ -1100,11 +1100,13 @@ interpret_key(int code, int paused) unsigned int j; mp_cmd_t* ret; - if (code == MP_KEY_RELEASE_ALL) { + if (code & MP_KEY_RELEASE_ALL) { + code &= ~MP_KEY_RELEASE_ALL; memset(key_down, 0, sizeof(key_down)); num_key_down = 0; last_key_down = 0; - return NULL; + if (!code) + return NULL; } if(mp_input_key_cb) { Modified: trunk/mp_fifo.c ============================================================================== --- trunk/mp_fifo.c Thu Mar 24 23:28:17 2011 (r33105) +++ trunk/mp_fifo.c Thu Mar 24 23:34:23 2011 (r33106) @@ -26,6 +26,7 @@ int key_fifo_size = 7; static int *key_fifo_data; static unsigned key_fifo_read; static unsigned key_fifo_write; +static int previous_down_key; static void mplayer_put_key_internal(int code){ int fifo_free = key_fifo_read + key_fifo_size - key_fifo_write; @@ -37,10 +38,21 @@ static void mplayer_put_key_internal(int if((code & MP_KEY_DOWN) && fifo_free <= (key_fifo_size >> 1)) return; // in the worst case, just reset key state - if (fifo_free == 1) - code = MP_KEY_RELEASE_ALL; + if (fifo_free == 1) { + // HACK: this ensures that a fifo size of 2 does + // not queue any key presses while still allowing + // the mouse wheel to work (which sends down and up + // at nearly the same time + if (code != previous_down_key) + code = 0; + code |= MP_KEY_RELEASE_ALL; + } key_fifo_data[key_fifo_write % key_fifo_size]=code; key_fifo_write++; + if (code & MP_KEY_DOWN) + previous_down_key = code & ~MP_KEY_DOWN; + else + previous_down_key = 0; } int mplayer_get_key(int fd){

1 0

r33105 - trunk/mp_fifo.c
by reimar 24 Mar '11

24 Mar '11

Author: reimar Date: Thu Mar 24 23:28:17 2011 New Revision: 33105 Log: Change condition to avoid needless key state resets with very small key fifos. Modified: trunk/mp_fifo.c Modified: trunk/mp_fifo.c ============================================================================== --- trunk/mp_fifo.c Thu Mar 24 23:11:18 2011 (r33104) +++ trunk/mp_fifo.c Thu Mar 24 23:28:17 2011 (r33105) @@ -33,7 +33,8 @@ static void mplayer_put_key_internal(int key_fifo_data = malloc(key_fifo_size * sizeof(int)); if(!fifo_free) return; // FIFO FULL!! // reserve some space for key release events to avoid stuck keys - if((code & MP_KEY_DOWN) && fifo_free < (key_fifo_size >> 1)) + // Make sure we do not reset key state because of a down event + if((code & MP_KEY_DOWN) && fifo_free <= (key_fifo_size >> 1)) return; // in the worst case, just reset key state if (fifo_free == 1)

1 0

r33104 - in trunk: input/input.c input/input.h mp_fifo.c
by reimar 24 Mar '11

24 Mar '11

Author: reimar Date: Thu Mar 24 23:11:18 2011 New Revision: 33104 Log: Make "stuck keys" problem impossibly by resetting the internal key state when our key fifo overflowed. Modified: trunk/input/input.c trunk/input/input.h trunk/mp_fifo.c Modified: trunk/input/input.c ============================================================================== --- trunk/input/input.c Thu Mar 24 22:58:06 2011 (r33103) +++ trunk/input/input.c Thu Mar 24 23:11:18 2011 (r33104) @@ -1100,6 +1100,13 @@ interpret_key(int code, int paused) unsigned int j; mp_cmd_t* ret; + if (code == MP_KEY_RELEASE_ALL) { + memset(key_down, 0, sizeof(key_down)); + num_key_down = 0; + last_key_down = 0; + return NULL; + } + if(mp_input_key_cb) { if (code & MP_KEY_DOWN) return NULL; Modified: trunk/input/input.h ============================================================================== --- trunk/input/input.h Thu Mar 24 22:58:06 2011 (r33103) +++ trunk/input/input.h Thu Mar 24 23:11:18 2011 (r33104) @@ -191,6 +191,8 @@ typedef enum { #define MP_KEY_DOWN (1<<29) // Use this when the key shouldn't be auto-repeated (like mouse buttons) #define MP_NO_REPEAT_KEY (1<<28) +// Special value to mark all keys as "up" +#define MP_KEY_RELEASE_ALL (1<<27) #ifndef MP_MAX_KEY_DOWN #define MP_MAX_KEY_DOWN 32 Modified: trunk/mp_fifo.c ============================================================================== --- trunk/mp_fifo.c Thu Mar 24 22:58:06 2011 (r33103) +++ trunk/mp_fifo.c Thu Mar 24 23:11:18 2011 (r33104) @@ -35,6 +35,9 @@ static void mplayer_put_key_internal(int // reserve some space for key release events to avoid stuck keys if((code & MP_KEY_DOWN) && fifo_free < (key_fifo_size >> 1)) return; + // in the worst case, just reset key state + if (fifo_free == 1) + code = MP_KEY_RELEASE_ALL; key_fifo_data[key_fifo_write % key_fifo_size]=code; key_fifo_write++; }

1 0

r33103 - trunk/mp_fifo.c
by reimar 24 Mar '11

24 Mar '11

Author: reimar Date: Thu Mar 24 22:58:06 2011 New Revision: 33103 Log: Remove debug printfs that haven't been used since ages. Modified: trunk/mp_fifo.c Modified: trunk/mp_fifo.c ============================================================================== --- trunk/mp_fifo.c Thu Mar 24 22:57:08 2011 (r33102) +++ trunk/mp_fifo.c Thu Mar 24 22:58:06 2011 (r33103) @@ -29,7 +29,6 @@ static unsigned key_fifo_write; static void mplayer_put_key_internal(int code){ int fifo_free = key_fifo_read + key_fifo_size - key_fifo_write; -// printf("mplayer_put_key(%d)\n",code); if (key_fifo_data == NULL) key_fifo_data = malloc(key_fifo_size * sizeof(int)); if(!fifo_free) return; // FIFO FULL!! @@ -42,13 +41,11 @@ static void mplayer_put_key_internal(int int mplayer_get_key(int fd){ int key; -// printf("mplayer_get_key(%d)\n",fd); if (key_fifo_data == NULL) return MP_INPUT_NOTHING; if(key_fifo_write==key_fifo_read) return MP_INPUT_NOTHING; key=key_fifo_data[key_fifo_read % key_fifo_size]; key_fifo_read++; -// printf("mplayer_get_key => %d\n",key); return key; }

1 0

r33102 - trunk/mp_fifo.c
by reimar 24 Mar '11

24 Mar '11

Author: reimar Date: Thu Mar 24 22:57:08 2011 New Revision: 33102 Log: Remove pointless initializers. Modified: trunk/mp_fifo.c Modified: trunk/mp_fifo.c ============================================================================== --- trunk/mp_fifo.c Thu Mar 24 22:56:34 2011 (r33101) +++ trunk/mp_fifo.c Thu Mar 24 22:57:08 2011 (r33102) @@ -23,9 +23,9 @@ #include "mp_fifo.h" int key_fifo_size = 7; -static int *key_fifo_data = NULL; -static unsigned key_fifo_read=0; -static unsigned key_fifo_write=0; +static int *key_fifo_data; +static unsigned key_fifo_read; +static unsigned key_fifo_write; static void mplayer_put_key_internal(int code){ int fifo_free = key_fifo_read + key_fifo_size - key_fifo_write;

1 0

r33101 - trunk/mp_fifo.c
by reimar 24 Mar '11

24 Mar '11

Author: reimar Date: Thu Mar 24 22:56:34 2011 New Revision: 33101 Log: Change fifo to not waste one entry needlessly. Modified: trunk/mp_fifo.c Modified: trunk/mp_fifo.c ============================================================================== --- trunk/mp_fifo.c Thu Mar 24 21:25:45 2011 (r33100) +++ trunk/mp_fifo.c Thu Mar 24 22:56:34 2011 (r33101) @@ -24,12 +24,11 @@ int key_fifo_size = 7; static int *key_fifo_data = NULL; -static int key_fifo_read=0; -static int key_fifo_write=0; +static unsigned key_fifo_read=0; +static unsigned key_fifo_write=0; static void mplayer_put_key_internal(int code){ - int fifo_free = key_fifo_read - key_fifo_write - 1; - if (fifo_free < 0) fifo_free += key_fifo_size; + int fifo_free = key_fifo_read + key_fifo_size - key_fifo_write; // printf("mplayer_put_key(%d)\n",code); if (key_fifo_data == NULL) key_fifo_data = malloc(key_fifo_size * sizeof(int)); @@ -37,8 +36,8 @@ static void mplayer_put_key_internal(int // reserve some space for key release events to avoid stuck keys if((code & MP_KEY_DOWN) && fifo_free < (key_fifo_size >> 1)) return; - key_fifo_data[key_fifo_write]=code; - key_fifo_write=(key_fifo_write+1)%key_fifo_size; + key_fifo_data[key_fifo_write % key_fifo_size]=code; + key_fifo_write++; } int mplayer_get_key(int fd){ @@ -47,8 +46,8 @@ int mplayer_get_key(int fd){ if (key_fifo_data == NULL) return MP_INPUT_NOTHING; if(key_fifo_write==key_fifo_read) return MP_INPUT_NOTHING; - key=key_fifo_data[key_fifo_read]; - key_fifo_read=(key_fifo_read+1)%key_fifo_size; + key=key_fifo_data[key_fifo_read % key_fifo_size]; + key_fifo_read++; // printf("mplayer_get_key => %d\n",key); return key; }

1 0

r33100 - trunk/libvo/fastmemcpy.h
by reimar 24 Mar '11

24 Mar '11

Author: reimar Date: Thu Mar 24 21:25:45 2011 New Revision: 33100 Log: More const preservation. Modified: trunk/libvo/fastmemcpy.h Modified: trunk/libvo/fastmemcpy.h ============================================================================== --- trunk/libvo/fastmemcpy.h Thu Mar 24 21:21:27 2011 (r33099) +++ trunk/libvo/fastmemcpy.h Thu Mar 24 21:25:45 2011 (r33100) @@ -40,7 +40,7 @@ static inline void * mem2agpcpy_pic(void if(dstStride == srcStride) { if (srcStride < 0) { - src = (uint8_t*)src + (height-1)*srcStride; + src = (const uint8_t*)src + (height-1)*srcStride; dst = (uint8_t*)dst + (height-1)*dstStride; srcStride = -srcStride; } @@ -52,7 +52,7 @@ static inline void * mem2agpcpy_pic(void for(i=0; i<height; i++) { mem2agpcpy(dst, src, bytesPerLine); - src = (uint8_t*)src + srcStride; + src = (const uint8_t*)src + srcStride; dst = (uint8_t*)dst + dstStride; } }

1 0

r33099 - trunk/libvo/fastmemcpy.h
by reimar 24 Mar '11

24 Mar '11

Author: reimar Date: Thu Mar 24 21:21:27 2011 New Revision: 33099 Log: Do not pointlessly cast away a const. Modified: trunk/libvo/fastmemcpy.h Modified: trunk/libvo/fastmemcpy.h ============================================================================== --- trunk/libvo/fastmemcpy.h Wed Mar 23 23:08:34 2011 (r33098) +++ trunk/libvo/fastmemcpy.h Thu Mar 24 21:21:27 2011 (r33099) @@ -77,7 +77,7 @@ static inline void * memcpy_pic2(void * if(!limit2width && dstStride == srcStride) { if (srcStride < 0) { - src = (uint8_t*)src + (height-1)*srcStride; + src = (const uint8_t*)src + (height-1)*srcStride; dst = (uint8_t*)dst + (height-1)*dstStride; srcStride = -srcStride; } @@ -89,7 +89,7 @@ static inline void * memcpy_pic2(void * for(i=0; i<height; i++) { fast_memcpy(dst, src, bytesPerLine); - src = (uint8_t*)src + srcStride; + src = (const uint8_t*)src + srcStride; dst = (uint8_t*)dst + dstStride; } }

1 0

r33098 - in trunk/libmpdemux: demux_mkv.c matroska.h
by cehoyos 23 Mar '11

23 Mar '11

Author: cehoyos Date: Wed Mar 23 23:08:34 2011 New Revision: 33098 Log: Support E-AC3 in deprecated native matroska demuxer. Modified: trunk/libmpdemux/demux_mkv.c trunk/libmpdemux/matroska.h Modified: trunk/libmpdemux/demux_mkv.c ============================================================================== --- trunk/libmpdemux/demux_mkv.c Wed Mar 23 15:52:13 2011 (r33097) +++ trunk/libmpdemux/demux_mkv.c Wed Mar 23 23:08:34 2011 (r33098) @@ -1677,6 +1677,8 @@ static int demux_mkv_open_audio(demuxer_ track->a_formattag = 0x2000; else if (!strcmp(track->codec_id, MKV_A_DTS)) track->a_formattag = 0x2001; + else if (!strcmp(track->codec_id, MKV_A_EAC3)) + track->a_formattag = mmioFOURCC('E', 'A', 'C', '3'); else if (!strcmp(track->codec_id, MKV_A_PCM) || !strcmp(track->codec_id, MKV_A_PCM_BE)) track->a_formattag = 0x0001; @@ -1746,6 +1748,7 @@ static int demux_mkv_open_audio(demuxer_ sh_a->wf->nAvgBytesPerSec = 16000; sh_a->wf->nBlockAlign = 1152; } else if ((track->a_formattag == 0x2000) || /* AC3 */ + (track->a_formattag == mmioFOURCC('E', 'A', 'C', '3')) || (track->a_formattag == 0x2001)) { /* DTS */ free(sh_a->wf); sh_a->wf = NULL; Modified: trunk/libmpdemux/matroska.h ============================================================================== --- trunk/libmpdemux/matroska.h Wed Mar 23 15:52:13 2011 (r33097) +++ trunk/libmpdemux/matroska.h Wed Mar 23 23:08:34 2011 (r33098) @@ -35,6 +35,7 @@ #define MKV_A_AAC "A_AAC" #define MKV_A_AC3 "A_AC3" #define MKV_A_DTS "A_DTS" +#define MKV_A_EAC3 "A_EAC3" #define MKV_A_MP2 "A_MPEG/L2" #define MKV_A_MP3 "A_MPEG/L3" #define MKV_A_PCM "A_PCM/INT/LIT"

1 0

r33096 - trunk/etc/codecs.conf
by cehoyos 23 Mar '11

23 Mar '11

Author: cehoyos Date: Wed Mar 23 11:49:28 2011 New Revision: 33096 Log: VDPAU does not support colourspaces different from 4:2:0. Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Wed Mar 23 09:35:45 2011 (r33095) +++ trunk/etc/codecs.conf Wed Mar 23 11:49:28 2011 (r33096) @@ -352,9 +352,6 @@ videocodec ffmpeg12vdpau fourcc xdv7,xdv8,xdv9 fourcc xdva,xdvb,xdvc fourcc xdvd,xdve,xdvf - fourcc xd5a,xd5b,xd5c - fourcc xd5d,xd5e,xd5f - fourcc xd59,xd54,xd55 fourcc mx5n,mx4n,mx4p fourcc mx3n,mx3p fourcc AVmp

2 1

r33097 - trunk/libmpcodecs/vd_ffmpeg.c
by zuxy 23 Mar '11

23 Mar '11

Author: zuxy Date: Wed Mar 23 15:52:13 2011 New Revision: 33097 Log: Change MP_IMGFLAG_ACCEPT_STRIDE to MP_IMGFLAG_ACCEPT_ALIGNED_STRIDE as various FFmpeg assembly routines assume aligned input. Modified: trunk/libmpcodecs/vd_ffmpeg.c Modified: trunk/libmpcodecs/vd_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/vd_ffmpeg.c Wed Mar 23 11:49:28 2011 (r33096) +++ trunk/libmpcodecs/vd_ffmpeg.c Wed Mar 23 15:52:13 2011 (r33097) @@ -583,7 +583,7 @@ static int get_buffer(AVCodecContext *av sh_video_t *sh = avctx->opaque; vd_ffmpeg_ctx *ctx = sh->context; mp_image_t *mpi=NULL; - int flags= MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_PREFER_ALIGNED_STRIDE; + int flags= MP_IMGFLAG_ACCEPT_ALIGNED_STRIDE | MP_IMGFLAG_PREFER_ALIGNED_STRIDE; int type= MP_IMGTYPE_IPB; int width= avctx->width; int height= avctx->height;

1 0

r33095 - in trunk: configure etc/codecs.conf libmpdemux/stheader.h
by cehoyos 23 Mar '11

23 Mar '11

Author: cehoyos Date: Wed Mar 23 09:35:45 2011 New Revision: 33095 Log: Support CrystalHD decoding. Patch by Philip Langdale, philipl overt org Modified: trunk/configure trunk/etc/codecs.conf trunk/libmpdemux/stheader.h Modified: trunk/configure ============================================================================== --- trunk/configure Tue Mar 22 12:44:26 2011 (r33094) +++ trunk/configure Wed Mar 23 09:35:45 2011 (r33095) @@ -431,6 +431,7 @@ Codecs: --disable-libopencore_amrnb disable libopencore_amr narrowband [autodetect] --disable-libopencore_amrwb disable libopencore_amr wideband [autodetect] --disable-libopenjpeg disable OpenJPEG (JPEG2000) input/output support [autodetect] + --disable-crystalhd disable CrystalHD support [autodetect] --disable-decoder=DECODER disable specified FFmpeg decoder --enable-decoder=DECODER enable specified FFmpeg decoder --disable-encoder=ENCODER disable specified FFmpeg encoder @@ -634,8 +635,6 @@ _libopencore_amrwb=auto libopenjpeg=auto libavdecoders_all=$(sed -n 's/^[^#]*DEC.*(.*, *$.*$).*/\1_decoder/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') libavdecoders=$(echo $libavdecoders_all | sed -e 's/ LIB[A-Z0-9_]*_DECODER//g') -# temporary hack until we have proper crystalhd support -libavdecoders=$(echo $libavdecoders | sed -e 's/[A-Z0-9]*_CRYSTALHD_DECODER//g') libavencoders_all=$(sed -n 's/^[^#]*ENC.*(.*, *$.*$).*/\1_encoder/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') libavencoders=$(echo $libavencoders_all | sed -e 's/ LIB[A-Z0-9_]*_ENCODER//g') libavparsers_all=$(sed -n 's/^[^#]*PARSER.*(.*, *$.*$).*/\1_parser/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') @@ -775,6 +774,7 @@ _vidix_pcidb=yes _dhahelper=no _svgalib_helper=no _joystick=no +crystalhd=auto _xvid=auto _xvid_lavc=auto _x264=auto @@ -1219,6 +1219,8 @@ for ac_option do --disable-svgalib_helper) _svgalib_helper=no ;; --enable-joystick) _joystick=yes ;; --disable-joystick) _joystick=no ;; + --enable-crystalhd) crystalhd=yes ;; + --disable-crystalhd) crystalhd=no ;; --enable-xvid) _xvid=yes ;; --disable-xvid) _xvid=no ;; --enable-xvid-lavc) _xvid_lavc=yes ;; @@ -6963,6 +6965,22 @@ else fi echores "$_libdv" +echocheck "CrystalHD" +if test "$crystalhd" = auto ; then + crystalhd=no + statement_check_broken libcrystalhd/bc_dts_types.h libcrystalhd/libcrystalhd_if.h 'DtsGetVersion(0, 0, 0)' -lcrystalhd $_ld_lm && crystalhd=yes +fi + +if test "$crystalhd" = yes ; then + extra_ldflags="$extra_ldflags -lcrystalhd" + def_crystalhd="#define CONFIG_CRYSTALHD 1" + codecmodules="crystalhd $codecmodules" +else + def_crystalhd="#define CONFIG_CRYSTALHD 0" + nocodecmodules="crystalhd $nocodecmodules" + libavdecoders=$(echo $libavdecoders | sed -e 's/[A-Z0-9]*_CRYSTALHD_DECODER//g') +fi +echores "$crystalhd" echocheck "Xvid" if test "$_xvid" = auto ; then @@ -8171,6 +8189,7 @@ CONFIG_LIBRTMP = $_librtmp CONFIG_AC3DSP = $_mencoder CONFIG_BZLIB = $bzlib +CONFIG_CRYSTALHD= $crystalhd CONFIG_ENCODERS = yes CONFIG_GPL = yes CONFIG_MLIB = $_mlib @@ -8682,6 +8701,7 @@ $def_yasm #define LIBAV_LICENSE FFMPEG_LICENSE /* External libraries used through FFmpeg. */ +$def_crystalhd $def_faac_lavc $def_libdirac_lavc $def_libgsm Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Tue Mar 22 12:44:26 2011 (r33094) +++ trunk/etc/codecs.conf Wed Mar 23 09:35:45 2011 (r33095) @@ -3,7 +3,7 @@ ; Before editing this file, please read DOCS/tech/codecs.conf.txt ! ;============================================================================= -release 20101127 +release 20110311 ;============================================================================= ; VIDEO CODECS @@ -366,6 +366,42 @@ videocodec ffmpeg12vdpau out VDPAU_MPEG1 out VDPAU_MPEG2 +videocodec ffmpeg2crystalhd + info "FFmpeg MPEG-2 (CrystalHD)" + status working + format 0x10000002 ; MPEG-2 + fourcc mpg2,MPG2 + fourcc "DVR " + fourcc hdv1 + fourcc hdv2 + fourcc MPEG + fourcc hdv3 ; HDV 1080i50 + fourcc hdv5 ; HDV 720p25 + fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) + fourcc MMES,mmes ; matrox mpeg2 in avi + fourcc M701 ; matrox mpeg2 intra-only + fourcc hdv6,hdv7,hdv8 + fourcc xdv1,xdv2,xdv3 + fourcc xdv4,xdv5,xdv6 + fourcc xdv7,xdv8,xdv9 + fourcc xdva,xdvb,xdvc + fourcc xdvd,xdve,xdvf + fourcc xd5a,xd5b,xd5c + fourcc xd5d,xd5e,xd5f + fourcc xd59,xd54 + fourcc mx5n,mx4n,mx4p + fourcc mx3n,mx3p + fourcc AVmp + fourcc VCR2 + fourcc mp2v,mpgv + fourcc m2v1 + fourcc PIM2 + fourcc LMP2 ; Lead mpeg2 in avi + fourcc slif ; SoftLab MPEG-2 I-frames Codec + driver ffmpeg + dll mpeg2_crystalhd + out YUY2 + videocodec mpegpes info "MPEG-PES output (.mpg or DXR3/IVTV/DVB/V4L2 card)" comment "for hardware decoding" @@ -900,6 +936,23 @@ videocodec ffdivx dll msmpeg4 out YV12,I420,IYUV +videocodec ffdivxcrystalhd + info "FFmpeg DivX ;-) (MSMPEG-4 v3) (CrystalHD)" + status buggy + fourcc MPG3,mpg3 div3 + fourcc MP43,mp43 div3 ; MSMPEG-4 v3 (fourcc mapping to div3) + fourcc DIV5,div5 div3 ; DivX 3.20 + fourcc DIV6,div6 div4 ; -||- + fourcc DIV3,div3,DIV4,div4 + fourcc DIVF,divf ; divx4.12 + fourcc AP41 div3 ; AngelPotion stuff + fourcc COL1,col1,COL0,col0 ; Cool codec (based on mpg4ds32.ax) + fourcc 3IVD,3ivd ; divxdoctored files (3ivx.com) + fourcc DVX3 + driver ffmpeg + dll msmpeg4_crystalhd + out YUY2 + videocodec ffmp42 info "FFmpeg MSMPEG-4 v2" status working @@ -960,6 +1013,14 @@ videocodec ffwmv3vdpau dll wmv3_vdpau out VDPAU_WMV3 +videocodec ffwmv3crystalhd + info "FFmpeg WMV3/WMV9 (CrystalHD)" + status buggy + fourcc WMV3,wmv3 + driver ffmpeg + dll wmv3_crystalhd + out YUY2 + videocodec ffvc1 info "FFmpeg WVC1" status buggy @@ -978,6 +1039,15 @@ videocodec ffvc1vdpau dll vc1_vdpau out VDPAU_VC1 +videocodec ffvc1crystalhd + info "FFmpeg WVC1 (CrystalHD)" + status buggy + fourcc WVC1,wvc1,WMVA + fourcc vc-1,VC-1 + driver ffmpeg + dll vc1_crystalhd + out YUY2 + videocodec ffh264 info "FFmpeg H.264" status working @@ -1008,6 +1078,21 @@ videocodec ffh264vdpau dll h264_vdpau out VDPAU_H264 +videocodec ffh264crystalhd + info "FFmpeg H.264 (CrystalHD)" + status working + fourcc H264,h264 + fourcc X264,x264 + fourcc avc1,AVC1 + fourcc davc,DAVC + fourcc vvvc ; only one sample using this fourcc + fourcc ai55,ai15 ; flip4mac avc intra + fourcc ai1q,ai5q ; flip4mac avc intra + format 0x10000005 + driver ffmpeg + dll h264_crystalhd + out YUY2 + videocodec coreavcwindows info "CoreAVC H.264 for x86 - http://corecodec.org/" comment "this codec will only work after purchasing it" @@ -1100,6 +1185,39 @@ videocodec ffodivxvdpau dll mpeg4_vdpau out VDPAU_MPEG4 +videocodec ffodivxcrystalhd + info "FFmpeg MPEG-4,DIVX-4/5 (CrystalHD)" + status working + fourcc FMP4,fmp4 + fourcc DIVX,divx + fourcc DIV1,div1 divx + fourcc MP4S,mp4s ; ISO MPEG-4 Video V1 + fourcc M4S2,m4s2 + fourcc xvid,XVID,XviD,XVIX + fourcc DX50,dx50,BLZ0 DX50 + fourcc mp4v,MP4V + format 0x4 + fourcc UMP4 + fourcc RMP4 + fourcc 3IV2,3iv2 ; 3ivx Delta 4 + fourcc DXGM + fourcc SEDG ; diskless camcorder Samsung Miniket VP-M110 + fourcc SMP4,smp4 ; Samsung SMP4 video codec + fourcc VIDM ; vidm 4.01 codec + format 0x10000004 ; mpeg 4 es + fourcc m4cc,M4CC + fourcc hdx4,HDX4 + fourcc FVFW,fvfw + fourcc FFDS + fourcc DCOD,MVXM,EM4A,PM4V + fourcc M4T3,DMK2,DIGI,INMC + fourcc EPHV,SN40,WAWV + fourcc uldx,ULDX,VSPX + fourcc SIPP ; Samsung SHR-6040 + driver ffmpeg + dll mpeg4_crystalhd + out YUY2 + videocodec ffwv1f info "WV1F MPEG-4" status working Modified: trunk/libmpdemux/stheader.h ============================================================================== --- trunk/libmpdemux/stheader.h Tue Mar 22 12:44:26 2011 (r33094) +++ trunk/libmpdemux/stheader.h Wed Mar 23 09:35:45 2011 (r33095) @@ -97,7 +97,7 @@ typedef struct sh_video { double i_pts; // PTS for the _next_ I/P frame float next_frame_time; double last_pts; - double buffered_pts[20]; + double buffered_pts[32]; int num_buffered_pts; // output format: (set by demuxer) float fps; // frames per second (set only if constant fps)

2 1

r33094 - trunk/etc/codecs.conf
by compn 22 Mar '11

22 Mar '11

Author: compn Date: Tue Mar 22 12:44:26 2011 New Revision: 33094 Log: add xd55 isom for mpeg2 video from fcp Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Mon Mar 21 20:33:22 2011 (r33093) +++ trunk/etc/codecs.conf Tue Mar 22 12:44:26 2011 (r33094) @@ -200,7 +200,7 @@ videocodec ffmpeg2 fourcc xdvd,xdve,xdvf fourcc xd5a,xd5b,xd5c fourcc xd5d,xd5e,xd5f - fourcc xd59,xd54 + fourcc xd59,xd54,xd55 fourcc mx5n,mx4n,mx4p fourcc mx3n,mx3p fourcc AVmp @@ -242,7 +242,7 @@ videocodec ffmpeg12 fourcc xdvd,xdve,xdvf fourcc xd5a,xd5b,xd5c fourcc xd5d,xd5e,xd5f - fourcc xd59,xd54 + fourcc xd59,xd54,xd55 fourcc mx5n,mx4n,mx4p fourcc mx3n,mx3p fourcc AVmp @@ -282,7 +282,7 @@ videocodec mpeg12 fourcc xdvd,xdve,xdvf fourcc xd5a,xd5b,xd5c fourcc xd5d,xd5e,xd5f - fourcc xd59,xd54 + fourcc xd59,xd54,xd55 fourcc mx5n,mx4n,mx4p fourcc mx3n,mx3p fourcc AVmp @@ -319,7 +319,7 @@ videocodec ffmpeg12mc fourcc xdvd,xdve,xdvf fourcc xd5a,xd5b,xd5c fourcc xd5d,xd5e,xd5f - fourcc xd59,xd54 + fourcc xd59,xd54,xd55 fourcc mx5n,mx4n,mx4p fourcc mx3n,mx3p fourcc AVmp @@ -354,7 +354,7 @@ videocodec ffmpeg12vdpau fourcc xdvd,xdve,xdvf fourcc xd5a,xd5b,xd5c fourcc xd5d,xd5e,xd5f - fourcc xd59,xd54 + fourcc xd59,xd54,xd55 fourcc mx5n,mx4n,mx4p fourcc mx3n,mx3p fourcc AVmp @@ -384,7 +384,7 @@ videocodec mpegpes fourcc xdvd,xdve,xdvf fourcc xd5a,xd5b,xd5c fourcc xd5d,xd5e,xd5f - fourcc xd59,xd54 + fourcc xd59,xd54,xd55 fourcc mx5n,mx4n,mx4p fourcc mx3n,mx3p fourcc AVmp

1 0

r33093 - trunk/gui/interface.c
by ib 21 Mar '11

21 Mar '11

Author: ib Date: Mon Mar 21 20:33:22 2011 New Revision: 33093 Log: Initialize guiIntfStruct.VCDTracks. The check for stream->priv has become unnecessary. The initialization also provides for a stream_control() failure. Modified: trunk/gui/interface.c Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Mon Mar 21 20:21:32 2011 (r33092) +++ trunk/gui/interface.c Mon Mar 21 20:33:22 2011 (r33093) @@ -696,10 +696,8 @@ int guiGetEvent(int type, void *arg) #ifdef CONFIG_VCD case STREAMTYPE_VCD: - if (!stream->priv) - guiIntfStruct.VCDTracks = 0; - else - stream_control(stream, STREAM_CTRL_GET_NUM_CHAPTERS, &guiIntfStruct.VCDTracks); + guiIntfStruct.VCDTracks = 0; + stream_control(stream, STREAM_CTRL_GET_NUM_CHAPTERS, &guiIntfStruct.VCDTracks); break; #endif

1 0