August 2014 - MPlayer-cvslog - lists.mplayerhq.hu

r37262 - in trunk: DOCS/man/en/mplayer.1 cfg-common.h libmpdemux/demuxer.c
by reimar 31 Aug '14

31 Aug '14

Author: reimar Date: Sun Aug 31 11:39:13 2014 New Revision: 37262 Log: Support -ni option for all formats. Can work around playback issues with badly interleaved files. Modified: trunk/cfg-common.h trunk/libmpdemux/demuxer.c Changes in other areas also in this revision: Modified: trunk/DOCS/man/en/mplayer.1 Modified: trunk/cfg-common.h ============================================================================== --- trunk/cfg-common.h Sun Aug 31 11:33:38 2014 (r37261) +++ trunk/cfg-common.h Sun Aug 31 11:39:13 2014 (r37262) @@ -406,7 +406,7 @@ const m_option_t common_opts[] = { {"edl", &edl_filename, CONF_TYPE_STRING, 0, 0, 0, NULL}, - // AVI specific: force non-interleaved mode + // force non-interleaved mode {"ni", &force_ni, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"noni", &force_ni, CONF_TYPE_FLAG, 0, 1, 0, NULL}, Modified: trunk/libmpdemux/demuxer.c ============================================================================== --- trunk/libmpdemux/demuxer.c Sun Aug 31 11:33:38 2014 (r37261) +++ trunk/libmpdemux/demuxer.c Sun Aug 31 11:39:13 2014 (r37262) @@ -722,7 +722,7 @@ int ds_fill_buffer(demux_stream_t *ds) // This needs to be enough for at least 1 second of packets // since libavformat mov demuxer does not try to interleave // with more than 1s precision. - if (ds->fill_count > 80) + if (!force_ni && ds->fill_count > 80) break; // avoid printing the "too many ..." message over and over if (ds->eof)

1 0

r37261 - trunk/mplayer.c
by reimar 31 Aug '14

31 Aug '14

Author: reimar Date: Sun Aug 31 11:33:38 2014 New Revision: 37261 Log: Double-check that we are really at audio EOF by trying to refill. Somewhat improves trac #2196. Modified: trunk/mplayer.c Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Sun Aug 31 00:06:22 2014 (r37260) +++ trunk/mplayer.c Sun Aug 31 11:33:38 2014 (r37261) @@ -3823,7 +3823,7 @@ goto_enable_cache: // Ensure vo_pts is updated so that ao_pcm will not hang. advance_timer(frame_time); // only stop playing when audio is at end as well - if (!mpctx->sh_audio || mpctx->d_audio->eof) + if (!mpctx->sh_audio || (mpctx->d_audio->eof && !ds_fill_buffer(mpctx->d_audio))) mpctx->eof = 1; } else { // might return with !eof && !blit_frame if !correct_pts

1 0

r37260 - trunk/TOOLS/mp-uncrustify-style.cfg
by ib 30 Aug '14

30 Aug '14

Author: ib Date: Sun Aug 31 00:06:22 2014 New Revision: 37260 Log: Fix issue with blank line after each function and #ifdef. Setting nl_squeeze_ifdef suppresses the blank line as desired. Modified: trunk/TOOLS/mp-uncrustify-style.cfg Modified: trunk/TOOLS/mp-uncrustify-style.cfg ============================================================================== --- trunk/TOOLS/mp-uncrustify-style.cfg Thu Aug 28 21:34:05 2014 (r37259) +++ trunk/TOOLS/mp-uncrustify-style.cfg Sun Aug 31 00:06:22 2014 (r37260) @@ -5,21 +5,6 @@ ### ### - Align comments? ### -### - New line after function -### -### nl_after_func_body force one blank line after each function, but it should -### not when surrounded with #ifdef: -### -### #ifdef CONFIG_DVDNAV -### static void mp_dvdnav_context_free(MPContext *ctx) -### { -### // [...] -### } -### -### #endif -### -### void uninit_player(unsigned int mask) -### # # General options @@ -1013,7 +998,7 @@ nl_after_vbrace_close nl_define_macro = false # false/true # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = false # false/true +nl_squeeze_ifdef = true # false/true # Add or remove blank line before 'if' nl_before_if = ignore # ignore/add/remove/force

1 0

r37259 - trunk/command.c
by ib 28 Aug '14

28 Aug '14

Author: ib Date: Thu Aug 28 21:34:05 2014 New Revision: 37259 Log: Check existence of a demuxer when updating global_sub_size. The GUI may call mpctx_get_global_sub_info() which forces updating global_sub_size even if there isn't yet a demuxer. This closes Trac #2201. Modified: trunk/command.c Modified: trunk/command.c ============================================================================== --- trunk/command.c Thu Aug 28 20:36:23 2014 (r37258) +++ trunk/command.c Thu Aug 28 21:34:05 2014 (r37259) @@ -155,7 +155,7 @@ static void update_global_sub_size(MPCon // update number of demuxer sub streams for (i = 0; i < MAX_S_STREAMS; i++) - if (mpctx->demuxer->s_streams[i]) + if (mpctx->demuxer && mpctx->demuxer->s_streams[i]) cnt++; if (cnt > mpctx->sub_counts[SUB_SOURCE_DEMUX]) mpctx->sub_counts[SUB_SOURCE_DEMUX] = cnt; @@ -168,7 +168,7 @@ static void update_global_sub_size(MPCon // update global_sub_pos if we auto-detected a demuxer sub if (mpctx->global_sub_pos == -1) { int sub_id = -1; - if (mpctx->demuxer->sub) + if (mpctx->demuxer && mpctx->demuxer->sub) sub_id = mpctx->demuxer->sub->id; if (sub_id < 0) sub_id = dvdsub_id;

1 0

r37258 - trunk/configure
by reimar 28 Aug '14

28 Aug '14

Author: reimar Date: Thu Aug 28 20:36:23 2014 New Revision: 37258 Log: Add setend ARM instruction detection for FFmpeg. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sat Aug 23 16:23:37 2014 (r37257) +++ trunk/configure Thu Aug 28 20:36:23 2014 (r37258) @@ -644,6 +644,7 @@ _armv6=auto _armv6t2=auto _armvfp=auto vfpv3=auto +setend=auto neon=auto armthumb=auto _iwmmxt=auto @@ -3152,6 +3153,13 @@ if arm ; then fi echores "$vfpv3" + echocheck "ARM setend" + if test $setend = "auto" ; then + setend=no + inline_asm_check '"setend be"' && setend=yes + fi + echores "$setend" + echocheck "softfloat ABI" softfloat=yes cpp_condition_check '' 'defined(__ARM_PCS_VFP) || (!defined(__ARM_PCS) && !defined(__SOFTFP__))' && softfloat=no @@ -3190,7 +3198,7 @@ if arm ; then echores "$_iwmmxt" fi -cpuexts_all='ALTIVEC XOP AVX AVX2 FMA3 FMA4 MMX MMX2 MMXEXT AMD3DNOW AMD3DNOWEXT SSE SSE2 SSE3 SSSE3 SSE4 SSE42 FAST_CMOV I686 FAST_CLZ ARMV5TE ARMV6 ARMV6T2 VFP VFPV3 NEON IWMMXT MMI VIS MVI' +cpuexts_all='ALTIVEC XOP AVX AVX2 FMA3 FMA4 MMX MMX2 MMXEXT AMD3DNOW AMD3DNOWEXT SSE SSE2 SSE3 SSSE3 SSE4 SSE42 FAST_CMOV I686 FAST_CLZ ARMV5TE ARMV6 ARMV6T2 VFP VFPV3 SETEND NEON IWMMXT MMI VIS MVI' test "$_altivec" = yes && cpuexts="ALTIVEC $cpuexts" test "$_mmx" = yes && cpuexts="MMX $cpuexts" test "$_mmxext" = yes && cpuexts="MMX2 $cpuexts" @@ -3216,6 +3224,7 @@ test "$_armv6" = yes && cpuexts="ARM test "$_armv6t2" = yes && cpuexts="ARMV6T2 $cpuexts" test "$_armvfp" = yes && cpuexts="VFP $cpuexts" test "$vfpv3" = yes && cpuexts="VFPV3 $cpuexts" +test "$setend" = yes && cpuexts="SETEND $cpuexts" test "$neon" = yes && cpuexts="NEON $cpuexts" test "$_iwmmxt" = yes && cpuexts="IWMMXT $cpuexts" test "$_vis" = yes && cpuexts="VIS $cpuexts"

1 0

r37257 - in trunk/sub: av_sub.c spudec.c
by reimar 23 Aug '14

23 Aug '14

Author: reimar Date: Sat Aug 23 16:23:37 2014 New Revision: 37257 Log: Better handling of out-of-range subtitle timestamps. Fixes decoding of PGS subtitles. Modified: trunk/sub/av_sub.c trunk/sub/spudec.c Modified: trunk/sub/av_sub.c ============================================================================== --- trunk/sub/av_sub.c Sat Aug 23 15:59:32 2014 (r37256) +++ trunk/sub/av_sub.c Sat Aug 23 16:23:37 2014 (r37257) @@ -130,7 +130,7 @@ int decode_avsub(struct sh_sub *sh, uint if (res < 0) return res; if (*pts != MP_NOPTS_VALUE) { - if (sub.end_display_time > sub.start_display_time) + if (sub.end_display_time > sub.start_display_time && sub.end_display_time < 0x7fffffff) *endpts = *pts + sub.end_display_time / 1000.0; *pts += sub.start_display_time / 1000.0; } Modified: trunk/sub/spudec.c ============================================================================== --- trunk/sub/spudec.c Sat Aug 23 15:59:32 2014 (r37256) +++ trunk/sub/spudec.c Sat Aug 23 16:23:37 2014 (r37257) @@ -1426,9 +1426,9 @@ void spudec_packet_send(void *spu, packe { packet->start_pts = 0; packet->end_pts = 0x7fffffff; - if (pts != MP_NOPTS_VALUE) + if (pts != MP_NOPTS_VALUE && pts < 0xffffffffu / 90000) packet->start_pts = pts * 90000; - if (endpts != MP_NOPTS_VALUE) + if (endpts != MP_NOPTS_VALUE && endpts < 0xffffffffu / 90000) packet->end_pts = endpts * 90000; spudec_queue_packet(spu, packet); }

1 0

r37256 - trunk/configure
by reimar 23 Aug '14

23 Aug '14

Author: reimar Date: Sat Aug 23 15:59:32 2014 New Revision: 37256 Log: Add ZLIB_CONST to make the zlib API const-correct. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun Aug 17 20:06:56 2014 (r37255) +++ trunk/configure Sat Aug 23 15:59:32 2014 (r37256) @@ -6441,6 +6441,7 @@ statement_check zlib.h 'inflate(0, Z_NO_ if test "$_zlib" = yes ; then def_zlib='#define CONFIG_ZLIB 1' extra_ldflags="$extra_ldflags -lz" + extra_cflags="$extra_cflags -DZLIB_CONST" # necessary for vf_screenshot mplayer_encoders="$mplayer_encoders PNG_ENCODER" else

1 0

r37255 - in trunk: access_mpcontext.h gui/dialog/menu.c mplayer.c
by ib 17 Aug '14

17 Aug '14

Author: ib Date: Sun Aug 17 20:06:56 2014 New Revision: 37255 Log: Ensure up-to-dateness of global_sub information upon request. Some demuxers (like mpg) can detect subtitles only while playing, which is the reason why MPlayer always - indirectly - calls update_global_sub_size() prior to dealing with subtitles. Functions mpctx_get_global_sub_size() and mpctx_get_global_sub_pos(), however, merely return last determined values, thus missing information that may have been arisen after MPlayer has checked last for subtitles (when playback started). Merge the two mpctx_get_global_sub_*() functions into one for easier handling. Retrieve global_sub pos by a mp_property_do("sub") command which performs the necessary update of both global_sub variables, pos and size. Reported by Lode Leroy, lode.leroy gmail com. Modified: trunk/access_mpcontext.h trunk/gui/dialog/menu.c trunk/mplayer.c Modified: trunk/access_mpcontext.h ============================================================================== --- trunk/access_mpcontext.h Sat Aug 16 00:27:52 2014 (r37254) +++ trunk/access_mpcontext.h Sun Aug 17 20:06:56 2014 (r37255) @@ -25,8 +25,7 @@ const void *mpctx_get_audio_out(struct M void *mpctx_get_demuxer(struct MPContext *mpctx); void *mpctx_get_playtree_iter(struct MPContext *mpctx); void *mpctx_get_mixer(struct MPContext *mpctx); -int mpctx_get_global_sub_size(struct MPContext *mpctx); -int mpctx_get_global_sub_pos(struct MPContext *mpctx); +void mpctx_get_global_sub_info(struct MPContext *mpctx, int *size, int *pos); int mpctx_get_osd_function(struct MPContext *mpctx); void *mpctx_get_stream(struct MPContext *mpctx); void *mpctx_get_afilter(struct MPContext *mpctx); Modified: trunk/gui/dialog/menu.c ============================================================================== --- trunk/gui/dialog/menu.c Sat Aug 16 00:27:52 2014 (r37254) +++ trunk/gui/dialog/menu.c Sun Aug 17 20:06:56 2014 (r37255) @@ -462,7 +462,7 @@ GtkWidget * CreatePopUpMenu( void ) GtkWidget * H, * N, * D, * F; demuxer_t *demuxer = mpctx_get_demuxer(guiInfo.mpcontext); mixer_t *mixer = mpctx_get_mixer(guiInfo.mpcontext); - int global_sub_size = mpctx_get_global_sub_size(guiInfo.mpcontext); + int subs = 0, sub_pos; Menu=gtk_menu_new(); gtk_widget_realize (Menu); @@ -733,13 +733,15 @@ GtkWidget * CreatePopUpMenu( void ) } /* cheap subtitle switching for non-DVD streams */ - if ( global_sub_size && guiInfo.StreamType != STREAMTYPE_DVD ) + + mpctx_get_global_sub_info(guiInfo.mpcontext, &subs, &sub_pos); + + if ( subs && guiInfo.StreamType != STREAMTYPE_DVD ) { - int pos, i, j, subs0 = guiInfo.mpcontext->sub_counts[SUB_SOURCE_SUBS], subs1 = guiInfo.mpcontext->sub_counts[SUB_SOURCE_VOBSUB]; - pos = mpctx_get_global_sub_pos(guiInfo.mpcontext); + int i, j, subs0 = guiInfo.mpcontext->sub_counts[SUB_SOURCE_SUBS], subs1 = guiInfo.mpcontext->sub_counts[SUB_SOURCE_VOBSUB]; SubMenu=AddSubMenu( window1, (const char*)subtitle_xpm, Menu, MSGTR_GUI_Subtitles ); - AddMenuCheckItem( window1, (const char*)empty1px_xpm, SubMenu, MSGTR_GUI__none_, pos == -1, (-1 << 16) + ivSetSubtitle ); - for ( i=0;i < global_sub_size;i++ ) + AddMenuCheckItem( window1, (const char*)empty1px_xpm, SubMenu, MSGTR_GUI__none_, sub_pos == -1, (-1 << 16) + ivSetSubtitle ); + for ( i=0;i < subs;i++ ) { int ret = -1; char lng[32], tmp[64], *lang = NULL; @@ -782,7 +784,7 @@ GtkWidget * CreatePopUpMenu( void ) } if ( ret == 0 ) snprintf( tmp, sizeof(tmp), MSGTR_GUI_TrackN" - %s", i, GetLanguage( lng, GET_LANG_CHR ) ); else snprintf( tmp, sizeof(tmp), MSGTR_GUI_TrackN, i ); - AddMenuCheckItem( window1,(const char*)empty1px_xpm,SubMenu,tmp,pos == i,( i << 16 ) + ivSetSubtitle ); + AddMenuCheckItem( window1,(const char*)empty1px_xpm,SubMenu,tmp,sub_pos == i,( i << 16 ) + ivSetSubtitle ); } } Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Sat Aug 16 00:27:52 2014 (r37254) +++ trunk/mplayer.c Sun Aug 17 20:06:56 2014 (r37255) @@ -360,14 +360,11 @@ void *mpctx_get_mixer(MPContext *mpctx) return &mpctx->mixer; } -int mpctx_get_global_sub_size(MPContext *mpctx) +void mpctx_get_global_sub_info(MPContext *mpctx, int *size, int *pos) { - return mpctx->global_sub_size; -} + mp_property_do("sub", M_PROPERTY_GET, pos, mpctx); -int mpctx_get_global_sub_pos(MPContext *mpctx) -{ - return mpctx->global_sub_pos; + if (size) *size = mpctx->global_sub_size; } int mpctx_get_osd_function(MPContext *mpctx)

1 0

r37254 - trunk/libmpcodecs/vd_ffmpeg.c
by al 15 Aug '14

15 Aug '14

Author: al Date: Sat Aug 16 00:27:52 2014 New Revision: 37254 Log: vd_ffmpeg: Rewrite ticket reference in comment Omit the issue tracking software's name. Despite the migration from Bugzilla to Trac we were able to keep the ticket numbers. Modified: trunk/libmpcodecs/vd_ffmpeg.c Modified: trunk/libmpcodecs/vd_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/vd_ffmpeg.c Sat Aug 16 00:26:09 2014 (r37253) +++ trunk/libmpcodecs/vd_ffmpeg.c Sat Aug 16 00:27:52 2014 (r37254) @@ -260,7 +260,7 @@ static void set_dr_slice_settings(struct ctx->nonref_dr = 0; // TODO: fix and enable again. This currently causes issues when using filters // and seeking, usually failing with the "Ran out of numbered images" message, - // but bugzilla #2118 might be related as well. + // but ticket #2118 might be related as well. if (0 && lavc_codec->id == AV_CODEC_ID_H264) { ctx->do_dr1 = 1; ctx->nonref_dr = 1;

1 0

r37253 - trunk/DOCS/tech/release-howto.txt
by al 15 Aug '14

15 Aug '14

Author: al Date: Sat Aug 16 00:26:09 2014 New Revision: 37253 Log: release-howto: Rewrite instructions from Bugzilla to Trac Modified: trunk/DOCS/tech/release-howto.txt Modified: trunk/DOCS/tech/release-howto.txt ============================================================================== --- trunk/DOCS/tech/release-howto.txt Sat Aug 16 00:24:18 2014 (r37252) +++ trunk/DOCS/tech/release-howto.txt Sat Aug 16 00:26:09 2014 (r37253) @@ -44,7 +44,7 @@ sometimes links are broken. Do not forge Send the release notes as a mail to the mplayer-announce mailing list. -Add the new release version to bugzilla page. +Add the new release version and release date to Trac (Admin - Ticket System - Versions). Update release version in #mplayer and #mplayerdev topics.

1 0