From c19e0ebe532360aee043b5fb275257dc008968c3 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Thu, 21 Jun 2012 16:36:15 +0100 Subject: [PATCH 01/10] lavf: include libavutil/time.h instead of redeclaring av_gettime() This avoids some warnings about redundant declarations. Signed-off-by: Mans Rullgard --- libavformat/avformat.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 1c1aad652f..e292206c60 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -201,6 +201,10 @@ #include "avio.h" #include "libavformat/version.h" +#if FF_API_AV_GETTIME +#include "libavutil/time.h" +#endif + struct AVFormatContext; @@ -1635,10 +1639,6 @@ void av_dump_format(AVFormatContext *ic, const char *url, int is_output); -#if FF_API_AV_GETTIME -int64_t av_gettime(void); -#endif - /** * Return in 'buf' the path with '%d' replaced by a number. * From 539df61193f2452ddeb74999f0ae301d7a7318cc Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Thu, 21 Jun 2012 16:33:36 +0100 Subject: [PATCH 02/10] log: include unistd.h only when needed The only symbol this file uses from unistd.h is isatty(). By including the header only when this function is used, the file can be built on systems without unistd.h (which presumably also lack isatty). Signed-off-by: Mans Rullgard --- libavutil/log.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavutil/log.c b/libavutil/log.c index 5e841296bb..e4a9fec552 100644 --- a/libavutil/log.c +++ b/libavutil/log.c @@ -24,7 +24,11 @@ * logging functions */ +#include "config.h" + +#if HAVE_ISATTY #include +#endif #include #include "avstring.h" #include "avutil.h" From 542920b7f6d977dc29689b669b92a5cd82597785 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Thu, 21 Jun 2012 16:34:10 +0100 Subject: [PATCH 03/10] configure: check for unistd.h Signed-off-by: Mans Rullgard --- configure | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure b/configure index 14642faee9..a9fd94f999 100755 --- a/configure +++ b/configure @@ -1150,6 +1150,7 @@ HAVE_LIST=" threads trunc truncf + unistd_h vfp_args VirtualAlloc winsock2_h @@ -2866,6 +2867,7 @@ check_header sys/mman.h check_header sys/param.h check_header sys/resource.h check_header sys/select.h +check_header unistd.h check_header vdpau/vdpau.h check_header vdpau/vdpau_x11.h check_header X11/extensions/XvMClib.h From d11baad055857ef01e79a0499efbdcbad5c7e657 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Thu, 21 Jun 2012 16:54:02 +0100 Subject: [PATCH 04/10] lavu/file: include unistd.h only when available The unistd.h header is only needed for the close() declaration. If this header is not available, the close() declaration may be provided by another header, e.g. io.h. Signed-off-by: Mans Rullgard --- libavutil/file.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavutil/file.c b/libavutil/file.c index 77aaca0fc0..e1d0831994 100644 --- a/libavutil/file.c +++ b/libavutil/file.c @@ -20,7 +20,9 @@ #include "log.h" #include #include +#if HAVE_UNISTD_H #include +#endif #if HAVE_MMAP #include #elif HAVE_MAPVIEWOFFILE From a5a93fa8f5aad3a1e6e71b95eaef96b734ba0dd3 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Thu, 21 Jun 2012 11:44:53 +0200 Subject: [PATCH 05/10] cosmetics: do not use full path for local headers --- libavcodec/x86/rv40dsp_init.c | 2 +- libavutil/arm/float_dsp_init_arm.c | 2 +- libavutil/arm/float_dsp_init_vfp.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/x86/rv40dsp_init.c b/libavcodec/x86/rv40dsp_init.c index cc1ea45e88..e429cc3359 100644 --- a/libavcodec/x86/rv40dsp_init.c +++ b/libavcodec/x86/rv40dsp_init.c @@ -26,8 +26,8 @@ * 3,3 is bugged in the rv40 format and maps to _xy2 version */ -#include "libavcodec/x86/dsputil_mmx.h" #include "libavcodec/rv34dsp.h" +#include "dsputil_mmx.h" void ff_put_rv40_chroma_mc8_mmx (uint8_t *dst, uint8_t *src, int stride, int h, int x, int y); diff --git a/libavutil/arm/float_dsp_init_arm.c b/libavutil/arm/float_dsp_init_arm.c index a352becd0c..b133d32c9a 100644 --- a/libavutil/arm/float_dsp_init_arm.c +++ b/libavutil/arm/float_dsp_init_arm.c @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/arm/cpu.h" #include "libavutil/float_dsp.h" +#include "cpu.h" #include "float_dsp_arm.h" void ff_float_dsp_init_arm(AVFloatDSPContext *fdsp) diff --git a/libavutil/arm/float_dsp_init_vfp.c b/libavutil/arm/float_dsp_init_vfp.c index 30a9ce4ed7..ef808d8a5b 100644 --- a/libavutil/arm/float_dsp_init_vfp.c +++ b/libavutil/arm/float_dsp_init_vfp.c @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/arm/cpu.h" #include "libavutil/float_dsp.h" +#include "cpu.h" #include "float_dsp_arm.h" void ff_vector_fmul_vfp(float *dst, const float *src0, const float *src1, From 8875333707f43900c1a0fa54cca0789025dde70b Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Thu, 21 Jun 2012 21:11:23 +0000 Subject: [PATCH 06/10] utvideo: Fix interlaced prediction for RGB utvideo. Signed-off-by: Derek Buitenhuis --- libavcodec/utvideo.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/libavcodec/utvideo.c b/libavcodec/utvideo.c index a3b0d7cf01..e5efa4a7ec 100644 --- a/libavcodec/utvideo.c +++ b/libavcodec/utvideo.c @@ -439,10 +439,17 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, plane_start[i], c->frame_pred == PRED_LEFT); if (ret) return ret; - if (c->frame_pred == PRED_MEDIAN) - restore_median(c->pic.data[0] + rgb_order[i], c->planes, - c->pic.linesize[0], avctx->width, avctx->height, - c->slices, 0); + if (c->frame_pred == PRED_MEDIAN) { + if (!c->interlaced) { + restore_median(c->pic.data[0] + rgb_order[i], c->planes, + c->pic.linesize[0], avctx->width, + avctx->height, c->slices, 0); + } else { + restore_median_il(c->pic.data[0] + rgb_order[i], c->planes, + c->pic.linesize[0], avctx->width, + avctx->height, c->slices, 0); + } + } } restore_rgb_planes(c->pic.data[0], c->planes, c->pic.linesize[0], avctx->width, avctx->height); From f6b4624fcf9a8f4966b495b9c769ff0796839d57 Mon Sep 17 00:00:00 2001 From: Hendrik Leppkes Date: Thu, 21 Jun 2012 21:11:24 +0000 Subject: [PATCH 07/10] utvideo: mark interlaced frames as such Signed-off-by: Michael Niedermayer Signed-off-by: Derek Buitenhuis --- libavcodec/utvideo.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/utvideo.c b/libavcodec/utvideo.c index e5efa4a7ec..471d85adc3 100644 --- a/libavcodec/utvideo.c +++ b/libavcodec/utvideo.c @@ -499,6 +499,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, c->pic.key_frame = 1; c->pic.pict_type = AV_PICTURE_TYPE_I; + c->pic.interlaced_frame = !!c->interlaced; + *data_size = sizeof(AVFrame); *(AVFrame*)data = c->pic; From d3d3a32c9d389cc0d6a91b389988a225ae01c948 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Thu, 21 Jun 2012 17:00:25 +0100 Subject: [PATCH 08/10] lavu: add av_usleep() function This function implements a delay using the first available of the following functions: - nanosleep() - usleep() - Sleep() (Windows) The conditional #includes in time.c are simplified by including unistd.h and windows.h whenever they are available rather than having these lines triggered by specific functions. Signed-off-by: Mans Rullgard --- configure | 7 +++++++ doc/APIchanges | 3 +++ libavutil/avutil.h | 2 +- libavutil/time.c | 24 +++++++++++++++++++++++- libavutil/time.h | 10 ++++++++++ 5 files changed, 44 insertions(+), 2 deletions(-) diff --git a/configure b/configure index a9fd94f999..aa1856d673 100755 --- a/configure +++ b/configure @@ -1113,6 +1113,7 @@ HAVE_LIST=" memalign mkstemp mmap + nanosleep netinet_sctp_h poll_h posix_memalign @@ -1123,6 +1124,7 @@ HAVE_LIST=" sdl_video_size setmode setrlimit + Sleep sndio_h socklen_t soundcard_h @@ -1151,8 +1153,10 @@ HAVE_LIST=" trunc truncf unistd_h + usleep vfp_args VirtualAlloc + windows_h winsock2_h xform_asm xmm_clobbers @@ -2851,12 +2855,14 @@ check_func strtok_r check_func sched_getaffinity check_func sysconf check_func sysctl +check_func usleep check_func_headers io.h setmode check_lib2 "windows.h psapi.h" GetProcessMemoryInfo -lpsapi check_func_headers windows.h GetProcessAffinityMask check_func_headers windows.h GetProcessTimes check_func_headers windows.h GetSystemTimeAsFileTime check_func_headers windows.h MapViewOfFile +check_func_headers windows.h Sleep check_func_headers windows.h VirtualAlloc check_header dlfcn.h @@ -2870,6 +2876,7 @@ check_header sys/select.h check_header unistd.h check_header vdpau/vdpau.h check_header vdpau/vdpau_x11.h +check_header windows.h check_header X11/extensions/XvMClib.h disabled zlib || check_lib zlib.h zlibVersion -lz || disable zlib diff --git a/doc/APIchanges b/doc/APIchanges index 85db9033cb..b84c7ae85c 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -13,6 +13,9 @@ libavutil: 2011-04-18 API changes, most recent first: +2012-06-22 - xxxxxxx - lavu 51.34.0 + Add av_usleep() + 2012-06-20 - ae0a301 - lavu 51.33.0 Move av_gettime() to libavutil, add libavutil/time.h diff --git a/libavutil/avutil.h b/libavutil/avutil.h index ce73754ead..351e8279ac 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -152,7 +152,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 51 -#define LIBAVUTIL_VERSION_MINOR 33 +#define LIBAVUTIL_VERSION_MINOR 34 #define LIBAVUTIL_VERSION_MICRO 0 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ diff --git a/libavutil/time.c b/libavutil/time.c index 80c4029d9b..51779c5d17 100644 --- a/libavutil/time.c +++ b/libavutil/time.c @@ -20,13 +20,19 @@ #include #include +#include #if HAVE_GETTIMEOFDAY #include -#elif HAVE_GETSYSTEMTIMEASFILETIME +#endif +#if HAVE_UNISTD_H +#include +#endif +#if HAVE_WINDOWS_H #include #endif #include "libavutil/time.h" +#include "error.h" int64_t av_gettime(void) { @@ -44,3 +50,19 @@ int64_t av_gettime(void) return -1; #endif } + +int av_usleep(unsigned usec) +{ +#if HAVE_NANOSLEEP + struct timespec ts = { usec / 1000000, usec % 1000000 * 1000 }; + while (nanosleep(&ts, &ts) < 0 && errno == EINTR); + return 0; +#elif HAVE_USLEEP + return usleep(usec); +#elif HAVE_SLEEP + Sleep(usec / 1000); + return 0; +#else + return AVERROR(ENOSYS); +#endif +} diff --git a/libavutil/time.h b/libavutil/time.h index 2ee7e08caf..b01a97d770 100644 --- a/libavutil/time.h +++ b/libavutil/time.h @@ -26,4 +26,14 @@ */ int64_t av_gettime(void); +/** + * Sleep for a period of time. Although the duration is expressed in + * microseconds, the actual delay may be rounded to the precision of the + * system timer. + * + * @param usec Number of microseconds to sleep. + * @return zero on success or (negative) error code. + */ +int av_usleep(unsigned usec); + #endif /* AVUTIL_TIME_H */ From 896bb0d742a513b1bb5b9a770dbffd2cd436bed6 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Thu, 21 Jun 2012 20:31:44 +0100 Subject: [PATCH 09/10] Replace usleep() calls with av_usleep() This reduces the dependency on unistd.h which is not available on all systems. Signed-off-by: Mans Rullgard --- avconv.c | 8 ++++---- avplay.c | 4 ++-- libavformat/avio.c | 5 ++--- libavformat/hls.c | 4 ++-- libavformat/hlsproto.c | 4 ++-- libavformat/rtmphttp.c | 5 ++--- tools/aviocat.c | 4 ++-- tools/pktdumper.c | 3 ++- 8 files changed, 18 insertions(+), 19 deletions(-) diff --git a/avconv.c b/avconv.c index 7abf10d7b0..bc6a8fbe06 100644 --- a/avconv.c +++ b/avconv.c @@ -27,7 +27,6 @@ #include #include #include -#include #include "libavformat/avformat.h" #include "libavdevice/avdevice.h" #include "libswscale/swscale.h" @@ -45,6 +44,7 @@ #include "libavutil/avstring.h" #include "libavutil/libm.h" #include "libavutil/imgutils.h" +#include "libavutil/time.h" #include "libavformat/os_support.h" # include "libavfilter/avfilter.h" @@ -1876,7 +1876,7 @@ static void rate_emu_sleep(InputStream *ist) int64_t pts = av_rescale(ist->last_dts, 1000000, AV_TIME_BASE); int64_t now = av_gettime() - ist->start; if (pts > now) - usleep(pts - now); + av_usleep(pts - now); } } @@ -2793,7 +2793,7 @@ static void *input_thread(void *arg) ret = av_read_frame(f->ctx, &pkt); if (ret == AVERROR(EAGAIN)) { - usleep(10000); + av_usleep(10000); ret = 0; continue; } else if (ret < 0) @@ -2948,7 +2948,7 @@ static int transcode(void) if (no_packet_count) { no_packet_count = 0; memset(no_packet, 0, nb_input_files); - usleep(10000); + av_usleep(10000); continue; } av_log(NULL, AV_LOG_VERBOSE, "No more inputs to read from, finishing.\n"); diff --git a/avplay.c b/avplay.c index e9389ffe65..6acb6c10e8 100644 --- a/avplay.c +++ b/avplay.c @@ -31,6 +31,7 @@ #include "libavutil/dict.h" #include "libavutil/parseutils.h" #include "libavutil/samplefmt.h" +#include "libavutil/time.h" #include "libavformat/avformat.h" #include "libavdevice/avdevice.h" #include "libswscale/swscale.h" @@ -54,7 +55,6 @@ #undef main /* We don't want SDL to override our main() */ #endif -#include #include const char program_name[] = "avplay"; @@ -952,7 +952,7 @@ static int refresh_thread(void *opaque) is->refresh = 1; SDL_PushEvent(&event); } - usleep(is->audio_st && is->show_audio ? rdftspeed * 1000 : 5000); // FIXME ideally we should wait the correct time but SDLs event passing is so slow it would be silly + av_usleep(is->audio_st && is->show_audio ? rdftspeed * 1000 : 5000); // FIXME ideally we should wait the correct time but SDLs event passing is so slow it would be silly } return 0; } diff --git a/libavformat/avio.c b/libavformat/avio.c index 371500e8a6..5acaf30e90 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -19,11 +19,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include - #include "libavutil/avstring.h" #include "libavutil/dict.h" #include "libavutil/opt.h" +#include "libavutil/time.h" #include "os_support.h" #include "avformat.h" #if CONFIG_NETWORK @@ -237,7 +236,7 @@ static inline int retry_transfer_wrapper(URLContext *h, unsigned char *buf, int if (fast_retries) fast_retries--; else - usleep(1000); + av_usleep(1000); } else if (ret < 1) return ret < 0 ? ret : len; if (ret) diff --git a/libavformat/hls.c b/libavformat/hls.c index e876735468..253463edf6 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -30,9 +30,9 @@ #include "libavutil/mathematics.h" #include "libavutil/opt.h" #include "libavutil/dict.h" +#include "libavutil/time.h" #include "avformat.h" #include "internal.h" -#include #include "avio_internal.h" #include "url.h" @@ -407,7 +407,7 @@ reload: while (av_gettime() - v->last_load_time < reload_interval) { if (ff_check_interrupt(c->interrupt_callback)) return AVERROR_EXIT; - usleep(100*1000); + av_usleep(100*1000); } /* Enough time has elapsed since the last reload */ goto reload; diff --git a/libavformat/hlsproto.c b/libavformat/hlsproto.c index 044b7ffe98..179bdf1967 100644 --- a/libavformat/hlsproto.c +++ b/libavformat/hlsproto.c @@ -26,11 +26,11 @@ */ #include "libavutil/avstring.h" +#include "libavutil/time.h" #include "avformat.h" #include "internal.h" #include "url.h" #include "version.h" -#include /* * An apple http stream consists of a playlist with media segment files, @@ -308,7 +308,7 @@ retry: while (av_gettime() - s->last_load_time < reload_interval) { if (ff_check_interrupt(&h->interrupt_callback)) return AVERROR_EXIT; - usleep(100*1000); + av_usleep(100*1000); } goto retry; } diff --git a/libavformat/rtmphttp.c b/libavformat/rtmphttp.c index 544b493500..499341a173 100644 --- a/libavformat/rtmphttp.c +++ b/libavformat/rtmphttp.c @@ -24,11 +24,10 @@ * RTMP HTTP protocol */ -#include - #include "libavutil/avstring.h" #include "libavutil/intfloat.h" #include "libavutil/opt.h" +#include "libavutil/time.h" #include "internal.h" #include "http.h" @@ -126,7 +125,7 @@ static int rtmp_http_read(URLContext *h, uint8_t *buf, int size) if (rt->nb_bytes_read == 0) { /* Wait 50ms before retrying to read a server reply in * order to reduce the number of idle requets. */ - usleep(50000); + av_usleep(50000); } if ((ret = rtmp_http_write(h, "", 1)) < 0) diff --git a/tools/aviocat.c b/tools/aviocat.c index f5da526ba9..52a96bde2f 100644 --- a/tools/aviocat.c +++ b/tools/aviocat.c @@ -20,8 +20,8 @@ #include #include -#include +#include "libavutil/time.h" #include "libavformat/avformat.h" static int usage(const char *argv0, int ret) @@ -82,7 +82,7 @@ int main(int argc, char **argv) if (bps) { avio_flush(output); while ((av_gettime() - start_time) * bps / AV_TIME_BASE < stream_pos) - usleep(50 * 1000); + av_usleep(50 * 1000); } } diff --git a/tools/pktdumper.c b/tools/pktdumper.c index c3a3a218ef..d23cd9674f 100644 --- a/tools/pktdumper.c +++ b/tools/pktdumper.c @@ -25,6 +25,7 @@ #include #include +#include "libavutil/time.h" #include "libavformat/avformat.h" #define PKTFILESUFF "_%08" PRId64 "_%02d_%010" PRId64 "_%06d_%c.bin" @@ -122,7 +123,7 @@ int main(int argc, char **argv) avformat_close_input(&fctx); while (donotquit) - usleep(60 * 1000000); + av_usleep(60 * 1000000); return 0; } From 9ee3334840c0d8564ca73dbfd6cd5a01bcdca79b Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Thu, 21 Jun 2012 09:19:23 +0200 Subject: [PATCH 10/10] libspeexenc: add supported sample rates and channel layouts. --- libavcodec/libspeexenc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavcodec/libspeexenc.c b/libavcodec/libspeexenc.c index faf470eb6c..8a869a0973 100644 --- a/libavcodec/libspeexenc.c +++ b/libavcodec/libspeexenc.c @@ -67,6 +67,8 @@ #include #include #include + +#include "libavutil/audioconvert.h" #include "libavutil/opt.h" #include "avcodec.h" #include "internal.h" @@ -334,6 +336,10 @@ AVCodec ff_libspeex_encoder = { .capabilities = CODEC_CAP_DELAY, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, + .channel_layouts = (const uint64_t[]){ AV_CH_LAYOUT_MONO, + AV_CH_LAYOUT_STEREO, + 0 }, + .supported_samplerates = (const int[]){ 8000, 16000, 32000, 0 }, .long_name = NULL_IF_CONFIG_SMALL("libspeex Speex"), .priv_class = &class, .defaults = defaults,