ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Should fix occasional horrible noise on end of recordings.

This commit is contained in:
Themaister 2011-11-20 02:44:21 +01:00
parent bb5e31df0d
commit aa124b4c40
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
record/ffemu.c
View File

@ -569,14 +569,19 @@ bool ffemu_finalize(ffemu_t *handle)
{ {
deinit_thread(handle); deinit_thread(handle);
// Push out audio still in queue.
size_t audio_buf_size = 512 * handle->params.channels * sizeof(int16_t); size_t audio_buf_size = 512 * handle->params.channels * sizeof(int16_t);
int16_t *audio_buf = av_malloc(audio_buf_size); int16_t *audio_buf = av_malloc(audio_buf_size);
if (audio_buf) void *video_buf = av_malloc(2 * handle->params.fb_width * handle->params.fb_height * handle->video.pix_size);
// Try pushing data in an interleaving pattern to ease the work of the muxer a bit.
bool did_work;
do
{ {
while (fifo_read_avail(handle->audio_fifo) >= audio_buf_size) did_work = false;
if (fifo_read_avail(handle->audio_fifo) >= audio_buf_size)
{ {
fifo_read(handle->audio_fifo, audio_buf, sizeof(audio_buf_size)); fifo_read(handle->audio_fifo, audio_buf, audio_buf_size);
struct ffemu_audio_data aud = { struct ffemu_audio_data aud = {
.frames = 512, .frames = 512,
@ -584,6 +589,7 @@ bool ffemu_finalize(ffemu_t *handle)
}; };
ffemu_push_audio_thread(handle, &aud); ffemu_push_audio_thread(handle, &aud);
did_work = true;
} }
size_t avail = fifo_read_avail(handle->audio_fifo); size_t avail = fifo_read_avail(handle->audio_fifo);
@ -594,26 +600,21 @@ bool ffemu_finalize(ffemu_t *handle)
}; };
ffemu_push_audio_thread(handle, &aud); ffemu_push_audio_thread(handle, &aud);
av_free(audio_buf);
}
// Push out frames still stuck in queue.
void *video_buf = av_malloc(2 * handle->params.fb_width * handle->params.fb_height * handle->video.pix_size);
if (video_buf)
{
struct ffemu_video_data attr_buf; struct ffemu_video_data attr_buf;
while (fifo_read_avail(handle->attr_fifo) >= sizeof(attr_buf)) if (fifo_read_avail(handle->attr_fifo) >= sizeof(attr_buf))
{ {
fifo_read(handle->attr_fifo, &attr_buf, sizeof(attr_buf)); fifo_read(handle->attr_fifo, &attr_buf, sizeof(attr_buf));
fifo_read(handle->video_fifo, video_buf, attr_buf.height * attr_buf.pitch); fifo_read(handle->video_fifo, video_buf, attr_buf.height * attr_buf.pitch);
attr_buf.data = video_buf; attr_buf.data = video_buf;
ffemu_push_video_thread(handle, &attr_buf); ffemu_push_video_thread(handle, &attr_buf);
did_work = true;
} }
av_free(video_buf); } while (did_work);
}
deinit_thread_buf(handle); deinit_thread_buf(handle);
av_free(audio_buf);
av_free(video_buf);
// Push out delayed frames. (MPEG codecs) // Push out delayed frames. (MPEG codecs)
AVPacket pkt; AVPacket pkt;