Attachment #99315 for bug #150509




gdouble
ogmrip_backend_dvdcpy_watch (OGMJobExec *exec, const gchar *buffer, OGMRipVideo *video)
{
  guint bytes, total, percent;
  guint percent;

  if (sscanf (buffer, "%u/%u blocks written (%u%%)", &bytes, &total, &percent) == 3)
    return percent / 100.;

  GPtrArray *argv;

  const gchar *device;
  gint vid;

#if MPLAYER_PRE >= 8
  gint sstep;
#endif

  g_return_val_if_fail (OGMRIP_IS_VIDEO (video), NULL);

  title = ogmrip_codec_get_input (OGMRIP_CODEC (video));




ogmrip_container_get_audio_overhead (OGMRipContainer *container, OGMRipContainerChild *child)
{
  glong length;
  gint samples_per_frame, sample_rate;
  guint numerator, denominator;

  length = ogmrip_codec_get_length (child->codec, NULL);
  sample_rate = ogmrip_audio_get_sample_rate (OGMRIP_AUDIO (child->codec));
  samples_per_frame = ogmrip_audio_get_samples_per_frame (OGMRIP_AUDIO (child->codec));
  ogmrip_codec_get_framerate (OGMRIP_CODEC (child->codec), &numerator, &denominator);

  return (gint64) length * sample_rate * denominator * container->priv->overhead / (gdouble) (samples_per_frame * numerator);
}

static gint64

Lines 690-697 Link Here

(-)src/ogmrip-main.c (+2 lines)
690	* The mp4 container's implementation in mencoder does not support b frames	690	* The mp4 container's implementation in mencoder does not support b frames
691	* This should be automated in libogmrip	691	* This should be automated in libogmrip
692	*/	692	*/
		693	#ifdef HAVE_LAVF_SUPPORT
693	if (encode->container == OGMRIP_TYPE_MP4)	694	if (encode->container == OGMRIP_TYPE_MP4)
694	ogmrip_video_set_max_b_frames (OGMRIP_VIDEO (spawn), 0);	695	ogmrip_video_set_max_b_frames (OGMRIP_VIDEO (spawn), 0);
		696	#endif
695		697
696	if (encode->passes == 0)	698	if (encode->passes == 0)
697	result = ogmrip_main_extract_video_stream_pass (data, spawn, encode->title, 0, error);	699	result = ogmrip_main_extract_video_stream_pass (data, spawn, encode->title, 0, error);




09 Oct 2006 Olivier Rolland <billl@users.sf.net>

	* libogmrip/ogmrip-backend.c
	* dvdcpy/dvdcpy.c

	Fixed compilation on amd64

	* libogmrip/ogmrip-backend.c

	Fixed compilation with mplayer < 1.0pre8

	* libogmrip/ogmrip-container.c

	Fixed audio overhead

	* src/ogmrip-main.c

	Fixed compilation when mp4 is not available

08 Oct 2006 Olivier Rolland <billl@users.sf.net>

	* configure.in

	Released OGMRip-0.10.0-rc4

05 Oct 2006 Olivier Rolland <billl@users.sf.net>

	* configure.in




    }

    current_size += count;
    fprintf (stdout, "\r%zd/%zd blocks written (%zd%%)", current_size, total_size, current_size * 100 / total_size);
    fflush (stdout);
  }

  fprintf (stdout, "\r%zd/%zd blocks written (%zd%%)", current_size, total_size, current_size * 100 / total_size);
  fflush (stdout);

  return size;


  if (total_size > get_space_left (output))
  {
    fprintf (stderr, "Error: Not enough space left on device (%zd bytes needed)\n", total_size);
    ifoClose (vmg_file);
    DVDClose (reader);
    return EXIT_FAILURE;

Return to bug 150509

Lines 406-413 Link Here

(-)libogmrip/ogmrip-backend.c (-3 / +6 lines)
406	gdouble	406	gdouble
407	ogmrip_backend_dvdcpy_watch (OGMJobExec exec, const gchar buffer, OGMRipVideo *video)	407	ogmrip_backend_dvdcpy_watch (OGMJobExec exec, const gchar buffer, OGMRipVideo *video)
408	{	408	{
409	size_t bytes, total;	409	guint bytes, total, percent;
410	guint percent;
411		410
412	if (sscanf (buffer, "%u/%u blocks written (%u%%)", &bytes, &total, &percent) == 3)	411	if (sscanf (buffer, "%u/%u blocks written (%u%%)", &bytes, &total, &percent) == 3)
413	return percent / 100.;	412	return percent / 100.;
Lines 1378-1385 Link Here
1378	GPtrArray *argv;	1377	GPtrArray *argv;
1379		1378
1380	const gchar *device;	1379	const gchar *device;
1381	gint vid, sstep;	1380	gint vid;
1382		1381
		1382	#if MPLAYER_PRE >= 8
		1383	gint sstep;
		1384	#endif
		1385
1383	g_return_val_if_fail (OGMRIP_IS_VIDEO (video), NULL);	1386	g_return_val_if_fail (OGMRIP_IS_VIDEO (video), NULL);
1384		1387
1385	title = ogmrip_codec_get_input (OGMRIP_CODEC (video));	1388	title = ogmrip_codec_get_input (OGMRIP_CODEC (video));

Lines 563-574 Link Here

(-)libogmrip/ogmrip-container.c (-2 / +5 lines)
563	ogmrip_container_get_audio_overhead (OGMRipContainer container, OGMRipContainerChild child)	563	ogmrip_container_get_audio_overhead (OGMRipContainer container, OGMRipContainerChild child)
564	{	564	{
565	glong length;	565	glong length;
566	gint samples_per_frame, bitrate = 0;	566	gint samples_per_frame, sample_rate;
		567	guint numerator, denominator;
567		568
568	length = ogmrip_codec_get_length (child->codec, NULL);	569	length = ogmrip_codec_get_length (child->codec, NULL);
		570	sample_rate = ogmrip_audio_get_sample_rate (OGMRIP_AUDIO (child->codec));
569	samples_per_frame = ogmrip_audio_get_samples_per_frame (OGMRIP_AUDIO (child->codec));	571	samples_per_frame = ogmrip_audio_get_samples_per_frame (OGMRIP_AUDIO (child->codec));
		572	ogmrip_codec_get_framerate (OGMRIP_CODEC (child->codec), &numerator, &denominator);
570		573
571	return (gint64) length * bitrate * container->priv->overhead / (gdouble) samples_per_frame;	574	return (gint64) length * sample_rate * denominator * container->priv->overhead / (gdouble) (samples_per_frame * numerator);
572	}	575	}
573		576
574	static gint64	577	static gint64

Lines 286-296 Link Here

(-)dvdcpy/dvdcpy.c (-3 / +3 lines)
286	}	286	}
287		287
288	current_size += count;	288	current_size += count;
289	fprintf (stdout, "\r%d/%d blocks written (%d%%)", current_size, total_size, current_size * 100 / total_size);	289	fprintf (stdout, "\r%zd/%zd blocks written (%zd%%)", current_size, total_size, current_size * 100 / total_size);
290	fflush (stdout);	290	fflush (stdout);
291	}	291	}
292		292
293	fprintf (stdout, "\r%d/%d blocks written (%d%%)", current_size, total_size, current_size * 100 / total_size);	293	fprintf (stdout, "\r%zd/%zd blocks written (%zd%%)", current_size, total_size, current_size * 100 / total_size);
294	fflush (stdout);	294	fflush (stdout);
295		295
296	return size;	296	return size;
Lines 801-807 Link Here
801		801
802	if (total_size > get_space_left (output))	802	if (total_size > get_space_left (output))
803	{	803	{
804	fprintf (stderr, "Error: Not enough space left on device (%d bytes needed)\n", total_size);	804	fprintf (stderr, "Error: Not enough space left on device (%zd bytes needed)\n", total_size);
805	ifoClose (vmg_file);	805	ifoClose (vmg_file);
806	DVDClose (reader);	806	DVDClose (reader);
807	return EXIT_FAILURE;	807	return EXIT_FAILURE;

Lines 1-3 Link Here

(-)ChangeLog (+25 lines)
		1	09 Oct 2006 Olivier Rolland <billl@users.sf.net>
		2
		3	* libogmrip/ogmrip-backend.c
		4	* dvdcpy/dvdcpy.c
		5
		6	Fixed compilation on amd64
		7
		8	* libogmrip/ogmrip-backend.c
		9
		10	Fixed compilation with mplayer < 1.0pre8
		11
		12	* libogmrip/ogmrip-container.c
		13
		14	Fixed audio overhead
		15
		16	* src/ogmrip-main.c
		17
		18	Fixed compilation when mp4 is not available
		19
		20	08 Oct 2006 Olivier Rolland <billl@users.sf.net>
		21
		22	* configure.in
		23
		24	Released OGMRip-0.10.0-rc4
		25
1	05 Oct 2006 Olivier Rolland <billl@users.sf.net>	26	05 Oct 2006 Olivier Rolland <billl@users.sf.net>
2		27
3	* configure.in	28	* configure.in