diff --git a/configure b/configure index df7cce79df..e709fcaea4 100755 --- a/configure +++ b/configure @@ -1488,7 +1488,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" @@ -2427,7 +2427,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)' @@ -2446,6 +2445,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 @@ -2460,8 +2460,6 @@ case $target_os in check_cflags -fno-common ;; *-dos|freedos|opendos) - disable ffplay ffserver - disable $INDEV_LIST $OUTDEV_LIST network_extralibs="-lsocket" objformat="coff" enable dos_paths @@ -2742,6 +2740,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 @@ -2976,7 +2976,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 diff --git a/libavcodec/ac3dsp.c b/libavcodec/ac3dsp.c index 9bfa7300e3..511a94f212 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 0a2dedf478..66dc32bd03 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..6874546c7c --- /dev/null +++ b/libavcodec/arm/ac3dsp_init_arm.c @@ -0,0 +1,39 @@ +/* + * 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); +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 new file mode 100644 index 0000000000..43d4e612af --- /dev/null +++ b/libavcodec/arm/ac3dsp_neon.S @@ -0,0 +1,80 @@ +/* + * 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 + +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 diff --git a/libavcodec/arm/dsputil_init_neon.c b/libavcodec/arm/dsputil_init_neon.c index 76ae632273..ef5b63bf18 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, unsigned 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 05a911502b..0dbf5ca48a 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 diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 30a6aaaf94..5db24e87fd 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -1924,7 +1924,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; } @@ -2342,6 +2344,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"); diff --git a/libavformat/ffmetadec.c b/libavformat/ffmetadec.c index cc7e1da48f..a8bffa09af 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; } diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 3358e038f5..2bb1215176 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1859,6 +1859,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,