Attachment #56134 for bug #85865

Lines 958-963 Link Here

(-)transcode-0.6.14.orig/configure.in (+4 lines)
958	[C], [quicktime/lqt.h], quicktime, quicktime_open)	958	[C], [quicktime/lqt.h], quicktime, quicktime_open)
959	if test x"$have_libquicktime" = x"yes" ; then	959	if test x"$have_libquicktime" = x"yes" ; then
960	AC_DEFINE([HAVE_LIBQUICKTIME], 1, [have libquicktime support])	960	AC_DEFINE([HAVE_LIBQUICKTIME], 1, [have libquicktime support])
		961	AC_CHECK_LIB(quicktime, lqt_encode_video,
		962	[AC_DEFINE([LIBQUICKTIME_000904], [1], [Have libquicktime 0.9.4 or newer])],
		963	[],
		964	[$LIBQUICKTIME_EXTRA_LIBS])
961	fi	965	fi
962	AM_CONDITIONAL(HAVE_LIBQUICKTIME, test x"$have_libquicktime" = x"yes")	966	AM_CONDITIONAL(HAVE_LIBQUICKTIME, test x"$have_libquicktime" = x"yes")
963	AC_SUBST(LIBQUICKTIME_CFLAGS)	967	AC_SUBST(LIBQUICKTIME_CFLAGS)




  {"info", "",  "Info string (no '=' or ',' allowed) "},
  {NULL, NULL, NULL}};

#ifdef LIBQUICKTIME_000904
/* from libquicktime */
int tc_quicktime_get_timescale(double frame_rate)
{
	int timescale = 600;
	/* Encode the 29.97, 23.976, 59.94 framerates */
	if(frame_rate - (int)frame_rate != 0) 
		timescale = (int)(frame_rate * 1001 + 0.5);
	else
		if((600 / frame_rate) - (int)(600 / frame_rate) != 0) 
			timescale = (int)(frame_rate * 100 + 0.5);
	return timescale;
}
#endif

/* print list of things. Shamelessly stolen from export_ffmpeg.c */ 
static int list(char *list_type) 

            return(TC_EXPORT_ERROR);
        }

#if !defined(LIBQUICKTIME_000904)
        /* set proposed video codec */
        lqt_set_video(qtfile, 1, w, h, vob->ex_fps,qt_codec_info[0]);
#else
	fprintf(stderr, "\n \n  %i \n \n", tc_quicktime_get_timescale(vob->ex_fps));
        /* set proposed video codec */
        lqt_set_video(qtfile, 1, w, h,
		tc_quicktime_get_timescale(vob->ex_fps) / vob->ex_fps+0.5,
		tc_quicktime_get_timescale(vob->ex_fps), qt_codec_info[0]);
#endif
    }

    /* set color model */

Lines 160-165 Link Here

(-)transcode-0.6.14.orig/import/decode_mov.c (+2 lines)
160	}	160	}
161	free(p_buffer);	161	free(p_buffer);
162	}	162	}
		163	#if !defined(LIBQUICKTIME_000904)
163	else if((strcasecmp(p_a_codec,QUICKTIME_RAW)==0) \|\| (strcasecmp(p_a_codec,QUICKTIME_TWOS)==0))	164	else if((strcasecmp(p_a_codec,QUICKTIME_RAW)==0) \|\| (strcasecmp(p_a_codec,QUICKTIME_TWOS)==0))
164	{	165	{
165	s_sample=(1.00 * s_channel * s_bits s_audio_rate)/(s_fps8);	166	s_sample=(1.00 * s_channel * s_bits s_audio_rate)/(s_fps8);
Lines 180-185 Link Here
180	quicktime_close(p_qt_structure);	181	quicktime_close(p_qt_structure);
181	free(p_buffer);	182	free(p_buffer);
182	}	183	}
		184	#endif
183	else	185	else
184	{	186	{
185	quicktime_close(p_qt_structure);	187	quicktime_close(p_qt_structure);




    if(quicktime_supported_audio(qt_audio, 0)!=0) {
      rawAudioMode = 0;
    } 
#if !defined(LIBQUICKTIME_000904)
    /* RAW PCM is directly supported */
    else if(strcasecmp(codec,QUICKTIME_RAW)==0) {
      rawAudioMode = 1;
      fprintf(stderr,"[%s] using RAW audio mode!\n",MOD_NAME);
    }
#endif
    /* unsupported codec */
    else {
      fprintf(stderr, "error: quicktime audio codec '%s' not supported!\n",

    }

    /* raw read mode */
#if !defined(LIBQUICKTIME_000904)
    if(rawAudioMode) {
      bytes_read = quicktime_read_audio(qt_audio, 
					param->buffer, param->size, 0);
    } else
#endif
    {
      /* decode audio mode */
      long pos = quicktime_audio_position(qt_audio,0);
      long samples = param->size;
      if(bits==16)

Return to bug 85865

Lines 102-107 Link Here

(-)transcode-0.6.14.orig/export/export_mov.c (+22 lines)
102	{"info", "", "Info string (no '=' or ',' allowed) "},	102	{"info", "", "Info string (no '=' or ',' allowed) "},
103	{NULL, NULL, NULL}};	103	{NULL, NULL, NULL}};
104		104
		105	#ifdef LIBQUICKTIME_000904
		106	/* from libquicktime */
		107	int tc_quicktime_get_timescale(double frame_rate)
		108	{
		109	int timescale = 600;
		110	/* Encode the 29.97, 23.976, 59.94 framerates */
		111	if(frame_rate - (int)frame_rate != 0)
		112	timescale = (int)(frame_rate * 1001 + 0.5);
		113	else
		114	if((600 / frame_rate) - (int)(600 / frame_rate) != 0)
		115	timescale = (int)(frame_rate * 100 + 0.5);
		116	return timescale;
		117	}
		118	#endif
105		119
106	/* print list of things. Shamelessly stolen from export_ffmpeg.c */	120	/* print list of things. Shamelessly stolen from export_ffmpeg.c */
107	static int list(char *list_type)	121	static int list(char *list_type)
Lines 262-269 Link Here
262	return(TC_EXPORT_ERROR);	276	return(TC_EXPORT_ERROR);
263	}	277	}
264		278
		279	#if !defined(LIBQUICKTIME_000904)
265	/* set proposed video codec */	280	/* set proposed video codec */
266	lqt_set_video(qtfile, 1, w, h, vob->ex_fps,qt_codec_info[0]);	281	lqt_set_video(qtfile, 1, w, h, vob->ex_fps,qt_codec_info[0]);
		282	#else
		283	fprintf(stderr, "\n \n %i \n \n", tc_quicktime_get_timescale(vob->ex_fps));
		284	/* set proposed video codec */
		285	lqt_set_video(qtfile, 1, w, h,
		286	tc_quicktime_get_timescale(vob->ex_fps) / vob->ex_fps+0.5,
		287	tc_quicktime_get_timescale(vob->ex_fps), qt_codec_info[0]);
		288	#endif
267	}	289	}
268		290
269	/* set color model */	291	/* set color model */

Lines 136-146 Link Here

(-)transcode-0.6.14.orig/import/import_mov.c (-3 / +7 lines)
136	if(quicktime_supported_audio(qt_audio, 0)!=0) {	136	if(quicktime_supported_audio(qt_audio, 0)!=0) {
137	rawAudioMode = 0;	137	rawAudioMode = 0;
138	}	138	}
		139	#if !defined(LIBQUICKTIME_000904)
139	/* RAW PCM is directly supported */	140	/* RAW PCM is directly supported */
140	else if(strcasecmp(codec,QUICKTIME_RAW)==0) {	141	else if(strcasecmp(codec,QUICKTIME_RAW)==0) {
141	rawAudioMode = 1;	142	rawAudioMode = 1;
142	fprintf(stderr,"[%s] using RAW audio mode!\n",MOD_NAME);	143	fprintf(stderr,"[%s] using RAW audio mode!\n",MOD_NAME);
143	}	144	}
		145	#endif
144	/* unsupported codec */	146	/* unsupported codec */
145	else {	147	else {
146	fprintf(stderr, "error: quicktime audio codec '%s' not supported!\n",	148	fprintf(stderr, "error: quicktime audio codec '%s' not supported!\n",
Lines 334-345 Link Here
334	}	336	}
335		337
336	/* raw read mode */	338	/* raw read mode */
		339	#if !defined(LIBQUICKTIME_000904)
337	if(rawAudioMode) {	340	if(rawAudioMode) {
338	bytes_read = quicktime_read_audio(qt_audio,	341	bytes_read = quicktime_read_audio(qt_audio,
339	param->buffer, param->size, 0);	342	param->buffer, param->size, 0);
340	}	343	} else
341	/* decode audio mode */	344	#endif
342	else {	345	{
		346	/* decode audio mode */
343	long pos = quicktime_audio_position(qt_audio,0);	347	long pos = quicktime_audio_position(qt_audio,0);
344	long samples = param->size;	348	long samples = param->size;
345	if(bits==16)	349	if(bits==16)