Attachment #103345 for bug #157125




if test "x$enable_flac" = "xyes"; then
    dnl Library required for flac files, if not found 'enable_flac' is disabled
    AC_CHECK_LIB(m, cos) dnl Patch from Christian Weisgerber
    AC_CHECK_LIB(FLAC, FLAC__stream_decoder_init_file, flac_8_available=yes, flac_8_available=no)
    AC_CHECK_LIB(FLAC, FLAC__file_decoder_new, flac_7_available=yes, flac_7_available=no)

    AC_MSG_CHECKING(for FLAC file support)
    if test "x$flac_8_available" = "xyes"; then
        enable_flac="yes"
	flac_available="yes"
	AC_DEFINE(ENABLE_FLAC_8,1,[Define for FLAC support])
    elif test "x$flac_7_available" = "xyes"; then
        enable_flac="yes"
	flac_available="yes"
	AC_DEFINE(ENABLE_FLAC_7,1,[Define for FLAC support])
    else
	flac_available="no"
    fi
    
    if test "x$flac_available" = "xno"; then
	AC_MSG_RESULT(no)
	enable_flac="no"
	echo "***"
        echo "*** Warning: FLAC file support disabled, libflac missing"
        echo "*** (Install libflac, libogg and libvorbis libraries to enable it)"
        echo "***"

if test "x$enable_flac" = "xyes"; then
    LIBS_SAVE="$LIBS"
    CFLAGS_SAVE="$CFLAGS"
    LIBS="$LIBS -lFLAC"
    CFLAGS="$CFLAGS $LIBFLAC_CFLAGS"
    AC_MSG_CHECKING(for libFLAC version)
        AC_TRY_RUN([

    fclose(output);
    exit(0);
}
], source ./conftest.flac; echo "${LIBFLAC_MAJOR}.${LIBFLAC_MINOR}.${LIBFLAC_PATCH}", AC_MSG_WARN(could not determine libFLAC version),echo $ac_n "cross compiling; assuming ${LIBFLAC_MAJOR}.${LIBFLAC_MINOR}.${LIBFLAC_PATCH} $ac_c")
    LIBS="$LIBS_SAVE -lFLAC"
    CFLAGS="$CFLAGS_SAVE"
    LIBFLAC_VERSION="(flac-$LIBFLAC_MAJOR.$LIBFLAC_MINOR.$LIBFLAC_PATCH)"
fi




/**************
 * Prototypes *
 **************/
#endif /* ENABLE_FLAC */

#ifdef ENABLE_FLAC_8
static FLAC__StreamDecoderWriteStatus write_callback_(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
static void metadata_callback_ (const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
static void error_callback_   (const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
#elif ENABLE_FLAC_7
static FLAC__StreamDecoderWriteStatus write_callback_(const FLAC__FileDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
static void metadata_callback_ (const FLAC__FileDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
static void error_callback_   (const FLAC__FileDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
#endif /* ENABLE_FLAC_8 */


/*************
 * Functions *

/****************************
 * Header info of FLAC file *
 ****************************/
#ifdef ENABLE_FLAC_8

gboolean Flac_Header_Read_File_Info (gchar *filename, ET_File_Info *ETFileInfo)
{
    FILE *file;
    gdouble duration = 0;
    gulong filesize;
    
    
    
    FLAC__StreamDecoder *tmp_decoder;
    
    file_info_struct tmp_file_info;


    if (!filename || !ETFileInfo)
        return FALSE;

    if ( (file=fopen(filename,"r"))==NULL )
    {
        gchar *filename_utf8 = filename_to_display(filename);
        g_print(_("ERROR while opening file: '%s' (%s)\n\a"),filename_utf8,g_strerror(errno));
        g_free(filename_utf8);
        return FALSE;
    }
    fclose(file);

    /* Decoding FLAC file */
    tmp_decoder = FLAC__stream_decoder_new();
    if (tmp_decoder == 0)
    {
        return FALSE;
    }

    tmp_file_info.abort_flag = false;
    
    FLAC__stream_decoder_set_md5_checking(tmp_decoder, false);
    
    if(FLAC__stream_decoder_init_file(
	tmp_decoder,
	filename,
	write_callback_,
	metadata_callback_,
	error_callback_,
	&tmp_file_info
	) != FLAC__STREAM_DECODER_INIT_STATUS_OK) {
	    return FALSE;
    }

    if (!FLAC__stream_decoder_process_until_end_of_metadata(tmp_decoder)) {
        return FALSE;
    }

    FLAC__stream_decoder_finish(tmp_decoder);
    FLAC__stream_decoder_delete(tmp_decoder);
    /* End of decoding FLAC file */


    filesize = Get_File_Size(filename);
    duration = (gint)tmp_file_info.length_in_msec/1000;

    ETFileInfo->version     = 0; // Not defined in FLAC file
    if (duration > 0)
        ETFileInfo->bitrate = filesize*8/duration/1000; // FIXME : Approximation!! Needs to remove tag size!
    ETFileInfo->samplerate  = tmp_file_info.sample_rate;
    ETFileInfo->mode        = tmp_file_info.channels;
    ETFileInfo->size        = filesize;
    ETFileInfo->duration    = duration;

    return TRUE;
}

#elif ENABLE_FLAC_7

gboolean Flac_Header_Read_File_Info (gchar *filename, ET_File_Info *ETFileInfo)
{
    FILE *file;
    gdouble duration = 0;
    gulong filesize;
    
    
    
    FLAC__FileDecoder *tmp_decoder;
    
    file_info_struct tmp_file_info;


    if (!filename || !ETFileInfo)
        return FALSE;


    return TRUE;
}

#endif /* ENABLE_FLAC_8 */

#ifdef ENABLE_FLAC_8

FLAC__StreamDecoderWriteStatus write_callback_(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
{
    file_info_struct *file_info = (file_info_struct *)client_data;
    const unsigned bps = file_info->bits_per_sample, channels = file_info->channels, wide_samples = frame->header.blocksize;
    unsigned wide_sample, sample, channel;
    FLAC__int8 *scbuffer = (FLAC__int8*)reservoir_;
    FLAC__int16 *ssbuffer = (FLAC__int16*)reservoir_;

    (void)decoder;

    if (file_info->abort_flag)
        return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;

    if (bps == 8) {
        for(sample = reservoir_samples_*channels, wide_sample = 0; wide_sample < wide_samples; wide_sample++)
            for(channel = 0; channel < channels; channel++, sample++)
                scbuffer[sample] = (FLAC__int8)buffer[channel][wide_sample];
    }
    else if (bps == 16) {
        for(sample = reservoir_samples_*channels, wide_sample = 0; wide_sample < wide_samples; wide_sample++)
            for(channel = 0; channel < channels; channel++, sample++)
                ssbuffer[sample] = (FLAC__int16)buffer[channel][wide_sample];
    }
    else {
        file_info->abort_flag = true;
        return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
    }

    reservoir_samples_ += wide_samples;

    return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
}

void metadata_callback_(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
{
    file_info_struct *file_info = (file_info_struct *)client_data;
    (void)decoder;
    if (metadata->type == FLAC__METADATA_TYPE_STREAMINFO) {
        FLAC__ASSERT(metadata->data.stream_info.total_samples < 0x100000000); /* this plugin can only handle < 4 gigasamples */
        file_info->total_samples = (unsigned)(metadata->data.stream_info.total_samples&0xffffffff);
        file_info->bits_per_sample = metadata->data.stream_info.bits_per_sample;
        file_info->channels = metadata->data.stream_info.channels;
        file_info->sample_rate = metadata->data.stream_info.sample_rate;

        if (file_info->bits_per_sample == 8) {
            file_info->sample_format = FMT_S8;
        }
        else if (file_info->bits_per_sample == 16) {
            file_info->sample_format = FMT_S16_NE;
        }
        else {
            file_info->abort_flag = true;
            return;
        }
        file_info->length_in_msec = file_info->total_samples * 10 / (file_info->sample_rate / 100);
    }
}

void error_callback_(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
{
    file_info_struct *file_info = (file_info_struct *)client_data;
    (void)decoder;
    if (status != FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC)
        file_info->abort_flag = true;
}

#elif ENABLE_FLAC_7

FLAC__StreamDecoderWriteStatus write_callback_(const FLAC__FileDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
{

        file_info->abort_flag = true;
}

#endif /* FLAC_ENABLE_8 */

#ifdef ENABLE_FLAC

gboolean Flac_Header_Display_File_Info_To_UI (gchar *filename_utf8, ET_File_Info *ETFileInfo)
{

Return to bug 157125

Lines 109-121 Link Here

(-)easytag-1.99.12/configure.in (-7 / +20 lines)
109	if test "x$enable_flac" = "xyes"; then	109	if test "x$enable_flac" = "xyes"; then
110	dnl Library required for flac files, if not found 'enable_flac' is disabled	110	dnl Library required for flac files, if not found 'enable_flac' is disabled
111	AC_CHECK_LIB(m, cos) dnl Patch from Christian Weisgerber	111	AC_CHECK_LIB(m, cos) dnl Patch from Christian Weisgerber
112	AC_CHECK_LIB(FLAC, FLAC__metadata_simple_iterator_new, , flac_available=no)	112	AC_CHECK_LIB(FLAC, FLAC__stream_decoder_init_file, flac_8_available=yes, flac_8_available=no)
		113	AC_CHECK_LIB(FLAC, FLAC__file_decoder_new, flac_7_available=yes, flac_7_available=no)
113		114
114	AC_MSG_CHECKING(for FLAC file support)	115	AC_MSG_CHECKING(for FLAC file support)
		116	if test "x$flac_8_available" = "xyes"; then
		117	enable_flac="yes"
		118	flac_available="yes"
		119	AC_DEFINE(ENABLE_FLAC_8,1,[Define for FLAC support])
		120	elif test "x$flac_7_available" = "xyes"; then
		121	enable_flac="yes"
		122	flac_available="yes"
		123	AC_DEFINE(ENABLE_FLAC_7,1,[Define for FLAC support])
		124	else
		125	flac_available="no"
		126	fi
		127
115	if test "x$flac_available" = "xno"; then	128	if test "x$flac_available" = "xno"; then
116	AC_MSG_RESULT(no)	129	AC_MSG_RESULT(no)
117	enable_flac="no"	130	enable_flac="no"
118	echo "***"	131	echo "***"
119	echo "*** Warning: FLAC file support disabled, libflac missing"	132	echo "*** Warning: FLAC file support disabled, libflac missing"
120	echo "*** (Install libflac, libogg and libvorbis libraries to enable it)"	133	echo "*** (Install libflac, libogg and libvorbis libraries to enable it)"
121	echo "***"	134	echo "***"
Lines 144-150 Link Here
144	if test "x$enable_flac" = "xyes"; then	157	if test "x$enable_flac" = "xyes"; then
145	LIBS_SAVE="$LIBS"	158	LIBS_SAVE="$LIBS"
146	CFLAGS_SAVE="$CFLAGS"	159	CFLAGS_SAVE="$CFLAGS"
147	LIBS="$LIBS $LIBFLAC_LIBS"	160	LIBS="$LIBS -lFLAC"
148	CFLAGS="$CFLAGS $LIBFLAC_CFLAGS"	161	CFLAGS="$CFLAGS $LIBFLAC_CFLAGS"
149	AC_MSG_CHECKING(for libFLAC version)	162	AC_MSG_CHECKING(for libFLAC version)
150	AC_TRY_RUN([	163	AC_TRY_RUN([
Lines 168-175 Link Here
168	fclose(output);	181	fclose(output);
169	exit(0);	182	exit(0);
170	}	183	}
171	], . ./conftest.flac; echo "${LIBFLAC_MAJOR}.${LIBFLAC_MINOR}.${LIBFLAC_PATCH}", AC_MSG_WARN(could not determine libFLAC version),[echo $ac_n "cross compiling; assuming ${LIBFLAC_MAJOR}.${LIBFLAC_MINOR}.${LIBFLAC_PATCH} $ac_c"])	184	], source ./conftest.flac; echo "${LIBFLAC_MAJOR}.${LIBFLAC_MINOR}.${LIBFLAC_PATCH}", AC_MSG_WARN(could not determine libFLAC version),echo $ac_n "cross compiling; assuming ${LIBFLAC_MAJOR}.${LIBFLAC_MINOR}.${LIBFLAC_PATCH} $ac_c")
172	LIBS="$LIBS_SAVE"	185	LIBS="$LIBS_SAVE -lFLAC"
173	CFLAGS="$CFLAGS_SAVE"	186	CFLAGS="$CFLAGS_SAVE"
174	LIBFLAC_VERSION="(flac-$LIBFLAC_MAJOR.$LIBFLAC_MINOR.$LIBFLAC_PATCH)"	187	LIBFLAC_VERSION="(flac-$LIBFLAC_MAJOR.$LIBFLAC_MINOR.$LIBFLAC_PATCH)"
175	fi	188	fi

Lines 75-85 Link Here

(-)easytag-1.99.12/src/flac_header.c (-4 / +158 lines)
75	/**************	75	/**************
76	* Prototypes *	76	* Prototypes *
77	**************/	77	**************/
		78	#endif /* ENABLE_FLAC */
		79
		80	#ifdef ENABLE_FLAC_8
		81	static FLAC__StreamDecoderWriteStatus write_callback_(const FLAC__StreamDecoder decoder, const FLAC__Frame frame, const FLAC__int32 * const buffer[], void *client_data);
		82	static void metadata_callback_ (const FLAC__StreamDecoder decoder, const FLAC__StreamMetadata metadata, void *client_data);
		83	static void error_callback_ (const FLAC__StreamDecoder decoder, FLAC__StreamDecoderErrorStatus status, void client_data);
		84	#elif ENABLE_FLAC_7
78	static FLAC__StreamDecoderWriteStatus write_callback_(const FLAC__FileDecoder decoder, const FLAC__Frame frame, const FLAC__int32 * const buffer[], void *client_data);	85	static FLAC__StreamDecoderWriteStatus write_callback_(const FLAC__FileDecoder decoder, const FLAC__Frame frame, const FLAC__int32 * const buffer[], void *client_data);
79	static void metadata_callback_(const FLAC__FileDecoder decoder, const FLAC__StreamMetadata metadata, void *client_data);	86	static void metadata_callback_ (const FLAC__FileDecoder decoder, const FLAC__StreamMetadata metadata, void *client_data);
80	static void error_callback_ (const FLAC__FileDecoder decoder, FLAC__StreamDecoderErrorStatus status, void client_data);	87	static void error_callback_ (const FLAC__FileDecoder decoder, FLAC__StreamDecoderErrorStatus status, void client_data);
81		88	#endif /* ENABLE_FLAC_8 */
82
83		89
84	/*************	90	/*************
85	* Functions *	91	* Functions *
Lines 88-103 Link Here
88	/****************************	94	/****************************
89	* Header info of FLAC file *	95	* Header info of FLAC file *
90	****************************/	96	****************************/
		97	#ifdef ENABLE_FLAC_8
91		98
92	gboolean Flac_Header_Read_File_Info (gchar filename, ET_File_Info ETFileInfo)	99	gboolean Flac_Header_Read_File_Info (gchar filename, ET_File_Info ETFileInfo)
93	{	100	{
94	FILE *file;	101	FILE *file;
95	gdouble duration = 0;	102	gdouble duration = 0;
96	gulong filesize;	103	gulong filesize;
		104
		105
		106
		107	FLAC__StreamDecoder *tmp_decoder;
		108
		109	file_info_struct tmp_file_info;
		110
		111
		112	if (!filename \|\| !ETFileInfo)
		113	return FALSE;
		114
		115	if ( (file=fopen(filename,"r"))==NULL )
		116	{
		117	gchar *filename_utf8 = filename_to_display(filename);
		118	g_print(_("ERROR while opening file: '%s' (%s)\n\a"),filename_utf8,g_strerror(errno));
		119	g_free(filename_utf8);
		120	return FALSE;
		121	}
		122	fclose(file);
		123
		124	/* Decoding FLAC file */
		125	tmp_decoder = FLAC__stream_decoder_new();
		126	if (tmp_decoder == 0)
		127	{
		128	return FALSE;
		129	}
		130
		131	tmp_file_info.abort_flag = false;
		132
		133	FLAC__stream_decoder_set_md5_checking(tmp_decoder, false);
		134
		135	if(FLAC__stream_decoder_init_file(
		136	tmp_decoder,
		137	filename,
		138	write_callback_,
		139	metadata_callback_,
		140	error_callback_,
		141	&tmp_file_info
		142	) != FLAC__STREAM_DECODER_INIT_STATUS_OK) {
		143	return FALSE;
		144	}
		145
		146	if (!FLAC__stream_decoder_process_until_end_of_metadata(tmp_decoder)) {
		147	return FALSE;
		148	}
97		149
		150	FLAC__stream_decoder_finish(tmp_decoder);
		151	FLAC__stream_decoder_delete(tmp_decoder);
		152	/* End of decoding FLAC file */
		153
		154
		155	filesize = Get_File_Size(filename);
		156	duration = (gint)tmp_file_info.length_in_msec/1000;
		157
		158	ETFileInfo->version = 0; // Not defined in FLAC file
		159	if (duration > 0)
		160	ETFileInfo->bitrate = filesize*8/duration/1000; // FIXME : Approximation!! Needs to remove tag size!
		161	ETFileInfo->samplerate = tmp_file_info.sample_rate;
		162	ETFileInfo->mode = tmp_file_info.channels;
		163	ETFileInfo->size = filesize;
		164	ETFileInfo->duration = duration;
		165
		166	return TRUE;
		167	}
		168
		169	#elif ENABLE_FLAC_7
		170
		171	gboolean Flac_Header_Read_File_Info (gchar filename, ET_File_Info ETFileInfo)
		172	{
		173	FILE *file;
		174	gdouble duration = 0;
		175	gulong filesize;
		176
		177
		178
98	FLAC__FileDecoder *tmp_decoder;	179	FLAC__FileDecoder *tmp_decoder;
		180
99	file_info_struct tmp_file_info;	181	file_info_struct tmp_file_info;
100		182
		183
101	if (!filename \|\| !ETFileInfo)	184	if (!filename \|\| !ETFileInfo)
102	return FALSE;	185	return FALSE;
103		186
Lines 159-165 Link Here
159	return TRUE;	242	return TRUE;
160	}	243	}
161		244
		245	#endif /* ENABLE_FLAC_8 */
162		246
		247	#ifdef ENABLE_FLAC_8
		248
		249	FLAC__StreamDecoderWriteStatus write_callback_(const FLAC__StreamDecoder decoder, const FLAC__Frame frame, const FLAC__int32 * const buffer[], void *client_data)
		250	{
		251	file_info_struct file_info = (file_info_struct )client_data;
		252	const unsigned bps = file_info->bits_per_sample, channels = file_info->channels, wide_samples = frame->header.blocksize;
		253	unsigned wide_sample, sample, channel;
		254	FLAC__int8 scbuffer = (FLAC__int8)reservoir_;
		255	FLAC__int16 ssbuffer = (FLAC__int16)reservoir_;
		256
		257	(void)decoder;
		258
		259	if (file_info->abort_flag)
		260	return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
		261
		262	if (bps == 8) {
		263	for(sample = reservoir_samples_*channels, wide_sample = 0; wide_sample < wide_samples; wide_sample++)
		264	for(channel = 0; channel < channels; channel++, sample++)
		265	scbuffer[sample] = (FLAC__int8)buffer[channel][wide_sample];
		266	}
		267	else if (bps == 16) {
		268	for(sample = reservoir_samples_*channels, wide_sample = 0; wide_sample < wide_samples; wide_sample++)
		269	for(channel = 0; channel < channels; channel++, sample++)
		270	ssbuffer[sample] = (FLAC__int16)buffer[channel][wide_sample];
		271	}
		272	else {
		273	file_info->abort_flag = true;
		274	return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
		275	}
		276
		277	reservoir_samples_ += wide_samples;
		278
		279	return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
		280	}
		281
		282	void metadata_callback_(const FLAC__StreamDecoder decoder, const FLAC__StreamMetadata metadata, void *client_data)
		283	{
		284	file_info_struct file_info = (file_info_struct )client_data;
		285	(void)decoder;
		286	if (metadata->type == FLAC__METADATA_TYPE_STREAMINFO) {
		287	FLAC__ASSERT(metadata->data.stream_info.total_samples < 0x100000000); /* this plugin can only handle < 4 gigasamples */
		288	file_info->total_samples = (unsigned)(metadata->data.stream_info.total_samples&0xffffffff);
		289	file_info->bits_per_sample = metadata->data.stream_info.bits_per_sample;
		290	file_info->channels = metadata->data.stream_info.channels;
		291	file_info->sample_rate = metadata->data.stream_info.sample_rate;
		292
		293	if (file_info->bits_per_sample == 8) {
		294	file_info->sample_format = FMT_S8;
		295	}
		296	else if (file_info->bits_per_sample == 16) {
		297	file_info->sample_format = FMT_S16_NE;
		298	}
		299	else {
		300	file_info->abort_flag = true;
		301	return;
		302	}
		303	file_info->length_in_msec = file_info->total_samples * 10 / (file_info->sample_rate / 100);
		304	}
		305	}
		306
		307	void error_callback_(const FLAC__StreamDecoder decoder, FLAC__StreamDecoderErrorStatus status, void client_data)
		308	{
		309	file_info_struct file_info = (file_info_struct )client_data;
		310	(void)decoder;
311	if (status != FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC)
312	file_info->abort_flag = true;
313	}
314
315	#elif ENABLE_FLAC_7
163		316
164	FLAC__StreamDecoderWriteStatus write_callback_(const FLAC__FileDecoder decoder, const FLAC__Frame frame, const FLAC__int32 * const buffer[], void *client_data)	317	FLAC__StreamDecoderWriteStatus write_callback_(const FLAC__FileDecoder decoder, const FLAC__Frame frame, const FLAC__int32 * const buffer[], void *client_data)
165	{	318	{
Lines 227-234 Link Here
227	file_info->abort_flag = true;	380	file_info->abort_flag = true;
228	}	381	}
229		382
		383	#endif /* FLAC_ENABLE_8 */
230		384
231		385	#ifdef ENABLE_FLAC
232		386
233	gboolean Flac_Header_Display_File_Info_To_UI (gchar filename_utf8, ET_File_Info ETFileInfo)	387	gboolean Flac_Header_Display_File_Info_To_UI (gchar filename_utf8, ET_File_Info ETFileInfo)
234	{	388	{