diff oggvorbis.c @ 2979:bfabfdf9ce55 libavcodec

COSMETICS: tabs --> spaces, some prettyprinting
author diego
date Thu, 22 Dec 2005 01:10:11 +0000
parents ef2149182f1c
children 8936371f5a5c
line wrap: on
line diff
--- a/oggvorbis.c	Wed Dec 21 17:50:40 2005 +0000
+++ b/oggvorbis.c	Thu Dec 22 01:10:11 2005 +0000
@@ -40,13 +40,13 @@
 
     return (vorbis_encode_setup_managed(vi, avccontext->channels,
               avccontext->sample_rate, -1, avccontext->bit_rate, -1) ||
-	    vorbis_encode_ctl(vi, OV_ECTL_RATEMANAGE_AVG, NULL) ||
-	    vorbis_encode_setup_init(vi)) ;
+            vorbis_encode_ctl(vi, OV_ECTL_RATEMANAGE_AVG, NULL) ||
+            vorbis_encode_setup_init(vi)) ;
 #else
     /* constant bitrate */
 
     return vorbis_encode_init(vi, avccontext->channels,
-	          avccontext->sample_rate, -1, avccontext->bit_rate, -1) ;
+                  avccontext->sample_rate, -1, avccontext->bit_rate, -1) ;
 #endif
 }
 
@@ -58,8 +58,8 @@
 
     vorbis_info_init(&context->vi) ;
     if(oggvorbis_init_encoder(&context->vi, avccontext) < 0) {
-	av_log(avccontext, AV_LOG_ERROR, "oggvorbis_encode_init: init_encoder failed") ;
-	return -1 ;
+        av_log(avccontext, AV_LOG_ERROR, "oggvorbis_encode_init: init_encoder failed") ;
+        return -1 ;
     }
     vorbis_analysis_init(&context->vd, &context->vi) ;
     vorbis_block_init(&context->vd, &context->vb) ;
@@ -101,8 +101,8 @@
 
 
 static int oggvorbis_encode_frame(AVCodecContext *avccontext,
-				  unsigned char *packets,
-			   int buf_size, void *data)
+                                  unsigned char *packets,
+                           int buf_size, void *data)
 {
     OggVorbisContext *context = avccontext->priv_data ;
     float **buffer ;
@@ -113,22 +113,22 @@
     buffer = vorbis_analysis_buffer(&context->vd, samples) ;
 
     if(context->vi.channels == 1) {
-	for(l = 0 ; l < samples ; l++)
-	    buffer[0][l]=audio[l]/32768.f;
+        for(l = 0 ; l < samples ; l++)
+            buffer[0][l]=audio[l]/32768.f;
     } else {
-	for(l = 0 ; l < samples ; l++){
-	    buffer[0][l]=audio[l*2]/32768.f;
-	    buffer[1][l]=audio[l*2+1]/32768.f;
-	}
+        for(l = 0 ; l < samples ; l++){
+            buffer[0][l]=audio[l*2]/32768.f;
+            buffer[1][l]=audio[l*2+1]/32768.f;
+        }
     }
 
     vorbis_analysis_wrote(&context->vd, samples) ;
 
     while(vorbis_analysis_blockout(&context->vd, &context->vb) == 1) {
-	vorbis_analysis(&context->vb, NULL);
-	vorbis_bitrate_addblock(&context->vb) ;
+        vorbis_analysis(&context->vb, NULL);
+        vorbis_bitrate_addblock(&context->vb) ;
 
-	while(vorbis_bitrate_flushpacket(&context->vd, &op)) {
+        while(vorbis_bitrate_flushpacket(&context->vd, &op)) {
             if(op.bytes==1) //id love to say this is a hack, bad sadly its not, appearently the end of stream decission is in libogg
                 continue;
             memcpy(context->buffer + context->buffer_index, &op, sizeof(ogg_packet));
@@ -136,7 +136,7 @@
             memcpy(context->buffer + context->buffer_index, op.packet, op.bytes);
             context->buffer_index += op.bytes;
 //            av_log(avccontext, AV_LOG_DEBUG, "e%d / %d\n", context->buffer_index, op.bytes);
-	}
+        }
     }
 
     l=0;
@@ -268,19 +268,19 @@
     float *mono ;
 
     for(i = 0 ; i < channels ; i++){
-	ptr = &data[i];
-	mono = pcm[i] ;
+        ptr = &data[i];
+        mono = pcm[i] ;
 
-	for(j = 0 ; j < samples ; j++) {
+        for(j = 0 ; j < samples ; j++) {
 
-	    val = mono[j] * 32767.f;
+            val = mono[j] * 32767.f;
 
-	    if(val > 32767) val = 32767 ;
-	    if(val < -32768) val = -32768 ;
+            if(val > 32767) val = 32767 ;
+            if(val < -32768) val = -32768 ;
 
-	    *ptr = val ;
-	    ptr += channels;
-	}
+            *ptr = val ;
+            ptr += channels;
+        }
     }
 
     return 0 ;
@@ -311,15 +311,15 @@
     av_log(avccontext, AV_LOG_DEBUG, "\n");*/
 
     if(vorbis_synthesis(&context->vb, op) == 0)
-	vorbis_synthesis_blockin(&context->vd, &context->vb) ;
+        vorbis_synthesis_blockin(&context->vd, &context->vb) ;
 
     total_samples = 0 ;
     total_bytes = 0 ;
 
     while((samples = vorbis_synthesis_pcmout(&context->vd, &pcm)) > 0) {
-	conv(samples, pcm, (char*)data + total_bytes, context->vi.channels) ;
-	total_bytes += samples * 2 * context->vi.channels ;
-	total_samples += samples ;
+        conv(samples, pcm, (char*)data + total_bytes, context->vi.channels) ;
+        total_bytes += samples * 2 * context->vi.channels ;
+        total_samples += samples ;
         vorbis_synthesis_read(&context->vd, samples) ;
     }