July 2009 - FFmpeg-soc - lists.ffmpeg.org

[soc]: r4834 - in amr: amr-ffmpeg.diff amrnbdata.h amrnbdec.c
by cmcq 29 Jul '09

29 Jul '09

Author: cmcq Date: Wed Jul 29 14:28:57 2009 New Revision: 4834 Log: Adopt the new names for the floating-point source files Modified: amr/amr-ffmpeg.diff amr/amrnbdata.h amr/amrnbdec.c Modified: amr/amr-ffmpeg.diff ============================================================================== --- amr/amr-ffmpeg.diff Wed Jul 29 14:26:19 2009 (r4833) +++ amr/amr-ffmpeg.diff Wed Jul 29 14:28:57 2009 (r4834) @@ -6,7 +6,7 @@ Index: libavcodec/Makefile OBJS-$(CONFIG_AC3_ENCODER) += ac3enc.o ac3tab.o ac3.o OBJS-$(CONFIG_ALAC_DECODER) += alac.o OBJS-$(CONFIG_ALAC_ENCODER) += alacenc.o lpc.o -+OBJS-$(CONFIG_AMRNB_DECODER) += amrnbfloatdec.o qcelp_lsp.o celp_filters.o celp_math.o acelp_filters.o acelp_vectors.o ++OBJS-$(CONFIG_AMRNB_DECODER) += amrnbdec.o qcelp_lsp.o celp_filters.o celp_math.o acelp_filters.o acelp_vectors.o OBJS-$(CONFIG_AMV_DECODER) += sp5xdec.o mjpegdec.o mjpeg.o OBJS-$(CONFIG_APE_DECODER) += apedec.o OBJS-$(CONFIG_ASV1_DECODER) += asv1.o mpeg12data.o Modified: amr/amrnbdata.h ============================================================================== --- amr/amrnbdata.h Wed Jul 29 14:26:19 2009 (r4833) +++ amr/amrnbdata.h Wed Jul 29 14:28:57 2009 (r4834) @@ -22,12 +22,12 @@ /** - * @file libavcodec/amrnbfloatdata.h + * @file libavcodec/amrnbdata.h * AMR narrowband data and definitions */ -#ifndef AVCODEC_AMRNBFLOATDATA_H -#define AVCODEC_AMRNBFLOATDATA_H +#ifndef AVCODEC_AMRNBDATA_H +#define AVCODEC_AMRNBDATA_H #include <stdint.h> @@ -2362,5 +2362,5 @@ static const float *formant_low_d = form /**************************** end of tables *****************************/ -#endif /* AVCODEC_AMRNBFLOATDATA_H */ +#endif /* AVCODEC_AMRNBDATA_H */ Modified: amr/amrnbdec.c ============================================================================== --- amr/amrnbdec.c Wed Jul 29 14:26:19 2009 (r4833) +++ amr/amrnbdec.c Wed Jul 29 14:28:57 2009 (r4834) @@ -1,5 +1,5 @@ /* - * AMR narrowband decoder (floating point) + * AMR narrowband decoder * Copyright (c) 2006-2007 Robert Swain * Copyright (c) 2009 Colin McQuillan * @@ -22,7 +22,7 @@ /** - * @file libavcodec/amrnbfloatdec.c + * @file libavcodec/amrnbdec.c * AMR narrowband decoder (floating point) */ @@ -37,7 +37,7 @@ #include "celp_filters.h" #include "acelp_filters.h" #include "acelp_vectors.h" -#include "amrnbfloatdata.h" +#include "amrnbdata.h" void ff_celp_lspf2lpc(const double *lspf, float *lpc);

1 0

[soc]: r4832 - in amr: amrdata.h amrfixeddata.h amrnbdec.c amrnbfixeddec.c
by cmcq 29 Jul '09

29 Jul '09

Author: cmcq Date: Wed Jul 29 14:25:09 2009 New Revision: 4832 Log: The fixed-point decoder isn't being developed, so move it out the way. #include changes will follow in a separate patch Added: amr/amrfixeddata.h (props changed) - copied unchanged from r4831, amr/amrdata.h amr/amrnbfixeddec.c (props changed) - copied unchanged from r4831, amr/amrnbdec.c Deleted: amr/amrdata.h amr/amrnbdec.c

1 0

[soc]: r4831 - in amr: amrnbfloatdata.h amrnbfloatdec.c
by cmcq 29 Jul '09

29 Jul '09

Author: cmcq Date: Wed Jul 29 13:58:37 2009 New Revision: 4831 Log: cmcq wrote the postfilter code so add a copyright message Modified: amr/amrnbfloatdata.h amr/amrnbfloatdec.c Modified: amr/amrnbfloatdata.h ============================================================================== --- amr/amrnbfloatdata.h Wed Jul 29 13:45:23 2009 (r4830) +++ amr/amrnbfloatdata.h Wed Jul 29 13:58:37 2009 (r4831) @@ -1,6 +1,7 @@ /* * AMR narrowband data and definitions * Copyright (c) 2006-2007 Robert Swain + * Copyright (c) 2009 Colin McQuillan * * This file is part of FFmpeg. * Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Wed Jul 29 13:45:23 2009 (r4830) +++ amr/amrnbfloatdec.c Wed Jul 29 13:58:37 2009 (r4831) @@ -1,6 +1,7 @@ /* * AMR narrowband decoder (floating point) * Copyright (c) 2006-2007 Robert Swain + * Copyright (c) 2009 Colin McQuillan * * This file is part of FFmpeg. *

1 0

[soc]: r4830 - amr/amrnbfloatdec.c
by cmcq 29 Jul '09

29 Jul '09

Author: cmcq Date: Wed Jul 29 13:45:23 2009 New Revision: 4830 Log: offsetof is no longer used in amrnbfloatdec.c (except through #defines) Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Wed Jul 29 13:43:55 2009 (r4829) +++ amr/amrnbfloatdec.c Wed Jul 29 13:45:23 2009 (r4830) @@ -26,7 +26,6 @@ */ -#include <stddef.h> #include <string.h> #include <math.h>

1 0

[soc]: r4829 - amr/amrnbfloatdata.h
by cmcq 29 Jul '09

29 Jul '09

Author: cmcq Date: Wed Jul 29 13:43:55 2009 New Revision: 4829 Log: Use avutil headers for offsetof and M_PI Modified: amr/amrnbfloatdata.h Modified: amr/amrnbfloatdata.h ============================================================================== --- amr/amrnbfloatdata.h Wed Jul 29 11:10:00 2009 (r4828) +++ amr/amrnbfloatdata.h Wed Jul 29 13:43:55 2009 (r4829) @@ -29,10 +29,9 @@ #define AVCODEC_AMRNBFLOATDATA_H #include <stdint.h> -#include <stddef.h> -#include <math.h> -#include "libavutil/common.h" +#include "libavutil/common.h" /* offsetof */ +#include "libavutil/mathematics.h" /* M_PI */ // general definitions #define AMR_BLOCK_SIZE 160

1 0

[soc]: r4825 - in concat/libavformat: concat.c playlist.h
by gkovacs 29 Jul '09

29 Jul '09

Author: gkovacs Date: Wed Jul 29 05:06:53 2009 New Revision: 4825 Log: added implicitly declared header, fixed wrong datatype declaration Modified: concat/libavformat/concat.c concat/libavformat/playlist.h Modified: concat/libavformat/concat.c ============================================================================== --- concat/libavformat/concat.c Wed Jul 29 04:48:38 2009 (r4824) +++ concat/libavformat/concat.c Wed Jul 29 05:06:53 2009 (r4825) @@ -36,7 +36,7 @@ extern int ff_concatgen_read_packet(AVFo extern int ff_concatgen_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags); -extern int ff_concatgen_read_timestamp(AVFormatContext *s, int stream_index, int64_t *pos, int64_t pos_limit); +extern int64_t ff_concatgen_read_timestamp(AVFormatContext *s, int stream_index, int64_t *pos, int64_t pos_limit); extern int ff_concatgen_read_close(AVFormatContext *s); Modified: concat/libavformat/playlist.h ============================================================================== --- concat/libavformat/playlist.h Wed Jul 29 04:48:38 2009 (r4824) +++ concat/libavformat/playlist.h Wed Jul 29 05:06:53 2009 (r4825) @@ -36,6 +36,7 @@ #include "avformat.h" #include "riff.h" #include <libgen.h> +#include <libavutil/avstring.h> /** @struct PlaylistContext * @brief Represents the playlist and contains PlayElem for each playlist item.

4 4

[soc]: r4827 - concat/libavformat/playlist.h
by gkovacs 29 Jul '09

29 Jul '09

Author: gkovacs Date: Wed Jul 29 09:08:12 2009 New Revision: 4827 Log: fixed header includes Modified: concat/libavformat/playlist.h Modified: concat/libavformat/playlist.h ============================================================================== --- concat/libavformat/playlist.h Wed Jul 29 09:08:09 2009 (r4826) +++ concat/libavformat/playlist.h Wed Jul 29 09:08:12 2009 (r4827) @@ -33,10 +33,10 @@ #ifndef AVFORMAT_PLAYLIST_H #define AVFORMAT_PLAYLIST_H +#include <libgen.h> #include "avformat.h" #include "riff.h" -#include <libgen.h> -#include <libavutil/avstring.h> +#include "libavutil/avstring.h" /** @struct PlaylistContext * @brief Represents the playlist and contains PlayElem for each playlist item.

2 1

[soc]: r4822 - in amr: amrnbfloatdata.h amrnbfloatdec.c
by cmcq 29 Jul '09

29 Jul '09

Author: cmcq Date: Wed Jul 29 01:24:30 2009 New Revision: 4822 Log: Include headers for M_PI, memcpy, memmove, log10f, fabsf Modified: amr/amrnbfloatdata.h amr/amrnbfloatdec.c Modified: amr/amrnbfloatdata.h ============================================================================== --- amr/amrnbfloatdata.h Tue Jul 28 18:17:23 2009 (r4821) +++ amr/amrnbfloatdata.h Wed Jul 29 01:24:30 2009 (r4822) @@ -30,6 +30,7 @@ #include <stdint.h> #include <stddef.h> +#include <math.h> #include "libavutil/common.h" Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Tue Jul 28 18:17:23 2009 (r4821) +++ amr/amrnbfloatdec.c Wed Jul 29 01:24:30 2009 (r4822) @@ -27,6 +27,8 @@ #include <stddef.h> +#include <string.h> +#include <math.h> #include "avcodec.h" #include "get_bits.h"

2 1

[soc]: r4828 - amr/amrnbfloatdec.c
by cmcq 29 Jul '09

29 Jul '09

Author: cmcq Date: Wed Jul 29 11:10:00 2009 New Revision: 4828 Log: Mark an internal function as static Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Wed Jul 29 09:08:12 2009 (r4827) +++ amr/amrnbfloatdec.c Wed Jul 29 11:10:00 2009 (r4828) @@ -127,8 +127,8 @@ static av_cold int amrnb_decode_init(AVC * * @return the frame mode */ -enum Mode decode_bitstream(AMRContext *p, const uint8_t *buf, int buf_size, - enum Mode *speech_mode) +static enum Mode decode_bitstream(AMRContext *p, const uint8_t *buf, + int buf_size, enum Mode *speech_mode) { enum Mode mode;

1 0

[soc]: r4826 - in concat/libavformat: m3u.c pls.c xspf.c
by gkovacs 29 Jul '09

29 Jul '09

Author: gkovacs Date: Wed Jul 29 09:08:09 2009 New Revision: 4826 Log: fixed local declarations in other files as well Modified: concat/libavformat/m3u.c concat/libavformat/pls.c concat/libavformat/xspf.c Modified: concat/libavformat/m3u.c ============================================================================== --- concat/libavformat/m3u.c Wed Jul 29 05:06:53 2009 (r4825) +++ concat/libavformat/m3u.c Wed Jul 29 09:08:09 2009 (r4826) @@ -31,7 +31,7 @@ extern int ff_concatgen_read_packet(AVFo extern int ff_concatgen_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags); -extern int ff_concatgen_read_timestamp(AVFormatContext *s, int stream_index, int64_t *pos, int64_t pos_limit); +extern int64_t ff_concatgen_read_timestamp(AVFormatContext *s, int stream_index, int64_t *pos, int64_t pos_limit); extern int ff_concatgen_read_close(AVFormatContext *s); Modified: concat/libavformat/pls.c ============================================================================== --- concat/libavformat/pls.c Wed Jul 29 05:06:53 2009 (r4825) +++ concat/libavformat/pls.c Wed Jul 29 09:08:09 2009 (r4826) @@ -31,7 +31,7 @@ extern int ff_concatgen_read_packet(AVFo extern int ff_concatgen_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags); -extern int ff_concatgen_read_timestamp(AVFormatContext *s, int stream_index, int64_t *pos, int64_t pos_limit); +extern int64_t ff_concatgen_read_timestamp(AVFormatContext *s, int stream_index, int64_t *pos, int64_t pos_limit); extern int ff_concatgen_read_close(AVFormatContext *s); Modified: concat/libavformat/xspf.c ============================================================================== --- concat/libavformat/xspf.c Wed Jul 29 05:06:53 2009 (r4825) +++ concat/libavformat/xspf.c Wed Jul 29 09:08:09 2009 (r4826) @@ -34,7 +34,7 @@ extern int ff_concatgen_read_packet(AVFo extern int ff_concatgen_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags); -extern int ff_concatgen_read_timestamp(AVFormatContext *s, int stream_index, int64_t *pos, int64_t pos_limit); +extern int64_t ff_concatgen_read_timestamp(AVFormatContext *s, int stream_index, int64_t *pos, int64_t pos_limit); extern int ff_concatgen_read_close(AVFormatContext *s);

1 0