~ubuntu-branches/ubuntu/karmic/recordmydesktop/karmic

Viewing changes to src/rmd_encode_sound_buffer.c

Committer: Bazaar Package Importer
Author(s): Alan Pope
Date: 2009-04-21 10:57:22 UTC
mfrom: (1.1.5 upstream)
Revision ID: james.westby@ubuntu.com-20090421105722-w6l4gz958gva15wn

Tags: 0.3.8.1-0ubuntu1

* New upstream release (LP: #364674)
* debian/control: Fixed libjack0.100.0-dev dependancy
* debian/control: Fixed project home page

files added:
src/rmd.c

src/rmd_cache.h

src/rmd_cache_audio.c

src/rmd_cache_audio.h

src/rmd_cache_frame.c

src/rmd_cache_frame.h

src/rmd_capture_sound.c

src/rmd_capture_sound.h

src/rmd_encode_cache.c

src/rmd_encode_cache.h

src/rmd_encode_image_buffer.c

src/rmd_encode_image_buffer.h

src/rmd_encode_sound_buffer.c

src/rmd_encode_sound_buffer.h

src/rmd_error.h

src/rmd_flush_to_ogg.c

src/rmd_flush_to_ogg.h

src/rmd_frame.h

src/rmd_get_frame.c

src/rmd_get_frame.h

src/rmd_getzpixmap.c

src/rmd_getzpixmap.h

src/rmd_init_encoder.c

src/rmd_init_encoder.h

src/rmd_initialize_data.c

src/rmd_initialize_data.h

src/rmd_jack.h

src/rmd_load_cache.c

src/rmd_load_cache.h

src/rmd_macro.h

src/rmd_make_dummy_pointer.c

src/rmd_make_dummy_pointer.h

src/rmd_math.c

src/rmd_math.h

src/rmd_opendev.c

src/rmd_opendev.h

src/rmd_parseargs.c

src/rmd_parseargs.h

src/rmd_poll_events.c

src/rmd_poll_events.h

src/rmd_queryextensions.c

src/rmd_queryextensions.h

src/rmd_rectinsert.c

src/rmd_rectinsert.h

src/rmd_register_callbacks.c

src/rmd_register_callbacks.h

src/rmd_rescue.h

src/rmd_setbrwindow.c

src/rmd_setbrwindow.h

src/rmd_shortcuts.c

src/rmd_shortcuts.h

src/rmd_specsfile.c

src/rmd_specsfile.h

src/rmd_threads.c

src/rmd_threads.h

src/rmd_timer.h

src/rmd_types.h

src/rmd_update_image.c

src/rmd_update_image.h

src/rmd_wm_check.c

src/rmd_wm_check.h

src/rmd_wm_is_compositing.c

src/rmd_wm_is_compositing.h

src/rmd_yuv_utils.c

src/rmd_yuv_utils.h

src/skeleton.h

src/test-rectinsert-data.c

src/test-rectinsert-data.h

src/test-rectinsert-types.h

src/test-rectinsert.c

files removed:
include

include/Makefile.am

include/Makefile.in

include/recordmydesktop.h

include/rmdfunc.h

include/rmdmacro.h

include/rmdtypes.h

include/skeleton.h

mkinstalldirs

src/bgr_to_yuv.c

src/cache_audio.c

src/cache_frame.c

src/capture_sound.c

src/cleanup.c

src/encode_cache.c

src/encode_image_buffer.c

src/encode_sound_buffer.c

src/flush_to_ogg.c

src/get_frame.c

src/getzpixmap.c

src/init_encoder.c

src/initialize_data.c

src/load_cache.c

src/make_dummy_pointer.c

src/opendev.c

src/parseargs.c

src/poll_events.c

src/queryextensions.c

src/recordmydesktop.c

src/rectinsert.c

src/register_callbacks.c

src/rmdthreads.c

src/setbrwindow.c

src/shortcuts.c

src/specsfile.c

src/update_image.c

src/wm_check.c

files modified:
ChangeLog

Makefile.am

Makefile.in

aclocal.m4

compile

config.guess

config.h.in

config.sub

configure

configure.ac

debian/changelog

debian/control

depcomp

doc/Makefile.in

doc/recordmydesktop.1

install-sh

missing

src/Makefile.am

src/Makefile.in

src/rmd_cache.c

src/rmd_error.c

src/rmd_frame.c

src/rmd_jack.c

src/rmd_rescue.c

src/rmd_timer.c

src/skeleton.c

Show diffs side-by-side

added added

removed removed

src/rmd_encode_sound_buffer.c

/******************************************************************************

* recordMyDesktop *

*******************************************************************************

* *

* 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_types.h"

#include <pthread.h>

#include <stdlib.h>

#include <errno.h>

void *EncodeSoundBuffer(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

pdata->v_encoding_clean=0;

while((pdata->running)){

float **vorbis_buffer;

int count=0,i,j;

SndBuffer *buff=NULL;

if (pdata->paused) {

pthread_mutex_lock(&pdata->pause_mutex);

pthread_cond_wait(&pdata->pause_cond, &pdata->pause_mutex);

pthread_mutex_unlock(&pdata->pause_mutex);

}

if(!pdata->args.use_jack){

if(pdata->sound_buffer==NULL){

pdata->v_enc_thread_waiting=1;

pthread_mutex_lock(&pdata->snd_buff_ready_mutex);

pthread_cond_wait(&pdata->sound_data_read,

&pdata->snd_buff_ready_mutex);

pthread_mutex_unlock(&pdata->snd_buff_ready_mutex);

pdata->v_enc_thread_waiting=0;

}

if(pdata->sound_buffer==NULL || !pdata->running)

break;

pthread_mutex_lock(&pdata->sound_buffer_mutex);

buff=pdata->sound_buffer;

//advance the list

pdata->sound_buffer=pdata->sound_buffer->next;

pthread_mutex_unlock(&pdata->sound_buffer_mutex);

vorbis_buffer=vorbis_analysis_buffer(&pdata->enc_data->m_vo_dsp,

sampread);

for(i=0;i<sampread;i++){

for(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

if((*jack_ringbuffer_read_space)(pdata->jdata->sound_buffer)>=

(pdata->sound_framesize*pdata->jdata->buffersize)){

(*jack_ringbuffer_read)(pdata->jdata->sound_buffer,

jackbuf,

(pdata->sound_framesize*

pdata->jdata->buffersize));

vorbis_buffer=vorbis_analysis_buffer(&pdata->enc_data->m_vo_dsp,

sampread);

for(j=0;j<pdata->args.channels;j++){

100

for(i=0;i<sampread;i++){

101

vorbis_buffer[j][i]=((float*)jackbuf)[count];

102

count++;

103

}

104

}

105

}

106

else{

107

pdata->v_enc_thread_waiting=1;

108

pthread_mutex_lock(&pdata->snd_buff_ready_mutex);

109

pthread_cond_wait(&pdata->sound_data_read,

110

&pdata->snd_buff_ready_mutex);

111

pthread_mutex_unlock(&pdata->snd_buff_ready_mutex);

112

pdata->v_enc_thread_waiting=0;

113

continue;

114

}

115

#endif

116

}

117

vorbis_analysis_wrote(&pdata->enc_data->m_vo_dsp,sampread);

118

119

pthread_mutex_lock(&pdata->libogg_mutex);

120

while(vorbis_analysis_blockout(&pdata->enc_data->m_vo_dsp,

121

&pdata->enc_data->m_vo_block)==1){

122

123

vorbis_analysis(&pdata->enc_data->m_vo_block,NULL);

124

vorbis_bitrate_addblock(&pdata->enc_data->m_vo_block);

125

126

while(vorbis_bitrate_flushpacket(&pdata->enc_data->m_vo_dsp,

127

&pdata->enc_data->m_ogg_pckt2)){

128

ogg_stream_packetin(&pdata->enc_data->m_ogg_vs,

129

&pdata->enc_data->m_ogg_pckt2);

130

}

131

}

132

pthread_mutex_unlock(&pdata->libogg_mutex);

133

134

pdata->avd-=pdata->periodtime;

135

136

137

}

138

139

pdata->v_encoding_clean=1;

140

pthread_mutex_lock(&pdata->vorbis_lib_mutex);

141

pthread_cond_signal(&pdata->vorbis_lib_clean);

142

pthread_mutex_unlock(&pdata->vorbis_lib_mutex);

143

pthread_exit(&errno);

144

}

145

146

void SyncEncodeSoundBuffer(ProgData *pdata,signed char *buff){

147

float **vorbis_buffer;

148

int count=0,i,j;

149

int sampread=(buff!=NULL)?pdata->periodsize:0;

150

151

vorbis_buffer=vorbis_analysis_buffer(&pdata->enc_data->m_vo_dsp,sampread);

152

153

if(!pdata->args.use_jack){

154

for(i=0;i<sampread;i++){

155

for(j=0;j<pdata->args.channels;j++){

156

vorbis_buffer[j][i]=((buff[count+1]<<8)|

157

(0x00ff&(int)buff[count]))/

158

32768.f;

159

count+=2;

160

}

161

}

162

}

163

else{

164

for(j=0;j<pdata->args.channels;j++){

165

for(i=0;i<sampread;i++){

166

vorbis_buffer[j][i]=((float*)buff)[count];

167

count++;

168

}

169

}

170

}

171

172

vorbis_analysis_wrote(&pdata->enc_data->m_vo_dsp,sampread);

173

174

pthread_mutex_lock(&pdata->libogg_mutex);

175

while(vorbis_analysis_blockout(&pdata->enc_data->m_vo_dsp,

176

&pdata->enc_data->m_vo_block)==1){

177

178

vorbis_analysis(&pdata->enc_data->m_vo_block,NULL);

179

vorbis_bitrate_addblock(&pdata->enc_data->m_vo_block);

180

181

while(vorbis_bitrate_flushpacket(&pdata->enc_data->m_vo_dsp,

182

&pdata->enc_data->m_ogg_pckt2)){

183

ogg_stream_packetin(&pdata->enc_data->m_ogg_vs,

184

&pdata->enc_data->m_ogg_pckt2);

185

}

186

}

187

pthread_mutex_unlock(&pdata->libogg_mutex);

188

189

if(!pdata->running)pdata->enc_data->m_ogg_vs.e_o_s=1;

190

191

pdata->avd-=pdata->periodtime;

192

}

193

Older »