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

r37216 - trunk/configure
by michael 30 May '14

30 May '14

Author: michael Date: Fri May 30 02:59:49 2014 New Revision: 37216 Log: configure add CONFIG_QPELDSP to avoid breaking build Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Wed May 28 00:20:15 2014 (r37215) +++ trunk/configure Fri May 30 02:59:49 2014 (r37216) @@ -8656,6 +8656,7 @@ CONFIG_H264DSP = yes CONFIG_H264PRED= yes CONFIG_H264QPEL= yes CONFIG_HPELDSP = yes +CONFIG_QPELDSP = yes CONFIG_HUFFYUVDSP = yes CONFIG_HUFFYUVENCDSP = yes CONFIG_TPELDSP = yes

1 0

r37215 - trunk/configure
by michael 27 May '14

27 May '14

Author: michael Date: Wed May 28 00:20:15 2014 New Revision: 37215 Log: configure: add CONFIG_HUFFYUVENCDSP to prevent build failure Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Tue May 27 23:30:48 2014 (r37214) +++ trunk/configure Wed May 28 00:20:15 2014 (r37215) @@ -8657,6 +8657,7 @@ CONFIG_H264PRED= yes CONFIG_H264QPEL= yes CONFIG_HPELDSP = yes CONFIG_HUFFYUVDSP = yes +CONFIG_HUFFYUVENCDSP = yes CONFIG_TPELDSP = yes CONFIG_HUFFMAN = yes CONFIG_INTRAX8 = yes

1 0

r37214 - trunk/configure
by michael 27 May '14

27 May '14

Author: michael Date: Tue May 27 23:30:48 2014 New Revision: 37214 Log: configure: prevent build failure due to CONFIG_HUFFYUVDSP Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Tue May 27 21:22:12 2014 (r37213) +++ trunk/configure Tue May 27 23:30:48 2014 (r37214) @@ -8656,6 +8656,7 @@ CONFIG_H264DSP = yes CONFIG_H264PRED= yes CONFIG_H264QPEL= yes CONFIG_HPELDSP = yes +CONFIG_HUFFYUVDSP = yes CONFIG_TPELDSP = yes CONFIG_HUFFMAN = yes CONFIG_INTRAX8 = yes

1 0

r37213 - trunk/sub/subreader.c
by reimar 27 May '14

27 May '14

Author: reimar Date: Tue May 27 21:22:12 2014 New Revision: 37213 Log: subreader: Check the %n result variable. This ensures we had an actual match against the full string. Ideally this would be possible by checking for a one larger return value, but unfortunately the standard is unclear if %n arguments should be counted or not... Modified: trunk/sub/subreader.c Modified: trunk/sub/subreader.c ============================================================================== --- trunk/sub/subreader.c Tue May 27 21:22:11 2014 (r37212) +++ trunk/sub/subreader.c Tue May 27 21:22:12 2014 (r37213) @@ -607,44 +607,54 @@ static subtitle *sub_read_line_rt(stream if (!match) { plen=a1=a2=a3=a4=b1=b2=b3=b4=0; match = sscanf(line, "<%*[tT]ime %*[bB]egin=\"%d.%d\" %*[Ee]nd=\"%d.%d\"%*[^<]<clear/>%n",&a3,&a4,&b3,&b4,&plen) >= 4; + match &= plen > 0; } if (!match) { plen=a1=a2=a3=a4=b1=b2=b3=b4=0; match = sscanf(line, "<%*[tT]ime %*[bB]egin=\"%d.%d\" %*[Ee]nd=\"%d:%d.%d\"%*[^<]<clear/>%n",&a3,&a4,&b2,&b3,&b4,&plen) >= 5; + match &= plen > 0; } if (!match) { plen=a1=a2=a3=a4=b1=b2=b3=b4=0; match = sscanf(line, "<%*[tT]ime %*[bB]egin=\"%d:%d\" %*[Ee]nd=\"%d:%d\"%*[^<]<clear/>%n",&a2,&a3,&b2,&b3,&plen) >= 4; + match &= plen > 0; } if (!match) { plen=a1=a2=a3=a4=b1=b2=b3=b4=0; match = sscanf(line, "<%*[tT]ime %*[bB]egin=\"%d:%d\" %*[Ee]nd=\"%d:%d.%d\"%*[^<]<clear/>%n",&a2,&a3,&b2,&b3,&b4,&plen) >= 5; + match &= plen > 0; } // sscanf(line, "<%*[tT]ime %*[bB]egin=\"%d:%d.%d\" %*[Ee]nd=\"%d:%d\"%*[^<]<clear/>%n",&a2,&a3,&a4,&b2,&b3,&plen) >= 5 if (!match) { plen=a1=a2=a3=a4=b1=b2=b3=b4=0; match = sscanf(line, "<%*[tT]ime %*[bB]egin=\"%d:%d.%d\" %*[Ee]nd=\"%d:%d.%d\"%*[^<]<clear/>%n",&a2,&a3,&a4,&b2,&b3,&b4,&plen) >= 6; + match &= plen > 0; } if (!match) { plen=a1=a2=a3=a4=b1=b2=b3=b4=0; match = sscanf(line, "<%*[tT]ime %*[bB]egin=\"%d:%d:%d.%d\" %*[Ee]nd=\"%d:%d:%d.%d\"%*[^<]<clear/>%n",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4,&plen) >= 8; + match &= plen > 0; } //now try it without end time if (!match) { plen=a1=a2=a3=a4=b1=b2=b3=b4=0; match = sscanf(line, "<%*[tT]ime %*[bB]egin=\"%d.%d\"%*[^<]<clear/>%n",&a3,&a4,&plen) >= 2; + match &= plen > 0; } if (!match) { plen=a1=a2=a3=a4=b1=b2=b3=b4=0; match = sscanf(line, "<%*[tT]ime %*[bB]egin=\"%d:%d\"%*[^<]<clear/>%n",&a2,&a3,&plen) >= 2; + match &= plen > 0; } if (!match) { plen=a1=a2=a3=a4=b1=b2=b3=b4=0; match = sscanf(line, "<%*[tT]ime %*[bB]egin=\"%d:%d.%d\"%*[^<]<clear/>%n",&a2,&a3,&a4,&plen) >= 3; + match &= plen > 0; } if (!match) { plen=a1=a2=a3=a4=b1=b2=b3=b4=0; match = sscanf(line, "<%*[tT]ime %*[bB]egin=\"%d:%d:%d.%d\"%*[^<]<clear/>%n",&a1,&a2,&a3,&a4,&plen) >= 4; + match &= plen > 0; } if (!match) continue;

1 0

r37212 - trunk/sub/subreader.c
by reimar 27 May '14

27 May '14

Author: reimar Date: Tue May 27 21:22:11 2014 New Revision: 37212 Log: subreader: Split a monster if() into multiple parts. Should make code more maintainable. Also make sure all input variables are properly reset before each test. Modified: trunk/sub/subreader.c Modified: trunk/sub/subreader.c ============================================================================== --- trunk/sub/subreader.c Tue May 27 21:22:10 2014 (r37211) +++ trunk/sub/subreader.c Tue May 27 21:22:11 2014 (r37212) @@ -594,28 +594,59 @@ static subtitle *sub_read_line_rt(stream char line[LINE_LEN+1]; int a1,a2,a3,a4,b1,b2,b3,b4; char *p=NULL,*next=NULL; - int len,plen; + int plen; while (!current->text[0]) { + int match = 0; if (!stream_read_line (st, line, LINE_LEN, utf16)) return NULL; //TODO: it seems that format of time is not easily determined, it may be 1:12, 1:12.0 or 0:1:12.0 //to describe the same moment in time. Maybe there are even more formats in use. + //This probably should be changed to do something nicer than + //"brute-forcing" a long list of format strings. //if ((len=sscanf (line, "<Time Begin=\"%d:%d:%d.%d\" End=\"%d:%d:%d.%d\"",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4)) < 8) - plen=a1=a2=a3=a4=b1=b2=b3=b4=0; - if ( - ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d.%d\" %*[Ee]nd=\"%d.%d\"%*[^<]<clear/>%n",&a3,&a4,&b3,&b4,&plen)) < 4) && - ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d.%d\" %*[Ee]nd=\"%d:%d.%d\"%*[^<]<clear/>%n",&a3,&a4,&b2,&b3,&b4,&plen)) < 5) && - ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d\" %*[Ee]nd=\"%d:%d\"%*[^<]<clear/>%n",&a2,&a3,&b2,&b3,&plen)) < 4) && - ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d\" %*[Ee]nd=\"%d:%d.%d\"%*[^<]<clear/>%n",&a2,&a3,&b2,&b3,&b4,&plen)) < 5) && -// ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d.%d\" %*[Ee]nd=\"%d:%d\"%*[^<]<clear/>%n",&a2,&a3,&a4,&b2,&b3,&plen)) < 5) && - ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d.%d\" %*[Ee]nd=\"%d:%d.%d\"%*[^<]<clear/>%n",&a2,&a3,&a4,&b2,&b3,&b4,&plen)) < 6) && - ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d:%d.%d\" %*[Ee]nd=\"%d:%d:%d.%d\"%*[^<]<clear/>%n",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4,&plen)) < 8) && + if (!match) { + plen=a1=a2=a3=a4=b1=b2=b3=b4=0; + match = sscanf(line, "<%*[tT]ime %*[bB]egin=\"%d.%d\" %*[Ee]nd=\"%d.%d\"%*[^<]<clear/>%n",&a3,&a4,&b3,&b4,&plen) >= 4; + } + if (!match) { + plen=a1=a2=a3=a4=b1=b2=b3=b4=0; + match = sscanf(line, "<%*[tT]ime %*[bB]egin=\"%d.%d\" %*[Ee]nd=\"%d:%d.%d\"%*[^<]<clear/>%n",&a3,&a4,&b2,&b3,&b4,&plen) >= 5; + } + if (!match) { + plen=a1=a2=a3=a4=b1=b2=b3=b4=0; + match = sscanf(line, "<%*[tT]ime %*[bB]egin=\"%d:%d\" %*[Ee]nd=\"%d:%d\"%*[^<]<clear/>%n",&a2,&a3,&b2,&b3,&plen) >= 4; + } + if (!match) { + plen=a1=a2=a3=a4=b1=b2=b3=b4=0; + match = sscanf(line, "<%*[tT]ime %*[bB]egin=\"%d:%d\" %*[Ee]nd=\"%d:%d.%d\"%*[^<]<clear/>%n",&a2,&a3,&b2,&b3,&b4,&plen) >= 5; + } +// sscanf(line, "<%*[tT]ime %*[bB]egin=\"%d:%d.%d\" %*[Ee]nd=\"%d:%d\"%*[^<]<clear/>%n",&a2,&a3,&a4,&b2,&b3,&plen) >= 5 + if (!match) { + plen=a1=a2=a3=a4=b1=b2=b3=b4=0; + match = sscanf(line, "<%*[tT]ime %*[bB]egin=\"%d:%d.%d\" %*[Ee]nd=\"%d:%d.%d\"%*[^<]<clear/>%n",&a2,&a3,&a4,&b2,&b3,&b4,&plen) >= 6; + } + if (!match) { + plen=a1=a2=a3=a4=b1=b2=b3=b4=0; + match = sscanf(line, "<%*[tT]ime %*[bB]egin=\"%d:%d:%d.%d\" %*[Ee]nd=\"%d:%d:%d.%d\"%*[^<]<clear/>%n",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4,&plen) >= 8; + } //now try it without end time - ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d.%d\"%*[^<]<clear/>%n",&a3,&a4,&plen)) < 2) && - ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d\"%*[^<]<clear/>%n",&a2,&a3,&plen)) < 2) && - ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d.%d\"%*[^<]<clear/>%n",&a2,&a3,&a4,&plen)) < 3) && - ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d:%d.%d\"%*[^<]<clear/>%n",&a1,&a2,&a3,&a4,&plen)) < 4) - ) + if (!match) { + plen=a1=a2=a3=a4=b1=b2=b3=b4=0; + match = sscanf(line, "<%*[tT]ime %*[bB]egin=\"%d.%d\"%*[^<]<clear/>%n",&a3,&a4,&plen) >= 2; + } + if (!match) { + plen=a1=a2=a3=a4=b1=b2=b3=b4=0; + match = sscanf(line, "<%*[tT]ime %*[bB]egin=\"%d:%d\"%*[^<]<clear/>%n",&a2,&a3,&plen) >= 2; + } + if (!match) { + plen=a1=a2=a3=a4=b1=b2=b3=b4=0; + match = sscanf(line, "<%*[tT]ime %*[bB]egin=\"%d:%d.%d\"%*[^<]<clear/>%n",&a2,&a3,&a4,&plen) >= 3; + } + if (!match) { + plen=a1=a2=a3=a4=b1=b2=b3=b4=0; + match = sscanf(line, "<%*[tT]ime %*[bB]egin=\"%d:%d:%d.%d\"%*[^<]<clear/>%n",&a1,&a2,&a3,&a4,&plen) >= 4; + } + if (!match) continue; current->start = a1*360000+a2*6000+a3*100+a4/10; current->end = b1*360000+b2*6000+b3*100+b4/10;

1 0

r37211 - trunk/libmpdemux/demux_ts.c
by reimar 27 May '14

27 May '14

Author: reimar Date: Tue May 27 21:22:10 2014 New Revision: 37211 Log: demux_ts: Pass through the stream pts. Copy-paste from MPEG-PS/PES demuxer. This helps making e.g. seeking more accurate. Modified: trunk/libmpdemux/demux_ts.c Modified: trunk/libmpdemux/demux_ts.c ============================================================================== --- trunk/libmpdemux/demux_ts.c Tue May 27 21:22:09 2014 (r37210) +++ trunk/libmpdemux/demux_ts.c Tue May 27 21:22:10 2014 (r37211) @@ -2715,8 +2715,12 @@ static int fill_packet(demuxer_t *demuxe } if(*dp) { + double stream_pts = MP_NOPTS_VALUE; ret = *dp_offset; resize_demux_packet(*dp, ret); //shrinked to the right size + if (ds == demuxer->video && + stream_control(demuxer->stream, STREAM_CTRL_GET_CURRENT_TIME, (void *)&stream_pts) != STREAM_UNSUPPORTED) + (*dp)->stream_pts = stream_pts; ds_add_packet(ds, *dp); mp_msg(MSGT_DEMUX, MSGL_DBG2, "ADDED %d bytes to %s fifo, PTS=%.3f\n", ret, (ds == demuxer->audio ? "audio" : (ds == demuxer->video ? "video" : "sub")), (*dp)->pts); if(si)

1 0

r37210 - trunk/libmpdemux/demuxer.c
by reimar 27 May '14

27 May '14

Author: reimar Date: Tue May 27 21:22:09 2014 New Revision: 37210 Log: demuxer: Fall back to asking the stream layer for length. The bitrate-based estimate seem to be easily 2x off for some blurays for example. Modified: trunk/libmpdemux/demuxer.c Modified: trunk/libmpdemux/demuxer.c ============================================================================== --- trunk/libmpdemux/demuxer.c Tue May 27 21:22:07 2014 (r37209) +++ trunk/libmpdemux/demuxer.c Tue May 27 21:22:09 2014 (r37210) @@ -1495,7 +1495,8 @@ double demuxer_get_time_length(demuxer_t sh_audio_t *sh_audio = demuxer->audio->sh; // <= 0 means DEMUXER_CTRL_NOTIMPL or DEMUXER_CTRL_DONTKNOW if (demux_control - (demuxer, DEMUXER_CTRL_GET_TIME_LENGTH, (void *) &get_time_ans) <= 0) { + (demuxer, DEMUXER_CTRL_GET_TIME_LENGTH, (void *) &get_time_ans) <= 0 && + stream_control(demuxer->stream, STREAM_CTRL_GET_TIME_LENGTH, (void *)&get_time_ans) != STREAM_OK) { if (sh_video && sh_video->i_bps && sh_audio && sh_audio->i_bps) get_time_ans = (double) (demuxer->movi_end - demuxer->movi_start) / (sh_video->i_bps +

1 0

r37209 - trunk/stream/stream_bluray.c
by reimar 27 May '14

27 May '14

Author: reimar Date: Tue May 27 21:22:07 2014 New Revision: 37209 Log: bluray: add some missing stream controls. Will all exact time-based seeking and displaying the correct time and duration. Modified: trunk/stream/stream_bluray.c Modified: trunk/stream/stream_bluray.c ============================================================================== --- trunk/stream/stream_bluray.c Tue May 27 15:52:52 2014 (r37208) +++ trunk/stream/stream_bluray.c Tue May 27 21:22:07 2014 (r37209) @@ -198,6 +198,25 @@ static int bluray_stream_control(stream_ return r ? 1 : STREAM_UNSUPPORTED; } + case STREAM_CTRL_GET_TIME_LENGTH: { + BLURAY_TITLE_INFO *ti = bd_get_title_info(b->bd, b->current_title, b->current_angle); + if (!ti) + return STREAM_UNSUPPORTED; + *(double *)arg = ti->duration / 90000.0; + return STREAM_OK; + } + + case STREAM_CTRL_GET_CURRENT_TIME: + *(double *)arg = bd_tell_time(b->bd) / 90000.0; + return STREAM_OK; + case STREAM_CTRL_SEEK_TO_TIME: { + int64_t res = bd_seek_time(b->bd, *(double*)arg * 90000.0); + if (res < 0) + return STREAM_ERROR; + s->pos = res; + return 1; + } + case STREAM_CTRL_GET_NUM_ANGLES: { BLURAY_TITLE_INFO *ti;

1 0

r37208 - trunk/configure
by michael 27 May '14

27 May '14

Author: michael Date: Tue May 27 15:52:52 2014 New Revision: 37208 Log: avx2 support to not break ffmpeg build Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Tue May 20 21:29:33 2014 (r37207) +++ trunk/configure Tue May 27 15:52:52 2014 (r37208) @@ -571,6 +571,7 @@ Advanced options: --enable-sse4 enable SSE4 [autodetect] --enable-sse42 enable SSE4.2 [autodetect] --enable-avx enable AVX [autodetect] + --enable-avx2 enable AVX2 [autodetect] --enable-xop enable XOP [autodetect] --enable-fma3 enable FMA3 [autodetect] --enable-shm enable shm [autodetect] @@ -630,6 +631,7 @@ _ssse3=auto _sse4_1=auto _sse4_2=auto _avx=auto +_avx2=auto _xop=auto _fma3=auto _cmov=auto @@ -1423,6 +1425,8 @@ for ac_option do --disable-sse42) _sse4_2=no;; --enable-avx) _avx=yes;; --disable-avx) _avx=no;; + --enable-avx2) _avx2=yes;; + --disable-avx2) _avx2=no;; --enable-xop) _xop=yes;; --disable-xop) _xop=no;; --enable-fma3) _fma3=yes;; @@ -1991,6 +1995,7 @@ EOF extcheck $_sse4_1 "sse4_1" "pmaxsb %%xmm0, %%xmm0" extcheck $_sse4_2 "sse4_2" "pcmpgtq %%xmm0, %%xmm0" extcheck $_avx "avx" "vpabsw %%xmm0, %%xmm0" + extcheck $_avx2 "avx2" "vextracti128 $0, %%ymm0, %%xmm0" extcheck $_xop "xop" "vpmacsdd %%xmm0, %%xmm1, %%xmm2, %%xmm3" extcheck $_fma3 "fma3" "vfmadd132ps %%ymm0, %%ymm1, %%ymm2" extcheck $_cmov "cmov" "cmovb %%eax, %%ebx" @@ -2676,6 +2681,7 @@ if test "$_runtime_cpudetection" = yes ; test "$_sse4_1" != no && _sse4_1=yes test "$_sse4_2" != no && _sse4_2=yes test "$_avx" != no && _avx=yes + test "$_avx2" != no && _avx2=yes test "$_xop" != no && _xop=yes test "$_fma3" != no && _fma3=yes test "$_mtrr" != no && _mtrr=yes @@ -3178,7 +3184,7 @@ if arm ; then echores "$_iwmmxt" fi -cpuexts_all='ALTIVEC XOP AVX FMA3 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 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' test "$_altivec" = yes && cpuexts="ALTIVEC $cpuexts" test "$_mmx" = yes && cpuexts="MMX $cpuexts" test "$_mmxext" = yes && cpuexts="MMX2 $cpuexts" @@ -3192,6 +3198,7 @@ test "$_ssse3" = yes && cpuexts="SSS test "$_sse4_1" = yes && cpuexts="SSE4 $cpuexts" test "$_sse4_2" = yes && cpuexts="SSE42 $cpuexts" test "$_avx" = yes && cpuexts="AVX $cpuexts" +test "$_avx2" = yes && cpuexts="AVX2 $cpuexts" test "$_xop" = yes && cpuexts="XOP $cpuexts" test "$_fma3" = yes && cpuexts="FMA3 $cpuexts" test "$_cmov" = yes && cpuexts="I686 $cpuexts"

1 0

r37207 - trunk/mencoder.c
by reimar 20 May '14

20 May '14

Author: reimar Date: Tue May 20 21:29:33 2014 New Revision: 37207 Log: mencoder: warn if audio format changes. This is not handled in any way currently and will fail completely. Modified: trunk/mencoder.c Modified: trunk/mencoder.c ============================================================================== --- trunk/mencoder.c Tue May 20 21:29:31 2014 (r37206) +++ trunk/mencoder.c Tue May 20 21:29:33 2014 (r37207) @@ -282,9 +282,14 @@ static int dec_audio(sh_audio_t *sh_audi int size=0; int at_eof=0; while(size<total && !at_eof){ + int res; int len=total-size; if(len>MAX_OUTBURST) len=MAX_OUTBURST; - if (mp_decode_audio(sh_audio, len) < 0) + res = mp_decode_audio(sh_audio, len); + if (res == -2) + mp_msg(MSGT_MENCODER, MSGL_FATAL, "Audio format change detected!\n" + "MEncoder currently cannot handle format changes - patches welcome!\n"); + if (res < 0) at_eof = 1; if(len>sh_audio->a_out_buffer_len) len=sh_audio->a_out_buffer_len; fast_memcpy(buffer+size,sh_audio->a_out_buffer,len);

1 0