[FFmpeg-cvslog] r13035 - in trunk/libavcodec: flac.c flac.h
jbr
subversion
Fri May 2 23:33:14 CEST 2008
Author: jbr
Date: Fri May 2 23:33:14 2008
New Revision: 13035
Log:
split out some decoder context params to a shared macro
Added:
trunk/libavcodec/flac.h
Modified:
trunk/libavcodec/flac.c
Modified: trunk/libavcodec/flac.c
==============================================================================
--- trunk/libavcodec/flac.c (original)
+++ trunk/libavcodec/flac.c Fri May 2 23:33:14 2008
@@ -40,6 +40,7 @@
#include "bitstream.h"
#include "golomb.h"
#include "crc.h"
+#include "flac.h"
#undef NDEBUG
#include <assert.h>
@@ -56,14 +57,13 @@ enum decorrelation_type {
};
typedef struct FLACContext {
+ FLACSTREAMINFO
+
AVCodecContext *avctx;
GetBitContext gb;
- int min_blocksize, max_blocksize;
- int max_framesize;
- int samplerate, channels;
int blocksize/*, last_blocksize*/;
- int bps, curr_bps;
+ int curr_bps;
enum decorrelation_type decorrelation;
int32_t *decoded[MAX_CHANNELS];
Added: trunk/libavcodec/flac.h
==============================================================================
--- (empty file)
+++ trunk/libavcodec/flac.h Fri May 2 23:33:14 2008
@@ -0,0 +1,42 @@
+/*
+ * FLAC (Free Lossless Audio Codec) decoder/demuxer common functions
+ * Copyright (c) 2008 Justin Ruggles
+ *
+ * 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
+ */
+
+/**
+ * @file flac.h
+ * FLAC (Free Lossless Audio Codec) decoder/demuxer common functions
+ */
+
+#ifndef FFMPEG_FLAC_H
+#define FFMPEG_FLAC_H
+
+/**
+ * Data needed from the Streaminfo header for use by the raw FLAC demuxer
+ * and/or the FLAC decoder.
+ */
+#define FLACSTREAMINFO \
+ int min_blocksize; /**< minimum block size, in samples */\
+ int max_blocksize; /**< maximum block size, in samples */\
+ int max_framesize; /**< maximum frame size, in bytes */\
+ int samplerate; /**< sample rate */\
+ int channels; /**< number of channels */\
+ int bps; /**< bits-per-sample */\
+
+#endif /* FFMPEG_FLAC_H */
More information about the ffmpeg-cvslog
mailing list