opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-02 14:07:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replace all uses of the replaced av_fifo_read by av_fifo_generic_read

Browse Source 
Originally committed as revision 17873 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger
2009-03-08 14:42:11 +00:00
parent 792e467904
commit c957c85426
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ffmpeg.c
View File

@ -672,7 +672,7 @@ static void do_audio_out(AVFormatContext *s,
AVPacket pkt; AVPacket pkt;
av_init_packet(&pkt); av_init_packet(&pkt);
av_fifo_read(ost->fifo, audio_buf, frame_bytes); av_fifo_generic_read(ost->fifo, frame_bytes, NULL, audio_buf);
//FIXME pass ost->sync_opts as AVFrame.pts in avcodec_encode_audio() //FIXME pass ost->sync_opts as AVFrame.pts in avcodec_encode_audio()
@ -1452,7 +1452,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
if(fifo_bytes > 0 && enc->codec->capabilities & CODEC_CAP_SMALL_LAST_FRAME) { if(fifo_bytes > 0 && enc->codec->capabilities & CODEC_CAP_SMALL_LAST_FRAME) {
int fs_tmp = enc->frame_size; int fs_tmp = enc->frame_size;
enc->frame_size = fifo_bytes / (2 * enc->channels); enc->frame_size = fifo_bytes / (2 * enc->channels);
av_fifo_read(ost->fifo, (uint8_t *)samples, fifo_bytes); av_fifo_generic_read(ost->fifo, fifo_bytes, NULL, samples);
ret = avcodec_encode_audio(enc, bit_buffer, bit_buffer_size, samples); ret = avcodec_encode_audio(enc, bit_buffer, bit_buffer_size, samples);
enc->frame_size = fs_tmp; enc->frame_size = fs_tmp;
} }

2
libavformat/audiointerleave.c
View File

@ -80,7 +80,7 @@ static int ff_interleave_new_audio_packet(AVFormatContext *s, AVPacket *pkt,
return 0; return 0;
av_new_packet(pkt, size); av_new_packet(pkt, size);
av_fifo_read(aic->fifo, pkt->data, size); av_fifo_generic_read(aic->fifo, size, NULL, pkt->data);
pkt->dts = pkt->pts = aic->dts; pkt->dts = pkt->pts = aic->dts;
pkt->duration = av_rescale_q(*aic->samples, st->time_base, aic->time_base); pkt->duration = av_rescale_q(*aic->samples, st->time_base, aic->time_base);

2
libavutil/fifo.c
View File

@ -63,7 +63,7 @@ int av_fifo_realloc2(AVFifoBuffer *f, unsigned int new_size) {
if (!f2) if (!f2)
return -1; return -1;
av_fifo_read(f, f2->buffer, len); av_fifo_generic_read(f, len, NULL, f2->buffer);
f2->wptr += len; f2->wptr += len;
f2->wndx += len; f2->wndx += len;
av_free(f->buffer); av_free(f->buffer);