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

r37230 - trunk/libmpcodecs/ad_spdif.c
by reimar 28 Jun '14

28 Jun '14

Author: reimar Date: Sat Jun 28 21:57:15 2014 New Revision: 37230 Log: ad_spdif: do not call internal write_packet function directly. Use av_write_frame instead. Patch by Jan Andres [jandres gmx net]. Modified: trunk/libmpcodecs/ad_spdif.c Modified: trunk/libmpcodecs/ad_spdif.c ============================================================================== --- trunk/libmpcodecs/ad_spdif.c Mon Jun 23 13:48:21 2014 (r37229) +++ trunk/libmpcodecs/ad_spdif.c Sat Jun 28 21:57:15 2014 (r37230) @@ -265,7 +265,7 @@ static int decode_audio(sh_audio_t *sh, sh->pts = pts; sh->pts_bytes = 0; } - ret = lavf_ctx->oformat->write_packet(lavf_ctx, &pkt); + ret = av_write_frame(lavf_ctx, &pkt); if (ret < 0) break; }

1 0

r37229 - trunk/configure
by michael 23 Jun '14

23 Jun '14

Author: michael Date: Mon Jun 23 13:48:21 2014 New Revision: 37229 Log: configure: add CONFIG_BSWAPDSP to avoid build breakage Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Mon Jun 23 04:05:17 2014 (r37228) +++ trunk/configure Mon Jun 23 13:48:21 2014 (r37229) @@ -8651,6 +8651,7 @@ CONFIG_AANDCTTABLES = yes CONFIG_AUDIODSP = yes CONFIG_AUDIO_FRAME_QUEUE = yes CONFIG_BLOCKDSP= yes +CONFIG_BSWAPDSP= yes CONFIG_CABAC = yes CONFIG_DCT = yes CONFIG_DSPUTIL = yes @@ -9283,6 +9284,7 @@ $def_truncf #define CONFIG_AUDIODSP 1 #define CONFIG_AUDIO_FRAME_QUEUE 1 #define CONFIG_BLOCKDSP 1 +#define CONFIG_BSWAPDSP 1 #define CONFIG_DCT 1 #define CONFIG_DSPUTIL 1 #define CONFIG_DWT 1

1 0

r37228 - trunk/configure
by michael 23 Jun '14

23 Jun '14

Author: michael Date: Mon Jun 23 04:05:17 2014 New Revision: 37228 Log: configure: avoid build failure with mpeg_er Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun Jun 22 17:52:55 2014 (r37227) +++ trunk/configure Mon Jun 23 04:05:17 2014 (r37228) @@ -8678,6 +8678,7 @@ CONFIG_LPC = yes CONFIG_LSP = yes CONFIG_LZO = yes CONFIG_MDCT = yes +CONFIG_MPEG_ER = yes CONFIG_MPEGAUDIODSP = yes CONFIG_MPEGVIDEO = yes CONFIG_MPEGVIDEOENC = yes @@ -9299,6 +9300,7 @@ $def_truncf #define CONFIG_LPC 1 #define CONFIG_LZO 1 #define CONFIG_MDCT 1 +#define CONFIG_MPEG_ER 1 #define CONFIG_MPEGVIDEO 1 #define CONFIG_RDFT 1 #define CONFIG_RIFFDEC 1

1 0

r37227 - trunk/configure
by michael 22 Jun '14

22 Jun '14

Author: michael Date: Sun Jun 22 17:52:55 2014 New Revision: 37227 Log: configure: fix build before it breaks, add config_audiodsp Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Thu Jun 19 05:14:03 2014 (r37226) +++ trunk/configure Sun Jun 22 17:52:55 2014 (r37227) @@ -8648,6 +8648,7 @@ SLIBNAME_WITH_MAJOR = \$(SLIBNAME)-42 # Some FFmpeg codecs depend on these. Enable them unconditionally for now. CONFIG_AANDCTTABLES = yes +CONFIG_AUDIODSP = yes CONFIG_AUDIO_FRAME_QUEUE = yes CONFIG_BLOCKDSP= yes CONFIG_CABAC = yes @@ -9278,6 +9279,7 @@ $def_truncf /* Some FFmpeg codecs depend on these. Enable them unconditionally for now. */ #define CONFIG_AANDCTTABLES 1 +#define CONFIG_AUDIODSP 1 #define CONFIG_AUDIO_FRAME_QUEUE 1 #define CONFIG_BLOCKDSP 1 #define CONFIG_DCT 1

1 0

r37226 - trunk/configure
by michael 19 Jun '14

19 Jun '14

Author: michael Date: Thu Jun 19 05:14:03 2014 New Revision: 37226 Log: configure: add config_blockdsp to prevent ffmpeg build failure Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Fri Jun 13 18:46:55 2014 (r37225) +++ trunk/configure Thu Jun 19 05:14:03 2014 (r37226) @@ -8649,6 +8649,7 @@ SLIBNAME_WITH_MAJOR = \$(SLIBNAME)-42 # Some FFmpeg codecs depend on these. Enable them unconditionally for now. CONFIG_AANDCTTABLES = yes CONFIG_AUDIO_FRAME_QUEUE = yes +CONFIG_BLOCKDSP= yes CONFIG_CABAC = yes CONFIG_DCT = yes CONFIG_DSPUTIL = yes @@ -9278,6 +9279,7 @@ $def_truncf /* Some FFmpeg codecs depend on these. Enable them unconditionally for now. */ #define CONFIG_AANDCTTABLES 1 #define CONFIG_AUDIO_FRAME_QUEUE 1 +#define CONFIG_BLOCKDSP 1 #define CONFIG_DCT 1 #define CONFIG_DSPUTIL 1 #define CONFIG_DWT 1

1 0

r37225 - trunk/configure
by michael 13 Jun '14

13 Jun '14

Author: michael Date: Fri Jun 13 18:46:55 2014 New Revision: 37225 Log: configure: fix swscale build Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Tue Jun 10 20:12:20 2014 (r37224) +++ trunk/configure Fri Jun 13 18:46:55 2014 (r37225) @@ -9244,6 +9244,7 @@ $def_truncf #define CONFIG_SHARED 0 #define CONFIG_SMALL 0 #define CONFIG_SWSCALE_ALPHA 1 +#define SWS_MAX_FILTER_SIZE 256 #define CONFIG_VAAPI 0 #define HAVE_ALIGNED_STACK 1

1 0

r37224 - trunk/etc/codecs.conf
by compn 10 Jun '14

10 Jun '14

Author: compn Date: Tue Jun 10 20:12:20 2014 New Revision: 37224 Log: codecs.conf add ULH2 to utvideo, fixes trac 2191 Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Tue Jun 10 18:39:04 2014 (r37223) +++ trunk/etc/codecs.conf Tue Jun 10 20:12:20 2014 (r37224) @@ -2725,6 +2725,7 @@ videocodec ffutvideo info "FFmpeg Ut Video" status working fourcc ULRA,ULRG,ULY2,ULY0 + fourcc ULH2 driver ffmpeg dll utvideo out YV12,422P,RGB24,RGB32

1 0

r37223 - trunk/stream/tvi_v4l2.c
by iive 10 Jun '14

10 Jun '14

Author: iive Date: Tue Jun 10 18:39:04 2014 New Revision: 37223 Log: Allow building of v4l2 without clock_gettime(). Add overly verbose message in case monotone timestamps are required by the kernel. Modified: trunk/stream/tvi_v4l2.c Modified: trunk/stream/tvi_v4l2.c ============================================================================== --- trunk/stream/tvi_v4l2.c Tue Jun 10 17:41:02 2014 (r37222) +++ trunk/stream/tvi_v4l2.c Tue Jun 10 18:39:04 2014 (r37223) @@ -495,6 +495,7 @@ static int getstd(priv_t *priv) return 0; } +#if HAVE_CLOCK_GETTIME /* ** Gets current timestamp, using specified clock id. ** @return number of microseconds. @@ -505,6 +506,18 @@ static long long get_curr_timestamp(int clock_gettime(clk_id, &ts); return (long long)ts.tv_sec * 1000000 + ts.tv_nsec / 1000; } +#else +/* +** Gets current timestamp, using system time. +** @return number of microseconds. +*/ +static long long get_curr_timestamp(int clk_id) +{ + struct timeval tv; + gettimeofday(&tv, NULL); + return (long long)tv.tv_sec * 1000000 + tv.tv_usec; +} +#endif /***********************************************************************\ * * @@ -1549,8 +1562,13 @@ static int start(priv_t *priv) return 0; } priv->map[i].len = priv->map[i].buf.length; +#ifdef HAVE_CLOCK_GETTIME priv->clk_id = (priv->map[i].buf.flags & V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC) ? CLOCK_MONOTONIC : CLOCK_REALTIME; +#else + if (priv->map[i].buf.flags & V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC) + mp_msg(MSGT_TV, MSGL_WARN, "MPlayer compiled without clock_gettime() that is needed to handle monotone video timestamps from the kernel. Expect desync.\n"); +#endif /* count up to make sure this is correct everytime */ priv->mapcount++;

1 0

r37222 - trunk/stream/tvi_v4l2.c
by iive 10 Jun '14

10 Jun '14

Author: iive Date: Tue Jun 10 17:41:02 2014 New Revision: 37222 Log: Use correct type of timestamps when recording from v4l2. Fix #2176 Patch by Jarek Czekalski <jarekczek at poczta onet pl>. Modified: trunk/stream/tvi_v4l2.c Modified: trunk/stream/tvi_v4l2.c ============================================================================== --- trunk/stream/tvi_v4l2.c Tue Jun 10 15:37:20 2014 (r37221) +++ trunk/stream/tvi_v4l2.c Tue Jun 10 17:41:02 2014 (r37222) @@ -63,6 +63,11 @@ known issues: #include "tv.h" #include "audio_in.h" +// flag introduced in kernel 3.10 +#ifndef V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC +#define V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC 0x2000 +#endif + #define info tvi_info_v4l2 static tvi_handle_t *tvi_init_v4l2(tv_param_t* tv_param); /* information about this file */ @@ -109,8 +114,10 @@ typedef struct priv { struct map *map; int mapcount; int frames; - volatile long long first_frame; - long long curr_frame; + volatile long long first_frame; ///< number of useconds + long long curr_frame; ///< usec, using kernel timestamps + int clk_id; /**< clk_id from clock_gettime + used in frame timestamps */ /* audio video interleaving ;-) */ volatile int streamon; pthread_t audio_grabber_thread; @@ -488,6 +495,17 @@ static int getstd(priv_t *priv) return 0; } +/* +** Gets current timestamp, using specified clock id. +** @return number of microseconds. +*/ +static long long get_curr_timestamp(int clk_id) +{ + struct timespec ts; + clock_gettime(clk_id, &ts); + return (long long)ts.tv_sec * 1000000 + ts.tv_nsec / 1000; +} + /***********************************************************************\ * * * * @@ -1531,6 +1549,8 @@ static int start(priv_t *priv) return 0; } priv->map[i].len = priv->map[i].buf.length; + priv->clk_id = (priv->map[i].buf.flags & V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC) + ? CLOCK_MONOTONIC : CLOCK_REALTIME; /* count up to make sure this is correct everytime */ priv->mapcount++; @@ -1834,13 +1854,11 @@ static void read_doublespeed(priv_t *pri static void *audio_grabber(void *data) { priv_t *priv = (priv_t*)data; - struct timeval tv; int i, audio_skew_ptr = 0; long long current_time, prev_skew = 0, prev_skew_uncorr = 0; - long long start_time_avg; + long long start_time_avg, curr_timestamp; - gettimeofday(&tv, NULL); - start_time_avg = priv->audio_start_time = (long long)1e6*tv.tv_sec + tv.tv_usec; + start_time_avg = priv->audio_start_time = get_curr_timestamp(priv->clk_id); audio_in_start_capture(&priv->audio_in); for (i = 0; i < priv->aud_skew_cnt; i++) priv->audio_skew_buffer[i] = 0; @@ -1858,21 +1876,19 @@ static void *audio_grabber(void *data) pthread_mutex_lock(&priv->skew_mutex); if (priv->first_frame == 0) { // there is no first frame yet (unlikely to happen) - gettimeofday(&tv, NULL); - start_time_avg = priv->audio_start_time = (long long)1e6*tv.tv_sec + tv.tv_usec; + start_time_avg = priv->audio_start_time = get_curr_timestamp(priv->clk_id); // fprintf(stderr, "warning - first frame not yet available!\n"); pthread_mutex_unlock(&priv->skew_mutex); continue; } pthread_mutex_unlock(&priv->skew_mutex); - gettimeofday(&tv, NULL); - priv->audio_recv_blocks_total++; - current_time = (long long)1e6*tv.tv_sec + tv.tv_usec - priv->audio_start_time; + curr_timestamp = get_curr_timestamp(priv->clk_id); + current_time = curr_timestamp - priv->audio_start_time; if (priv->audio_recv_blocks_total < priv->aud_skew_cnt*2) { - start_time_avg += (long long)1e6*tv.tv_sec + tv.tv_usec - priv->audio_usecs_per_block*priv->audio_recv_blocks_total; + start_time_avg += curr_timestamp - priv->audio_usecs_per_block*priv->audio_recv_blocks_total; priv->audio_start_time = start_time_avg/(priv->audio_recv_blocks_total+1); }

1 0

r37221 - trunk/configure
by iive 10 Jun '14

10 Jun '14

Author: iive Date: Tue Jun 10 15:37:20 2014 New Revision: 37221 Log: Add clock_gettime() detection in configure. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Fri Jun 6 17:30:03 2014 (r37220) +++ trunk/configure Tue Jun 10 15:37:20 2014 (r37221) @@ -4174,6 +4174,14 @@ statement_check_broken stddef.h sys/time echores "$gettimeofday" +echocheck "clock_gettime()" +clock_gettime=no +def_clock_gettime='#undef HAVE_CLOCK_GETTIME' +statement_check_broken stddef.h time.h 'struct timespec tp; clock_gettime(CLOCK_MONOTONIC, &tp)' -lrt && + { clock_gettime=yes ; def_clock_gettime='#define HAVE_CLOCK_GETTIME 1' ; extra_ldflags="$extra_ldflags -lrt" ; } +echores "$clock_gettime" + + echocheck "glob()" # glob_win disables a Windows-specific glob() replacement. glob=yes @@ -8835,6 +8843,7 @@ $def_winsock2_h /* system functions */ $def_gethostbyname2 $def_gettimeofday +$def_clock_gettime $def_glob $def_langinfo $def_map_memalign

1 0