From 1ff49c231436413830223e4b1b5692ba67464e6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Wed, 23 Mar 2011 12:26:58 +0200 Subject: [PATCH 01/12] configure: Add fork as a dependency to ffserver --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 316b849aa7..5c9d434f01 100755 --- a/configure +++ b/configure @@ -1471,7 +1471,7 @@ ffmpeg_select="buffer_filter" ffplay_deps="avcodec avformat swscale sdl" ffplay_select="rdft" ffprobe_deps="avcodec avformat" -ffserver_deps="avformat ffm_muxer rtp_protocol rtsp_demuxer" +ffserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer" ffserver_extralibs='$ldl' doc_deps="texi2html" From 8bb605c11fd745bad3b4a454cb8a5a37efa6bdd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Wed, 23 Mar 2011 13:13:31 +0200 Subject: [PATCH 02/12] configure: Remove the explicit disabling of ffserver It is automatically disabled on both mingw and dos due to the lack of fork. --- configure | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configure b/configure index 5c9d434f01..3b1a132f9b 100755 --- a/configure +++ b/configure @@ -2410,7 +2410,6 @@ case $target_os in LIBTARGET=arm-wince fi shlibdir_default="$bindir_default" - disable ffserver SLIBPREF="" SLIBSUF=".dll" SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)' @@ -2443,7 +2442,7 @@ case $target_os in check_cflags -fno-common ;; *-dos|freedos|opendos) - disable ffplay ffserver + disable ffplay disable $INDEV_LIST $OUTDEV_LIST network_extralibs="-lsocket" objformat="coff" From da21225ae2d1803450b054db0e5ae13064f6fbbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Wed, 23 Mar 2011 12:49:37 +0000 Subject: [PATCH 03/12] configure: Don't explicitly disable ffplay or in/outdevices on dos The normal dependency tracking system disables them just fine. --- configure | 2 -- 1 file changed, 2 deletions(-) diff --git a/configure b/configure index 3b1a132f9b..bb4f52cbca 100755 --- a/configure +++ b/configure @@ -2442,8 +2442,6 @@ case $target_os in check_cflags -fno-common ;; *-dos|freedos|opendos) - disable ffplay - disable $INDEV_LIST $OUTDEV_LIST network_extralibs="-lsocket" objformat="coff" enable dos_paths From cd256c3b89c14651b9ff75d9235f2c146fa48aba Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Thu, 24 Mar 2011 07:41:03 -0400 Subject: [PATCH 04/12] ffmetadec.c: fix compiler warnings. --- libavformat/ffmetadec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/ffmetadec.c b/libavformat/ffmetadec.c index a6cc858ab2..6915b60552 100644 --- a/libavformat/ffmetadec.c +++ b/libavformat/ffmetadec.c @@ -61,14 +61,14 @@ static AVChapter *read_chapter(AVFormatContext *s) if (sscanf(line, "TIMEBASE=%d/%d", &tb.num, &tb.den)) get_line(s->pb, line, sizeof(line)); - if (!sscanf(line, "START=%lld", &start)) { + if (!sscanf(line, "START=%"SCNd64, &start)) { av_log(s, AV_LOG_ERROR, "Expected chapter start timestamp, found %s.\n", line); start = (s->nb_chapters && s->chapters[s->nb_chapters - 1]->end != AV_NOPTS_VALUE) ? s->chapters[s->nb_chapters - 1]->end : 0; } else get_line(s->pb, line, sizeof(line)); - if (!sscanf(line, "END=%lld", &end)) { + if (!sscanf(line, "END=%"SCNd64, &end)) { av_log(s, AV_LOG_ERROR, "Expected chapter end timestamp, found %s.\n", line); end = AV_NOPTS_VALUE; } From f71142496931d264ceeedfaac399eba07b7c5def Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Thu, 24 Mar 2011 12:16:22 -0400 Subject: [PATCH 05/12] mpeg12.c: fix slice threading for mpeg2 field picture mode. Fixes "make THREADS=2 fate-mpeg2-field-enc". --- libavcodec/mpeg12.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index c60826b91b..c47b6e2877 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -1882,7 +1882,9 @@ static int slice_decode_thread(AVCodecContext *c, void *arg){ start_code= -1; buf = ff_find_start_code(buf, s->gb.buffer_end, &start_code); - mb_y= start_code - SLICE_MIN_START_CODE; + mb_y= (start_code - SLICE_MIN_START_CODE) << field_pic; + if (s->picture_structure == PICT_BOTTOM_FIELD) + mb_y++; if(mb_y < 0 || mb_y >= s->end_mb_y) return -1; } @@ -2299,6 +2301,16 @@ static int decode_chunks(AVCodecContext *avctx, break; case PICTURE_START_CODE: + if (avctx->thread_count > 1 && s->slice_count) { + int i; + + avctx->execute(avctx, slice_decode_thread, + s2->thread_context, NULL, + s->slice_count, sizeof(void*)); + for (i = 0; i < s->slice_count; i++) + s2->error_count += s2->thread_context[i]->error_count; + s->slice_count = 0; + } if(last_code == 0 || last_code == SLICE_MIN_START_CODE){ if(mpeg_decode_postinit(avctx) < 0){ av_log(avctx, AV_LOG_ERROR, "mpeg_decode_postinit() failure\n"); From f4855a904e4d3a12822739cda149262f98e8723a Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Wed, 9 Mar 2011 19:51:50 +0000 Subject: [PATCH 06/12] ac3enc: NEON optimised ac3_max_msb_abs_int16 and ac3_exponent_min --- libavcodec/ac3dsp.c | 2 ++ libavcodec/ac3dsp.h | 1 + libavcodec/arm/Makefile | 3 ++ libavcodec/arm/ac3dsp_init_arm.c | 35 +++++++++++++++++++ libavcodec/arm/ac3dsp_neon.S | 59 ++++++++++++++++++++++++++++++++ 5 files changed, 100 insertions(+) create mode 100644 libavcodec/arm/ac3dsp_init_arm.c create mode 100644 libavcodec/arm/ac3dsp_neon.S diff --git a/libavcodec/ac3dsp.c b/libavcodec/ac3dsp.c index db97229963..42b44f7db8 100644 --- a/libavcodec/ac3dsp.c +++ b/libavcodec/ac3dsp.c @@ -109,6 +109,8 @@ av_cold void ff_ac3dsp_init(AC3DSPContext *c, int bit_exact) c->ac3_rshift_int32 = ac3_rshift_int32_c; c->float_to_fixed24 = float_to_fixed24_c; + if (ARCH_ARM) + ff_ac3dsp_init_arm(c, bit_exact); if (HAVE_MMX) ff_ac3dsp_init_x86(c, bit_exact); } diff --git a/libavcodec/ac3dsp.h b/libavcodec/ac3dsp.h index ff132415b6..eeaa56cbbf 100644 --- a/libavcodec/ac3dsp.h +++ b/libavcodec/ac3dsp.h @@ -84,6 +84,7 @@ typedef struct AC3DSPContext { } AC3DSPContext; void ff_ac3dsp_init (AC3DSPContext *c, int bit_exact); +void ff_ac3dsp_init_arm(AC3DSPContext *c, int bit_exact); void ff_ac3dsp_init_x86(AC3DSPContext *c, int bit_exact); #endif /* AVCODEC_AC3DSP_H */ diff --git a/libavcodec/arm/Makefile b/libavcodec/arm/Makefile index d223703cfe..08697da29b 100644 --- a/libavcodec/arm/Makefile +++ b/libavcodec/arm/Makefile @@ -1,3 +1,4 @@ +OBJS-$(CONFIG_AC3DSP) += arm/ac3dsp_init_arm.o OBJS-$(CONFIG_DCA_DECODER) += arm/dcadsp_init_arm.o \ OBJS-$(CONFIG_VP5_DECODER) += arm/vp56dsp_init_arm.o @@ -46,6 +47,8 @@ NEON-OBJS-$(CONFIG_H264DSP) += arm/h264dsp_neon.o \ NEON-OBJS-$(CONFIG_H264PRED) += arm/h264pred_neon.o \ +NEON-OBJS-$(CONFIG_AC3DSP) += arm/ac3dsp_neon.o + NEON-OBJS-$(CONFIG_DCA_DECODER) += arm/dcadsp_neon.o \ arm/synth_filter_neon.o \ diff --git a/libavcodec/arm/ac3dsp_init_arm.c b/libavcodec/arm/ac3dsp_init_arm.c new file mode 100644 index 0000000000..a0fc97799c --- /dev/null +++ b/libavcodec/arm/ac3dsp_init_arm.c @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2011 Mans Rullgard + * + * This file is part of Libav. + * + * Libav is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * Libav is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with Libav; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include +#include "libavutil/attributes.h" +#include "libavcodec/ac3dsp.h" +#include "config.h" + +void ff_ac3_exponent_min_neon(uint8_t *exp, int num_reuse_blocks, int nb_coefs); +int ff_ac3_max_msb_abs_int16_neon(const int16_t *src, int len); + +av_cold void ff_ac3dsp_init_arm(AC3DSPContext *c, int bit_exact) +{ + if (HAVE_NEON) { + c->ac3_exponent_min = ff_ac3_exponent_min_neon; + c->ac3_max_msb_abs_int16 = ff_ac3_max_msb_abs_int16_neon; + } +} diff --git a/libavcodec/arm/ac3dsp_neon.S b/libavcodec/arm/ac3dsp_neon.S new file mode 100644 index 0000000000..e69a3c2013 --- /dev/null +++ b/libavcodec/arm/ac3dsp_neon.S @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2011 Mans Rullgard + * + * This file is part of Libav. + * + * Libav is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * Libav is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with Libav; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "asm.S" + +function ff_ac3_max_msb_abs_int16_neon, export=1 + vmov.i16 q0, #0 + vmov.i16 q2, #0 +1: vld1.16 {q1}, [r0,:128]! + vabs.s16 q1, q1 + vld1.16 {q3}, [r0,:128]! + vabs.s16 q3, q3 + vorr q0, q0, q1 + vorr q2, q2, q3 + subs r1, r1, #16 + bgt 1b + vorr q0, q0, q2 + vorr d0, d0, d1 + vpmax.u16 d0, d0, d0 + vpmax.u16 d0, d0, d0 + vmov.u16 r0, d0[0] + bx lr +endfunc + +function ff_ac3_exponent_min_neon, export=1 + cmp r1, #0 + bxeq lr + push {lr} + mov r12, #256 +1: + vld1.8 {q0}, [r0,:128] + mov lr, r1 + add r3, r0, #256 +2: vld1.8 {q1}, [r3,:128], r12 + subs lr, lr, #1 + vmin.u8 q0, q0, q1 + bgt 2b + subs r2, r2, #16 + vst1.8 {q0}, [r0,:128]! + bgt 1b + pop {pc} +endfunc From 245c78313fac79d3336f139fbca88c8d799f866a Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Sat, 12 Mar 2011 23:16:06 +0000 Subject: [PATCH 07/12] ac3enc: NEON optimised shift functions --- libavcodec/arm/ac3dsp_init_arm.c | 4 ++++ libavcodec/arm/ac3dsp_neon.S | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/libavcodec/arm/ac3dsp_init_arm.c b/libavcodec/arm/ac3dsp_init_arm.c index a0fc97799c..6874546c7c 100644 --- a/libavcodec/arm/ac3dsp_init_arm.c +++ b/libavcodec/arm/ac3dsp_init_arm.c @@ -25,11 +25,15 @@ void ff_ac3_exponent_min_neon(uint8_t *exp, int num_reuse_blocks, int nb_coefs); int ff_ac3_max_msb_abs_int16_neon(const int16_t *src, int len); +void ff_ac3_lshift_int16_neon(int16_t *src, unsigned len, unsigned shift); +void ff_ac3_rshift_int32_neon(int32_t *src, unsigned len, unsigned shift); av_cold void ff_ac3dsp_init_arm(AC3DSPContext *c, int bit_exact) { if (HAVE_NEON) { c->ac3_exponent_min = ff_ac3_exponent_min_neon; c->ac3_max_msb_abs_int16 = ff_ac3_max_msb_abs_int16_neon; + c->ac3_lshift_int16 = ff_ac3_lshift_int16_neon; + c->ac3_rshift_int32 = ff_ac3_rshift_int32_neon; } } diff --git a/libavcodec/arm/ac3dsp_neon.S b/libavcodec/arm/ac3dsp_neon.S index e69a3c2013..43d4e612af 100644 --- a/libavcodec/arm/ac3dsp_neon.S +++ b/libavcodec/arm/ac3dsp_neon.S @@ -57,3 +57,24 @@ function ff_ac3_exponent_min_neon, export=1 bgt 1b pop {pc} endfunc + +function ff_ac3_lshift_int16_neon, export=1 + vdup.16 q0, r2 +1: vld1.16 {q1}, [r0,:128] + vshl.s16 q1, q1, q0 + vst1.16 {q1}, [r0,:128]! + subs r1, r1, #8 + bgt 1b + bx lr +endfunc + +function ff_ac3_rshift_int32_neon, export=1 + rsb r2, r2, #0 + vdup.32 q0, r2 +1: vld1.32 {q1}, [r0,:128] + vshl.s32 q1, q1, q0 + vst1.32 {q1}, [r0,:128]! + subs r1, r1, #4 + bgt 1b + bx lr +endfunc From 2d3b21ffb91610f806a6c550dc142520d7a11e50 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Wed, 23 Mar 2011 01:45:43 +0000 Subject: [PATCH 08/12] ARM: NEON optimised apply_window_int16() Signed-off-by: Mans Rullgard --- libavcodec/arm/dsputil_init_neon.c | 5 +++++ libavcodec/arm/dsputil_neon.S | 23 +++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/libavcodec/arm/dsputil_init_neon.c b/libavcodec/arm/dsputil_init_neon.c index 2b283c4ac1..eb0bc575e8 100644 --- a/libavcodec/arm/dsputil_init_neon.c +++ b/libavcodec/arm/dsputil_init_neon.c @@ -168,6 +168,9 @@ int32_t ff_scalarproduct_int16_neon(const int16_t *v1, const int16_t *v2, int le int32_t ff_scalarproduct_and_madd_int16_neon(int16_t *v1, const int16_t *v2, const int16_t *v3, int len, int mul); +void ff_apply_window_int16_neon(int16_t *dst, const int16_t *src, + const int16_t *window, int n); + void ff_dsputil_init_neon(DSPContext *c, AVCodecContext *avctx) { if (!avctx->lowres) { @@ -319,4 +322,6 @@ void ff_dsputil_init_neon(DSPContext *c, AVCodecContext *avctx) c->scalarproduct_int16 = ff_scalarproduct_int16_neon; c->scalarproduct_and_madd_int16 = ff_scalarproduct_and_madd_int16_neon; + + c->apply_window_int16 = ff_apply_window_int16_neon; } diff --git a/libavcodec/arm/dsputil_neon.S b/libavcodec/arm/dsputil_neon.S index 140f5a0743..5b80e40d6f 100644 --- a/libavcodec/arm/dsputil_neon.S +++ b/libavcodec/arm/dsputil_neon.S @@ -789,3 +789,26 @@ NOVFP ldr r2, [sp] vst1.f32 {q9},[r0,:128]! bx lr endfunc + +function ff_apply_window_int16_neon, export=1 + push {r4,lr} + add r4, r1, r3, lsl #1 + add lr, r0, r3, lsl #1 + sub r4, r4, #16 + sub lr, lr, #16 + mov r12, #-16 +1: + vld1.16 {q0}, [r1,:128]! + vld1.16 {q2}, [r2,:128]! + vld1.16 {q1}, [r4,:128], r12 + vrev64.16 q3, q2 + vqrdmulh.s16 q0, q0, q2 + vqrdmulh.s16 d2, d2, d7 + vqrdmulh.s16 d3, d3, d6 + vst1.16 {q0}, [r0,:128]! + vst1.16 {q1}, [lr,:128], r12 + subs r3, r3, #16 + bgt 1b + + pop {r4,pc} +endfunc From 4a7e068b8fb15b646c465d360ee478e02d100ca4 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Sun, 6 Mar 2011 13:57:34 +0000 Subject: [PATCH 09/12] configure: check for --as-needed support early This moves the check for --as-needed linker support before all library tests, ensuring consistent behaviour between the checks and the actual link step. Signed-off-by: Mans Rullgard --- configure | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure b/configure index bb4f52cbca..38fd46074c 100755 --- a/configure +++ b/configure @@ -2722,6 +2722,8 @@ if enabled asm; then $nogas "GNU assembler not found, install gas-preprocessor" fi +check_ldflags -Wl,--as-needed + if check_func dlopen; then ldl= elif check_func dlopen -ldl; then @@ -2951,7 +2953,6 @@ enabled extra_warnings && check_cflags -Winline # add some linker flags check_ldflags -Wl,--warn-common -check_ldflags -Wl,--as-needed check_ldflags '-Wl,-rpath-link,\$(BUILD_ROOT)/libpostproc -Wl,-rpath-link,\$(BUILD_ROOT)/libswscale -Wl,-rpath-link,\$(BUILD_ROOT)/libavfilter -Wl,-rpath-link,\$(BUILD_ROOT)/libavdevice -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil' test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic From d743065e18c19b63591a5e3eb9aa8aeeeaefdb37 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Thu, 24 Mar 2011 20:22:34 +0000 Subject: [PATCH 10/12] ARM: fix ff_apply_window_int16_neon() prototype The length argument should be unsigned. No change in code. Signed-off-by: Mans Rullgard --- libavcodec/arm/dsputil_init_neon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/arm/dsputil_init_neon.c b/libavcodec/arm/dsputil_init_neon.c index eb0bc575e8..cd58011a2c 100644 --- a/libavcodec/arm/dsputil_init_neon.c +++ b/libavcodec/arm/dsputil_init_neon.c @@ -169,7 +169,7 @@ int32_t ff_scalarproduct_and_madd_int16_neon(int16_t *v1, const int16_t *v2, const int16_t *v3, int len, int mul); void ff_apply_window_int16_neon(int16_t *dst, const int16_t *src, - const int16_t *window, int n); + const int16_t *window, unsigned n); void ff_dsputil_init_neon(DSPContext *c, AVCodecContext *avctx) { From 5666a9f20c6ef2b207e0517c8eeb9556badf76a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= Date: Thu, 24 Mar 2011 12:18:35 +0100 Subject: [PATCH 11/12] When building for MinGW32 disable strict ANSI compliancy. When -std=c99 is used, GCC defines __STRICT_ANSI__ to hide non-ANSI interfaces; on MinGW32, when this macro is defined, some functions that are part of POSIX but not of Windows APIs are disabled, including strcasecmp(). Signed-off-by: Luca Barbato --- configure | 1 + 1 file changed, 1 insertion(+) diff --git a/configure b/configure index 38fd46074c..9b5d8552ce 100755 --- a/configure +++ b/configure @@ -2428,6 +2428,7 @@ case $target_os in check_cpp_condition _mingw.h "defined (__MINGW64_VERSION_MAJOR) || (__MINGW32_MAJOR_VERSION > 3) \ || (__MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION >= 15)" || die "ERROR: MinGW runtime version must be >= 3.15." + add_cppflags -U__STRICT_ANSI__ ;; cygwin*) target_os=cygwin From 98a7d560b4f835ba5b99b9974ee1a2c096198bea Mon Sep 17 00:00:00 2001 From: John Stebbins Date: Fri, 25 Mar 2011 00:34:18 +0100 Subject: [PATCH 12/12] matroskadec: set default duration for simple block When a normal Block is parsed, duration is initialized to AV_NOPTS_VALUE. If it is not changed, then the track's default duration is used. But for SimpleBlock, duration is initialized to 0 instead of AV_NOPTS_VALUE. This is due to the difference in how EBML_NEST vs EBML_PASS are processed. Setting duration to 0 leads eventually to wrongly estimate the frame duration in util.c Signed-off-by: Luca Barbato --- libavformat/matroskadec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 828d5787af..61a77abdf8 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1852,6 +1852,8 @@ static int matroska_parse_cluster(MatroskaDemuxContext *matroska) for (i=0; inb_elem; i++) if (blocks[i].bin.size > 0 && blocks[i].bin.data) { int is_keyframe = blocks[i].non_simple ? !blocks[i].reference : -1; + if (!blocks[i].non_simple) + blocks[i].duration = AV_NOPTS_VALUE; res=matroska_parse_block(matroska, blocks[i].bin.data, blocks[i].bin.size, blocks[i].bin.pos, cluster.timecode,