summaryrefslogtreecommitdiff
path: root/core/multimedia/opieplayer/libmad/frame.h
Unidiff
Diffstat (limited to 'core/multimedia/opieplayer/libmad/frame.h') (more/less context) (show whitespace changes)
-rw-r--r--core/multimedia/opieplayer/libmad/frame.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/core/multimedia/opieplayer/libmad/frame.h b/core/multimedia/opieplayer/libmad/frame.h
index e88d0c8..3b8e454 100644
--- a/core/multimedia/opieplayer/libmad/frame.h
+++ b/core/multimedia/opieplayer/libmad/frame.h
@@ -1,8 +1,8 @@
1/* 1/*
2 * mad - MPEG audio decoder 2 * libmad - MPEG audio decoder library
3 * Copyright (C) 2000-2001 Robert Leslie 3 * Copyright (C) 2000-2001 Robert Leslie
4 * 4 *
5 * This program is free software; you can redistribute it and/or modify 5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by 6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or 7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version. 8 * (at your option) any later version.
@@ -42,13 +42,12 @@ enum mad_mode {
42enum mad_emphasis { 42enum mad_emphasis {
43 MAD_EMPHASIS_NONE = 0, /* no emphasis */ 43 MAD_EMPHASIS_NONE = 0, /* no emphasis */
44 MAD_EMPHASIS_50_15_US = 1, /* 50/15 microseconds emphasis */ 44 MAD_EMPHASIS_50_15_US = 1, /* 50/15 microseconds emphasis */
45 MAD_EMPHASIS_CCITT_J_17 = 3 /* CCITT J.17 emphasis */ 45 MAD_EMPHASIS_CCITT_J_17 = 3 /* CCITT J.17 emphasis */
46}; 46};
47 47
48struct mad_frame {
49 struct mad_header { 48 struct mad_header {
50 enum mad_layer layer; /* audio layer (1, 2, or 3) */ 49 enum mad_layer layer; /* audio layer (1, 2, or 3) */
51 enum mad_mode mode; /* channel mode (see above) */ 50 enum mad_mode mode; /* channel mode (see above) */
52 int mode_extension; /* additional mode info */ 51 int mode_extension; /* additional mode info */
53 enum mad_emphasis emphasis; /* de-emphasis to use (see above) */ 52 enum mad_emphasis emphasis; /* de-emphasis to use (see above) */
54 53
@@ -59,13 +58,16 @@ struct mad_frame {
59 unsigned short crc_target; /* final target CRC checksum */ 58 unsigned short crc_target; /* final target CRC checksum */
60 59
61 int flags; /* flags (see below) */ 60 int flags; /* flags (see below) */
62 int private_bits; /* private bits (see below) */ 61 int private_bits; /* private bits (see below) */
63 62
64 mad_timer_t duration; /* audio playing time of frame */ 63 mad_timer_t duration; /* audio playing time of frame */
65 } header; 64};
65
66struct mad_frame {
67 struct mad_header header; /* MPEG audio header */
66 68
67 int options; /* decoding options (from stream) */ 69 int options; /* decoding options (from stream) */
68 70
69 mad_fixed_t sbsample[2][36][32];/* synthesis subband filter samples */ 71 mad_fixed_t sbsample[2][36][32];/* synthesis subband filter samples */
70 mad_fixed_t (*overlap)[2][32][18];/* Layer III block overlap data */ 72 mad_fixed_t (*overlap)[2][32][18];/* Layer III block overlap data */
71}; 73};