From: Wim Taymans <wim.taymans@gmail.com>
Date: Mon, 23 Sep 2002 20:05:04 +0000 (+0000)
Subject: Fix various overflow cases, this should fix seeking on very large files.
X-Git-Tag: CAPS~158
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ef399ccaf4b021dc30ca037c3a18e444ac209e24;p=platform%2Fupstream%2Fgst-plugins-good.git

Fix various overflow cases, this should fix seeking on very large files.

Original commit message from CVS:
Fix various overflow cases, this should fix seeking on very large
files.
---

diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c
index 2fa5678..6b2a8ff 100644
--- a/gst/avi/gstavidemux.c
+++ b/gst/avi/gstavidemux.c
@@ -839,19 +839,10 @@ gst_avi_demux_src_convert (GstPad *pad, GstFormat src_format, gint64 src_value,
       }
       break;
     case GST_FORMAT_BYTES:
-      switch (*dest_format) {
-	case GST_FORMAT_TIME:
-          *dest_value = src_value * GST_SECOND * stream->strh.scale  / stream->strh.rate;
-	  break;
-	default:
-	  res = FALSE;
-	  break;
-      }
-      break;
     case GST_FORMAT_UNITS:
       switch (*dest_format) {
 	case GST_FORMAT_TIME:
-          *dest_value = src_value * GST_SECOND * stream->strh.scale / stream->strh.rate;
+          *dest_value = ((((gfloat)src_value) * stream->strh.scale)  / stream->strh.rate) * GST_SECOND;
 	  break;
 	default:
 	  res = FALSE;
@@ -892,7 +883,7 @@ gst_avi_demux_handle_src_query (GstPad *pad, GstPadQueryType type,
           *format = GST_FORMAT_TIME;
           /* fall through */
         case GST_FORMAT_TIME:
-          *value = GST_SECOND * stream->strh.scale * stream->strh.length / stream->strh.rate;
+          *value = (((gfloat)stream->strh.scale) * stream->strh.length / stream->strh.rate) * GST_SECOND;
 	  break;
         case GST_FORMAT_BYTES:
           if (stream->strh.type == GST_RIFF_FCC_auds) {
@@ -921,10 +912,10 @@ gst_avi_demux_handle_src_query (GstPad *pad, GstPadQueryType type,
           /* fall through */
         case GST_FORMAT_TIME:
           if (stream->strh.samplesize) {
-            *value = stream->current_byte * GST_SECOND * stream->strh.scale / stream->strh.rate;
+            *value = (((gfloat)stream->current_byte) * stream->strh.scale / stream->strh.rate) * GST_SECOND;
 	  }
 	  else {
-            *value = stream->current_frame * GST_SECOND * stream->strh.scale / stream->strh.rate;
+            *value = (((gfloat)stream->current_frame) * stream->strh.scale / stream->strh.rate) * GST_SECOND;
 	  }
 	  break;
         case GST_FORMAT_BYTES:
diff --git a/gst/avi/gstavidemux.h b/gst/avi/gstavidemux.h
index 8a5fc6d..5eb0387 100644
--- a/gst/avi/gstavidemux.h
+++ b/gst/avi/gstavidemux.h
@@ -76,7 +76,7 @@ typedef struct
   guint32	av_bps;
 
   guint64	total_bytes;
-  gint32	total_frames;
+  guint32	total_frames;
 
   guint32	skip;