[FFmpeg-cvslog] r13405 - in trunk: ffmpeg.c libavformat/mpegenc.c libavutil/fifo.c libavutil/fifo.h

[michael]

Author: michael
Date: Mon May 26 01:04:09 2008
New Revision: 13405

Log:
Ensure that one can store X bytes in a fifo of size X.
Fixed issue417.


Modified:
   trunk/ffmpeg.c
   trunk/libavformat/mpegenc.c
   trunk/libavutil/fifo.c
   trunk/libavutil/fifo.h

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	(original)
+++ trunk/ffmpeg.c	Mon May 26 01:04:09 2008
@@ -587,7 +587,7 @@ static void do_audio_out(AVFormatContext
     /* now encode as many frames as possible */
     if (enc->frame_size > 1) {
         /* output resampled raw samples */
-        av_fifo_realloc(&ost->fifo, av_fifo_size(&ost->fifo) + size_out + 1);
+        av_fifo_realloc(&ost->fifo, av_fifo_size(&ost->fifo) + size_out);
         av_fifo_write(&ost->fifo, buftmp, size_out);
 
         frame_bytes = enc->frame_size * 2 * enc->channels;

Modified: trunk/libavformat/mpegenc.c
==============================================================================
--- trunk/libavformat/mpegenc.c	(original)
+++ trunk/libavformat/mpegenc.c	Mon May 26 01:04:09 2008
@@ -1170,7 +1170,7 @@ static int mpeg_mux_write_packet(AVForma
         stream->predecode_packet= pkt_desc;
     stream->next_packet= &pkt_desc->next;
 
-    av_fifo_realloc(&stream->fifo, av_fifo_size(&stream->fifo) + size + 1);
+    av_fifo_realloc(&stream->fifo, av_fifo_size(&stream->fifo) + size);
 
     if (s->is_dvd){
         if (is_iframe && (s->packet_number == 0 || (pts - stream->vobu_start_pts >= 36000))) { // min VOBU length 0.4 seconds (mpucoder)

Modified: trunk/libavutil/fifo.c
==============================================================================
--- trunk/libavutil/fifo.c	(original)
+++ trunk/libavutil/fifo.c	Mon May 26 01:04:09 2008
@@ -22,8 +22,9 @@
 #include "common.h"
 #include "fifo.h"
 
-int av_fifo_init(AVFifoBuffer *f, int size)
+int av_fifo_init(AVFifoBuffer *f, unsigned int size)
 {
+    size= FFMAX(size, size+1);
     f->wptr = f->rptr =
     f->buffer = av_malloc(size);
     f->end = f->buffer + size;
@@ -56,7 +57,7 @@ int av_fifo_read(AVFifoBuffer *f, uint8_
 void av_fifo_realloc(AVFifoBuffer *f, unsigned int new_size) {
     unsigned int old_size= f->end - f->buffer;
 
-    if(old_size < new_size){
+    if(old_size <= new_size){
         int len= av_fifo_size(f);
         AVFifoBuffer f2;
 

Modified: trunk/libavutil/fifo.h
==============================================================================
--- trunk/libavutil/fifo.h	(original)
+++ trunk/libavutil/fifo.h	Mon May 26 01:04:09 2008
@@ -38,7 +38,7 @@ typedef struct AVFifoBuffer {
  * @param size of FIFO
  * @return <0 for failure >=0 otherwise
  */
-int av_fifo_init(AVFifoBuffer *f, int size);
+int av_fifo_init(AVFifoBuffer *f, unsigned int size);
 
 /**
  * Frees an AVFifoBuffer.