Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
flac
Commits
504dcafe
Commit
504dcafe
authored
Sep 13, 2007
by
Josh Coalson
Browse files
minor comments
parent
59830602
Changes
10
Hide whitespace changes
Inline
Side-by-side
include/FLAC/format.h
View file @
504dcafe
...
...
@@ -937,7 +937,6 @@ FLAC_API FLAC__bool FLAC__format_vorbiscomment_entry_value_is_legal(const FLAC__
*/
FLAC_API
FLAC__bool
FLAC__format_vorbiscomment_entry_is_legal
(
const
FLAC__byte
*
entry
,
unsigned
length
);
/* @@@@ add to unit tests; it is already indirectly tested by the metadata_object tests */
/** Check a seek table to see if it conforms to the FLAC specification.
* See the format specification for limits on the contents of the
* seek table.
...
...
@@ -950,7 +949,6 @@ FLAC_API FLAC__bool FLAC__format_vorbiscomment_entry_is_legal(const FLAC__byte *
*/
FLAC_API
FLAC__bool
FLAC__format_seektable_is_legal
(
const
FLAC__StreamMetadata_SeekTable
*
seek_table
);
/* @@@@ add to unit tests; it is already indirectly tested by the metadata_object tests */
/** Sort a seek table's seek points according to the format specification.
* This includes a "unique-ification" step to remove duplicates, i.e.
* seek points with identical \a sample_number values. Duplicate seek
...
...
@@ -965,7 +963,6 @@ FLAC_API FLAC__bool FLAC__format_seektable_is_legal(const FLAC__StreamMetadata_S
*/
FLAC_API
unsigned
FLAC__format_seektable_sort
(
FLAC__StreamMetadata_SeekTable
*
seek_table
);
/* @@@@ add to unit tests; it is already indirectly tested by the metadata_object tests */
/** Check a cue sheet to see if it conforms to the FLAC specification.
* See the format specification for limits on the contents of the
* cue sheet.
...
...
@@ -986,7 +983,6 @@ FLAC_API unsigned FLAC__format_seektable_sort(FLAC__StreamMetadata_SeekTable *se
*/
FLAC_API
FLAC__bool
FLAC__format_cuesheet_is_legal
(
const
FLAC__StreamMetadata_CueSheet
*
cue_sheet
,
FLAC__bool
check_cd_da_subset
,
const
char
**
violation
);
/* @@@@ add to unit tests; it is already indirectly tested by the metadata_object tests */
/** Check picture data to see if it conforms to the FLAC specification.
* See the format specification for limits on the contents of the
* PICTURE block.
...
...
include/FLAC/metadata.h
View file @
504dcafe
...
...
@@ -444,7 +444,6 @@ FLAC_API FLAC__bool FLAC__metadata_simple_iterator_next(FLAC__Metadata_SimpleIte
*/
FLAC_API
FLAC__bool
FLAC__metadata_simple_iterator_prev
(
FLAC__Metadata_SimpleIterator
*
iterator
);
/*@@@@add to tests*/
/** Returns a flag telling if the current metadata block is the last.
*
* \param iterator A pointer to an existing initialized iterator.
...
...
@@ -458,7 +457,6 @@ FLAC_API FLAC__bool FLAC__metadata_simple_iterator_prev(FLAC__Metadata_SimpleIte
*/
FLAC_API
FLAC__bool
FLAC__metadata_simple_iterator_is_last
(
const
FLAC__Metadata_SimpleIterator
*
iterator
);
/*@@@@add to tests*/
/** Get the offset of the metadata block at the current position. This
* avoids reading the actual block data which can save time for large
* blocks.
...
...
@@ -489,7 +487,6 @@ FLAC_API off_t FLAC__metadata_simple_iterator_get_block_offset(const FLAC__Metad
*/
FLAC_API
FLAC__MetadataType
FLAC__metadata_simple_iterator_get_block_type
(
const
FLAC__Metadata_SimpleIterator
*
iterator
);
/*@@@@add to tests*/
/** Get the length of the metadata block at the current position. This
* avoids reading the actual block data which can save time for large
* blocks.
...
...
@@ -507,7 +504,6 @@ FLAC_API FLAC__MetadataType FLAC__metadata_simple_iterator_get_block_type(const
*/
FLAC_API
unsigned
FLAC__metadata_simple_iterator_get_block_length
(
const
FLAC__Metadata_SimpleIterator
*
iterator
);
/*@@@@add to tests*/
/** Get the application ID of the \c APPLICATION block at the current
* position. This avoids reading the actual block data which can save
* time for large blocks.
...
...
@@ -835,7 +831,6 @@ FLAC_API FLAC__Metadata_ChainStatus FLAC__metadata_chain_status(FLAC__Metadata_C
*/
FLAC_API
FLAC__bool
FLAC__metadata_chain_read
(
FLAC__Metadata_Chain
*
chain
,
const
char
*
filename
);
/*@@@@ add to unit tests*/
/** Read all metadata from an Ogg FLAC file into the chain.
*
* \note Ogg FLAC metadata data writing is not supported yet and
...
...
@@ -875,7 +870,6 @@ FLAC_API FLAC__bool FLAC__metadata_chain_read_ogg(FLAC__Metadata_Chain *chain, c
*/
FLAC_API
FLAC__bool
FLAC__metadata_chain_read_with_callbacks
(
FLAC__Metadata_Chain
*
chain
,
FLAC__IOHandle
handle
,
FLAC__IOCallbacks
callbacks
);
/*@@@@ add to unit tests*/
/** Read all metadata from an Ogg FLAC stream into the chain via I/O callbacks.
*
* The \a handle need only be open for reading, but must be seekable.
...
...
@@ -2076,7 +2070,6 @@ FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_delete_track(FLAC__StreamMeta
*/
FLAC_API
FLAC__bool
FLAC__metadata_object_cuesheet_is_legal
(
const
FLAC__StreamMetadata
*
object
,
FLAC__bool
check_cd_da_subset
,
const
char
**
violation
);
/* @@@@ add to unit tests */
/** Calculate and return the CDDB/freedb ID for a cue sheet. The function
* assumes the cue sheet corresponds to a CD; the result is undefined
* if the cuesheet's is_cd bit is not set.
...
...
include/FLAC/stream_encoder.h
View file @
504dcafe
...
...
@@ -908,7 +908,6 @@ FLAC_API FLAC__bool FLAC__stream_encoder_set_do_mid_side_stereo(FLAC__StreamEnco
*/
FLAC_API
FLAC__bool
FLAC__stream_encoder_set_loose_mid_side_stereo
(
FLAC__StreamEncoder
*
encoder
,
FLAC__bool
value
);
/* @@@@add to unit tests*/
/** Sets the apodization function(s) the encoder will use when windowing
* audio data for LPC analysis.
*
...
...
src/flac/foreign_metadata.c
View file @
504dcafe
...
...
@@ -80,7 +80,6 @@ static FLAC__bool append_block_(foreign_metadata_t *fm, off_t offset, FLAC__uint
fb
[
fm
->
num_blocks
].
size
=
size
;
fm
->
num_blocks
++
;
fm
->
blocks
=
fb
;
/*fprintf(stderr,"@@@@@@ appended: block#%u offset=%d size=%u\n",fm->num_blocks-1,(int)fm->blocks[fm->num_blocks-1].offset,(unsigned)fm->blocks[fm->num_blocks-1].size);*/
return
true
;
}
if
(
error
)
*
error
=
"out of memory"
;
...
...
@@ -102,7 +101,6 @@ static FLAC__bool read_from_aiff_(foreign_metadata_t *fm, FILE *f, const char **
if
(
!
append_block_
(
fm
,
offset
,
12
,
error
))
return
false
;
eof_offset
=
8
+
unpack32be_
(
buffer
+
4
);
/*fprintf(stderr,"@@@@@@ off=%d eof=%d\n",(int)offset,(int)eof_offset);*/
while
(
!
feof
(
f
))
{
FLAC__uint32
size
;
if
((
offset
=
ftello
(
f
))
<
0
)
{
...
...
@@ -153,7 +151,6 @@ static FLAC__bool read_from_aiff_(foreign_metadata_t *fm, FILE *f, const char **
}
if
(
!
append_block_
(
fm
,
offset
,
8
+
(
memcmp
(
buffer
,
"SSND"
,
4
)
?
size
:
8
+
fm
->
ssnd_offset_size
),
error
))
return
false
;
/*fprintf(stderr,"@@@@@@ chunk=%c%c%c%c offset=%d size=%d\n",buffer[0],buffer[1],buffer[2],buffer[3],(int)offset,8+(int)size);*/
if
(
fseeko
(
f
,
size
,
SEEK_CUR
)
<
0
)
{
if
(
error
)
*
error
=
"invalid AIFF file: seek error (011)"
;
return
false
;
...
...
@@ -189,7 +186,6 @@ static FLAC__bool read_from_wave_(foreign_metadata_t *fm, FILE *f, const char **
if
(
!
append_block_
(
fm
,
offset
,
12
,
error
))
return
false
;
eof_offset
=
8
+
unpack32le_
(
buffer
+
4
);
/*fprintf(stderr,"@@@@@@ off=%d eof=%d\n",(int)offset,(int)eof_offset);*/
while
(
!
feof
(
f
))
{
FLAC__uint32
size
;
if
((
offset
=
ftello
(
f
))
<
0
)
{
...
...
@@ -230,7 +226,6 @@ static FLAC__bool read_from_wave_(foreign_metadata_t *fm, FILE *f, const char **
}
if
(
!
append_block_
(
fm
,
offset
,
8
+
(
memcmp
(
buffer
,
"data"
,
4
)
?
size
:
0
),
error
))
return
false
;
/*fprintf(stderr,"@@@@@@ chunk=%c%c%c%c offset=%d size=%d\n",buffer[0],buffer[1],buffer[2],buffer[3],(int)offset,8+(int)size);*/
if
(
fseeko
(
f
,
size
,
SEEK_CUR
)
<
0
)
{
if
(
error
)
*
error
=
"invalid WAVE file: seek error (009)"
;
return
false
;
...
...
@@ -270,7 +265,6 @@ static FLAC__bool write_to_flac_(foreign_metadata_t *fm, FILE *fin, FILE *fout,
if
(
error
)
*
error
=
"PADDING block with wrong size found (005)"
;
return
false
;
}
/*fprintf(stderr,"@@@@@@ flac offset = %d\n",(int)FLAC__metadata_simple_iterator_get_block_offset(it));*/
/* transfer chunk into APPLICATION block */
/* first set up the file pointers */
if
(
fseeko
(
fin
,
fm
->
blocks
[
block_num
].
offset
,
SEEK_SET
)
<
0
)
{
...
...
src/libFLAC/cpu.c
View file @
504dcafe
...
...
@@ -302,9 +302,9 @@ void FLAC__cpu_info(FLAC__CPUInfo *info)
int
sse
=
0
;
LPTOP_LEVEL_EXCEPTION_FILTER
save
=
SetUnhandledExceptionFilter
(
sigill_handler_sse_os
);
/* see GCC version above for explanation */
/
/@@@@@@
http://msdn2.microsoft.com/en-us/library/4ks26t93.aspx
/
/@@@@@@
http://www.codeproject.com/cpp/gccasm.asp
/
/@@@@@@
http://www.hick.org/~mmiller/msvc_inline_asm.html
/
*
http://msdn2.microsoft.com/en-us/library/4ks26t93.aspx
*/
/
*
http://www.codeproject.com/cpp/gccasm.asp
*/
/
*
http://www.hick.org/~mmiller/msvc_inline_asm.html
*/
__asm
{
# if _MSC_VER <= 1200
/* VC6 assembler doesn't know SSE, have to emit bytecode instead */
...
...
src/libFLAC/format.c
View file @
504dcafe
...
...
@@ -238,6 +238,7 @@ FLAC_API FLAC__bool FLAC__format_sample_rate_is_subset(unsigned sample_rate)
return
true
;
}
/* @@@@ add to unit tests; it is already indirectly tested by the metadata_object tests */
FLAC_API
FLAC__bool
FLAC__format_seektable_is_legal
(
const
FLAC__StreamMetadata_SeekTable
*
seek_table
)
{
unsigned
i
;
...
...
@@ -273,6 +274,7 @@ static int seekpoint_compare_(const FLAC__StreamMetadata_SeekPoint *l, const FLA
return
1
;
}
/* @@@@ add to unit tests; it is already indirectly tested by the metadata_object tests */
FLAC_API
unsigned
FLAC__format_seektable_sort
(
FLAC__StreamMetadata_SeekTable
*
seek_table
)
{
unsigned
i
,
j
;
...
...
@@ -410,6 +412,7 @@ FLAC_API FLAC__bool FLAC__format_vorbiscomment_entry_is_legal(const FLAC__byte *
return
true
;
}
/* @@@@ add to unit tests; it is already indirectly tested by the metadata_object tests */
FLAC_API
FLAC__bool
FLAC__format_cuesheet_is_legal
(
const
FLAC__StreamMetadata_CueSheet
*
cue_sheet
,
FLAC__bool
check_cd_da_subset
,
const
char
**
violation
)
{
unsigned
i
,
j
;
...
...
@@ -488,6 +491,7 @@ FLAC_API FLAC__bool FLAC__format_cuesheet_is_legal(const FLAC__StreamMetadata_Cu
return
true
;
}
/* @@@@ add to unit tests; it is already indirectly tested by the metadata_object tests */
FLAC_API
FLAC__bool
FLAC__format_picture_is_legal
(
const
FLAC__StreamMetadata_Picture
*
picture
,
const
char
**
violation
)
{
char
*
p
;
...
...
src/libFLAC/metadata_iterators.c
View file @
504dcafe
...
...
@@ -578,6 +578,7 @@ FLAC_API FLAC__bool FLAC__metadata_simple_iterator_prev(FLAC__Metadata_SimpleIte
return
true
;
}
/*@@@@add to tests*/
FLAC_API
FLAC__bool
FLAC__metadata_simple_iterator_is_last
(
const
FLAC__Metadata_SimpleIterator
*
iterator
)
{
FLAC__ASSERT
(
0
!=
iterator
);
...
...
@@ -586,6 +587,7 @@ FLAC_API FLAC__bool FLAC__metadata_simple_iterator_is_last(const FLAC__Metadata_
return
iterator
->
is_last
;
}
/*@@@@add to tests*/
FLAC_API
off_t
FLAC__metadata_simple_iterator_get_block_offset
(
const
FLAC__Metadata_SimpleIterator
*
iterator
)
{
FLAC__ASSERT
(
0
!=
iterator
);
...
...
@@ -602,6 +604,7 @@ FLAC_API FLAC__MetadataType FLAC__metadata_simple_iterator_get_block_type(const
return
iterator
->
type
;
}
/*@@@@add to tests*/
FLAC_API
unsigned
FLAC__metadata_simple_iterator_get_block_length
(
const
FLAC__Metadata_SimpleIterator
*
iterator
)
{
FLAC__ASSERT
(
0
!=
iterator
);
...
...
@@ -610,6 +613,7 @@ FLAC_API unsigned FLAC__metadata_simple_iterator_get_block_length(const FLAC__Me
return
iterator
->
length
;
}
/*@@@@add to tests*/
FLAC_API
FLAC__bool
FLAC__metadata_simple_iterator_get_application_id
(
FLAC__Metadata_SimpleIterator
*
iterator
,
FLAC__byte
*
id
)
{
const
unsigned
id_bytes
=
FLAC__STREAM_METADATA_APPLICATION_ID_LEN
/
8
;
...
...
@@ -1559,6 +1563,7 @@ FLAC_API FLAC__bool FLAC__metadata_chain_read(FLAC__Metadata_Chain *chain, const
return
chain_read_
(
chain
,
filename
,
/*is_ogg=*/
false
);
}
/*@@@@add to tests*/
FLAC_API
FLAC__bool
FLAC__metadata_chain_read_ogg
(
FLAC__Metadata_Chain
*
chain
,
const
char
*
filename
)
{
return
chain_read_
(
chain
,
filename
,
/*is_ogg=*/
true
);
...
...
@@ -1599,6 +1604,7 @@ FLAC_API FLAC__bool FLAC__metadata_chain_read_with_callbacks(FLAC__Metadata_Chai
return
chain_read_with_callbacks_
(
chain
,
handle
,
callbacks
,
/*is_ogg=*/
false
);
}
/*@@@@add to tests*/
FLAC_API
FLAC__bool
FLAC__metadata_chain_read_ogg_with_callbacks
(
FLAC__Metadata_Chain
*
chain
,
FLAC__IOHandle
handle
,
FLAC__IOCallbacks
callbacks
)
{
return
chain_read_with_callbacks_
(
chain
,
handle
,
callbacks
,
/*is_ogg=*/
true
);
...
...
src/libFLAC/metadata_object.c
View file @
504dcafe
...
...
@@ -1695,6 +1695,7 @@ static FLAC__uint32 cddb_add_digits_(FLAC__uint32 x)
return
n
;
}
/*@@@@add to tests*/
FLAC_API
FLAC__uint32
FLAC__metadata_object_cuesheet_calculate_cddb_id
(
const
FLAC__StreamMetadata
*
object
)
{
const
FLAC__StreamMetadata_CueSheet
*
cs
;
...
...
src/libFLAC/stream_encoder.c
View file @
504dcafe
...
...
@@ -1533,6 +1533,7 @@ FLAC_API FLAC__bool FLAC__stream_encoder_set_loose_mid_side_stereo(FLAC__StreamE
return
true
;
}
/*@@@@add to tests*/
FLAC_API
FLAC__bool
FLAC__stream_encoder_set_apodization
(
FLAC__StreamEncoder
*
encoder
,
const
char
*
specification
)
{
FLAC__ASSERT
(
0
!=
encoder
);
...
...
src/utils/flactimer/main.cpp
View file @
504dcafe
...
...
@@ -110,7 +110,7 @@ int main(int argc, char *argv[])
strcat
(
args
,
argv
[
i
]);
}
//fprintf(stderr, "@@@
@@@
cmd=[%s] args=[%s]\n", argv[0], args);
//fprintf(stderr, "@@@ cmd=[%s] args=[%s]\n", argv[0], args);
STARTUPINFO
si
;
GetStartupInfo
(
&
si
);
...
...
@@ -138,9 +138,9 @@ int main(int argc, char *argv[])
return
1
;
}
//fprintf(stderr, "@@@
@@@
waiting...\n");
//fprintf(stderr, "@@@ waiting...\n");
WaitForSingleObject
(
pi
.
hProcess
,
INFINITE
);
//fprintf(stderr, "@@@
@@@
done\n");
//fprintf(stderr, "@@@ done\n");
wallclock_msec
=
GetTickCount
()
-
wallclock_msec
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment