1. ffmpeg
  2. Commit 8b22017f380f9d5b5220d4ff6d1c030b8886dc04
Browse code

Move aanscales tables to their own file; fixes compilation without encoders. based on a patch by David Geldreich, david.geldreich free fr

Originally committed as revision 15939 to svn://svn.ffmpeg.org/ffmpeg/trunk

Diego Biurrun authored on 2008/11/26 22:38:13
Showing 5 changed files
libavcodec/Makefile
History View file @ 8b22017
... ... 
@@ -58,7 +58,7 @@ OBJS-$(CONFIG_CSCD_DECODER)            += cscd.o
58 58 
 OBJS-$(CONFIG_CYUV_DECODER)            += cyuv.o
59 59 
 OBJS-$(CONFIG_DCA_DECODER)             += dca.o
60 60 
 OBJS-$(CONFIG_DNXHD_DECODER)           += dnxhddec.o dnxhddata.o
61 
-OBJS-$(CONFIG_DNXHD_ENCODER)           += dnxhdenc.o dnxhddata.o mpegvideo_enc.o motion_est.o ratecontrol.o mpeg12data.o mpegvideo.o
61 
+OBJS-$(CONFIG_DNXHD_ENCODER)           += dnxhdenc.o dnxhddata.o mpegvideo_enc.o motion_est.o ratecontrol.o mpeg12data.o mpegvideo.o aandcttab.o
62 62 
 OBJS-$(CONFIG_DSICINAUDIO_DECODER)     += dsicinav.o
63 63 
 OBJS-$(CONFIG_DSICINVIDEO_DECODER)     += dsicinav.o
64 64 
 OBJS-$(CONFIG_DVBSUB_DECODER)          += dvbsubdec.o
... ... 
@@ -70,7 +70,7 @@ OBJS-$(CONFIG_DVVIDEO_ENCODER)         += dv.o
70 70 
 OBJS-$(CONFIG_DXA_DECODER)             += dxa.o
71 71 
 OBJS-$(CONFIG_EAC3_DECODER)            += eac3dec.o ac3dec.o ac3tab.o ac3dec_data.o ac3.o
72 72 
 OBJS-$(CONFIG_EACMV_DECODER)           += eacmv.o
73 
-OBJS-$(CONFIG_EATGQ_DECODER)           += eatgq.o eaidct.o
73 
+OBJS-$(CONFIG_EATGQ_DECODER)           += eatgq.o eaidct.o aandcttab.o
74 74 
 OBJS-$(CONFIG_EATGV_DECODER)           += eatgv.o
75 75 
 OBJS-$(CONFIG_EIGHTBPS_DECODER)        += 8bps.o
76 76 
 OBJS-$(CONFIG_EIGHTSVX_EXP_DECODER)    += 8svx.o
... ... 
@@ -86,17 +86,17 @@ OBJS-$(CONFIG_FLASHSV_DECODER)         += flashsv.o
86 86 
 OBJS-$(CONFIG_FLASHSV_ENCODER)         += flashsvenc.o
87 87 
 OBJS-$(CONFIG_FLIC_DECODER)            += flicvideo.o
88 88 
 OBJS-$(CONFIG_FLV_DECODER)             += h263dec.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
89 
-OBJS-$(CONFIG_FLV_ENCODER)             += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
89 
+OBJS-$(CONFIG_FLV_ENCODER)             += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o aandcttab.o
90 90 
 OBJS-$(CONFIG_FOURXM_DECODER)          += 4xm.o
91 91 
 OBJS-$(CONFIG_FRAPS_DECODER)           += fraps.o huffman.o
92 92 
 OBJS-$(CONFIG_GIF_DECODER)             += gifdec.o lzw.o
93 93 
 OBJS-$(CONFIG_GIF_ENCODER)             += gif.o
94 94 
 OBJS-$(CONFIG_H261_DECODER)            += h261dec.o h261.o mpegvideo.o error_resilience.o
95 
-OBJS-$(CONFIG_H261_ENCODER)            += h261enc.o h261.o mpegvideo_enc.o motion_est.o ratecontrol.o mpeg12data.o mpegvideo.o
95 
+OBJS-$(CONFIG_H261_ENCODER)            += h261enc.o h261.o mpegvideo_enc.o motion_est.o ratecontrol.o mpeg12data.o mpegvideo.o aandcttab.o
96 96 
 OBJS-$(CONFIG_H263_DECODER)            += h263dec.o h263.o h263_parser.o mpeg12data.o mpegvideo.o error_resilience.o
97 97 
 OBJS-$(CONFIG_H263I_DECODER)           += h263dec.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
98 
-OBJS-$(CONFIG_H263_ENCODER)            += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
99 
-OBJS-$(CONFIG_H263P_ENCODER)           += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
98 
+OBJS-$(CONFIG_H263_ENCODER)            += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o aandcttab.o
99 
+OBJS-$(CONFIG_H263P_ENCODER)           += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o aandcttab.o
100 100 
 OBJS-$(CONFIG_H264_DECODER)            += h264.o h264idct.o h264pred.o h264_parser.o cabac.o mpegvideo.o error_resilience.o
101 101 
 OBJS-$(CONFIG_H264_ENCODER)            += h264enc.o h264dspenc.o
102 102 
 OBJS-$(CONFIG_HUFFYUV_DECODER)         += huffyuv.o
... ... 
@@ -110,13 +110,13 @@ OBJS-$(CONFIG_INTERPLAY_VIDEO_DECODER) += interplayvideo.o
110 110 
 OBJS-$(CONFIG_JPEGLS_DECODER)          += jpeglsdec.o jpegls.o mjpegdec.o mjpeg.o
111 111 
 OBJS-$(CONFIG_JPEGLS_ENCODER)          += jpeglsenc.o jpegls.o
112 112 
 OBJS-$(CONFIG_KMVC_DECODER)            += kmvc.o
113 
-OBJS-$(CONFIG_LJPEG_ENCODER)           += ljpegenc.o mjpegenc.o mjpeg.o mpegvideo_enc.o motion_est.o ratecontrol.o mpeg12data.o mpegvideo.o
113 
+OBJS-$(CONFIG_LJPEG_ENCODER)           += ljpegenc.o mjpegenc.o mjpeg.o mpegvideo_enc.o motion_est.o ratecontrol.o mpeg12data.o mpegvideo.o aandcttab.o
114 114 
 OBJS-$(CONFIG_LOCO_DECODER)            += loco.o
115 115 
 OBJS-$(CONFIG_MACE3_DECODER)           += mace.o
116 116 
 OBJS-$(CONFIG_MACE6_DECODER)           += mace.o
117 117 
 OBJS-$(CONFIG_MIMIC_DECODER)           += mimic.o
118 118 
 OBJS-$(CONFIG_MJPEG_DECODER)           += mjpegdec.o mjpeg.o
119 
-OBJS-$(CONFIG_MJPEG_ENCODER)           += mjpegenc.o mjpeg.o mpegvideo_enc.o motion_est.o ratecontrol.o mpeg12data.o mpegvideo.o
119 
+OBJS-$(CONFIG_MJPEG_ENCODER)           += mjpegenc.o mjpeg.o mpegvideo_enc.o motion_est.o ratecontrol.o mpeg12data.o mpegvideo.o aandcttab.o
120 120 
 OBJS-$(CONFIG_MJPEGB_DECODER)          += mjpegbdec.o mjpegdec.o mjpeg.o
121 121 
 OBJS-$(CONFIG_MLP_DECODER)             += mlpdec.o mlp_parser.o mlp.o
122 122 
 OBJS-$(CONFIG_MMVIDEO_DECODER)         += mmvideo.o
... ... 
@@ -131,17 +131,17 @@ OBJS-$(CONFIG_MPC8_DECODER)            += mpc8.o mpc.o mpegaudiodec.o mpegaudiod
131 131 
 OBJS-$(CONFIG_MDEC_DECODER)            += mdec.o mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o
132 132 
 OBJS-$(CONFIG_MPEGVIDEO_DECODER)       += mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o
133 133 
 OBJS-$(CONFIG_MPEG1VIDEO_DECODER)      += mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o
134 
-OBJS-$(CONFIG_MPEG1VIDEO_ENCODER)      += mpeg12enc.o mpeg12data.o mpegvideo_enc.o motion_est.o ratecontrol.o mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o
134 
+OBJS-$(CONFIG_MPEG1VIDEO_ENCODER)      += mpeg12enc.o mpeg12data.o mpegvideo_enc.o motion_est.o ratecontrol.o mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o aandcttab.o
135 135 
 OBJS-$(CONFIG_MPEG2VIDEO_DECODER)      += mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o
136 
-OBJS-$(CONFIG_MPEG2VIDEO_ENCODER)      += mpeg12enc.o mpeg12data.o mpegvideo_enc.o motion_est.o ratecontrol.o mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o
136 
+OBJS-$(CONFIG_MPEG2VIDEO_ENCODER)      += mpeg12enc.o mpeg12data.o mpegvideo_enc.o motion_est.o ratecontrol.o mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o aandcttab.o
137 137 
 OBJS-$(CONFIG_MPEG4_DECODER)           += h263dec.o h263.o mpeg4video_parser.o mpeg12data.o mpegvideo.o error_resilience.o
138 
-OBJS-$(CONFIG_MPEG4_ENCODER)           += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
138 
+OBJS-$(CONFIG_MPEG4_ENCODER)           += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o aandcttab.o
139 139 
 OBJS-$(CONFIG_MSMPEG4V1_DECODER)       += msmpeg4.o msmpeg4data.o h263dec.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
140 
-OBJS-$(CONFIG_MSMPEG4V1_ENCODER)       += msmpeg4.o msmpeg4data.o mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
140 
+OBJS-$(CONFIG_MSMPEG4V1_ENCODER)       += msmpeg4.o msmpeg4data.o mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o aandcttab.o
141 141 
 OBJS-$(CONFIG_MSMPEG4V2_DECODER)       += msmpeg4.o msmpeg4data.o h263dec.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
142 
-OBJS-$(CONFIG_MSMPEG4V2_ENCODER)       += msmpeg4.o msmpeg4data.o mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
142 
+OBJS-$(CONFIG_MSMPEG4V2_ENCODER)       += msmpeg4.o msmpeg4data.o mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o aandcttab.o
143 143 
 OBJS-$(CONFIG_MSMPEG4V3_DECODER)       += msmpeg4.o msmpeg4data.o h263dec.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
144 
-OBJS-$(CONFIG_MSMPEG4V3_ENCODER)       += msmpeg4.o msmpeg4data.o mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
144 
+OBJS-$(CONFIG_MSMPEG4V3_ENCODER)       += msmpeg4.o msmpeg4data.o mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o aandcttab.o
145 145 
 OBJS-$(CONFIG_MSRLE_DECODER)           += msrle.o msrledec.o
146 146 
 OBJS-$(CONFIG_MSVIDEO1_DECODER)        += msvideo1.o
147 147 
 OBJS-$(CONFIG_MSZH_DECODER)            += lcldec.o
... ... 
@@ -173,9 +173,9 @@ OBJS-$(CONFIG_ROQ_DPCM_DECODER)        += dpcm.o
173 173 
 OBJS-$(CONFIG_ROQ_DPCM_ENCODER)        += roqaudioenc.o
174 174 
 OBJS-$(CONFIG_RPZA_DECODER)            += rpza.o
175 175 
 OBJS-$(CONFIG_RV10_DECODER)            += rv10.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
176 
-OBJS-$(CONFIG_RV10_ENCODER)            += rv10.o mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
176 
+OBJS-$(CONFIG_RV10_ENCODER)            += rv10.o mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o aandcttab.o
177 177 
 OBJS-$(CONFIG_RV20_DECODER)            += rv10.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
178 
-OBJS-$(CONFIG_RV20_ENCODER)            += rv10.o mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
178 
+OBJS-$(CONFIG_RV20_ENCODER)            += rv10.o mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o aandcttab.o
179 179 
 OBJS-$(CONFIG_SGI_DECODER)             += sgidec.o
180 180 
 OBJS-$(CONFIG_SGI_ENCODER)             += sgienc.o rle.o
181 181 
 OBJS-$(CONFIG_SHORTEN_DECODER)         += shorten.o
... ... 
@@ -228,9 +228,9 @@ OBJS-$(CONFIG_WMAV1_ENCODER)           += wmaenc.o wma.o
228 228 
 OBJS-$(CONFIG_WMAV2_DECODER)           += wmadec.o wma.o
229 229 
 OBJS-$(CONFIG_WMAV2_ENCODER)           += wmaenc.o wma.o
230 230 
 OBJS-$(CONFIG_WMV1_DECODER)            += h263dec.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
231 
-OBJS-$(CONFIG_WMV1_ENCODER)            += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
231 
+OBJS-$(CONFIG_WMV1_ENCODER)            += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o aandcttab.o
232 232 
 OBJS-$(CONFIG_WMV2_DECODER)            += wmv2dec.o wmv2.o msmpeg4.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o mpeg12data.o mpegvideo.o error_resilience.o
233 
-OBJS-$(CONFIG_WMV2_ENCODER)            += wmv2enc.o wmv2.o msmpeg4.o msmpeg4data.o mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
233 
+OBJS-$(CONFIG_WMV2_ENCODER)            += wmv2enc.o wmv2.o msmpeg4.o msmpeg4data.o mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o aandcttab.o
234 234 
 OBJS-$(CONFIG_WMV3_DECODER)            += vc1.o vc1data.o vc1dsp.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o error_resilience.o mpegvideo.o
235 235 
 OBJS-$(CONFIG_WNV1_DECODER)            += wnv1.o
236 236 
 OBJS-$(CONFIG_WS_SND1_DECODER)         += ws-snd1.o
libavcodec/aandcttab.c
History View file @ 8b22017
237 237 
new file mode 100644
... ... 
@@ -0,0 +1,47 @@
0 
+/*
1 
+ * This file is part of FFmpeg.
2 
+ *
3 
+ * FFmpeg is free software; you can redistribute it and/or
4 
+ * modify it under the terms of the GNU Lesser General Public
5 
+ * License as published by the Free Software Foundation; either
6 
+ * version 2.1 of the License, or (at your option) any later version.
7 
+ *
8 
+ * FFmpeg is distributed in the hope that it will be useful,
9 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
11 
+ * Lesser General Public License for more details.
12 
+ *
13 
+ * You should have received a copy of the GNU Lesser General Public
14 
+ * License along with FFmpeg; if not, write to the Free Software
15 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16 
+ */
17 
+
18 
+/**
19 
+ * @file aandcttab.c
20 
+ * AAN (Arai Agui Aakajima) (I)DCT tables
21 
+ */
22 
+
23 
+#include <stdint.h>
24 
+
25 
+const uint16_t ff_aanscales[64] = {
26 
+    /* precomputed values scaled up by 14 bits */
27 
+    16384, 22725, 21407, 19266, 16384, 12873,  8867,  4520,
28 
+    22725, 31521, 29692, 26722, 22725, 17855, 12299,  6270,
29 
+    21407, 29692, 27969, 25172, 21407, 16819, 11585,  5906,
30 
+    19266, 26722, 25172, 22654, 19266, 15137, 10426,  5315,
31 
+    16384, 22725, 21407, 19266, 16384, 12873,  8867,  4520,
32 
+    12873, 17855, 16819, 15137, 12873, 10114,  6967,  3552,
33 
+    8867 , 12299, 11585, 10426,  8867,  6967,  4799,  2446,
34 
+    4520 ,  6270,  5906,  5315,  4520,  3552,  2446,  1247
35 
+};
36 
+
37 
+const uint16_t ff_inv_aanscales[64] = {
38 
+  4096,  2953,  3135,  3483,  4096,  5213,  7568, 14846,
39 
+  2953,  2129,  2260,  2511,  2953,  3759,  5457, 10703,
40 
+  3135,  2260,  2399,  2666,  3135,  3990,  5793, 11363,
41 
+  3483,  2511,  2666,  2962,  3483,  4433,  6436, 12625,
42 
+  4096,  2953,  3135,  3483,  4096,  5213,  7568, 14846,
43 
+  5213,  3759,  3990,  4433,  5213,  6635,  9633, 18895,
44 
+  7568,  5457,  5793,  6436,  7568,  9633, 13985, 27432,
45 
+ 14846, 10703, 11363, 12625, 14846, 18895, 27432, 53809,
46 
+};
libavcodec/aandcttab.h
History View file @ 8b22017
0 47 
new file mode 100644
... ... 
@@ -0,0 +1,32 @@
0 
+/*
1 
+ * This file is part of FFmpeg.
2 
+ *
3 
+ * FFmpeg is free software; you can redistribute it and/or
4 
+ * modify it under the terms of the GNU Lesser General Public
5 
+ * License as published by the Free Software Foundation; either
6 
+ * version 2.1 of the License, or (at your option) any later version.
7 
+ *
8 
+ * FFmpeg is distributed in the hope that it will be useful,
9 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
11 
+ * Lesser General Public License for more details.
12 
+ *
13 
+ * You should have received a copy of the GNU Lesser General Public
14 
+ * License along with FFmpeg; if not, write to the Free Software
15 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16 
+ */
17 
+
18 
+/**
19 
+ * @file aandcttab.h
20 
+ * AAN (Arai Agui Nakajima) (I)DCT tables
21 
+ */
22 
+
23 
+#ifndef AVCODEC_AANDCTTAB_H
24 
+#define AVCODEC_AANDCTTAB_H
25 
+
26 
+#include <stdint.h>
27 
+
28 
+extern const uint16_t ff_aanscales[64];
29 
+extern const uint16_t ff_inv_aanscales[64];
30 
+
31 
+#endif /* AVCODEC_AANDCTTAB_H */
libavcodec/eatgq.c
History View file @ 8b22017
... ... 
@@ -33,7 +33,7 @@
33 33 
 #include "bitstream.h"
34 34 
 #include "bytestream.h"
35 35 
 #include "dsputil.h"
36 
-extern const uint16_t ff_inv_aanscales[64]; //mpegvideo_enc.c
36 
+#include "aandcttab.h"
37 37
38 38 
 typedef struct TgqContext {
39 39 
     AVCodecContext *avctx;
libavcodec/mpegvideo_enc.c
History View file @ 8b22017
... ... 
@@ -35,6 +35,7 @@
35 35 
 #include "msmpeg4.h"
36 36 
 #include "h263.h"
37 37 
 #include "faandct.h"
38 
+#include "aandcttab.h"
38 39 
 #include <limits.h>
39 40
40 41 
 //#undef NDEBUG
... ... 
@@ -49,29 +50,6 @@ static int sse_mb(MpegEncContext *s);
49 49
50 50 
 //#define DEBUG
51 51
52 
-static const uint16_t ff_aanscales[64] = {
53 
-    /* precomputed values scaled up by 14 bits */
54 
-    16384, 22725, 21407, 19266, 16384, 12873,  8867,  4520,
55 
-    22725, 31521, 29692, 26722, 22725, 17855, 12299,  6270,
56 
-    21407, 29692, 27969, 25172, 21407, 16819, 11585,  5906,
57 
-    19266, 26722, 25172, 22654, 19266, 15137, 10426,  5315,
58 
-    16384, 22725, 21407, 19266, 16384, 12873,  8867,  4520,
59 
-    12873, 17855, 16819, 15137, 12873, 10114,  6967,  3552,
60 
-    8867 , 12299, 11585, 10426,  8867,  6967,  4799,  2446,
61 
-    4520 ,  6270,  5906,  5315,  4520,  3552,  2446,  1247
62 
-};
63 
-
64 
-const uint16_t ff_inv_aanscales[64] = {
65 
-  4096,  2953,  3135,  3483,  4096,  5213,  7568, 14846,
66 
-  2953,  2129,  2260,  2511,  2953,  3759,  5457, 10703,
67 
-  3135,  2260,  2399,  2666,  3135,  3990,  5793, 11363,
68 
-  3483,  2511,  2666,  2962,  3483,  4433,  6436, 12625,
69 
-  4096,  2953,  3135,  3483,  4096,  5213,  7568, 14846,
70 
-  5213,  3759,  3990,  4433,  5213,  6635,  9633, 18895,
71 
-  7568,  5457,  5793,  6436,  7568,  9633, 13985, 27432,
72 
- 14846, 10703, 11363, 12625, 14846, 18895, 27432, 53809,
73 
-};
74 
-
75 52 
 static uint8_t default_mv_penalty[MAX_FCODE+1][MAX_MV*2+1];
76 53 
 static uint8_t default_fcode_tab[MAX_MV*2+1];
77 54