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

pad last audio frame when encoding

Browse Source 
Originally committed as revision 18907 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier
2009-05-23 04:07:25 +00:00
parent c43accabd3
commit b10d7e4e3a
5 changed files with 116 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ffmpeg.c
View File

@ -1464,11 +1464,20 @@ static int output_packet(AVInputStream *ist, int ist_index,
fifo_bytes = av_fifo_size(ost->fifo);
ret = 0;
/* encode any samples remaining in fifo */
if(fifo_bytes > 0 && enc->codec->capabilities & CODEC_CAP_SMALL_LAST_FRAME) {
if (fifo_bytes > 0) {
int osize = av_get_bits_per_sample_format(enc->sample_fmt) >> 3;
int fs_tmp = enc->frame_size;
enc->frame_size = fifo_bytes / (osize * enc->channels);
av_fifo_generic_read(ost->fifo, samples, fifo_bytes, NULL);
if (enc->codec->capabilities & CODEC_CAP_SMALL_LAST_FRAME) {
enc->frame_size = fifo_bytes / (osize * enc->channels);
} else { /* pad */
int frame_bytes = enc->frame_size*osize*enc->channels;
if (samples_size < frame_bytes)
av_exit(1);
memset((uint8_t*)samples+fifo_bytes, 0, frame_bytes - fifo_bytes);
}
ret = avcodec_encode_audio(enc, bit_buffer, bit_buffer_size, samples);
pkt.duration = av_rescale((int64_t)enc->frame_size*ost->st->time_base.den,
ost->st->time_base.num, enc->sample_rate);