Revert "Avoid decoding other packets when looking for subs."

This reverts commit 9e025d3f85f9d6d855b3d5e6c90bca0eac3a3d49.

It causes corruption in prophet_clip.xml for reasons that
are not yet known.

diff --git a/src/lib/audio_decoder_stream.cc b/src/lib/audio_decoder_stream.cc
index 4d1a5e4c58837e87d1d5e9fcc1446fc614dbe43b..274bf2d547e41ecb29a6d5d7b8abb451fe6da312 100644 (file)
--- a/src/lib/audio_decoder_stream.cc
+++ b/src/lib/audio_decoder_stream.cc
@@ -87,7 +87,7 @@ AudioDecoderStream::get (Frame frame, Frame length, bool accurate)
                /* Keep stuffing data into _decoded until we have enough data, or the subclass does not want to give us any more */
                while (
                        (_decoded.frame > frame || (_decoded.frame + _decoded.audio->frames()) < end) &&
-                       !_decoder->pass (Decoder::PASS_REASON_AUDIO)
+                       !_decoder->pass ()
                        )
                {}
 
@@ -95,7 +95,7 @@ AudioDecoderStream::get (Frame frame, Frame length, bool accurate)
        } else {
                while (
                        _decoded.audio->frames() < length &&
-                       !_decoder->pass (Decoder::PASS_REASON_AUDIO)
+                       !_decoder->pass ()
                        )
                {}
 

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index ada0d01d1db617dabf66f117f92971e008102776..21eb2f7ea48d116f828d9955ff93ca817687636f 100644 (file)
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -59,7 +59,7 @@ DCPDecoder::DCPDecoder (shared_ptr<const DCPContent> c, bool fast)
 }
 
 bool
-DCPDecoder::pass (PassReason reason)
+DCPDecoder::pass ()
 {
        if (_reel == _reels.end () || !_dcp_content->can_be_played ()) {
                return true;
@@ -68,7 +68,7 @@ DCPDecoder::pass (PassReason reason)
        double const vfr = _dcp_content->video_frame_rate ();
        int64_t const frame = _next.frames_round (vfr);
 
-       if ((*_reel)->main_picture () && reason != PASS_REASON_SUBTITLE) {
+       if ((*_reel)->main_picture ()) {
                shared_ptr<dcp::PictureAsset> asset = (*_reel)->main_picture()->asset ();
                shared_ptr<dcp::MonoPictureAsset> mono = dynamic_pointer_cast<dcp::MonoPictureAsset> (asset);
                shared_ptr<dcp::StereoPictureAsset> stereo = dynamic_pointer_cast<dcp::StereoPictureAsset> (asset);
@@ -88,7 +88,7 @@ DCPDecoder::pass (PassReason reason)
                }
        }
 
-       if ((*_reel)->main_sound () && reason != PASS_REASON_SUBTITLE) {
+       if ((*_reel)->main_sound ()) {
                int64_t const entry_point = (*_reel)->main_sound()->entry_point ();
                shared_ptr<const dcp::SoundFrame> sf = (*_reel)->main_sound()->asset()->get_frame (entry_point + frame);
                uint8_t const * from = sf->data ();

diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h
index 8ec80c2aff5f0651bd8ca41d8b93989e1a18dd4a..6fdbd946af348dcd2f99a7d8306e5c8e6dabeff4 100644 (file)
--- a/src/lib/dcp_decoder.h
+++ b/src/lib/dcp_decoder.h
@@ -44,7 +44,7 @@ public:
 private:
        friend struct dcp_subtitle_within_dcp_test;
 
-       bool pass (PassReason);
+       bool pass ();
        void seek (ContentTime t, bool accurate);
 
        std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod, bool starting) const;

diff --git a/src/lib/dcp_subtitle_decoder.cc b/src/lib/dcp_subtitle_decoder.cc
index 0f1cda209dd7d460f8d37cb371f8a1a801e1646b..1c6b973d683913722e4b6cecb2570bed205b0f21 100644 (file)
--- a/src/lib/dcp_subtitle_decoder.cc
+++ b/src/lib/dcp_subtitle_decoder.cc
@@ -47,7 +47,7 @@ DCPSubtitleDecoder::seek (ContentTime time, bool accurate)
 }
 
 bool
-DCPSubtitleDecoder::pass (PassReason)
+DCPSubtitleDecoder::pass ()
 {
        if (_next == _subtitles.end ()) {
                return true;

diff --git a/src/lib/dcp_subtitle_decoder.h b/src/lib/dcp_subtitle_decoder.h
index 30bb896e061b3d845d901826c8024a78fb1cdef9..fb2213fa271d2f933d981d042ce268130aaf653f 100644 (file)
--- a/src/lib/dcp_subtitle_decoder.h
+++ b/src/lib/dcp_subtitle_decoder.h
@@ -28,7 +28,7 @@ public:
        DCPSubtitleDecoder (boost::shared_ptr<const DCPSubtitleContent>);
 
 protected:
-       bool pass (PassReason);
+       bool pass ();
        void seek (ContentTime time, bool accurate);
 
 private:

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 9e5573662e8acb82f4d71f9c26f22cd99d124044..8378373c6e0e29c8c4ed45943a30a6817651ed2e 100644 (file)
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -51,13 +51,7 @@ protected:
         */
        virtual void seek (ContentTime time, bool accurate) = 0;
 
-       enum PassReason {
-               PASS_REASON_VIDEO,
-               PASS_REASON_AUDIO,
-               PASS_REASON_SUBTITLE
-       };
-
-       virtual bool pass (PassReason) = 0;
+       virtual bool pass () = 0;
 };
 
 #endif

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index ee9d9eecbc8258e68615aa47d965dbc48704de23..72a3d02b49f6f732827a649ab24d4e4815ce64bf 100644 (file)
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -89,7 +89,7 @@ FFmpegDecoder::flush ()
 }
 
 bool
-FFmpegDecoder::pass (PassReason reason)
+FFmpegDecoder::pass ()
 {
        int r = av_read_frame (_format_context, &_packet);
 
@@ -112,11 +112,11 @@ FFmpegDecoder::pass (PassReason reason)
        int const si = _packet.stream_index;
        shared_ptr<const FFmpegContent> fc = _ffmpeg_content;
 
-       if (si == _video_stream && !_ignore_video && reason != PASS_REASON_SUBTITLE) {
+       if (si == _video_stream && !_ignore_video) {
                decode_video_packet ();
        } else if (fc->subtitle_stream() && fc->subtitle_stream()->uses_index (_format_context, si)) {
                decode_subtitle_packet ();
-       } else if (reason != PASS_REASON_SUBTITLE) {
+       } else {
                decode_audio_packet ();
        }
 

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index ce52679364f69844fc9e1d50e92612ba95a6c09d..5475be6122da98b51c4bb8414a837af46d0be087 100644 (file)
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -49,7 +49,7 @@ public:
 private:
        friend struct ::ffmpeg_pts_offset_test;
 
-       bool pass (PassReason);
+       bool pass ();
        void seek (ContentTime time, bool);
        void flush ();
 

diff --git a/src/lib/image_decoder.cc b/src/lib/image_decoder.cc
index 94c0dfd45709f7f583bbc9a870fef1fcf811d247..db7c5401fa3591c536fdf6083bf0a159e366e255 100644 (file)
--- a/src/lib/image_decoder.cc
+++ b/src/lib/image_decoder.cc
@@ -43,7 +43,7 @@ ImageDecoder::ImageDecoder (shared_ptr<const ImageContent> c)
 }
 
 bool
-ImageDecoder::pass (PassReason)
+ImageDecoder::pass ()
 {
        if (_video_position >= _image_content->video_length()) {
                return true;

diff --git a/src/lib/image_decoder.h b/src/lib/image_decoder.h
index 4ce75a20d043871add2623699877029e45d4f8fe..4d96306a89c63775121f4e243da36ce2aa507372 100644 (file)
--- a/src/lib/image_decoder.h
+++ b/src/lib/image_decoder.h
@@ -31,7 +31,7 @@ public:
        }
 
 private:
-       bool pass (PassReason);
+       bool pass ();
        void seek (ContentTime, bool);
 
        boost::shared_ptr<const ImageContent> _image_content;

diff --git a/src/lib/sndfile_decoder.cc b/src/lib/sndfile_decoder.cc
index 7986e3c73da14886de117373d1a296c2860cda6c..49633dd1fad2e503b345bf078fa4c56e454b52c1 100644 (file)
--- a/src/lib/sndfile_decoder.cc
+++ b/src/lib/sndfile_decoder.cc
@@ -48,7 +48,7 @@ SndfileDecoder::~SndfileDecoder ()
 }
 
 bool
-SndfileDecoder::pass (PassReason)
+SndfileDecoder::pass ()
 {
        if (_remaining == 0) {
                return true;

diff --git a/src/lib/sndfile_decoder.h b/src/lib/sndfile_decoder.h
index a9d2935b6c36ac75b20e52a644f468f20af8cf48..da9016ee09a958c26211df60e4ae68b6a1d9620d 100644 (file)
--- a/src/lib/sndfile_decoder.h
+++ b/src/lib/sndfile_decoder.h
@@ -29,7 +29,7 @@ public:
        ~SndfileDecoder ();
 
 private:
-       bool pass (PassReason);
+       bool pass ();
        void seek (ContentTime, bool);
 
        int64_t _done;

diff --git a/src/lib/subrip_decoder.cc b/src/lib/subrip_decoder.cc
index 3c93292a166ef8208cda997893a7e54005f5fc79..32d50d86b14e62ad44b0f28015799fea1ce1514b 100644 (file)
--- a/src/lib/subrip_decoder.cc
+++ b/src/lib/subrip_decoder.cc
@@ -49,7 +49,7 @@ SubRipDecoder::seek (ContentTime time, bool accurate)
 }
 
 bool
-SubRipDecoder::pass (PassReason)
+SubRipDecoder::pass ()
 {
        if (_next >= _subtitles.size ()) {
                return true;

diff --git a/src/lib/subrip_decoder.h b/src/lib/subrip_decoder.h
index b899b5dd8cd53138e735016bcfa06a282d7d64ff..db8374c5c86fac05cbac154ca31329618caea02c 100644 (file)
--- a/src/lib/subrip_decoder.h
+++ b/src/lib/subrip_decoder.h
@@ -32,7 +32,7 @@ public:
 
 protected:
        void seek (ContentTime time, bool accurate);
-       bool pass (PassReason);
+       bool pass ();
 
 private:
        std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod, bool starting) const;

diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc
index 85b814d58faa53798a4bda8a90c2c2c1e52db4fa..a7da626b7665fb6d1af02908d7aaccb1c358f7eb 100644 (file)
--- a/src/lib/subtitle_decoder.cc
+++ b/src/lib/subtitle_decoder.cc
@@ -72,7 +72,7 @@ SubtitleDecoder::get (list<T> const & subs, list<ContentTimePeriod> const & sp,
         *  (a) give us what we want, or
         *  (b) hit the end of the decoder.
         */
-       while (!pass(PASS_REASON_SUBTITLE) && (subs.empty() || (subs.back().period().to < sp.back().to))) {}
+       while (!pass () && (subs.empty() || (subs.back().period().to < sp.back().to))) {}
 
        /* Now look for what we wanted in the data we have collected */
        /* XXX: inefficient */

diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index efc0ecf11cce892b4987df0b0ee9048153c149c4..1c9a6374fa9dad584ee6c49abf53545b993fc7e4 100644 (file)
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -98,7 +98,7 @@ VideoDecoder::get_video (Frame frame, bool accurate)
                                break;
                        }
 
-                       if (pass (PASS_REASON_VIDEO)) {
+                       if (pass ()) {
                                /* The decoder has nothing more for us */
                                break;
                        }
@@ -115,7 +115,7 @@ VideoDecoder::get_video (Frame frame, bool accurate)
                dec = decoded_video (frame);
        } else {
                /* Any frame will do: use the first one that comes out of pass() */
-               while (_decoded_video.empty() && !pass (PASS_REASON_VIDEO)) {}
+               while (_decoded_video.empty() && !pass ()) {}
                if (!_decoded_video.empty ()) {
                        dec.push_back (_decoded_video.front ());
                }

diff --git a/test/audio_decoder_test.cc b/test/audio_decoder_test.cc
index 48118c1b7dd85d1308304ab2ff1db64951192af1..44d0d60f416e664fa76faf9495b9e8601b4c4f1c 100644 (file)
--- a/test/audio_decoder_test.cc
+++ b/test/audio_decoder_test.cc
@@ -65,7 +65,7 @@ public:
                , _position (0)
        {}
 
-       bool pass (PassReason)
+       bool pass ()
        {
                Frame const N = min (
                        Frame (2000),