diff options
| -rw-r--r-- | libavformat/Makefile | 2 | ||||
| -rw-r--r-- | libavformat/crc.c | 33 | ||||
| -rw-r--r-- | libavformat/framecrcenc.c | 46 |
3 files changed, 48 insertions, 33 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index cf8a042c84..2efcbc342f 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -50,7 +50,7 @@ OBJS-$(CONFIG_FLIC_DEMUXER) += flic.o OBJS-$(CONFIG_FLV_DEMUXER) += flvdec.o OBJS-$(CONFIG_FLV_MUXER) += flvenc.o OBJS-$(CONFIG_FOURXM_DEMUXER) += 4xm.o -OBJS-$(CONFIG_FRAMECRC_MUXER) += crc.o +OBJS-$(CONFIG_FRAMECRC_MUXER) += framecrcenc.o OBJS-$(CONFIG_GIF_MUXER) += gif.o OBJS-$(CONFIG_GIF_DEMUXER) += gifdec.o OBJS-$(CONFIG_GXF_DEMUXER) += gxf.o diff --git a/libavformat/crc.c b/libavformat/crc.c index bdbe8bcffb..7b1622706e 100644 --- a/libavformat/crc.c +++ b/libavformat/crc.c @@ -1,5 +1,5 @@ /* - * CRC decoder (for codec/format testing) + * CRC encoder (for codec/format testing) * Copyright (c) 2002 Fabrice Bellard. * * This file is part of FFmpeg. @@ -21,7 +21,6 @@ #include "avformat.h" #include "adler32.h" -#ifdef CONFIG_CRC_MUXER typedef struct CRCState { uint32_t crcval; } CRCState; @@ -53,22 +52,7 @@ static int crc_write_trailer(struct AVFormatContext *s) put_flush_packet(&s->pb); return 0; } -#endif -#ifdef CONFIG_FRAMECRC_MUXER -static int framecrc_write_packet(struct AVFormatContext *s, AVPacket *pkt) -{ - 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); - put_buffer(&s->pb, buf, strlen(buf)); - put_flush_packet(&s->pb); - return 0; -} -#endif - -#ifdef CONFIG_CRC_MUXER AVOutputFormat crc_muxer = { "crc", "crc testing format", @@ -81,18 +65,3 @@ AVOutputFormat crc_muxer = { crc_write_packet, crc_write_trailer, }; -#endif -#ifdef CONFIG_FRAMECRC_MUXER -AVOutputFormat framecrc_muxer = { - "framecrc", - "framecrc testing format", - NULL, - "", - 0, - CODEC_ID_PCM_S16LE, - CODEC_ID_RAWVIDEO, - NULL, - framecrc_write_packet, - NULL, -}; -#endif diff --git a/libavformat/framecrcenc.c b/libavformat/framecrcenc.c new file mode 100644 index 0000000000..6b3168a6fe --- /dev/null +++ b/libavformat/framecrcenc.c @@ -0,0 +1,46 @@ +/* + * frame CRC encoder (for codec/format testing) + * Copyright (c) 2002 Fabrice Bellard. + * + * This file is part of FFmpeg. + * + * FFmpeg 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. + * + * FFmpeg 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 FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +#include "avformat.h" +#include "adler32.h" + +static int framecrc_write_packet(struct AVFormatContext *s, AVPacket *pkt) +{ + 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); + put_buffer(&s->pb, buf, strlen(buf)); + put_flush_packet(&s->pb); + return 0; +} + +AVOutputFormat framecrc_muxer = { + "framecrc", + "framecrc testing format", + NULL, + "", + 0, + CODEC_ID_PCM_S16LE, + CODEC_ID_RAWVIDEO, + NULL, + framecrc_write_packet, + NULL, +}; |