From 2f3767a0f6562b8e1e7a41f83a6febf05310c5bb Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Sun, 4 Apr 2021 23:55:01 -0700 Subject: *: encode_image_buffer.[ch]->encode_audio_buffers.[ch] mechanical change to get filenames more accurate, thread function will be renamed in subsequent commit. --- src/Makefile.am | 4 +- src/rmd_encode_image_buffer.c | 123 ----------------------------------------- src/rmd_encode_image_buffer.h | 51 ----------------- src/rmd_encode_image_buffers.c | 123 +++++++++++++++++++++++++++++++++++++++++ src/rmd_encode_image_buffers.h | 51 +++++++++++++++++ src/rmd_flush_to_ogg.c | 2 +- src/rmd_load_cache.c | 2 +- src/rmd_threads.c | 2 +- 8 files changed, 179 insertions(+), 179 deletions(-) delete mode 100644 src/rmd_encode_image_buffer.c delete mode 100644 src/rmd_encode_image_buffer.h create mode 100644 src/rmd_encode_image_buffers.c create mode 100644 src/rmd_encode_image_buffers.h diff --git a/src/Makefile.am b/src/Makefile.am index 1a06e23..913b928 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -14,8 +14,8 @@ recordmydesktop_SOURCES = \ rmd_encode_cache.h \ rmd_encode_audio_buffers.c \ rmd_encode_audio_buffers.h \ - rmd_encode_image_buffer.c \ - rmd_encode_image_buffer.h \ + rmd_encode_image_buffers.c \ + rmd_encode_image_buffers.h \ rmd_error.c \ rmd_error.h \ rmd_flush_to_ogg.c \ diff --git a/src/rmd_encode_image_buffer.c b/src/rmd_encode_image_buffer.c deleted file mode 100644 index a669155..0000000 --- a/src/rmd_encode_image_buffer.c +++ /dev/null @@ -1,123 +0,0 @@ -/****************************************************************************** -* recordMyDesktop * -******************************************************************************* -* * -* Copyright (C) 2006,2007,2008 John Varouhakis * -* * -* * -* This program is free software; you can redistribute it and/or modify * -* it under the terms of the GNU General Public License as published by * -* the Free Software Foundation; either version 2 of the License, or * -* (at your option) any later version. * -* * -* This program is distributed in the hope that it will be useful, * -* but WITHOUT ANY WARRANTY; without even the implied warranty of * -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * -* GNU General Public License for more details. * -* * -* You should have received a copy of the GNU General Public License * -* along with this program; if not, write to the Free Software * -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * -* * -* * -* * -* For further information contact me at johnvarouhakis@gmail.com * -******************************************************************************/ - -#include "config.h" -#include "rmd_encode_image_buffer.h" - -#include "rmd_threads.h" -#include "rmd_types.h" - -#include - - -void *rmdEncodeImageBuffer(ProgData *pdata) -{ - unsigned int encode_frameno = 0, last_encode_frameno = 0; - - rmdThreadsSetName("rmdEncodeImages"); - - pdata->th_encoding_clean = 0; - - while (pdata->running) { - EncData *enc_data = pdata->enc_data; - unsigned int n_frames; - int r; - - pthread_mutex_lock(&pdata->pause_mutex); - while (pdata->paused) - pthread_cond_wait(&pdata->pause_cond, &pdata->pause_mutex); - pthread_mutex_unlock(&pdata->pause_mutex); - - pthread_mutex_lock(&pdata->img_buff_ready_mutex); - while (pdata->running && encode_frameno >= pdata->capture_frameno) - pthread_cond_wait(&pdata->image_buffer_ready, &pdata->img_buff_ready_mutex); - encode_frameno = pdata->capture_frameno; - pthread_mutex_unlock(&pdata->img_buff_ready_mutex); - - pthread_mutex_lock(&pdata->yuv_mutex); - r = theora_encode_YUVin(&enc_data->m_th_st, &enc_data->yuv); - pthread_mutex_unlock(&pdata->yuv_mutex); - if (r) { - fprintf(stderr, "Encoder not ready!\n"); - continue; - } - - n_frames = encode_frameno - last_encode_frameno; - if (n_frames > 1) - theora_control( &enc_data->m_th_st, - TH_ENCCTL_SET_DUP_COUNT, - (void *)&(int){n_frames - 1}, - sizeof(int)); - - while (theora_encode_packetout(&enc_data->m_th_st, 0, &enc_data->m_ogg_pckt1) > 0) { - pthread_mutex_lock(&pdata->libogg_mutex); - ogg_stream_packetin(&enc_data->m_ogg_ts, &enc_data->m_ogg_pckt1); - pthread_mutex_unlock(&pdata->libogg_mutex); - } - - last_encode_frameno = encode_frameno; - } - - //last packet - pthread_mutex_lock(&pdata->theora_lib_mutex); - pdata->th_encoding_clean = 1; - pthread_cond_signal(&pdata->theora_lib_clean); - pthread_mutex_unlock(&pdata->theora_lib_mutex); - - pthread_exit(&errno); -} - -//this function is meant to be called normally -//not through a thread of it's own -void rmdSyncEncodeImageBuffer(ProgData *pdata, unsigned int n_frames) -{ - EncData *enc_data = pdata->enc_data; - - if (theora_encode_YUVin(&enc_data->m_th_st, &enc_data->yuv)) { - fprintf(stderr, "Encoder not ready!\n"); - return; - } - - if (n_frames > 1) - theora_control( &enc_data->m_th_st, - TH_ENCCTL_SET_DUP_COUNT, - (void *)&(int){n_frames - 1}, - sizeof(int)); - - while (theora_encode_packetout(&enc_data->m_th_st, 0, &enc_data->m_ogg_pckt1) > 0) { - pthread_mutex_lock(&pdata->libogg_mutex); - ogg_stream_packetin(&enc_data->m_ogg_ts, &enc_data->m_ogg_pckt1); - /* TODO: this is the only real difference from what's open-coded above, - * investigate why this is done this way and make the thread just call - * this function instead of duplicating it. - */ - if (!pdata->running) - enc_data->m_ogg_ts.e_o_s = 1; - pthread_mutex_unlock(&pdata->libogg_mutex); - } - - pdata->avd += pdata->frametime_us * n_frames; -} diff --git a/src/rmd_encode_image_buffer.h b/src/rmd_encode_image_buffer.h deleted file mode 100644 index d011e26..0000000 --- a/src/rmd_encode_image_buffer.h +++ /dev/null @@ -1,51 +0,0 @@ -/****************************************************************************** -* recordMyDesktop * -******************************************************************************* -* * -* Copyright (C) 2006,2007,2008 John Varouhakis * -* * -* * -* This program is free software; you can redistribute it and/or modify * -* it under the terms of the GNU General Public License as published by * -* the Free Software Foundation; either version 2 of the License, or * -* (at your option) any later version. * -* * -* This program is distributed in the hope that it will be useful, * -* but WITHOUT ANY WARRANTY; without even the implied warranty of * -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * -* GNU General Public License for more details. * -* * -* You should have received a copy of the GNU General Public License * -* along with this program; if not, write to the Free Software * -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * -* * -* * -* * -* For further information contact me at johnvarouhakis@gmail.com * -******************************************************************************/ - -#ifndef ENCODE_IMAGE_BUFFER_H -#define ENCODE_IMAGE_BUFFER_H 1 - -#include "rmd_types.h" - - -/** -* feed a yuv buffer to the theora encoder and submit outcome to -* the ogg stream. -* \param pdata ProgData struct containing all program data -* \param n_frames number of frames to encode from image buffer -*/ -void *rmdEncodeImageBuffer(ProgData *pdata); - -/** -* As rmdEncodeImageBuffer, only with the assumption that -* this is not a thread on it's own -* -* \param pdata ProgData struct containing all program data -* -*/ -void rmdSyncEncodeImageBuffer(ProgData *pdata, unsigned int n_frames); - - -#endif diff --git a/src/rmd_encode_image_buffers.c b/src/rmd_encode_image_buffers.c new file mode 100644 index 0000000..7ee9f04 --- /dev/null +++ b/src/rmd_encode_image_buffers.c @@ -0,0 +1,123 @@ +/****************************************************************************** +* recordMyDesktop * +******************************************************************************* +* * +* Copyright (C) 2006,2007,2008 John Varouhakis * +* * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program; if not, write to the Free Software * +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * +* * +* * +* * +* For further information contact me at johnvarouhakis@gmail.com * +******************************************************************************/ + +#include "config.h" +#include "rmd_encode_image_buffers.h" + +#include "rmd_threads.h" +#include "rmd_types.h" + +#include + + +void *rmdEncodeImageBuffer(ProgData *pdata) +{ + unsigned int encode_frameno = 0, last_encode_frameno = 0; + + rmdThreadsSetName("rmdEncodeImages"); + + pdata->th_encoding_clean = 0; + + while (pdata->running) { + EncData *enc_data = pdata->enc_data; + unsigned int n_frames; + int r; + + pthread_mutex_lock(&pdata->pause_mutex); + while (pdata->paused) + pthread_cond_wait(&pdata->pause_cond, &pdata->pause_mutex); + pthread_mutex_unlock(&pdata->pause_mutex); + + pthread_mutex_lock(&pdata->img_buff_ready_mutex); + while (pdata->running && encode_frameno >= pdata->capture_frameno) + pthread_cond_wait(&pdata->image_buffer_ready, &pdata->img_buff_ready_mutex); + encode_frameno = pdata->capture_frameno; + pthread_mutex_unlock(&pdata->img_buff_ready_mutex); + + pthread_mutex_lock(&pdata->yuv_mutex); + r = theora_encode_YUVin(&enc_data->m_th_st, &enc_data->yuv); + pthread_mutex_unlock(&pdata->yuv_mutex); + if (r) { + fprintf(stderr, "Encoder not ready!\n"); + continue; + } + + n_frames = encode_frameno - last_encode_frameno; + if (n_frames > 1) + theora_control( &enc_data->m_th_st, + TH_ENCCTL_SET_DUP_COUNT, + (void *)&(int){n_frames - 1}, + sizeof(int)); + + while (theora_encode_packetout(&enc_data->m_th_st, 0, &enc_data->m_ogg_pckt1) > 0) { + pthread_mutex_lock(&pdata->libogg_mutex); + ogg_stream_packetin(&enc_data->m_ogg_ts, &enc_data->m_ogg_pckt1); + pthread_mutex_unlock(&pdata->libogg_mutex); + } + + last_encode_frameno = encode_frameno; + } + + //last packet + pthread_mutex_lock(&pdata->theora_lib_mutex); + pdata->th_encoding_clean = 1; + pthread_cond_signal(&pdata->theora_lib_clean); + pthread_mutex_unlock(&pdata->theora_lib_mutex); + + pthread_exit(&errno); +} + +//this function is meant to be called normally +//not through a thread of it's own +void rmdSyncEncodeImageBuffer(ProgData *pdata, unsigned int n_frames) +{ + EncData *enc_data = pdata->enc_data; + + if (theora_encode_YUVin(&enc_data->m_th_st, &enc_data->yuv)) { + fprintf(stderr, "Encoder not ready!\n"); + return; + } + + if (n_frames > 1) + theora_control( &enc_data->m_th_st, + TH_ENCCTL_SET_DUP_COUNT, + (void *)&(int){n_frames - 1}, + sizeof(int)); + + while (theora_encode_packetout(&enc_data->m_th_st, 0, &enc_data->m_ogg_pckt1) > 0) { + pthread_mutex_lock(&pdata->libogg_mutex); + ogg_stream_packetin(&enc_data->m_ogg_ts, &enc_data->m_ogg_pckt1); + /* TODO: this is the only real difference from what's open-coded above, + * investigate why this is done this way and make the thread just call + * this function instead of duplicating it. + */ + if (!pdata->running) + enc_data->m_ogg_ts.e_o_s = 1; + pthread_mutex_unlock(&pdata->libogg_mutex); + } + + pdata->avd += pdata->frametime_us * n_frames; +} diff --git a/src/rmd_encode_image_buffers.h b/src/rmd_encode_image_buffers.h new file mode 100644 index 0000000..d011e26 --- /dev/null +++ b/src/rmd_encode_image_buffers.h @@ -0,0 +1,51 @@ +/****************************************************************************** +* recordMyDesktop * +******************************************************************************* +* * +* Copyright (C) 2006,2007,2008 John Varouhakis * +* * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program; if not, write to the Free Software * +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * +* * +* * +* * +* For further information contact me at johnvarouhakis@gmail.com * +******************************************************************************/ + +#ifndef ENCODE_IMAGE_BUFFER_H +#define ENCODE_IMAGE_BUFFER_H 1 + +#include "rmd_types.h" + + +/** +* feed a yuv buffer to the theora encoder and submit outcome to +* the ogg stream. +* \param pdata ProgData struct containing all program data +* \param n_frames number of frames to encode from image buffer +*/ +void *rmdEncodeImageBuffer(ProgData *pdata); + +/** +* As rmdEncodeImageBuffer, only with the assumption that +* this is not a thread on it's own +* +* \param pdata ProgData struct containing all program data +* +*/ +void rmdSyncEncodeImageBuffer(ProgData *pdata, unsigned int n_frames); + + +#endif diff --git a/src/rmd_flush_to_ogg.c b/src/rmd_flush_to_ogg.c index 7805d7c..0ca5bc3 100644 --- a/src/rmd_flush_to_ogg.c +++ b/src/rmd_flush_to_ogg.c @@ -28,7 +28,7 @@ #include "rmd_flush_to_ogg.h" #include "rmd_encode_audio_buffers.h" -#include "rmd_encode_image_buffer.h" +#include "rmd_encode_image_buffers.h" #include "rmd_threads.h" #include "rmd_types.h" diff --git a/src/rmd_load_cache.c b/src/rmd_load_cache.c index 222628a..a4ee42b 100644 --- a/src/rmd_load_cache.c +++ b/src/rmd_load_cache.c @@ -29,7 +29,7 @@ #include "rmd_cache.h" #include "rmd_encode_audio_buffers.h" -#include "rmd_encode_image_buffer.h" +#include "rmd_encode_image_buffers.h" #include "rmd_macro.h" #include "rmd_threads.h" #include "rmd_types.h" diff --git a/src/rmd_threads.c b/src/rmd_threads.c index 279a767..9947eb6 100644 --- a/src/rmd_threads.c +++ b/src/rmd_threads.c @@ -31,7 +31,7 @@ #include "rmd_cache_frame.h" #include "rmd_capture_audio.h" #include "rmd_encode_audio_buffers.h" -#include "rmd_encode_image_buffer.h" +#include "rmd_encode_image_buffers.h" #include "rmd_flush_to_ogg.h" #include "rmd_get_frames.h" #include "rmd_jack.h" -- cgit v1.2.3