annotate mpeg12.c @ 1164:0e3c0c4a7b3d libavcodec

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