X-Git-Url: https://git.decadent.org.uk/gitweb/?p=videolink.git;a=blobdiff_plain;f=webdvd.cpp;h=94ab121f890c3f043cca63277ecc7928e76933e1;hp=4d951ee9120f5502b0bec78b4aedcc92e2c16012;hb=a144f37803d6e86aedd634e971d8a76b0d8ac5fa;hpb=8d0ade32b10e040e462b244332afad1a0961d25b

diff --git a/webdvd.cpp b/webdvd.cpp
index 4d951ee..94ab121 100644
--- a/webdvd.cpp
+++ b/webdvd.cpp
@@ -9,12 +9,17 @@
 #include <memory>
 #include <queue>
 #include <set>
+#include <sstream>
 #include <string>
 
 #include <stdlib.h>
 #include <unistd.h>
 
+#include <boost/shared_ptr.hpp>
+
 #include <gdkmm/pixbuf.h>
+#include <glibmm/convert.h>
+#include <glibmm/spawn.h>
 #include <gtkmm/main.h>
 #include <gtkmm/window.h>
 
@@ -48,6 +53,7 @@
 #include "linkiterator.hpp"
 #include "pixbufs.hpp"
 #include "stylesheets.hpp"
+#include "temp_file.hpp"
 #include "video.hpp"
 #include "xpcom_support.hpp"
 
@@ -133,10 +139,13 @@ namespace
     class WebDvdWindow : public Gtk::Window
     {
     public:
-	WebDvdWindow(int width, int height);
-	void add_page(const std::string & uri);
+	WebDvdWindow(
+	    const video::frame_params & frame_params,
+	    const std::string & main_page_uri,
+	    const std::string & output_dir);
 
     private:
+	void add_page(const std::string & uri);
 	void add_video(const std::string & uri);
 	void load_next_page();
 	void on_net_state_change(const char * uri, gint flags, guint status);
@@ -144,11 +153,12 @@ namespace
 	void process_links(nsIPresShell * pres_shell,
 			   nsIPresContext * pres_context,
 			   nsIDOMWindow * dom_window);
-	void generate_dvdauthor_file();
+	void generate_dvd();
 
 	enum ResourceType { page_resource, video_resource };
 	typedef std::pair<ResourceType, int> ResourceEntry;
-	int width_, height_;
+	video::frame_params frame_params_;
+	std::string output_dir_;
 	BrowserWidget browser_widget_;
 	nsCOMPtr<nsIStyleSheet> stylesheet_;
 	std::queue<std::string> page_queue_;
@@ -157,21 +167,30 @@ namespace
 	std::vector<std::string> video_paths_;
 	bool loading_;
 	int pending_req_count_;
+	std::auto_ptr<temp_file> background_temp_;
 	struct link_state;
 	std::auto_ptr<link_state> link_state_;
+	std::vector<boost::shared_ptr<temp_file> > page_temp_files_;
     };
 
-    WebDvdWindow::WebDvdWindow(int width, int height)
-	    : width_(width), height_(height),
+    WebDvdWindow::WebDvdWindow(
+	const video::frame_params & frame_params,
+	const std::string & main_page_uri,
+	const std::string & output_dir)
+	    : frame_params_(frame_params),
+	      output_dir_(output_dir),
 	      stylesheet_(load_css("file://" WEBDVD_LIB_DIR "/webdvd.css")),
 	      loading_(false),
 	      pending_req_count_(0)
     {
-	set_default_size(width, height);
+	set_default_size(frame_params_.width, frame_params_.height);
 	add(browser_widget_);
 	browser_widget_.show();
 	browser_widget_.signal_net_state().connect(
 	    SigC::slot(*this, &WebDvdWindow::on_net_state_change));
+
+	add_page(main_page_uri);
+	load_next_page();
     }
 
     void WebDvdWindow::add_page(const std::string & uri)
@@ -181,8 +200,6 @@ namespace
 	    .second)
 	{
 	    page_queue_.push(uri);
-	    if (!loading_)
-		load_next_page();
 	}
     }
 
@@ -277,7 +294,7 @@ namespace
 		    page_queue_.pop();
 		    if (page_queue_.empty())
 		    {
-			generate_dvdauthor_file();
+			generate_dvd();
 			Gtk::Main::quit();
 		    }
 		    else
@@ -298,24 +315,29 @@ namespace
 
     void WebDvdWindow::save_screenshot()
     {
-	char filename[25];
-	std::sprintf(filename, "page_%06d_back.png", page_links_.size());
 	Glib::RefPtr<Gdk::Window> window(get_window());
 	assert(window);
 	window->process_updates(true);
-	std::cout << "saving " << filename << std::endl;
+
+	background_temp_.reset(new temp_file("webdvd-back-"));
+	background_temp_->close();
+	std::cout << "saving " << background_temp_->get_name() << std::endl;
 	Gdk::Pixbuf::create(Glib::RefPtr<Gdk::Drawable>(window),
 			    window->get_colormap(),
-			    0, 0, 0, 0, width_, height_)
-	    ->save(filename, "png");
+			    0, 0, 0, 0,
+			    frame_params_.width, frame_params_.height)
+	    ->save(background_temp_->get_name(), "png");
     }
 
     struct WebDvdWindow::link_state
     {
 	Glib::RefPtr<Gdk::Pixbuf> diff_pixbuf;
 
+	std::auto_ptr<temp_file> spumux_temp;
 	std::ofstream spumux_file;
 
+	std::auto_ptr<temp_file> links_temp;
+
 	int link_num;
 	LinkIterator links_it, links_end;
 
@@ -352,32 +374,35 @@ namespace
 	{
 	    state.reset(new link_state);
 
-	    state->diff_pixbuf = Gdk::Pixbuf::create(Gdk::COLORSPACE_RGB,
-						     true, // has_alpha
-						     8, // bits_per_sample
-						     width_, height_);
+	    state->diff_pixbuf = Gdk::Pixbuf::create(
+		Gdk::COLORSPACE_RGB,
+		true, 8, // has_alpha, bits_per_sample
+		frame_params_.width, frame_params_.height);
 
-	    char spumux_filename[20];
-	    std::sprintf(spumux_filename,
-			 "page_%06d.spumux", page_links_.size());
-	    state->spumux_file.open(spumux_filename);
+	    state->spumux_temp.reset(new temp_file("webdvd-spumux-"));
+	    state->spumux_temp->close();
+
+	    state->links_temp.reset(new temp_file("webdvd-links-"));
+	    state->links_temp->close();
+	    
+	    state->spumux_file.open(state->spumux_temp->get_name().c_str());
 	    state->spumux_file <<
 		"<subpictures>\n"
 		"  <stream>\n"
 		"    <spu force='yes' start='00:00:00.00'\n"
-		"        highlight='page_" << std::setfill('0')
-			       << std::setw(6) << page_links_.size()
-			       << "_links.png'\n"
-		"        select='page_" << std::setfill('0')
-			       << std::setw(6) << page_links_.size()
-			       << "_links.png'>\n";
+		"        highlight='" << state->links_temp->get_name()
+			       << "'\n"
+		"        select='" << state->links_temp->get_name()
+			       << "'>\n";
 
 	    state->link_num = 0;
 	    state->links_it = LinkIterator(basic_doc);
 	    state->link_changing = false;
 	}
 	    
-	rectangle window_rect = { 0, 0, width_, height_ };
+	rectangle window_rect = {
+	    0, 0, frame_params_.width, frame_params_.height
+	};
 
 	for (/* no initialisation */;
 	     state->links_it != state->links_end;
@@ -539,23 +564,65 @@ namespace
 
 	quantise_rgba_pixbuf(state->diff_pixbuf, dvd::button_n_colours);
 
-	char filename[25];
-	std::sprintf(filename, "page_%06d_links.png", page_links_.size());
-	std::cout << "saving " << filename << std::endl;
-	state->diff_pixbuf->save(filename, "png");
+	std::cout << "saving " << state->links_temp->get_name()
+		  << std::endl;
+	state->diff_pixbuf->save(state->links_temp->get_name(), "png");
 
 	state->spumux_file <<
 	    "    </spu>\n"
 	    "  </stream>\n"
 	    "</subpictures>\n";
+
+	state->spumux_file.close();
+
+	// TODO: if (!state->spumux_file) throw ...
+
+	{
+	    boost::shared_ptr<temp_file> vob_temp(
+		new temp_file("webdvd-vob-"));
+	    std::ostringstream command_stream;
+	    command_stream << "pngtopnm "
+			   << background_temp_->get_name()
+			   << " | ppmtoy4m -v0 -n1 -F"
+			   << frame_params_.rate_numer
+			   << ":" << frame_params_.rate_denom
+			   << " -A" << frame_params_.pixel_ratio_width
+			   << ":" << frame_params_.pixel_ratio_height
+			   << (" -Ip -S420_mpeg2"
+			       " | mpeg2enc -v0 -f8 -a2 -o/dev/stdout"
+			       " | mplex -v0 -f8 -o/dev/stdout /dev/stdin"
+			       " | spumux -v0 -mdvd ")
+			   << state->spumux_temp->get_name()
+			   << " > " << vob_temp->get_name();
+	    std::string command(command_stream.str());
+	    const char * argv[] = {
+		"/bin/sh", "-c", command.c_str(), 0
+	    };
+	    std::cout << "running " << argv[2] << std::endl;
+	    int command_result;
+	    Glib::spawn_sync(".",
+			     Glib::ArrayHandle<std::string>(
+				 argv, sizeof(argv)/sizeof(argv[0]),
+				 Glib::OWNERSHIP_NONE),
+			     Glib::SPAWN_STDOUT_TO_DEV_NULL,
+			     SigC::Slot0<void>(),
+			     0, 0,
+			     &command_result);
+	    if (command_result != 0)
+		throw std::runtime_error("spumux pipeline failed");
+
+	    page_temp_files_.push_back(vob_temp);
+	}
     }
 
     void generate_page_dispatch(std::ostream &, int indent,
 				int first_page, int last_page);
 
-    void WebDvdWindow::generate_dvdauthor_file()
+    void WebDvdWindow::generate_dvd()
     {
-	std::ofstream file("webdvd.dvdauthor");
+	temp_file temp("webdvd-dvdauthor-");
+	temp.close();
+	std::ofstream file(temp.get_name().c_str());
 
 	// We generate code that uses registers in the following way:
 	//
@@ -649,9 +716,8 @@ namespace
 		// appropriate link/button.
 		"          g0 = 0; s8 = g1 &amp; " << link_mask << ";\n"
 		"        </pre>\n"
-	        "        <vob file='page_"
-		 << std::setfill('0') << std::setw(6) << page_num
-		 << ".vob'/>\n";
+	        "        <vob file='"
+		 << page_temp_files_[page_num - 1]->get_name() << "'/>\n";
 
 	    for (std::size_t link_num = 1;
 		 link_num <= page_links.size();
@@ -717,6 +783,29 @@ namespace
 
 	file <<
 	    "</dvdauthor>\n";
+
+	file.close();
+
+	{
+	    const char * argv[] = {
+		"dvdauthor",
+		"-o", output_dir_.c_str(),
+		"-x", temp.get_name().c_str(),
+		0
+	    };
+	    int command_result;
+	    Glib::spawn_sync(".",
+			     Glib::ArrayHandle<std::string>(
+				 argv, sizeof(argv)/sizeof(argv[0]),
+				 Glib::OWNERSHIP_NONE),
+			     Glib::SPAWN_SEARCH_PATH
+			     | Glib::SPAWN_STDOUT_TO_DEV_NULL,
+			     SigC::Slot0<void>(),
+			     0, 0,
+			     &command_result);
+	    if (command_result != 0)
+		throw std::runtime_error("dvdauthor failed");
+	}
     }
 
     void generate_page_dispatch(std::ostream & file, int indent,
@@ -755,38 +844,112 @@ namespace
 	}
     }
 
+    const video::frame_params & lookup_frame_params(const char * str)
+    {
+	assert(str);
+	static const struct { const char * str; bool is_ntsc; }
+	known_strings[] = {
+	    { "NTSC",  true },
+	    { "ntsc",  true },
+	    { "PAL",   false },
+	    { "pal",   false },
+	    // For DVD purposes, SECAM can be treated identically to PAL.
+	    { "SECAM", false },
+	    { "secam", false }
+	};
+	for (std::size_t i = 0;
+	     i != sizeof(known_strings)/sizeof(known_strings[0]);
+	     ++i)
+	    if (std::strcmp(str, known_strings[i].str) == 0)
+		return known_strings[i].is_ntsc ?
+		    video::ntsc_params : video::pal_params;
+	throw std::runtime_error(
+	    std::string("Invalid video standard: ").append(str));
+    }
+
+    void print_usage(std::ostream & stream, const char * command_name)
+    {
+	stream << "Usage: " << command_name
+	       << (" [gtk-options] [--video-std std-name]"
+		   " front-page-url output-dir\n");
+    }
+    
 } // namespace
 
 int main(int argc, char ** argv)
 {
-    // Get dimensions
-    int width = video::pal_oscan_width, height = video::pal_oscan_height;
-    for (int i = 1; i < argc - 1; ++i)
-	if (std::strcmp(argv[i], "-geometry") == 0)
-	{
-	    std::sscanf(argv[i + 1], "%dx%d", &width, &height);
-	    break;
-	}
-    // A depth of 24 results in 8 bits each for RGB components, which
-    // translates into "enough" bits for YUV components.
-    const int depth = 24;
-
     try
     {
+	// Do initial argument parsing.  We have to do this before
+	// letting Gtk parse the arguments since we need to spawn Xvfb
+	// first and that's currently dependent on the frame
+	// parameters (though we could just make it large enough for
+	// any frame) and also an unnecessary expense in some cases.
+	video::frame_params frame_params = video::pal_params;
+	for (int argi = 1; argi != argc; ++argi)
+	{
+	    if (std::strcmp(argv[argi], "--") == 0)
+		break;
+	    if (std::strcmp(argv[argi], "--help") == 0)
+	    {
+		print_usage(std::cout, argv[0]);
+		return EXIT_SUCCESS;
+	    }
+	    if (std::strcmp(argv[argi], "--video-std") == 0)
+	    {
+		if (argi + 1 == argc)
+		{
+		    std::cerr << "Missing argument to --video-std\n";
+		    print_usage(std::cerr, argv[0]);
+		    return EXIT_FAILURE;
+		}
+		frame_params = lookup_frame_params(argv[argi + 1]);
+		break;
+	    }
+	}
+	
 	// Spawn Xvfb and set env variables so that Xlib will use it
-	FrameBuffer fb(width, height, depth);
+	// Use 8 bits each for RGB components, which should translate into
+	// "enough" bits for YUV components.
+	FrameBuffer fb(frame_params.width, frame_params.height, 3 * 8);
 	setenv("XAUTHORITY", fb.get_x_authority().c_str(), true);
 	setenv("DISPLAY", fb.get_x_display().c_str(), true);
 
-	// Initialise Gtk and Mozilla
+	// Initialise Gtk
 	Gtk::Main kit(argc, argv);
+
+	// Complete argument parsing with Gtk's options out of the way.
+	int argi = 1;
+	while (argi != argc)
+	{
+	    if (std::strcmp(argv[argi], "--video-std") == 0)
+	    {
+		argi += 2;
+	    }
+	    else if (std::strcmp(argv[argi], "--") == 0)
+	    {
+		argi += 1;
+		break;
+	    }
+	    else if (argv[argi][0] == '-')
+	    {
+		std::cerr << "Invalid option: " << argv[argi] << "\n";
+		print_usage(std::cerr, argv[0]);
+		return EXIT_FAILURE;
+	    }
+	    else
+		break;
+	}
+	if (argi != argc - 2)
+	{
+	    print_usage(std::cerr, argv[0]);
+	    return EXIT_FAILURE;
+	}
+
+	// Initialise Mozilla
 	BrowserWidget::init();
 
-	WebDvdWindow window(width, height);
-	for (int argi = 1; argi < argc; ++argi)
-	    window.add_page(argv[argi]);
-	if (argc < 2)
-	    window.add_page("about:");
+	WebDvdWindow window(frame_params, argv[argi], argv[argi + 1]);
 	Gtk::Main::run(window);
     }
     catch (std::exception & e)