Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix audio for Coldfire targets - the EMAC was being initialised in the main thread, not the audio thread. Also fix some comments and kill the video thread if the audio thread can not be created.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11883 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dave Chapman 2007-01-02 13:36:17 +00:00
parent e367ec3a38
commit 5395246004
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/plugins/mpegplayer/mpegplayer.c
View file

@ -307,7 +307,6 @@ static void init_mad(void* mad_frame_overlap)
mad_stream_init(&stream);
mad_frame_init(&frame);
mad_synth_init(&synth);
/* We do this so libmad doesn't try to call codec_calloc() */
frame.overlap = mad_frame_overlap;
@ -532,6 +531,9 @@ static void mad_decode(void)
int file_end = 0; /* A count of the errors in each frame */
int framelength;
/* We need this here to init the EMAC for Coldfire targets */
mad_synth_init(&synth);
init_pcmbuf();
/* This is the decoding loop. */
@ -825,7 +827,8 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
/* Initialise our malloc buffer */
mpeg2_alloc_init(audiobuf,audiosize);
/* Grab most of the buffer for the compressed video - leave 4MB for mpeg audio, and 512KB for PCM audio data */
/* Grab most of the buffer for the compressed video - leave some for
PCM audio data and some for libmpeg2 malloc use. */
buffer_size = audiosize - (PCMBUFFER_SIZE+AUDIOBUFFER_SIZE+LIBMPEG2BUFFER_SIZE);
DEBUGF("audiosize=%d, buffer_size=%d\n",audiosize,buffer_size);
buffer = mpeg2_malloc(buffer_size,-1);
@ -839,7 +842,6 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
if (mpa_buffer == NULL)
return PLUGIN_ERROR;
/* Use 0.5MB of the remaining 4MB for audio data */
pcm_buffer_size = PCMBUFFER_SIZE;
pcm_buffer = mpeg2_malloc(pcm_buffer_size,-2);
@ -922,6 +924,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
(uint8_t*)audio_stack,AUDIO_STACKSIZE,"mpgaudio" IF_PRIO(,PRIORITY_PLAYBACK))) == NULL)
{
rb->splash(HZ,true,"Cannot create audio thread!");
rb->remove_thread(videothread_id);
return PLUGIN_ERROR;
}