Merge commit 'fd9212f2edfe9b107c3c08ba2df5fd2cba5ab9e3'

* commit 'fd9212f2edfe9b107c3c08ba2df5fd2cba5ab9e3': Mark some arrays that never change as const.

James Almer committed 9 years ago

Commit 318778d2 parents 2508e60 fd9212f26 files · +64 −64Browse files

Showing the changes to libavcodec (17 of 26 files). Show all

Unified · Split

17 files

libavcodec/aaccoder.c +1 −1
libavcodec/aacenc.h +2 −2
libavcodec/amrwbdata.h +1 −1
libavcodec/atrac3plus.c +2 −2
libavcodec/dfa.c +1 −1
libavcodec/g722dec.c +2 −2
libavcodec/on2avcdata.c +8 −8
libavcodec/on2avcdata.h +10 −10
libavcodec/opus_silk.c +3 −3
libavcodec/qsvdec_h2645.c +2 −2
libavcodec/qsvenc_hevc.c +2 −2
libavcodec/tscc2data.h +3 −3
libavcodec/vaapi_encode.c +1 −1
libavcodec/vaapi_encode_mjpeg.c +1 −1
libavcodec/vp8.c +4 −4
libavcodec/vp9block.c +1 −1
libavcodec/x86/mlpdsp_init.c +6 −6

@@ -894,7 +894,7 @@ static void search_for_ms(AACEncContext s, ChannelElement cpe) · 893 unmodified lines
894	894	}
895	895	}
896	896
897		−AACCoefficientsEncoder ff_aac_coders[AAC_CODER_NB] = {
	897	+const AACCoefficientsEncoder ff_aac_coders[AAC_CODER_NB] = {
898	898	[AAC_CODER_ANMR] = {
899	899	search_for_quantizers_anmr,
900	900	encode_window_bands_info,

libavcodec/aacenc.h+2−2

@@ -78,7 +78,7 @@ typedef struct AACCoefficientsEncoder { · 77 unmodified lines
78	78	void (search_for_pred)(struct AACEncContext s, SingleChannelElement *sce);
79	79	} AACCoefficientsEncoder;
80	80
81		−extern AACCoefficientsEncoder ff_aac_coders[];
	81	+extern const AACCoefficientsEncoder ff_aac_coders[];
82	82
83	83	typedef struct AACQuantizeBandCostCacheEntry {
84	84	float rd;
@@ -110,7 +110,7 @@ typedef struct AACEncContext { · 25 unmodified lines
110	110	ChannelElement *cpe; ///< channel elements
111	111	FFPsyContext psy;
112	112	struct FFPsyPreprocessContext* psypp;
113		− AACCoefficientsEncoder *coder;
	113	+ const AACCoefficientsEncoder *coder;
114	114	int cur_channel; ///< current channel for coder context
115	115	int random_state;
116	116	float lambda;

libavcodec/amrwbdata.h+1−1

@@ -673,7 +673,7 @@ static const uint16_t order_MODE_23k85[] = { · 672 unmodified lines
673	673	};
674	674
675	675	/** Reordering array addresses for each mode */
676		−static const uint16_t* amr_bit_orderings_by_mode[] = {
	676	+static const uint16_t * const amr_bit_orderings_by_mode[] = {
677	677	order_MODE_6k60,
678	678	order_MODE_8k85,
679	679	order_MODE_12k65,

libavcodec/atrac3plus.c+2−2

@@ -109,8 +109,8 @@ av_cold void ff_atrac3p_init_vlcs(void) · 108 unmodified lines
109	109	NULL, NULL, atrac3p_ct_huff_xlat1, NULL
110	110	};
111	111
112		− static const int sf_nb_bits[8] = { 9, 9, 9, 9, 6, 6, 7, 7 };
113		− static const int sf_nb_codes[8] = { 64, 64, 64, 64, 16, 16, 16, 16 };
	112	+ static const int sf_nb_bits[8] = { 9, 9, 9, 9, 6, 6, 7, 7 };
	113	+ static const int sf_nb_codes[8] = { 64, 64, 64, 64, 16, 16, 16, 16 };
114	114	static const uint8_t * const sf_bits[8] = {
115	115	atrac3p_sf_huff_bits1, atrac3p_sf_huff_bits1, atrac3p_sf_huff_bits2,
116	116	atrac3p_sf_huff_bits3, atrac3p_sf_huff_bits4, atrac3p_sf_huff_bits4,

libavcodec/dfa.c+1−1

@@ -330,7 +330,7 @@ static const chunk_decoder decoder[8] = { · 329 unmodified lines
330	330	decode_tdlt, decode_dsw1, decode_blck, decode_dds1,
331	331	};
332	332
333		−static const char* chunk_name[8] = {
	333	+static const char * const chunk_name[8] = {
334	334	"COPY", "TSW1", "BDLT", "WDLT", "TDLT", "DSW1", "BLCK", "DDS1"
335	335	};
336	336

libavcodec/g722dec.c+2−2

@@ -80,8 +80,8 @@ static const int16_t low_inv_quant5[32] = { · 79 unmodified lines
80	80	};
81	81
82	82	static const int16_t * const low_inv_quants[3] = { ff_g722_low_inv_quant6,
83		− low_inv_quant5,
84		− ff_g722_low_inv_quant4 };
	83	+ low_inv_quant5,
	84	+ ff_g722_low_inv_quant4 };
85	85
86	86	static int g722_decode_frame(AVCodecContext avctx, void data,
87	87	int got_frame_ptr, AVPacket avpkt)

libavcodec/on2avcdata.c+8−8

@@ -7724,12 +7724,12 @@ static const double tabs_9_20[9 * 2][20] = { · 7723 unmodified lines
7724	7724	0.22783, 0.058894795, -0.61350902, 0.69559873, -0.27013783, }
7725	7725	};
7726	7726
7727		−const double* const ff_on2avc_tabs_9_20_1[9] = {
	7727	+const double * const ff_on2avc_tabs_9_20_1[9] = {
7728	7728	tabs_9_20[0], tabs_9_20[1], tabs_9_20[2], tabs_9_20[3], tabs_9_20[4],
7729	7729	tabs_9_20[5], tabs_9_20[6], tabs_9_20[7], tabs_9_20[8]
7730	7730	};
7731	7731
7732		−const double* const ff_on2avc_tabs_9_20_2[9] = {
	7732	+const double * const ff_on2avc_tabs_9_20_2[9] = {
7733	7733	tabs_9_20[ 9], tabs_9_20[10], tabs_9_20[11], tabs_9_20[12], tabs_9_20[13],
7734	7734	tabs_9_20[14], tabs_9_20[15], tabs_9_20[16], tabs_9_20[17]
7735	7735	};
@@ -7927,7 +7927,7 @@ static const double tabs_19_40[19 * 2][40] = { · 191 unmodified lines
7927	7927	0.019871848, -0.11989559, 0.036659135, 0.26632201, -0.3057397, -0.23220335, 0.68741352, -0.54024027, }
7928	7928	};
7929	7929
7930		−const double* const ff_on2avc_tabs_19_40_1[19] = {
	7930	+const double * const ff_on2avc_tabs_19_40_1[19] = {
7931	7931	tabs_19_40[ 0], tabs_19_40[ 1], tabs_19_40[ 2], tabs_19_40[ 3],
7932	7932	tabs_19_40[ 4], tabs_19_40[ 5], tabs_19_40[ 6], tabs_19_40[ 7],
7933	7933	tabs_19_40[ 8], tabs_19_40[ 9], tabs_19_40[10], tabs_19_40[11],
@@ -7935,7 +7935,7 @@ const double* const ff_on2avc_tabs_19_40_1[19] = { · 1 unmodified line
7935	7935	tabs_19_40[16], tabs_19_40[17], tabs_19_40[18],
7936	7936	};
7937	7937
7938		−const double* const ff_on2avc_tabs_19_40_2[19] = {
	7938	+const double * const ff_on2avc_tabs_19_40_2[19] = {
7939	7939	tabs_19_40[19], tabs_19_40[20], tabs_19_40[21], tabs_19_40[22],
7940	7940	tabs_19_40[23], tabs_19_40[24], tabs_19_40[25], tabs_19_40[26],
7941	7941	tabs_19_40[27], tabs_19_40[28], tabs_19_40[29], tabs_19_40[30],
@@ -8826,7 +8826,7 @@ static const double tabs_20_84[20 * 4][84] = { · 884 unmodified lines
8826	8826	0.51434408, -0.41486443, 0.27672635, -0.10432054, },
8827	8827	};
8828	8828
8829		−const double* const ff_on2avc_tabs_20_84_1[20] = {
	8829	+const double * const ff_on2avc_tabs_20_84_1[20] = {
8830	8830	tabs_20_84[ 0], tabs_20_84[ 1], tabs_20_84[ 2], tabs_20_84[ 3],
8831	8831	tabs_20_84[ 4], tabs_20_84[ 5], tabs_20_84[ 6], tabs_20_84[ 7],
8832	8832	tabs_20_84[ 8], tabs_20_84[ 9], tabs_20_84[10], tabs_20_84[11],
@@ -8834,7 +8834,7 @@ const double* const ff_on2avc_tabs_20_84_1[20] = { · 1 unmodified line
8834	8834	tabs_20_84[16], tabs_20_84[17], tabs_20_84[18], tabs_20_84[19]
8835	8835	};
8836	8836
8837		−const double* const ff_on2avc_tabs_20_84_2[20] = {
	8837	+const double * const ff_on2avc_tabs_20_84_2[20] = {
8838	8838	tabs_20_84[20], tabs_20_84[21], tabs_20_84[22], tabs_20_84[23],
8839	8839	tabs_20_84[24], tabs_20_84[25], tabs_20_84[26], tabs_20_84[27],
8840	8840	tabs_20_84[28], tabs_20_84[29], tabs_20_84[30], tabs_20_84[31],
@@ -8842,7 +8842,7 @@ const double* const ff_on2avc_tabs_20_84_2[20] = { · 1 unmodified line
8842	8842	tabs_20_84[36], tabs_20_84[37], tabs_20_84[38], tabs_20_84[39]
8843	8843	};
8844	8844
8845		−const double* const ff_on2avc_tabs_20_84_3[20] = {
	8845	+const double * const ff_on2avc_tabs_20_84_3[20] = {
8846	8846	tabs_20_84[40], tabs_20_84[41], tabs_20_84[42], tabs_20_84[43],
8847	8847	tabs_20_84[44], tabs_20_84[45], tabs_20_84[46], tabs_20_84[47],
8848	8848	tabs_20_84[48], tabs_20_84[49], tabs_20_84[50], tabs_20_84[51],
@@ -8850,7 +8850,7 @@ const double* const ff_on2avc_tabs_20_84_3[20] = { · 1 unmodified line
8850	8850	tabs_20_84[56], tabs_20_84[57], tabs_20_84[58], tabs_20_84[59]
8851	8851	};
8852	8852
8853		−const double* const ff_on2avc_tabs_20_84_4[20] = {
	8853	+const double * const ff_on2avc_tabs_20_84_4[20] = {
8854	8854	tabs_20_84[60], tabs_20_84[61], tabs_20_84[62], tabs_20_84[63],
8855	8855	tabs_20_84[64], tabs_20_84[65], tabs_20_84[66], tabs_20_84[67],
8856	8856	tabs_20_84[68], tabs_20_84[69], tabs_20_84[70], tabs_20_84[71],

libavcodec/on2avcdata.h+10−10

@@ -64,16 +64,16 @@ extern const double ff_on2avc_tab_84_1[]; · 63 unmodified lines
64	64	extern const double ff_on2avc_tab_84_2[];
65	65	extern const double ff_on2avc_tab_84_3[];
66	66	extern const double ff_on2avc_tab_84_4[];
67		−extern const double* const ff_on2avc_tabs_4_10_1[4];
68		−extern const double* const ff_on2avc_tabs_4_10_2[4];
69		−extern const double* const ff_on2avc_tabs_9_20_1[9];
70		−extern const double* const ff_on2avc_tabs_9_20_2[9];
71		−extern const double* const ff_on2avc_tabs_19_40_1[19];
72		−extern const double* const ff_on2avc_tabs_19_40_2[19];
73		−extern const double* const ff_on2avc_tabs_20_84_1[20];
74		−extern const double* const ff_on2avc_tabs_20_84_2[20];
75		−extern const double* const ff_on2avc_tabs_20_84_3[20];
76		−extern const double* const ff_on2avc_tabs_20_84_4[20];
	67	+extern const double * const ff_on2avc_tabs_4_10_1[4];
	68	+extern const double * const ff_on2avc_tabs_4_10_2[4];
	69	+extern const double * const ff_on2avc_tabs_9_20_1[9];
	70	+extern const double * const ff_on2avc_tabs_9_20_2[9];
	71	+extern const double * const ff_on2avc_tabs_19_40_1[19];
	72	+extern const double * const ff_on2avc_tabs_19_40_2[19];
	73	+extern const double * const ff_on2avc_tabs_20_84_1[20];
	74	+extern const double * const ff_on2avc_tabs_20_84_2[20];
	75	+extern const double * const ff_on2avc_tabs_20_84_3[20];
	76	+extern const double * const ff_on2avc_tabs_20_84_4[20];
77	77	extern const float ff_on2avc_ctab_1[2048];
78	78	extern const float ff_on2avc_ctab_2[2048];
79	79	extern const float ff_on2avc_ctab_3[2048];

libavcodec/opus_silk.c+3−3

@@ -599,7 +599,7 @@ static void silk_decode_frame(SilkContext s, OpusRangeCoder rc, · 598 unmodified lines
599	599	if (lag_absolute) {
600	600	/* primary lag is coded absolute */
601	601	int highbits, lowbits;
602		− static const uint16_t *model[] = {
	602	+ static const uint16_t * const model[] = {
603	603	ff_silk_model_pitch_lowbits_nb, ff_silk_model_pitch_lowbits_mb,
604	604	ff_silk_model_pitch_lowbits_wb
605	605	};
@@ -633,11 +633,11 @@ static void silk_decode_frame(SilkContext s, OpusRangeCoder rc, · 27 unmodified lines
633	633	ltpfilter = ff_opus_rc_dec_cdf(rc, ff_silk_model_ltp_filter);
634	634	for (i = 0; i < s->subframes; i++) {
635	635	int index, j;
636		− static const uint16_t *filter_sel[] = {
	636	+ static const uint16_t * const filter_sel[] = {
637	637	ff_silk_model_ltp_filter0_sel, ff_silk_model_ltp_filter1_sel,
638	638	ff_silk_model_ltp_filter2_sel
639	639	};
640		− static const int8_t (*filter_taps[])[5] = {
	640	+ static const int8_t (* const filter_taps[])[5] = {
641	641	ff_silk_ltp_filter0_taps, ff_silk_ltp_filter1_taps, ff_silk_ltp_filter2_taps
642	642	};
643	643	index = ff_opus_rc_dec_cdf(rc, filter_sel[ltpfilter]);

libavcodec/qsvdec_h2645.c+2−2

@@ -84,8 +84,8 @@ static av_cold int qsv_decode_init(AVCodecContext *avctx) · 83 unmodified lines
84	84	int ret;
85	85
86	86	if (avctx->codec_id == AV_CODEC_ID_HEVC && s->load_plugin != LOAD_PLUGIN_NONE) {
87		− static const char *uid_hevcdec_sw = "15dd936825ad475ea34e35f3f54217a6";
88		− static const char *uid_hevcdec_hw = "33a61c0b4c27454ca8d85dde757c6f8e";
	87	+ static const char * const uid_hevcdec_sw = "15dd936825ad475ea34e35f3f54217a6";
	88	+ static const char * const uid_hevcdec_hw = "33a61c0b4c27454ca8d85dde757c6f8e";
89	89
90	90	if (s->qsv.load_plugins[0]) {
91	91	av_log(avctx, AV_LOG_WARNING,

libavcodec/qsvenc_hevc.c+2−2

@@ -161,8 +161,8 @@ static av_cold int qsv_enc_init(AVCodecContext *avctx) · 160 unmodified lines
161	161	int ret;
162	162
163	163	if (q->load_plugin != LOAD_PLUGIN_NONE) {
164		− static const char *uid_hevcenc_sw = "2fca99749fdb49aeb121a5b63ef568f7";
165		− static const char *uid_hevcenc_hw = "6fadc791a0c2eb479ab6dcd5ea9da347";
	164	+ static const char * const uid_hevcenc_sw = "2fca99749fdb49aeb121a5b63ef568f7";
	165	+ static const char * const uid_hevcenc_hw = "6fadc791a0c2eb479ab6dcd5ea9da347";
166	166
167	167	if (q->qsv.load_plugins[0]) {
168	168	av_log(avctx, AV_LOG_WARNING,

libavcodec/tscc2data.h+3−3

@@ -903,14 +903,14 @@ static const int tscc2_ac_vlc_sizes[NUM_VLC_SETS] = { · 902 unmodified lines
903	903	172, 169, 165, 162, 131, 132, 130, 125, 121, 114, 110, 101, 96
904	904	};
905	905
906		−static const uint16_t *tscc2_ac_vlc_syms[NUM_VLC_SETS] = {
	906	+static const uint16_t * const tscc2_ac_vlc_syms[NUM_VLC_SETS] = {
907	907	ac_vlc_desc0_syms, ac_vlc_desc1_syms, ac_vlc_desc2_syms, ac_vlc_desc3_syms,
908	908	ac_vlc_desc4_syms, ac_vlc_desc5_syms, ac_vlc_desc6_syms, ac_vlc_desc7_syms,
909	909	ac_vlc_desc8_syms, ac_vlc_desc9_syms, ac_vlc_descA_syms, ac_vlc_descB_syms,
910	910	ac_vlc_descC_syms,
911	911	};
912	912
913		−static const uint16_t *tscc2_ac_vlc_codes[NUM_VLC_SETS] = {
	913	+static const uint16_t * const tscc2_ac_vlc_codes[NUM_VLC_SETS] = {
914	914	ac_vlc_desc0_codes, ac_vlc_desc1_codes, ac_vlc_desc2_codes,
915	915	ac_vlc_desc3_codes, ac_vlc_desc4_codes, ac_vlc_desc5_codes,
916	916	ac_vlc_desc6_codes, ac_vlc_desc7_codes, ac_vlc_desc8_codes,
@@ -918,7 +918,7 @@ static const uint16_t *tscc2_ac_vlc_codes[NUM_VLC_SETS] = { · 1 unmodified line
918	918	ac_vlc_descC_codes,
919	919	};
920	920
921		−static const uint8_t *tscc2_ac_vlc_bits[NUM_VLC_SETS] = {
	921	+static const uint8_t * const tscc2_ac_vlc_bits[NUM_VLC_SETS] = {
922	922	ac_vlc_desc0_bits, ac_vlc_desc1_bits, ac_vlc_desc2_bits, ac_vlc_desc3_bits,
923	923	ac_vlc_desc4_bits, ac_vlc_desc5_bits, ac_vlc_desc6_bits, ac_vlc_desc7_bits,
924	924	ac_vlc_desc8_bits, ac_vlc_desc9_bits, ac_vlc_descA_bits, ac_vlc_descB_bits,

libavcodec/vaapi_encode.c+1−1

@@ -27,7 +27,7 @@ · 26 unmodified lines
27	27	#include "vaapi_encode.h"
28	28	#include "avcodec.h"
29	29
30		−static const char *picture_type_name[] = { "IDR", "I", "P", "B" };
	30	+static const char * const picture_type_name[] = { "IDR", "I", "P", "B" };
31	31
32	32	static int vaapi_encode_make_packed_header(AVCodecContext *avctx,
33	33	VAAPIEncodePicture *pic,

libavcodec/vaapi_encode_mjpeg.c+1−1

@@ -361,7 +361,7 @@ static av_cold int vaapi_encode_mjpeg_configure(AVCodecContext *avctx) · 360 unmodified lines
361	361	return 0;
362	362	}
363	363
364		−static VAAPIEncodeType vaapi_encode_type_mjpeg = {
	364	+static const VAAPIEncodeType vaapi_encode_type_mjpeg = {
365	365	.priv_data_size = sizeof(VAAPIEncodeMJPEGContext),
366	366
367	367	.configure = &vaapi_encode_mjpeg_configure,

libavcodec/vp8.c+4−4

@@ -1171,10 +1171,10 @@ void decode_mb_mode(VP8Context s, VP8mvbounds mv_bounds, · 1170 unmodified lines
1171	1171	uint8_t segment, uint8_t ref, int layout, int is_vp7)
1172	1172	{
1173	1173	VP56RangeCoder *c = &s->c;
1174		− static const char *vp7_feature_name[] = { "q-index",
1175		− "lf-delta",
1176		− "partial-golden-update",
1177		− "blit-pitch" };
	1174	+ static const char * const vp7_feature_name[] = { "q-index",
	1175	+ "lf-delta",
	1176	+ "partial-golden-update",
	1177	+ "blit-pitch" };
1178	1178	if (is_vp7) {
1179	1179	int i;
1180	1180	*segment = 0;

libavcodec/vp9block.c+1−1

@@ -976,7 +976,7 @@ static av_always_inline int decode_coeffs(VP9TileData *td, int is8bitsperpixel) · 975 unmodified lines
976	976	int16_t (*qmul)[2] = s->s.h.segmentation.feat[b->seg_id].qmul;
977	977	int tx = 4 * s->s.h.lossless + b->tx;
978	978	const int16_t * const *yscans = ff_vp9_scans[tx];
979		− const int16_t (* const *ynbs)[2] = ff_vp9_scans_nb[tx];
	979	+ const int16_t (* const * ynbs)[2] = ff_vp9_scans_nb[tx];
980	980	const int16_t *uvscan = ff_vp9_scans[b->uvtx][DCT_DCT];
981	981	const int16_t (*uvnb)[2] = ff_vp9_scans_nb[b->uvtx][DCT_DCT];
982	982	uint8_t a = &s->above_y_nnz_ctx[col 2];

libavcodec/x86/mlpdsp_init.c+6−6

@@ -61,13 +61,13 @@ extern char ff_mlp_iirorder_1; · 60 unmodified lines
61	61	extern char ff_mlp_iirorder_0;
62	62
63	63	static const void * const firtable[9] = { &ff_mlp_firorder_0, &ff_mlp_firorder_1,
64		− &ff_mlp_firorder_2, &ff_mlp_firorder_3,
65		− &ff_mlp_firorder_4, &ff_mlp_firorder_5,
66		− &ff_mlp_firorder_6, &ff_mlp_firorder_7,
67		− &ff_mlp_firorder_8 };
	64	+ &ff_mlp_firorder_2, &ff_mlp_firorder_3,
	65	+ &ff_mlp_firorder_4, &ff_mlp_firorder_5,
	66	+ &ff_mlp_firorder_6, &ff_mlp_firorder_7,
	67	+ &ff_mlp_firorder_8 };
68	68	static const void * const iirtable[5] = { &ff_mlp_iirorder_0, &ff_mlp_iirorder_1,
69		− &ff_mlp_iirorder_2, &ff_mlp_iirorder_3,
70		− &ff_mlp_iirorder_4 };
	69	+ &ff_mlp_iirorder_2, &ff_mlp_iirorder_3,
	70	+ &ff_mlp_iirorder_4 };
71	71
72	72	#if ARCH_X86_64
73	73

Merge commit 'fd9212f2edfe9b107c3c08ba2df5fd2cba5ab9e3'

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code