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

r37291 - trunk/configure
by al 28 Sep '14

28 Sep '14

Author: al Date: Sun Sep 28 20:38:41 2014 New Revision: 37291 Log: configure: Fix initialization of variable def_local_aligned_32 It contiained the #define of HAVE_LOCAL_ALIGNED_16 instead of HAVE_LOCAL_ALIGNED_32. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun Sep 28 14:21:42 2014 (r37290) +++ trunk/configure Sun Sep 28 20:38:41 2014 (r37291) @@ -2016,7 +2016,7 @@ def_fast_unaligned='#define HAVE_FAST_UN 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_16 0' +def_local_aligned_32='#define HAVE_LOCAL_ALIGNED_32 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' case "$host_arch" in

1 0

r37290 - trunk/libmpdemux/demux_lavf.c
by reimar 28 Sep '14

28 Sep '14

Author: reimar Date: Sun Sep 28 14:21:42 2014 New Revision: 37290 Log: demux_lavf: set stream_pts if possible. Modified: trunk/libmpdemux/demux_lavf.c Modified: trunk/libmpdemux/demux_lavf.c ============================================================================== --- trunk/libmpdemux/demux_lavf.c Sat Sep 27 20:44:47 2014 (r37289) +++ trunk/libmpdemux/demux_lavf.c Sun Sep 28 14:21:42 2014 (r37290) @@ -640,6 +640,7 @@ static int demux_lavf_fill_buffer(demuxe demux_packet_t *dp; demux_stream_t *ds; int id; + double stream_pts = MP_NOPTS_VALUE; mp_msg(MSGT_DEMUX,MSGL_DBG2,"demux_lavf_fill_buffer()\n"); demux->filepos=stream_tell(demux->stream); @@ -699,6 +700,9 @@ static int demux_lavf_fill_buffer(demuxe } dp->pos=demux->filepos; dp->flags= !!(pkt.flags&AV_PKT_FLAG_KEY); + if (ds == demux->video && + stream_control(demux->stream, STREAM_CTRL_GET_CURRENT_TIME, (void *)&stream_pts) != STREAM_UNSUPPORTED) + dp->stream_pts = stream_pts; // append packet to DS stream: ds_add_packet(ds,dp); return 1;

1 0

r37289 - in trunk/loader/dmo: DMO_VideoDecoder.c dmo.c
by reimar 27 Sep '14

27 Sep '14

Author: reimar Date: Sat Sep 27 20:44:47 2014 New Revision: 37289 Log: dmo: print messages to stderr instead of stdout. Modified: trunk/loader/dmo/DMO_VideoDecoder.c trunk/loader/dmo/dmo.c Modified: trunk/loader/dmo/DMO_VideoDecoder.c ============================================================================== --- trunk/loader/dmo/DMO_VideoDecoder.c Sat Sep 27 20:44:46 2014 (r37288) +++ trunk/loader/dmo/DMO_VideoDecoder.c Sat Sep 27 20:44:47 2014 (r37289) @@ -178,7 +178,7 @@ DMO_VideoDecoder * DMO_VideoDecoder_Open if (!this->m_pDMO_Filter) { - printf("Failed to create DMO filter\n"); + fprintf(stderr, "Failed to create DMO filter\n"); return 0; } @@ -190,7 +190,7 @@ DMO_VideoDecoder * DMO_VideoDecoder_Open result = this->m_pDMO_Filter->m_pMedia->vt->SetOutputType(this->m_pDMO_Filter->m_pMedia, 0, &this->m_sDestType, DMO_SET_TYPEF_TEST_ONLY); if (result) { - printf("Decoder does not support upside-down RGB frames\n"); + fprintf(stderr, "Decoder does not support upside-down RGB frames\n"); this->iv.m_obh.biHeight *= -1; this->m_sVhdr2->bmiHeader.biHeight = this->iv.m_obh.biHeight; } @@ -220,7 +220,7 @@ DMO_VideoDecoder * DMO_VideoDecoder_Open this->m_Caps = CAP_NONE; - printf("Decoder supports the following formats: "); + fprintf(stderr, "Decoder supports the following formats: "); for (c = check; c->bits; c++) { this->m_sVhdr2->bmiHeader.biBitCount = c->bits; @@ -232,16 +232,16 @@ DMO_VideoDecoder * DMO_VideoDecoder_Open { this->m_Caps = (this->m_Caps | c->cap); if (c->name) - printf("%s ", c->name); + fprintf(stderr, "%s ", c->name); else - printf("%.4s ", (char*) &c->fcc); + fprintf(stderr, "%.4s ", (char*) &c->fcc); } } - printf("\n"); + fprintf(stderr, "\n"); } if (this->m_Caps != CAP_NONE) - printf("Decoder is capable of YUV output (flags 0x%x)\n", (int)this->m_Caps); + fprintf(stderr, "Decoder is capable of YUV output (flags 0x%x)\n", (int)this->m_Caps); this->m_sVhdr2->bmiHeader.biBitCount = 24; this->m_sVhdr2->bmiHeader.biCompression = 0; @@ -326,9 +326,9 @@ int DMO_VideoDecoder_DecodeInternal(DMO_ { /* something for process */ if (result != S_FALSE) - printf("ProcessInputError r:0x%x=%d (keyframe: %d)\n", result, result, is_keyframe); + fprintf(stderr, "ProcessInputError r:0x%x=%d (keyframe: %d)\n", result, result, is_keyframe); else - printf("ProcessInputError FALSE ?? (keyframe: %d)\n", is_keyframe); + fprintf(stderr, "ProcessInputError FALSE ?? (keyframe: %d)\n", is_keyframe); return size; } @@ -342,9 +342,9 @@ int DMO_VideoDecoder_DecodeInternal(DMO_ 1, &db, &status); //m_pDMO_Filter->m_pMedia->vt->Lock(m_pDMO_Filter->m_pMedia, 0); if ((unsigned)result == DMO_E_NOTACCEPTING) - printf("ProcessOutputError: Not accepting\n"); + fprintf(stderr, "ProcessOutputError: Not accepting\n"); else if (result) - printf("ProcessOutputError: r:0x%x=%d %ld stat:%ld\n", result, result, status, db.dwStatus); + fprintf(stderr, "ProcessOutputError: r:0x%x=%d %ld stat:%ld\n", result, result, status, db.dwStatus); ((IMediaBuffer*)db.pBuffer)->vt->Release((IUnknown*)db.pBuffer); @@ -516,9 +516,9 @@ int DMO_VideoDecoder_SetDestFmt(DMO_Vide if (result != 0) { if (csp) - printf("Warning: unsupported color space\n"); + fprintf(stderr, "Warning: unsupported color space\n"); else - printf("Warning: unsupported bit depth\n"); + fprintf(stderr, "Warning: unsupported bit depth\n"); this->m_sDestType.lSampleSize = this->iv.m_decoder.biSizeImage; memcpy(&(this->m_sVhdr2->bmiHeader), &this->iv.m_decoder, sizeof(this->iv.m_decoder)); Modified: trunk/loader/dmo/dmo.c ============================================================================== --- trunk/loader/dmo/dmo.c Sat Sep 27 20:44:46 2014 (r37288) +++ trunk/loader/dmo/dmo.c Sat Sep 27 20:44:47 2014 (r37289) @@ -88,15 +88,15 @@ DMO_Filter* DMO_FilterCreate(const char* /* query for some extra available interface */ HRESULT r = object->vt->QueryInterface(object, &IID_IMediaObjectInPlace, (void*)&This->m_pInPlace); if (r == 0 && This->m_pInPlace) - printf("DMO dll supports InPlace - PLEASE REPORT to developer\n"); + fprintf(stderr, "DMO dll supports InPlace - PLEASE REPORT to developer\n"); r = object->vt->QueryInterface(object, &IID_IDMOVideoOutputOptimizations, (void*)&This->m_pOptim); if (r == 0 && This->m_pOptim) { unsigned long flags; r = This->m_pOptim->vt->QueryOperationModePreferences(This->m_pOptim, 0, &flags); - printf("DMO dll supports VO Optimizations %ld %lx\n", r, flags); + fprintf(stderr, "DMO dll supports VO Optimizations %ld %lx\n", r, flags); if (flags & DMO_VOSF_NEEDS_PREVIOUS_SAMPLE) - printf("DMO dll might use previous sample when requested\n"); + fprintf(stderr, "DMO dll might use previous sample when requested\n"); } } object->vt->Release((IUnknown*)object); @@ -159,7 +159,7 @@ DMO_Filter* DMO_FilterCreate(const char* if (em) { DMO_Filter_Destroy(This); - printf("IMediaObject ERROR: %p %s (0x%lx : %ld)\n", em, em ? em : "", hr, hr); + fprintf(stderr, "IMediaObject ERROR: %p %s (0x%lx : %ld)\n", em, em ? em : "", hr, hr); This = 0; } return This;

1 0

r37288 - trunk/loader/dmo/dmo.c
by reimar 27 Sep '14

27 Sep '14

Author: reimar Date: Sat Sep 27 20:44:46 2014 New Revision: 37288 Log: dmo.c: Remove cast that is not a good idea. Modified: trunk/loader/dmo/dmo.c Modified: trunk/loader/dmo/dmo.c ============================================================================== --- trunk/loader/dmo/dmo.c Sat Sep 27 20:44:45 2014 (r37287) +++ trunk/loader/dmo/dmo.c Sat Sep 27 20:44:46 2014 (r37288) @@ -62,7 +62,7 @@ DMO_Filter* DMO_FilterCreate(const char* em = "could not open DMO DLL"; break; } - func = (GETCLASS)GetProcAddress((unsigned)This->m_iHandle, "DllGetClassObject"); + func = (GETCLASS)GetProcAddress(This->m_iHandle, "DllGetClassObject"); if (!func) { em = "illegal or corrupt DMO DLL";

1 0

r37287 - trunk/loader/dmo/DMO_AudioDecoder.c
by reimar 27 Sep '14

27 Sep '14

Author: reimar Date: Sat Sep 27 20:44:45 2014 New Revision: 37287 Log: DMO_AudioDecoder: Disable some debug code. Modified: trunk/loader/dmo/DMO_AudioDecoder.c Modified: trunk/loader/dmo/DMO_AudioDecoder.c ============================================================================== --- trunk/loader/dmo/DMO_AudioDecoder.c Sat Sep 27 20:44:44 2014 (r37286) +++ trunk/loader/dmo/DMO_AudioDecoder.c Sat Sep 27 20:44:45 2014 (r37287) @@ -29,7 +29,7 @@ struct DMO_AudioDecoder #include <stdlib.h> #include "mp_msg.h" -#include "libmpdemux/aviprint.h" +//#include "libmpdemux/aviprint.h" typedef long STDCALL (*GETCLASS) (GUID*, GUID*, void**); @@ -84,8 +84,8 @@ DMO_AudioDecoder * DMO_AudioDecoder_Open this->m_sDestType.cbFormat=18; //pWF->cbSize; this->m_sDestType.pbFormat=this->m_sVhdr2; -print_wave_header((WAVEFORMATEX *)this->m_sVhdr, MSGL_V); -print_wave_header((WAVEFORMATEX *)this->m_sVhdr2, MSGL_V); +//print_wave_header((WAVEFORMATEX *)this->m_sVhdr, MSGL_V); +//print_wave_header((WAVEFORMATEX *)this->m_sVhdr2, MSGL_V); this->m_pDMO_Filter = DMO_FilterCreate(dllname, guid, &this->m_sOurType, &this->m_sDestType); if( !this->m_pDMO_Filter ) {

1 0

r37286 - trunk/codec-cfg.h
by reimar 27 Sep '14

27 Sep '14

Author: reimar Date: Sat Sep 27 20:44:44 2014 New Revision: 37286 Log: codec-cfg.h: Fix GUID type to be identical between 32 and 64 bit builds. Modified: trunk/codec-cfg.h Modified: trunk/codec-cfg.h ============================================================================== --- trunk/codec-cfg.h Thu Sep 18 22:22:31 2014 (r37285) +++ trunk/codec-cfg.h Sat Sep 27 20:44:44 2014 (r37286) @@ -50,7 +50,7 @@ extern char *codecs_file; #define GUID_TYPE 1 #define GUID_DEFINED 1 typedef struct { - unsigned long f1; + unsigned int f1; unsigned short f2; unsigned short f3; unsigned char f4[8];

1 0

r37285 - trunk/configure
by reimar 18 Sep '14

18 Sep '14

Author: reimar Date: Thu Sep 18 22:22:31 2014 New Revision: 37285 Log: configure: fix up some FFmpeg config.h defines, especially for ARM. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Wed Sep 17 20:16:22 2014 (r37284) +++ trunk/configure Thu Sep 18 22:22:31 2014 (r37285) @@ -2016,6 +2016,7 @@ def_fast_unaligned='#define HAVE_FAST_UN 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_16 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' case "$host_arch" in @@ -2026,6 +2027,7 @@ case "$host_arch" in 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' iproc=486 proc=i486 @@ -2280,6 +2282,7 @@ case "$host_arch" in 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_fast_64bit='#define HAVE_FAST_64BIT 1' iproc='x86_64' @@ -2415,6 +2418,12 @@ case "$host_arch" in arm*) arch='arm' 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' + test $_fast_clz = "auto" && _fast_clz=yes ;; avr32) @@ -2437,6 +2446,7 @@ case "$host_arch" in 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' iproc='ppc' if test "$host_arch" = "ppc64" ; then @@ -9156,6 +9166,7 @@ $def_gnu_as $def_ibm_asm $def_local_aligned_8 $def_local_aligned_16 +$def_local_aligned_32 $def_os2threads $def_pic $def_pthreads @@ -9248,9 +9259,6 @@ $def_truncf #define HAVE_ISATTY 0 #define HAVE_LDBRX 0 #define HAVE_LIBC_MSVCRT 0 -#define HAVE_LOCAL_ALIGNED_8 1 -#define HAVE_LOCAL_ALIGNED_16 1 -#define HAVE_LOCAL_ALIGNED_32 1 #define HAVE_LOCALTIME_R 0 #define HAVE_MACH_MACH_TIME_H 0 #define HAVE_MAPVIEWOFFILE 0

1 0

r37284 - trunk/stream/stream_bluray.c
by reimar 17 Sep '14

17 Sep '14

Author: reimar Date: Wed Sep 17 20:16:22 2014 New Revision: 37284 Log: bluray: Fix STREAM_CTRL_SEEK_TO_TIME for out-of-bound values. Modified: trunk/stream/stream_bluray.c Modified: trunk/stream/stream_bluray.c ============================================================================== --- trunk/stream/stream_bluray.c Wed Sep 17 20:00:19 2014 (r37283) +++ trunk/stream/stream_bluray.c Wed Sep 17 20:16:22 2014 (r37284) @@ -219,7 +219,14 @@ static int bluray_stream_control(stream_ *(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); + int64_t res; + double target = *(double*)arg * 90000.0; + BLURAY_TITLE_INFO *ti = bd_get_title_info(b->bd, b->current_title, b->current_angle); + // clamp to ensure that out-of-bounds seeks do not simply do nothing. + target = FFMAX(target, 0); + if (ti && ti->duration > 1) + target = FFMIN(target, ti->duration - 1); + res = bd_seek_time(b->bd, target); if (res < 0) return STREAM_ERROR; s->pos = res;

1 0

r37283 - trunk/stream/stream_bluray.c
by reimar 17 Sep '14

17 Sep '14

Author: reimar Date: Wed Sep 17 20:00:19 2014 New Revision: 37283 Log: bluray: fix seek implementation again. Modified: trunk/stream/stream_bluray.c Modified: trunk/stream/stream_bluray.c ============================================================================== --- trunk/stream/stream_bluray.c Wed Sep 17 19:49:55 2014 (r37282) +++ trunk/stream/stream_bluray.c Wed Sep 17 20:00:19 2014 (r37283) @@ -93,7 +93,9 @@ static int bluray_stream_seek(stream_t * p = bd_seek(b->bd, pos); // bd_seek does not say what happens on errors, // so be extra paranoid. - if (p < 0 || p != pos) { + // bd_seek also does not seek exactly to the requested + // position, so allow for some fuzz. + if (p < 0 || p > pos || p + 20*1024*1024 < pos) { s->pos = bd_tell(b->bd); return 0; }

1 0

r37282 - trunk/stream/stream_bluray.c
by reimar 17 Sep '14

17 Sep '14

Author: reimar Date: Wed Sep 17 19:49:55 2014 New Revision: 37282 Log: bluray: check bd_seek result more thoroughly. Also implement GET_SIZE stream control. Modified: trunk/stream/stream_bluray.c Modified: trunk/stream/stream_bluray.c ============================================================================== --- trunk/stream/stream_bluray.c Wed Sep 17 19:49:54 2014 (r37281) +++ trunk/stream/stream_bluray.c Wed Sep 17 19:49:55 2014 (r37282) @@ -91,8 +91,12 @@ static int bluray_stream_seek(stream_t * int64_t p; p = bd_seek(b->bd, pos); - if (p == -1) + // bd_seek does not say what happens on errors, + // so be extra paranoid. + if (p < 0 || p != pos) { + s->pos = bd_tell(b->bd); return 0; + } s->pos = p; return 1; @@ -205,6 +209,9 @@ static int bluray_stream_control(stream_ *(double *)arg = ti->duration / 90000.0; return STREAM_OK; } + case STREAM_CTRL_GET_SIZE: + *(uint64_t*)arg = bd_get_title_size(b->bd); + return STREAM_OK; case STREAM_CTRL_GET_CURRENT_TIME: *(double *)arg = bd_tell_time(b->bd) / 90000.0;

1 0