MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ensure that one can store X bytes in a fifo of size X.

Browse Source 
Fixed issue417.

Originally committed as revision 13405 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2008-05-25 23:04:09 +00:00
parent 0871ae1a93
commit fa3b98182d
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ffmpeg.c
View File

@ -587,7 +587,7 @@ static void do_audio_out(AVFormatContext *s,
/* 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;

2
libavformat/mpegenc.c
View File

@ -1170,7 +1170,7 @@ static int mpeg_mux_write_packet(AVFormatContext *ctx, AVPacket *pkt)
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)

5
libavutil/fifo.c
View File

@ -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_t *buf, int buf_size)
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;

2
libavutil/fifo.h
View File

@ -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.