Attachment 310176 Details for Bug 370931 – [dvgrab patch] fix odd timecode values (from Patrick Mansfield)

[patch] [dvgrab patch] fix odd timecode values (from Patrick Mansfield)

dvgrab-fix-odd-timecode-values.patch (text/plain), 1.66 KB, created by Stefan Richter on 2008-06-24 19:30:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Richter

Created: 2008-06-24 19:30:29 UTC

Size: 1.66 KB

patch

obsolete

>Date: 2008-04-14 01:53
>From: Patrick Mansfield <patman@ar...>
>Subject: fix odd timecode values
>
>Check the result of the dv_get_timestamp_int call, and don't store random
>values (well, data on the stack) into the timecode if dv_get_timestamp_int
>fails.
>
>This should also fix the segfault bug, but the other change to increase
>string sizes should still be applied.
>
>With this change, I no longer see the large time code values with my
>video, like this:
>
>"again-2003.12.24_09-08-20.avi": 74.57 MiB 651 frames timecode +167058900:-1319513512:-1291087864.163713312 date 2008.04.13 11:23:17
>
>Index: dvframe.cc
>===================================================================
>RCS file: /cvsroot/kino/dvgrab/dvframe.cc,v
>retrieving revision 1.2
>diff -u -r1.2 dvframe.cc
>--- dvframe.cc 27 Feb 2008 03:33:36 -0000 1.2
>+++ dvframe.cc 14 Apr 2008 01:48:11 -0000
>@@ -458,12 +458,19 @@
> #ifdef HAVE_LIBDV
> 	int timestamp[ 4 ];
> 
>-	dv_get_timestamp_int( decoder, timestamp );
>-
>-	timeCode.hour = timestamp[ 0 ];
>-	timeCode.min = timestamp[ 1 ];
>-	timeCode.sec = timestamp[ 2 ];
>-	timeCode.frame = timestamp[ 3 ];
>+	if ( dv_get_timestamp_int( decoder, timestamp ) ) {
>+		timeCode.hour = timestamp[ 0 ];
>+		timeCode.min = timestamp[ 1 ];
>+		timeCode.sec = timestamp[ 2 ];
>+		timeCode.frame = timestamp[ 3 ];
>+		return true;
>+	} else {
>+		timeCode.hour = 0;
>+		timeCode.min = 0;
>+		timeCode.sec = 0;
>+		timeCode.frame = 0;
>+		return false;
>+	}
> #else
> 
> 	Pack tc;
>@@ -480,9 +487,8 @@
> 	timeCode.sec = ( sec & 0xf ) + 10 * ( ( sec >> 4 ) & 0x7 );
> 	timeCode.min = ( min & 0xf ) + 10 * ( ( min >> 4 ) & 0x7 );
> 	timeCode.hour = ( hour & 0xf ) + 10 * ( ( hour >> 4 ) & 0x3 );
>-#endif
>-
> 	return true;
>+#endif
> }
> 
>

Actions: View | Diff

Attachments on bug 370931: 251301 | 310175 | 310176