Mercurial > libavcodec.hg

comparison mpeg4data.h @ 10817:d1fe22d92a65 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename mpeg4 intra vlc tables so they contain "mpeg4", this improves readability of msmpeg4 code (one now knows where that table comes from).
author michael
date Fri, 08 Jan 2010 17:41:14 +0000
parents 9abebeca7d1b
children 34739b965809
comparison
equal deleted inserted replaced
10816:9abebeca7d1b 10817:d1fe22d92a65
42 { 42 {
43 {3,2}, {2,2}, {1,2}, {1,3}, {1,4}, {1,5}, {1,6}, {1,7}, {1,8}, 43 {3,2}, {2,2}, {1,2}, {1,3}, {1,4}, {1,5}, {1,6}, {1,7}, {1,8},
44 {1,9}, {1,10}, {1,11}, {1,12}, 44 {1,9}, {1,10}, {1,11}, {1,12},
45 }; 45 };
46 46
47 const uint16_t intra_vlc[103][2] = { 47 const uint16_t ff_mpeg4_intra_vlc[103][2] = {
48 { 0x2, 2 }, 48 { 0x2, 2 },
49 { 0x6, 3 },{ 0xf, 4 },{ 0xd, 5 },{ 0xc, 5 }, 49 { 0x6, 3 },{ 0xf, 4 },{ 0xd, 5 },{ 0xc, 5 },
50 { 0x15, 6 },{ 0x13, 6 },{ 0x12, 6 },{ 0x17, 7 }, 50 { 0x15, 6 },{ 0x13, 6 },{ 0x12, 6 },{ 0x17, 7 },
51 { 0x1f, 8 },{ 0x1e, 8 },{ 0x1d, 8 },{ 0x25, 9 }, 51 { 0x1f, 8 },{ 0x1e, 8 },{ 0x1d, 8 },{ 0x25, 9 },
52 { 0x24, 9 },{ 0x23, 9 },{ 0x21, 9 },{ 0x21, 10 }, 52 { 0x24, 9 },{ 0x23, 9 },{ 0x21, 9 },{ 0x21, 10 },
72 { 0x13, 9 },{ 0x12, 9 },{ 0x11, 9 },{ 0x26, 11 }, 72 { 0x13, 9 },{ 0x12, 9 },{ 0x11, 9 },{ 0x26, 11 },
73 { 0x27, 11 },{ 0x5c, 12 },{ 0x5d, 12 },{ 0x5e, 12 }, 73 { 0x27, 11 },{ 0x5c, 12 },{ 0x5d, 12 },{ 0x5e, 12 },
74 { 0x5f, 12 },{ 0x3, 7 }, 74 { 0x5f, 12 },{ 0x3, 7 },
75 }; 75 };
76 76
77 const int8_t intra_level[102] = { 77 const int8_t ff_mpeg4_intra_level[102] = {
78 1, 2, 3, 4, 5, 6, 7, 8, 78 1, 2, 3, 4, 5, 6, 7, 8,
79 9, 10, 11, 12, 13, 14, 15, 16, 79 9, 10, 11, 12, 13, 14, 15, 16,
80 17, 18, 19, 20, 21, 22, 23, 24, 80 17, 18, 19, 20, 21, 22, 23, 24,
81 25, 26, 27, 1, 2, 3, 4, 5, 81 25, 26, 27, 1, 2, 3, 4, 5,
82 6, 7, 8, 9, 10, 1, 2, 3, 82 6, 7, 8, 9, 10, 1, 2, 3,
88 1, 2, 1, 2, 1, 2, 1, 2, 88 1, 2, 1, 2, 1, 2, 1, 2,
89 1, 1, 1, 1, 1, 1, 1, 1, 89 1, 1, 1, 1, 1, 1, 1, 1,
90 1, 1, 1, 1, 1, 1, 90 1, 1, 1, 1, 1, 1,
91 }; 91 };
92 92
93 const int8_t intra_run[102] = { 93 const int8_t ff_mpeg4_intra_run[102] = {
94 0, 0, 0, 0, 0, 0, 0, 0, 94 0, 0, 0, 0, 0, 0, 0, 0,
95 0, 0, 0, 0, 0, 0, 0, 0, 95 0, 0, 0, 0, 0, 0, 0, 0,
96 0, 0, 0, 0, 0, 0, 0, 0, 96 0, 0, 0, 0, 0, 0, 0, 0,
97 0, 0, 0, 1, 1, 1, 1, 1, 97 0, 0, 0, 1, 1, 1, 1, 1,
98 1, 1, 1, 1, 1, 2, 2, 2, 98 1, 1, 1, 1, 1, 2, 2, 2,
104 3, 3, 4, 4, 5, 5, 6, 6, 104 3, 3, 4, 4, 5, 5, 6, 6,
105 7, 8, 9, 10, 11, 12, 13, 14, 105 7, 8, 9, 10, 11, 12, 13, 14,
106 15, 16, 17, 18, 19, 20, 106 15, 16, 17, 18, 19, 20,
107 }; 107 };
108 108
109 RLTable rl_intra = { 109 RLTable ff_mpeg4_rl_intra = {
110 102, 110 102,
111 67, 111 67,
112 intra_vlc, 112 ff_mpeg4_intra_vlc,
113 intra_run, 113 ff_mpeg4_intra_run,
114 intra_level, 114 ff_mpeg4_intra_level,
115 }; 115 };
116 116
117 /* Note this is identical to the intra rvlc except that it is reordered. */ 117 /* Note this is identical to the intra rvlc except that it is reordered. */
118 const uint16_t inter_rvlc[170][2]={ 118 const uint16_t inter_rvlc[170][2]={
119 {0x0006, 3},{0x0001, 4},{0x0004, 5},{0x001C, 7}, 119 {0x0006, 3},{0x0001, 4},{0x0004, 5},{0x001C, 7},