From f9fbd474676e903e12efe83203697d60a9d28cf9 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 10 Feb 2016 14:55:52 +0100 Subject: [PATCH] msmpeg4data: Move WMV2 data tables to their own file --- libavcodec/Makefile | 11 ++++++----- libavcodec/msmpeg4data.c | 14 -------------- libavcodec/msmpeg4data.h | 3 --- libavcodec/mss2.c | 2 +- libavcodec/vc1.c | 2 +- libavcodec/wmv2.c | 1 + libavcodec/wmv2data.c | 35 +++++++++++++++++++++++++++++++++++ libavcodec/wmv2data.h | 27 +++++++++++++++++++++++++++ 8 files changed, 71 insertions(+), 24 deletions(-) create mode 100644 libavcodec/wmv2data.c create mode 100644 libavcodec/wmv2data.h diff --git a/libavcodec/Makefile b/libavcodec/Makefile index ea70c65a93..a58333fdfe 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -329,7 +329,7 @@ OBJS-$(CONFIG_MSMPEG4V3_ENCODER) += msmpeg4enc.o msmpeg4.o msmpeg4data.o OBJS-$(CONFIG_MSRLE_DECODER) += msrle.o msrledec.o OBJS-$(CONFIG_MSA1_DECODER) += mss3.o OBJS-$(CONFIG_MSS1_DECODER) += mss1.o mss12.o -OBJS-$(CONFIG_MSS2_DECODER) += mss2.o mss12.o mss2dsp.o +OBJS-$(CONFIG_MSS2_DECODER) += mss2.o mss12.o mss2dsp.o wmv2data.o OBJS-$(CONFIG_MSVIDEO1_DECODER) += msvideo1.o OBJS-$(CONFIG_MSZH_DECODER) += lcldec.o OBJS-$(CONFIG_MTS2_DECODER) += mss4.o @@ -444,7 +444,8 @@ OBJS-$(CONFIG_VBLE_DECODER) += vble.o OBJS-$(CONFIG_VC1_DECODER) += vc1dec.o vc1_block.o vc1_loopfilter.o \ vc1_mc.o vc1_pred.o vc1.o vc1data.o \ vc1dsp.o \ - msmpeg4dec.o msmpeg4.o msmpeg4data.o + msmpeg4dec.o msmpeg4.o msmpeg4data.o \ + wmv2data.o OBJS-$(CONFIG_VCR1_DECODER) += vcr1.o OBJS-$(CONFIG_VMDAUDIO_DECODER) += vmdaudio.o OBJS-$(CONFIG_VMDVIDEO_DECODER) += vmdvideo.o @@ -474,9 +475,9 @@ OBJS-$(CONFIG_WMAVOICE_DECODER) += wmavoice.o \ celp_filters.o \ acelp_vectors.o acelp_filters.o OBJS-$(CONFIG_WMV1_DECODER) += msmpeg4dec.o msmpeg4.o msmpeg4data.o -OBJS-$(CONFIG_WMV2_DECODER) += wmv2dec.o wmv2.o \ +OBJS-$(CONFIG_WMV2_DECODER) += wmv2dec.o wmv2.o wmv2data.o \ msmpeg4dec.o msmpeg4.o msmpeg4data.o -OBJS-$(CONFIG_WMV2_ENCODER) += wmv2enc.o wmv2.o \ +OBJS-$(CONFIG_WMV2_ENCODER) += wmv2enc.o wmv2.o wmv2data.o \ msmpeg4.o msmpeg4enc.o msmpeg4data.o OBJS-$(CONFIG_WNV1_DECODER) += wnv1.o OBJS-$(CONFIG_WS_SND1_DECODER) += ws-snd1.o @@ -731,7 +732,7 @@ OBJS-$(CONFIG_PNM_PARSER) += pnm_parser.o pnm.o OBJS-$(CONFIG_RV30_PARSER) += rv34_parser.o OBJS-$(CONFIG_RV40_PARSER) += rv34_parser.o OBJS-$(CONFIG_TAK_PARSER) += tak_parser.o tak.o -OBJS-$(CONFIG_VC1_PARSER) += vc1_parser.o +OBJS-$(CONFIG_VC1_PARSER) += vc1_parser.o wmv2data.o OBJS-$(CONFIG_VP3_PARSER) += vp3_parser.o OBJS-$(CONFIG_VP8_PARSER) += vp8_parser.o diff --git a/libavcodec/msmpeg4data.c b/libavcodec/msmpeg4data.c index d953a38e1a..6bc0520c82 100644 --- a/libavcodec/msmpeg4data.c +++ b/libavcodec/msmpeg4data.c @@ -1959,17 +1959,3 @@ const uint32_t (*const ff_wmv2_inter_table[WMV2_INTER_CBP_TABLE_COUNT])[2] = { table_mb_non_intra4, ff_table_mb_non_intra, }; - -const uint8_t ff_wmv2_scantableA[64] = { - 0x00, 0x01, 0x02, 0x08, 0x03, 0x09, 0x0A, 0x10, - 0x04, 0x0B, 0x11, 0x18, 0x12, 0x0C, 0x05, 0x13, - 0x19, 0x0D, 0x14, 0x1A, 0x1B, 0x06, 0x15, 0x1C, - 0x0E, 0x16, 0x1D, 0x07, 0x1E, 0x0F, 0x17, 0x1F, -}; - -const uint8_t ff_wmv2_scantableB[64] = { - 0x00, 0x08, 0x01, 0x10, 0x09, 0x18, 0x11, 0x02, - 0x20, 0x0A, 0x19, 0x28, 0x12, 0x30, 0x21, 0x1A, - 0x38, 0x29, 0x22, 0x03, 0x31, 0x39, 0x0B, 0x2A, - 0x13, 0x32, 0x1B, 0x3A, 0x23, 0x2B, 0x33, 0x3B, -}; diff --git a/libavcodec/msmpeg4data.h b/libavcodec/msmpeg4data.h index ca2dac14bd..9d57d419a8 100644 --- a/libavcodec/msmpeg4data.h +++ b/libavcodec/msmpeg4data.h @@ -84,7 +84,4 @@ extern const uint32_t ff_table1_dc_chroma[120][2]; #define WMV2_INTER_CBP_TABLE_COUNT 4 extern const uint32_t (* const ff_wmv2_inter_table[WMV2_INTER_CBP_TABLE_COUNT])[2]; -extern const uint8_t ff_wmv2_scantableA[64]; -extern const uint8_t ff_wmv2_scantableB[64]; - #endif /* AVCODEC_MSMPEG4DATA_H */ diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c index 4a4eaa0b88..2c993f67e0 100644 --- a/libavcodec/mss2.c +++ b/libavcodec/mss2.c @@ -28,9 +28,9 @@ #include "internal.h" #include "mpeg_er.h" #include "msmpeg4.h" -#include "msmpeg4data.h" #include "qpeldsp.h" #include "vc1.h" +#include "wmv2data.h" #include "mss12.h" #include "mss2dsp.h" diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index ec5d68d4de..14634bd993 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -32,7 +32,7 @@ #include "mpegvideo.h" #include "vc1.h" #include "vc1data.h" -#include "msmpeg4data.h" +#include "wmv2data.h" #include "unary.h" #include "simple_idct.h" diff --git a/libavcodec/wmv2.c b/libavcodec/wmv2.c index 3974254fab..6542d31e9d 100644 --- a/libavcodec/wmv2.c +++ b/libavcodec/wmv2.c @@ -25,6 +25,7 @@ #include "msmpeg4data.h" #include "simple_idct.h" #include "wmv2.h" +#include "wmv2data.h" av_cold void ff_wmv2_common_init(Wmv2Context *w) diff --git a/libavcodec/wmv2data.c b/libavcodec/wmv2data.c new file mode 100644 index 0000000000..bbb07bbcb8 --- /dev/null +++ b/libavcodec/wmv2data.c @@ -0,0 +1,35 @@ +/* + * This file is part of Libav. + * + * Libav is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * Libav is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with Libav; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include + +#include "wmv2data.h" + +const uint8_t ff_wmv2_scantableA[64] = { + 0x00, 0x01, 0x02, 0x08, 0x03, 0x09, 0x0A, 0x10, + 0x04, 0x0B, 0x11, 0x18, 0x12, 0x0C, 0x05, 0x13, + 0x19, 0x0D, 0x14, 0x1A, 0x1B, 0x06, 0x15, 0x1C, + 0x0E, 0x16, 0x1D, 0x07, 0x1E, 0x0F, 0x17, 0x1F, +}; + +const uint8_t ff_wmv2_scantableB[64] = { + 0x00, 0x08, 0x01, 0x10, 0x09, 0x18, 0x11, 0x02, + 0x20, 0x0A, 0x19, 0x28, 0x12, 0x30, 0x21, 0x1A, + 0x38, 0x29, 0x22, 0x03, 0x31, 0x39, 0x0B, 0x2A, + 0x13, 0x32, 0x1B, 0x3A, 0x23, 0x2B, 0x33, 0x3B, +}; diff --git a/libavcodec/wmv2data.h b/libavcodec/wmv2data.h new file mode 100644 index 0000000000..8914e579df --- /dev/null +++ b/libavcodec/wmv2data.h @@ -0,0 +1,27 @@ +/* + * This file is part of Libav. + * + * Libav is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * Libav is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with Libav; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_WMV2DATA_H +#define AVCODEC_WMV2DATA_H + +#include + +extern const uint8_t ff_wmv2_scantableA[64]; +extern const uint8_t ff_wmv2_scantableB[64]; + +#endif /* AVCODEC_WMV2DATA_H */ -- GitLab