From cd2f6c3aca998c7e68aa6e4ccd0ad260426d28e8 Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Tue, 8 Sep 2020 23:45:17 -0700 Subject: encode_sound_buffer: rename to encode_audio_buffer Cosmetic rename to make naming consistent, normalizing on audio. This is a minimal rename and includes update, subsequent commit will change naming as appropriate in rmd_encode_audio_buffer.[ch] --- src/Makefile.am | 4 +- src/rmd_encode_audio_buffer.c | 178 ++++++++++++++++++++++++++++++++++++++++++ src/rmd_encode_audio_buffer.h | 51 ++++++++++++ src/rmd_encode_sound_buffer.c | 178 ------------------------------------------ src/rmd_encode_sound_buffer.h | 51 ------------ src/rmd_flush_to_ogg.c | 2 +- src/rmd_load_cache.c | 2 +- src/rmd_threads.c | 2 +- 8 files changed, 234 insertions(+), 234 deletions(-) create mode 100644 src/rmd_encode_audio_buffer.c create mode 100644 src/rmd_encode_audio_buffer.h delete mode 100644 src/rmd_encode_sound_buffer.c delete mode 100644 src/rmd_encode_sound_buffer.h diff --git a/src/Makefile.am b/src/Makefile.am index e01a5d8..ba429cb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,10 +12,10 @@ recordmydesktop_SOURCES = \ rmd_capture_audio.h \ rmd_encode_cache.c \ rmd_encode_cache.h \ + rmd_encode_audio_buffer.c \ + rmd_encode_audio_buffer.h \ rmd_encode_image_buffer.c \ rmd_encode_image_buffer.h \ - rmd_encode_sound_buffer.c \ - rmd_encode_sound_buffer.h \ rmd_error.c \ rmd_error.h \ rmd_flush_to_ogg.c \ diff --git a/src/rmd_encode_audio_buffer.c b/src/rmd_encode_audio_buffer.c new file mode 100644 index 0000000..1aa9943 --- /dev/null +++ b/src/rmd_encode_audio_buffer.c @@ -0,0 +1,178 @@ +/****************************************************************************** +* 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_audio_buffer.h" + +#include "rmd_jack.h" +#include "rmd_threads.h" +#include "rmd_types.h" + +#include + +#include +#include + + +void *rmdEncodeSoundBuffer(ProgData *pdata) { + int sampread = pdata->periodsize; +#ifdef HAVE_LIBJACK + void *jackbuf = NULL; + + if (pdata->args.use_jack) + jackbuf = malloc(pdata->sound_framesize * pdata->jdata->buffersize); +#endif + + rmdThreadsSetName("rmdEncodeSound"); + + pdata->v_encoding_clean = 0; + while (pdata->running) { + float **vorbis_buffer; + SndBuffer *buff = NULL; + + pthread_mutex_lock(&pdata->pause_mutex); + while (pdata->paused) + pthread_cond_wait(&pdata->pause_cond, &pdata->pause_mutex); + pthread_mutex_unlock(&pdata->pause_mutex); + + if (!pdata->args.use_jack) { + pthread_mutex_lock(&pdata->sound_buffer_mutex); + while (!pdata->sound_buffer && pdata->running) + pthread_cond_wait(&pdata->sound_data_read, &pdata->sound_buffer_mutex); + + buff = pdata->sound_buffer; + if (buff) + pdata->sound_buffer = buff->next; + pthread_mutex_unlock(&pdata->sound_buffer_mutex); + + if (!pdata->running) + break; + + vorbis_buffer = vorbis_analysis_buffer(&pdata->enc_data->m_vo_dsp, sampread); + + for (int i = 0, count = 0; i < sampread; i++) { + for (int j = 0; j < pdata->args.channels; j++) { + vorbis_buffer[j][i] = ((buff->data[count + 1] << 8) | + (0x00ff & (int)buff->data[count])) / + 32768.f; + count += 2; + } + } + free(buff->data); + free(buff); + } else { +#ifdef HAVE_LIBJACK + + pthread_mutex_lock(&pdata->sound_buffer_mutex); + while ( pdata->running && + jack_ringbuffer_read_space(pdata->jdata->sound_buffer) < + pdata->sound_framesize * pdata->jdata->buffersize) + pthread_cond_wait(&pdata->sound_data_read, &pdata->sound_buffer_mutex); + + if (pdata->running) + jack_ringbuffer_read( pdata->jdata->sound_buffer, + jackbuf, + (pdata->sound_framesize * + pdata->jdata->buffersize) + ); + + pthread_mutex_unlock(&pdata->sound_buffer_mutex); + + if (!pdata->running) + break; + + vorbis_buffer = vorbis_analysis_buffer(&pdata->enc_data->m_vo_dsp, sampread); + + for (int j = 0, count = 0; j < pdata->args.channels; j++) { + for (int i = 0; i < sampread; i++) { + vorbis_buffer[j][i] = ((float*)jackbuf)[count]; + count++; + } + } +#endif + } + vorbis_analysis_wrote(&pdata->enc_data->m_vo_dsp, sampread); + + pthread_mutex_lock(&pdata->libogg_mutex); + while (vorbis_analysis_blockout(&pdata->enc_data->m_vo_dsp, &pdata->enc_data->m_vo_block) == 1) { + + vorbis_analysis(&pdata->enc_data->m_vo_block, NULL); + vorbis_bitrate_addblock(&pdata->enc_data->m_vo_block); + + while (vorbis_bitrate_flushpacket(&pdata->enc_data->m_vo_dsp, &pdata->enc_data->m_ogg_pckt2)) { + ogg_stream_packetin(&pdata->enc_data->m_ogg_vs, &pdata->enc_data->m_ogg_pckt2); + } + } + pthread_mutex_unlock(&pdata->libogg_mutex); + } + + pthread_mutex_lock(&pdata->vorbis_lib_mutex); + pdata->v_encoding_clean = 1; + pthread_cond_signal(&pdata->vorbis_lib_clean); + pthread_mutex_unlock(&pdata->vorbis_lib_mutex); + pthread_exit(&errno); +} + +void rmdSyncEncodeSoundBuffer(ProgData *pdata, signed char *buff) { + int sampread = (buff != NULL) ? pdata->periodsize : 0; + float **vorbis_buffer = vorbis_analysis_buffer(&pdata->enc_data->m_vo_dsp, sampread); + + if (!pdata->args.use_jack) { + for (int i = 0, count = 0; i < sampread; i++) { + for (int j = 0; j < pdata->args.channels; j++) { + vorbis_buffer[j][i] = ((buff[count + 1] << 8) | + (0x00ff & (int)buff[count])) + / 32768.f; + count += 2; + } + } + } else { + for (int j = 0, count = 0; j < pdata->args.channels; j++) { + for (int i = 0; i < sampread; i++) { + vorbis_buffer[j][i] = ((float *)buff)[count]; + count++; + } + } + } + + vorbis_analysis_wrote(&pdata->enc_data->m_vo_dsp, sampread); + + pthread_mutex_lock(&pdata->libogg_mutex); + while (vorbis_analysis_blockout(&pdata->enc_data->m_vo_dsp, &pdata->enc_data->m_vo_block) == 1) { + + vorbis_analysis(&pdata->enc_data->m_vo_block, NULL); + vorbis_bitrate_addblock(&pdata->enc_data->m_vo_block); + + while (vorbis_bitrate_flushpacket(&pdata->enc_data->m_vo_dsp, &pdata->enc_data->m_ogg_pckt2)) + ogg_stream_packetin(&pdata->enc_data->m_ogg_vs, &pdata->enc_data->m_ogg_pckt2); + } + pthread_mutex_unlock(&pdata->libogg_mutex); + + if (!pdata->running) + pdata->enc_data->m_ogg_vs.e_o_s = 1; + + pdata->avd -= pdata->periodtime; +} diff --git a/src/rmd_encode_audio_buffer.h b/src/rmd_encode_audio_buffer.h new file mode 100644 index 0000000..7d5c312 --- /dev/null +++ b/src/rmd_encode_audio_buffer.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_SOUND_BUFFER_H +#define ENCODE_SOUND_BUFFER_H 1 + +#include "rmd_types.h" + + +/** +* Sound encoding thread. Picks up data from the buffer queue , +* encodes and places them on the vorbis stream. +* +* \param pdata ProgData struct containing all program data +*/ +void *rmdEncodeSoundBuffer(ProgData *pdata); + +/** +* As rmdEncodeSoundBuffer, only with the assumption that +* this is not a thread on it's own +* +* \param pdata ProgData struct containing all program data +* +*/ +void rmdSyncEncodeSoundBuffer(ProgData *pdata,signed char *buff); + + +#endif diff --git a/src/rmd_encode_sound_buffer.c b/src/rmd_encode_sound_buffer.c deleted file mode 100644 index 8a1d3d4..0000000 --- a/src/rmd_encode_sound_buffer.c +++ /dev/null @@ -1,178 +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_sound_buffer.h" - -#include "rmd_jack.h" -#include "rmd_threads.h" -#include "rmd_types.h" - -#include - -#include -#include - - -void *rmdEncodeSoundBuffer(ProgData *pdata) { - int sampread = pdata->periodsize; -#ifdef HAVE_LIBJACK - void *jackbuf = NULL; - - if (pdata->args.use_jack) - jackbuf = malloc(pdata->sound_framesize * pdata->jdata->buffersize); -#endif - - rmdThreadsSetName("rmdEncodeSound"); - - pdata->v_encoding_clean = 0; - while (pdata->running) { - float **vorbis_buffer; - SndBuffer *buff = NULL; - - pthread_mutex_lock(&pdata->pause_mutex); - while (pdata->paused) - pthread_cond_wait(&pdata->pause_cond, &pdata->pause_mutex); - pthread_mutex_unlock(&pdata->pause_mutex); - - if (!pdata->args.use_jack) { - pthread_mutex_lock(&pdata->sound_buffer_mutex); - while (!pdata->sound_buffer && pdata->running) - pthread_cond_wait(&pdata->sound_data_read, &pdata->sound_buffer_mutex); - - buff = pdata->sound_buffer; - if (buff) - pdata->sound_buffer = buff->next; - pthread_mutex_unlock(&pdata->sound_buffer_mutex); - - if (!pdata->running) - break; - - vorbis_buffer = vorbis_analysis_buffer(&pdata->enc_data->m_vo_dsp, sampread); - - for (int i = 0, count = 0; i < sampread; i++) { - for (int j = 0; j < pdata->args.channels; j++) { - vorbis_buffer[j][i] = ((buff->data[count + 1] << 8) | - (0x00ff & (int)buff->data[count])) / - 32768.f; - count += 2; - } - } - free(buff->data); - free(buff); - } else { -#ifdef HAVE_LIBJACK - - pthread_mutex_lock(&pdata->sound_buffer_mutex); - while ( pdata->running && - jack_ringbuffer_read_space(pdata->jdata->sound_buffer) < - pdata->sound_framesize * pdata->jdata->buffersize) - pthread_cond_wait(&pdata->sound_data_read, &pdata->sound_buffer_mutex); - - if (pdata->running) - jack_ringbuffer_read( pdata->jdata->sound_buffer, - jackbuf, - (pdata->sound_framesize * - pdata->jdata->buffersize) - ); - - pthread_mutex_unlock(&pdata->sound_buffer_mutex); - - if (!pdata->running) - break; - - vorbis_buffer = vorbis_analysis_buffer(&pdata->enc_data->m_vo_dsp, sampread); - - for (int j = 0, count = 0; j < pdata->args.channels; j++) { - for (int i = 0; i < sampread; i++) { - vorbis_buffer[j][i] = ((float*)jackbuf)[count]; - count++; - } - } -#endif - } - vorbis_analysis_wrote(&pdata->enc_data->m_vo_dsp, sampread); - - pthread_mutex_lock(&pdata->libogg_mutex); - while (vorbis_analysis_blockout(&pdata->enc_data->m_vo_dsp, &pdata->enc_data->m_vo_block) == 1) { - - vorbis_analysis(&pdata->enc_data->m_vo_block, NULL); - vorbis_bitrate_addblock(&pdata->enc_data->m_vo_block); - - while (vorbis_bitrate_flushpacket(&pdata->enc_data->m_vo_dsp, &pdata->enc_data->m_ogg_pckt2)) { - ogg_stream_packetin(&pdata->enc_data->m_ogg_vs, &pdata->enc_data->m_ogg_pckt2); - } - } - pthread_mutex_unlock(&pdata->libogg_mutex); - } - - pthread_mutex_lock(&pdata->vorbis_lib_mutex); - pdata->v_encoding_clean = 1; - pthread_cond_signal(&pdata->vorbis_lib_clean); - pthread_mutex_unlock(&pdata->vorbis_lib_mutex); - pthread_exit(&errno); -} - -void rmdSyncEncodeSoundBuffer(ProgData *pdata, signed char *buff) { - int sampread = (buff != NULL) ? pdata->periodsize : 0; - float **vorbis_buffer = vorbis_analysis_buffer(&pdata->enc_data->m_vo_dsp, sampread); - - if (!pdata->args.use_jack) { - for (int i = 0, count = 0; i < sampread; i++) { - for (int j = 0; j < pdata->args.channels; j++) { - vorbis_buffer[j][i] = ((buff[count + 1] << 8) | - (0x00ff & (int)buff[count])) - / 32768.f; - count += 2; - } - } - } else { - for (int j = 0, count = 0; j < pdata->args.channels; j++) { - for (int i = 0; i < sampread; i++) { - vorbis_buffer[j][i] = ((float *)buff)[count]; - count++; - } - } - } - - vorbis_analysis_wrote(&pdata->enc_data->m_vo_dsp, sampread); - - pthread_mutex_lock(&pdata->libogg_mutex); - while (vorbis_analysis_blockout(&pdata->enc_data->m_vo_dsp, &pdata->enc_data->m_vo_block) == 1) { - - vorbis_analysis(&pdata->enc_data->m_vo_block, NULL); - vorbis_bitrate_addblock(&pdata->enc_data->m_vo_block); - - while (vorbis_bitrate_flushpacket(&pdata->enc_data->m_vo_dsp, &pdata->enc_data->m_ogg_pckt2)) - ogg_stream_packetin(&pdata->enc_data->m_ogg_vs, &pdata->enc_data->m_ogg_pckt2); - } - pthread_mutex_unlock(&pdata->libogg_mutex); - - if (!pdata->running) - pdata->enc_data->m_ogg_vs.e_o_s = 1; - - pdata->avd -= pdata->periodtime; -} diff --git a/src/rmd_encode_sound_buffer.h b/src/rmd_encode_sound_buffer.h deleted file mode 100644 index 7d5c312..0000000 --- a/src/rmd_encode_sound_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_SOUND_BUFFER_H -#define ENCODE_SOUND_BUFFER_H 1 - -#include "rmd_types.h" - - -/** -* Sound encoding thread. Picks up data from the buffer queue , -* encodes and places them on the vorbis stream. -* -* \param pdata ProgData struct containing all program data -*/ -void *rmdEncodeSoundBuffer(ProgData *pdata); - -/** -* As rmdEncodeSoundBuffer, only with the assumption that -* this is not a thread on it's own -* -* \param pdata ProgData struct containing all program data -* -*/ -void rmdSyncEncodeSoundBuffer(ProgData *pdata,signed char *buff); - - -#endif diff --git a/src/rmd_flush_to_ogg.c b/src/rmd_flush_to_ogg.c index 6c5a0d8..ced0ea4 100644 --- a/src/rmd_flush_to_ogg.c +++ b/src/rmd_flush_to_ogg.c @@ -27,8 +27,8 @@ #include "config.h" #include "rmd_flush_to_ogg.h" +#include "rmd_encode_audio_buffer.h" #include "rmd_encode_image_buffer.h" -#include "rmd_encode_sound_buffer.h" #include "rmd_threads.h" #include "rmd_types.h" diff --git a/src/rmd_load_cache.c b/src/rmd_load_cache.c index 8130cf3..24c22e1 100644 --- a/src/rmd_load_cache.c +++ b/src/rmd_load_cache.c @@ -28,8 +28,8 @@ #include "rmd_load_cache.h" #include "rmd_cache.h" +#include "rmd_encode_audio_buffer.h" #include "rmd_encode_image_buffer.h" -#include "rmd_encode_sound_buffer.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 1859a56..f7937c4 100644 --- a/src/rmd_threads.c +++ b/src/rmd_threads.c @@ -30,8 +30,8 @@ #include "rmd_cache_audio.h" #include "rmd_cache_frame.h" #include "rmd_capture_audio.h" +#include "rmd_encode_audio_buffer.h" #include "rmd_encode_image_buffer.h" -#include "rmd_encode_sound_buffer.h" #include "rmd_flush_to_ogg.h" #include "rmd_get_frame.h" #include "rmd_jack.h" -- cgit v1.2.3