From 73142e753381519de645a56e7d6994c77a3fd27f Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Sat, 6 Jul 2013 12:05:27 +0200 Subject: [PATCH 1/2] fifo: K&R formatting cosmetics --- libavutil/fifo.c | 52 ++++++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/libavutil/fifo.c b/libavutil/fifo.c index 26848999ec..dffaf54533 100644 --- a/libavutil/fifo.c +++ b/libavutil/fifo.c @@ -24,11 +24,11 @@ AVFifoBuffer *av_fifo_alloc(unsigned int size) { - AVFifoBuffer *f= av_mallocz(sizeof(AVFifoBuffer)); - if(!f) + AVFifoBuffer *f = av_mallocz(sizeof(AVFifoBuffer)); + if (!f) return NULL; f->buffer = av_malloc(size); - f->end = f->buffer + size; + f->end = f->buffer + size; av_fifo_reset(f); if (!f->buffer) av_freep(&f); @@ -37,7 +37,7 @@ AVFifoBuffer *av_fifo_alloc(unsigned int size) void av_fifo_free(AVFifoBuffer *f) { - if(f){ + if (f) { av_free(f->buffer); av_free(f); } @@ -59,12 +59,13 @@ int av_fifo_space(AVFifoBuffer *f) return f->end - f->buffer - av_fifo_size(f); } -int av_fifo_realloc2(AVFifoBuffer *f, unsigned int new_size) { - unsigned int old_size= f->end - f->buffer; +int av_fifo_realloc2(AVFifoBuffer *f, unsigned int new_size) +{ + unsigned int old_size = f->end - f->buffer; - if(old_size < new_size){ - int len= av_fifo_size(f); - AVFifoBuffer *f2= av_fifo_alloc(new_size); + if (old_size < new_size) { + int len = av_fifo_size(f); + AVFifoBuffer *f2 = av_fifo_alloc(new_size); if (!f2) return -1; @@ -72,45 +73,48 @@ int av_fifo_realloc2(AVFifoBuffer *f, unsigned int new_size) { f2->wptr += len; f2->wndx += len; av_free(f->buffer); - *f= *f2; + *f = *f2; av_free(f2); } return 0; } -// src must NOT be const as it can be a context for func that may need updating (like a pointer or byte counter) -int av_fifo_generic_write(AVFifoBuffer *f, void *src, int size, int (*func)(void*, void*, int)) +/* src must NOT be const as it can be a context for func that may need + * updating (like a pointer or byte counter) */ +int av_fifo_generic_write(AVFifoBuffer *f, void *src, int size, + int (*func)(void *, void *, int)) { int total = size; do { int len = FFMIN(f->end - f->wptr, size); - if(func) { - if(func(src, f->wptr, len) <= 0) + if (func) { + if (func(src, f->wptr, len) <= 0) break; } else { memcpy(f->wptr, src, len); - src = (uint8_t*)src + len; + src = (uint8_t *)src + len; } // Write memory barrier needed for SMP here in theory f->wptr += len; if (f->wptr >= f->end) f->wptr = f->buffer; f->wndx += len; - size -= len; + size -= len; } while (size > 0); return total - size; } - -int av_fifo_generic_read(AVFifoBuffer *f, void *dest, int buf_size, void (*func)(void*, void*, int)) +int av_fifo_generic_read(AVFifoBuffer *f, void *dest, int buf_size, + void (*func)(void *, void *, int)) { // Read memory barrier needed for SMP here in theory do { int len = FFMIN(f->end - f->rptr, buf_size); - if(func) func(dest, f->rptr, len); - else{ + if (func) + func(dest, f->rptr, len); + else { memcpy(dest, f->rptr, len); - dest = (uint8_t*)dest + len; + dest = (uint8_t *)dest + len; } // memory barrier needed for SMP here in theory av_fifo_drain(f, len); @@ -141,9 +145,9 @@ int main(void) av_fifo_generic_write(fifo, &i, sizeof(int), NULL); /* peek at FIFO */ - n = av_fifo_size(fifo)/sizeof(int); - for (i = -n+1; i < n; i++) { - int *v = (int *)av_fifo_peek2(fifo, i*sizeof(int)); + n = av_fifo_size(fifo) / sizeof(int); + for (i = -n + 1; i < n; i++) { + int *v = (int *)av_fifo_peek2(fifo, i * sizeof(int)); printf("%d: %d\n", i, *v); } printf("\n"); From 6516632967da5e6bd7d6136e8678f826669ed26e Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Tue, 2 Jul 2013 17:16:18 +0200 Subject: [PATCH 2/2] tests: Only run noproxy test if networking is enabled --- libavformat/Makefile | 5 +++-- tests/fate/libavformat.mak | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index 24b303e345..9d002a8e7f 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -383,11 +383,12 @@ SKIPHEADERS-$(CONFIG_NETWORK) += network.h rtsp.h EXAMPLES = metadata \ output \ -TESTPROGS = noproxy \ - seek \ +TESTPROGS = seek \ srtp \ url \ +TESTPROGS-$(CONFIG_NETWORK) += noproxy + TOOLS = aviocat \ ismindex \ pktdumper \ diff --git a/tests/fate/libavformat.mak b/tests/fate/libavformat.mak index 8332246949..d532adcb15 100644 --- a/tests/fate/libavformat.mak +++ b/tests/fate/libavformat.mak @@ -1,14 +1,14 @@ -FATE_LIBAVFORMAT += fate-noproxy +FATE_LIBAVFORMAT-$(CONFIG_NETWORK) += fate-noproxy fate-noproxy: libavformat/noproxy-test$(EXESUF) fate-noproxy: CMD = run libavformat/noproxy-test -FATE_LIBAVFORMAT += fate-srtp +FATE_LIBAVFORMAT-yes += fate-srtp fate-srtp: libavformat/srtp-test$(EXESUF) fate-srtp: CMD = run libavformat/srtp-test -FATE_LIBAVFORMAT += fate-url +FATE_LIBAVFORMAT-yes += fate-url fate-url: libavformat/url-test$(EXESUF) fate-url: CMD = run libavformat/url-test -FATE-$(CONFIG_AVFORMAT) += $(FATE_LIBAVFORMAT) +FATE-$(CONFIG_AVFORMAT) += $(FATE_LIBAVFORMAT-yes) fate-libavformat: $(FATE_LIBAVFORMAT)