Mercurial > libavformat.hg

changeset 1552:de18846fa25c libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor modifications to handle mms streaming. Patch by Ryan Martell rdm4 martellventures com.
author takis
date Mon, 04 Dec 2006 15:46:32 +0000
parents ee4ef413497e
children 504ceaa50e31
files asf.c asf.h
diffstat 2 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/asf.c	Mon Dec 04 11:42:48 2006 +0000
+++ b/asf.c	Mon Dec 04 15:46:32 2006 +0000
@@ -203,8 +203,10 @@
                 goto fail;
             st->priv_data = asf_st;
             st->start_time = asf->hdr.preroll;
-            st->duration = asf->hdr.send_time /
-                (10000000 / 1000) - st->start_time;
+            if(!(asf->hdr.flags & 0x01)) { // if we aren't streaming...
+                st->duration = asf->hdr.send_time /
+                    (10000000 / 1000) - st->start_time;
+            }
             get_guid(pb, &g);
 
             test_for_ext_stream_audio = 0;
@@ -328,7 +330,8 @@
             url_fskip(pb, gsize - (pos2 - pos1 + 24));
         } else if (!memcmp(&g, &data_header, sizeof(GUID))) {
             asf->data_object_offset = url_ftell(pb);
-            if (gsize != (uint64_t)-1 && gsize >= 24) {
+            // if not streaming, gsize is not unlimited (how?), and there is enough space in the file..
+            if (!(asf->hdr.flags & 0x01) && gsize != (uint64_t)-1 && gsize >= 24) {
                 asf->data_object_size = gsize - 24;
             } else {
                 asf->data_object_size = (uint64_t)-1;
--- a/asf.h	Mon Dec 04 11:42:48 2006 +0000
+++ b/asf.h	Mon Dec 04 15:46:32 2006 +0000
@@ -86,7 +86,7 @@
     int asfid2avid[128];        /* conversion table from asf ID 2 AVStream ID */
     ASFStream streams[128];     /* it's max number and it's not that big */
     /* non streamed additonnal info */
-    int64_t nb_packets;
+    uint64_t nb_packets;
     int64_t duration; /* in 100ns units */
     /* packet filling */
     unsigned char multi_payloads_present;