changeset 508:4655d19a3d94 libavformat

* fixing a bug in DV timestamp generation. Now libavtest doesn't depend on a local TZ anymore.
author romansh
date Mon, 02 Aug 2004 05:42:49 +0000
parents f998b32632d6
children 45abb3409125
files dv.c
diffstat 1 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/dv.c	Wed Jul 28 21:56:59 2004 +0000
+++ b/dv.c	Mon Aug 02 05:42:49 2004 +0000
@@ -195,7 +195,7 @@
     case dv_timecode:
           ct = (time_t)(c->frames / ((float)c->sys->frame_rate / 
                                      (float)c->sys->frame_rate_base));
-          localtime_r(&ct, &tc);
+          gmtime_r(&ct, &tc);
           /* 
            * LTC drop-frame frame counter drops two frames (0 and 1) every 
            * minute, unless it is exactly divisible by 10
@@ -253,14 +253,15 @@
     case dv_viedo_recdate:  /* VAUX recording date */
           ct = c->start_time + (time_t)(c->frames / 
 	       ((float)c->sys->frame_rate / (float)c->sys->frame_rate_base));
-          localtime_r(&ct, &tc);
+          gmtime_r(&ct, &tc);
 	  buf[1] = 0xff; /* ds, tm, tens of time zone, units of time zone */
 	                 /* 0xff is very likely to be "unknown" */
 	  buf[2] = (3 << 6) | /* reserved -- always 1 */
 		   ((tc.tm_mday / 10) << 4) | /* Tens of day */
 		   (tc.tm_mday % 10);         /* Units of day */
 	  buf[3] = /* we set high 4 bits to 0, shouldn't we set them to week? */
-		   (tc.tm_mon % 10);         /* Units of month */
+	           (((tc.tm_mon + 1) / 10) << 4) |    /* Tens of month */
+		   ((tc.tm_mon + 1) % 10);            /* Units of month */
 	  buf[4] = (((tc.tm_year % 100) / 10) << 4) | /* Tens of year */
 		   (tc.tm_year % 10);                 /* Units of year */
           break;
@@ -268,7 +269,7 @@
     case dv_video_rectime:  /* VAUX recording time */
           ct = c->start_time + (time_t)(c->frames / 
 	       ((float)c->sys->frame_rate / (float)c->sys->frame_rate_base));
-          localtime_r(&ct, &tc);
+          gmtime_r(&ct, &tc);
 	  buf[1] = (3 << 6) | /* reserved -- always 1 */
 		   0x3f; /* tens of frame, units of frame: 0x3f - "unknown" ? */
 	  buf[2] = (1 << 7) | /* reserved -- always 1 */