Fix handling of case here the first GOP is open

Signed-off-by: Derek Buitenhuis <[email protected]>
dwbuiten · Feb 26, 2013 · 326d49c · 326d49c
1 parent 0a785b9
commit 326d49c
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 20 deletions.
diff --git a/README b/README
@@ -52,9 +52,6 @@ Parameters:
 Known Limitations & Bugs
 ------------------------
 
-* Has decode / frame-accuracy issues on files that start with leading B frames.
-  These are very easy to detect given the flags in the D2V file, but I am
-  unsure how to handle this using libavcodec, or if it is even possible.
 * Only works with D2V files created by DGIndex (version flag 16).
 * Not all the IDCT algorithms in DGDecode are in libavcodec, so I've tried to
   map them as best I could. See idct_algo_conv in d2v.hpp for more info.

diff --git a/core/decode.cpp b/core/decode.cpp
@@ -257,7 +257,7 @@ int decodeframe(int frame_num, d2vcontext *ctx, decodecontext *dctx, AVFrame *ou
     gop g;
     unsigned int i;
     int o, j, av_ret, offset;
-    bool next;
+    bool next = true;
 
     /* Get our frame and the GOP its in. */
     f = ctx->frames[frame_num];
@@ -277,26 +277,57 @@ int decodeframe(int frame_num, d2vcontext *ctx, decodecontext *dctx, AVFrame *ou
      * from the previous GOP (one at most is needed), and adjust
      * out offset accordingly.
      */
-    if (!(g.info & GOP_FLAG_CLOSED) && (f.gop > 0)) {
-        int n = frame_num;
-        frame t = ctx->frames[n];
+    if (!(g.info & GOP_FLAG_CLOSED)) {
+        if (f.gop == 0) {
+            int n = 0;
 
-        g = ctx->gops[f.gop - 1];
+            /*
+             * Adjust the offset by the number of frames
+             * that require of the previous GOP when the
+             * first GOP is open.
+             */
+            while(!(g.flags[n] & GOP_FLAG_PROGRESSIVE))
+                n++;
+
+            /*
+             * Only adjust the offset if it's feasible;
+             * that is, if it produces a positive offset.
+             */
+            offset = n > f.offset ? 0 : f.offset - n;
+
+            /*
+             * If the offset is 0, force decoding.
+             *
+             * FIXME: This method increases the number
+             * of frames to be decoded.
+             */
+            next = offset != 0;
+        } else {
+            int n = frame_num;
+            frame t = ctx->frames[n];
+
+            g = ctx->gops[f.gop - 1];
+
+            /*
+             * Find the offset of the last frame in the
+             * previous GOP and add it to our offset.
+             */
+            while(t.offset)
+                t = ctx->frames[--n];
 
-        /*
-         * Find the offset of the last frame in the
-         * previous GOP and add it to our offset.
-         */
-        while(t.offset)
             t = ctx->frames[--n];
 
-        t = ctx->frames[--n];
+            /*
+             * Subtract number of frames that require the
+             * previous GOP.
+             */
+            n = 0;
+            if (!(g.info & GOP_FLAG_CLOSED))
+                while(!(g.flags[n] & GOP_FLAG_PROGRESSIVE))
+                    n++;
 
-        /*
-         * Subtract one from the offset to compensate for
-         * libavcodec delay, I think.
-         */
-        offset += t.offset - 1;
+            offset += t.offset + 1 - n;
+        }
     }
 
     /*
@@ -305,7 +336,7 @@ int decodeframe(int frame_num, d2vcontext *ctx, decodecontext *dctx, AVFrame *ou
      * the same, or also linear. If so, we can decode
      * linearly.
      */
-    next = (dctx->last_gop == f.gop || dctx->last_gop == f.gop - 1) && dctx->last_frame == frame_num - 1;
+    next = next && (dctx->last_gop == f.gop || dctx->last_gop == f.gop - 1) && dctx->last_frame == frame_num - 1;
 
     /* Skip GOP initialization if we're decoding linearly. */
     if (!next) {