annotate mpeg12.c @ 1098:b7f267d168b7 libavcodec

mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
author michaelni
date Wed, 05 Mar 2003 20:03:15 +0000
parents 5e6e505d8997
children 1e39f273ecd6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1 /*
986e461dc072 Initial revision
glantau
parents:
diff changeset
2 * MPEG1 encoder / MPEG2 decoder
429
718a22dc121f license/copyright change
glantau
parents: 401
diff changeset
3 * Copyright (c) 2000,2001 Fabrice Bellard.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4 *
429
718a22dc121f license/copyright change
glantau
parents: 401
diff changeset
5 * This library is free software; you can redistribute it and/or
718a22dc121f license/copyright change
glantau
parents: 401
diff changeset
6 * modify it under the terms of the GNU Lesser General Public
718a22dc121f license/copyright change
glantau
parents: 401
diff changeset
7 * License as published by the Free Software Foundation; either
718a22dc121f license/copyright change
glantau
parents: 401
diff changeset
8 * version 2 of the License, or (at your option) any later version.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
9 *
429
718a22dc121f license/copyright change
glantau
parents: 401
diff changeset
10 * This library is distributed in the hope that it will be useful,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
429
718a22dc121f license/copyright change
glantau
parents: 401
diff changeset
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
718a22dc121f license/copyright change
glantau
parents: 401
diff changeset
13 * Lesser General Public License for more details.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
14 *
429
718a22dc121f license/copyright change
glantau
parents: 401
diff changeset
15 * You should have received a copy of the GNU Lesser General Public
718a22dc121f license/copyright change
glantau
parents: 401
diff changeset
16 * License along with this library; if not, write to the Free Software
718a22dc121f license/copyright change
glantau
parents: 401
diff changeset
17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
18 */
76
0b09bd08ef4b win32 fixes
glantau
parents: 69
diff changeset
19 //#define DEBUG
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
20 #include "avcodec.h"
986e461dc072 Initial revision
glantau
parents:
diff changeset
21 #include "dsputil.h"
986e461dc072 Initial revision
glantau
parents:
diff changeset
22 #include "mpegvideo.h"
986e461dc072 Initial revision
glantau
parents:
diff changeset
23
986e461dc072 Initial revision
glantau
parents:
diff changeset
24 #include "mpeg12data.h"
986e461dc072 Initial revision
glantau
parents:
diff changeset
25
694
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
26 #if 1
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
27 #define PRINT_QP(a, b) {}
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
28 #else
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
29 #define PRINT_QP(a, b) printf(a, b)
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
30 #endif
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
31
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
32 /* Start codes. */
986e461dc072 Initial revision
glantau
parents:
diff changeset
33 #define SEQ_END_CODE 0x000001b7
986e461dc072 Initial revision
glantau
parents:
diff changeset
34 #define SEQ_START_CODE 0x000001b3
986e461dc072 Initial revision
glantau
parents:
diff changeset
35 #define GOP_START_CODE 0x000001b8
986e461dc072 Initial revision
glantau
parents:
diff changeset
36 #define PICTURE_START_CODE 0x00000100
986e461dc072 Initial revision
glantau
parents:
diff changeset
37 #define SLICE_MIN_START_CODE 0x00000101
986e461dc072 Initial revision
glantau
parents:
diff changeset
38 #define SLICE_MAX_START_CODE 0x000001af
986e461dc072 Initial revision
glantau
parents:
diff changeset
39 #define EXT_START_CODE 0x000001b5
986e461dc072 Initial revision
glantau
parents:
diff changeset
40 #define USER_START_CODE 0x000001b2
986e461dc072 Initial revision
glantau
parents:
diff changeset
41
552
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
42 #define DC_VLC_BITS 9
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
43 #define MV_VLC_BITS 9
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
44 #define MBINCR_VLC_BITS 9
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
45 #define MB_PAT_VLC_BITS 9
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
46 #define MB_PTYPE_VLC_BITS 6
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
47 #define MB_BTYPE_VLC_BITS 6
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
48 #define TEX_VLC_BITS 9
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
49
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
50 static void mpeg1_encode_block(MpegEncContext *s,
986e461dc072 Initial revision
glantau
parents:
diff changeset
51 DCTELEM *block,
986e461dc072 Initial revision
glantau
parents:
diff changeset
52 int component);
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
53 static void mpeg1_encode_motion(MpegEncContext *s, int val, int f_or_b_code); // RAL: f_code parameter added
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
54 static void mpeg1_skip_picture(MpegEncContext *s, int pict_num);
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
55 static inline int mpeg1_decode_block_inter(MpegEncContext *s,
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
56 DCTELEM *block,
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
57 int n);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
58 static inline int mpeg1_decode_block_intra(MpegEncContext *s,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
59 DCTELEM *block,
986e461dc072 Initial revision
glantau
parents:
diff changeset
60 int n);
714
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
61 static inline int mpeg2_decode_block_non_intra(MpegEncContext *s,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
62 DCTELEM *block,
986e461dc072 Initial revision
glantau
parents:
diff changeset
63 int n);
714
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
64 static inline int mpeg2_decode_block_intra(MpegEncContext *s,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
65 DCTELEM *block,
986e461dc072 Initial revision
glantau
parents:
diff changeset
66 int n);
986e461dc072 Initial revision
glantau
parents:
diff changeset
67 static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred);
986e461dc072 Initial revision
glantau
parents:
diff changeset
68
947
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
69 #ifdef CONFIG_ENCODERS
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
70 static uint16_t mv_penalty[MAX_FCODE+1][MAX_MV*2+1];
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
71 static uint8_t fcode_tab[MAX_MV*2+1];
281
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
72
947
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
73 static uint32_t uni_mpeg1_ac_vlc_bits[64*64*2];
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
74 static uint8_t uni_mpeg1_ac_vlc_len [64*64*2];
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
75 #endif
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
76
740
585c163c225a mpeg1 2pass encoding
michaelni
parents: 718
diff changeset
77 static inline int get_bits_diff(MpegEncContext *s){
585c163c225a mpeg1 2pass encoding
michaelni
parents: 718
diff changeset
78 int bits,ret;
585c163c225a mpeg1 2pass encoding
michaelni
parents: 718
diff changeset
79
585c163c225a mpeg1 2pass encoding
michaelni
parents: 718
diff changeset
80 bits= get_bit_count(&s->pb);
585c163c225a mpeg1 2pass encoding
michaelni
parents: 718
diff changeset
81 ret= bits - s->last_bits;
585c163c225a mpeg1 2pass encoding
michaelni
parents: 718
diff changeset
82 s->last_bits=bits;
585c163c225a mpeg1 2pass encoding
michaelni
parents: 718
diff changeset
83
585c163c225a mpeg1 2pass encoding
michaelni
parents: 718
diff changeset
84 return ret;
585c163c225a mpeg1 2pass encoding
michaelni
parents: 718
diff changeset
85 }
585c163c225a mpeg1 2pass encoding
michaelni
parents: 718
diff changeset
86
552
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
87 static void init_2d_vlc_rl(RLTable *rl)
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
88 {
620
a5aa53b6e648 warning patch by (Dominik Mierzejewski <dominik at rangers dot eu dot org>)
michaelni
parents: 617
diff changeset
89 int i;
552
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
90
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
91 init_vlc(&rl->vlc, TEX_VLC_BITS, rl->n + 2,
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
92 &rl->table_vlc[0][1], 4, 2,
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
93 &rl->table_vlc[0][0], 4, 2);
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
94
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
95
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
96 rl->rl_vlc[0]= av_malloc(rl->vlc.table_size*sizeof(RL_VLC_ELEM));
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
97 for(i=0; i<rl->vlc.table_size; i++){
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
98 int code= rl->vlc.table[i][0];
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
99 int len = rl->vlc.table[i][1];
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
100 int level, run;
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
101
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
102 if(len==0){ // illegal code
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
103 run= 65;
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
104 level= MAX_LEVEL;
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
105 }else if(len<0){ //more bits needed
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
106 run= 0;
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
107 level= code;
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
108 }else{
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
109 if(code==rl->n){ //esc
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
110 run= 65;
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
111 level= 0;
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
112 }else if(code==rl->n+1){ //eob
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
113 run= 0;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
114 level= 127;
552
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
115 }else{
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
116 run= rl->table_run [code] + 1;
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
117 level= rl->table_level[code];
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
118 }
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
119 }
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
120 rl->rl_vlc[0][i].len= len;
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
121 rl->rl_vlc[0][i].level= level;
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
122 rl->rl_vlc[0][i].run= run;
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
123 }
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
124 }
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
125
947
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
126 static void init_uni_ac_vlc(RLTable *rl, uint32_t *uni_ac_vlc_bits, uint8_t *uni_ac_vlc_len){
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
127 int i;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
128
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
129 for(i=0; i<128; i++){
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
130 int level= i-64;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
131 int run;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
132 for(run=0; run<64; run++){
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
133 int len, bits, code;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
134
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
135 int alevel= ABS(level);
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
136 int sign= (level>>31)&1;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
137
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
138 if (alevel > rl->max_level[0][run])
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
139 code= 111; /*rl->n*/
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
140 else
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
141 code= rl->index_run[0][run] + alevel - 1;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
142
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
143 if (code < 111 /* rl->n */) {
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
144 /* store the vlc & sign at once */
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
145 len= mpeg1_vlc[code][1]+1;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
146 bits= (mpeg1_vlc[code][0]<<1) + sign;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
147 } else {
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
148 len= mpeg1_vlc[111/*rl->n*/][1]+6;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
149 bits= mpeg1_vlc[111/*rl->n*/][0]<<6;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
150
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
151 bits|= run;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
152 if (alevel < 128) {
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
153 bits<<=8; len+=8;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
154 bits|= level & 0xff;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
155 } else {
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
156 bits<<=16; len+=16;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
157 bits|= level & 0xff;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
158 if (level < 0) {
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
159 bits|= 0x8001 + level + 255;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
160 } else {
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
161 bits|= level & 0xffff;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
162 }
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
163 }
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
164 }
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
165
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
166 uni_ac_vlc_bits[UNI_AC_ENC_INDEX(run, i)]= bits;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
167 uni_ac_vlc_len [UNI_AC_ENC_INDEX(run, i)]= len;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
168 }
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
169 }
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
170 }
552
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
171
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
172 static void put_header(MpegEncContext *s, int header)
986e461dc072 Initial revision
glantau
parents:
diff changeset
173 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
174 align_put_bits(&s->pb);
236
4a090f1da60a optimize mpeg1_encode_block()
michaelni
parents: 76
diff changeset
175 put_bits(&s->pb, 16, header>>16);
4a090f1da60a optimize mpeg1_encode_block()
michaelni
parents: 76
diff changeset
176 put_bits(&s->pb, 16, header&0xFFFF);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
177 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
178
986e461dc072 Initial revision
glantau
parents:
diff changeset
179 /* put sequence header if needed */
986e461dc072 Initial revision
glantau
parents:
diff changeset
180 static void mpeg1_encode_sequence_header(MpegEncContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
181 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
182 unsigned int vbv_buffer_size;
1
383bfb30fc84 fixed unsigned pb
glantau
parents: 0
diff changeset
183 unsigned int fps, v;
918
f9e54ade14a1 aspect ratio encoding for mpeg1
michaelni
parents: 917
diff changeset
184 int n, i;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
185 uint64_t time_code;
918
f9e54ade14a1 aspect ratio encoding for mpeg1
michaelni
parents: 917
diff changeset
186 float best_aspect_error= 1E10;
f9e54ade14a1 aspect ratio encoding for mpeg1
michaelni
parents: 917
diff changeset
187 float aspect_ratio= s->avctx->aspect_ratio;
f9e54ade14a1 aspect ratio encoding for mpeg1
michaelni
parents: 917
diff changeset
188
f9e54ade14a1 aspect ratio encoding for mpeg1
michaelni
parents: 917
diff changeset
189 if(aspect_ratio==0.0) aspect_ratio= s->width / (float)s->height; //pixel aspect 1:1 (VGA)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
190
903
22ee74da2cd3 cleanup
michaelni
parents: 890
diff changeset
191 if (s->current_picture.key_frame) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
192 /* mpeg1 header repeated every gop */
986e461dc072 Initial revision
glantau
parents:
diff changeset
193 put_header(s, SEQ_START_CODE);
986e461dc072 Initial revision
glantau
parents:
diff changeset
194
986e461dc072 Initial revision
glantau
parents:
diff changeset
195 /* search closest frame rate */
986e461dc072 Initial revision
glantau
parents:
diff changeset
196 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
197 int i, dmin, d;
986e461dc072 Initial revision
glantau
parents:
diff changeset
198 s->frame_rate_index = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
199 dmin = 0x7fffffff;
986e461dc072 Initial revision
glantau
parents:
diff changeset
200 for(i=1;i<9;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
201 d = abs(s->frame_rate - frame_rate_tab[i]);
986e461dc072 Initial revision
glantau
parents:
diff changeset
202 if (d < dmin) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
203 dmin = d;
986e461dc072 Initial revision
glantau
parents:
diff changeset
204 s->frame_rate_index = i;
986e461dc072 Initial revision
glantau
parents:
diff changeset
205 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
206 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
207 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
208
986e461dc072 Initial revision
glantau
parents:
diff changeset
209 put_bits(&s->pb, 12, s->width);
986e461dc072 Initial revision
glantau
parents:
diff changeset
210 put_bits(&s->pb, 12, s->height);
918
f9e54ade14a1 aspect ratio encoding for mpeg1
michaelni
parents: 917
diff changeset
211
f9e54ade14a1 aspect ratio encoding for mpeg1
michaelni
parents: 917
diff changeset
212 for(i=1; i<15; i++){
f9e54ade14a1 aspect ratio encoding for mpeg1
michaelni
parents: 917
diff changeset
213 float error= mpeg1_aspect[i] - s->width/(s->height*aspect_ratio);
f9e54ade14a1 aspect ratio encoding for mpeg1
michaelni
parents: 917
diff changeset
214 error= ABS(error);
f9e54ade14a1 aspect ratio encoding for mpeg1
michaelni
parents: 917
diff changeset
215
f9e54ade14a1 aspect ratio encoding for mpeg1
michaelni
parents: 917
diff changeset
216 if(error < best_aspect_error){
f9e54ade14a1 aspect ratio encoding for mpeg1
michaelni
parents: 917
diff changeset
217 best_aspect_error= error;
f9e54ade14a1 aspect ratio encoding for mpeg1
michaelni
parents: 917
diff changeset
218 s->aspect_ratio_info= i;
f9e54ade14a1 aspect ratio encoding for mpeg1
michaelni
parents: 917
diff changeset
219 }
f9e54ade14a1 aspect ratio encoding for mpeg1
michaelni
parents: 917
diff changeset
220 }
f9e54ade14a1 aspect ratio encoding for mpeg1
michaelni
parents: 917
diff changeset
221
f9e54ade14a1 aspect ratio encoding for mpeg1
michaelni
parents: 917
diff changeset
222 put_bits(&s->pb, 4, s->aspect_ratio_info);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
223 put_bits(&s->pb, 4, s->frame_rate_index);
986e461dc072 Initial revision
glantau
parents:
diff changeset
224 v = s->bit_rate / 400;
986e461dc072 Initial revision
glantau
parents:
diff changeset
225 if (v > 0x3ffff)
986e461dc072 Initial revision
glantau
parents:
diff changeset
226 v = 0x3ffff;
986e461dc072 Initial revision
glantau
parents:
diff changeset
227 put_bits(&s->pb, 18, v);
986e461dc072 Initial revision
glantau
parents:
diff changeset
228 put_bits(&s->pb, 1, 1); /* marker */
639
f449913e8419 new vbv calculation patch by (Henry Mason <talus25 at speakeasy dot net>) with slight modification by me
michaelni
parents: 620
diff changeset
229
f449913e8419 new vbv calculation patch by (Henry Mason <talus25 at speakeasy dot net>) with slight modification by me
michaelni
parents: 620
diff changeset
230 if(s->avctx->rc_buffer_size)
f449913e8419 new vbv calculation patch by (Henry Mason <talus25 at speakeasy dot net>) with slight modification by me
michaelni
parents: 620
diff changeset
231 vbv_buffer_size = s->avctx->rc_buffer_size;
f449913e8419 new vbv calculation patch by (Henry Mason <talus25 at speakeasy dot net>) with slight modification by me
michaelni
parents: 620
diff changeset
232 else
f449913e8419 new vbv calculation patch by (Henry Mason <talus25 at speakeasy dot net>) with slight modification by me
michaelni
parents: 620
diff changeset
233 /* VBV calculation: Scaled so that a VCD has the proper VBV size of 40 kilobytes */
f449913e8419 new vbv calculation patch by (Henry Mason <talus25 at speakeasy dot net>) with slight modification by me
michaelni
parents: 620
diff changeset
234 vbv_buffer_size = (( 20 * s->bit_rate) / (1151929 / 2)) * 8 * 1024;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
235 put_bits(&s->pb, 10, (vbv_buffer_size + 16383) / 16384);
986e461dc072 Initial revision
glantau
parents:
diff changeset
236 put_bits(&s->pb, 1, 1); /* constrained parameter flag */
986e461dc072 Initial revision
glantau
parents:
diff changeset
237 put_bits(&s->pb, 1, 0); /* no custom intra matrix */
986e461dc072 Initial revision
glantau
parents:
diff changeset
238 put_bits(&s->pb, 1, 0); /* no custom non intra matrix */
986e461dc072 Initial revision
glantau
parents:
diff changeset
239
986e461dc072 Initial revision
glantau
parents:
diff changeset
240 put_header(s, GOP_START_CODE);
986e461dc072 Initial revision
glantau
parents:
diff changeset
241 put_bits(&s->pb, 1, 0); /* do drop frame */
986e461dc072 Initial revision
glantau
parents:
diff changeset
242 /* time code : we must convert from the real frame rate to a
986e461dc072 Initial revision
glantau
parents:
diff changeset
243 fake mpeg frame rate in case of low frame rate */
986e461dc072 Initial revision
glantau
parents:
diff changeset
244 fps = frame_rate_tab[s->frame_rate_index];
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
245 time_code = (int64_t)s->fake_picture_number * FRAME_RATE_BASE;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
246 s->gop_picture_number = s->fake_picture_number;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
247 put_bits(&s->pb, 5, (uint32_t)((time_code / (fps * 3600)) % 24));
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
248 put_bits(&s->pb, 6, (uint32_t)((time_code / (fps * 60)) % 60));
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
249 put_bits(&s->pb, 1, 1);
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
250 put_bits(&s->pb, 6, (uint32_t)((time_code / fps) % 60));
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
251 put_bits(&s->pb, 6, (uint32_t)((time_code % fps) / FRAME_RATE_BASE));
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
252 put_bits(&s->pb, 1, 1); /* closed gop */
986e461dc072 Initial revision
glantau
parents:
diff changeset
253 put_bits(&s->pb, 1, 0); /* broken link */
986e461dc072 Initial revision
glantau
parents:
diff changeset
254 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
255
986e461dc072 Initial revision
glantau
parents:
diff changeset
256 if (s->frame_rate < (24 * FRAME_RATE_BASE) && s->picture_number > 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
257 /* insert empty P pictures to slow down to the desired
986e461dc072 Initial revision
glantau
parents:
diff changeset
258 frame rate. Each fake pictures takes about 20 bytes */
986e461dc072 Initial revision
glantau
parents:
diff changeset
259 fps = frame_rate_tab[s->frame_rate_index];
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
260 n = (((int64_t)s->picture_number * fps) / s->frame_rate) - 1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
261 while (s->fake_picture_number < n) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
262 mpeg1_skip_picture(s, s->fake_picture_number -
986e461dc072 Initial revision
glantau
parents:
diff changeset
263 s->gop_picture_number);
986e461dc072 Initial revision
glantau
parents:
diff changeset
264 s->fake_picture_number++;
986e461dc072 Initial revision
glantau
parents:
diff changeset
265 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
266
986e461dc072 Initial revision
glantau
parents:
diff changeset
267 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
268 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
269
986e461dc072 Initial revision
glantau
parents:
diff changeset
270
986e461dc072 Initial revision
glantau
parents:
diff changeset
271 /* insert a fake P picture */
986e461dc072 Initial revision
glantau
parents:
diff changeset
272 static void mpeg1_skip_picture(MpegEncContext *s, int pict_num)
986e461dc072 Initial revision
glantau
parents:
diff changeset
273 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
274 unsigned int mb_incr;
986e461dc072 Initial revision
glantau
parents:
diff changeset
275
986e461dc072 Initial revision
glantau
parents:
diff changeset
276 /* mpeg1 picture header */
986e461dc072 Initial revision
glantau
parents:
diff changeset
277 put_header(s, PICTURE_START_CODE);
986e461dc072 Initial revision
glantau
parents:
diff changeset
278 /* temporal reference */
986e461dc072 Initial revision
glantau
parents:
diff changeset
279 put_bits(&s->pb, 10, pict_num & 0x3ff);
986e461dc072 Initial revision
glantau
parents:
diff changeset
280
986e461dc072 Initial revision
glantau
parents:
diff changeset
281 put_bits(&s->pb, 3, P_TYPE);
986e461dc072 Initial revision
glantau
parents:
diff changeset
282 put_bits(&s->pb, 16, 0xffff); /* non constant bit rate */
986e461dc072 Initial revision
glantau
parents:
diff changeset
283
986e461dc072 Initial revision
glantau
parents:
diff changeset
284 put_bits(&s->pb, 1, 1); /* integer coordinates */
986e461dc072 Initial revision
glantau
parents:
diff changeset
285 put_bits(&s->pb, 3, 1); /* forward_f_code */
986e461dc072 Initial revision
glantau
parents:
diff changeset
286
986e461dc072 Initial revision
glantau
parents:
diff changeset
287 put_bits(&s->pb, 1, 0); /* extra bit picture */
986e461dc072 Initial revision
glantau
parents:
diff changeset
288
986e461dc072 Initial revision
glantau
parents:
diff changeset
289 /* only one slice */
986e461dc072 Initial revision
glantau
parents:
diff changeset
290 put_header(s, SLICE_MIN_START_CODE);
986e461dc072 Initial revision
glantau
parents:
diff changeset
291 put_bits(&s->pb, 5, 1); /* quantizer scale */
986e461dc072 Initial revision
glantau
parents:
diff changeset
292 put_bits(&s->pb, 1, 0); /* slice extra information */
986e461dc072 Initial revision
glantau
parents:
diff changeset
293
986e461dc072 Initial revision
glantau
parents:
diff changeset
294 mb_incr = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
295 put_bits(&s->pb, mbAddrIncrTable[mb_incr - 1][1],
986e461dc072 Initial revision
glantau
parents:
diff changeset
296 mbAddrIncrTable[mb_incr - 1][0]);
986e461dc072 Initial revision
glantau
parents:
diff changeset
297
986e461dc072 Initial revision
glantau
parents:
diff changeset
298 /* empty macroblock */
986e461dc072 Initial revision
glantau
parents:
diff changeset
299 put_bits(&s->pb, 3, 1); /* motion only */
986e461dc072 Initial revision
glantau
parents:
diff changeset
300
986e461dc072 Initial revision
glantau
parents:
diff changeset
301 /* zero motion x & y */
986e461dc072 Initial revision
glantau
parents:
diff changeset
302 put_bits(&s->pb, 1, 1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
303 put_bits(&s->pb, 1, 1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
304
986e461dc072 Initial revision
glantau
parents:
diff changeset
305 /* output a number of empty slice */
986e461dc072 Initial revision
glantau
parents:
diff changeset
306 mb_incr = s->mb_width * s->mb_height - 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
307 while (mb_incr > 33) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
308 put_bits(&s->pb, 11, 0x008);
986e461dc072 Initial revision
glantau
parents:
diff changeset
309 mb_incr -= 33;
986e461dc072 Initial revision
glantau
parents:
diff changeset
310 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
311 put_bits(&s->pb, mbAddrIncrTable[mb_incr - 1][1],
986e461dc072 Initial revision
glantau
parents:
diff changeset
312 mbAddrIncrTable[mb_incr - 1][0]);
986e461dc072 Initial revision
glantau
parents:
diff changeset
313
986e461dc072 Initial revision
glantau
parents:
diff changeset
314 /* empty macroblock */
986e461dc072 Initial revision
glantau
parents:
diff changeset
315 put_bits(&s->pb, 3, 1); /* motion only */
986e461dc072 Initial revision
glantau
parents:
diff changeset
316
986e461dc072 Initial revision
glantau
parents:
diff changeset
317 /* zero motion x & y */
986e461dc072 Initial revision
glantau
parents:
diff changeset
318 put_bits(&s->pb, 1, 1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
319 put_bits(&s->pb, 1, 1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
320 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
321
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
322 static void common_init(MpegEncContext *s)
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
323 {
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
324 s->y_dc_scale_table=
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
325 s->c_dc_scale_table= ff_mpeg1_dc_scale_table;
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
326 }
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
327
1070
6da5ae9ee199 more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents: 1064
diff changeset
328 #ifdef CONFIG_ENCODERS
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
329 void mpeg1_encode_picture_header(MpegEncContext *s, int picture_number)
986e461dc072 Initial revision
glantau
parents:
diff changeset
330 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
331 mpeg1_encode_sequence_header(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
332
986e461dc072 Initial revision
glantau
parents:
diff changeset
333 /* mpeg1 picture header */
986e461dc072 Initial revision
glantau
parents:
diff changeset
334 put_header(s, PICTURE_START_CODE);
986e461dc072 Initial revision
glantau
parents:
diff changeset
335 /* temporal reference */
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
336
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
337 // RAL: s->picture_number instead of s->fake_picture_number
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
338 put_bits(&s->pb, 10, (s->picture_number -
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
339 s->gop_picture_number) & 0x3ff);
276
1e2f9ef286d4 - Fix pts calculation on mpeg mux (A/V sync) - Thanks to Lennert Buytenhek
pulento
parents: 275
diff changeset
340 s->fake_picture_number++;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
341
986e461dc072 Initial revision
glantau
parents:
diff changeset
342 put_bits(&s->pb, 3, s->pict_type);
986e461dc072 Initial revision
glantau
parents:
diff changeset
343 put_bits(&s->pb, 16, 0xffff); /* non constant bit rate */
986e461dc072 Initial revision
glantau
parents:
diff changeset
344
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
345 // RAL: Forward f_code also needed for B frames
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
346 if (s->pict_type == P_TYPE || s->pict_type == B_TYPE) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
347 put_bits(&s->pb, 1, 0); /* half pel coordinates */
986e461dc072 Initial revision
glantau
parents:
diff changeset
348 put_bits(&s->pb, 3, s->f_code); /* forward_f_code */
986e461dc072 Initial revision
glantau
parents:
diff changeset
349 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
350
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
351 // RAL: Backward f_code necessary for B frames
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
352 if (s->pict_type == B_TYPE) {
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
353 put_bits(&s->pb, 1, 0); /* half pel coordinates */
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
354 put_bits(&s->pb, 3, s->b_code); /* backward_f_code */
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
355 }
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
356
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
357 put_bits(&s->pb, 1, 0); /* extra bit picture */
986e461dc072 Initial revision
glantau
parents:
diff changeset
358
986e461dc072 Initial revision
glantau
parents:
diff changeset
359 /* only one slice */
986e461dc072 Initial revision
glantau
parents:
diff changeset
360 put_header(s, SLICE_MIN_START_CODE);
986e461dc072 Initial revision
glantau
parents:
diff changeset
361 put_bits(&s->pb, 5, s->qscale); /* quantizer scale */
986e461dc072 Initial revision
glantau
parents:
diff changeset
362 put_bits(&s->pb, 1, 0); /* slice extra information */
986e461dc072 Initial revision
glantau
parents:
diff changeset
363 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
364
986e461dc072 Initial revision
glantau
parents:
diff changeset
365 void mpeg1_encode_mb(MpegEncContext *s,
986e461dc072 Initial revision
glantau
parents:
diff changeset
366 DCTELEM block[6][64],
986e461dc072 Initial revision
glantau
parents:
diff changeset
367 int motion_x, int motion_y)
986e461dc072 Initial revision
glantau
parents:
diff changeset
368 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
369 int mb_incr, i, cbp, mb_x, mb_y;
986e461dc072 Initial revision
glantau
parents:
diff changeset
370
986e461dc072 Initial revision
glantau
parents:
diff changeset
371 mb_x = s->mb_x;
986e461dc072 Initial revision
glantau
parents:
diff changeset
372 mb_y = s->mb_y;
986e461dc072 Initial revision
glantau
parents:
diff changeset
373
986e461dc072 Initial revision
glantau
parents:
diff changeset
374 /* compute cbp */
986e461dc072 Initial revision
glantau
parents:
diff changeset
375 cbp = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
376 for(i=0;i<6;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
377 if (s->block_last_index[i] >= 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
378 cbp |= 1 << (5 - i);
986e461dc072 Initial revision
glantau
parents:
diff changeset
379 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
380
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
381 // RAL: Skipped macroblocks for B frames...
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
382 if (cbp == 0 && (!((mb_x | mb_y) == 0 || (mb_x == s->mb_width - 1 && mb_y == s->mb_height - 1))) &&
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
383 ((s->pict_type == P_TYPE && (motion_x | motion_y) == 0) ||
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
384 (s->pict_type == B_TYPE && s->mv_dir == s->last_mv_dir && (((s->mv_dir & MV_DIR_FORWARD) ? ((s->mv[0][0][0] - s->last_mv[0][0][0])|(s->mv[0][0][1] - s->last_mv[0][0][1])) : 0) |
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
385 ((s->mv_dir & MV_DIR_BACKWARD) ? ((s->mv[1][0][0] - s->last_mv[1][0][0])|(s->mv[1][0][1] - s->last_mv[1][0][1])) : 0)) == 0))) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
386 s->mb_incr++;
694
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
387 s->qscale -= s->dquant;
740
585c163c225a mpeg1 2pass encoding
michaelni
parents: 718
diff changeset
388 s->skip_count++;
585c163c225a mpeg1 2pass encoding
michaelni
parents: 718
diff changeset
389 s->misc_bits++;
585c163c225a mpeg1 2pass encoding
michaelni
parents: 718
diff changeset
390 s->last_bits++;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
391 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
392 /* output mb incr */
986e461dc072 Initial revision
glantau
parents:
diff changeset
393 mb_incr = s->mb_incr;
986e461dc072 Initial revision
glantau
parents:
diff changeset
394
986e461dc072 Initial revision
glantau
parents:
diff changeset
395 while (mb_incr > 33) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
396 put_bits(&s->pb, 11, 0x008);
986e461dc072 Initial revision
glantau
parents:
diff changeset
397 mb_incr -= 33;
986e461dc072 Initial revision
glantau
parents:
diff changeset
398 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
399 put_bits(&s->pb, mbAddrIncrTable[mb_incr - 1][1],
986e461dc072 Initial revision
glantau
parents:
diff changeset
400 mbAddrIncrTable[mb_incr - 1][0]);
986e461dc072 Initial revision
glantau
parents:
diff changeset
401
986e461dc072 Initial revision
glantau
parents:
diff changeset
402 if (s->pict_type == I_TYPE) {
694
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
403 if(s->dquant && cbp){
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
404 put_bits(&s->pb, 2, 1); /* macroblock_type : macroblock_quant = 1 */
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
405 put_bits(&s->pb, 5, s->qscale);
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
406 }else{
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
407 put_bits(&s->pb, 1, 1); /* macroblock_type : macroblock_quant = 0 */
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
408 s->qscale -= s->dquant;
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
409 }
740
585c163c225a mpeg1 2pass encoding
michaelni
parents: 718
diff changeset
410 s->misc_bits+= get_bits_diff(s);
585c163c225a mpeg1 2pass encoding
michaelni
parents: 718
diff changeset
411 s->i_count++;
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
412 } else if (s->mb_intra) {
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
413 if(s->dquant && cbp){
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
414 put_bits(&s->pb, 6, 0x01);
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
415 put_bits(&s->pb, 5, s->qscale);
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
416 }else{
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
417 put_bits(&s->pb, 5, 0x03);
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
418 s->qscale -= s->dquant;
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
419 }
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
420 s->misc_bits+= get_bits_diff(s);
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
421 s->i_count++;
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
422 s->last_mv[0][0][0] =
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
423 s->last_mv[0][0][1] = 0;
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
424 } else if (s->pict_type == P_TYPE) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
425 if (cbp != 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
426 if (motion_x == 0 && motion_y == 0) {
694
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
427 if(s->dquant){
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
428 put_bits(&s->pb, 5, 1); /* macroblock_pattern & quant */
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
429 put_bits(&s->pb, 5, s->qscale);
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
430 }else{
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
431 put_bits(&s->pb, 2, 1); /* macroblock_pattern only */
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
432 }
740
585c163c225a mpeg1 2pass encoding
michaelni
parents: 718
diff changeset
433 s->misc_bits+= get_bits_diff(s);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
434 put_bits(&s->pb, mbPatTable[cbp - 1][1], mbPatTable[cbp - 1][0]);
986e461dc072 Initial revision
glantau
parents:
diff changeset
435 } else {
694
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
436 if(s->dquant){
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
437 put_bits(&s->pb, 5, 2); /* motion + cbp */
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
438 put_bits(&s->pb, 5, s->qscale);
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
439 }else{
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
440 put_bits(&s->pb, 1, 1); /* motion + cbp */
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
441 }
740
585c163c225a mpeg1 2pass encoding
michaelni
parents: 718
diff changeset
442 s->misc_bits+= get_bits_diff(s);
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
443 mpeg1_encode_motion(s, motion_x - s->last_mv[0][0][0], s->f_code); // RAL: f_code parameter added
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
444 mpeg1_encode_motion(s, motion_y - s->last_mv[0][0][1], s->f_code); // RAL: f_code parameter added
740
585c163c225a mpeg1 2pass encoding
michaelni
parents: 718
diff changeset
445 s->mv_bits+= get_bits_diff(s);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
446 put_bits(&s->pb, mbPatTable[cbp - 1][1], mbPatTable[cbp - 1][0]);
986e461dc072 Initial revision
glantau
parents:
diff changeset
447 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
448 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
449 put_bits(&s->pb, 3, 1); /* motion only */
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
450 mpeg1_encode_motion(s, motion_x - s->last_mv[0][0][0], s->f_code); // RAL: f_code parameter added
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
451 mpeg1_encode_motion(s, motion_y - s->last_mv[0][0][1], s->f_code); // RAL: f_code parameter added
694
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
452 s->qscale -= s->dquant;
740
585c163c225a mpeg1 2pass encoding
michaelni
parents: 718
diff changeset
453 s->mv_bits+= get_bits_diff(s);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
454 }
740
585c163c225a mpeg1 2pass encoding
michaelni
parents: 718
diff changeset
455 s->f_count++;
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
456 } else
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
457 { // RAL: All the following bloc added for B frames:
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
458 if (cbp != 0)
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
459 { // With coded bloc pattern
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
460 if (s->mv_dir == (MV_DIR_FORWARD | MV_DIR_BACKWARD))
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
461 { // Bi-directional motion
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
462 if (s->dquant)
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
463 { // With QScale
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
464 put_bits(&s->pb, 5, 2);
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
465 put_bits(&s->pb, 5, s->qscale);
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
466 }
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
467 else // Without QScale
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
468 put_bits(&s->pb, 2, 3);
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
469 s->misc_bits += get_bits_diff(s);
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
470 mpeg1_encode_motion(s, s->mv[0][0][0] - s->last_mv[0][0][0], s->f_code);
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
471 mpeg1_encode_motion(s, s->mv[0][0][1] - s->last_mv[0][0][1], s->f_code);
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
472 mpeg1_encode_motion(s, s->mv[1][0][0] - s->last_mv[1][0][0], s->b_code);
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
473 mpeg1_encode_motion(s, s->mv[1][0][1] - s->last_mv[1][0][1], s->b_code);
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
474 s->b_count++;
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
475 s->f_count++;
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
476 s->mv_bits += get_bits_diff(s);
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
477 put_bits(&s->pb, mbPatTable[cbp - 1][1], mbPatTable[cbp - 1][0]);
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
478 }
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
479 else if (s->mv_dir == MV_DIR_BACKWARD)
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
480 { // Backward motion
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
481 if (s->dquant)
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
482 { // With QScale
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
483 put_bits(&s->pb, 6, 2);
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
484 put_bits(&s->pb, 5, s->qscale);
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
485 }
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
486 else // Without QScale
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
487 put_bits(&s->pb, 3, 3);
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
488 s->misc_bits += get_bits_diff(s);
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
489 mpeg1_encode_motion(s, motion_x - s->last_mv[1][0][0], s->b_code);
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
490 mpeg1_encode_motion(s, motion_y - s->last_mv[1][0][1], s->b_code);
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
491 s->b_count++;
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
492 s->mv_bits += get_bits_diff(s);
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
493 put_bits(&s->pb, mbPatTable[cbp - 1][1], mbPatTable[cbp - 1][0]);
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
494 }
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
495 else if (s->mv_dir == MV_DIR_FORWARD)
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
496 { // Forward motion
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
497 if (s->dquant)
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
498 { // With QScale
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
499 put_bits(&s->pb, 6, 3);
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
500 put_bits(&s->pb, 5, s->qscale);
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
501 }
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
502 else // Without QScale
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
503 put_bits(&s->pb, 4, 3);
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
504 s->misc_bits += get_bits_diff(s);
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
505 mpeg1_encode_motion(s, motion_x - s->last_mv[0][0][0], s->f_code);
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
506 mpeg1_encode_motion(s, motion_y - s->last_mv[0][0][1], s->f_code);
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
507 s->f_count++;
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
508 s->mv_bits += get_bits_diff(s);
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
509 put_bits(&s->pb, mbPatTable[cbp - 1][1], mbPatTable[cbp - 1][0]);
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
510 }
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
511 }
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
512 else
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
513 { // No coded bloc pattern
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
514 if (s->mv_dir == (MV_DIR_FORWARD | MV_DIR_BACKWARD))
1070
6da5ae9ee199 more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents: 1064
diff changeset
515 { // Bi-directional motion
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
516 put_bits(&s->pb, 2, 2); /* backward & forward motion */
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
517 mpeg1_encode_motion(s, s->mv[0][0][0] - s->last_mv[0][0][0], s->f_code);
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
518 mpeg1_encode_motion(s, s->mv[0][0][1] - s->last_mv[0][0][1], s->f_code);
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
519 mpeg1_encode_motion(s, s->mv[1][0][0] - s->last_mv[1][0][0], s->b_code);
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
520 mpeg1_encode_motion(s, s->mv[1][0][1] - s->last_mv[1][0][1], s->b_code);
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
521 s->b_count++;
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
522 s->f_count++;
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
523 }
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
524 else if (s->mv_dir == MV_DIR_BACKWARD)
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
525 { // Backward motion
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
526 put_bits(&s->pb, 3, 2); /* backward motion only */
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
527 mpeg1_encode_motion(s, motion_x - s->last_mv[1][0][0], s->b_code);
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
528 mpeg1_encode_motion(s, motion_y - s->last_mv[1][0][1], s->b_code);
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
529 s->b_count++;
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
530 }
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
531 else if (s->mv_dir == MV_DIR_FORWARD)
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
532 { // Forward motion
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
533 put_bits(&s->pb, 4, 2); /* forward motion only */
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
534 mpeg1_encode_motion(s, motion_x - s->last_mv[0][0][0], s->f_code);
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
535 mpeg1_encode_motion(s, motion_y - s->last_mv[0][0][1], s->f_code);
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
536 s->f_count++;
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
537 }
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
538 s->qscale -= s->dquant;
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
539 s->mv_bits += get_bits_diff(s);
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
540 }
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
541 // End of bloc from RAL
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
542 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
543 for(i=0;i<6;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
544 if (cbp & (1 << (5 - i))) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
545 mpeg1_encode_block(s, block[i], i);
986e461dc072 Initial revision
glantau
parents:
diff changeset
546 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
547 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
548 s->mb_incr = 1;
740
585c163c225a mpeg1 2pass encoding
michaelni
parents: 718
diff changeset
549 if(s->mb_intra)
585c163c225a mpeg1 2pass encoding
michaelni
parents: 718
diff changeset
550 s->i_tex_bits+= get_bits_diff(s);
585c163c225a mpeg1 2pass encoding
michaelni
parents: 718
diff changeset
551 else
585c163c225a mpeg1 2pass encoding
michaelni
parents: 718
diff changeset
552 s->p_tex_bits+= get_bits_diff(s);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
553 }
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
554
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
555 // RAL: By this:
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
556 if (s->mv_dir & MV_DIR_FORWARD)
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
557 {
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
558 s->last_mv[0][0][0]= s->mv[0][0][0];
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
559 s->last_mv[0][0][1]= s->mv[0][0][1];
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
560 }
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
561 if (s->mv_dir & MV_DIR_BACKWARD)
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
562 {
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
563 s->last_mv[1][0][0]= s->mv[1][0][0];
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
564 s->last_mv[1][0][1]= s->mv[1][0][1];
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
565 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
566 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
567
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
568 // RAL: Parameter added: f_or_b_code
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
569 static void mpeg1_encode_motion(MpegEncContext *s, int val, int f_or_b_code)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
570 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
571 int code, bit_size, l, m, bits, range, sign;
986e461dc072 Initial revision
glantau
parents:
diff changeset
572
986e461dc072 Initial revision
glantau
parents:
diff changeset
573 if (val == 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
574 /* zero vector */
986e461dc072 Initial revision
glantau
parents:
diff changeset
575 code = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
576 put_bits(&s->pb,
986e461dc072 Initial revision
glantau
parents:
diff changeset
577 mbMotionVectorTable[0][1],
986e461dc072 Initial revision
glantau
parents:
diff changeset
578 mbMotionVectorTable[0][0]);
986e461dc072 Initial revision
glantau
parents:
diff changeset
579 } else {
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
580 bit_size = f_or_b_code - 1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
581 range = 1 << bit_size;
986e461dc072 Initial revision
glantau
parents:
diff changeset
582 /* modulo encoding */
986e461dc072 Initial revision
glantau
parents:
diff changeset
583 l = 16 * range;
986e461dc072 Initial revision
glantau
parents:
diff changeset
584 m = 2 * l;
986e461dc072 Initial revision
glantau
parents:
diff changeset
585 if (val < -l) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
586 val += m;
986e461dc072 Initial revision
glantau
parents:
diff changeset
587 } else if (val >= l) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
588 val -= m;
986e461dc072 Initial revision
glantau
parents:
diff changeset
589 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
590
986e461dc072 Initial revision
glantau
parents:
diff changeset
591 if (val >= 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
592 val--;
986e461dc072 Initial revision
glantau
parents:
diff changeset
593 code = (val >> bit_size) + 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
594 bits = val & (range - 1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
595 sign = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
596 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
597 val = -val;
986e461dc072 Initial revision
glantau
parents:
diff changeset
598 val--;
986e461dc072 Initial revision
glantau
parents:
diff changeset
599 code = (val >> bit_size) + 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
600 bits = val & (range - 1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
601 sign = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
602 }
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
603
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
604 assert(code > 0 && code <= 16);
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
605
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
606 put_bits(&s->pb,
986e461dc072 Initial revision
glantau
parents:
diff changeset
607 mbMotionVectorTable[code][1],
986e461dc072 Initial revision
glantau
parents:
diff changeset
608 mbMotionVectorTable[code][0]);
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
609
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
610 put_bits(&s->pb, 1, sign);
986e461dc072 Initial revision
glantau
parents:
diff changeset
611 if (bit_size > 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
612 put_bits(&s->pb, bit_size, bits);
986e461dc072 Initial revision
glantau
parents:
diff changeset
613 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
614 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
615 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
616
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
617 void ff_mpeg1_encode_init(MpegEncContext *s)
281
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
618 {
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
619 static int done=0;
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
620
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
621 common_init(s);
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
622
281
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
623 if(!done){
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
624 int f_code;
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
625 int mv;
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
626 int i;
281
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
627
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
628 done=1;
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
629 init_rl(&rl_mpeg1);
947
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
630
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
631 for(i=0; i<64; i++)
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
632 {
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
633 mpeg1_max_level[0][i]= rl_mpeg1.max_level[0][i];
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
634 mpeg1_index_run[0][i]= rl_mpeg1.index_run[0][i];
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
635 }
947
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
636
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
637 init_uni_ac_vlc(&rl_mpeg1, uni_mpeg1_ac_vlc_bits, uni_mpeg1_ac_vlc_len);
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
638
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
639 /* build unified dc encoding tables */
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
640 for(i=-255; i<256; i++)
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
641 {
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
642 int adiff, index;
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
643 int bits, code;
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
644 int diff=i;
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
645
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
646 adiff = ABS(diff);
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
647 if(diff<0) diff--;
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
648 index = vlc_dc_table[adiff];
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
649
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
650 bits= vlc_dc_lum_bits[index] + index;
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
651 code= (vlc_dc_lum_code[index]<<index) + (diff & ((1 << index) - 1));
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
652 mpeg1_lum_dc_uni[i+255]= bits + (code<<8);
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
653
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
654 bits= vlc_dc_chroma_bits[index] + index;
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
655 code= (vlc_dc_chroma_code[index]<<index) + (diff & ((1 << index) - 1));
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
656 mpeg1_chr_dc_uni[i+255]= bits + (code<<8);
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
657 }
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
658
281
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
659 for(f_code=1; f_code<=MAX_FCODE; f_code++){
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
660 for(mv=-MAX_MV; mv<=MAX_MV; mv++){
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
661 int len;
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
662
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
663 if(mv==0) len= mbMotionVectorTable[0][1];
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
664 else{
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
665 int val, bit_size, range, code;
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
666
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
667 bit_size = s->f_code - 1;
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
668 range = 1 << bit_size;
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
669
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
670 val=mv;
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
671 if (val < 0)
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
672 val = -val;
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
673 val--;
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
674 code = (val >> bit_size) + 1;
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
675 if(code<17){
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
676 len= mbMotionVectorTable[code][1] + 1 + bit_size;
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
677 }else{
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
678 len= mbMotionVectorTable[16][1] + 2 + bit_size;
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
679 }
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
680 }
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
681
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
682 mv_penalty[f_code][mv+MAX_MV]= len;
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
683 }
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
684 }
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
685
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
686
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
687 for(f_code=MAX_FCODE; f_code>0; f_code--){
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
688 for(mv=-(8<<f_code); mv<(8<<f_code); mv++){
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
689 fcode_tab[mv+MAX_MV]= f_code;
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
690 }
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
691 }
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
692 }
936
caa77cd960c0 qpel encoding
michaelni
parents: 933
diff changeset
693 s->me.mv_penalty= mv_penalty;
281
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
694 s->fcode_tab= fcode_tab;
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 313
diff changeset
695 s->min_qcoeff=-255;
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 313
diff changeset
696 s->max_qcoeff= 255;
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 313
diff changeset
697 s->intra_quant_bias= 3<<(QUANT_BIAS_SHIFT-3); //(a + x*3/8)/x
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 313
diff changeset
698 s->inter_quant_bias= 0;
947
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
699 s->intra_ac_vlc_length=
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
700 s->inter_ac_vlc_length= uni_mpeg1_ac_vlc_len;
281
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
701 }
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
702
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
703 static inline void encode_dc(MpegEncContext *s, int diff, int component)
986e461dc072 Initial revision
glantau
parents:
diff changeset
704 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
705 if (component == 0) {
237
75123d30f862 optimized encode_dc() (+2% speed on P3 for mpeg1 intra only encodings)
michaelni
parents: 236
diff changeset
706 put_bits(
75123d30f862 optimized encode_dc() (+2% speed on P3 for mpeg1 intra only encodings)
michaelni
parents: 236
diff changeset
707 &s->pb,
75123d30f862 optimized encode_dc() (+2% speed on P3 for mpeg1 intra only encodings)
michaelni
parents: 236
diff changeset
708 mpeg1_lum_dc_uni[diff+255]&0xFF,
75123d30f862 optimized encode_dc() (+2% speed on P3 for mpeg1 intra only encodings)
michaelni
parents: 236
diff changeset
709 mpeg1_lum_dc_uni[diff+255]>>8);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
710 } else {
237
75123d30f862 optimized encode_dc() (+2% speed on P3 for mpeg1 intra only encodings)
michaelni
parents: 236
diff changeset
711 put_bits(
75123d30f862 optimized encode_dc() (+2% speed on P3 for mpeg1 intra only encodings)
michaelni
parents: 236
diff changeset
712 &s->pb,
75123d30f862 optimized encode_dc() (+2% speed on P3 for mpeg1 intra only encodings)
michaelni
parents: 236
diff changeset
713 mpeg1_chr_dc_uni[diff+255]&0xFF,
75123d30f862 optimized encode_dc() (+2% speed on P3 for mpeg1 intra only encodings)
michaelni
parents: 236
diff changeset
714 mpeg1_chr_dc_uni[diff+255]>>8);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
715 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
716 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
717
986e461dc072 Initial revision
glantau
parents:
diff changeset
718 static void mpeg1_encode_block(MpegEncContext *s,
986e461dc072 Initial revision
glantau
parents:
diff changeset
719 DCTELEM *block,
986e461dc072 Initial revision
glantau
parents:
diff changeset
720 int n)
986e461dc072 Initial revision
glantau
parents:
diff changeset
721 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
722 int alevel, level, last_non_zero, dc, diff, i, j, run, last_index, sign;
986e461dc072 Initial revision
glantau
parents:
diff changeset
723 int code, component;
236
4a090f1da60a optimize mpeg1_encode_block()
michaelni
parents: 76
diff changeset
724 // RLTable *rl = &rl_mpeg1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
725
986e461dc072 Initial revision
glantau
parents:
diff changeset
726 last_index = s->block_last_index[n];
986e461dc072 Initial revision
glantau
parents:
diff changeset
727
986e461dc072 Initial revision
glantau
parents:
diff changeset
728 /* DC coef */
986e461dc072 Initial revision
glantau
parents:
diff changeset
729 if (s->mb_intra) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
730 component = (n <= 3 ? 0 : n - 4 + 1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
731 dc = block[0]; /* overflow is impossible */
986e461dc072 Initial revision
glantau
parents:
diff changeset
732 diff = dc - s->last_dc[component];
986e461dc072 Initial revision
glantau
parents:
diff changeset
733 encode_dc(s, diff, component);
986e461dc072 Initial revision
glantau
parents:
diff changeset
734 s->last_dc[component] = dc;
986e461dc072 Initial revision
glantau
parents:
diff changeset
735 i = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
736 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
737 /* encode the first coefficient : needs to be done here because
986e461dc072 Initial revision
glantau
parents:
diff changeset
738 it is handled slightly differently */
986e461dc072 Initial revision
glantau
parents:
diff changeset
739 level = block[0];
986e461dc072 Initial revision
glantau
parents:
diff changeset
740 if (abs(level) == 1) {
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
741 code = ((uint32_t)level >> 31); /* the sign bit */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
742 put_bits(&s->pb, 2, code | 0x02);
986e461dc072 Initial revision
glantau
parents:
diff changeset
743 i = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
744 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
745 i = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
746 last_non_zero = -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
747 goto next_coef;
986e461dc072 Initial revision
glantau
parents:
diff changeset
748 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
749 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
750
986e461dc072 Initial revision
glantau
parents:
diff changeset
751 /* now quantify & encode AC coefs */
986e461dc072 Initial revision
glantau
parents:
diff changeset
752 last_non_zero = i - 1;
236
4a090f1da60a optimize mpeg1_encode_block()
michaelni
parents: 76
diff changeset
753
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
754 for(;i<=last_index;i++) {
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 694
diff changeset
755 j = s->intra_scantable.permutated[i];
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
756 level = block[j];
986e461dc072 Initial revision
glantau
parents:
diff changeset
757 next_coef:
986e461dc072 Initial revision
glantau
parents:
diff changeset
758 #if 0
986e461dc072 Initial revision
glantau
parents:
diff changeset
759 if (level != 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
760 dprintf("level[%d]=%d\n", i, level);
986e461dc072 Initial revision
glantau
parents:
diff changeset
761 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
762 /* encode using VLC */
986e461dc072 Initial revision
glantau
parents:
diff changeset
763 if (level != 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
764 run = i - last_non_zero - 1;
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 694
diff changeset
765
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 694
diff changeset
766 alevel= level;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 694
diff changeset
767 MASK_ABS(sign, alevel)
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 694
diff changeset
768 sign&=1;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 694
diff changeset
769
236
4a090f1da60a optimize mpeg1_encode_block()
michaelni
parents: 76
diff changeset
770 // code = get_rl_index(rl, 0, run, alevel);
947
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
771 if (alevel <= mpeg1_max_level[0][run]){
236
4a090f1da60a optimize mpeg1_encode_block()
michaelni
parents: 76
diff changeset
772 code= mpeg1_index_run[0][run] + alevel - 1;
4a090f1da60a optimize mpeg1_encode_block()
michaelni
parents: 76
diff changeset
773 /* store the vlc & sign at once */
4a090f1da60a optimize mpeg1_encode_block()
michaelni
parents: 76
diff changeset
774 put_bits(&s->pb, mpeg1_vlc[code][1]+1, (mpeg1_vlc[code][0]<<1) + sign);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
775 } else {
236
4a090f1da60a optimize mpeg1_encode_block()
michaelni
parents: 76
diff changeset
776 /* escape seems to be pretty rare <5% so i dont optimize it */
4a090f1da60a optimize mpeg1_encode_block()
michaelni
parents: 76
diff changeset
777 put_bits(&s->pb, mpeg1_vlc[111/*rl->n*/][1], mpeg1_vlc[111/*rl->n*/][0]);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
778 /* escape: only clip in this case */
986e461dc072 Initial revision
glantau
parents:
diff changeset
779 put_bits(&s->pb, 6, run);
986e461dc072 Initial revision
glantau
parents:
diff changeset
780 if (alevel < 128) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
781 put_bits(&s->pb, 8, level & 0xff);
986e461dc072 Initial revision
glantau
parents:
diff changeset
782 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
783 if (level < 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
784 put_bits(&s->pb, 16, 0x8001 + level + 255);
986e461dc072 Initial revision
glantau
parents:
diff changeset
785 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
786 put_bits(&s->pb, 16, level & 0xffff);
986e461dc072 Initial revision
glantau
parents:
diff changeset
787 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
788 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
789 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
790 last_non_zero = i;
986e461dc072 Initial revision
glantau
parents:
diff changeset
791 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
792 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
793 /* end of block */
986e461dc072 Initial revision
glantau
parents:
diff changeset
794 put_bits(&s->pb, 2, 0x2);
986e461dc072 Initial revision
glantau
parents:
diff changeset
795 }
1070
6da5ae9ee199 more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents: 1064
diff changeset
796 #endif //CONFIG_ENCODERS
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
797
986e461dc072 Initial revision
glantau
parents:
diff changeset
798 /******************************************/
986e461dc072 Initial revision
glantau
parents:
diff changeset
799 /* decoding */
986e461dc072 Initial revision
glantau
parents:
diff changeset
800
986e461dc072 Initial revision
glantau
parents:
diff changeset
801 static VLC dc_lum_vlc;
986e461dc072 Initial revision
glantau
parents:
diff changeset
802 static VLC dc_chroma_vlc;
986e461dc072 Initial revision
glantau
parents:
diff changeset
803 static VLC mv_vlc;
986e461dc072 Initial revision
glantau
parents:
diff changeset
804 static VLC mbincr_vlc;
986e461dc072 Initial revision
glantau
parents:
diff changeset
805 static VLC mb_ptype_vlc;
986e461dc072 Initial revision
glantau
parents:
diff changeset
806 static VLC mb_btype_vlc;
986e461dc072 Initial revision
glantau
parents:
diff changeset
807 static VLC mb_pat_vlc;
986e461dc072 Initial revision
glantau
parents:
diff changeset
808
647
22b22723805e support decoding of the last mpeg "packet" even if no startcode is immedeatly afterwards (fixes bugs with mpeg in avi)
michaelni
parents: 639
diff changeset
809 static void init_vlcs(MpegEncContext *s)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
810 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
811 static int done = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
812
986e461dc072 Initial revision
glantau
parents:
diff changeset
813 if (!done) {
494
54b88078c361 fixed one mpeg decoder memory leak
bellard
parents: 486
diff changeset
814 done = 1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
815
568
7e7a7282608c hmm ABS(dc-diff) > 512 fix
michaelni
parents: 558
diff changeset
816 init_vlc(&dc_lum_vlc, DC_VLC_BITS, 12,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
817 vlc_dc_lum_bits, 1, 1,
986e461dc072 Initial revision
glantau
parents:
diff changeset
818 vlc_dc_lum_code, 2, 2);
568
7e7a7282608c hmm ABS(dc-diff) > 512 fix
michaelni
parents: 558
diff changeset
819 init_vlc(&dc_chroma_vlc, DC_VLC_BITS, 12,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
820 vlc_dc_chroma_bits, 1, 1,
986e461dc072 Initial revision
glantau
parents:
diff changeset
821 vlc_dc_chroma_code, 2, 2);
545
6df843af36cb optimization (get_vlc() -> get_vlc2())
michaelni
parents: 533
diff changeset
822 init_vlc(&mv_vlc, MV_VLC_BITS, 17,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
823 &mbMotionVectorTable[0][1], 2, 1,
986e461dc072 Initial revision
glantau
parents:
diff changeset
824 &mbMotionVectorTable[0][0], 2, 1);
545
6df843af36cb optimization (get_vlc() -> get_vlc2())
michaelni
parents: 533
diff changeset
825 init_vlc(&mbincr_vlc, MBINCR_VLC_BITS, 35,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
826 &mbAddrIncrTable[0][1], 2, 1,
986e461dc072 Initial revision
glantau
parents:
diff changeset
827 &mbAddrIncrTable[0][0], 2, 1);
545
6df843af36cb optimization (get_vlc() -> get_vlc2())
michaelni
parents: 533
diff changeset
828 init_vlc(&mb_pat_vlc, MB_PAT_VLC_BITS, 63,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
829 &mbPatTable[0][1], 2, 1,
986e461dc072 Initial revision
glantau
parents:
diff changeset
830 &mbPatTable[0][0], 2, 1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
831
545
6df843af36cb optimization (get_vlc() -> get_vlc2())
michaelni
parents: 533
diff changeset
832 init_vlc(&mb_ptype_vlc, MB_PTYPE_VLC_BITS, 32,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
833 &table_mb_ptype[0][1], 2, 1,
986e461dc072 Initial revision
glantau
parents:
diff changeset
834 &table_mb_ptype[0][0], 2, 1);
545
6df843af36cb optimization (get_vlc() -> get_vlc2())
michaelni
parents: 533
diff changeset
835 init_vlc(&mb_btype_vlc, MB_BTYPE_VLC_BITS, 32,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
836 &table_mb_btype[0][1], 2, 1,
986e461dc072 Initial revision
glantau
parents:
diff changeset
837 &table_mb_btype[0][0], 2, 1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
838 init_rl(&rl_mpeg1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
839 init_rl(&rl_mpeg2);
552
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
840
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
841 init_2d_vlc_rl(&rl_mpeg1);
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
842 init_2d_vlc_rl(&rl_mpeg2);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
843 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
844 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
845
986e461dc072 Initial revision
glantau
parents:
diff changeset
846 static inline int get_dmv(MpegEncContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
847 {
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
848 if(get_bits1(&s->gb))
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
849 return 1 - (get_bits1(&s->gb) << 1);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
850 else
986e461dc072 Initial revision
glantau
parents:
diff changeset
851 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
852 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
853
54
764f2eaf711e fixed mpeg2 qscale decoding
glantau
parents: 45
diff changeset
854 static inline int get_qscale(MpegEncContext *s)
764f2eaf711e fixed mpeg2 qscale decoding
glantau
parents: 45
diff changeset
855 {
764f2eaf711e fixed mpeg2 qscale decoding
glantau
parents: 45
diff changeset
856 int qscale;
764f2eaf711e fixed mpeg2 qscale decoding
glantau
parents: 45
diff changeset
857 if (s->mpeg2) {
764f2eaf711e fixed mpeg2 qscale decoding
glantau
parents: 45
diff changeset
858 if (s->q_scale_type) {
764f2eaf711e fixed mpeg2 qscale decoding
glantau
parents: 45
diff changeset
859 qscale = non_linear_qscale[get_bits(&s->gb, 5)];
764f2eaf711e fixed mpeg2 qscale decoding
glantau
parents: 45
diff changeset
860 } else {
764f2eaf711e fixed mpeg2 qscale decoding
glantau
parents: 45
diff changeset
861 qscale = get_bits(&s->gb, 5) << 1;
764f2eaf711e fixed mpeg2 qscale decoding
glantau
parents: 45
diff changeset
862 }
764f2eaf711e fixed mpeg2 qscale decoding
glantau
parents: 45
diff changeset
863 } else {
764f2eaf711e fixed mpeg2 qscale decoding
glantau
parents: 45
diff changeset
864 /* for mpeg1, we use the generic unquant code */
764f2eaf711e fixed mpeg2 qscale decoding
glantau
parents: 45
diff changeset
865 qscale = get_bits(&s->gb, 5);
764f2eaf711e fixed mpeg2 qscale decoding
glantau
parents: 45
diff changeset
866 }
764f2eaf711e fixed mpeg2 qscale decoding
glantau
parents: 45
diff changeset
867 return qscale;
764f2eaf711e fixed mpeg2 qscale decoding
glantau
parents: 45
diff changeset
868 }
764f2eaf711e fixed mpeg2 qscale decoding
glantau
parents: 45
diff changeset
869
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
870 /* motion type (for mpeg2) */
986e461dc072 Initial revision
glantau
parents:
diff changeset
871 #define MT_FIELD 1
986e461dc072 Initial revision
glantau
parents:
diff changeset
872 #define MT_FRAME 2
986e461dc072 Initial revision
glantau
parents:
diff changeset
873 #define MT_16X8 2
986e461dc072 Initial revision
glantau
parents:
diff changeset
874 #define MT_DMV 3
986e461dc072 Initial revision
glantau
parents:
diff changeset
875
986e461dc072 Initial revision
glantau
parents:
diff changeset
876 static int mpeg_decode_mb(MpegEncContext *s,
986e461dc072 Initial revision
glantau
parents:
diff changeset
877 DCTELEM block[6][64])
986e461dc072 Initial revision
glantau
parents:
diff changeset
878 {
751
cbe316f082bc warning fixes
michaelni
parents: 740
diff changeset
879 int i, j, k, cbp, val, mb_type, motion_type;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
880
986e461dc072 Initial revision
glantau
parents:
diff changeset
881 dprintf("decode_mb: x=%d y=%d\n", s->mb_x, s->mb_y);
986e461dc072 Initial revision
glantau
parents:
diff changeset
882
1021
2d7c9f5738de trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents: 947
diff changeset
883 assert(s->mb_skiped==0);
2d7c9f5738de trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents: 947
diff changeset
884
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
885 if (--s->mb_incr != 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
886 /* skip mb */
986e461dc072 Initial revision
glantau
parents:
diff changeset
887 s->mb_intra = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
888 for(i=0;i<6;i++)
986e461dc072 Initial revision
glantau
parents:
diff changeset
889 s->block_last_index[i] = -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
890 s->mv_type = MV_TYPE_16X16;
986e461dc072 Initial revision
glantau
parents:
diff changeset
891 if (s->pict_type == P_TYPE) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
892 /* if P type, zero motion vector is implied */
986e461dc072 Initial revision
glantau
parents:
diff changeset
893 s->mv_dir = MV_DIR_FORWARD;
986e461dc072 Initial revision
glantau
parents:
diff changeset
894 s->mv[0][0][0] = s->mv[0][0][1] = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
895 s->last_mv[0][0][0] = s->last_mv[0][0][1] = 0;
59
efd3c19f6d62 fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents: 58
diff changeset
896 s->last_mv[0][1][0] = s->last_mv[0][1][1] = 0;
1021
2d7c9f5738de trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents: 947
diff changeset
897 s->mb_skiped = 1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
898 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
899 /* if B type, reuse previous vectors and directions */
986e461dc072 Initial revision
glantau
parents:
diff changeset
900 s->mv[0][0][0] = s->last_mv[0][0][0];
986e461dc072 Initial revision
glantau
parents:
diff changeset
901 s->mv[0][0][1] = s->last_mv[0][0][1];
986e461dc072 Initial revision
glantau
parents:
diff changeset
902 s->mv[1][0][0] = s->last_mv[1][0][0];
986e461dc072 Initial revision
glantau
parents:
diff changeset
903 s->mv[1][0][1] = s->last_mv[1][0][1];
1021
2d7c9f5738de trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents: 947
diff changeset
904
2d7c9f5738de trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents: 947
diff changeset
905 if((s->mv[0][0][0]|s->mv[0][0][1]|s->mv[1][0][0]|s->mv[1][0][1])==0)
2d7c9f5738de trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents: 947
diff changeset
906 s->mb_skiped = 1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
907 }
930
6bcb214d6a17 more debug output
michaelni
parents: 925
diff changeset
908
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
909 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
910 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
911
986e461dc072 Initial revision
glantau
parents:
diff changeset
912 switch(s->pict_type) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
913 default:
986e461dc072 Initial revision
glantau
parents:
diff changeset
914 case I_TYPE:
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
915 if (get_bits1(&s->gb) == 0) {
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
916 if (get_bits1(&s->gb) == 0)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
917 return -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
918 mb_type = MB_QUANT | MB_INTRA;
986e461dc072 Initial revision
glantau
parents:
diff changeset
919 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
920 mb_type = MB_INTRA;
986e461dc072 Initial revision
glantau
parents:
diff changeset
921 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
922 break;
986e461dc072 Initial revision
glantau
parents:
diff changeset
923 case P_TYPE:
545
6df843af36cb optimization (get_vlc() -> get_vlc2())
michaelni
parents: 533
diff changeset
924 mb_type = get_vlc2(&s->gb, mb_ptype_vlc.table, MB_PTYPE_VLC_BITS, 1);
568
7e7a7282608c hmm ABS(dc-diff) > 512 fix
michaelni
parents: 558
diff changeset
925 if (mb_type < 0){
7e7a7282608c hmm ABS(dc-diff) > 512 fix
michaelni
parents: 558
diff changeset
926 fprintf(stderr, "invalid mb type in P Frame at %d %d\n", s->mb_x, s->mb_y);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
927 return -1;
568
7e7a7282608c hmm ABS(dc-diff) > 512 fix
michaelni
parents: 558
diff changeset
928 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
929 break;
986e461dc072 Initial revision
glantau
parents:
diff changeset
930 case B_TYPE:
545
6df843af36cb optimization (get_vlc() -> get_vlc2())
michaelni
parents: 533
diff changeset
931 mb_type = get_vlc2(&s->gb, mb_btype_vlc.table, MB_BTYPE_VLC_BITS, 1);
568
7e7a7282608c hmm ABS(dc-diff) > 512 fix
michaelni
parents: 558
diff changeset
932 if (mb_type < 0){
7e7a7282608c hmm ABS(dc-diff) > 512 fix
michaelni
parents: 558
diff changeset
933 fprintf(stderr, "invalid mb type in B Frame at %d %d\n", s->mb_x, s->mb_y);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
934 return -1;
568
7e7a7282608c hmm ABS(dc-diff) > 512 fix
michaelni
parents: 558
diff changeset
935 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
936 break;
986e461dc072 Initial revision
glantau
parents:
diff changeset
937 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
938 dprintf("mb_type=%x\n", mb_type);
986e461dc072 Initial revision
glantau
parents:
diff changeset
939 motion_type = 0; /* avoid warning */
986e461dc072 Initial revision
glantau
parents:
diff changeset
940 if (mb_type & (MB_FOR|MB_BACK)) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
941 /* get additionnal motion vector type */
986e461dc072 Initial revision
glantau
parents:
diff changeset
942 if (s->picture_structure == PICT_FRAME && s->frame_pred_frame_dct)
986e461dc072 Initial revision
glantau
parents:
diff changeset
943 motion_type = MT_FRAME;
986e461dc072 Initial revision
glantau
parents:
diff changeset
944 else
986e461dc072 Initial revision
glantau
parents:
diff changeset
945 motion_type = get_bits(&s->gb, 2);
986e461dc072 Initial revision
glantau
parents:
diff changeset
946 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
947 /* compute dct type */
986e461dc072 Initial revision
glantau
parents:
diff changeset
948 if (s->picture_structure == PICT_FRAME &&
986e461dc072 Initial revision
glantau
parents:
diff changeset
949 !s->frame_pred_frame_dct &&
986e461dc072 Initial revision
glantau
parents:
diff changeset
950 (mb_type & (MB_PAT | MB_INTRA))) {
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
951 s->interlaced_dct = get_bits1(&s->gb);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
952 #ifdef DEBUG
986e461dc072 Initial revision
glantau
parents:
diff changeset
953 if (s->interlaced_dct)
986e461dc072 Initial revision
glantau
parents:
diff changeset
954 printf("interlaced_dct\n");
986e461dc072 Initial revision
glantau
parents:
diff changeset
955 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
956 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
957 s->interlaced_dct = 0; /* frame based */
986e461dc072 Initial revision
glantau
parents:
diff changeset
958 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
959
986e461dc072 Initial revision
glantau
parents:
diff changeset
960 if (mb_type & MB_QUANT) {
54
764f2eaf711e fixed mpeg2 qscale decoding
glantau
parents: 45
diff changeset
961 s->qscale = get_qscale(s);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
962 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
963 if (mb_type & MB_INTRA) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
964 if (s->concealment_motion_vectors) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
965 /* just parse them */
986e461dc072 Initial revision
glantau
parents:
diff changeset
966 if (s->picture_structure != PICT_FRAME)
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
967 skip_bits1(&s->gb); /* field select */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
968 mpeg_decode_motion(s, s->mpeg_f_code[0][0], 0);
986e461dc072 Initial revision
glantau
parents:
diff changeset
969 mpeg_decode_motion(s, s->mpeg_f_code[0][1], 0);
986e461dc072 Initial revision
glantau
parents:
diff changeset
970 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
971 s->mb_intra = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
972 cbp = 0x3f;
986e461dc072 Initial revision
glantau
parents:
diff changeset
973 memset(s->last_mv, 0, sizeof(s->last_mv)); /* reset mv prediction */
986e461dc072 Initial revision
glantau
parents:
diff changeset
974 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
975 s->mb_intra = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
976 cbp = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
977 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
978 /* special case of implicit zero motion vector */
986e461dc072 Initial revision
glantau
parents:
diff changeset
979 if (s->pict_type == P_TYPE && !(mb_type & MB_FOR)) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
980 s->mv_dir = MV_DIR_FORWARD;
986e461dc072 Initial revision
glantau
parents:
diff changeset
981 s->mv_type = MV_TYPE_16X16;
986e461dc072 Initial revision
glantau
parents:
diff changeset
982 s->last_mv[0][0][0] = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
983 s->last_mv[0][0][1] = 0;
58
0e0a24def67a fixed last zero mv for field - fixed mismatch handling for intra coefs
glantau
parents: 54
diff changeset
984 s->last_mv[0][1][0] = 0;
0e0a24def67a fixed last zero mv for field - fixed mismatch handling for intra coefs
glantau
parents: 54
diff changeset
985 s->last_mv[0][1][1] = 0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
986 s->mv[0][0][0] = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
987 s->mv[0][0][1] = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
988 } else if (mb_type & (MB_FOR | MB_BACK)) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
989 /* motion vectors */
986e461dc072 Initial revision
glantau
parents:
diff changeset
990 s->mv_dir = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
991 for(i=0;i<2;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
992 if (mb_type & (MB_FOR >> i)) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
993 s->mv_dir |= (MV_DIR_FORWARD >> i);
58
0e0a24def67a fixed last zero mv for field - fixed mismatch handling for intra coefs
glantau
parents: 54
diff changeset
994 dprintf("motion_type=%d\n", motion_type);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
995 switch(motion_type) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
996 case MT_FRAME: /* or MT_16X8 */
986e461dc072 Initial revision
glantau
parents:
diff changeset
997 if (s->picture_structure == PICT_FRAME) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
998 /* MT_FRAME */
986e461dc072 Initial revision
glantau
parents:
diff changeset
999 s->mv_type = MV_TYPE_16X16;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1000 for(k=0;k<2;k++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1001 val = mpeg_decode_motion(s, s->mpeg_f_code[i][k],
986e461dc072 Initial revision
glantau
parents:
diff changeset
1002 s->last_mv[i][0][k]);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1003 s->last_mv[i][0][k] = val;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1004 s->last_mv[i][1][k] = val;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1005 /* full_pel: only for mpeg1 */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1006 if (s->full_pel[i])
986e461dc072 Initial revision
glantau
parents:
diff changeset
1007 val = val << 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1008 s->mv[i][0][k] = val;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1009 dprintf("mv%d: %d\n", k, val);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1010 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1011 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1012 /* MT_16X8 */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1013 s->mv_type = MV_TYPE_16X8;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1014 for(j=0;j<2;j++) {
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
1015 s->field_select[i][j] = get_bits1(&s->gb);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1016 for(k=0;k<2;k++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1017 val = mpeg_decode_motion(s, s->mpeg_f_code[i][k],
986e461dc072 Initial revision
glantau
parents:
diff changeset
1018 s->last_mv[i][j][k]);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1019 s->last_mv[i][j][k] = val;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1020 s->mv[i][j][k] = val;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1021 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1022 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1023 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1024 break;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1025 case MT_FIELD:
1096
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1092
diff changeset
1026 s->mv_type = MV_TYPE_FIELD;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1027 if (s->picture_structure == PICT_FRAME) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1028 for(j=0;j<2;j++) {
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
1029 s->field_select[i][j] = get_bits1(&s->gb);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1030 val = mpeg_decode_motion(s, s->mpeg_f_code[i][0],
986e461dc072 Initial revision
glantau
parents:
diff changeset
1031 s->last_mv[i][j][0]);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1032 s->last_mv[i][j][0] = val;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1033 s->mv[i][j][0] = val;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1034 dprintf("fmx=%d\n", val);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1035 val = mpeg_decode_motion(s, s->mpeg_f_code[i][1],
986e461dc072 Initial revision
glantau
parents:
diff changeset
1036 s->last_mv[i][j][1] >> 1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1037 s->last_mv[i][j][1] = val << 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1038 s->mv[i][j][1] = val;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1039 dprintf("fmy=%d\n", val);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1040 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1041 } else {
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
1042 s->field_select[i][0] = get_bits1(&s->gb);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1043 for(k=0;k<2;k++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1044 val = mpeg_decode_motion(s, s->mpeg_f_code[i][k],
986e461dc072 Initial revision
glantau
parents:
diff changeset
1045 s->last_mv[i][0][k]);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1046 s->last_mv[i][0][k] = val;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1047 s->last_mv[i][1][k] = val;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1048 s->mv[i][0][k] = val;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1049 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1050 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1051 break;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1052 case MT_DMV:
986e461dc072 Initial revision
glantau
parents:
diff changeset
1053 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1054 int dmx, dmy, mx, my, m;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1055
986e461dc072 Initial revision
glantau
parents:
diff changeset
1056 mx = mpeg_decode_motion(s, s->mpeg_f_code[i][0],
986e461dc072 Initial revision
glantau
parents:
diff changeset
1057 s->last_mv[i][0][0]);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1058 s->last_mv[i][0][0] = mx;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1059 s->last_mv[i][1][0] = mx;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1060 dmx = get_dmv(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1061 my = mpeg_decode_motion(s, s->mpeg_f_code[i][1],
986e461dc072 Initial revision
glantau
parents:
diff changeset
1062 s->last_mv[i][0][1] >> 1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1063 dmy = get_dmv(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1064 s->mv_type = MV_TYPE_DMV;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1065 /* XXX: totally broken */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1066 if (s->picture_structure == PICT_FRAME) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1067 s->last_mv[i][0][1] = my << 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1068 s->last_mv[i][1][1] = my << 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1069
986e461dc072 Initial revision
glantau
parents:
diff changeset
1070 m = s->top_field_first ? 1 : 3;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1071 /* top -> top pred */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1072 s->mv[i][0][0] = mx;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1073 s->mv[i][0][1] = my << 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1074 s->mv[i][1][0] = ((mx * m + (mx > 0)) >> 1) + dmx;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1075 s->mv[i][1][1] = ((my * m + (my > 0)) >> 1) + dmy - 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1076 m = 4 - m;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1077 s->mv[i][2][0] = mx;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1078 s->mv[i][2][1] = my << 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1079 s->mv[i][3][0] = ((mx * m + (mx > 0)) >> 1) + dmx;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1080 s->mv[i][3][1] = ((my * m + (my > 0)) >> 1) + dmy + 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1081 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1082 s->last_mv[i][0][1] = my;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1083 s->last_mv[i][1][1] = my;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1084 s->mv[i][0][0] = mx;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1085 s->mv[i][0][1] = my;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1086 s->mv[i][1][0] = ((mx + (mx > 0)) >> 1) + dmx;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1087 s->mv[i][1][1] = ((my + (my > 0)) >> 1) + dmy - 1
986e461dc072 Initial revision
glantau
parents:
diff changeset
1088 /* + 2 * cur_field */;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1089 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1090 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1091 break;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1092 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1093 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1094 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1095 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1096
986e461dc072 Initial revision
glantau
parents:
diff changeset
1097 if ((mb_type & MB_INTRA) && s->concealment_motion_vectors) {
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
1098 skip_bits1(&s->gb); /* marker */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1099 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1100
986e461dc072 Initial revision
glantau
parents:
diff changeset
1101 if (mb_type & MB_PAT) {
545
6df843af36cb optimization (get_vlc() -> get_vlc2())
michaelni
parents: 533
diff changeset
1102 cbp = get_vlc2(&s->gb, mb_pat_vlc.table, MB_PAT_VLC_BITS, 1);
568
7e7a7282608c hmm ABS(dc-diff) > 512 fix
michaelni
parents: 558
diff changeset
1103 if (cbp < 0){
7e7a7282608c hmm ABS(dc-diff) > 512 fix
michaelni
parents: 558
diff changeset
1104 fprintf(stderr, "invalid cbp at %d %d\n", s->mb_x, s->mb_y);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1105 return -1;
568
7e7a7282608c hmm ABS(dc-diff) > 512 fix
michaelni
parents: 558
diff changeset
1106 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1107 cbp++;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1108 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1109 dprintf("cbp=%x\n", cbp);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1110
986e461dc072 Initial revision
glantau
parents:
diff changeset
1111 if (s->mpeg2) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1112 if (s->mb_intra) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1113 for(i=0;i<6;i++) {
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1114 if (mpeg2_decode_block_intra(s, block[i], i) < 0)
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1115 return -1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1116 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1117 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1118 for(i=0;i<6;i++) {
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1119 if (cbp & 32) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1120 if (mpeg2_decode_block_non_intra(s, block[i], i) < 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1121 return -1;
391
ddb1be8aa479 improved mpeg1/2 decoding speed
glantau
parents: 383
diff changeset
1122 } else {
ddb1be8aa479 improved mpeg1/2 decoding speed
glantau
parents: 383
diff changeset
1123 s->block_last_index[i] = -1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1124 }
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1125 cbp+=cbp;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1126 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1127 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1128 } else {
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1129 if (s->mb_intra) {
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1130 for(i=0;i<6;i++) {
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1131 if (mpeg1_decode_block_intra(s, block[i], i) < 0)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1132 return -1;
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1133 }
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1134 }else{
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1135 for(i=0;i<6;i++) {
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1136 if (cbp & 32) {
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1137 if (mpeg1_decode_block_inter(s, block[i], i) < 0)
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1138 return -1;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1139 } else {
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1140 s->block_last_index[i] = -1;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1141 }
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1142 cbp+=cbp;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1143 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1144 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1145 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1146 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1147 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1148
986e461dc072 Initial revision
glantau
parents:
diff changeset
1149 /* as h263, but only 17 codes */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1150 static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1151 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1152 int code, sign, val, m, l, shift;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1153
545
6df843af36cb optimization (get_vlc() -> get_vlc2())
michaelni
parents: 533
diff changeset
1154 code = get_vlc2(&s->gb, mv_vlc.table, MV_VLC_BITS, 2);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1155 if (code < 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1156 return 0xffff;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1157 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1158 if (code == 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1159 return pred;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1160 }
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
1161 sign = get_bits1(&s->gb);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1162 shift = fcode - 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1163 val = (code - 1) << shift;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1164 if (shift > 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1165 val |= get_bits(&s->gb, shift);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1166 val++;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1167 if (sign)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1168 val = -val;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1169 val += pred;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1170
986e461dc072 Initial revision
glantau
parents:
diff changeset
1171 /* modulo decoding */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1172 l = (1 << shift) * 16;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1173 m = 2 * l;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1174 if (val < -l) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1175 val += m;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1176 } else if (val >= l) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1177 val -= m;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1178 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1179 return val;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1180 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1181
986e461dc072 Initial revision
glantau
parents:
diff changeset
1182 static inline int decode_dc(MpegEncContext *s, int component)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1183 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1184 int code, diff;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1185
986e461dc072 Initial revision
glantau
parents:
diff changeset
1186 if (component == 0) {
568
7e7a7282608c hmm ABS(dc-diff) > 512 fix
michaelni
parents: 558
diff changeset
1187 code = get_vlc2(&s->gb, dc_lum_vlc.table, DC_VLC_BITS, 2);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1188 } else {
568
7e7a7282608c hmm ABS(dc-diff) > 512 fix
michaelni
parents: 558
diff changeset
1189 code = get_vlc2(&s->gb, dc_chroma_vlc.table, DC_VLC_BITS, 2);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1190 }
568
7e7a7282608c hmm ABS(dc-diff) > 512 fix
michaelni
parents: 558
diff changeset
1191 if (code < 0){
7e7a7282608c hmm ABS(dc-diff) > 512 fix
michaelni
parents: 558
diff changeset
1192 fprintf(stderr, "invalid dc code at %d %d\n", s->mb_x, s->mb_y);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1193 return 0xffff;
568
7e7a7282608c hmm ABS(dc-diff) > 512 fix
michaelni
parents: 558
diff changeset
1194 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1195 if (code == 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1196 diff = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1197 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1198 diff = get_bits(&s->gb, code);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1199 if ((diff & (1 << (code - 1))) == 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1200 diff = (-1 << code) | (diff + 1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1201 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1202 return diff;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1203 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1204
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1205 static inline int mpeg1_decode_block_intra(MpegEncContext *s,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1206 DCTELEM *block,
986e461dc072 Initial revision
glantau
parents:
diff changeset
1207 int n)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1208 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1209 int level, dc, diff, i, j, run;
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1210 int component;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1211 RLTable *rl = &rl_mpeg1;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
1212 uint8_t * const scantable= s->intra_scantable.permutated;
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
1213 const uint16_t *quant_matrix= s->intra_matrix;
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1214 const int qscale= s->qscale;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1215
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1216 /* DC coef */
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1217 component = (n <= 3 ? 0 : n - 4 + 1);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1218 diff = decode_dc(s, component);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1219 if (diff >= 0xffff)
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1220 return -1;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1221 dc = s->last_dc[component];
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1222 dc += diff;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1223 s->last_dc[component] = dc;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1224 block[0] = dc<<3;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1225 dprintf("dc=%d diff=%d\n", dc, diff);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1226 i = 0;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1227 {
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1228 OPEN_READER(re, &s->gb);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1229 /* now quantify & encode AC coefs */
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1230 for(;;) {
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1231 UPDATE_CACHE(re, &s->gb);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1232 GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1233
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1234 if(level == 127){
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1235 break;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1236 } else if(level != 0) {
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1237 i += run;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1238 j = scantable[i];
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1239 level= (level*qscale*quant_matrix[j])>>3;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1240 level= (level-1)|1;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1241 level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1242 LAST_SKIP_BITS(re, &s->gb, 1);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1243 } else {
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1244 /* escape */
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1245 run = SHOW_UBITS(re, &s->gb, 6)+1; LAST_SKIP_BITS(re, &s->gb, 6);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1246 UPDATE_CACHE(re, &s->gb);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1247 level = SHOW_SBITS(re, &s->gb, 8); SKIP_BITS(re, &s->gb, 8);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1248 if (level == -128) {
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1249 level = SHOW_UBITS(re, &s->gb, 8) - 256; LAST_SKIP_BITS(re, &s->gb, 8);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1250 } else if (level == 0) {
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1251 level = SHOW_UBITS(re, &s->gb, 8) ; LAST_SKIP_BITS(re, &s->gb, 8);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1252 }
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1253 i += run;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1254 j = scantable[i];
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1255 if(level<0){
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1256 level= -level;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1257 level= (level*qscale*quant_matrix[j])>>3;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1258 level= (level-1)|1;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1259 level= -level;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1260 }else{
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1261 level= (level*qscale*quant_matrix[j])>>3;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1262 level= (level-1)|1;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1263 }
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1264 }
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1265 if (i > 63){
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1266 fprintf(stderr, "ac-tex damaged at %d %d\n", s->mb_x, s->mb_y);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1267 return -1;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1268 }
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1269
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1270 block[j] = level;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1271 }
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1272 CLOSE_READER(re, &s->gb);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1273 }
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1274 s->block_last_index[n] = i;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1275 return 0;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1276 }
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1277
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1278 static inline int mpeg1_decode_block_inter(MpegEncContext *s,
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1279 DCTELEM *block,
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1280 int n)
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1281 {
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1282 int level, i, j, run;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1283 RLTable *rl = &rl_mpeg1;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
1284 uint8_t * const scantable= s->intra_scantable.permutated;
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
1285 const uint16_t *quant_matrix= s->inter_matrix;
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1286 const int qscale= s->qscale;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1287
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1288 {
520
19a5e2a81e1a new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents: 498
diff changeset
1289 int v;
19a5e2a81e1a new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents: 498
diff changeset
1290 OPEN_READER(re, &s->gb);
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1291 i = -1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1292 /* special case for the first coef. no need to add a second vlc table */
520
19a5e2a81e1a new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents: 498
diff changeset
1293 UPDATE_CACHE(re, &s->gb);
19a5e2a81e1a new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents: 498
diff changeset
1294 v= SHOW_UBITS(re, &s->gb, 2);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1295 if (v & 2) {
714
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1296 LAST_SKIP_BITS(re, &s->gb, 2);
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1297 level= (3*qscale*quant_matrix[0])>>4;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1298 level= (level-1)|1;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1299 if(v&1)
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1300 level= -level;
714
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1301 block[0] = level;
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1302 i++;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1303 }
714
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1304
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1305 /* now quantify & encode AC coefs */
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1306 for(;;) {
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1307 UPDATE_CACHE(re, &s->gb);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1308 GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1309
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1310 if(level == 127){
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1311 break;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1312 } else if(level != 0) {
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1313 i += run;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1314 j = scantable[i];
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1315 level= ((level*2+1)*qscale*quant_matrix[j])>>4;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1316 level= (level-1)|1;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1317 level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1318 LAST_SKIP_BITS(re, &s->gb, 1);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1319 } else {
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1320 /* escape */
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1321 run = SHOW_UBITS(re, &s->gb, 6)+1; LAST_SKIP_BITS(re, &s->gb, 6);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1322 UPDATE_CACHE(re, &s->gb);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1323 level = SHOW_SBITS(re, &s->gb, 8); SKIP_BITS(re, &s->gb, 8);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1324 if (level == -128) {
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1325 level = SHOW_UBITS(re, &s->gb, 8) - 256; LAST_SKIP_BITS(re, &s->gb, 8);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1326 } else if (level == 0) {
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1327 level = SHOW_UBITS(re, &s->gb, 8) ; LAST_SKIP_BITS(re, &s->gb, 8);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1328 }
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1329 i += run;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1330 j = scantable[i];
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1331 if(level<0){
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1332 level= -level;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1333 level= ((level*2+1)*qscale*quant_matrix[j])>>4;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1334 level= (level-1)|1;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1335 level= -level;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1336 }else{
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1337 level= ((level*2+1)*qscale*quant_matrix[j])>>4;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1338 level= (level-1)|1;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1339 }
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1340 }
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1341 if (i > 63){
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1342 fprintf(stderr, "ac-tex damaged at %d %d\n", s->mb_x, s->mb_y);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1343 return -1;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1344 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1345
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1346 block[j] = level;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1347 }
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1348 CLOSE_READER(re, &s->gb);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1349 }
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1350 s->block_last_index[n] = i;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1351 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1352 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1353
986e461dc072 Initial revision
glantau
parents:
diff changeset
1354 /* Also does unquantization here, since I will never support mpeg2
986e461dc072 Initial revision
glantau
parents:
diff changeset
1355 encoding */
714
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1356 static inline int mpeg2_decode_block_non_intra(MpegEncContext *s,
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1357 DCTELEM *block,
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1358 int n)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1359 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1360 int level, i, j, run;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1361 RLTable *rl = &rl_mpeg1;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
1362 uint8_t * const scantable= s->intra_scantable.permutated;
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
1363 const uint16_t *quant_matrix;
714
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1364 const int qscale= s->qscale;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1365 int mismatch;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1366
986e461dc072 Initial revision
glantau
parents:
diff changeset
1367 mismatch = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1368
986e461dc072 Initial revision
glantau
parents:
diff changeset
1369 {
520
19a5e2a81e1a new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents: 498
diff changeset
1370 int v;
19a5e2a81e1a new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents: 498
diff changeset
1371 OPEN_READER(re, &s->gb);
714
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1372 i = -1;
520
19a5e2a81e1a new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents: 498
diff changeset
1373 if (n < 4)
714
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1374 quant_matrix = s->inter_matrix;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1375 else
714
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1376 quant_matrix = s->chroma_inter_matrix;
520
19a5e2a81e1a new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents: 498
diff changeset
1377
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1378 /* special case for the first coef. no need to add a second vlc table */
520
19a5e2a81e1a new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents: 498
diff changeset
1379 UPDATE_CACHE(re, &s->gb);
19a5e2a81e1a new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents: 498
diff changeset
1380 v= SHOW_UBITS(re, &s->gb, 2);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1381 if (v & 2) {
714
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1382 LAST_SKIP_BITS(re, &s->gb, 2);
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1383 level= (3*qscale*quant_matrix[0])>>5;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1384 if(v&1)
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1385 level= -level;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1386 block[0] = level;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1387 mismatch ^= level;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1388 i++;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1389 }
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1390
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1391 /* now quantify & encode AC coefs */
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1392 for(;;) {
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1393 UPDATE_CACHE(re, &s->gb);
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1394 GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2);
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1395
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1396 if(level == 127){
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1397 break;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1398 } else if(level != 0) {
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1399 i += run;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1400 j = scantable[i];
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1401 level= ((level*2+1)*qscale*quant_matrix[j])>>5;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1402 level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1);
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1403 LAST_SKIP_BITS(re, &s->gb, 1);
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1404 } else {
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1405 /* escape */
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1406 run = SHOW_UBITS(re, &s->gb, 6)+1; LAST_SKIP_BITS(re, &s->gb, 6);
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1407 UPDATE_CACHE(re, &s->gb);
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1408 level = SHOW_SBITS(re, &s->gb, 12); SKIP_BITS(re, &s->gb, 12);
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1409
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1410 i += run;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1411 j = scantable[i];
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1412 if(level<0){
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1413 level= ((-level*2+1)*qscale*quant_matrix[j])>>5;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1414 level= -level;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1415 }else{
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1416 level= ((level*2+1)*qscale*quant_matrix[j])>>5;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1417 }
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1418 }
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1419 if (i > 63){
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1420 fprintf(stderr, "ac-tex damaged at %d %d\n", s->mb_x, s->mb_y);
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1421 return -1;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1422 }
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1423
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1424 mismatch ^= level;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1425 block[j] = level;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1426 }
520
19a5e2a81e1a new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents: 498
diff changeset
1427 CLOSE_READER(re, &s->gb);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1428 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1429 block[63] ^= (mismatch & 1);
714
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1430
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1431 s->block_last_index[n] = i;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1432 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1433 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1434
714
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1435 static inline int mpeg2_decode_block_intra(MpegEncContext *s,
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1436 DCTELEM *block,
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1437 int n)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1438 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1439 int level, dc, diff, i, j, run;
714
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1440 int component;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1441 RLTable *rl;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
1442 uint8_t * const scantable= s->intra_scantable.permutated;
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
1443 const uint16_t *quant_matrix;
714
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1444 const int qscale= s->qscale;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1445 int mismatch;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1446
986e461dc072 Initial revision
glantau
parents:
diff changeset
1447 /* DC coef */
714
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1448 if (n < 4){
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1449 quant_matrix = s->intra_matrix;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1450 component = 0;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1451 }else{
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1452 quant_matrix = s->chroma_intra_matrix;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1453 component = n - 3;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1454 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1455 diff = decode_dc(s, component);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1456 if (diff >= 0xffff)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1457 return -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1458 dc = s->last_dc[component];
986e461dc072 Initial revision
glantau
parents:
diff changeset
1459 dc += diff;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1460 s->last_dc[component] = dc;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1461 block[0] = dc << (3 - s->intra_dc_precision);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1462 dprintf("dc=%d\n", block[0]);
58
0e0a24def67a fixed last zero mv for field - fixed mismatch handling for intra coefs
glantau
parents: 54
diff changeset
1463 mismatch = block[0] ^ 1;
714
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1464 i = 0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1465 if (s->intra_vlc_format)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1466 rl = &rl_mpeg2;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1467 else
986e461dc072 Initial revision
glantau
parents:
diff changeset
1468 rl = &rl_mpeg1;
59
efd3c19f6d62 fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents: 58
diff changeset
1469
714
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1470 {
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1471 OPEN_READER(re, &s->gb);
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1472 /* now quantify & encode AC coefs */
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1473 for(;;) {
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1474 UPDATE_CACHE(re, &s->gb);
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1475 GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2);
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1476
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1477 if(level == 127){
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1478 break;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1479 } else if(level != 0) {
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1480 i += run;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1481 j = scantable[i];
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1482 level= (level*qscale*quant_matrix[j])>>4;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1483 level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1);
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1484 LAST_SKIP_BITS(re, &s->gb, 1);
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1485 } else {
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1486 /* escape */
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1487 run = SHOW_UBITS(re, &s->gb, 6)+1; LAST_SKIP_BITS(re, &s->gb, 6);
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1488 UPDATE_CACHE(re, &s->gb);
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1489 level = SHOW_SBITS(re, &s->gb, 12); SKIP_BITS(re, &s->gb, 12);
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1490 i += run;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1491 j = scantable[i];
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1492 if(level<0){
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1493 level= (-level*qscale*quant_matrix[j])>>4;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1494 level= -level;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1495 }else{
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1496 level= (level*qscale*quant_matrix[j])>>4;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1497 }
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1498 }
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1499 if (i > 63){
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1500 fprintf(stderr, "ac-tex damaged at %d %d\n", s->mb_x, s->mb_y);
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1501 return -1;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1502 }
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1503
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1504 mismatch^= level;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1505 block[j] = level;
568
7e7a7282608c hmm ABS(dc-diff) > 512 fix
michaelni
parents: 558
diff changeset
1506 }
714
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1507 CLOSE_READER(re, &s->gb);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1508 }
714
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1509 block[63]^= mismatch&1;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1510
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1511 s->block_last_index[n] = i;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1512 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1513 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1514
986e461dc072 Initial revision
glantau
parents:
diff changeset
1515 /* compressed picture size */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1516 #define PICTURE_BUFFER_SIZE 100000
986e461dc072 Initial revision
glantau
parents:
diff changeset
1517
986e461dc072 Initial revision
glantau
parents:
diff changeset
1518 typedef struct Mpeg1Context {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1519 MpegEncContext mpeg_enc_ctx;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
1520 uint32_t header_state;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1521 int start_code; /* current start code */
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
1522 uint8_t buffer[PICTURE_BUFFER_SIZE];
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
1523 uint8_t *buf_ptr;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1524 int buffer_size;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1525 int mpeg_enc_ctx_allocated; /* true if decoding context allocated */
267
e10840e4f773 - Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents: 241
diff changeset
1526 int repeat_field; /* true if we must repeat the field */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1527 } Mpeg1Context;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1528
986e461dc072 Initial revision
glantau
parents:
diff changeset
1529 static int mpeg_decode_init(AVCodecContext *avctx)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1530 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1531 Mpeg1Context *s = avctx->priv_data;
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
1532
558
michaelni
parents: 556
diff changeset
1533 s->mpeg_enc_ctx.flags= avctx->flags;
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
1534 common_init(&s->mpeg_enc_ctx);
647
22b22723805e support decoding of the last mpeg "packet" even if no startcode is immedeatly afterwards (fixes bugs with mpeg in avi)
michaelni
parents: 639
diff changeset
1535 init_vlcs(&s->mpeg_enc_ctx);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1536
986e461dc072 Initial revision
glantau
parents:
diff changeset
1537 s->header_state = 0xff;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1538 s->mpeg_enc_ctx_allocated = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1539 s->buffer_size = PICTURE_BUFFER_SIZE;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1540 s->start_code = -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1541 s->buf_ptr = s->buffer;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1542 s->mpeg_enc_ctx.picture_number = 0;
267
e10840e4f773 - Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents: 241
diff changeset
1543 s->repeat_field = 0;
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 313
diff changeset
1544 s->mpeg_enc_ctx.codec_id= avctx->codec->id;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1545 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1546 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1547
986e461dc072 Initial revision
glantau
parents:
diff changeset
1548 /* return the 8 bit start code value and update the search
986e461dc072 Initial revision
glantau
parents:
diff changeset
1549 state. Return -1 if no start code found */
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
1550 static int find_start_code(uint8_t **pbuf_ptr, uint8_t *buf_end,
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
1551 uint32_t *header_state)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1552 {
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
1553 uint8_t *buf_ptr;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1554 unsigned int state, v;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1555 int val;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1556
986e461dc072 Initial revision
glantau
parents:
diff changeset
1557 state = *header_state;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1558 buf_ptr = *pbuf_ptr;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1559 while (buf_ptr < buf_end) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1560 v = *buf_ptr++;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1561 if (state == 0x000001) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1562 state = ((state << 8) | v) & 0xffffff;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1563 val = state;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1564 goto found;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1565 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1566 state = ((state << 8) | v) & 0xffffff;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1567 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1568 val = -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1569 found:
986e461dc072 Initial revision
glantau
parents:
diff changeset
1570 *pbuf_ptr = buf_ptr;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1571 *header_state = state;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1572 return val;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1573 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1574
986e461dc072 Initial revision
glantau
parents:
diff changeset
1575 static int mpeg1_decode_picture(AVCodecContext *avctx,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
1576 uint8_t *buf, int buf_size)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1577 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1578 Mpeg1Context *s1 = avctx->priv_data;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1579 MpegEncContext *s = &s1->mpeg_enc_ctx;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1580 int ref, f_code;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1581
1025
1f9afd8b9131 GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents: 1021
diff changeset
1582 init_get_bits(&s->gb, buf, buf_size*8);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1583
986e461dc072 Initial revision
glantau
parents:
diff changeset
1584 ref = get_bits(&s->gb, 10); /* temporal ref */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1585 s->pict_type = get_bits(&s->gb, 3);
45
933cc4acab5c fixed mpeg1 last block bug (mb stuffing code was not included in vlc table...)
glantau
parents: 38
diff changeset
1586 dprintf("pict_type=%d number=%d\n", s->pict_type, s->picture_number);
872
8af5c366e3d9 hurry_up=5 support
michaelni
parents: 853
diff changeset
1587
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
1588 skip_bits(&s->gb, 16);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1589 if (s->pict_type == P_TYPE || s->pict_type == B_TYPE) {
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
1590 s->full_pel[0] = get_bits1(&s->gb);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1591 f_code = get_bits(&s->gb, 3);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1592 if (f_code == 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1593 return -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1594 s->mpeg_f_code[0][0] = f_code;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1595 s->mpeg_f_code[0][1] = f_code;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1596 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1597 if (s->pict_type == B_TYPE) {
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
1598 s->full_pel[1] = get_bits1(&s->gb);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1599 f_code = get_bits(&s->gb, 3);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1600 if (f_code == 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1601 return -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1602 s->mpeg_f_code[1][0] = f_code;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1603 s->mpeg_f_code[1][1] = f_code;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1604 }
903
22ee74da2cd3 cleanup
michaelni
parents: 890
diff changeset
1605 s->current_picture.pict_type= s->pict_type;
22ee74da2cd3 cleanup
michaelni
parents: 890
diff changeset
1606 s->current_picture.key_frame= s->pict_type == I_TYPE;
911
4b2c86f1fee9 drop b frames if there are no reference frames
michaelni
parents: 903
diff changeset
1607
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1608 s->y_dc_scale = 8;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1609 s->c_dc_scale = 8;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1610 s->first_slice = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1611 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1612 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1613
986e461dc072 Initial revision
glantau
parents:
diff changeset
1614 static void mpeg_decode_sequence_extension(MpegEncContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1615 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1616 int horiz_size_ext, vert_size_ext;
917
d3aa313dc373 mpeg1&2 aspect decoding
michaelni
parents: 911
diff changeset
1617 int bit_rate_ext, vbv_buf_ext;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1618 int frame_rate_ext_n, frame_rate_ext_d;
917
d3aa313dc373 mpeg1&2 aspect decoding
michaelni
parents: 911
diff changeset
1619 float aspect;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1620
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
1621 skip_bits(&s->gb, 8); /* profil and level */
267
e10840e4f773 - Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents: 241
diff changeset
1622 s->progressive_sequence = get_bits1(&s->gb); /* progressive_sequence */
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
1623 skip_bits(&s->gb, 2); /* chroma_format */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1624 horiz_size_ext = get_bits(&s->gb, 2);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1625 vert_size_ext = get_bits(&s->gb, 2);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1626 s->width |= (horiz_size_ext << 12);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1627 s->height |= (vert_size_ext << 12);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1628 bit_rate_ext = get_bits(&s->gb, 12); /* XXX: handle it */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1629 s->bit_rate = ((s->bit_rate / 400) | (bit_rate_ext << 12)) * 400;
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
1630 skip_bits1(&s->gb); /* marker */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1631 vbv_buf_ext = get_bits(&s->gb, 8);
917
d3aa313dc373 mpeg1&2 aspect decoding
michaelni
parents: 911
diff changeset
1632 s->low_delay = get_bits1(&s->gb);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1633 frame_rate_ext_n = get_bits(&s->gb, 2);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1634 frame_rate_ext_d = get_bits(&s->gb, 5);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1635 if (frame_rate_ext_d >= 1)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1636 s->frame_rate = (s->frame_rate * frame_rate_ext_n) / frame_rate_ext_d;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1637 dprintf("sequence extension\n");
986e461dc072 Initial revision
glantau
parents:
diff changeset
1638 s->mpeg2 = 1;
401
e20655449d4a mpeg1/2 identifier - fixed frame rate for some bad mpeg1 streams
glantau
parents: 391
diff changeset
1639 s->avctx->sub_id = 2; /* indicates mpeg2 found */
917
d3aa313dc373 mpeg1&2 aspect decoding
michaelni
parents: 911
diff changeset
1640
d3aa313dc373 mpeg1&2 aspect decoding
michaelni
parents: 911
diff changeset
1641 aspect= mpeg2_aspect[s->aspect_ratio_info];
d3aa313dc373 mpeg1&2 aspect decoding
michaelni
parents: 911
diff changeset
1642 if(aspect>0.0) s->avctx->aspect_ratio= s->width/(aspect*s->height);
d3aa313dc373 mpeg1&2 aspect decoding
michaelni
parents: 911
diff changeset
1643 else if(aspect<0.0) s->avctx->aspect_ratio= -1.0/aspect;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1644 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1645
986e461dc072 Initial revision
glantau
parents:
diff changeset
1646 static void mpeg_decode_quant_matrix_extension(MpegEncContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1647 {
38
5bf15419d47e changed quant matrix order (should fix mmx mpeg decoding bug)
glantau
parents: 21
diff changeset
1648 int i, v, j;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1649
59
efd3c19f6d62 fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents: 58
diff changeset
1650 dprintf("matrix extension\n");
efd3c19f6d62 fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents: 58
diff changeset
1651
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
1652 if (get_bits1(&s->gb)) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1653 for(i=0;i<64;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1654 v = get_bits(&s->gb, 8);
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1085
diff changeset
1655 j= s->dsp.idct_permutation[ ff_zigzag_direct[i] ];
38
5bf15419d47e changed quant matrix order (should fix mmx mpeg decoding bug)
glantau
parents: 21
diff changeset
1656 s->intra_matrix[j] = v;
5bf15419d47e changed quant matrix order (should fix mmx mpeg decoding bug)
glantau
parents: 21
diff changeset
1657 s->chroma_intra_matrix[j] = v;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1658 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1659 }
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
1660 if (get_bits1(&s->gb)) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1661 for(i=0;i<64;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1662 v = get_bits(&s->gb, 8);
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1085
diff changeset
1663 j= s->dsp.idct_permutation[ ff_zigzag_direct[i] ];
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 313
diff changeset
1664 s->inter_matrix[j] = v;
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 313
diff changeset
1665 s->chroma_inter_matrix[j] = v;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1666 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1667 }
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
1668 if (get_bits1(&s->gb)) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1669 for(i=0;i<64;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1670 v = get_bits(&s->gb, 8);
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1085
diff changeset
1671 j= s->dsp.idct_permutation[ ff_zigzag_direct[i] ];
38
5bf15419d47e changed quant matrix order (should fix mmx mpeg decoding bug)
glantau
parents: 21
diff changeset
1672 s->chroma_intra_matrix[j] = v;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1673 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1674 }
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
1675 if (get_bits1(&s->gb)) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1676 for(i=0;i<64;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1677 v = get_bits(&s->gb, 8);
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1085
diff changeset
1678 j= s->dsp.idct_permutation[ ff_zigzag_direct[i] ];
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 313
diff changeset
1679 s->chroma_inter_matrix[j] = v;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1680 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1681 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1682 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1683
986e461dc072 Initial revision
glantau
parents:
diff changeset
1684 static void mpeg_decode_picture_coding_extension(MpegEncContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1685 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1686 s->full_pel[0] = s->full_pel[1] = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1687 s->mpeg_f_code[0][0] = get_bits(&s->gb, 4);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1688 s->mpeg_f_code[0][1] = get_bits(&s->gb, 4);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1689 s->mpeg_f_code[1][0] = get_bits(&s->gb, 4);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1690 s->mpeg_f_code[1][1] = get_bits(&s->gb, 4);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1691 s->intra_dc_precision = get_bits(&s->gb, 2);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1692 s->picture_structure = get_bits(&s->gb, 2);
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
1693 s->top_field_first = get_bits1(&s->gb);
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
1694 s->frame_pred_frame_dct = get_bits1(&s->gb);
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
1695 s->concealment_motion_vectors = get_bits1(&s->gb);
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
1696 s->q_scale_type = get_bits1(&s->gb);
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
1697 s->intra_vlc_format = get_bits1(&s->gb);
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
1698 s->alternate_scan = get_bits1(&s->gb);
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
1699 s->repeat_first_field = get_bits1(&s->gb);
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
1700 s->chroma_420_type = get_bits1(&s->gb);
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
1701 s->progressive_frame = get_bits1(&s->gb);
715
8b3ccabfce4a move scantable init from block-decode to header parser
michaelni
parents: 714
diff changeset
1702
1096
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1092
diff changeset
1703 if(s->picture_structure == PICT_FRAME)
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1092
diff changeset
1704 s->first_field=0;
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1092
diff changeset
1705 else{
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1092
diff changeset
1706 s->first_field ^= 1;
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1092
diff changeset
1707 memset(s->mbskip_table, 0, s->mb_width*s->mb_height);
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1092
diff changeset
1708 }
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1092
diff changeset
1709
715
8b3ccabfce4a move scantable init from block-decode to header parser
michaelni
parents: 714
diff changeset
1710 if(s->alternate_scan){
8b3ccabfce4a move scantable init from block-decode to header parser
michaelni
parents: 714
diff changeset
1711 ff_init_scantable(s, &s->inter_scantable , ff_alternate_vertical_scan);
8b3ccabfce4a move scantable init from block-decode to header parser
michaelni
parents: 714
diff changeset
1712 ff_init_scantable(s, &s->intra_scantable , ff_alternate_vertical_scan);
8b3ccabfce4a move scantable init from block-decode to header parser
michaelni
parents: 714
diff changeset
1713 ff_init_scantable(s, &s->intra_h_scantable, ff_alternate_vertical_scan);
8b3ccabfce4a move scantable init from block-decode to header parser
michaelni
parents: 714
diff changeset
1714 ff_init_scantable(s, &s->intra_v_scantable, ff_alternate_vertical_scan);
8b3ccabfce4a move scantable init from block-decode to header parser
michaelni
parents: 714
diff changeset
1715 }else{
8b3ccabfce4a move scantable init from block-decode to header parser
michaelni
parents: 714
diff changeset
1716 ff_init_scantable(s, &s->inter_scantable , ff_zigzag_direct);
8b3ccabfce4a move scantable init from block-decode to header parser
michaelni
parents: 714
diff changeset
1717 ff_init_scantable(s, &s->intra_scantable , ff_zigzag_direct);
8b3ccabfce4a move scantable init from block-decode to header parser
michaelni
parents: 714
diff changeset
1718 ff_init_scantable(s, &s->intra_h_scantable, ff_alternate_horizontal_scan);
8b3ccabfce4a move scantable init from block-decode to header parser
michaelni
parents: 714
diff changeset
1719 ff_init_scantable(s, &s->intra_v_scantable, ff_alternate_vertical_scan);
8b3ccabfce4a move scantable init from block-decode to header parser
michaelni
parents: 714
diff changeset
1720 }
8b3ccabfce4a move scantable init from block-decode to header parser
michaelni
parents: 714
diff changeset
1721
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1722 /* composite display not parsed */
267
e10840e4f773 - Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents: 241
diff changeset
1723 dprintf("intra_dc_precision=%d\n", s->intra_dc_precision);
59
efd3c19f6d62 fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents: 58
diff changeset
1724 dprintf("picture_structure=%d\n", s->picture_structure);
383
e6b64bc3bc87 - repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents: 377
diff changeset
1725 dprintf("top field first=%d\n", s->top_field_first);
e6b64bc3bc87 - repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents: 377
diff changeset
1726 dprintf("repeat first field=%d\n", s->repeat_first_field);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1727 dprintf("conceal=%d\n", s->concealment_motion_vectors);
59
efd3c19f6d62 fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents: 58
diff changeset
1728 dprintf("intra_vlc_format=%d\n", s->intra_vlc_format);
efd3c19f6d62 fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents: 58
diff changeset
1729 dprintf("alternate_scan=%d\n", s->alternate_scan);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1730 dprintf("frame_pred_frame_dct=%d\n", s->frame_pred_frame_dct);
267
e10840e4f773 - Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents: 241
diff changeset
1731 dprintf("progressive_frame=%d\n", s->progressive_frame);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1732 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1733
986e461dc072 Initial revision
glantau
parents:
diff changeset
1734 static void mpeg_decode_extension(AVCodecContext *avctx,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
1735 uint8_t *buf, int buf_size)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1736 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1737 Mpeg1Context *s1 = avctx->priv_data;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1738 MpegEncContext *s = &s1->mpeg_enc_ctx;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1739 int ext_type;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1740
1025
1f9afd8b9131 GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents: 1021
diff changeset
1741 init_get_bits(&s->gb, buf, buf_size*8);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1742
986e461dc072 Initial revision
glantau
parents:
diff changeset
1743 ext_type = get_bits(&s->gb, 4);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1744 switch(ext_type) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1745 case 0x1:
986e461dc072 Initial revision
glantau
parents:
diff changeset
1746 /* sequence ext */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1747 mpeg_decode_sequence_extension(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1748 break;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1749 case 0x3:
986e461dc072 Initial revision
glantau
parents:
diff changeset
1750 /* quant matrix extension */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1751 mpeg_decode_quant_matrix_extension(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1752 break;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1753 case 0x8:
986e461dc072 Initial revision
glantau
parents:
diff changeset
1754 /* picture extension */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1755 mpeg_decode_picture_coding_extension(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1756 break;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1757 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1758 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1759
826
ce240888252d cleanup
michaelni
parents: 825
diff changeset
1760 #define DECODE_SLICE_FATAL_ERROR -2
ce240888252d cleanup
michaelni
parents: 825
diff changeset
1761 #define DECODE_SLICE_ERROR -1
ce240888252d cleanup
michaelni
parents: 825
diff changeset
1762 #define DECODE_SLICE_OK 0
ce240888252d cleanup
michaelni
parents: 825
diff changeset
1763 #define DECODE_SLICE_EOP 1
ce240888252d cleanup
michaelni
parents: 825
diff changeset
1764
ce240888252d cleanup
michaelni
parents: 825
diff changeset
1765 /**
ce240888252d cleanup
michaelni
parents: 825
diff changeset
1766 * decodes a slice.
ce240888252d cleanup
michaelni
parents: 825
diff changeset
1767 * @return DECODE_SLICE_FATAL_ERROR if a non recoverable error occured<br>
ce240888252d cleanup
michaelni
parents: 825
diff changeset
1768 * DECODE_SLICE_ERROR if the slice is damaged<br>
ce240888252d cleanup
michaelni
parents: 825
diff changeset
1769 * DECODE_SLICE_OK if this slice is ok<br>
ce240888252d cleanup
michaelni
parents: 825
diff changeset
1770 * DECODE_SLICE_EOP if the end of the picture is reached
ce240888252d cleanup
michaelni
parents: 825
diff changeset
1771 */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1772 static int mpeg_decode_slice(AVCodecContext *avctx,
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
1773 AVFrame *pict,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1774 int start_code,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
1775 uint8_t *buf, int buf_size)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1776 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1777 Mpeg1Context *s1 = avctx->priv_data;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1778 MpegEncContext *s = &s1->mpeg_enc_ctx;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1779 int ret;
1096
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1092
diff changeset
1780 const int field_pic= s->picture_structure != PICT_FRAME;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1781
986e461dc072 Initial revision
glantau
parents:
diff changeset
1782 start_code = (start_code - 1) & 0xff;
568
7e7a7282608c hmm ABS(dc-diff) > 512 fix
michaelni
parents: 558
diff changeset
1783 if (start_code >= s->mb_height){
647
22b22723805e support decoding of the last mpeg "packet" even if no startcode is immedeatly afterwards (fixes bugs with mpeg in avi)
michaelni
parents: 639
diff changeset
1784 fprintf(stderr, "slice below image (%d >= %d)\n", start_code, s->mb_height);
826
ce240888252d cleanup
michaelni
parents: 825
diff changeset
1785 return DECODE_SLICE_ERROR;
568
7e7a7282608c hmm ABS(dc-diff) > 512 fix
michaelni
parents: 558
diff changeset
1786 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1787 s->last_dc[0] = 1 << (7 + s->intra_dc_precision);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1788 s->last_dc[1] = s->last_dc[0];
986e461dc072 Initial revision
glantau
parents:
diff changeset
1789 s->last_dc[2] = s->last_dc[0];
986e461dc072 Initial revision
glantau
parents:
diff changeset
1790 memset(s->last_mv, 0, sizeof(s->last_mv));
1096
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1092
diff changeset
1791
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1792 /* start frame decoding */
1096
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1092
diff changeset
1793 if (s->first_slice && (s->first_field || s->picture_structure==PICT_FRAME)) {
771
d4cc92144266 handle direct rendering buffer allocation failure
michaelni
parents: 751
diff changeset
1794 if(MPV_frame_start(s, avctx) < 0)
826
ce240888252d cleanup
michaelni
parents: 825
diff changeset
1795 return DECODE_SLICE_FATAL_ERROR;
1085
9acf4b552047 move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents: 1084
diff changeset
1796 /* first check if we must repeat the frame */
9acf4b552047 move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents: 1084
diff changeset
1797 s->current_picture.repeat_pict = 0;
9acf4b552047 move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents: 1084
diff changeset
1798
9acf4b552047 move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents: 1084
diff changeset
1799 if (s->repeat_first_field) {
9acf4b552047 move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents: 1084
diff changeset
1800 if (s->progressive_sequence) {
9acf4b552047 move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents: 1084
diff changeset
1801 if (s->top_field_first)
9acf4b552047 move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents: 1084
diff changeset
1802 s->current_picture.repeat_pict = 4;
9acf4b552047 move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents: 1084
diff changeset
1803 else
9acf4b552047 move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents: 1084
diff changeset
1804 s->current_picture.repeat_pict = 2;
9acf4b552047 move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents: 1084
diff changeset
1805 } else if (s->progressive_frame) {
9acf4b552047 move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents: 1084
diff changeset
1806 s->current_picture.repeat_pict = 1;
9acf4b552047 move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents: 1084
diff changeset
1807 }
9acf4b552047 move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents: 1084
diff changeset
1808 }
9acf4b552047 move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents: 1084
diff changeset
1809 // printf("%d \n", s->current_picture.repeat_pict);
9acf4b552047 move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents: 1084
diff changeset
1810
930
6bcb214d6a17 more debug output
michaelni
parents: 925
diff changeset
1811 if(s->avctx->debug&FF_DEBUG_PICT_INFO){
1021
2d7c9f5738de trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents: 947
diff changeset
1812 printf("qp:%d fc:%2d%2d%2d%2d %s %s %s %s dc:%d pstruct:%d fdct:%d cmv:%d qtype:%d ivlc:%d rff:%d %s\n",
930
6bcb214d6a17 more debug output
michaelni
parents: 925
diff changeset
1813 s->qscale, s->mpeg_f_code[0][0],s->mpeg_f_code[0][1],s->mpeg_f_code[1][0],s->mpeg_f_code[1][1],
6bcb214d6a17 more debug output
michaelni
parents: 925
diff changeset
1814 s->pict_type == I_TYPE ? "I" : (s->pict_type == P_TYPE ? "P" : (s->pict_type == B_TYPE ? "B" : "S")),
6bcb214d6a17 more debug output
michaelni
parents: 925
diff changeset
1815 s->progressive_sequence ? "pro" :"", s->alternate_scan ? "alt" :"", s->top_field_first ? "top" :"",
6bcb214d6a17 more debug output
michaelni
parents: 925
diff changeset
1816 s->intra_dc_precision, s->picture_structure, s->frame_pred_frame_dct, s->concealment_motion_vectors,
6bcb214d6a17 more debug output
michaelni
parents: 925
diff changeset
1817 s->q_scale_type, s->intra_vlc_format, s->repeat_first_field, s->chroma_420_type ? "420" :"");
6bcb214d6a17 more debug output
michaelni
parents: 925
diff changeset
1818 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1819 }
1096
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1092
diff changeset
1820 s->first_slice = 0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1821
1025
1f9afd8b9131 GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents: 1021
diff changeset
1822 init_get_bits(&s->gb, buf, buf_size*8);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1823
54
764f2eaf711e fixed mpeg2 qscale decoding
glantau
parents: 45
diff changeset
1824 s->qscale = get_qscale(s);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1825 /* extra slice info */
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
1826 while (get_bits1(&s->gb) != 0) {
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
1827 skip_bits(&s->gb, 8);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1828 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1829
716
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1830 s->mb_x=0;
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1831 for(;;) {
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1832 int code = get_vlc2(&s->gb, mbincr_vlc.table, MBINCR_VLC_BITS, 2);
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1833 if (code < 0)
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1834 return -1; /* error = end of slice, but empty slice is bad or?*/
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1835 if (code >= 33) {
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1836 if (code == 33) {
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1837 s->mb_x += 33;
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1838 }
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1839 /* otherwise, stuffing, nothing to do */
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1840 } else {
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1841 s->mb_x += code;
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1842 break;
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1843 }
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1844 }
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1845 s->mb_y = start_code;
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1846 s->mb_incr= 1;
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1847
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1848 for(;;) {
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 844
diff changeset
1849 s->dsp.clear_blocks(s->block[0]);
716
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1850
12
4d50c7d89e0f use block[] in structure to have it aligned on 8 bytes for mmx optimizations
glantau
parents: 7
diff changeset
1851 ret = mpeg_decode_mb(s, s->block);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1852 dprintf("ret=%d\n", ret);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1853 if (ret < 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1854 return -1;
1096
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1092
diff changeset
1855 //printf("%d %d\n", s->mb_x, s->mb_y);
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1092
diff changeset
1856 //FIXME this isnt the most beautifull way to solve the problem ...
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1092
diff changeset
1857 if(s->picture_structure!=PICT_FRAME){
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1092
diff changeset
1858 if(s->picture_structure == PICT_BOTTOM_FIELD){
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1092
diff changeset
1859 s->current_picture.data[0] += s->linesize;
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1092
diff changeset
1860 s->current_picture.data[1] += s->uvlinesize;
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1092
diff changeset
1861 s->current_picture.data[2] += s->uvlinesize;
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1092
diff changeset
1862 }
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1092
diff changeset
1863 s->linesize *= 2;
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1092
diff changeset
1864 s->uvlinesize *= 2;
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1092
diff changeset
1865 }
716
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1866 MPV_decode_mb(s, s->block);
1096
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1092
diff changeset
1867 if(s->picture_structure!=PICT_FRAME){
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1092
diff changeset
1868 s->linesize /= 2;
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1092
diff changeset
1869 s->uvlinesize /= 2;
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1092
diff changeset
1870 if(s->picture_structure == PICT_BOTTOM_FIELD){
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1092
diff changeset
1871 s->current_picture.data[0] -= s->linesize;
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1092
diff changeset
1872 s->current_picture.data[1] -= s->uvlinesize;
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1092
diff changeset
1873 s->current_picture.data[2] -= s->uvlinesize;
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1092
diff changeset
1874 }
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1092
diff changeset
1875 }
716
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1876
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1877 if (++s->mb_x >= s->mb_width) {
1098
b7f267d168b7 mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents: 1096
diff changeset
1878 if(s->picture_structure==PICT_FRAME){
b7f267d168b7 mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents: 1096
diff changeset
1879 ff_draw_horiz_band(s, 16*s->mb_y, 16);
b7f267d168b7 mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents: 1096
diff changeset
1880 }else{
b7f267d168b7 mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents: 1096
diff changeset
1881 if(!s->first_field){
b7f267d168b7 mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents: 1096
diff changeset
1882 ff_draw_horiz_band(s, 32*s->mb_y, 32);
b7f267d168b7 mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents: 1096
diff changeset
1883 }
b7f267d168b7 mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents: 1096
diff changeset
1884 }
716
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1885
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1886 s->mb_x = 0;
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1887 s->mb_y++;
694
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
1888 PRINT_QP("%s", "\n");
716
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1889 }
694
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
1890 PRINT_QP("%2d", s->qscale);
716
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1891
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1892 /* skip mb handling */
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1893 if (s->mb_incr == 0) {
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1894 /* read again increment */
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1895 s->mb_incr = 1;
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1896 for(;;) {
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1897 int code = get_vlc2(&s->gb, mbincr_vlc.table, MBINCR_VLC_BITS, 2);
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1898 if (code < 0)
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1899 goto eos; /* error = end of slice */
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1900 if (code >= 33) {
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1901 if (code == 33) {
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1902 s->mb_incr += 33;
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1903 }
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1904 /* otherwise, stuffing, nothing to do */
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1905 } else {
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1906 s->mb_incr += code;
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1907 break;
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1908 }
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1909 }
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1910 }
1096
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1092
diff changeset
1911 if(s->mb_y<<field_pic >= s->mb_height){
716
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1912 fprintf(stderr, "slice too long\n");
826
ce240888252d cleanup
michaelni
parents: 825
diff changeset
1913 return DECODE_SLICE_ERROR;
716
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1914 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1915 }
716
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1916 eos: //end of slice
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
1917
305
1de85b419387 emms was missing, found by juanjo but he didnt commit it?!
michaelni
parents: 296
diff changeset
1918 emms_c();
1096
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1092
diff changeset
1919 //intf("%d %d %d %d\n", s->mb_y, s->mb_height, s->pict_type, s->picture_number);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1920 /* end of slice reached */
1096
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1092
diff changeset
1921 if (s->mb_y<<field_pic == s->mb_height && !s->first_field) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1922 /* end of image */
903
22ee74da2cd3 cleanup
michaelni
parents: 890
diff changeset
1923
22ee74da2cd3 cleanup
michaelni
parents: 890
diff changeset
1924 if(s->mpeg2)
22ee74da2cd3 cleanup
michaelni
parents: 890
diff changeset
1925 s->qscale >>=1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1926
986e461dc072 Initial revision
glantau
parents:
diff changeset
1927 MPV_frame_end(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1928
924
3814e9115672 cleanup / messup?
michaelni
parents: 918
diff changeset
1929 if (s->pict_type == B_TYPE || s->low_delay) {
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
1930 *pict= *(AVFrame*)&s->current_picture;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1931 } else {
903
22ee74da2cd3 cleanup
michaelni
parents: 890
diff changeset
1932 s->picture_number++;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1933 /* latency of 1 frame for I and P frames */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1934 /* XXX: use another variable than picture_number */
933
8254eac24488 * fix for empty image queue
kabi
parents: 930
diff changeset
1935 if (s->last_picture.data[0] == NULL) {
903
22ee74da2cd3 cleanup
michaelni
parents: 890
diff changeset
1936 return DECODE_SLICE_OK;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1937 } else {
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
1938 *pict= *(AVFrame*)&s->last_picture;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1939 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1940 }
903
22ee74da2cd3 cleanup
michaelni
parents: 890
diff changeset
1941 return DECODE_SLICE_EOP;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1942 } else {
826
ce240888252d cleanup
michaelni
parents: 825
diff changeset
1943 return DECODE_SLICE_OK;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1944 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1945 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1946
986e461dc072 Initial revision
glantau
parents:
diff changeset
1947 static int mpeg1_decode_sequence(AVCodecContext *avctx,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
1948 uint8_t *buf, int buf_size)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1949 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1950 Mpeg1Context *s1 = avctx->priv_data;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1951 MpegEncContext *s = &s1->mpeg_enc_ctx;
38
5bf15419d47e changed quant matrix order (should fix mmx mpeg decoding bug)
glantau
parents: 21
diff changeset
1952 int width, height, i, v, j;
917
d3aa313dc373 mpeg1&2 aspect decoding
michaelni
parents: 911
diff changeset
1953 float aspect;
401
e20655449d4a mpeg1/2 identifier - fixed frame rate for some bad mpeg1 streams
glantau
parents: 391
diff changeset
1954
1025
1f9afd8b9131 GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents: 1021
diff changeset
1955 init_get_bits(&s->gb, buf, buf_size*8);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1956
986e461dc072 Initial revision
glantau
parents:
diff changeset
1957 width = get_bits(&s->gb, 12);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1958 height = get_bits(&s->gb, 12);
917
d3aa313dc373 mpeg1&2 aspect decoding
michaelni
parents: 911
diff changeset
1959 s->aspect_ratio_info= get_bits(&s->gb, 4);
d3aa313dc373 mpeg1&2 aspect decoding
michaelni
parents: 911
diff changeset
1960 if(!s->mpeg2){
d3aa313dc373 mpeg1&2 aspect decoding
michaelni
parents: 911
diff changeset
1961 aspect= mpeg1_aspect[s->aspect_ratio_info];
d3aa313dc373 mpeg1&2 aspect decoding
michaelni
parents: 911
diff changeset
1962 if(aspect!=0.0) avctx->aspect_ratio= width/(aspect*height);
d3aa313dc373 mpeg1&2 aspect decoding
michaelni
parents: 911
diff changeset
1963 }
d3aa313dc373 mpeg1&2 aspect decoding
michaelni
parents: 911
diff changeset
1964
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1965 s->frame_rate_index = get_bits(&s->gb, 4);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1966 if (s->frame_rate_index == 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1967 return -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1968 s->bit_rate = get_bits(&s->gb, 18) * 400;
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
1969 if (get_bits1(&s->gb) == 0) /* marker */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1970 return -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1971 if (width <= 0 || height <= 0 ||
986e461dc072 Initial revision
glantau
parents:
diff changeset
1972 (width % 2) != 0 || (height % 2) != 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1973 return -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1974 if (width != s->width ||
986e461dc072 Initial revision
glantau
parents:
diff changeset
1975 height != s->height) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1976 /* start new mpeg1 context decoding */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1977 s->out_format = FMT_MPEG1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1978 if (s1->mpeg_enc_ctx_allocated) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1979 MPV_common_end(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1980 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1981 s->width = width;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1982 s->height = height;
924
3814e9115672 cleanup / messup?
michaelni
parents: 918
diff changeset
1983 avctx->has_b_frames= 1;
69
361631a8d140 copy avctx
glantau
parents: 64
diff changeset
1984 s->avctx = avctx;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1985 avctx->width = width;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1986 avctx->height = height;
401
e20655449d4a mpeg1/2 identifier - fixed frame rate for some bad mpeg1 streams
glantau
parents: 391
diff changeset
1987 if (s->frame_rate_index >= 9) {
e20655449d4a mpeg1/2 identifier - fixed frame rate for some bad mpeg1 streams
glantau
parents: 391
diff changeset
1988 /* at least give a valid frame rate (some old mpeg1 have this) */
e20655449d4a mpeg1/2 identifier - fixed frame rate for some bad mpeg1 streams
glantau
parents: 391
diff changeset
1989 avctx->frame_rate = 25 * FRAME_RATE_BASE;
e20655449d4a mpeg1/2 identifier - fixed frame rate for some bad mpeg1 streams
glantau
parents: 391
diff changeset
1990 } else {
e20655449d4a mpeg1/2 identifier - fixed frame rate for some bad mpeg1 streams
glantau
parents: 391
diff changeset
1991 avctx->frame_rate = frame_rate_tab[s->frame_rate_index];
e20655449d4a mpeg1/2 identifier - fixed frame rate for some bad mpeg1 streams
glantau
parents: 391
diff changeset
1992 }
267
e10840e4f773 - Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents: 241
diff changeset
1993 s->frame_rate = avctx->frame_rate;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1994 avctx->bit_rate = s->bit_rate;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1995
986e461dc072 Initial revision
glantau
parents:
diff changeset
1996 if (MPV_common_init(s) < 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1997 return -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1998 s1->mpeg_enc_ctx_allocated = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1999 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2000
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
2001 skip_bits(&s->gb, 10); /* vbv_buffer_size */
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
2002 skip_bits(&s->gb, 1);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2003
986e461dc072 Initial revision
glantau
parents:
diff changeset
2004 /* get matrix */
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
2005 if (get_bits1(&s->gb)) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2006 for(i=0;i<64;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
2007 v = get_bits(&s->gb, 8);
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 694
diff changeset
2008 j = s->intra_scantable.permutated[i];
38
5bf15419d47e changed quant matrix order (should fix mmx mpeg decoding bug)
glantau
parents: 21
diff changeset
2009 s->intra_matrix[j] = v;
5bf15419d47e changed quant matrix order (should fix mmx mpeg decoding bug)
glantau
parents: 21
diff changeset
2010 s->chroma_intra_matrix[j] = v;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2011 }
59
efd3c19f6d62 fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents: 58
diff changeset
2012 #ifdef DEBUG
efd3c19f6d62 fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents: 58
diff changeset
2013 dprintf("intra matrix present\n");
efd3c19f6d62 fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents: 58
diff changeset
2014 for(i=0;i<64;i++)
710
97377ab86647 forgot zigzag_direct[] behind #ifdef DEBUG (found by Klaas-Pieter Vlieg <vlieg at eurescom dot de>)
michaelni
parents: 706
diff changeset
2015 dprintf(" %d", s->intra_matrix[s->intra_scantable.permutated[i]]);
59
efd3c19f6d62 fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents: 58
diff changeset
2016 printf("\n");
efd3c19f6d62 fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents: 58
diff changeset
2017 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2018 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
2019 for(i=0;i<64;i++) {
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1085
diff changeset
2020 int j= s->dsp.idct_permutation[i];
533
3c07cf9595de adding ff prefix to avoid global name conficts with xvid (patch by Marko Kreen <marko at l-t.ee>)
michaelni
parents: 520
diff changeset
2021 v = ff_mpeg1_default_intra_matrix[i];
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 694
diff changeset
2022 s->intra_matrix[j] = v;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 694
diff changeset
2023 s->chroma_intra_matrix[j] = v;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2024 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2025 }
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
2026 if (get_bits1(&s->gb)) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2027 for(i=0;i<64;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
2028 v = get_bits(&s->gb, 8);
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 694
diff changeset
2029 j = s->intra_scantable.permutated[i];
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 313
diff changeset
2030 s->inter_matrix[j] = v;
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 313
diff changeset
2031 s->chroma_inter_matrix[j] = v;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2032 }
59
efd3c19f6d62 fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents: 58
diff changeset
2033 #ifdef DEBUG
efd3c19f6d62 fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents: 58
diff changeset
2034 dprintf("non intra matrix present\n");
efd3c19f6d62 fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents: 58
diff changeset
2035 for(i=0;i<64;i++)
710
97377ab86647 forgot zigzag_direct[] behind #ifdef DEBUG (found by Klaas-Pieter Vlieg <vlieg at eurescom dot de>)
michaelni
parents: 706
diff changeset
2036 dprintf(" %d", s->inter_matrix[s->intra_scantable.permutated[i]]);
59
efd3c19f6d62 fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents: 58
diff changeset
2037 printf("\n");
efd3c19f6d62 fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents: 58
diff changeset
2038 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2039 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
2040 for(i=0;i<64;i++) {
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1085
diff changeset
2041 int j= s->dsp.idct_permutation[i];
533
3c07cf9595de adding ff prefix to avoid global name conficts with xvid (patch by Marko Kreen <marko at l-t.ee>)
michaelni
parents: 520
diff changeset
2042 v = ff_mpeg1_default_non_intra_matrix[i];
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 694
diff changeset
2043 s->inter_matrix[j] = v;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 694
diff changeset
2044 s->chroma_inter_matrix[j] = v;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2045 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2046 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2047
986e461dc072 Initial revision
glantau
parents:
diff changeset
2048 /* we set mpeg2 parameters so that it emulates mpeg1 */
986e461dc072 Initial revision
glantau
parents:
diff changeset
2049 s->progressive_sequence = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2050 s->progressive_frame = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2051 s->picture_structure = PICT_FRAME;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2052 s->frame_pred_frame_dct = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2053 s->mpeg2 = 0;
401
e20655449d4a mpeg1/2 identifier - fixed frame rate for some bad mpeg1 streams
glantau
parents: 391
diff changeset
2054 avctx->sub_id = 1; /* indicates mpeg1 */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2055 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2056 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2057
1084
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2058 static void mpeg_decode_user_data(AVCodecContext *avctx,
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2059 const uint8_t *buf, int buf_size)
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2060 {
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2061 const uint8_t *p;
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2062 int len, flags;
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2063 p = buf;
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2064 len = buf_size;
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2065
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2066 /* we parse the DTG active format information */
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2067 if (len >= 5 &&
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2068 p[0] == 'D' && p[1] == 'T' && p[2] == 'G' && p[3] == '1') {
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2069 flags = p[4];
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2070 p += 5;
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2071 len -= 5;
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2072 if (flags & 0x80) {
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2073 /* skip event id */
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2074 if (len < 2)
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2075 return;
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2076 p += 2;
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2077 len -= 2;
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2078 }
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2079 if (flags & 0x40) {
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2080 if (len < 1)
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2081 return;
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2082 avctx->dtg_active_format = p[0] & 0x0f;
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2083 }
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2084 }
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2085 }
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2086
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2087 /* handle buffering and image synchronisation */
986e461dc072 Initial revision
glantau
parents:
diff changeset
2088 static int mpeg_decode_frame(AVCodecContext *avctx,
986e461dc072 Initial revision
glantau
parents:
diff changeset
2089 void *data, int *data_size,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
2090 uint8_t *buf, int buf_size)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2091 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
2092 Mpeg1Context *s = avctx->priv_data;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
2093 uint8_t *buf_end, *buf_ptr, *buf_start;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2094 int len, start_code_found, ret, code, start_code, input_size;
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
2095 AVFrame *picture = data;
267
e10840e4f773 - Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents: 241
diff changeset
2096 MpegEncContext *s2 = &s->mpeg_enc_ctx;
e10840e4f773 - Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents: 241
diff changeset
2097
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2098 dprintf("fill_buffer\n");
986e461dc072 Initial revision
glantau
parents:
diff changeset
2099
986e461dc072 Initial revision
glantau
parents:
diff changeset
2100 *data_size = 0;
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 313
diff changeset
2101
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2102 /* special case for last picture */
986e461dc072 Initial revision
glantau
parents:
diff changeset
2103 if (buf_size == 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
2104 if (s2->picture_number > 0) {
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
2105 *picture= *(AVFrame*)&s2->next_picture;
903
22ee74da2cd3 cleanup
michaelni
parents: 890
diff changeset
2106
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
2107 *data_size = sizeof(AVFrame);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2108 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2109 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2110 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2111
986e461dc072 Initial revision
glantau
parents:
diff changeset
2112 buf_ptr = buf;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2113 buf_end = buf + buf_size;
383
e6b64bc3bc87 - repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents: 377
diff changeset
2114
e6b64bc3bc87 - repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents: 377
diff changeset
2115 #if 0
e6b64bc3bc87 - repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents: 377
diff changeset
2116 if (s->repeat_field % 2 == 1) {
267
e10840e4f773 - Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents: 241
diff changeset
2117 s->repeat_field++;
e10840e4f773 - Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents: 241
diff changeset
2118 //fprintf(stderr,"\nRepeating last frame: %d -> %d! pict: %d %d", avctx->frame_number-1, avctx->frame_number,
383
e6b64bc3bc87 - repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents: 377
diff changeset
2119 // s2->picture_number, s->repeat_field);
e6b64bc3bc87 - repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents: 377
diff changeset
2120 if (avctx->flags & CODEC_FLAG_REPEAT_FIELD) {
e6b64bc3bc87 - repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents: 377
diff changeset
2121 *data_size = sizeof(AVPicture);
e6b64bc3bc87 - repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents: 377
diff changeset
2122 goto the_end;
e6b64bc3bc87 - repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents: 377
diff changeset
2123 }
267
e10840e4f773 - Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents: 241
diff changeset
2124 }
383
e6b64bc3bc87 - repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents: 377
diff changeset
2125 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2126 while (buf_ptr < buf_end) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
2127 buf_start = buf_ptr;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2128 /* find start next code */
986e461dc072 Initial revision
glantau
parents:
diff changeset
2129 code = find_start_code(&buf_ptr, buf_end, &s->header_state);
986e461dc072 Initial revision
glantau
parents:
diff changeset
2130 if (code >= 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
2131 start_code_found = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2132 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
2133 start_code_found = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2134 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2135 /* copy to buffer */
986e461dc072 Initial revision
glantau
parents:
diff changeset
2136 len = buf_ptr - buf_start;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2137 if (len + (s->buf_ptr - s->buffer) > s->buffer_size) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
2138 /* data too big : flush */
986e461dc072 Initial revision
glantau
parents:
diff changeset
2139 s->buf_ptr = s->buffer;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2140 if (start_code_found)
986e461dc072 Initial revision
glantau
parents:
diff changeset
2141 s->start_code = code;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2142 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
2143 memcpy(s->buf_ptr, buf_start, len);
986e461dc072 Initial revision
glantau
parents:
diff changeset
2144 s->buf_ptr += len;
842
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 826
diff changeset
2145 if( (!(s2->flags&CODEC_FLAG_TRUNCATED)) && (!start_code_found)
647
22b22723805e support decoding of the last mpeg "packet" even if no startcode is immedeatly afterwards (fixes bugs with mpeg in avi)
michaelni
parents: 639
diff changeset
2146 && s->buf_ptr+4<s->buffer+s->buffer_size){
22b22723805e support decoding of the last mpeg "packet" even if no startcode is immedeatly afterwards (fixes bugs with mpeg in avi)
michaelni
parents: 639
diff changeset
2147 start_code_found= 1;
22b22723805e support decoding of the last mpeg "packet" even if no startcode is immedeatly afterwards (fixes bugs with mpeg in avi)
michaelni
parents: 639
diff changeset
2148 code= 0x1FF;
22b22723805e support decoding of the last mpeg "packet" even if no startcode is immedeatly afterwards (fixes bugs with mpeg in avi)
michaelni
parents: 639
diff changeset
2149 s->header_state=0xFF;
22b22723805e support decoding of the last mpeg "packet" even if no startcode is immedeatly afterwards (fixes bugs with mpeg in avi)
michaelni
parents: 639
diff changeset
2150 s->buf_ptr[0]=0;
22b22723805e support decoding of the last mpeg "packet" even if no startcode is immedeatly afterwards (fixes bugs with mpeg in avi)
michaelni
parents: 639
diff changeset
2151 s->buf_ptr[1]=0;
22b22723805e support decoding of the last mpeg "packet" even if no startcode is immedeatly afterwards (fixes bugs with mpeg in avi)
michaelni
parents: 639
diff changeset
2152 s->buf_ptr[2]=1;
22b22723805e support decoding of the last mpeg "packet" even if no startcode is immedeatly afterwards (fixes bugs with mpeg in avi)
michaelni
parents: 639
diff changeset
2153 s->buf_ptr[3]=0xFF;
22b22723805e support decoding of the last mpeg "packet" even if no startcode is immedeatly afterwards (fixes bugs with mpeg in avi)
michaelni
parents: 639
diff changeset
2154 s->buf_ptr+=4;
22b22723805e support decoding of the last mpeg "packet" even if no startcode is immedeatly afterwards (fixes bugs with mpeg in avi)
michaelni
parents: 639
diff changeset
2155 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2156 if (start_code_found) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
2157 /* prepare data for next start code */
986e461dc072 Initial revision
glantau
parents:
diff changeset
2158 input_size = s->buf_ptr - s->buffer;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2159 start_code = s->start_code;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2160 s->buf_ptr = s->buffer;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2161 s->start_code = code;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2162 switch(start_code) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
2163 case SEQ_START_CODE:
986e461dc072 Initial revision
glantau
parents:
diff changeset
2164 mpeg1_decode_sequence(avctx, s->buffer,
986e461dc072 Initial revision
glantau
parents:
diff changeset
2165 input_size);
986e461dc072 Initial revision
glantau
parents:
diff changeset
2166 break;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2167
986e461dc072 Initial revision
glantau
parents:
diff changeset
2168 case PICTURE_START_CODE:
986e461dc072 Initial revision
glantau
parents:
diff changeset
2169 /* we have a complete image : we try to decompress it */
986e461dc072 Initial revision
glantau
parents:
diff changeset
2170 mpeg1_decode_picture(avctx,
986e461dc072 Initial revision
glantau
parents:
diff changeset
2171 s->buffer, input_size);
986e461dc072 Initial revision
glantau
parents:
diff changeset
2172 break;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2173 case EXT_START_CODE:
986e461dc072 Initial revision
glantau
parents:
diff changeset
2174 mpeg_decode_extension(avctx,
986e461dc072 Initial revision
glantau
parents:
diff changeset
2175 s->buffer, input_size);
986e461dc072 Initial revision
glantau
parents:
diff changeset
2176 break;
1084
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2177 case USER_START_CODE:
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2178 mpeg_decode_user_data(avctx,
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2179 s->buffer, input_size);
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2180 break;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2181 default:
986e461dc072 Initial revision
glantau
parents:
diff changeset
2182 if (start_code >= SLICE_MIN_START_CODE &&
911
4b2c86f1fee9 drop b frames if there are no reference frames
michaelni
parents: 903
diff changeset
2183 start_code <= SLICE_MAX_START_CODE) {
917
d3aa313dc373 mpeg1&2 aspect decoding
michaelni
parents: 911
diff changeset
2184
d3aa313dc373 mpeg1&2 aspect decoding
michaelni
parents: 911
diff changeset
2185 /* skip b frames if we dont have reference frames */
d3aa313dc373 mpeg1&2 aspect decoding
michaelni
parents: 911
diff changeset
2186 if(s2->last_picture.data[0]==NULL && s2->pict_type==B_TYPE) break;
d3aa313dc373 mpeg1&2 aspect decoding
michaelni
parents: 911
diff changeset
2187 /* skip b frames if we are in a hurry */
d3aa313dc373 mpeg1&2 aspect decoding
michaelni
parents: 911
diff changeset
2188 if(avctx->hurry_up && s2->pict_type==B_TYPE) break;
d3aa313dc373 mpeg1&2 aspect decoding
michaelni
parents: 911
diff changeset
2189 /* skip everything if we are in a hurry>=5 */
d3aa313dc373 mpeg1&2 aspect decoding
michaelni
parents: 911
diff changeset
2190 if(avctx->hurry_up>=5) break;
d3aa313dc373 mpeg1&2 aspect decoding
michaelni
parents: 911
diff changeset
2191
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2192 ret = mpeg_decode_slice(avctx, picture,
986e461dc072 Initial revision
glantau
parents:
diff changeset
2193 start_code, s->buffer, input_size);
1096
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1092
diff changeset
2194
826
ce240888252d cleanup
michaelni
parents: 825
diff changeset
2195 if (ret == DECODE_SLICE_EOP) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2196 *data_size = sizeof(AVPicture);
986e461dc072 Initial revision
glantau
parents:
diff changeset
2197 goto the_end;
825
92c6d8b71e3b handle init error in ffmpeg12
arpi_esp
parents: 813
diff changeset
2198 }else if(ret<0){
890
653d9419ea01 dont put flies in the stdout soup patch by (Agent Smith <asmith at wgz dot com>)
michaelni
parents: 885
diff changeset
2199 fprintf(stderr,"Error while decoding slice\n");
826
ce240888252d cleanup
michaelni
parents: 825
diff changeset
2200 if(ret==DECODE_SLICE_FATAL_ERROR) return -1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2201 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2202 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2203 break;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2204 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2205 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2206 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2207 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2208 the_end:
986e461dc072 Initial revision
glantau
parents:
diff changeset
2209 return buf_ptr - buf;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2210 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2211
986e461dc072 Initial revision
glantau
parents:
diff changeset
2212 static int mpeg_decode_end(AVCodecContext *avctx)
986e461dc072 Initial revision
glantau
parents:
diff changeset
2213 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
2214 Mpeg1Context *s = avctx->priv_data;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2215
986e461dc072 Initial revision
glantau
parents:
diff changeset
2216 if (s->mpeg_enc_ctx_allocated)
986e461dc072 Initial revision
glantau
parents:
diff changeset
2217 MPV_common_end(&s->mpeg_enc_ctx);
986e461dc072 Initial revision
glantau
parents:
diff changeset
2218 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2219 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2220
986e461dc072 Initial revision
glantau
parents:
diff changeset
2221 AVCodec mpeg_decoder = {
986e461dc072 Initial revision
glantau
parents:
diff changeset
2222 "mpegvideo",
986e461dc072 Initial revision
glantau
parents:
diff changeset
2223 CODEC_TYPE_VIDEO,
986e461dc072 Initial revision
glantau
parents:
diff changeset
2224 CODEC_ID_MPEG1VIDEO,
986e461dc072 Initial revision
glantau
parents:
diff changeset
2225 sizeof(Mpeg1Context),
986e461dc072 Initial revision
glantau
parents:
diff changeset
2226 mpeg_decode_init,
986e461dc072 Initial revision
glantau
parents:
diff changeset
2227 NULL,
986e461dc072 Initial revision
glantau
parents:
diff changeset
2228 mpeg_decode_end,
986e461dc072 Initial revision
glantau
parents:
diff changeset
2229 mpeg_decode_frame,
842
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 826
diff changeset
2230 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2231 };