Changeset 220 for libmpc/branches/r2d/libmpcdec/mpc_demux.c

Timestamp:

02/17/07 18:49:10 (18 years ago)

Author:

r2d

Message:

• updated according to the spec
• now reads / write beginning / end silences, but decoder does not care.
• please test !

File:

• libmpc/branches/r2d/libmpcdec/mpc_demux.c (modified) (3 diffs)

libmpc/branches/r2d/libmpcdec/mpc_demux.c

@@ -298 +298 @@
                 mpc_demux_fill(d, 11, 0); // max header block size
                 size = mpc_bits_get_block(&d->bits_reader, &b);
-                while( memcmp(b.key, "AD", 2) != 0 ){ // scan all blocks until audio
+                while( memcmp(b.key, "AP", 2) != 0 ){ // scan all blocks until audio
                         mpc_demux_fill(d, 11 + (mpc_uint32_t) b.size, 0);
-                        if (memcmp(b.key, "SI", 2) == 0){
+                        if (memcmp(b.key, "SH", 2) == 0){
                                 int ret = streaminfo_read_header_sv8(&d->si, &d->bits_reader, (mpc_uint32_t) b.size);
                                 if (ret != MPC_STATUS_OK) return ret;
-                        } else if (memcmp(b.key, "EI", 2) == 0)
+                        } else if (memcmp(b.key, "RG", 2) == 0)
+                                streaminfo_gain(&d->si, &d->bits_reader);
+                        else if (memcmp(b.key, "EI", 2) == 0)
                                 streaminfo_encoder_info(&d->si, &d->bits_reader);
-                        else if (memcmp(b.key, "SP", 2) == 0)
+                        else if (memcmp(b.key, "SO", 2) == 0)
                                 mpc_demux_SP(d, size, (mpc_uint32_t) b.size);
                         else if (memcmp(b.key, "ST", 2) == 0)
@@ -366 +368 @@
                         mpc_demux_fill(d, 11, 0); // max header block size
                         mpc_bits_get_block(&d->bits_reader, &b);
-                        while( memcmp(b.key, "AD", 2) != 0 ) { // scan all blocks until audio
+                        while( memcmp(b.key, "AP", 2) != 0 ) { // scan all blocks until audio
                                 if (memcmp(b.key, "SE", 2) == 0) { // end block
                                         i->bits = -1;
@@ -436 +438 @@
                 size = mpc_bits_get_block(&d->bits_reader, &b);
                 while(i < fwd) {
-                        if (memcmp(b.key, "AD", 2) == 0) {
+                        if (memcmp(b.key, "AP", 2) == 0) {
                                 if (d->d->decoded_samples == (d->seek_table_size << d->seek_pwr) * MPC_FRAME_LENGTH) {
                                         d->seek_table[d->seek_table_size] = (mpc_uint32_t) mpc_demux_pos(d) - 8 * size;