Changeset 226 for libmpc/branches/r2d/libmpcenc/libmpcenc.h

Timestamp:

03/16/07 16:54:54 (17 years ago)

Author:

r2d

Message:

• added sv8 options to mpcenc
• some change in mpcdec to correctly display that there is no information

File:

• libmpc/branches/r2d/libmpcenc/libmpcenc.h (modified) (3 diffs)

libmpc/branches/r2d/libmpcenc/libmpcenc.h

@@ -27 +27 @@
 #endif
 
-// bitstream.c
-#define FRAMES_PER_BLOCK_PWR 6 // MUST be even
-#define FRAMES_PER_BLOCK (1 << FRAMES_PER_BLOCK_PWR)
-#define BUFFER_FULL         (4352 * FRAMES_PER_BLOCK)         // 34490 bit/frame  1320.3 kbps
-
-// FIXME : make this size dependent of the input file
-#define SEEK_SIZE (1 << 16) // number of seek entries
+#define MPC_FRAME_LENGTH (36 * 32)
+#define MAX_FRAME_SIZE 4352
 
 typedef struct {
@@ -45 +40 @@
         mpc_uint64_t outputBits; // Counter for the number of written bits in the bitstream
         mpc_uint32_t bitsBuff; // bits buffer
-        mpc_uint8_t buffer [BUFFER_FULL]; // Buffer for bitstream-file
-        mpc_uint_t framesInBlock;
+        mpc_uint8_t * buffer; // Buffer for bitstream-file
+        mpc_uint_t framesInBlock; // Number of frames in current block
+        mpc_uint_t frames_per_block_pwr; // Number of frame in a block = 1 << frames_per_block_pwr
 
         // seeking
-        mpc_uint32_t seek_table[SEEK_SIZE];
+        mpc_uint32_t * seek_table;
         mpc_uint32_t seek_pos; /// current position in the seek table
         mpc_uint32_t seek_ref; /// reference position for the seek information
@@ -74 +70 @@
  } mpc_encoder_t;
 
- void         Init_SV8             ( mpc_encoder_t* );
+ void mpc_encoder_init ( mpc_encoder_t * e,
+                                                 mpc_uint64_t SamplesInWAVE,
+                                                 unsigned int FramesBlockPwr,
+                                                 unsigned int SeekDistance );
+ void mpc_encoder_exit ( mpc_encoder_t * e );
  void writeStreamInfo ( mpc_encoder_t*e,
                                                 const unsigned int  MaxBand,