shorten APPLICATION id to 32 bits

This commit is contained in:
Josh Coalson
2001-02-23 23:11:34 +00:00
parent c91eca76c7
commit 52c44e9a5d
3 changed files with 9 additions and 7 deletions

View File

@@ -522,7 +522,7 @@
</TR> </TR>
<TR> <TR>
<TD ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC"> <TD ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC">
&lt;128&gt; &lt;32&gt;
</TD> </TD>
<TD> <TD>
Registered application ID Registered application ID

View File

@@ -345,17 +345,17 @@ typedef struct {
/***************************************************************************** /*****************************************************************************
* *
* 128: Registered application ID * 32: Registered application ID
* n: Application data * n: Application data
*-------- ----------------- *------- -----------------
* 16+n/8 bytes total * 4+n/8 bytes total
*/ */
typedef struct { typedef struct {
byte id[16]; byte id[16];
byte *data; byte *data;
} FLAC__StreamMetaData_Application; } FLAC__StreamMetaData_Application;
extern const unsigned FLAC__STREAM_METADATA_APPLICATION_ID_LEN; /* = 128 bits */ extern const unsigned FLAC__STREAM_METADATA_APPLICATION_ID_LEN; /* = 32 bits */
/***************************************************************************** /*****************************************************************************
* *
@@ -371,6 +371,8 @@ typedef struct {
unsigned length; /* in bytes */ unsigned length; /* in bytes */
union { union {
FLAC__StreamMetaData_StreamInfo stream_info; FLAC__StreamMetaData_StreamInfo stream_info;
FLAC__StreamMetaData_Padding padding;
FLAC__StreamMetaData_Application application;
} data; } data;
} FLAC__StreamMetaData; } FLAC__StreamMetaData;

View File

@@ -36,7 +36,7 @@ const unsigned FLAC__STREAM_METADATA_STREAMINFO_TOTAL_SAMPLES_LEN = 36; /* bits
const unsigned FLAC__STREAM_METADATA_STREAMINFO_MD5SUM_LEN = 128; /* bits */ const unsigned FLAC__STREAM_METADATA_STREAMINFO_MD5SUM_LEN = 128; /* bits */
const unsigned FLAC__STREAM_METADATA_STREAMINFO_LENGTH = 34; /* bytes */ const unsigned FLAC__STREAM_METADATA_STREAMINFO_LENGTH = 34; /* bytes */
const unsigned FLAC__STREAM_METADATA_APPLICATION_ID_LEN = 128; /* bits */ const unsigned FLAC__STREAM_METADATA_APPLICATION_ID_LEN = 32; /* bits */
const unsigned FLAC__STREAM_METADATA_IS_LAST_LEN = 1; /* bits */ const unsigned FLAC__STREAM_METADATA_IS_LAST_LEN = 1; /* bits */
const unsigned FLAC__STREAM_METADATA_TYPE_LEN = 7; /* bits */ const unsigned FLAC__STREAM_METADATA_TYPE_LEN = 7; /* bits */