From 74976c1484d7c8a89a290ffc7e4a7525874278b4 Mon Sep 17 00:00:00 2001 From: Linus Nielsen Feltzing Date: Wed, 31 Dec 2003 03:13:29 +0000 Subject: New recording feature: Prerecord up to 30 seconds before you press the Play key. Especially useful for FM radio recording. Also fixed a bug which didn't apply the recording settings correctly in the Radio screen. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4183 a1c6a512-1295-4272-9138-f99709370657 --- firmware/mpeg.c | 582 ++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 400 insertions(+), 182 deletions(-) (limited to 'firmware/mpeg.c') diff --git a/firmware/mpeg.c b/firmware/mpeg.c index 80e871597e..43da221800 100644 --- a/firmware/mpeg.c +++ b/firmware/mpeg.c @@ -44,6 +44,7 @@ extern void bitswap(unsigned char *data, int length); #ifdef HAVE_MAS3587F static void init_recording(void); static void init_playback(void); +static void start_prerecording(void); static void start_recording(void); static void stop_recording(void); static int get_unsaved_space(void); @@ -497,6 +498,17 @@ static char recording_filename[MAX_PATH]; static int rec_frequency_index; /* For create_xing_header() calls */ static int rec_version_index; /* For create_xing_header() calls */ static bool disable_xing_header; /* When splitting files */ + +static bool prerecording; /* True if prerecording is enabled */ +static bool is_prerecording; /* True if we are prerecording */ +static int prerecord_buffer[MPEG_MAX_PRERECORD_SECONDS]; /* Array of buffer + indexes for each + prerecorded + second */ +static int prerecord_index; /* Current index in the prerecord buffer */ +static int prerecording_max_seconds; /* Max number of seconds to store */ +static int prerecord_count; /* Number of seconds in the prerecord buffer */ +static int prerecord_timeout; /* The tick count of the next prerecord data store */ #endif static int mpeg_file; @@ -865,17 +877,38 @@ static void dma_tick(void) num_rec_bytes += i; - /* Signal to save the data if we are running out of buffer - space */ - num_bytes = mp3buf_write - mp3buf_read; - if(num_bytes < 0) - num_bytes += mp3buflen; + if(is_prerecording) + { + if(TIME_AFTER(current_tick, prerecord_timeout)) + { + prerecord_timeout = current_tick + HZ; + + /* Store the write pointer every second */ + prerecord_buffer[prerecord_index++] = mp3buf_write; + + /* Wrap if necessary */ + if(prerecord_index == prerecording_max_seconds) + prerecord_index = 0; - if(mp3buflen - num_bytes < MPEG_RECORDING_LOW_WATER && !saving) + /* Update the number of seconds recorded */ + if(prerecord_count < prerecording_max_seconds) + prerecord_count++; + } + } + else { - saving = true; - queue_post(&mpeg_queue, MPEG_SAVE_DATA, 0); - wake_up_thread(); + /* Signal to save the data if we are running out of buffer + space */ + num_bytes = mp3buf_write - mp3buf_read; + if(num_bytes < 0) + num_bytes += mp3buflen; + + if(mp3buflen - num_bytes < MPEG_RECORDING_LOW_WATER && !saving) + { + saving = true; + queue_post(&mpeg_queue, MPEG_SAVE_DATA, 0); + wake_up_thread(); + } } } } @@ -1887,20 +1920,84 @@ static void mpeg_thread(void) switch(ev.id) { case MPEG_RECORD: - DEBUGF("Recording...\n"); - reset_mp3_buffer(); + if(is_prerecording) + { + int startpos, i; + + /* Go back prerecord_count seconds in the buffer */ + startpos = prerecord_index - prerecord_count; + if(startpos < 0) + startpos += prerecording_max_seconds; + + /* Read the mp3 buffer pointer from the prerecord buffer */ + startpos = prerecord_buffer[startpos]; + + DEBUGF("Start looking at address %x (%x)\n", + mp3buf+startpos, startpos); + + saved_header = get_last_recorded_header(); + + mem_find_next_frame(startpos, &offset, 5000, + saved_header); + + mp3buf_read = startpos + offset; + + DEBUGF("New mp3buf_read address: %x (%x)\n", + mp3buf+mp3buf_read, mp3buf_read); - /* Advance the write pointer to make - room for an ID3 tag plus a VBR header */ - mp3buf_write = MPEG_RESERVED_HEADER_SPACE; - memset(mp3buf, 0, MPEG_RESERVED_HEADER_SPACE); + /* Make room for headers */ + mp3buf_read -= MPEG_RESERVED_HEADER_SPACE; + if(mp3buf_read < 0) + { + /* Clear the bottom half */ + memset(mp3buf, 0, + mp3buf_read + MPEG_RESERVED_HEADER_SPACE); - /* Insert the ID3 header */ - memcpy(mp3buf, empty_id3_header, sizeof(empty_id3_header)); + /* And the top half */ + mp3buf_read += mp3buflen; + memset(mp3buf + mp3buf_read, 0, + mp3buflen - mp3buf_read); + } + else + { + memset(mp3buf + mp3buf_read, 0, + MPEG_RESERVED_HEADER_SPACE); + } + + /* Copy the empty ID3 header */ + startpos = mp3buf_read; + for(i = 0;i < (int)sizeof(empty_id3_header);i++) + { + mp3buf[startpos++] = empty_id3_header[i]; + if(startpos == mp3buflen) + startpos = 0; + } + + DEBUGF("New mp3buf_read address (reservation): %x\n", + mp3buf+mp3buf_read); + + DEBUGF("Prerecording...\n"); + } + else + { + reset_mp3_buffer(); + + num_rec_bytes = 0; + + /* Advance the write pointer to make + room for an ID3 tag plus a VBR header */ + mp3buf_write = MPEG_RESERVED_HEADER_SPACE; + memset(mp3buf, 0, MPEG_RESERVED_HEADER_SPACE); + + /* Insert the ID3 header */ + memcpy(mp3buf, empty_id3_header, + sizeof(empty_id3_header)); + + DEBUGF("Recording...\n"); + } start_recording(); - demand_irq_enable(true); - + mpeg_file = open(recording_filename, O_WRONLY|O_CREAT); if(mpeg_file < 0) @@ -1910,14 +2007,13 @@ static void mpeg_thread(void) case MPEG_STOP: DEBUGF("MPEG_STOP\n"); - demand_irq_enable(false); /* Store the last recorded header for later use by the Xing header generation */ saved_header = get_last_recorded_header(); stop_recording(); - + /* Save the remaining data in the buffer */ stop_pending = true; queue_post(&mpeg_queue, MPEG_SAVE_DATA, 0); @@ -1942,6 +2038,11 @@ static void mpeg_thread(void) if(num_recorded_frames == 0x7ffff) num_recorded_frames = 0; + /* Also, if we have been prerecording, the frame count + will be wrong */ + if(prerecording) + num_recorded_frames = 0; + /* saved_header is saved right before stopping the MAS */ framelen = create_xing_header(mpeg_file, 0, @@ -1970,6 +2071,11 @@ static void mpeg_thread(void) } } #endif + + if(prerecording) + { + start_prerecording(); + } mpeg_stop_done = true; break; @@ -2117,7 +2223,6 @@ static void mpeg_thread(void) if(errno == ENOSPC) { mpeg_errno = MPEGERR_DISK_FULL; - demand_irq_enable(false); stop_recording(); queue_post(&mpeg_queue, MPEG_STOP_DONE, 0); break; @@ -2161,18 +2266,22 @@ static void mpeg_thread(void) break; case SYS_USB_CONNECTED: - is_playing = false; - paused = false; - stop_playing(); -#ifndef SIMULATOR + /* We can safely go to USB mode if no recording + is taking place */ + if((!is_recording || is_prerecording) && mpeg_stop_done) + { + /* Even if we aren't recording, we still call this + function, to put the MAS in monitoring mode, + to save power. */ + stop_recording(); - /* Tell the USB thread that we are safe */ - DEBUGF("mpeg_thread got SYS_USB_CONNECTED\n"); - usb_acknowledge(SYS_USB_CONNECTED_ACK); + /* Tell the USB thread that we are safe */ + DEBUGF("mpeg_thread got SYS_USB_CONNECTED\n"); + usb_acknowledge(SYS_USB_CONNECTED_ACK); - /* Wait until the USB cable is extracted again */ - usb_wait_for_disconnect(&mpeg_queue); -#endif + /* Wait until the USB cable is extracted again */ + usb_wait_for_disconnect(&mpeg_queue); + } break; } } @@ -2245,22 +2354,90 @@ bool mpeg_has_changed_track(void) } #ifdef HAVE_MAS3587F -void mpeg_init_recording(void) +void mpeg_init_playback(void) { - init_recording_done = false; - queue_post(&mpeg_queue, MPEG_INIT_RECORDING, NULL); + init_playback_done = false; + queue_post(&mpeg_queue, MPEG_INIT_PLAYBACK, NULL); - while(!init_recording_done) + while(!init_playback_done) sleep_thread(); wake_up_thread(); } -void mpeg_init_playback(void) +static void init_playback(void) { - init_playback_done = false; - queue_post(&mpeg_queue, MPEG_INIT_PLAYBACK, NULL); + unsigned long val; + int rc; - while(!init_playback_done) + if(mpeg_mode == MPEG_ENCODER) + stop_recording(); + + stop_dma(); + + mas_reset(); + + /* Enable the audio CODEC and the DSP core, max analog voltage range */ + rc = mas_direct_config_write(MAS_CONTROL, 0x8c00); + if(rc < 0) + panicf("mas_ctrl_w: %d", rc); + + /* Stop the current application */ + val = 0; + mas_writemem(MAS_BANK_D0,0x7f6,&val,1); + do + { + mas_readmem(MAS_BANK_D0, 0x7f7, &val, 1); + } while(val); + + /* Enable the D/A Converter */ + mas_codec_writereg(0x0, 0x0001); + + /* ADC scale 0%, DSP scale 100% */ + mas_codec_writereg(6, 0x0000); + mas_codec_writereg(7, 0x4000); + + /* Disable SDO and SDI */ + val = 0x0d; + mas_writemem(MAS_BANK_D0,0x7f2,&val,1); + + /* Set Demand mode and validate all settings */ + val = 0x25; + mas_writemem(MAS_BANK_D0,0x7f1,&val,1); + + /* Start the Layer2/3 decoder applications */ + val = 0x0c; + mas_writemem(MAS_BANK_D0,0x7f6,&val,1); + do + { + mas_readmem(MAS_BANK_D0, 0x7f7, &val, 1); + } while((val & 0x0c) != 0x0c); + + mpeg_sound_channel_config(MPEG_SOUND_STEREO); + + mpeg_mode = MPEG_DECODER; + + /* set IRQ6 to edge detect */ + ICR |= 0x02; + + /* set IRQ6 prio 8 */ + IPRB = ( IPRB & 0xff0f ) | 0x0080; + + DEBUGF("MAS Decoding application started\n"); +} + +/**************************************************************************** + ** + ** + ** Recording functions + ** + ** + ***************************************************************************/ +void mpeg_init_recording(void) +{ + init_recording_done = false; + queue_post(&mpeg_queue, MPEG_INIT_RECORDING, NULL); + + while(!init_recording_done) sleep_thread(); wake_up_thread(); } @@ -2270,6 +2447,9 @@ static void init_recording(void) unsigned long val; int rc; + /* Disable IRQ6 */ + IPRB &= 0xff0f; + stop_playing(); is_playing = false; paused = false; @@ -2283,6 +2463,9 @@ static void init_recording(void) /* Init the recording variables */ is_recording = false; + is_prerecording = false; + + mpeg_stop_done = true; mas_reset(); @@ -2324,7 +2507,7 @@ static void init_recording(void) /* No mute */ val = 0; - mas_writemem(MAS_BANK_D0, 0x7f9, &val, 1); + mas_writemem(MAS_BANK_D0, 0x7f9, &val, 1); /* Set Demand mode, no monitoring and validate all settings */ val = 0x125; @@ -2345,70 +2528,16 @@ static void init_recording(void) Now let's wait for some data to be encoded. */ sleep(20); - /* Disable IRQ6 */ - IPRB &= 0xff0f; + /* Now set it to Monitoring mode as default, saves power */ + val = 0x525; + mas_writemem(MAS_BANK_D0, 0x7f1, &val, 1); mpeg_mode = MPEG_ENCODER; DEBUGF("MAS Recording application started\n"); -} - -static void init_playback(void) -{ - unsigned long val; - int rc; - - stop_dma(); - - mas_reset(); - - /* Enable the audio CODEC and the DSP core, max analog voltage range */ - rc = mas_direct_config_write(MAS_CONTROL, 0x8c00); - if(rc < 0) - panicf("mas_ctrl_w: %d", rc); - - /* Stop the current application */ - val = 0; - mas_writemem(MAS_BANK_D0,0x7f6,&val,1); - do - { - mas_readmem(MAS_BANK_D0, 0x7f7, &val, 1); - } while(val); - - /* Enable the D/A Converter */ - mas_codec_writereg(0x0, 0x0001); - - /* ADC scale 0%, DSP scale 100% */ - mas_codec_writereg(6, 0x0000); - mas_codec_writereg(7, 0x4000); - - /* Disable SDO and SDI */ - val = 0x0d; - mas_writemem(MAS_BANK_D0,0x7f2,&val,1); - - /* Set Demand mode and validate all settings */ - val = 0x25; - mas_writemem(MAS_BANK_D0,0x7f1,&val,1); - - /* Start the Layer2/3 decoder applications */ - val = 0x0c; - mas_writemem(MAS_BANK_D0,0x7f6,&val,1); - do - { - mas_readmem(MAS_BANK_D0, 0x7f7, &val, 1); - } while((val & 0x0c) != 0x0c); - - mpeg_sound_channel_config(MPEG_SOUND_STEREO); - - mpeg_mode = MPEG_DECODER; - - /* set IRQ6 to edge detect */ - ICR |= 0x02; - - /* set IRQ6 prio 8 */ - IPRB = ( IPRB & 0xff0f ) | 0x0080; - DEBUGF("MAS Decoding application started\n"); + /* At this point, all settings are the reset MAS defaults, next thing is to + call mpeg_set_recording_options(). */ } void mpeg_record(char *filename) @@ -2418,53 +2547,109 @@ void mpeg_record(char *filename) strncpy(recording_filename, filename, MAX_PATH - 1); recording_filename[MAX_PATH - 1] = 0; - num_rec_bytes = 0; disable_xing_header = false; queue_post(&mpeg_queue, MPEG_RECORD, NULL); } -static void start_recording(void) +static void start_prerecording(void) { unsigned long val; - num_recorded_frames = 0; + DEBUGF("Starting prerecording\n"); - /* Stop monitoring and record for real */ + prerecord_index = 0; + prerecord_count = 0; + prerecord_timeout = current_tick + HZ; + memset(prerecord_buffer, 0, sizeof(prerecord_buffer)); + reset_mp3_buffer(); + + is_prerecording = true; + + /* Stop monitoring and start the encoder */ mas_readmem(MAS_BANK_D0, 0x7f1, &val, 1); val &= ~(1 << 10); val |= 1; mas_writemem(MAS_BANK_D0, 0x7f1, &val, 1); + DEBUGF("mas_writemem(MAS_BANK_D0, 0x7f1, %x)\n", val); /* Wait until the DSP has accepted the settings */ do { mas_readmem(MAS_BANK_D0, 0x7f1, &val,1); } while(val & 1); - - sleep(20); - /* Store the current time */ - record_start_time = current_tick; + sleep(20); is_recording = true; stop_pending = false; saving = false; + + demand_irq_enable(true); +} + +static void start_recording(void) +{ + unsigned long val; + + num_recorded_frames = 0; + + if(is_prerecording) + { + /* This will make the IRQ handler start recording + for real, i.e send MPEG_SAVE_DATA messages when + the buffer is full */ + is_prerecording = false; + } + else + { + /* If prerecording is off, we need to stop the monitoring + and start the encoder */ + mas_readmem(MAS_BANK_D0, 0x7f1, &val, 1); + val &= ~(1 << 10); + val |= 1; + mas_writemem(MAS_BANK_D0, 0x7f1, &val, 1); + DEBUGF("mas_writemem(MAS_BANK_D0, 0x7f1, %x)\n", val); + + /* Wait until the DSP has accepted the settings */ + do + { + mas_readmem(MAS_BANK_D0, 0x7f1, &val,1); + } while(val & 1); + + sleep(20); + } + + is_recording = true; + stop_pending = false; + saving = false; + + /* Store the current time */ + if(prerecording) + record_start_time = current_tick - prerecord_count * HZ; + else + record_start_time = current_tick; + + demand_irq_enable(true); } static void stop_recording(void) { unsigned long val; - is_recording = false; + demand_irq_enable(false); + is_recording = false; + is_prerecording = false; + /* Read the number of frames recorded */ mas_readmem(MAS_BANK_D0, 0xfd0, &num_recorded_frames, 1); - + /* Start monitoring */ mas_readmem(MAS_BANK_D0, 0x7f1, &val, 1); val |= (1 << 10) | 1; mas_writemem(MAS_BANK_D0, 0x7f1, &val, 1); - + DEBUGF("mas_writemem(MAS_BANK_D0, 0x7f1, %x)\n", val); + /* Wait until the DSP has accepted the settings */ do { @@ -2474,6 +2659,82 @@ static void stop_recording(void) drain_dma_buffer(); } +void mpeg_set_recording_options(int frequency, int quality, + int source, int channel_mode, + bool editable, int prerecord_time) +{ + bool is_mpeg1; + unsigned long val; + + is_mpeg1 = (frequency < 3)?true:false; + + rec_version_index = is_mpeg1?3:2; + rec_frequency_index = frequency % 3; + + val = (quality << 17) | + (rec_frequency_index << 10) | + ((is_mpeg1?1:0) << 9) | + (1 << 8) | /* CRC on */ + (((channel_mode * 2 + 1) & 3) << 6) | + (1 << 5) /* MS-stereo */ | + (1 << 2) /* Is an original */; + mas_writemem(MAS_BANK_D0, 0x7f0, &val,1); + + DEBUGF("mas_writemem(MAS_BANK_D0, 0x7f0, %x)\n", val); + + val = editable?4:0; + mas_writemem(MAS_BANK_D0, 0x7f9, &val,1); + + DEBUGF("mas_writemem(MAS_BANK_D0, 0x7f9, %x)\n", val); + + val = (((source < 2)?1:2) << 8) | /* Input select */ + (1 << 5) | /* SDO strobe invert */ + ((is_mpeg1?0:1) << 3) | + (1 << 2) | /* Inverted SIBC clock signal */ + 1; /* Validate */ + mas_writemem(MAS_BANK_D0, 0x7f1, &val,1); + + DEBUGF("mas_writemem(MAS_BANK_D0, 0x7f1, %x)\n", val); + + drain_dma_buffer(); + + if(source == 0) /* Mic */ + { + /* Copy left channel to right (mono mode) */ + mas_codec_writereg(8, 0x8000); + } + else + { + /* Stereo input mode */ + mas_codec_writereg(8, 0); + } + + prerecording_max_seconds = prerecord_time; + if(prerecording_max_seconds) + { + prerecording = true; + start_prerecording(); + } + else + { + prerecording = false; + is_prerecording = false; + is_recording = false; + } +} + +/* If use_mic is true, the left gain is used */ +void mpeg_set_recording_gain(int left, int right, bool use_mic) +{ + /* Enable both left and right A/D */ + mas_codec_writereg(0x0, + (left << 12) | + (right << 8) | + (left << 4) | + (use_mic?0x0008:0) | /* Connect left A/D to mic */ + 0x0007); +} + void mpeg_new_file(char *filename) { mpeg_errno = 0; @@ -2492,16 +2753,37 @@ void mpeg_new_file(char *filename) unsigned long mpeg_recorded_time(void) { + if(is_prerecording) + return prerecord_count * HZ; + if(is_recording) return current_tick - record_start_time; - else - return 0; + + return 0; } unsigned long mpeg_num_recorded_bytes(void) { + int num_bytes; + int index; + if(is_recording) - return num_rec_bytes; + { + if(is_prerecording) + { + index = prerecord_index - prerecord_count; + if(index < 0) + index += prerecording_max_seconds; + + num_bytes = mp3buf_write - prerecord_buffer[index]; + if(num_bytes < 0) + num_bytes += mp3buflen; + + return num_bytes;; + } + else + return num_rec_bytes; + } else return 0; } @@ -2660,8 +2942,11 @@ int mpeg_status(void) ret |= MPEG_STATUS_PAUSE; #ifdef HAVE_MAS3587F - if(is_recording) + if(is_recording && !is_prerecording) ret |= MPEG_STATUS_RECORD; + + if(is_prerecording) + ret |= MPEG_STATUS_PRERECORD; #endif if(mpeg_errno) @@ -3057,73 +3342,6 @@ void mpeg_set_pitch(int pitch) } #endif -#ifdef HAVE_MAS3587F -void mpeg_set_recording_options(int frequency, int quality, - int source, int channel_mode, - bool editable) -{ - bool is_mpeg1; - unsigned long val; - - is_mpeg1 = (frequency < 3)?true:false; - - rec_version_index = is_mpeg1?3:2; - rec_frequency_index = frequency % 3; - - val = (quality << 17) | - (rec_frequency_index << 10) | - ((is_mpeg1?1:0) << 9) | - (1 << 8) | /* CRC on */ - (((channel_mode * 2 + 1) & 3) << 6) | - (1 << 5) /* MS-stereo */ | - (1 << 2) /* Is an original */; - mas_writemem(MAS_BANK_D0, 0x7f0, &val,1); - - DEBUGF("mas_writemem(MAS_BANK_D0, 0x7f0, %x)\n", val); - - val = editable?4:0; - mas_writemem(MAS_BANK_D0, 0x7f9, &val,1); - - DEBUGF("mas_writemem(MAS_BANK_D0, 0x7f9, %x)\n", val); - - val = ((!is_recording << 10) | /* Monitoring */ - ((source < 2)?1:2) << 8) | /* Input select */ - (1 << 5) | /* SDO strobe invert */ - ((is_mpeg1?0:1) << 3) | - (1 << 2) | /* Inverted SIBC clock signal */ - 1; /* Validate */ - mas_writemem(MAS_BANK_D0, 0x7f1, &val,1); - - DEBUGF("mas_writemem(MAS_BANK_D0, 0x7f1, %x)\n", val); - - drain_dma_buffer(); - - if(source == 0) /* Mic */ - { - /* Copy left channel to right (mono mode) */ - mas_codec_writereg(8, 0x8000); - } - else - { - /* Stereo input mode */ - mas_codec_writereg(8, 0); - } -} - -/* If use_mic is true, the left gain is used */ -void mpeg_set_recording_gain(int left, int right, bool use_mic) -{ - /* Enable both left and right A/D */ - mas_codec_writereg(0x0, - (left << 12) | - (right << 8) | - (left << 4) | - (use_mic?0x0008:0) | /* Connect left A/D to mic */ - 0x0007); -} - -#endif - #ifdef SIMULATOR static char mpeg_stack[DEFAULT_STACK_SIZE]; static char mpeg_thread_name[] = "mpeg"; -- cgit v1.2.3