--- gorecord.c 2007-01-29 19:45:45.000000000 +0100 +++ gorecord.c 2007-01-29 19:45:58.000000000 +0100 @@ -16,6 +16,11 @@ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/* May 27, 2005 + * A-V Sync by Timo Pylvanainen, tpyl+nosa at iki fi */ +/* July 23, 2006 + * Playable AVI while recording + * by Francois Beerten, avrecord dot 10 dot fb at spamgourmet dot com */ #include #include @@ -32,6 +37,7 @@ #include #include #include +#include #include "../include/go7007.h" @@ -44,6 +50,7 @@ #define MAX_BUFFERS 32 #define AUDIO_BUF_LEN (256*1024) +#define MIN_SYNC_STEP 16 /* Defined in tv-freq.c */ int chan_to_freq(char *name); @@ -54,12 +61,16 @@ int buf_count = 0; int avi_frame_count = 0; int total_frames = 0; +int total_av_corr = 0; +double av_offset = 0; +double fps=29.97; int duration = -1; unsigned int sequence; int frame_limit = -1; int max_frame_length = 0; unsigned int vbytes = 0, abytes = 0; unsigned char audio_buffer[AUDIO_BUF_LEN]; +unsigned char audio_sync_buffer[AUDIO_BUF_LEN]; int audio_len = 0; int nowrite = 0; int probe = 0; @@ -352,6 +363,12 @@ "secam-l, ntsc-j\n"); exit(1); } + if(std == V4L2_STD_NTSC_M_JP || + std == V4L2_STD_NTSC_M ) { + fps = 29.97; + } else { + fps = 25.0; + } } else if (!strcmp(argv[i], "-tvchan")) { tv_freq = chan_to_freq(argv[++i]); if (tv_freq < 0) @@ -436,6 +453,80 @@ } } +int add_video_stream_header(unsigned char *hdr) +{ + unsigned int video_fourcc; + + switch (format) { + case FMT_MJPEG: + video_fourcc = FOURCC("mjpg"); + break; + case FMT_MPEG1: + video_fourcc = FOURCC("mpg1"); + break; + case FMT_MPEG2: + video_fourcc = FOURCC("mpg2"); + break; + case FMT_MPEG4: + video_fourcc = FOURCC("DX50"); + break; + default: + video_fourcc = 0; + break; + } + + PUT_32(hdr, FOURCC("LIST")); + PUT_32(hdr + 4, 12 - 8 + 64 + 48); + PUT_32(hdr + 8, FOURCC("strl")); + PUT_32(hdr + 12, FOURCC("strh")); + PUT_32(hdr + 12 + 4, 64 - 8); + PUT_32(hdr + 12 + 8, FOURCC("vids")); + PUT_32(hdr + 12 + 12, video_fourcc); + PUT_32(hdr + 12 + 28, frameperiod.numerator); + PUT_32(hdr + 12 + 32, frameperiod.denominator); + PUT_32(hdr + 12 + 40, avi_frame_count); + PUT_32(hdr + 12 + 44, max_frame_length); + PUT_16(hdr + 12 + 60, width); + PUT_16(hdr + 12 + 62, height); + PUT_32(hdr + 12 + 64, FOURCC("strf")); + PUT_32(hdr + 12 + 64 + 4, 48 - 8); + PUT_32(hdr + 12 + 64 + 8, 48 - 8); + PUT_32(hdr + 12 + 64 + 12, width); + PUT_32(hdr + 12 + 64 + 16, height); + PUT_32(hdr + 12 + 64 + 20, 1); + PUT_32(hdr + 12 + 64 + 22, 24); + PUT_32(hdr + 12 + 64 + 24, video_fourcc); + PUT_32(hdr + 12 + 64 + 28, width * height * 3); + return 12 + 64 + 48; +} + +int add_audio_stream_header(unsigned char *hdr) +{ + PUT_32(hdr, FOURCC("LIST")); + PUT_32(hdr + 4, 12 - 8 + 64 + 26); + PUT_32(hdr + 8, FOURCC("strl")); + + PUT_32(hdr + 12, FOURCC("strh")); + PUT_32(hdr + 12 + 4, 64 - 8); + PUT_32(hdr + 12 + 8, FOURCC("auds")); + PUT_32(hdr + 12 + 12, 1); + PUT_32(hdr + 12 + 28, 4); + PUT_32(hdr + 12 + 32, 48000 << 2); + PUT_32(hdr + 12 + 40, abytes >> 2); + PUT_32(hdr + 12 + 44, 48000 << 1); + PUT_32(hdr + 12 + 52, 4); + + PUT_32(hdr + 12 + 64, FOURCC("strf")); + PUT_32(hdr + 12 + 64 + 4, 26 - 8); + PUT_16(hdr + 12 + 64 + 8, 1); + PUT_16(hdr + 12 + 64 + 10, 2); + PUT_32(hdr + 12 + 64 + 12, 48000); + PUT_32(hdr + 12 + 64 + 16, 48000 << 2); + PUT_16(hdr + 12 + 64 + 20, 4); + PUT_16(hdr + 12 + 64 + 22, 16); + return 12 + 64 + 26; +} + void open_avifile(void) { /* First open the temporary file we'll store the index in */ @@ -453,6 +544,45 @@ strerror(errno)); exit(1); } + + int i, movielen, filelen, off; + unsigned char hdr[1024 + 12]; + + memset(hdr, 0, sizeof(hdr)); + PUT_32(hdr, FOURCC("RIFF")); + PUT_32(hdr + 4, lseek(avifd, 0, SEEK_CUR) - 8); + PUT_32(hdr + 8, FOURCC("AVI ")); + PUT_32(hdr + 12, FOURCC("LIST")); + PUT_32(hdr + 12 + 8, FOURCC("hdrl")); + PUT_32(hdr + 12 + 12, FOURCC("avih")); + PUT_32(hdr + 12 + 12 + 4, 64 - 8); + /* bizarre math to do microsecond arithmetic in 32-bit ints */ + /* => 1000000 * frameperiod.numerator / frameperiod.denominator */ + PUT_32(hdr + 12 + 12 + 8, (frameperiod.numerator * 15625 / + frameperiod.denominator) * 64 + + ((frameperiod.numerator * 15625) % + frameperiod.denominator) * 64 / + frameperiod.denominator); + PUT_32(hdr + 12 + 12 + 20, 2320); + PUT_32(hdr + 12 + 12 + 24, avi_frame_count); + PUT_32(hdr + 12 + 12 + 32, audfd < 0 ? 1 : 2); + PUT_32(hdr + 12 + 12 + 36, 128*1024); + PUT_32(hdr + 12 + 12 + 40, width); + PUT_32(hdr + 12 + 12 + 44, height); + off = 64; + off += add_video_stream_header(hdr + 12 + 12 + off); + if (audfd >= 0) + off += add_audio_stream_header(hdr + 12 + 12 + off); + PUT_32(hdr + 12 + 4, 12 - 8 + off); + + PUT_32(hdr + 12 + 12 + off, FOURCC("JUNK")); + PUT_32(hdr + 12 + 12 + off + 4, 1024 - 12 - 12 - off - 8); + PUT_32(hdr + 1024, FOURCC("LIST")); + PUT_32(hdr + 1024 + 4, movielen - 1024 - 8); + PUT_32(hdr + 1024 + 8, FOURCC("movi")); + lseek(avifd, 0, SEEK_SET); + write(avifd, hdr, 1024 + 12); + lseek(avifd, 1024 + 12, SEEK_SET); } @@ -888,10 +1018,94 @@ } if (interrupted) return 0; audio_len += ret; - abytes += ret; return ret; } + +void average16b(unsigned char* dst, unsigned char* src1, unsigned char* src2) +{ + int16_t a,b,c; + + a = (((u_int16_t)*(src1+1)) << 8) | (u_int16_t)*(src1); + b = (((u_int16_t)*(src2+1)) << 8) | (u_int16_t)*(src2); + + c = a/2+b/2 + (a&b&0x1); + *dst = ((u_int16_t)c)&0xFF; + *(dst+1) = (((u_int16_t)c)>>8)&0xFF; +} + + +int audio_video_sync(void) +{ + int i=0; + int j=0; + int k=0; + static int sync_step=0; + + + while(i 4000 && + sync_step > (int)(192000.0/fabs(av_offset)) && sync_step > MIN_SYNC_STEP ) { + /* If audio lagging, i.e. too many audio bytes, and + * enough audio_buffer left to average samples then do that */ + if(av_offset < 0 && i < audio_len-4) { + /* Merge two samples into one */ + for(k=0;k<2;k++) { + average16b(&audio_sync_buffer[j], &audio_buffer[i], &audio_buffer[i+4]); + i+=2; + j+=2; + } + i+=4; + /* Offset now reduced by 4 bytes */ + av_offset += 4; + total_av_corr -= 4; + /* Correction performed */ + sync_step = 0; + } else if(av_offset > 0 && j < AUDIO_BUF_LEN-4) { + /* Audio running, i.e. too few audio bytes, then insert + * samples */ + + for(k=0;k<2;k++) { + /* Copy first words */ + audio_sync_buffer[j] = audio_buffer[i]; + audio_sync_buffer[j+1] = audio_buffer[i+1]; + + /* Create second words */ + average16b(&audio_sync_buffer[j+4], &audio_buffer[i], &audio_buffer[i+4]); + i+=2; + j+=2; + } + j+=4; + /* Four bytes added */ + av_offset -= 4; + total_av_corr += 4; + /* Correction performed */ + sync_step = 0; + } else { /* To make sure something is always done */ + for(k=0;k<4&&i= 0) { alsa_read(); if (interrupted) return 0; - write_frame(audio_buffer, audio_len, FOURCC("01wb"), 1); + /* Must be careful to update av_offset before + * calling audio_video_sync */ + av_offset -= (double)audio_len; + audio_len = audio_video_sync(); + if(interrupted) return 0; + write_frame(audio_sync_buffer, audio_len, FOURCC("01wb"), 1); + abytes += audio_len; audio_len = 0; } @@ -940,79 +1160,6 @@ return length; } -int add_video_stream_header(unsigned char *hdr) -{ - unsigned int video_fourcc; - - switch (format) { - case FMT_MJPEG: - video_fourcc = FOURCC("mjpg"); - break; - case FMT_MPEG1: - video_fourcc = FOURCC("mpg1"); - break; - case FMT_MPEG2: - video_fourcc = FOURCC("mpg2"); - break; - case FMT_MPEG4: - video_fourcc = FOURCC("DX50"); - break; - default: - video_fourcc = 0; - break; - } - - PUT_32(hdr, FOURCC("LIST")); - PUT_32(hdr + 4, 12 - 8 + 64 + 48); - PUT_32(hdr + 8, FOURCC("strl")); - PUT_32(hdr + 12, FOURCC("strh")); - PUT_32(hdr + 12 + 4, 64 - 8); - PUT_32(hdr + 12 + 8, FOURCC("vids")); - PUT_32(hdr + 12 + 12, video_fourcc); - PUT_32(hdr + 12 + 28, frameperiod.numerator); - PUT_32(hdr + 12 + 32, frameperiod.denominator); - PUT_32(hdr + 12 + 40, avi_frame_count); - PUT_32(hdr + 12 + 44, max_frame_length); - PUT_16(hdr + 12 + 60, width); - PUT_16(hdr + 12 + 62, height); - PUT_32(hdr + 12 + 64, FOURCC("strf")); - PUT_32(hdr + 12 + 64 + 4, 48 - 8); - PUT_32(hdr + 12 + 64 + 8, 48 - 8); - PUT_32(hdr + 12 + 64 + 12, width); - PUT_32(hdr + 12 + 64 + 16, height); - PUT_32(hdr + 12 + 64 + 20, 1); - PUT_32(hdr + 12 + 64 + 22, 24); - PUT_32(hdr + 12 + 64 + 24, video_fourcc); - PUT_32(hdr + 12 + 64 + 28, width * height * 3); - return 12 + 64 + 48; -} - -int add_audio_stream_header(unsigned char *hdr) -{ - PUT_32(hdr, FOURCC("LIST")); - PUT_32(hdr + 4, 12 - 8 + 64 + 26); - PUT_32(hdr + 8, FOURCC("strl")); - - PUT_32(hdr + 12, FOURCC("strh")); - PUT_32(hdr + 12 + 4, 64 - 8); - PUT_32(hdr + 12 + 8, FOURCC("auds")); - PUT_32(hdr + 12 + 12, 1); - PUT_32(hdr + 12 + 28, 4); - PUT_32(hdr + 12 + 32, 48000 << 2); - PUT_32(hdr + 12 + 40, abytes >> 2); - PUT_32(hdr + 12 + 44, 48000 << 1); - PUT_32(hdr + 12 + 52, 4); - - PUT_32(hdr + 12 + 64, FOURCC("strf")); - PUT_32(hdr + 12 + 64 + 4, 26 - 8); - PUT_16(hdr + 12 + 64 + 8, 1); - PUT_16(hdr + 12 + 64 + 10, 2); - PUT_32(hdr + 12 + 64 + 12, 48000); - PUT_32(hdr + 12 + 64 + 16, 48000 << 2); - PUT_16(hdr + 12 + 64 + 20, 4); - PUT_16(hdr + 12 + 64 + 22, 16); - return 12 + 64 + 26; -} void avi_finish(void) { @@ -1092,8 +1239,10 @@ abytes, "uncompressed PCM"); fprintf(stderr, " AVI file format overhead : %d bytes\n", filelen - vbytes - abytes); - fprintf(stderr, " Total file size : %d bytes\n\n", + fprintf(stderr, " Total file size : %d bytes\n", filelen); + fprintf(stderr, " Total A/V correction : %d bytes\n\n", + total_av_corr ); } void interrupt_handler(int signal) @@ -1120,13 +1269,7 @@ memset(audio_buffer, 0, sizeof(audio_buffer)); parse_opts(argc, argv); - if (!nowrite) { - if (strstr(avibase, "%d")) - sprintf(avifile, avibase, file_count); - else - strcpy(avifile, avibase); - open_avifile(); - } + open_devices(); v4l2_init(); if (audfd >= 0) @@ -1135,7 +1278,19 @@ printf("For usage help, run `%s -help`\n", argv[0]); return 0; } + + if (!nowrite) { + if (strstr(avibase, "%d")) + sprintf(avifile, avibase, file_count); + else + strcpy(avifile, avibase); + open_avifile(); + } + v4l2_start(); + /* This will set the audiosync to be in line with the initial sync */ + av_offset += 192000.0*2.0/fps; + for (;;) { /* Retrieve a new video frame and audio frame */ vframe_len = v4l2_frame_capture(&cur); @@ -1149,14 +1304,16 @@ else filesize = lseek(avifd, 0, SEEK_CUR); ++avi_frame_count; + av_offset += 192000.0/fps; if (total_frames++ == 0) mmark = start = cur; csec = 100 * (cur.tv_sec - start.tv_sec) + (cur.tv_usec - start.tv_usec) / 10000; fprintf(stderr, "\r %02d:%02d.%02d Frames: %5d " - "AVI size: %9d", csec / 6000, csec / 100 % 60, - csec % 100, total_frames, filesize); + "AVI size: %3dMB A-V: %7.2fms", csec / 6000, csec / 100 % 60, + csec % 100, total_frames, filesize / 1024 / 1024, -av_offset/192); + /* Calculate and display video bitrate */ if (mcount++ == 50) { @@ -1169,7 +1326,7 @@ } mbytes += vframe_len; if (mrate > 0) - fprintf(stderr, " Video bitrate: %5d kbps", mrate); + fprintf(stderr, " Video: %5dkbps", mrate); /* If we've reached the maximum AVI length, make a new file * if we were given a filename with %d, or otherwise stop