Attachment #286781 for bug #383363

View | Details | Raw Unified | Return to bug 383363
Collapse All | Expand All




  encoding->priv->copy_dvd = TRUE;

#ifdef HAVE_SYSCONF_NPROC
  encoding->priv->threads = sysconf (_SC_NPROCESSORS_ONLN);
#else
  encoding->priv->threads = 1;
#endif


  gchar *output;
  guint start_delay, num, denom;
  gint threads;

  output = ogmrip_fs_mktemp ("video.XXXXXX", error);
  if (!output)

  ogmrip_codec_set_progressive (OGMRIP_CODEC (spawn), encoding->priv->progressive);
  ogmrip_codec_set_telecine (OGMRIP_CODEC (spawn), encoding->priv->telecine);

  ogmrip_video_codec_set_threads (OGMRIP_VIDEO_CODEC (spawn), encoding->priv->threads);

#ifdef HAVE_SYSCONF_NPROC
  if (!threads)
    threads = sysconf (_SC_NPROCESSORS_ONLN);
#endif

  ogmrip_video_codec_set_threads (OGMRIP_VIDEO_CODEC (spawn), threads);
  ogmrip_video_codec_set_passes  (OGMRIP_VIDEO_CODEC (spawn), encoding->priv->passes);
  ogmrip_video_codec_set_quality (OGMRIP_VIDEO_CODEC (spawn), encoding->priv->preset);
  ogmrip_video_codec_set_denoise (OGMRIP_VIDEO_CODEC (spawn), encoding->priv->denoise);

{
  g_return_if_fail (OGMRIP_IS_ENCODING (encoding));
  g_return_if_fail (!OGMRIP_ENCODING_IS_RUNNING (encoding));

#ifndef HAVE_SYSCONF_NPROC
  g_return_if_fail (threads > 0);
#endif

  encoding->priv->threads = threads;
}




  ogmrip_settings_bind (settings,
      OGMRIP_GCONF_ADVANCED, OGMRIP_GCONF_AFTER_ENC, G_OBJECT (widget), "active");

  widget = glade_xml_get_widget (xml, "threads-spin");
  ogmrip_settings_bind (settings,
      OGMRIP_GCONF_ADVANCED, OGMRIP_GCONF_THREADS, G_OBJECT (widget), "value");

  widget = glade_xml_get_widget (xml, "keep-tmp-check");
  ogmrip_settings_bind (settings,
      OGMRIP_GCONF_ADVANCED, OGMRIP_GCONF_KEEP_TMP, G_OBJECT (widget), "active");

  gtk_file_chooser_set_action (GTK_FILE_CHOOSER (widget), 
      GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);

#ifndef HAVE_SYSCONF_NPROC
  widget = glade_xml_get_widget (xml, "threads-label");
  gtk_widget_show (widget);

  widget = glade_xml_get_widget (xml, "threads-spin");
  gtk_widget_show (widget);

  ogmrip_settings_bind (settings, OGMRIP_GCONF_ADVANCED,
      OGMRIP_GCONF_THREADS, G_OBJECT (widget), "value");
#endif

  g_object_unref (xml);
}


Lines 16-21 Link Here

(-)src/ogmrip-gconf.c (+11 lines)
16	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA	16	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17	*/	17	*/
18		18
		19	#ifdef HAVE_CONFIG_H
		20	#include "config.h"
		21	#endif
		22
19	#include "ogmrip-fs.h"	23	#include "ogmrip-fs.h"
20	#include "ogmrip-gconf.h"	24	#include "ogmrip-gconf.h"
21	#include "ogmrip-helper.h"	25	#include "ogmrip-helper.h"
Lines 24-29 Link Here
24	#include "ogmrip-gconf-settings.h"	28	#include "ogmrip-gconf-settings.h"
25		29
26	#include <string.h>	30	#include <string.h>
		31	#include <unistd.h>
27		32
28	OGMRipSettings *settings;	33	OGMRipSettings *settings;
29		34
Lines 122-129 Link Here
122	g_param_spec_int (OGMRIP_GCONF_CHAPTER_LANG, NULL, NULL, 0, G_MAXINT, OGMRIP_DEFAULT_CHAPTER_LANG, G_PARAM_READWRITE));	127	g_param_spec_int (OGMRIP_GCONF_CHAPTER_LANG, NULL, NULL, 0, G_MAXINT, OGMRIP_DEFAULT_CHAPTER_LANG, G_PARAM_READWRITE));
123	ogmrip_settings_install_key (settings,	128	ogmrip_settings_install_key (settings,
124	g_param_spec_int (OGMRIP_GCONF_AFTER_ENC, NULL, NULL, 0, 3, OGMRIP_DEFAULT_AFTER_ENC, G_PARAM_READWRITE));	129	g_param_spec_int (OGMRIP_GCONF_AFTER_ENC, NULL, NULL, 0, 3, OGMRIP_DEFAULT_AFTER_ENC, G_PARAM_READWRITE));
		130
		131	#ifdef HAVE_SYSCONF_NPROC
125	ogmrip_settings_install_key (settings,	132	ogmrip_settings_install_key (settings,
		133	g_param_spec_int (OGMRIP_GCONF_THREADS, NULL, NULL, 1, G_MAXINT, sysconf (_SC_NPROCESSORS_ONLN), G_PARAM_READWRITE));
		134	#else
		135	ogmrip_settings_install_key (settings,
126	g_param_spec_int (OGMRIP_GCONF_THREADS, NULL, NULL, 1, G_MAXINT, OGMRIP_DEFAULT_THREADS, G_PARAM_READWRITE));	136	g_param_spec_int (OGMRIP_GCONF_THREADS, NULL, NULL, 1, G_MAXINT, OGMRIP_DEFAULT_THREADS, G_PARAM_READWRITE));
		137	#endif
127		138
128	ogmrip_settings_install_key (settings,	139	ogmrip_settings_install_key (settings,
129	g_param_spec_boolean (OGMRIP_GCONF_COPY_DVD, NULL, NULL, OGMRIP_DEFAULT_COPY_DVD, G_PARAM_READWRITE));	140	g_param_spec_boolean (OGMRIP_GCONF_COPY_DVD, NULL, NULL, OGMRIP_DEFAULT_COPY_DVD, G_PARAM_READWRITE));

Lines 410-415 Link Here

(-)data/ogmrip-pref.glade (+2 lines)
410	</child>	410	</child>
411	<child>	411	<child>
412	<widget class="GtkLabel" id="threads_label">	412	<widget class="GtkLabel" id="threads_label">
		413	<property name="visible">True</property>
413	<property name="xalign">0</property>	414	<property name="xalign">0</property>
414	<property name="label" translatable="yes">_Threads:</property>	415	<property name="label" translatable="yes">_Threads:</property>
415	<property name="use_underline">True</property>	416	<property name="use_underline">True</property>
Lines 424-429 Link Here
424	</child>	425	</child>
425	<child>	426	<child>
426	<widget class="GtkSpinButton" id="threads-spin">	427	<widget class="GtkSpinButton" id="threads-spin">
		428	<property name="visible">True</property>
427	<property name="can_focus">True</property>	429	<property name="can_focus">True</property>
428	<property name="adjustment">1 1 100 1 10 0</property>	430	<property name="adjustment">1 1 100 1 10 0</property>
429	<property name="climb_rate">1</property>	431	<property name="climb_rate">1</property>

Return to bug 383363

Lines 665-671 Link Here

(-)libogmrip/ogmrip-encoding.c (-13 / +2 lines)
665	encoding->priv->copy_dvd = TRUE;	665	encoding->priv->copy_dvd = TRUE;
666		666
667	#ifdef HAVE_SYSCONF_NPROC	667	#ifdef HAVE_SYSCONF_NPROC
668	encoding->priv->threads = 0;	668	encoding->priv->threads = sysconf (_SC_NPROCESSORS_ONLN);
669	#else	669	#else
670	encoding->priv->threads = 1;	670	encoding->priv->threads = 1;
671	#endif	671	#endif
Lines 2124-2130 Link Here
2124		2124
2125	gchar *output;	2125	gchar *output;
2126	guint start_delay, num, denom;	2126	guint start_delay, num, denom;
2127	gint threads;
2128		2127
2129	output = ogmrip_fs_mktemp ("video.XXXXXX", error);	2128	output = ogmrip_fs_mktemp ("video.XXXXXX", error);
2130	if (!output)	2129	if (!output)
Lines 2140-2153 Link Here
2140	ogmrip_codec_set_progressive (OGMRIP_CODEC (spawn), encoding->priv->progressive);	2139	ogmrip_codec_set_progressive (OGMRIP_CODEC (spawn), encoding->priv->progressive);
2141	ogmrip_codec_set_telecine (OGMRIP_CODEC (spawn), encoding->priv->telecine);	2140	ogmrip_codec_set_telecine (OGMRIP_CODEC (spawn), encoding->priv->telecine);
2142		2141
2143	threads = encoding->priv->threads;	2142	ogmrip_video_codec_set_threads (OGMRIP_VIDEO_CODEC (spawn), encoding->priv->threads);
2144
2145	#ifdef HAVE_SYSCONF_NPROC
2146	if (!threads)
2147	threads = sysconf (_SC_NPROCESSORS_ONLN);
2148	#endif
2149
2150	ogmrip_video_codec_set_threads (OGMRIP_VIDEO_CODEC (spawn), threads);
2151	ogmrip_video_codec_set_passes (OGMRIP_VIDEO_CODEC (spawn), encoding->priv->passes);	2143	ogmrip_video_codec_set_passes (OGMRIP_VIDEO_CODEC (spawn), encoding->priv->passes);
2152	ogmrip_video_codec_set_quality (OGMRIP_VIDEO_CODEC (spawn), encoding->priv->preset);	2144	ogmrip_video_codec_set_quality (OGMRIP_VIDEO_CODEC (spawn), encoding->priv->preset);
2153	ogmrip_video_codec_set_denoise (OGMRIP_VIDEO_CODEC (spawn), encoding->priv->denoise);	2145	ogmrip_video_codec_set_denoise (OGMRIP_VIDEO_CODEC (spawn), encoding->priv->denoise);
Lines 3912-3921 Link Here
3912	{	3904	{
3913	g_return_if_fail (OGMRIP_IS_ENCODING (encoding));	3905	g_return_if_fail (OGMRIP_IS_ENCODING (encoding));
3914	g_return_if_fail (!OGMRIP_ENCODING_IS_RUNNING (encoding));	3906	g_return_if_fail (!OGMRIP_ENCODING_IS_RUNNING (encoding));
3915
3916	#ifndef HAVE_SYSCONF_NPROC
3917	g_return_if_fail (threads > 0);	3907	g_return_if_fail (threads > 0);
3918	#endif
3919		3908
3920	encoding->priv->threads = threads;	3909	encoding->priv->threads = threads;
3921	}	3910	}

Lines 275-280 Link Here

(-)src/ogmrip-pref-dialog.c (-11 / +4 lines)
275	ogmrip_settings_bind (settings,	275	ogmrip_settings_bind (settings,
276	OGMRIP_GCONF_ADVANCED, OGMRIP_GCONF_AFTER_ENC, G_OBJECT (widget), "active");	276	OGMRIP_GCONF_ADVANCED, OGMRIP_GCONF_AFTER_ENC, G_OBJECT (widget), "active");
277		277
		278	widget = glade_xml_get_widget (xml, "threads-spin");
		279	ogmrip_settings_bind (settings,
		280	OGMRIP_GCONF_ADVANCED, OGMRIP_GCONF_THREADS, G_OBJECT (widget), "value");
		281
278	widget = glade_xml_get_widget (xml, "keep-tmp-check");	282	widget = glade_xml_get_widget (xml, "keep-tmp-check");
279	ogmrip_settings_bind (settings,	283	ogmrip_settings_bind (settings,
280	OGMRIP_GCONF_ADVANCED, OGMRIP_GCONF_KEEP_TMP, G_OBJECT (widget), "active");	284	OGMRIP_GCONF_ADVANCED, OGMRIP_GCONF_KEEP_TMP, G_OBJECT (widget), "active");
Lines 298-314 Link Here
298	gtk_file_chooser_set_action (GTK_FILE_CHOOSER (widget),	302	gtk_file_chooser_set_action (GTK_FILE_CHOOSER (widget),
299	GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);	303	GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
300		304
301	#ifndef HAVE_SYSCONF_NPROC
302	widget = glade_xml_get_widget (xml, "threads-label");
303	gtk_widget_show (widget);
304
305	widget = glade_xml_get_widget (xml, "threads-spin");
306	gtk_widget_show (widget);
307
308	ogmrip_settings_bind (settings, OGMRIP_GCONF_ADVANCED,
309	OGMRIP_GCONF_THREADS, G_OBJECT (widget), "value");
310	#endif
311
312	g_object_unref (xml);	305	g_object_unref (xml);
313	}	306	}
314		307

Lines 916-921 Link Here

(-)src/ogmrip-main.c (+4 lines)
916	ogmrip_encoding_set_bitrate (encoding, g_value_get_int (value));	916	ogmrip_encoding_set_bitrate (encoding, g_value_get_int (value));
917	else if (g_str_equal (key, OGMRIP_GCONF_VIDEO_QUANTIZER))	917	else if (g_str_equal (key, OGMRIP_GCONF_VIDEO_QUANTIZER))
918	ogmrip_encoding_set_quantizer (encoding, g_value_get_double (value));	918	ogmrip_encoding_set_quantizer (encoding, g_value_get_double (value));
		919	else if (g_str_equal (key, OGMRIP_GCONF_THREADS))
		920	ogmrip_encoding_set_threads (encoding, g_value_get_int (value));
919	else if (g_str_equal (key, OGMRIP_GCONF_CONTAINER_FORMAT))	921	else if (g_str_equal (key, OGMRIP_GCONF_CONTAINER_FORMAT))
920	{	922	{
921	/*	923	/*
Lines 1128-1133 Link Here
1128	ogmrip_encoding_set_video_codec_type (encoding, video_codec_type, NULL);	1130	ogmrip_encoding_set_video_codec_type (encoding, video_codec_type, NULL);
1129		1131
1130	ogmrip_settings_set_property_from_key (settings, G_OBJECT (encoding),	1132	ogmrip_settings_set_property_from_key (settings, G_OBJECT (encoding),
		1133	"threads", OGMRIP_GCONF_ADVANCED, OGMRIP_GCONF_THREADS);
		1134	ogmrip_settings_set_property_from_key (settings, G_OBJECT (encoding),
1131	"keep-tmp-files", OGMRIP_GCONF_ADVANCED, OGMRIP_GCONF_KEEP_TMP);	1135	"keep-tmp-files", OGMRIP_GCONF_ADVANCED, OGMRIP_GCONF_KEEP_TMP);
1132	ogmrip_settings_set_property_from_key (settings, G_OBJECT (encoding),	1136	ogmrip_settings_set_property_from_key (settings, G_OBJECT (encoding),
1133	"copy-dvd", OGMRIP_GCONF_ADVANCED, OGMRIP_GCONF_COPY_DVD);	1137	"copy-dvd", OGMRIP_GCONF_ADVANCED, OGMRIP_GCONF_COPY_DVD);