[FFmpeg-devel] [PATCH 4/6] avcodec/vorbisenc: Move encoder structures and macros to separate file
Tyler Jones
tdjones879 at gmail.com
Tue Aug 22 04:23:05 EEST 2017
Encoder structures are moved to a separate header file to improve
readability.
Signed-off-by: Tyler Jones <tdjones879 at gmail.com>
---
libavcodec/vorbisenc.c | 118 +---------------------------------------
libavcodec/vorbisenc.h | 145 +++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 146 insertions(+), 117 deletions(-)
create mode 100644 libavcodec/vorbisenc.h
diff --git a/libavcodec/vorbisenc.c b/libavcodec/vorbisenc.c
index 73182c6356..fae90c4a30 100644
--- a/libavcodec/vorbisenc.c
+++ b/libavcodec/vorbisenc.c
@@ -25,18 +25,12 @@
*/
#include <float.h>
-#include "libavutil/float_dsp.h"
+#include "vorbisenc.h"
#include "avcodec.h"
#include "internal.h"
-#include "fft.h"
#include "mathops.h"
-#include "vorbis.h"
#include "vorbis_enc_data.h"
-#include "vorbispsy.h"
-
-#include "audio_frame_queue.h"
-#include "libavfilter/bufferqueue.h"
#define BITSTREAM_WRITER_LE
#include "put_bits.h"
@@ -44,116 +38,6 @@
#undef NDEBUG
#include <assert.h>
-typedef struct vorbis_enc_codebook {
- int nentries;
- uint8_t *lens;
- uint32_t *codewords;
- int ndimensions;
- float min;
- float delta;
- int seq_p;
- int lookup;
- int *quantlist;
- float *dimensions;
- float *pow2;
-} vorbis_enc_codebook;
-
-typedef struct vorbis_enc_floor_class {
- int dim;
- int subclass;
- int masterbook;
- int *books;
-} vorbis_enc_floor_class;
-
-typedef struct vorbis_enc_floor {
- int partitions;
- int *partition_to_class;
- int nclasses;
- vorbis_enc_floor_class *classes;
- int multiplier;
- int rangebits;
- int values;
- vorbis_floor1_entry *list;
-} vorbis_enc_floor;
-
-typedef struct vorbis_enc_residue {
- int type;
- int begin;
- int end;
- int partition_size;
- int classifications;
- int classbook;
- int8_t (*books)[8];
- float (*maxes)[2];
-} vorbis_enc_residue;
-
-typedef struct vorbis_enc_mapping {
- int submaps;
- int *mux;
- int *floor;
- int *residue;
- int coupling_steps;
- int *magnitude;
- int *angle;
-} vorbis_enc_mapping;
-
-typedef struct vorbis_enc_mode {
- int blockflag;
- int mapping;
-} vorbis_enc_mode;
-
-typedef struct vorbis_enc_context {
- int channels;
- int sample_rate;
- int log2_blocksize[2];
- int blockflags[3]; ///< Flags used for the previous, current, next windows
- int transient; ///< Negative if a series of transients are not being encoded
- int num_transient; ///< Number of short blocks for each frame
- FFTContext mdct[2];
- const float *win[2];
- int have_saved;
- float *saved;
- float *samples;
- float *floor; // also used for tmp values for mdct
- float *coeffs; // also used for residue after floor
- float *scratch; //< Used for temp values for psy model and window application
- float quality;
-
- AudioFrameQueue afq;
- struct FFBufQueue bufqueue;
-
- int ncodebooks;
- vorbis_enc_codebook *codebooks;
-
- int nfloors;
- vorbis_enc_floor *floors;
-
- int nresidues;
- vorbis_enc_residue *residues;
-
- int nmappings;
- vorbis_enc_mapping *mappings;
-
- int nmodes;
- vorbis_enc_mode *modes;
-
- int64_t next_pts;
-
- AVFloatDSPContext *fdsp;
- VorbisPsyContext vpctx;
-} vorbis_enc_context;
-
-#define MAX_CHANNELS 2
-#define MAX_CODEBOOK_DIM 8
-
-#define MAX_FLOOR_CLASS_DIM 4
-#define NUM_FLOOR_PARTITIONS 8
-#define MAX_FLOOR_VALUES (MAX_FLOOR_CLASS_DIM*NUM_FLOOR_PARTITIONS+2)
-
-#define RESIDUE_SIZE 1600
-#define RESIDUE_PART_SIZE 32
-#define NUM_RESIDUE_PARTITIONS (RESIDUE_SIZE/RESIDUE_PART_SIZE)
-
static inline int put_codeword(PutBitContext *pb, vorbis_enc_codebook *cb,
int entry)
{
diff --git a/libavcodec/vorbisenc.h b/libavcodec/vorbisenc.h
new file mode 100644
index 0000000000..15ee02dfa6
--- /dev/null
+++ b/libavcodec/vorbisenc.h
@@ -0,0 +1,145 @@
+/*
+ * Vorbis encoder
+ * Copyright (C) 2017 Tyler Jones
+ *
+ * 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
+ */
+
+#ifndef AVCODEC_VORBISENC_H
+#define AVCODEC_VORBISENC_H
+
+#define MAX_CHANNELS 2
+#define MAX_CODEBOOK_DIM 8
+
+#define MAX_FLOOR_CLASS_DIM 4
+#define NUM_FLOOR_PARTITIONS 8
+#define MAX_FLOOR_VALUES (MAX_FLOOR_CLASS_DIM*NUM_FLOOR_PARTITIONS+2)
+
+#define RESIDUE_SIZE 1600
+#define RESIDUE_PART_SIZE 32
+#define NUM_RESIDUE_PARTITIONS (RESIDUE_SIZE/RESIDUE_PART_SIZE)
+
+#include "vorbis.h"
+#include "vorbispsy.h"
+#include "audio_frame_queue.h"
+#include "libavutil/float_dsp.h"
+#include "libavfilter/bufferqueue.h"
+#include "fft.h"
+
+typedef struct vorbis_enc_codebook {
+ int nentries;
+ uint8_t *lens;
+ uint32_t *codewords;
+ int ndimensions;
+ float min;
+ float delta;
+ int seq_p;
+ int lookup;
+ int *quantlist;
+ float *dimensions;
+ float *pow2;
+} vorbis_enc_codebook;
+
+typedef struct vorbis_enc_floor_class {
+ int dim;
+ int subclass;
+ int masterbook;
+ int *books;
+} vorbis_enc_floor_class;
+
+typedef struct vorbis_enc_floor {
+ int partitions;
+ int *partition_to_class;
+ int nclasses;
+ vorbis_enc_floor_class *classes;
+ int multiplier;
+ int rangebits;
+ int values;
+ vorbis_floor1_entry *list;
+} vorbis_enc_floor;
+
+typedef struct vorbis_enc_residue {
+ int type;
+ int begin;
+ int end;
+ int partition_size;
+ int classifications;
+ int classbook;
+ int8_t (*books)[8];
+ float (*maxes)[2];
+} vorbis_enc_residue;
+
+typedef struct vorbis_enc_mapping {
+ int submaps;
+ int *mux;
+ int *floor;
+ int *residue;
+ int coupling_steps;
+ int *magnitude;
+ int *angle;
+} vorbis_enc_mapping;
+
+typedef struct vorbis_enc_mode {
+ int blockflag;
+ int mapping;
+} vorbis_enc_mode;
+
+typedef struct vorbis_enc_context {
+ int channels;
+ int sample_rate;
+ int log2_blocksize[2];
+ int blockflags[3]; ///< Flags used for the previous, current, next windows
+ int transient; ///< Negative if a series of transients are not being encoded
+ int num_transient; ///< Number of short blocks for each frame
+ FFTContext mdct[2];
+ const float *win[2];
+ int have_saved;
+ float *saved;
+ float *samples;
+ float *floor; // also used for tmp values for mdct
+ float *coeffs; // also used for residue after floor
+ float *scratch; //< Used for temp values for psy model and window application
+ float quality;
+
+ AudioFrameQueue afq;
+ struct FFBufQueue bufqueue;
+
+ int nfloor_books;
+ vorbis_enc_codebook *floor_books;
+
+ int nfloors;
+ vorbis_enc_floor *floors;
+
+ int nres_books;
+ vorbis_enc_codebook *res_books;
+
+ int nresidues;
+ vorbis_enc_residue *residues;
+
+ int nmappings;
+ vorbis_enc_mapping *mappings;
+
+ int nmodes;
+ vorbis_enc_mode *modes;
+
+ int64_t next_pts;
+
+ AVFloatDSPContext *fdsp;
+ VorbisPsyContext vpctx;
+} vorbis_enc_context;
+
+#endif /* AVCODEC_VORBISENC_H */
--
2.14.1
More information about the ffmpeg-devel
mailing list