Use AV_ prefixes on some FFmpeg bits.

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

diff --git a/src/lib/player.cc b/src/lib/player.cc
index d316711f7bf7a664fa0924a13fc7abe4694da498..6c3d959fa4488b360352e440babc91ce25b3556d 100644 (file)
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -46,6 +46,7 @@
 #include "dcp_subtitle_decoder.h"
 #include "audio_processor.h"
 #include "playlist.h"
+#include "referenced_reel_asset.h"
 #include <dcp/reel.h>
 #include <dcp/reel_sound_asset.h>
 #include <dcp/reel_subtitle_asset.h>
@@ -57,7 +58,7 @@
 
 #include "i18n.h"
 
-#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
+#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
 
 using std::list;
 using std::cout;
@@ -247,7 +248,7 @@ Player::set_video_container_size (dcp::Size s)
 {
        _video_container_size = s;
 
-       _black_image.reset (new Image (PIX_FMT_RGB24, _video_container_size, true));
+       _black_image.reset (new Image (AV_PIX_FMT_RGB24, _video_container_size, true));
        _black_image->make_black ();
 }
 
@@ -670,8 +671,8 @@ Player::get_subtitles (DCPTime time, DCPTime length, bool starting, bool burnt)
                                if (fabs (1.0 - xs / ys) > dcp::ASPECT_ADJUST_EPSILON) {
                                        s.set_aspect_adjust (xs / ys);
                                }
-                               s.set_in (dcp::Time(content_subtitle_to_dcp (*j, ts.period().from).seconds()));
-                               s.set_out (dcp::Time(content_subtitle_to_dcp (*j, ts.period().to).seconds()));
+                               s.set_in (dcp::Time(content_subtitle_to_dcp (*j, ts.period().from).seconds(), 1000));
+                               s.set_out (dcp::Time(content_subtitle_to_dcp (*j, ts.period().to).seconds(), 1000));
                                ps.text.push_back (s);
                                ps.add_fonts (subtitle_content->fonts ());
                        }
@@ -741,26 +742,49 @@ Player::set_play_referenced ()
        _have_valid_pieces = false;
 }
 
-list<shared_ptr<dcp::ReelAsset> >
+list<ReferencedReelAsset>
 Player::get_reel_assets ()
 {
-       list<shared_ptr<dcp::ReelAsset> > a;
+       list<ReferencedReelAsset> a;
 
        BOOST_FOREACH (shared_ptr<Content> i, _playlist->content ()) {
                shared_ptr<DCPContent> j = dynamic_pointer_cast<DCPContent> (i);
                if (!j) {
                        continue;
                }
-               /* XXX: hack hack hack */
                DCPDecoder decoder (j, false);
-               if (j->reference_video ()) {
-                       a.push_back (decoder.reels().front()->main_picture ());
-               }
-               if (j->reference_audio ()) {
-                       a.push_back (decoder.reels().front()->main_sound ());
-               }
-               if (j->reference_subtitle ()) {
-                       a.push_back (decoder.reels().front()->main_subtitle ());
+               int64_t offset = 0;
+               BOOST_FOREACH (shared_ptr<dcp::Reel> k, decoder.reels()) {
+                       DCPTime const from = i->position() + DCPTime::from_frames (offset, _film->video_frame_rate());
+                       if (j->reference_video ()) {
+                               a.push_back (
+                                       ReferencedReelAsset (
+                                               k->main_picture (),
+                                               DCPTimePeriod (from, from + DCPTime::from_frames (k->main_picture()->duration(), _film->video_frame_rate()))
+                                               )
+                                       );
+                       }
+
+                       if (j->reference_audio ()) {
+                               a.push_back (
+                                       ReferencedReelAsset (
+                                               k->main_sound (),
+                                               DCPTimePeriod (from, from + DCPTime::from_frames (k->main_sound()->duration(), _film->video_frame_rate()))
+                                               )
+                                       );
+                       }
+
+                       if (j->reference_subtitle ()) {
+                               a.push_back (
+                                       ReferencedReelAsset (
+                                               k->main_subtitle (),
+                                               DCPTimePeriod (from, from + DCPTime::from_frames (k->main_subtitle()->duration(), _film->video_frame_rate()))
+                                               )
+                                       );
+                       }
+
+                       /* Assume that main picture duration is the length of the reel */
+                       offset += k->main_picture()->duration ();
                }
        }