From b9a73d8d2f1930bf705c836a09f0514480799898 Mon Sep 17 00:00:00 2001 From: =?utf8?q?M=C3=A5ns=20Rullg=C3=A5rd?= Date: Thu, 13 Jul 2006 21:29:01 +0000 Subject: [PATCH] move adler32 to libavutil Originally committed as revision 5731 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/Makefile | 4 ++-- libavformat/avio.h | 1 - libavformat/crc.c | 46 ++++---------------------------------------- libavformat/nut.c | 5 +++-- libavutil/Makefile | 3 ++- libavutil/adler32.c | 41 +++++++++++++++++++++++++++++++++++++++ libavutil/adler32.h | 7 +++++++ 7 files changed, 59 insertions(+), 48 deletions(-) create mode 100644 libavutil/adler32.c create mode 100644 libavutil/adler32.h diff --git a/libavformat/Makefile b/libavformat/Makefile index 93924a940ca..e512e24a44b 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -76,8 +76,8 @@ OBJS-$(CONFIG_MPEGTS_DEMUXER) += mpegts.o OBJS-$(CONFIG_MPEGTS_MUXER) += mpegtsenc.o OBJS-$(CONFIG_MPJPEG_MUXER) += mpjpeg.o OBJS-$(CONFIG_NSV_DEMUXER) += nsvdec.o riff.o -OBJS-$(CONFIG_NUT_DEMUXER) += nut.o riff.o crc.o -OBJS-$(CONFIG_NUT_MUXER) += nut.o riff.o crc.o +OBJS-$(CONFIG_NUT_DEMUXER) += nut.o riff.o +OBJS-$(CONFIG_NUT_MUXER) += nut.o riff.o OBJS-$(CONFIG_NUV_DEMUXER) += nuv.o riff.o OBJS-$(CONFIG_OGG_DEMUXER) += ogg2.o \ oggparsevorbis.o \ diff --git a/libavformat/avio.h b/libavformat/avio.h index d015d97a5a6..180d54976d3 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -160,7 +160,6 @@ int url_close_dyn_buf(ByteIOContext *s, uint8_t **pbuffer); unsigned long get_checksum(ByteIOContext *s); void init_checksum(ByteIOContext *s, unsigned long (*update_checksum)(unsigned long c, const uint8_t *p, unsigned int len), unsigned long checksum); -unsigned long update_adler32(unsigned long adler, const uint8_t *buf, unsigned int len); /* file.c */ extern URLProtocol file_protocol; diff --git a/libavformat/crc.c b/libavformat/crc.c index 2176d47d90e..40eed53e1f6 100644 --- a/libavformat/crc.c +++ b/libavformat/crc.c @@ -17,45 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "avformat.h" - -/* adler32.c -- compute the Adler-32 checksum of a data stream - * Copyright (C) 1995 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -#define BASE 65521L /* largest prime smaller than 65536 */ -#define NMAX 5552 -/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */ - -#define DO1(buf) {s1 += *buf++; s2 += s1;} -#define DO2(buf) DO1(buf); DO1(buf); -#define DO4(buf) DO2(buf); DO2(buf); -#define DO8(buf) DO4(buf); DO4(buf); -#define DO16(buf) DO8(buf); DO8(buf); - -unsigned long update_adler32(unsigned long adler, const uint8_t *buf, unsigned int len) -{ - unsigned long s1 = adler & 0xffff; - unsigned long s2 = (adler >> 16) & 0xffff; - int k; - - if (buf == NULL) return 1L; - - while (len > 0) { - k = len < NMAX ? len : NMAX; - len -= k; - while (k >= 16) { - DO16(buf); - k -= 16; - } - if (k != 0) do { - DO1(buf); - } while (--k); - s1 %= BASE; - s2 %= BASE; - } - return (s2 << 16) | s1; -} +#include "adler32.h" #ifdef CONFIG_CRC_MUXER typedef struct CRCState { @@ -67,7 +29,7 @@ static int crc_write_header(struct AVFormatContext *s) CRCState *crc = s->priv_data; /* init CRC */ - crc->crcval = update_adler32(0, NULL, 0); + crc->crcval = av_adler32_update(0, NULL, 0); return 0; } @@ -75,7 +37,7 @@ static int crc_write_header(struct AVFormatContext *s) static int crc_write_packet(struct AVFormatContext *s, AVPacket *pkt) { CRCState *crc = s->priv_data; - crc->crcval = update_adler32(crc->crcval, pkt->data, pkt->size); + crc->crcval = av_adler32_update(crc->crcval, pkt->data, pkt->size); return 0; } @@ -94,7 +56,7 @@ static int crc_write_trailer(struct AVFormatContext *s) #ifdef CONFIG_FRAMECRC_MUXER static int framecrc_write_packet(struct AVFormatContext *s, AVPacket *pkt) { - uint32_t crc = update_adler32(0, pkt->data, pkt->size); + uint32_t crc = av_adler32_update(0, pkt->data, pkt->size); char buf[256]; snprintf(buf, sizeof(buf), "%d, %"PRId64", %d, 0x%08x\n", pkt->stream_index, pkt->dts, pkt->size, crc); diff --git a/libavformat/nut.c b/libavformat/nut.c index 0bb242a5c23..a33dfb89140 100644 --- a/libavformat/nut.c +++ b/libavformat/nut.c @@ -34,6 +34,7 @@ #include "avformat.h" #include "mpegaudio.h" #include "riff.h" +#include "adler32.h" #undef NDEBUG #include @@ -330,7 +331,7 @@ static int get_packetheader(NUTContext *nut, ByteIOContext *bc, int calculate_ch size= get_v(bc); - init_checksum(bc, calculate_checksum ? update_adler32 : NULL, 0); + init_checksum(bc, calculate_checksum ? av_adler32_update : NULL, 0); nut->packet_start[2] = start; nut->written_packet_size= size; @@ -475,7 +476,7 @@ static int put_packetheader(NUTContext *nut, ByteIOContext *bc, int max_size, in put_v(bc, nut->written_packet_size); /* forward ptr */ if(calculate_checksum) - init_checksum(bc, update_adler32, 0); + init_checksum(bc, av_adler32_update, 0); return 0; } diff --git a/libavutil/Makefile b/libavutil/Makefile index 236810685b8..9870cfb0a18 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -12,9 +12,10 @@ OBJS= mathematics.o \ intfloat_readwrite.o \ crc.o \ md5.o \ + adler32.o HEADERS = avutil.h common.h mathematics.h integer.h rational.h \ - intfloat_readwrite.h md5.h + intfloat_readwrite.h md5.h adler32.h NAME=avutil ifeq ($(BUILD_SHARED),yes) diff --git a/libavutil/adler32.c b/libavutil/adler32.c new file mode 100644 index 00000000000..ab0b86da74f --- /dev/null +++ b/libavutil/adler32.c @@ -0,0 +1,41 @@ +/* adler32.c -- compute the Adler-32 checksum of a data stream + * Copyright (C) 1995 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +#include "common.h" +#include "adler32.h" + +#define BASE 65521L /* largest prime smaller than 65536 */ +#define NMAX 5552 +/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */ + +#define DO1(buf) {s1 += *buf++; s2 += s1;} +#define DO2(buf) DO1(buf); DO1(buf); +#define DO4(buf) DO2(buf); DO2(buf); +#define DO8(buf) DO4(buf); DO4(buf); +#define DO16(buf) DO8(buf); DO8(buf); + +unsigned long av_adler32_update(unsigned long adler, const uint8_t *buf, unsigned int len) +{ + unsigned long s1 = adler & 0xffff; + unsigned long s2 = (adler >> 16) & 0xffff; + int k; + + if (buf == NULL) return 1L; + + while (len > 0) { + k = len < NMAX ? len : NMAX; + len -= k; + while (k >= 16) { + DO16(buf); + k -= 16; + } + if (k != 0) do { + DO1(buf); + } while (--k); + s1 %= BASE; + s2 %= BASE; + } + return (s2 << 16) | s1; +} diff --git a/libavutil/adler32.h b/libavutil/adler32.h new file mode 100644 index 00000000000..4b035dcdf33 --- /dev/null +++ b/libavutil/adler32.h @@ -0,0 +1,7 @@ +#ifndef ADLER32_H +#define ADLER32_H + +unsigned long av_adler32_update(unsigned long adler, const uint8_t *buf, + unsigned int len); + +#endif -- 2.39.5