X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=generate_dvd.cpp;h=64079d28ad6c406e6579cc452bb7f1ae1e364ded;hb=12780c6ecf9ec8c227d5795e8fd1083b48891d7b;hp=aa57775e22639bdce088710cf24fc542cfd9315e;hpb=3194c256cf967c11bbc267f05044fa7eb049100f;p=videolink.git

diff --git a/generate_dvd.cpp b/generate_dvd.cpp
index aa57775..64079d2 100644
--- a/generate_dvd.cpp
+++ b/generate_dvd.cpp
@@ -1,8 +1,12 @@
 // Copyright 2005-6 Ben Hutchings <ben@decadent.org.uk>.
 // See the file "COPYING" for licence details.
 
+#include <cerrno>
+#include <cstring>
 #include <fstream>
+#include <iomanip>
 #include <iostream>
+#include <ostream>
 #include <sstream>
 #include <stdexcept>
 
@@ -72,6 +76,21 @@ namespace
 
 	return Glib::build_filename(dir.get_name(), base_name);
     }
+
+    // We would like to use just a single frame for the menu but this
+    // seems not to be legal or compatible.  The minimum length of a
+    // cell is 0.4 seconds but I've seen a static menu using 12 frames
+    // on a commercial "PAL" disc so let's use 12 frames regardless.
+    unsigned menu_duration_frames(const video::frame_params & params)
+    {
+	return 12;
+    }
+    double menu_duration_seconds(const video::frame_params & params)
+    {
+	return double(menu_duration_frames(params))
+	    * double(params.rate_numer)
+	    / double(params.rate_denom);
+    }
 }
 
 dvd_generator::dvd_generator(const video::frame_params & frame_params,
@@ -188,23 +207,34 @@ void dvd_generator::generate_menu_vob(unsigned index,
 	throw std::runtime_error("Failed to write control file for spumux");
 
     std::ostringstream command_stream;
+    unsigned frame_count(menu_duration_frames(frame_params_));
     if (encoder_ == mpeg_encoder_ffmpeg)
     {
-	command_stream
-	    << "ffmpeg"
-	    << " -f image2 -vcodec png -i "
-	    << background_name
-	    << " -target " << frame_params_.common_name <<  "-dvd"
-	    << " -vcodec mpeg2video -aspect 4:3 -an -y /dev/stdout";
+	for (unsigned i = 0; i != frame_count; ++i)
+	{
+	    std::string frame_name(background_name);
+	    frame_name.push_back('-');
+	    frame_name.push_back('0' + i / 10);
+	    frame_name.push_back('0' + i % 10);
+	    if (symlink(background_name.c_str(), frame_name.c_str()) != 0)
+		throw std::runtime_error(
+		    std::string("symlink: ").append(std::strerror(errno)));
+	}
+	command_stream <<
+	    "ffmpeg -f image2 -vcodec png"
+	    " -r " << frame_params_.rate_numer <<
+	    "/" << frame_params_.rate_denom <<
+	    " -i " << background_name << "-%02d"
+	    " -target " << frame_params_.common_name <<  "-dvd"
+	    " -vcodec mpeg2video -aspect 4:3 -an -y /dev/stdout";
     }
     else
     {
 	assert(encoder_ == mpeg_encoder_mjpegtools_old
 	       || encoder_ == mpeg_encoder_mjpegtools_new);
 	command_stream
-	    << "pngtopnm "
-	    << background_name
-	    << " | ppmtoy4m -v0 -n1 -F"
+	    << "pngtopnm " << background_name
+	    << " | ppmtoy4m -v0 -n" << frame_count << " -F"
 	    << frame_params_.rate_numer << ":" << frame_params_.rate_denom
 	    << " -A" << frame_params_.pixel_ratio_width
 	    << ":" << frame_params_.pixel_ratio_height
@@ -290,7 +320,7 @@ void dvd_generator::generate(const std::string & output_dir) const
 	    // This is the first (title) menu, displayed when the
 	    // disc is first played.
 	    file <<
-		"      <pgc entry='title' pause='inf'>\n"
+		"      <pgc entry='title'>\n"
 		"        <pre>\n"
 		// Set a default target location if none is set.
 		// This covers first play and use of the "top menu"
@@ -301,7 +331,7 @@ void dvd_generator::generate(const std::string & output_dir) const
 	else
 	{
 	    file <<
-		"      <pgc pause='inf'>\n"
+		"      <pgc>\n"
 		"        <pre>\n";
 	}
 
@@ -351,7 +381,15 @@ void dvd_generator::generate(const std::string & output_dir) const
 	    "        </pre>\n"
 	    "        <vob file='"
 	     << temp_file_name(temp_dir_, "menu-%3d.mpeg", 1 + menu_index)
-	     << "'/>\n";
+	     << "'>\n"
+	    // Define a cell covering the whole menu and set a still
+	    // time at the end of that, since it seems all players
+	    // support that but some ignore a still time set on a PGC.
+	    "          <cell start='0' end='"
+	     << std::fixed << std::setprecision(4)
+	     << menu_duration_seconds(frame_params_) << "'"
+	    " chapter='yes' pause='inf'/>\n"
+	    "        </vob>\n";
 
 	for (unsigned button_index = 0;
 	     button_index != this_menu.entries.size();
@@ -410,11 +448,6 @@ void dvd_generator::generate(const std::string & output_dir) const
 	}
 
 	file <<
-	    // Some DVD players don't seem to obey pause='inf' so make
-	    // them loop.
-	    "        <post>\n"
-	    "          jump cell 1;\n"
-	    "        </post>\n"
 	    "      </pgc>\n";
     }