commit 0d36cbd65a8ee96483ac1453db8034388f961461
author Josh Coalson <jcoalson@users.sourceforce.net> Mon Jul 15 05:24:56 2002 +0000
committer Josh Coalson <jcoalson@users.sourceforce.net> Mon Jul 15 05:24:56 2002 +0000
tree d20480a77d23977b6caa5cdd6b1b557b8860b3d0
parent f65fb22ceb111cc9939ed95968433c8e600df225

rename (FLAC__format_is_valid_sample_rate() to FLAC__format_sample_rate_is_valid()

src/libFLAC/format.c

diff --git a/src/libFLAC/format.c b/src/libFLAC/format.c
index 6c17b60..d3c94c3 100644
--- a/src/libFLAC/format.c
+++ b/src/libFLAC/format.c
@@ -18,6 +18,7 @@
  */
 
 #include <stdio.h>
+#include "FLAC/assert.h"
 #include "FLAC/format.h"
 
 const FLAC__byte FLAC__STREAM_SYNC_STRING[4] = { 'f','L','a','C' };
@@ -111,7 +112,7 @@
 	"VORBIS_COMMENT"
 };
 
-FLAC__bool FLAC__format_is_valid_sample_rate(unsigned sample_rate)
+FLAC__bool FLAC__format_sample_rate_is_valid(unsigned sample_rate)
 {
 	if(
 		sample_rate == 0 ||
@@ -126,3 +127,23 @@
 	else
 		return true;
 }
+
+FLAC__bool FLAC__format_seektable_is_legal(const FLAC__StreamMetadata_SeekTable *seek_table)
+{
+	unsigned i;
+	FLAC__uint64 prev_sample_number = 0;
+	FLAC__bool got_prev = false;
+
+	FLAC__ASSERT(0 != seek_table);
+
+	for(i = 0; i < seek_table->num_points; i++) {
+		if(got_prev) {
+			if(seek_table->points[i].sample_number <= prev_sample_number)
+				return false;
+		}
+		prev_sample_number = seek_table->points[i].sample_number;
+		got_prev = true;
+	}
+
+	return true;
+}

src/libFLAC/stream_encoder_framing.c

diff --git a/src/libFLAC/stream_encoder_framing.c b/src/libFLAC/stream_encoder_framing.c
index e3e3e5a..61127ba 100644
--- a/src/libFLAC/stream_encoder_framing.c
+++ b/src/libFLAC/stream_encoder_framing.c
@@ -58,7 +58,7 @@
 			FLAC__ASSERT(metadata->data.stream_info.max_framesize < (1u << FLAC__STREAM_METADATA_STREAMINFO_MAX_FRAME_SIZE_LEN));
 			if(!FLAC__bitbuffer_write_raw_uint32(bb, metadata->data.stream_info.max_framesize, FLAC__STREAM_METADATA_STREAMINFO_MAX_FRAME_SIZE_LEN))
 				return false;
-			FLAC__ASSERT(FLAC__format_is_valid_sample_rate(metadata->data.stream_info.sample_rate));
+			FLAC__ASSERT(FLAC__format_sample_rate_is_valid(metadata->data.stream_info.sample_rate));
 			if(!FLAC__bitbuffer_write_raw_uint32(bb, metadata->data.stream_info.sample_rate, FLAC__STREAM_METADATA_STREAMINFO_SAMPLE_RATE_LEN))
 				return false;
 			FLAC__ASSERT(metadata->data.stream_info.channels > 0);
@@ -157,7 +157,7 @@
 	if(!FLAC__bitbuffer_write_raw_uint32(bb, u, FLAC__FRAME_HEADER_BLOCK_SIZE_LEN))
 		return false;
 
-	FLAC__ASSERT(FLAC__format_is_valid_sample_rate(header->sample_rate));
+	FLAC__ASSERT(FLAC__format_sample_rate_is_valid(header->sample_rate));
 	sample_rate_hint = 0;
 	switch(header->sample_rate) {
 		case  8000: u = 4; break;