[FFmpeg-soc] [soc]: r3464 - mlp/mlpenc.c

[ramiro]

Author: ramiro
Date: Tue Aug 19 19:07:08 2008
New Revision: 3464

Log:
Revert previous commit and rename big_sample_buffer to major_frame_buffer instead.

Added:
   mlp/mlpenc.c
      - copied, changed from r3462, /mlp/mlpenc.c

Copied: mlp/mlpenc.c (from r3462, /mlp/mlpenc.c)
==============================================================================
--- /mlp/mlpenc.c	(original)
+++ mlp/mlpenc.c	Tue Aug 19 19:07:08 2008
@@ -88,14 +88,14 @@ typedef struct {
     //! Number of substreams contained within this stream.
     int             num_substreams;
 
-    int             num_channels;   /**< Number of channels in big_sample_buffer.
+    int             num_channels;   /**< Number of channels in major_frame_buffer.
                                      *   Normal channels + noise channels. */
 
     int             sample_fmt;     ///< sample format encoded for MLP
     int             sample_rate;    ///< sample rate encoded for MLP
 
     int32_t        *sample_buffer;
-    int32_t        *big_sample_buffer;
+    int32_t        *major_frame_buffer;
     int32_t        *last_frame;
 
     unsigned int    lpc_frame_size;
@@ -313,7 +313,7 @@ static void default_decoding_params(MLPE
 static av_cold int mlp_encode_init(AVCodecContext *avctx)
 {
     MLPEncodeContext *ctx = avctx->priv_data;
-    unsigned int big_sample_buffer_size;
+    unsigned int major_frame_buffer_size;
     unsigned int lossless_check_data_size;
     unsigned int substr;
 
@@ -353,11 +353,11 @@ static av_cold int mlp_encode_init(AVCod
                                 * ctx->num_channels;
     ctx->major_header_interval = MAJOR_HEADER_INTERVAL;
 
-    big_sample_buffer_size = ctx->one_sample_buffer_size
+    major_frame_buffer_size = ctx->one_sample_buffer_size
                            * ctx->major_header_interval * sizeof(int32_t);
 
-    ctx->big_sample_buffer = av_malloc(big_sample_buffer_size);
-    if (!ctx->big_sample_buffer) {
+    ctx->major_frame_buffer = av_malloc(major_frame_buffer_size);
+    if (!ctx->major_frame_buffer) {
         av_log(avctx, AV_LOG_ERROR,
                "Not enough memory for buffering samples.\n");
         return -1;
@@ -1292,7 +1292,7 @@ static int mlp_encode_frame(AVCodecConte
 
     ctx->frame_index = avctx->frame_number % ctx->major_header_interval;
 
-    ctx->sample_buffer = ctx->big_sample_buffer
+    ctx->sample_buffer = ctx->major_frame_buffer
                        + ctx->frame_index * ctx->one_sample_buffer_size;
 
     if (ctx->last_frame == ctx->sample_buffer) {
@@ -1309,7 +1309,7 @@ static int mlp_encode_frame(AVCodecConte
             ctx->major_header_interval = avctx->frame_number;
             ctx->frame_index = 0;
 
-            ctx->sample_buffer = ctx->big_sample_buffer;
+            ctx->sample_buffer = ctx->major_frame_buffer;
         }
     }
 
@@ -1388,7 +1388,7 @@ static av_cold int mlp_encode_close(AVCo
     MLPEncodeContext *ctx = avctx->priv_data;
 
     av_freep(&ctx->lossless_check_data);
-    av_freep(&ctx->big_sample_buffer);
+    av_freep(&ctx->major_frame_buffer);
     av_freep(&avctx->coded_frame);
 
     return 0;