Changeset 4754:177fec6e1c4e in roaraudio

Timestamp:

02/05/11 20:04:12 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Added time display to roarvorbis (Closes: #102)

Files:

• ChangeLog (modified) (1 diff)
• roarclients/roarvorbis.c (modified) (6 diffs)

ChangeLog

@@ -4 +4 @@
         * Updated configure (Closes: #94, #27)
         * Disable more stuff in minimal build (Closes: #104)
+        * Added time display to roarvorbis (Closes: #102)
 
 v. 0.4beta3 - Wed Jan 26 2011 23:26 CET

roarclients/roarvorbis.c

@@ -78 +78 @@
 }
 
+int cf_vorbis_vfvio_seek  (void *datasource, ogg_int64_t offset, int whence) {
+ return roar_vio_lseek(datasource, offset, whence);
+}
+
+long cf_vorbis_vfvio_tell (void *datasource) {
+ return roar_vio_lseek(datasource, 0, SEEK_CUR);
+}
 
 ov_callbacks _g_cf_vorbis_vfvio = {
   .read_func  = cf_vorbis_vfvio_read,
-  .seek_func  = (int    (*)(void *, ogg_int64_t, int      )) _g_cf_vorbis_vfvio_return_err,
+  .seek_func  = cf_vorbis_vfvio_seek,
   .close_func = (int    (*)(void *                        )) _g_cf_vorbis_vfvio_return_err,
-  .tell_func  = (long   (*)(void *                        )) _g_cf_vorbis_vfvio_return_err
+  .tell_func  = cf_vorbis_vfvio_tell
 };
 
@@ -218 +225 @@
 
  return 0;
+}
+
+
+const char * time2str(double t, char * buf, size_t len) {
+ int h, m;
+
+ if ( t < 0 ) {
+//  strncpy(buf, "unknown", len);
+//  return buf;
+  *buf++ = '-';
+  t *= -1;
+ }
+
+ h  = t / 3600;
+ t -= h * 3600;
+ m  = t / 60;
+ t -= m * 60;
+
+ snprintf(buf, len, "%.2i:%.2i:%.2i", h, m, (int)t);
+
+ return buf;
+}
+
+void print_time (OggVorbis_File * vf, roar_vs_t * vss, double time_total, struct roar_audio_info * info) {
+ ssize_t pos;
+ double time_cur;
+ long bitrate_cur = ov_bitrate_instant(vf);
+ float bitrate = bitrate_cur / 1000.0;
+ char time_buf[3][10];
+
+ pos = roar_vs_position(vss, ROAR_VS_BACKEND_DEFAULT, NULL);
+
+ if ( pos == -1 ) {
+  time_cur = ov_time_tell(vf);
+ } else {
+  time_cur = (double)pos/(double)(info->channels*info->rate);
+ }
+
+ time2str(time_cur, time_buf[0], sizeof(time_buf[0]));
+ time2str(time_total-time_cur, time_buf[1], sizeof(time_buf[1]));
+ time2str(time_total, time_buf[2], sizeof(time_buf[2]));
+
+ //Time: 00:02.53 [03:26.20] of 03:28.73  (122.7 kbps)  Output Buffer  43.8%
+ fprintf(stderr, "\rTime: %s [%s] of %s  (%.1f kbps)            ", time_buf[0], time_buf[1], time_buf[2], bitrate);
+ fflush(stderr);
 }
 
@@ -243 +295 @@
  struct roar_audio_info info;
  char pcmout[4096];
+ double time_total;
+ ssize_t bits_per_sec = -1;
+ ssize_t bits_written = -1;
 
 
@@ -293 +348 @@
  }
 
+ time_total = ov_time_total(&vf, -1);
+
  if ( vcltfile != NULL ) {
   if ( roar_vio_dstr_init_defaults(&def, ROAR_VIO_DEF_TYPE_NONE, O_WRONLY|O_CREAT|O_APPEND, 0644) == -1 )
@@ -317 +374 @@
     return 1;
    }
+   bits_per_sec = roar_info2bitspersec(&info);
 
   last_section = current_section;
@@ -328 +386 @@
   } else {
    roar_vs_write(vss, pcmout, ret, NULL);
-  }
- }
+   bits_written += ret * 8;
+   if ( bits_written > bits_per_sec ) {
+    bits_written = 0;
+    print_time(&vf, vss, time_total, &info);
+   }
+  }
+ }
+
+ fprintf(stderr, "\n"); // end the lion of print_time().
 
  ov_clear(&vf);