Rename SafeStringStream -> locked_stringstream. Bump deps for removal of stringstream.

[dcpomatic.git] / src / lib / video_decoder.cc

diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index fc3bcac39eda019d7037b2059d0e2cb605b52816..aedc1a13f0b80f09dfde79af245b7a41ff813911 100644 (file)
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -145,7 +145,8 @@ VideoDecoder::get (Frame frame, bool accurate)
        }
 
        /* Clean up _decoded; keep the frame we are returning, if any (which may have two images
-          for 3D), but nothing before that */
+          for 3D), but nothing before that
+       */
        while (!_decoded.empty() && !dec.empty() && _decoded.front().frame.index() < dec.front().frame.index()) {
                _decoded.pop_front ();
        }
@@ -252,7 +253,7 @@ VideoDecoder::give (shared_ptr<const ImageProxy> image, Frame frame)
                /* We receive the same frame index twice for 3D-alternate; hence we know which
                   frame this one is.
                */
-               bool const same = (!_decoded.empty() && frame == _decoded.back().frame);
+               bool const same = (!_decoded.empty() && frame == _decoded.back().frame.index());
                to_push.push_back (ContentVideo (image, VideoFrame (frame, same ? EYES_RIGHT : EYES_LEFT), PART_WHOLE));
                break;
        }
@@ -294,39 +295,45 @@ VideoDecoder::give (shared_ptr<const ImageProxy> image, Frame frame)
        /* If we've pre-rolled on a seek we may now receive out-of-order frames
           (frames before the last seek time) which we can just ignore.
        */
-
        if (from && (*from) > to_push.front().frame) {
                return;
        }
 
-       if (from) {
-               switch (_content->video->frame_type ()) {
-               case VIDEO_FRAME_TYPE_2D:
-                       fill_one_eye (from->index(), to_push.front().frame.index(), EYES_BOTH);
-                       break;
-               case VIDEO_FRAME_TYPE_3D:
-               case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT:
-               case VIDEO_FRAME_TYPE_3D_TOP_BOTTOM:
-               case VIDEO_FRAME_TYPE_3D_ALTERNATE:
-                       fill_both_eyes (from.get(), to_push.front().frame);
-                       break;
-               case VIDEO_FRAME_TYPE_3D_LEFT:
-                       fill_one_eye (from->index(), to_push.front().frame.index(), EYES_LEFT);
-                       break;
-               case VIDEO_FRAME_TYPE_3D_RIGHT:
-                       fill_one_eye (from->index(), to_push.front().frame.index(), EYES_RIGHT);
-                       break;
+       int const max_decoded_size = 96;
+
+       /* If _decoded is already `full' there is no point in adding anything more to it,
+          as the new stuff will just be removed again.
+       */
+       if (_decoded.size() < max_decoded_size) {
+               if (from) {
+                       switch (_content->video->frame_type ()) {
+                       case VIDEO_FRAME_TYPE_2D:
+                               fill_one_eye (from->index(), to_push.front().frame.index(), EYES_BOTH);
+                               break;
+                       case VIDEO_FRAME_TYPE_3D:
+                       case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT:
+                       case VIDEO_FRAME_TYPE_3D_TOP_BOTTOM:
+                       case VIDEO_FRAME_TYPE_3D_ALTERNATE:
+                               fill_both_eyes (from.get(), to_push.front().frame);
+                               break;
+                       case VIDEO_FRAME_TYPE_3D_LEFT:
+                               fill_one_eye (from->index(), to_push.front().frame.index(), EYES_LEFT);
+                               break;
+                       case VIDEO_FRAME_TYPE_3D_RIGHT:
+                               fill_one_eye (from->index(), to_push.front().frame.index(), EYES_RIGHT);
+                               break;
+                       }
                }
-       }
 
-       copy (to_push.begin(), to_push.end(), back_inserter (_decoded));
+               copy (to_push.begin(), to_push.end(), back_inserter (_decoded));
+       }
 
        /* We can't let this build up too much or we will run out of memory.  There is a
           `best' value for the allowed size of _decoded which balances memory use
           with decoding efficiency (lack of seeks).  Throwing away video frames here
           is not a problem for correctness, so do it.
        */
-       while (_decoded.size() > 96) {
+       while (_decoded.size() > max_decoded_size) {
                _decoded.pop_back ();
        }
 }