Bug 1000608 - Allow nestegg_offset_seek to be called externally - r=kinetik
authorcajbir <cajbir.bugzilla@cd.pn>
Wed, 23 Apr 2014 20:04:00 +1200
changeset 198899 826e982173dda5d25b5a33f377c892af9871f941
parent 198898 44ad5896ff61977428dae0db3f61917d47ddb0c6
child 198900 1e21f55bcc9d78c70e92cd18ddba11cb09ef2ce1
push id3624
push userasasaki@mozilla.com
push dateMon, 09 Jun 2014 21:49:01 +0000
treeherdermozilla-beta@b1a5da15899a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskinetik
bugs1000608
milestone31.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1000608 - Allow nestegg_offset_seek to be called externally - r=kinetik
media/libnestegg/README_MOZILLA
media/libnestegg/src/nestegg.c
--- a/media/libnestegg/README_MOZILLA
+++ b/media/libnestegg/README_MOZILLA
@@ -1,8 +1,8 @@
 The source from this directory was copied from the nestegg
 git repository using the update.sh script.  The only changes
 made were those applied by update.sh and the addition of
 Makefile.in build files for the Mozilla build system.
 
 The nestegg git repository is: git://github.com/kinetiknz/nestegg.git
 
-The git commit ID used was c739433afee18ee679ab0f3206d848b6d68f9de2.
+The git commit ID used was 276ccd80e723b0edaf0ef42dbacb5a3a42e02d5c.
--- a/media/libnestegg/src/nestegg.c
+++ b/media/libnestegg/src/nestegg.c
@@ -1957,16 +1957,21 @@ nestegg_offset_seek(nestegg * ctx, uint6
   ctx->last_valid = 0;
 
   while (ctx->ancestor)
     ne_ctx_pop(ctx);
 
   ne_ctx_push(ctx, ne_top_level_elements, ctx);
   ne_ctx_push(ctx, ne_segment_elements, &ctx->segment);
 
+  ctx->log(ctx, NESTEGG_LOG_DEBUG, "seek: parsing cluster elements");
+  r = ne_parse(ctx, NULL, -1);
+  if (r != 1)
+    return -1;
+
   return 0;
 }
 
 int
 nestegg_track_seek(nestegg * ctx, unsigned int track, uint64_t tstamp)
 {
   int r;
   struct cue_point * cue_point;
@@ -1992,20 +1997,16 @@ nestegg_track_seek(nestegg * ctx, unsign
   if (pos == NULL)
     return -1;
 
   if (ne_get_uint(pos->cluster_position, &seek_pos) != 0)
     return -1;
 
   /* Seek and set up parser state for segment-level element (Cluster). */
   r = nestegg_offset_seek(ctx, ctx->segment_offset + seek_pos);
-  ctx->log(ctx, NESTEGG_LOG_DEBUG, "seek: parsing cluster elements");
-  r = ne_parse(ctx, NULL, -1);
-  if (r != 1)
-    return -1;
 
   if (!ne_is_suspend_element(ctx->last_id))
     return -1;
 
   return 0;
 }
 
 int