annotate mpeg12.c @ 2497:69adfbbdcdeb libavcodec

- samples from mplayer ftp in the "adv" profile seem to have profile=2, which isn't the advanced one; and indeed, using adv. profile parser fails. Using normal parser works, and that's what is done - attempt at taking care of stride for NORM2 bitplane decoding - duplication of much code from msmpeg4.c; this code isn't yet used, but goes down as far as the block layer (mainly Transform Type stuff, the remains are wild editing without checking). Unusable yet, and lacks the AC decoding (but a step further in bitstream parsing) patch by anonymous
author michael
date Fri, 04 Feb 2005 02:20:38 +0000
parents f67b63ed036d
children fc23a5a86d97
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.
1739
07a484280a82 copyright year update of the files i touched and remembered, things look annoyingly unmaintained otherwise
michael
parents: 1732
diff changeset
4 * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
5 *
429
718a22dc121f license/copyright change
glantau
parents: 401
diff changeset
6 * This library is free software; you can redistribute it and/or
718a22dc121f license/copyright change
glantau
parents: 401
diff changeset
7 * modify it under the terms of the GNU Lesser General Public
718a22dc121f license/copyright change
glantau
parents: 401
diff changeset
8 * License as published by the Free Software Foundation; either
718a22dc121f license/copyright change
glantau
parents: 401
diff changeset
9 * version 2 of the License, or (at your option) any later version.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
10 *
429
718a22dc121f license/copyright change
glantau
parents: 401
diff changeset
11 * This library is distributed in the hope that it will be useful,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
429
718a22dc121f license/copyright change
glantau
parents: 401
diff changeset
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
718a22dc121f license/copyright change
glantau
parents: 401
diff changeset
14 * Lesser General Public License for more details.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
15 *
429
718a22dc121f license/copyright change
glantau
parents: 401
diff changeset
16 * You should have received a copy of the GNU Lesser General Public
718a22dc121f license/copyright change
glantau
parents: 401
diff changeset
17 * License along with this library; if not, write to the Free Software
718a22dc121f license/copyright change
glantau
parents: 401
diff changeset
18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
19 */
1106
1e39f273ecd6 per file doxy
michaelni
parents: 1098
diff changeset
20
1e39f273ecd6 per file doxy
michaelni
parents: 1098
diff changeset
21 /**
1e39f273ecd6 per file doxy
michaelni
parents: 1098
diff changeset
22 * @file mpeg12.c
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
23 * MPEG1/2 codec
1106
1e39f273ecd6 per file doxy
michaelni
parents: 1098
diff changeset
24 */
1e39f273ecd6 per file doxy
michaelni
parents: 1098
diff changeset
25
76
0b09bd08ef4b win32 fixes
glantau
parents: 69
diff changeset
26 //#define DEBUG
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
27 #include "avcodec.h"
986e461dc072 Initial revision
glantau
parents:
diff changeset
28 #include "dsputil.h"
986e461dc072 Initial revision
glantau
parents:
diff changeset
29 #include "mpegvideo.h"
986e461dc072 Initial revision
glantau
parents:
diff changeset
30
986e461dc072 Initial revision
glantau
parents:
diff changeset
31 #include "mpeg12data.h"
986e461dc072 Initial revision
glantau
parents:
diff changeset
32
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
33 //#undef NDEBUG
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
34 //#include <assert.h>
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
35
694
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
36
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
37 /* Start codes. */
986e461dc072 Initial revision
glantau
parents:
diff changeset
38 #define SEQ_END_CODE 0x000001b7
986e461dc072 Initial revision
glantau
parents:
diff changeset
39 #define SEQ_START_CODE 0x000001b3
986e461dc072 Initial revision
glantau
parents:
diff changeset
40 #define GOP_START_CODE 0x000001b8
986e461dc072 Initial revision
glantau
parents:
diff changeset
41 #define PICTURE_START_CODE 0x00000100
986e461dc072 Initial revision
glantau
parents:
diff changeset
42 #define SLICE_MIN_START_CODE 0x00000101
986e461dc072 Initial revision
glantau
parents:
diff changeset
43 #define SLICE_MAX_START_CODE 0x000001af
986e461dc072 Initial revision
glantau
parents:
diff changeset
44 #define EXT_START_CODE 0x000001b5
986e461dc072 Initial revision
glantau
parents:
diff changeset
45 #define USER_START_CODE 0x000001b2
986e461dc072 Initial revision
glantau
parents:
diff changeset
46
552
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
47 #define DC_VLC_BITS 9
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
48 #define MV_VLC_BITS 9
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
49 #define MBINCR_VLC_BITS 9
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
50 #define MB_PAT_VLC_BITS 9
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
51 #define MB_PTYPE_VLC_BITS 6
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
52 #define MB_BTYPE_VLC_BITS 6
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
53 #define TEX_VLC_BITS 9
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
54
1530
3b31998fe22f disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 1503
diff changeset
55 #ifdef CONFIG_ENCODERS
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
1530
3b31998fe22f disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 1503
diff changeset
60 #endif //CONFIG_ENCODERS
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);
2202
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
67 static inline int mpeg1_fast_decode_block_inter(MpegEncContext *s, DCTELEM *block, int n);
714
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
68 static inline int mpeg2_decode_block_non_intra(MpegEncContext *s,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
69 DCTELEM *block,
986e461dc072 Initial revision
glantau
parents:
diff changeset
70 int n);
714
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
71 static inline int mpeg2_decode_block_intra(MpegEncContext *s,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
72 DCTELEM *block,
986e461dc072 Initial revision
glantau
parents:
diff changeset
73 int n);
2201
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
74 static inline int mpeg2_fast_decode_block_non_intra(MpegEncContext *s, DCTELEM *block, int n);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
75 static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred);
1620
161632b8dbb4 silence few warnings
iive
parents: 1615
diff changeset
76 static void exchange_uv(MpegEncContext *s);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
77
1381
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
78 #ifdef HAVE_XVMC
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
79 extern int XVMC_field_start(MpegEncContext *s, AVCodecContext *avctx);
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
80 extern int XVMC_field_end(MpegEncContext *s);
1580
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1550
diff changeset
81 extern void XVMC_pack_pblocks(MpegEncContext *s,int cbp);
1620
161632b8dbb4 silence few warnings
iive
parents: 1615
diff changeset
82 extern void XVMC_init_block(MpegEncContext *s);//set s->block
1381
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
83 #endif
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
84
1821
1adbe0ab09fc use get_format
iive
parents: 1809
diff changeset
85 const enum PixelFormat pixfmt_yuv_420[]= {PIX_FMT_YUV420P,-1};
1adbe0ab09fc use get_format
iive
parents: 1809
diff changeset
86 const enum PixelFormat pixfmt_yuv_422[]= {PIX_FMT_YUV422P,-1};
1adbe0ab09fc use get_format
iive
parents: 1809
diff changeset
87 const enum PixelFormat pixfmt_yuv_444[]= {PIX_FMT_YUV444P,-1};
1adbe0ab09fc use get_format
iive
parents: 1809
diff changeset
88 const enum PixelFormat pixfmt_xvmc_mpg2_420[] = {
1adbe0ab09fc use get_format
iive
parents: 1809
diff changeset
89 PIX_FMT_XVMC_MPEG2_IDCT,
1adbe0ab09fc use get_format
iive
parents: 1809
diff changeset
90 PIX_FMT_XVMC_MPEG2_MC,
1adbe0ab09fc use get_format
iive
parents: 1809
diff changeset
91 -1};
947
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
92 #ifdef CONFIG_ENCODERS
1162
8c15d82c1893 some static -> dynamic alloc & 16->8 bit
michaelni
parents: 1160
diff changeset
93 static uint8_t (*mv_penalty)[MAX_MV*2+1]= NULL;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
94 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
95
947
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
96 static uint32_t uni_mpeg1_ac_vlc_bits[64*64*2];
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
97 static uint8_t uni_mpeg1_ac_vlc_len [64*64*2];
1325
1cbc2380d172 CONFIG_ENCODERS cleanup
michaelni
parents: 1323
diff changeset
98
1cbc2380d172 CONFIG_ENCODERS cleanup
michaelni
parents: 1323
diff changeset
99 /* simple include everything table for dc, first byte is bits number next 3 are code*/
1cbc2380d172 CONFIG_ENCODERS cleanup
michaelni
parents: 1323
diff changeset
100 static uint32_t mpeg1_lum_dc_uni[512];
1cbc2380d172 CONFIG_ENCODERS cleanup
michaelni
parents: 1323
diff changeset
101 static uint32_t mpeg1_chr_dc_uni[512];
1cbc2380d172 CONFIG_ENCODERS cleanup
michaelni
parents: 1323
diff changeset
102
1cbc2380d172 CONFIG_ENCODERS cleanup
michaelni
parents: 1323
diff changeset
103 static uint8_t mpeg1_index_run[2][64];
1cbc2380d172 CONFIG_ENCODERS cleanup
michaelni
parents: 1323
diff changeset
104 static int8_t mpeg1_max_level[2][64];
1530
3b31998fe22f disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 1503
diff changeset
105 #endif //CONFIG_ENCODERS
947
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
106
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2302
diff changeset
107 static void init_2d_vlc_rl(RLTable *rl, int use_static)
552
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
108 {
620
a5aa53b6e648 warning patch by (Dominik Mierzejewski <dominik at rangers dot eu dot org>)
michaelni
parents: 617
diff changeset
109 int i;
552
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
110
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
111 init_vlc(&rl->vlc, TEX_VLC_BITS, rl->n + 2,
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
112 &rl->table_vlc[0][1], 4, 2,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2302
diff changeset
113 &rl->table_vlc[0][0], 4, 2, use_static);
552
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
114
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2302
diff changeset
115 if(use_static)
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2302
diff changeset
116 rl->rl_vlc[0]= av_mallocz_static(rl->vlc.table_size*sizeof(RL_VLC_ELEM));
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2302
diff changeset
117 else
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2302
diff changeset
118 rl->rl_vlc[0]= av_malloc(rl->vlc.table_size*sizeof(RL_VLC_ELEM));
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2302
diff changeset
119
552
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
120 for(i=0; i<rl->vlc.table_size; i++){
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
121 int code= rl->vlc.table[i][0];
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
122 int len = rl->vlc.table[i][1];
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
123 int level, run;
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
124
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
125 if(len==0){ // illegal code
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
126 run= 65;
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
127 level= MAX_LEVEL;
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
128 }else if(len<0){ //more bits needed
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
129 run= 0;
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
130 level= code;
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
131 }else{
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
132 if(code==rl->n){ //esc
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
133 run= 65;
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
134 level= 0;
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
135 }else if(code==rl->n+1){ //eob
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
136 run= 0;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
137 level= 127;
552
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
138 }else{
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
139 run= rl->table_run [code] + 1;
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
140 level= rl->table_level[code];
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
141 }
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
142 }
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
143 rl->rl_vlc[0][i].len= len;
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
144 rl->rl_vlc[0][i].level= level;
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
145 rl->rl_vlc[0][i].run= run;
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
146 }
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
147 }
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
148
1325
1cbc2380d172 CONFIG_ENCODERS cleanup
michaelni
parents: 1323
diff changeset
149 #ifdef CONFIG_ENCODERS
947
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
150 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
151 int i;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
152
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
153 for(i=0; i<128; i++){
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
154 int level= i-64;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
155 int run;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
156 for(run=0; run<64; run++){
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
157 int len, bits, code;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
158
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
159 int alevel= ABS(level);
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
160 int sign= (level>>31)&1;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
161
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
162 if (alevel > rl->max_level[0][run])
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
163 code= 111; /*rl->n*/
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
164 else
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
165 code= rl->index_run[0][run] + alevel - 1;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
166
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
167 if (code < 111 /* rl->n */) {
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
168 /* store the vlc & sign at once */
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
169 len= mpeg1_vlc[code][1]+1;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
170 bits= (mpeg1_vlc[code][0]<<1) + sign;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
171 } else {
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
172 len= mpeg1_vlc[111/*rl->n*/][1]+6;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
173 bits= mpeg1_vlc[111/*rl->n*/][0]<<6;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
174
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
175 bits|= run;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
176 if (alevel < 128) {
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
177 bits<<=8; len+=8;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
178 bits|= level & 0xff;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
179 } else {
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
180 bits<<=16; len+=16;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
181 bits|= level & 0xff;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
182 if (level < 0) {
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
183 bits|= 0x8001 + level + 255;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
184 } else {
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
185 bits|= level & 0xffff;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
186 }
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
187 }
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
188 }
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
189
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
190 uni_ac_vlc_bits[UNI_AC_ENC_INDEX(run, i)]= bits;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
191 uni_ac_vlc_len [UNI_AC_ENC_INDEX(run, i)]= len;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
192 }
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
193 }
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
194 }
552
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
195
1749
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
196
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
197 static int find_frame_rate_index(MpegEncContext *s){
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
198 int i;
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
199 int64_t dmin= INT64_MAX;
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
200 int64_t d;
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
201
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
202 for(i=1;i<14;i++) {
1837
a4d9e8b4e2f8 AVCodec.supported_framerates
michael
parents: 1827
diff changeset
203 int64_t n0= 1001LL/frame_rate_tab[i].den*frame_rate_tab[i].num*s->avctx->frame_rate_base;
a4d9e8b4e2f8 AVCodec.supported_framerates
michael
parents: 1827
diff changeset
204 int64_t n1= 1001LL*s->avctx->frame_rate;
1749
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
205 if(s->avctx->strict_std_compliance >= 0 && i>=9) break;
1837
a4d9e8b4e2f8 AVCodec.supported_framerates
michael
parents: 1827
diff changeset
206
a4d9e8b4e2f8 AVCodec.supported_framerates
michael
parents: 1827
diff changeset
207 d = ABS(n0 - n1);
1749
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
208 if(d < dmin){
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
209 dmin=d;
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
210 s->frame_rate_index= i;
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
211 }
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
212 }
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
213 if(dmin)
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
214 return -1;
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
215 else
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
216 return 0;
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
217 }
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
218
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
219 static int encode_init(AVCodecContext *avctx)
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
220 {
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
221 MpegEncContext *s = avctx->priv_data;
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
222
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
223 if(MPV_encode_init(avctx) < 0)
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
224 return -1;
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
225
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
226 if(find_frame_rate_index(s) < 0){
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
227 if(s->strict_std_compliance >=0){
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
228 av_log(avctx, AV_LOG_ERROR, "MPEG1/2 doesnt support %d/%d fps\n", avctx->frame_rate, avctx->frame_rate_base);
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
229 return -1;
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
230 }else{
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
231 av_log(avctx, AV_LOG_INFO, "MPEG1/2 doesnt support %d/%d fps, there may be AV sync issues\n", avctx->frame_rate, avctx->frame_rate_base);
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
232 }
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
233 }
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
234
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
235 return 0;
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
236 }
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
237
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
238 static void put_header(MpegEncContext *s, int header)
986e461dc072 Initial revision
glantau
parents:
diff changeset
239 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
240 align_put_bits(&s->pb);
236
4a090f1da60a optimize mpeg1_encode_block()
michaelni
parents: 76
diff changeset
241 put_bits(&s->pb, 16, header>>16);
4a090f1da60a optimize mpeg1_encode_block()
michaelni
parents: 76
diff changeset
242 put_bits(&s->pb, 16, header&0xFFFF);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
243 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
244
986e461dc072 Initial revision
glantau
parents:
diff changeset
245 /* put sequence header if needed */
986e461dc072 Initial revision
glantau
parents:
diff changeset
246 static void mpeg1_encode_sequence_header(MpegEncContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
247 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
248 unsigned int vbv_buffer_size;
1
383bfb30fc84 fixed unsigned pb
glantau
parents: 0
diff changeset
249 unsigned int fps, v;
1904
129236143f2e warning patrol
mellum
parents: 1903
diff changeset
250 int i;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
251 uint64_t time_code;
918
f9e54ade14a1 aspect ratio encoding for mpeg1
michaelni
parents: 917
diff changeset
252 float best_aspect_error= 1E10;
1548
dd544554ed42 AVRational
michael
parents: 1546
diff changeset
253 float aspect_ratio= av_q2d(s->avctx->sample_aspect_ratio);
1479
f718b60fedc2 constraint_parameter_flag fix
michaelni
parents: 1432
diff changeset
254 int constraint_parameter_flag;
918
f9e54ade14a1 aspect ratio encoding for mpeg1
michaelni
parents: 917
diff changeset
255
1548
dd544554ed42 AVRational
michael
parents: 1546
diff changeset
256 if(aspect_ratio==0.0) aspect_ratio= 1.0; //pixel aspect 1:1 (VGA)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
257
903
22ee74da2cd3 cleanup
michaelni
parents: 890
diff changeset
258 if (s->current_picture.key_frame) {
1837
a4d9e8b4e2f8 AVCodec.supported_framerates
michael
parents: 1827
diff changeset
259 AVRational framerate= frame_rate_tab[s->frame_rate_index];
a4d9e8b4e2f8 AVCodec.supported_framerates
michael
parents: 1827
diff changeset
260
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
261 /* mpeg1 header repeated every gop */
986e461dc072 Initial revision
glantau
parents:
diff changeset
262 put_header(s, SEQ_START_CODE);
986e461dc072 Initial revision
glantau
parents:
diff changeset
263
986e461dc072 Initial revision
glantau
parents:
diff changeset
264 put_bits(&s->pb, 12, s->width);
986e461dc072 Initial revision
glantau
parents:
diff changeset
265 put_bits(&s->pb, 12, s->height);
918
f9e54ade14a1 aspect ratio encoding for mpeg1
michaelni
parents: 917
diff changeset
266
f9e54ade14a1 aspect ratio encoding for mpeg1
michaelni
parents: 917
diff changeset
267 for(i=1; i<15; i++){
1550
fca47124001d mpeg2 aspect ratio encoding fixed
michael
parents: 1548
diff changeset
268 float error= aspect_ratio;
fca47124001d mpeg2 aspect ratio encoding fixed
michael
parents: 1548
diff changeset
269 if(s->codec_id == CODEC_ID_MPEG1VIDEO || i <=1)
1587
b69b086f5570 100l (SAR is written as height/width instead of width/height in the MPEG1 standard)
michael
parents: 1580
diff changeset
270 error-= 1.0/mpeg1_aspect[i];
1550
fca47124001d mpeg2 aspect ratio encoding fixed
michael
parents: 1548
diff changeset
271 else
fca47124001d mpeg2 aspect ratio encoding fixed
michael
parents: 1548
diff changeset
272 error-= av_q2d(mpeg2_aspect[i])*s->height/s->width;
fca47124001d mpeg2 aspect ratio encoding fixed
michael
parents: 1548
diff changeset
273
918
f9e54ade14a1 aspect ratio encoding for mpeg1
michaelni
parents: 917
diff changeset
274 error= ABS(error);
f9e54ade14a1 aspect ratio encoding for mpeg1
michaelni
parents: 917
diff changeset
275
f9e54ade14a1 aspect ratio encoding for mpeg1
michaelni
parents: 917
diff changeset
276 if(error < best_aspect_error){
f9e54ade14a1 aspect ratio encoding for mpeg1
michaelni
parents: 917
diff changeset
277 best_aspect_error= error;
f9e54ade14a1 aspect ratio encoding for mpeg1
michaelni
parents: 917
diff changeset
278 s->aspect_ratio_info= i;
f9e54ade14a1 aspect ratio encoding for mpeg1
michaelni
parents: 917
diff changeset
279 }
f9e54ade14a1 aspect ratio encoding for mpeg1
michaelni
parents: 917
diff changeset
280 }
f9e54ade14a1 aspect ratio encoding for mpeg1
michaelni
parents: 917
diff changeset
281
f9e54ade14a1 aspect ratio encoding for mpeg1
michaelni
parents: 917
diff changeset
282 put_bits(&s->pb, 4, s->aspect_ratio_info);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
283 put_bits(&s->pb, 4, s->frame_rate_index);
1430
248d9ae1033c bit_rate in mpeg1/2 should be 0x3FFFF for vbr or at least >= max_bitrate
michaelni
parents: 1429
diff changeset
284
248d9ae1033c bit_rate in mpeg1/2 should be 0x3FFFF for vbr or at least >= max_bitrate
michaelni
parents: 1429
diff changeset
285 if(s->avctx->rc_max_rate){
248d9ae1033c bit_rate in mpeg1/2 should be 0x3FFFF for vbr or at least >= max_bitrate
michaelni
parents: 1429
diff changeset
286 v = (s->avctx->rc_max_rate + 399) / 400;
248d9ae1033c bit_rate in mpeg1/2 should be 0x3FFFF for vbr or at least >= max_bitrate
michaelni
parents: 1429
diff changeset
287 if (v > 0x3ffff && s->codec_id == CODEC_ID_MPEG1VIDEO)
248d9ae1033c bit_rate in mpeg1/2 should be 0x3FFFF for vbr or at least >= max_bitrate
michaelni
parents: 1429
diff changeset
288 v = 0x3ffff;
248d9ae1033c bit_rate in mpeg1/2 should be 0x3FFFF for vbr or at least >= max_bitrate
michaelni
parents: 1429
diff changeset
289 }else{
248d9ae1033c bit_rate in mpeg1/2 should be 0x3FFFF for vbr or at least >= max_bitrate
michaelni
parents: 1429
diff changeset
290 v= 0x3FFFF;
248d9ae1033c bit_rate in mpeg1/2 should be 0x3FFFF for vbr or at least >= max_bitrate
michaelni
parents: 1429
diff changeset
291 }
639
f449913e8419 new vbv calculation patch by (Henry Mason <talus25 at speakeasy dot net>) with slight modification by me
michaelni
parents: 620
diff changeset
292
f449913e8419 new vbv calculation patch by (Henry Mason <talus25 at speakeasy dot net>) with slight modification by me
michaelni
parents: 620
diff changeset
293 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
294 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
295 else
f449913e8419 new vbv calculation patch by (Henry Mason <talus25 at speakeasy dot net>) with slight modification by me
michaelni
parents: 620
diff changeset
296 /* VBV calculation: Scaled so that a VCD has the proper VBV size of 40 kilobytes */
1430
248d9ae1033c bit_rate in mpeg1/2 should be 0x3FFFF for vbr or at least >= max_bitrate
michaelni
parents: 1429
diff changeset
297 vbv_buffer_size = (( 20 * s->bit_rate) / (1151929 / 2)) * 8 * 1024;
248d9ae1033c bit_rate in mpeg1/2 should be 0x3FFFF for vbr or at least >= max_bitrate
michaelni
parents: 1429
diff changeset
298 vbv_buffer_size= (vbv_buffer_size + 16383) / 16384;
248d9ae1033c bit_rate in mpeg1/2 should be 0x3FFFF for vbr or at least >= max_bitrate
michaelni
parents: 1429
diff changeset
299
248d9ae1033c bit_rate in mpeg1/2 should be 0x3FFFF for vbr or at least >= max_bitrate
michaelni
parents: 1429
diff changeset
300 put_bits(&s->pb, 18, v & 0x3FFFF);
248d9ae1033c bit_rate in mpeg1/2 should be 0x3FFFF for vbr or at least >= max_bitrate
michaelni
parents: 1429
diff changeset
301 put_bits(&s->pb, 1, 1); /* marker */
1479
f718b60fedc2 constraint_parameter_flag fix
michaelni
parents: 1432
diff changeset
302 put_bits(&s->pb, 10, vbv_buffer_size & 0x3FF);
f718b60fedc2 constraint_parameter_flag fix
michaelni
parents: 1432
diff changeset
303
f718b60fedc2 constraint_parameter_flag fix
michaelni
parents: 1432
diff changeset
304 constraint_parameter_flag=
f718b60fedc2 constraint_parameter_flag fix
michaelni
parents: 1432
diff changeset
305 s->width <= 768 && s->height <= 576 &&
f718b60fedc2 constraint_parameter_flag fix
michaelni
parents: 1432
diff changeset
306 s->mb_width * s->mb_height <= 396 &&
1837
a4d9e8b4e2f8 AVCodec.supported_framerates
michael
parents: 1827
diff changeset
307 s->mb_width * s->mb_height * framerate.num <= framerate.den*396*25 &&
a4d9e8b4e2f8 AVCodec.supported_framerates
michael
parents: 1827
diff changeset
308 framerate.num <= framerate.den*30 &&
2302
857e16e85aea fix constrained parameters flag
michael
parents: 2270
diff changeset
309 s->avctx->me_range && s->avctx->me_range < 128 &&
1479
f718b60fedc2 constraint_parameter_flag fix
michaelni
parents: 1432
diff changeset
310 vbv_buffer_size <= 20 &&
f718b60fedc2 constraint_parameter_flag fix
michaelni
parents: 1432
diff changeset
311 v <= 1856000/400 &&
f718b60fedc2 constraint_parameter_flag fix
michaelni
parents: 1432
diff changeset
312 s->codec_id == CODEC_ID_MPEG1VIDEO;
f718b60fedc2 constraint_parameter_flag fix
michaelni
parents: 1432
diff changeset
313
f718b60fedc2 constraint_parameter_flag fix
michaelni
parents: 1432
diff changeset
314 put_bits(&s->pb, 1, constraint_parameter_flag);
1411
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1410
diff changeset
315
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1410
diff changeset
316 ff_write_quant_matrix(&s->pb, s->avctx->intra_matrix);
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1410
diff changeset
317 ff_write_quant_matrix(&s->pb, s->avctx->inter_matrix);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
318
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
319 if(s->codec_id == CODEC_ID_MPEG2VIDEO){
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
320 put_header(s, EXT_START_CODE);
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
321 put_bits(&s->pb, 4, 1); //seq ext
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
322 put_bits(&s->pb, 1, 0); //esc
2167
76334bbb5038 user overrideable level & profile
michael
parents: 2130
diff changeset
323
76334bbb5038 user overrideable level & profile
michael
parents: 2130
diff changeset
324 if(s->avctx->profile == FF_PROFILE_UNKNOWN){
76334bbb5038 user overrideable level & profile
michael
parents: 2130
diff changeset
325 put_bits(&s->pb, 3, 4); //profile
76334bbb5038 user overrideable level & profile
michael
parents: 2130
diff changeset
326 }else{
76334bbb5038 user overrideable level & profile
michael
parents: 2130
diff changeset
327 put_bits(&s->pb, 3, s->avctx->profile); //profile
76334bbb5038 user overrideable level & profile
michael
parents: 2130
diff changeset
328 }
76334bbb5038 user overrideable level & profile
michael
parents: 2130
diff changeset
329
76334bbb5038 user overrideable level & profile
michael
parents: 2130
diff changeset
330 if(s->avctx->level == FF_LEVEL_UNKNOWN){
76334bbb5038 user overrideable level & profile
michael
parents: 2130
diff changeset
331 put_bits(&s->pb, 4, 8); //level
76334bbb5038 user overrideable level & profile
michael
parents: 2130
diff changeset
332 }else{
76334bbb5038 user overrideable level & profile
michael
parents: 2130
diff changeset
333 put_bits(&s->pb, 4, s->avctx->level); //level
76334bbb5038 user overrideable level & profile
michael
parents: 2130
diff changeset
334 }
76334bbb5038 user overrideable level & profile
michael
parents: 2130
diff changeset
335
1677
c8b1b515d3b9 interlaced DCT support for MPEG2 encoding
bellard
parents: 1674
diff changeset
336 put_bits(&s->pb, 1, s->progressive_sequence);
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
337 put_bits(&s->pb, 2, 1); //chroma format 4:2:0
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
338 put_bits(&s->pb, 2, 0); //horizontal size ext
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
339 put_bits(&s->pb, 2, 0); //vertical size ext
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
340 put_bits(&s->pb, 12, v>>18); //bitrate ext
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
341 put_bits(&s->pb, 1, 1); //marker
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
342 put_bits(&s->pb, 8, vbv_buffer_size >>10); //vbv buffer ext
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
343 put_bits(&s->pb, 1, s->low_delay);
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
344 put_bits(&s->pb, 2, 0); // frame_rate_ext_n
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
345 put_bits(&s->pb, 5, 0); // frame_rate_ext_d
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
346 }
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
347
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
348 put_header(s, GOP_START_CODE);
986e461dc072 Initial revision
glantau
parents:
diff changeset
349 put_bits(&s->pb, 1, 0); /* do drop frame */
986e461dc072 Initial revision
glantau
parents:
diff changeset
350 /* time code : we must convert from the real frame rate to a
986e461dc072 Initial revision
glantau
parents:
diff changeset
351 fake mpeg frame rate in case of low frame rate */
1837
a4d9e8b4e2f8 AVCodec.supported_framerates
michael
parents: 1827
diff changeset
352 fps = (framerate.num + framerate.den/2)/ framerate.den;
1749
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
353 time_code = s->current_picture_ptr->coded_picture_number;
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
354
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
355 s->gop_picture_number = time_code;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
356 put_bits(&s->pb, 5, (uint32_t)((time_code / (fps * 3600)) % 24));
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
357 put_bits(&s->pb, 6, (uint32_t)((time_code / (fps * 60)) % 60));
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
358 put_bits(&s->pb, 1, 1);
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
359 put_bits(&s->pb, 6, (uint32_t)((time_code / fps) % 60));
1727
1ed3664b3523 gop timestamp fix
michael
parents: 1725
diff changeset
360 put_bits(&s->pb, 6, (uint32_t)((time_code % fps)));
1754
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1749
diff changeset
361 put_bits(&s->pb, 1, !!(s->flags & CODEC_FLAG_CLOSED_GOP));
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
362 put_bits(&s->pb, 1, 0); /* broken link */
986e461dc072 Initial revision
glantau
parents:
diff changeset
363 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
364 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
365
1160
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1150
diff changeset
366 static inline void encode_mb_skip_run(MpegEncContext *s, int run){
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1150
diff changeset
367 while (run >= 33) {
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1150
diff changeset
368 put_bits(&s->pb, 11, 0x008);
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1150
diff changeset
369 run -= 33;
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1150
diff changeset
370 }
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1150
diff changeset
371 put_bits(&s->pb, mbAddrIncrTable[run][1],
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1150
diff changeset
372 mbAddrIncrTable[run][0]);
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1150
diff changeset
373 }
1530
3b31998fe22f disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 1503
diff changeset
374 #endif //CONFIG_ENCODERS
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
375
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
376 static void common_init(MpegEncContext *s)
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
377 {
1888
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
378
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
379 s->y_dc_scale_table=
1992
938e47c809b0 intra_dc_precission>0 encoding support
michael
parents: 1990
diff changeset
380 s->c_dc_scale_table= mpeg2_dc_scale_table[s->intra_dc_precision];
1903
c94b19667d8b 1000l for iive
michael
parents: 1893
diff changeset
381
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
382 }
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
383
1325
1cbc2380d172 CONFIG_ENCODERS cleanup
michaelni
parents: 1323
diff changeset
384 void ff_mpeg1_clean_buffers(MpegEncContext *s){
1cbc2380d172 CONFIG_ENCODERS cleanup
michaelni
parents: 1323
diff changeset
385 s->last_dc[0] = 1 << (7 + s->intra_dc_precision);
1cbc2380d172 CONFIG_ENCODERS cleanup
michaelni
parents: 1323
diff changeset
386 s->last_dc[1] = s->last_dc[0];
1cbc2380d172 CONFIG_ENCODERS cleanup
michaelni
parents: 1323
diff changeset
387 s->last_dc[2] = s->last_dc[0];
1cbc2380d172 CONFIG_ENCODERS cleanup
michaelni
parents: 1323
diff changeset
388 memset(s->last_mv, 0, sizeof(s->last_mv));
1cbc2380d172 CONFIG_ENCODERS cleanup
michaelni
parents: 1323
diff changeset
389 }
1cbc2380d172 CONFIG_ENCODERS cleanup
michaelni
parents: 1323
diff changeset
390
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
391 #ifdef CONFIG_ENCODERS
1160
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1150
diff changeset
392
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1150
diff changeset
393 void ff_mpeg1_encode_slice_header(MpegEncContext *s){
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1150
diff changeset
394 put_header(s, SLICE_MIN_START_CODE + s->mb_y);
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1150
diff changeset
395 put_bits(&s->pb, 5, s->qscale); /* quantizer scale */
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1150
diff changeset
396 put_bits(&s->pb, 1, 0); /* slice extra information */
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1150
diff changeset
397 }
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1150
diff changeset
398
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
399 void mpeg1_encode_picture_header(MpegEncContext *s, int picture_number)
986e461dc072 Initial revision
glantau
parents:
diff changeset
400 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
401 mpeg1_encode_sequence_header(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
402
986e461dc072 Initial revision
glantau
parents:
diff changeset
403 /* mpeg1 picture header */
986e461dc072 Initial revision
glantau
parents:
diff changeset
404 put_header(s, PICTURE_START_CODE);
986e461dc072 Initial revision
glantau
parents:
diff changeset
405 /* temporal reference */
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
406
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
407 // 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
408 put_bits(&s->pb, 10, (s->picture_number -
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
409 s->gop_picture_number) & 0x3ff);
986e461dc072 Initial revision
glantau
parents:
diff changeset
410 put_bits(&s->pb, 3, s->pict_type);
1697
f3287b5d8d9f vbv_delay
michael
parents: 1692
diff changeset
411
1786
b7340afa261a get_bit_count -> put_bits_count
alex
parents: 1754
diff changeset
412 s->vbv_delay_ptr= s->pb.buf + put_bits_count(&s->pb)/8;
1697
f3287b5d8d9f vbv_delay
michael
parents: 1692
diff changeset
413 put_bits(&s->pb, 16, 0xFFFF); /* vbv_delay */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
414
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
415 // 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
416 if (s->pict_type == P_TYPE || s->pict_type == B_TYPE) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
417 put_bits(&s->pb, 1, 0); /* half pel coordinates */
1432
7406ed4479f7 fixing unused f_code values
michaelni
parents: 1430
diff changeset
418 if(s->codec_id == CODEC_ID_MPEG1VIDEO)
7406ed4479f7 fixing unused f_code values
michaelni
parents: 1430
diff changeset
419 put_bits(&s->pb, 3, s->f_code); /* forward_f_code */
7406ed4479f7 fixing unused f_code values
michaelni
parents: 1430
diff changeset
420 else
7406ed4479f7 fixing unused f_code values
michaelni
parents: 1430
diff changeset
421 put_bits(&s->pb, 3, 7); /* forward_f_code */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
422 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
423
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
424 // 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
425 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
426 put_bits(&s->pb, 1, 0); /* half pel coordinates */
1432
7406ed4479f7 fixing unused f_code values
michaelni
parents: 1430
diff changeset
427 if(s->codec_id == CODEC_ID_MPEG1VIDEO)
7406ed4479f7 fixing unused f_code values
michaelni
parents: 1430
diff changeset
428 put_bits(&s->pb, 3, s->b_code); /* backward_f_code */
7406ed4479f7 fixing unused f_code values
michaelni
parents: 1430
diff changeset
429 else
7406ed4479f7 fixing unused f_code values
michaelni
parents: 1430
diff changeset
430 put_bits(&s->pb, 3, 7); /* backward_f_code */
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
431 }
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
432
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
433 put_bits(&s->pb, 1, 0); /* extra bit picture */
1677
c8b1b515d3b9 interlaced DCT support for MPEG2 encoding
bellard
parents: 1674
diff changeset
434
c8b1b515d3b9 interlaced DCT support for MPEG2 encoding
bellard
parents: 1674
diff changeset
435 s->frame_pred_frame_dct = 1;
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
436 if(s->codec_id == CODEC_ID_MPEG2VIDEO){
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
437 put_header(s, EXT_START_CODE);
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
438 put_bits(&s->pb, 4, 8); //pic ext
1432
7406ed4479f7 fixing unused f_code values
michaelni
parents: 1430
diff changeset
439 if (s->pict_type == P_TYPE || s->pict_type == B_TYPE) {
7406ed4479f7 fixing unused f_code values
michaelni
parents: 1430
diff changeset
440 put_bits(&s->pb, 4, s->f_code);
7406ed4479f7 fixing unused f_code values
michaelni
parents: 1430
diff changeset
441 put_bits(&s->pb, 4, s->f_code);
7406ed4479f7 fixing unused f_code values
michaelni
parents: 1430
diff changeset
442 }else{
7406ed4479f7 fixing unused f_code values
michaelni
parents: 1430
diff changeset
443 put_bits(&s->pb, 8, 255);
7406ed4479f7 fixing unused f_code values
michaelni
parents: 1430
diff changeset
444 }
7406ed4479f7 fixing unused f_code values
michaelni
parents: 1430
diff changeset
445 if (s->pict_type == B_TYPE) {
7406ed4479f7 fixing unused f_code values
michaelni
parents: 1430
diff changeset
446 put_bits(&s->pb, 4, s->b_code);
7406ed4479f7 fixing unused f_code values
michaelni
parents: 1430
diff changeset
447 put_bits(&s->pb, 4, s->b_code);
7406ed4479f7 fixing unused f_code values
michaelni
parents: 1430
diff changeset
448 }else{
7406ed4479f7 fixing unused f_code values
michaelni
parents: 1430
diff changeset
449 put_bits(&s->pb, 8, 255);
7406ed4479f7 fixing unused f_code values
michaelni
parents: 1430
diff changeset
450 }
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
451 put_bits(&s->pb, 2, s->intra_dc_precision);
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1786
diff changeset
452
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1786
diff changeset
453 assert(s->picture_structure == PICT_FRAME);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1786
diff changeset
454 put_bits(&s->pb, 2, s->picture_structure);
1682
7b810155650f fixed top_field_first support when encoding
bellard
parents: 1677
diff changeset
455 if (s->progressive_sequence) {
7b810155650f fixed top_field_first support when encoding
bellard
parents: 1677
diff changeset
456 put_bits(&s->pb, 1, 0); /* no repeat */
7b810155650f fixed top_field_first support when encoding
bellard
parents: 1677
diff changeset
457 } else {
7b810155650f fixed top_field_first support when encoding
bellard
parents: 1677
diff changeset
458 put_bits(&s->pb, 1, s->current_picture_ptr->top_field_first);
7b810155650f fixed top_field_first support when encoding
bellard
parents: 1677
diff changeset
459 }
1677
c8b1b515d3b9 interlaced DCT support for MPEG2 encoding
bellard
parents: 1674
diff changeset
460 /* XXX: optimize the generation of this flag with entropy
c8b1b515d3b9 interlaced DCT support for MPEG2 encoding
bellard
parents: 1674
diff changeset
461 measures */
c8b1b515d3b9 interlaced DCT support for MPEG2 encoding
bellard
parents: 1674
diff changeset
462 s->frame_pred_frame_dct = s->progressive_sequence;
c8b1b515d3b9 interlaced DCT support for MPEG2 encoding
bellard
parents: 1674
diff changeset
463
c8b1b515d3b9 interlaced DCT support for MPEG2 encoding
bellard
parents: 1674
diff changeset
464 put_bits(&s->pb, 1, s->frame_pred_frame_dct);
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
465 put_bits(&s->pb, 1, s->concealment_motion_vectors);
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
466 put_bits(&s->pb, 1, s->q_scale_type);
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
467 put_bits(&s->pb, 1, s->intra_vlc_format);
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
468 put_bits(&s->pb, 1, s->alternate_scan);
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
469 put_bits(&s->pb, 1, s->repeat_first_field);
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
470 put_bits(&s->pb, 1, s->chroma_420_type=1);
1677
c8b1b515d3b9 interlaced DCT support for MPEG2 encoding
bellard
parents: 1674
diff changeset
471 s->progressive_frame = s->progressive_sequence;
c8b1b515d3b9 interlaced DCT support for MPEG2 encoding
bellard
parents: 1674
diff changeset
472 put_bits(&s->pb, 1, s->progressive_frame);
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
473 put_bits(&s->pb, 1, 0); //composite_display_flag
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
474 }
1721
8158e66f1f75 SVCD scan offset stuff
michael
parents: 1710
diff changeset
475 if(s->flags & CODEC_FLAG_SVCD_SCAN_OFFSET){
8158e66f1f75 SVCD scan offset stuff
michael
parents: 1710
diff changeset
476 int i;
8158e66f1f75 SVCD scan offset stuff
michael
parents: 1710
diff changeset
477
8158e66f1f75 SVCD scan offset stuff
michael
parents: 1710
diff changeset
478 put_header(s, USER_START_CODE);
8158e66f1f75 SVCD scan offset stuff
michael
parents: 1710
diff changeset
479 for(i=0; i<sizeof(svcd_scan_offset_placeholder); i++){
8158e66f1f75 SVCD scan offset stuff
michael
parents: 1710
diff changeset
480 put_bits(&s->pb, 8, svcd_scan_offset_placeholder[i]);
8158e66f1f75 SVCD scan offset stuff
michael
parents: 1710
diff changeset
481 }
8158e66f1f75 SVCD scan offset stuff
michael
parents: 1710
diff changeset
482 }
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
483
1160
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1150
diff changeset
484 s->mb_y=0;
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1150
diff changeset
485 ff_mpeg1_encode_slice_header(s);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
486 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
487
1677
c8b1b515d3b9 interlaced DCT support for MPEG2 encoding
bellard
parents: 1674
diff changeset
488 static inline void put_mb_modes(MpegEncContext *s, int n, int bits,
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
489 int has_mv, int field_motion)
1677
c8b1b515d3b9 interlaced DCT support for MPEG2 encoding
bellard
parents: 1674
diff changeset
490 {
c8b1b515d3b9 interlaced DCT support for MPEG2 encoding
bellard
parents: 1674
diff changeset
491 put_bits(&s->pb, n, bits);
c8b1b515d3b9 interlaced DCT support for MPEG2 encoding
bellard
parents: 1674
diff changeset
492 if (!s->frame_pred_frame_dct) {
c8b1b515d3b9 interlaced DCT support for MPEG2 encoding
bellard
parents: 1674
diff changeset
493 if (has_mv)
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
494 put_bits(&s->pb, 2, 2 - field_motion); /* motion_type: frame/field */
1677
c8b1b515d3b9 interlaced DCT support for MPEG2 encoding
bellard
parents: 1674
diff changeset
495 put_bits(&s->pb, 1, s->interlaced_dct);
c8b1b515d3b9 interlaced DCT support for MPEG2 encoding
bellard
parents: 1674
diff changeset
496 }
c8b1b515d3b9 interlaced DCT support for MPEG2 encoding
bellard
parents: 1674
diff changeset
497 }
c8b1b515d3b9 interlaced DCT support for MPEG2 encoding
bellard
parents: 1674
diff changeset
498
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
499 void mpeg1_encode_mb(MpegEncContext *s,
986e461dc072 Initial revision
glantau
parents:
diff changeset
500 DCTELEM block[6][64],
986e461dc072 Initial revision
glantau
parents:
diff changeset
501 int motion_x, int motion_y)
986e461dc072 Initial revision
glantau
parents:
diff changeset
502 {
1160
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1150
diff changeset
503 int i, cbp;
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1150
diff changeset
504 const int mb_x = s->mb_x;
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1150
diff changeset
505 const int mb_y = s->mb_y;
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1150
diff changeset
506 const int first_mb= mb_x == s->resync_mb_x && mb_y == s->resync_mb_y;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
507
986e461dc072 Initial revision
glantau
parents:
diff changeset
508 /* compute cbp */
986e461dc072 Initial revision
glantau
parents:
diff changeset
509 cbp = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
510 for(i=0;i<6;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
511 if (s->block_last_index[i] >= 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
512 cbp |= 1 << (5 - i);
986e461dc072 Initial revision
glantau
parents:
diff changeset
513 }
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
514
1915
284fb24da44d skiped mbs in interlaced b frames fix
michael
parents: 1904
diff changeset
515 if (cbp == 0 && !first_mb && s->mv_type == MV_TYPE_16X16 &&
284fb24da44d skiped mbs in interlaced b frames fix
michael
parents: 1904
diff changeset
516 (mb_x != s->mb_width - 1 || (mb_y != s->mb_height - 1 && s->codec_id == CODEC_ID_MPEG1VIDEO)) &&
284fb24da44d skiped mbs in interlaced b frames fix
michael
parents: 1904
diff changeset
517 ((s->pict_type == P_TYPE && (motion_x | motion_y) == 0) ||
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
518 (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
519 ((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
520 s->mb_skip_run++;
694
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
521 s->qscale -= s->dquant;
740
585c163c225a mpeg1 2pass encoding
michaelni
parents: 718
diff changeset
522 s->skip_count++;
585c163c225a mpeg1 2pass encoding
michaelni
parents: 718
diff changeset
523 s->misc_bits++;
585c163c225a mpeg1 2pass encoding
michaelni
parents: 718
diff changeset
524 s->last_bits++;
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
525 if(s->pict_type == P_TYPE){
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
526 s->last_mv[0][1][0]= s->last_mv[0][0][0]=
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
527 s->last_mv[0][1][1]= s->last_mv[0][0][1]= 0;
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
528 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
529 } else {
1160
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1150
diff changeset
530 if(first_mb){
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1150
diff changeset
531 assert(s->mb_skip_run == 0);
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1150
diff changeset
532 encode_mb_skip_run(s, s->mb_x);
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1150
diff changeset
533 }else{
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1150
diff changeset
534 encode_mb_skip_run(s, s->mb_skip_run);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
535 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
536
986e461dc072 Initial revision
glantau
parents:
diff changeset
537 if (s->pict_type == I_TYPE) {
694
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
538 if(s->dquant && cbp){
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
539 put_mb_modes(s, 2, 1, 0, 0); /* macroblock_type : macroblock_quant = 1 */
694
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
540 put_bits(&s->pb, 5, s->qscale);
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
541 }else{
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
542 put_mb_modes(s, 1, 1, 0, 0); /* macroblock_type : macroblock_quant = 0 */
694
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
543 s->qscale -= s->dquant;
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
544 }
740
585c163c225a mpeg1 2pass encoding
michaelni
parents: 718
diff changeset
545 s->misc_bits+= get_bits_diff(s);
585c163c225a mpeg1 2pass encoding
michaelni
parents: 718
diff changeset
546 s->i_count++;
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
547 } else if (s->mb_intra) {
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
548 if(s->dquant && cbp){
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
549 put_mb_modes(s, 6, 0x01, 0, 0);
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
550 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
551 }else{
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
552 put_mb_modes(s, 5, 0x03, 0, 0);
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
553 s->qscale -= s->dquant;
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
554 }
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
555 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
556 s->i_count++;
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
557 memset(s->last_mv, 0, sizeof(s->last_mv));
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
558 } else if (s->pict_type == P_TYPE) {
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
559 if(s->mv_type == MV_TYPE_16X16){
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
560 if (cbp != 0) {
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
561 if ((motion_x|motion_y) == 0) {
694
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
562 if(s->dquant){
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
563 put_mb_modes(s, 5, 1, 0, 0); /* macroblock_pattern & quant */
694
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
564 put_bits(&s->pb, 5, s->qscale);
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
565 }else{
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
566 put_mb_modes(s, 2, 1, 0, 0); /* macroblock_pattern only */
694
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
567 }
740
585c163c225a mpeg1 2pass encoding
michaelni
parents: 718
diff changeset
568 s->misc_bits+= get_bits_diff(s);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
569 } else {
694
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
570 if(s->dquant){
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
571 put_mb_modes(s, 5, 2, 1, 0); /* motion + cbp */
694
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
572 put_bits(&s->pb, 5, s->qscale);
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
573 }else{
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
574 put_mb_modes(s, 1, 1, 1, 0); /* motion + cbp */
694
20810b0193ef adaptive quantization for mpeg1
michaelni
parents: 647
diff changeset
575 }
740
585c163c225a mpeg1 2pass encoding
michaelni
parents: 718
diff changeset
576 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
577 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
578 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
579 s->mv_bits+= get_bits_diff(s);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
580 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
581 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
582 put_bits(&s->pb, 3, 1); /* motion only */
1677
c8b1b515d3b9 interlaced DCT support for MPEG2 encoding
bellard
parents: 1674
diff changeset
583 if (!s->frame_pred_frame_dct)
c8b1b515d3b9 interlaced DCT support for MPEG2 encoding
bellard
parents: 1674
diff changeset
584 put_bits(&s->pb, 2, 2); /* motion_type: frame */
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
585 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
586 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
587 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
588 s->qscale -= s->dquant;
740
585c163c225a mpeg1 2pass encoding
michaelni
parents: 718
diff changeset
589 s->mv_bits+= get_bits_diff(s);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
590 }
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
591 s->last_mv[0][1][0]= s->last_mv[0][0][0]= motion_x;
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
592 s->last_mv[0][1][1]= s->last_mv[0][0][1]= motion_y;
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
593 }else{
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
594 assert(!s->frame_pred_frame_dct && s->mv_type == MV_TYPE_FIELD);
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
595
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
596 if (cbp) {
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
597 if(s->dquant){
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
598 put_mb_modes(s, 5, 2, 1, 1); /* motion + cbp */
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
599 put_bits(&s->pb, 5, s->qscale);
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
600 }else{
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
601 put_mb_modes(s, 1, 1, 1, 1); /* motion + cbp */
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
602 }
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
603 } else {
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
604 put_bits(&s->pb, 3, 1); /* motion only */
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
605 put_bits(&s->pb, 2, 1); /* motion_type: field */
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
606 s->qscale -= s->dquant;
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
607 }
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
608 s->misc_bits+= get_bits_diff(s);
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
609 for(i=0; i<2; i++){
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
610 put_bits(&s->pb, 1, s->field_select[0][i]);
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
611 mpeg1_encode_motion(s, s->mv[0][i][0] - s->last_mv[0][i][0] , s->f_code);
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
612 mpeg1_encode_motion(s, s->mv[0][i][1] - (s->last_mv[0][i][1]>>1), s->f_code);
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
613 s->last_mv[0][i][0]= s->mv[0][i][0];
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
614 s->last_mv[0][i][1]= 2*s->mv[0][i][1];
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
615 }
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
616 s->mv_bits+= get_bits_diff(s);
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
617 }
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
618 if(cbp)
1853
9de89f579086 add vlc for cbp=0 that is valid in 422,444
iive
parents: 1852
diff changeset
619 put_bits(&s->pb, mbPatTable[cbp][1], mbPatTable[cbp][0]);
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
620 s->f_count++;
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
621 } else{
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
622 static const int mb_type_len[4]={0,3,4,2}; //bak,for,bi
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
623
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
624 if(s->mv_type == MV_TYPE_16X16){
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
625 if (cbp){ // With coded bloc pattern
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
626 if (s->dquant) {
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
627 if(s->mv_dir == MV_DIR_FORWARD)
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
628 put_mb_modes(s, 6, 3, 1, 0);
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
629 else
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
630 put_mb_modes(s, mb_type_len[s->mv_dir]+3, 2, 1, 0);
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
631 put_bits(&s->pb, 5, s->qscale);
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
632 } else {
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
633 put_mb_modes(s, mb_type_len[s->mv_dir], 3, 1, 0);
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
634 }
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
635 }else{ // No coded bloc pattern
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
636 put_bits(&s->pb, mb_type_len[s->mv_dir], 2);
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
637 if (!s->frame_pred_frame_dct)
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
638 put_bits(&s->pb, 2, 2); /* motion_type: frame */
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
639 s->qscale -= s->dquant;
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
640 }
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
641 s->misc_bits += get_bits_diff(s);
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
642 if (s->mv_dir&MV_DIR_FORWARD){
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
643 mpeg1_encode_motion(s, s->mv[0][0][0] - s->last_mv[0][0][0], s->f_code);
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
644 mpeg1_encode_motion(s, s->mv[0][0][1] - s->last_mv[0][0][1], s->f_code);
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
645 s->last_mv[0][0][0]=s->last_mv[0][1][0]= s->mv[0][0][0];
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
646 s->last_mv[0][0][1]=s->last_mv[0][1][1]= s->mv[0][0][1];
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
647 s->f_count++;
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
648 }
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
649 if (s->mv_dir&MV_DIR_BACKWARD){
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
650 mpeg1_encode_motion(s, s->mv[1][0][0] - s->last_mv[1][0][0], s->b_code);
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
651 mpeg1_encode_motion(s, s->mv[1][0][1] - s->last_mv[1][0][1], s->b_code);
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
652 s->last_mv[1][0][0]=s->last_mv[1][1][0]= s->mv[1][0][0];
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
653 s->last_mv[1][0][1]=s->last_mv[1][1][1]= s->mv[1][0][1];
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
654 s->b_count++;
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
655 }
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
656 }else{
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
657 assert(s->mv_type == MV_TYPE_FIELD);
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
658 assert(!s->frame_pred_frame_dct);
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
659 if (cbp){ // With coded bloc pattern
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
660 if (s->dquant) {
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
661 if(s->mv_dir == MV_DIR_FORWARD)
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
662 put_mb_modes(s, 6, 3, 1, 1);
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
663 else
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
664 put_mb_modes(s, mb_type_len[s->mv_dir]+3, 2, 1, 1);
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
665 put_bits(&s->pb, 5, s->qscale);
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
666 } else {
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
667 put_mb_modes(s, mb_type_len[s->mv_dir], 3, 1, 1);
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
668 }
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
669 }else{ // No coded bloc pattern
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
670 put_bits(&s->pb, mb_type_len[s->mv_dir], 2);
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
671 put_bits(&s->pb, 2, 1); /* motion_type: field */
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
672 s->qscale -= s->dquant;
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
673 }
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
674 s->misc_bits += get_bits_diff(s);
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
675 if (s->mv_dir&MV_DIR_FORWARD){
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
676 for(i=0; i<2; i++){
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
677 put_bits(&s->pb, 1, s->field_select[0][i]);
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
678 mpeg1_encode_motion(s, s->mv[0][i][0] - s->last_mv[0][i][0] , s->f_code);
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
679 mpeg1_encode_motion(s, s->mv[0][i][1] - (s->last_mv[0][i][1]>>1), s->f_code);
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
680 s->last_mv[0][i][0]= s->mv[0][i][0];
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
681 s->last_mv[0][i][1]= 2*s->mv[0][i][1];
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
682 }
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
683 s->f_count++;
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
684 }
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
685 if (s->mv_dir&MV_DIR_BACKWARD){
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
686 for(i=0; i<2; i++){
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
687 put_bits(&s->pb, 1, s->field_select[1][i]);
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
688 mpeg1_encode_motion(s, s->mv[1][i][0] - s->last_mv[1][i][0] , s->b_code);
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
689 mpeg1_encode_motion(s, s->mv[1][i][1] - (s->last_mv[1][i][1]>>1), s->b_code);
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
690 s->last_mv[1][i][0]= s->mv[1][i][0];
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
691 s->last_mv[1][i][1]= 2*s->mv[1][i][1];
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
692 }
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
693 s->b_count++;
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
694 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
695 }
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
696 s->mv_bits += get_bits_diff(s);
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
697 if(cbp)
1853
9de89f579086 add vlc for cbp=0 that is valid in 422,444
iive
parents: 1852
diff changeset
698 put_bits(&s->pb, mbPatTable[cbp][1], mbPatTable[cbp][0]);
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
699 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
700 for(i=0;i<6;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
701 if (cbp & (1 << (5 - i))) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
702 mpeg1_encode_block(s, block[i], i);
986e461dc072 Initial revision
glantau
parents:
diff changeset
703 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
704 }
1160
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1150
diff changeset
705 s->mb_skip_run = 0;
740
585c163c225a mpeg1 2pass encoding
michaelni
parents: 718
diff changeset
706 if(s->mb_intra)
585c163c225a mpeg1 2pass encoding
michaelni
parents: 718
diff changeset
707 s->i_tex_bits+= get_bits_diff(s);
585c163c225a mpeg1 2pass encoding
michaelni
parents: 718
diff changeset
708 else
585c163c225a mpeg1 2pass encoding
michaelni
parents: 718
diff changeset
709 s->p_tex_bits+= get_bits_diff(s);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
710 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
711 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
712
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
713 // 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
714 static void mpeg1_encode_motion(MpegEncContext *s, int val, int f_or_b_code)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
715 {
2093
82816cad0e29 optimization
michael
parents: 2076
diff changeset
716 int code, bit_size, l, bits, range, sign;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
717
986e461dc072 Initial revision
glantau
parents:
diff changeset
718 if (val == 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
719 /* zero vector */
986e461dc072 Initial revision
glantau
parents:
diff changeset
720 code = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
721 put_bits(&s->pb,
986e461dc072 Initial revision
glantau
parents:
diff changeset
722 mbMotionVectorTable[0][1],
986e461dc072 Initial revision
glantau
parents:
diff changeset
723 mbMotionVectorTable[0][0]);
986e461dc072 Initial revision
glantau
parents:
diff changeset
724 } else {
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
725 bit_size = f_or_b_code - 1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
726 range = 1 << bit_size;
986e461dc072 Initial revision
glantau
parents:
diff changeset
727 /* modulo encoding */
2093
82816cad0e29 optimization
michael
parents: 2076
diff changeset
728 l= INT_BIT - 5 - bit_size;
82816cad0e29 optimization
michael
parents: 2076
diff changeset
729 val= (val<<l)>>l;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
730
986e461dc072 Initial revision
glantau
parents:
diff changeset
731 if (val >= 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
732 val--;
986e461dc072 Initial revision
glantau
parents:
diff changeset
733 code = (val >> bit_size) + 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
734 bits = val & (range - 1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
735 sign = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
736 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
737 val = -val;
986e461dc072 Initial revision
glantau
parents:
diff changeset
738 val--;
986e461dc072 Initial revision
glantau
parents:
diff changeset
739 code = (val >> bit_size) + 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
740 bits = val & (range - 1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
741 sign = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
742 }
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
743
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
744 assert(code > 0 && code <= 16);
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
745
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
746 put_bits(&s->pb,
986e461dc072 Initial revision
glantau
parents:
diff changeset
747 mbMotionVectorTable[code][1],
986e461dc072 Initial revision
glantau
parents:
diff changeset
748 mbMotionVectorTable[code][0]);
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1025
diff changeset
749
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
750 put_bits(&s->pb, 1, sign);
986e461dc072 Initial revision
glantau
parents:
diff changeset
751 if (bit_size > 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
752 put_bits(&s->pb, bit_size, bits);
986e461dc072 Initial revision
glantau
parents:
diff changeset
753 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
754 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
755 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
756
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
757 void ff_mpeg1_encode_init(MpegEncContext *s)
281
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
758 {
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
759 static int done=0;
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
760
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
761 common_init(s);
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
762
281
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
763 if(!done){
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
764 int f_code;
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
765 int mv;
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
766 int i;
281
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
767
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
768 done=1;
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2302
diff changeset
769 init_rl(&rl_mpeg1, 1);
947
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
770
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
771 for(i=0; i<64; i++)
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
772 {
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
773 mpeg1_max_level[0][i]= rl_mpeg1.max_level[0][i];
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
774 mpeg1_index_run[0][i]= rl_mpeg1.index_run[0][i];
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
775 }
947
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
776
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
777 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
778
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
779 /* build unified dc encoding tables */
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
780 for(i=-255; i<256; i++)
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
781 {
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
782 int adiff, index;
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
783 int bits, code;
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
784 int diff=i;
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
785
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
786 adiff = ABS(diff);
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
787 if(diff<0) diff--;
1986
c8e866f4515f simplify
michael
parents: 1953
diff changeset
788 index = av_log2(2*adiff);
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
789
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
790 bits= vlc_dc_lum_bits[index] + index;
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
791 code= (vlc_dc_lum_code[index]<<index) + (diff & ((1 << index) - 1));
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
792 mpeg1_lum_dc_uni[i+255]= bits + (code<<8);
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
793
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
794 bits= vlc_dc_chroma_bits[index] + index;
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
795 code= (vlc_dc_chroma_code[index]<<index) + (diff & ((1 << index) - 1));
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
796 mpeg1_chr_dc_uni[i+255]= bits + (code<<8);
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
797 }
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
798
1162
8c15d82c1893 some static -> dynamic alloc & 16->8 bit
michaelni
parents: 1160
diff changeset
799 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
800
281
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
801 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
802 for(mv=-MAX_MV; mv<=MAX_MV; mv++){
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
803 int len;
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
804
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
805 if(mv==0) len= mbMotionVectorTable[0][1];
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
806 else{
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
807 int val, bit_size, range, code;
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
808
1893
779bdf5063ce 1000000l (using uninitalized variable for initalizing bits per MV table)
michael
parents: 1892
diff changeset
809 bit_size = f_code - 1;
281
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
810 range = 1 << bit_size;
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
811
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
812 val=mv;
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
813 if (val < 0)
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
814 val = -val;
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
815 val--;
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
816 code = (val >> bit_size) + 1;
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
817 if(code<17){
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
818 len= mbMotionVectorTable[code][1] + 1 + bit_size;
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
819 }else{
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
820 len= mbMotionVectorTable[16][1] + 2 + bit_size;
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
821 }
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
822 }
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
823
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
824 mv_penalty[f_code][mv+MAX_MV]= len;
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
825 }
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
826 }
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
827
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
828
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
829 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
830 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
831 fcode_tab[mv+MAX_MV]= f_code;
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
832 }
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
833 }
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
834 }
936
caa77cd960c0 qpel encoding
michaelni
parents: 933
diff changeset
835 s->me.mv_penalty= mv_penalty;
281
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
836 s->fcode_tab= fcode_tab;
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
837 if(s->codec_id == CODEC_ID_MPEG1VIDEO){
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
838 s->min_qcoeff=-255;
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
839 s->max_qcoeff= 255;
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
840 }else{
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
841 s->min_qcoeff=-2047;
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
842 s->max_qcoeff= 2047;
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
843 }
947
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
844 s->intra_ac_vlc_length=
1503
d53b1fa09b60 mpeg1 + trellis quant segfault fix
michaelni
parents: 1484
diff changeset
845 s->inter_ac_vlc_length=
d53b1fa09b60 mpeg1 + trellis quant segfault fix
michaelni
parents: 1484
diff changeset
846 s->intra_ac_vlc_last_length=
d53b1fa09b60 mpeg1 + trellis quant segfault fix
michaelni
parents: 1484
diff changeset
847 s->inter_ac_vlc_last_length= uni_mpeg1_ac_vlc_len;
281
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 277
diff changeset
848 }
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
849
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
850 static inline void encode_dc(MpegEncContext *s, int diff, int component)
986e461dc072 Initial revision
glantau
parents:
diff changeset
851 {
1992
938e47c809b0 intra_dc_precission>0 encoding support
michael
parents: 1990
diff changeset
852 if(((unsigned) (diff+255)) >= 511){
938e47c809b0 intra_dc_precission>0 encoding support
michael
parents: 1990
diff changeset
853 int index;
938e47c809b0 intra_dc_precission>0 encoding support
michael
parents: 1990
diff changeset
854
938e47c809b0 intra_dc_precission>0 encoding support
michael
parents: 1990
diff changeset
855 if(diff<0){
938e47c809b0 intra_dc_precission>0 encoding support
michael
parents: 1990
diff changeset
856 index= av_log2_16bit(-2*diff);
938e47c809b0 intra_dc_precission>0 encoding support
michael
parents: 1990
diff changeset
857 diff--;
938e47c809b0 intra_dc_precission>0 encoding support
michael
parents: 1990
diff changeset
858 }else{
938e47c809b0 intra_dc_precission>0 encoding support
michael
parents: 1990
diff changeset
859 index= av_log2_16bit(2*diff);
938e47c809b0 intra_dc_precission>0 encoding support
michael
parents: 1990
diff changeset
860 }
938e47c809b0 intra_dc_precission>0 encoding support
michael
parents: 1990
diff changeset
861 if (component == 0) {
938e47c809b0 intra_dc_precission>0 encoding support
michael
parents: 1990
diff changeset
862 put_bits(
938e47c809b0 intra_dc_precission>0 encoding support
michael
parents: 1990
diff changeset
863 &s->pb,
938e47c809b0 intra_dc_precission>0 encoding support
michael
parents: 1990
diff changeset
864 vlc_dc_lum_bits[index] + index,
938e47c809b0 intra_dc_precission>0 encoding support
michael
parents: 1990
diff changeset
865 (vlc_dc_lum_code[index]<<index) + (diff & ((1 << index) - 1)));
938e47c809b0 intra_dc_precission>0 encoding support
michael
parents: 1990
diff changeset
866 }else{
938e47c809b0 intra_dc_precission>0 encoding support
michael
parents: 1990
diff changeset
867 put_bits(
938e47c809b0 intra_dc_precission>0 encoding support
michael
parents: 1990
diff changeset
868 &s->pb,
938e47c809b0 intra_dc_precission>0 encoding support
michael
parents: 1990
diff changeset
869 vlc_dc_chroma_bits[index] + index,
938e47c809b0 intra_dc_precission>0 encoding support
michael
parents: 1990
diff changeset
870 (vlc_dc_chroma_code[index]<<index) + (diff & ((1 << index) - 1)));
938e47c809b0 intra_dc_precission>0 encoding support
michael
parents: 1990
diff changeset
871 }
938e47c809b0 intra_dc_precission>0 encoding support
michael
parents: 1990
diff changeset
872 }else{
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
873 if (component == 0) {
237
75123d30f862 optimized encode_dc() (+2% speed on P3 for mpeg1 intra only encodings)
michaelni
parents: 236
diff changeset
874 put_bits(
75123d30f862 optimized encode_dc() (+2% speed on P3 for mpeg1 intra only encodings)
michaelni
parents: 236
diff changeset
875 &s->pb,
75123d30f862 optimized encode_dc() (+2% speed on P3 for mpeg1 intra only encodings)
michaelni
parents: 236
diff changeset
876 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
877 mpeg1_lum_dc_uni[diff+255]>>8);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
878 } else {
237
75123d30f862 optimized encode_dc() (+2% speed on P3 for mpeg1 intra only encodings)
michaelni
parents: 236
diff changeset
879 put_bits(
75123d30f862 optimized encode_dc() (+2% speed on P3 for mpeg1 intra only encodings)
michaelni
parents: 236
diff changeset
880 &s->pb,
75123d30f862 optimized encode_dc() (+2% speed on P3 for mpeg1 intra only encodings)
michaelni
parents: 236
diff changeset
881 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
882 mpeg1_chr_dc_uni[diff+255]>>8);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
883 }
1992
938e47c809b0 intra_dc_precission>0 encoding support
michael
parents: 1990
diff changeset
884 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
885 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
886
986e461dc072 Initial revision
glantau
parents:
diff changeset
887 static void mpeg1_encode_block(MpegEncContext *s,
986e461dc072 Initial revision
glantau
parents:
diff changeset
888 DCTELEM *block,
986e461dc072 Initial revision
glantau
parents:
diff changeset
889 int n)
986e461dc072 Initial revision
glantau
parents:
diff changeset
890 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
891 int alevel, level, last_non_zero, dc, diff, i, j, run, last_index, sign;
986e461dc072 Initial revision
glantau
parents:
diff changeset
892 int code, component;
236
4a090f1da60a optimize mpeg1_encode_block()
michaelni
parents: 76
diff changeset
893 // RLTable *rl = &rl_mpeg1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
894
986e461dc072 Initial revision
glantau
parents:
diff changeset
895 last_index = s->block_last_index[n];
986e461dc072 Initial revision
glantau
parents:
diff changeset
896
986e461dc072 Initial revision
glantau
parents:
diff changeset
897 /* DC coef */
986e461dc072 Initial revision
glantau
parents:
diff changeset
898 if (s->mb_intra) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
899 component = (n <= 3 ? 0 : n - 4 + 1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
900 dc = block[0]; /* overflow is impossible */
986e461dc072 Initial revision
glantau
parents:
diff changeset
901 diff = dc - s->last_dc[component];
986e461dc072 Initial revision
glantau
parents:
diff changeset
902 encode_dc(s, diff, component);
986e461dc072 Initial revision
glantau
parents:
diff changeset
903 s->last_dc[component] = dc;
986e461dc072 Initial revision
glantau
parents:
diff changeset
904 i = 1;
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
905 /*
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
906 if (s->intra_vlc_format)
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
907 rl = &rl_mpeg2;
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
908 else
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
909 rl = &rl_mpeg1;
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
910 */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
911 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
912 /* encode the first coefficient : needs to be done here because
986e461dc072 Initial revision
glantau
parents:
diff changeset
913 it is handled slightly differently */
986e461dc072 Initial revision
glantau
parents:
diff changeset
914 level = block[0];
986e461dc072 Initial revision
glantau
parents:
diff changeset
915 if (abs(level) == 1) {
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
916 code = ((uint32_t)level >> 31); /* the sign bit */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
917 put_bits(&s->pb, 2, code | 0x02);
986e461dc072 Initial revision
glantau
parents:
diff changeset
918 i = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
919 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
920 i = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
921 last_non_zero = -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
922 goto next_coef;
986e461dc072 Initial revision
glantau
parents:
diff changeset
923 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
924 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
925
986e461dc072 Initial revision
glantau
parents:
diff changeset
926 /* now quantify & encode AC coefs */
986e461dc072 Initial revision
glantau
parents:
diff changeset
927 last_non_zero = i - 1;
236
4a090f1da60a optimize mpeg1_encode_block()
michaelni
parents: 76
diff changeset
928
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
929 for(;i<=last_index;i++) {
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 694
diff changeset
930 j = s->intra_scantable.permutated[i];
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
931 level = block[j];
986e461dc072 Initial revision
glantau
parents:
diff changeset
932 next_coef:
986e461dc072 Initial revision
glantau
parents:
diff changeset
933 #if 0
986e461dc072 Initial revision
glantau
parents:
diff changeset
934 if (level != 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
935 dprintf("level[%d]=%d\n", i, level);
986e461dc072 Initial revision
glantau
parents:
diff changeset
936 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
937 /* encode using VLC */
986e461dc072 Initial revision
glantau
parents:
diff changeset
938 if (level != 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
939 run = i - last_non_zero - 1;
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 694
diff changeset
940
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 694
diff changeset
941 alevel= level;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 694
diff changeset
942 MASK_ABS(sign, alevel)
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 694
diff changeset
943 sign&=1;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 694
diff changeset
944
236
4a090f1da60a optimize mpeg1_encode_block()
michaelni
parents: 76
diff changeset
945 // code = get_rl_index(rl, 0, run, alevel);
947
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 936
diff changeset
946 if (alevel <= mpeg1_max_level[0][run]){
236
4a090f1da60a optimize mpeg1_encode_block()
michaelni
parents: 76
diff changeset
947 code= mpeg1_index_run[0][run] + alevel - 1;
4a090f1da60a optimize mpeg1_encode_block()
michaelni
parents: 76
diff changeset
948 /* store the vlc & sign at once */
4a090f1da60a optimize mpeg1_encode_block()
michaelni
parents: 76
diff changeset
949 put_bits(&s->pb, mpeg1_vlc[code][1]+1, (mpeg1_vlc[code][0]<<1) + sign);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
950 } else {
236
4a090f1da60a optimize mpeg1_encode_block()
michaelni
parents: 76
diff changeset
951 /* escape seems to be pretty rare <5% so i dont optimize it */
4a090f1da60a optimize mpeg1_encode_block()
michaelni
parents: 76
diff changeset
952 put_bits(&s->pb, mpeg1_vlc[111/*rl->n*/][1], mpeg1_vlc[111/*rl->n*/][0]);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
953 /* escape: only clip in this case */
986e461dc072 Initial revision
glantau
parents:
diff changeset
954 put_bits(&s->pb, 6, run);
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
955 if(s->codec_id == CODEC_ID_MPEG1VIDEO){
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
956 if (alevel < 128) {
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
957 put_bits(&s->pb, 8, level & 0xff);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
958 } else {
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
959 if (level < 0) {
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
960 put_bits(&s->pb, 16, 0x8001 + level + 255);
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
961 } else {
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
962 put_bits(&s->pb, 16, level & 0xffff);
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
963 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
964 }
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
965 }else{
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
966 put_bits(&s->pb, 12, level & 0xfff);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
967 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
968 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
969 last_non_zero = i;
986e461dc072 Initial revision
glantau
parents:
diff changeset
970 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
971 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
972 /* end of block */
986e461dc072 Initial revision
glantau
parents:
diff changeset
973 put_bits(&s->pb, 2, 0x2);
986e461dc072 Initial revision
glantau
parents:
diff changeset
974 }
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
975 #endif //CONFIG_ENCODERS
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
976
986e461dc072 Initial revision
glantau
parents:
diff changeset
977 /******************************************/
986e461dc072 Initial revision
glantau
parents:
diff changeset
978 /* decoding */
986e461dc072 Initial revision
glantau
parents:
diff changeset
979
986e461dc072 Initial revision
glantau
parents:
diff changeset
980 static VLC dc_lum_vlc;
986e461dc072 Initial revision
glantau
parents:
diff changeset
981 static VLC dc_chroma_vlc;
986e461dc072 Initial revision
glantau
parents:
diff changeset
982 static VLC mv_vlc;
986e461dc072 Initial revision
glantau
parents:
diff changeset
983 static VLC mbincr_vlc;
986e461dc072 Initial revision
glantau
parents:
diff changeset
984 static VLC mb_ptype_vlc;
986e461dc072 Initial revision
glantau
parents:
diff changeset
985 static VLC mb_btype_vlc;
986e461dc072 Initial revision
glantau
parents:
diff changeset
986 static VLC mb_pat_vlc;
986e461dc072 Initial revision
glantau
parents:
diff changeset
987
1904
129236143f2e warning patrol
mellum
parents: 1903
diff changeset
988 static void init_vlcs(void)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
989 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
990 static int done = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
991
986e461dc072 Initial revision
glantau
parents:
diff changeset
992 if (!done) {
494
54b88078c361 fixed one mpeg decoder memory leak
bellard
parents: 486
diff changeset
993 done = 1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
994
568
7e7a7282608c hmm ABS(dc-diff) > 512 fix
michaelni
parents: 558
diff changeset
995 init_vlc(&dc_lum_vlc, DC_VLC_BITS, 12,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
996 vlc_dc_lum_bits, 1, 1,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2302
diff changeset
997 vlc_dc_lum_code, 2, 2, 1);
568
7e7a7282608c hmm ABS(dc-diff) > 512 fix
michaelni
parents: 558
diff changeset
998 init_vlc(&dc_chroma_vlc, DC_VLC_BITS, 12,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
999 vlc_dc_chroma_bits, 1, 1,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2302
diff changeset
1000 vlc_dc_chroma_code, 2, 2, 1);
545
6df843af36cb optimization (get_vlc() -> get_vlc2())
michaelni
parents: 533
diff changeset
1001 init_vlc(&mv_vlc, MV_VLC_BITS, 17,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1002 &mbMotionVectorTable[0][1], 2, 1,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2302
diff changeset
1003 &mbMotionVectorTable[0][0], 2, 1, 1);
1181
4c2339f3863a 100l (mpeg2 decoding fixed)
michaelni
parents: 1177
diff changeset
1004 init_vlc(&mbincr_vlc, MBINCR_VLC_BITS, 36,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1005 &mbAddrIncrTable[0][1], 2, 1,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2302
diff changeset
1006 &mbAddrIncrTable[0][0], 2, 1, 1);
1853
9de89f579086 add vlc for cbp=0 that is valid in 422,444
iive
parents: 1852
diff changeset
1007 init_vlc(&mb_pat_vlc, MB_PAT_VLC_BITS, 64,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1008 &mbPatTable[0][1], 2, 1,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2302
diff changeset
1009 &mbPatTable[0][0], 2, 1, 1);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1010
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1011 init_vlc(&mb_ptype_vlc, MB_PTYPE_VLC_BITS, 7,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1012 &table_mb_ptype[0][1], 2, 1,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2302
diff changeset
1013 &table_mb_ptype[0][0], 2, 1, 1);
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1014 init_vlc(&mb_btype_vlc, MB_BTYPE_VLC_BITS, 11,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1015 &table_mb_btype[0][1], 2, 1,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2302
diff changeset
1016 &table_mb_btype[0][0], 2, 1, 1);
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2302
diff changeset
1017 init_rl(&rl_mpeg1, 1);
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2302
diff changeset
1018 init_rl(&rl_mpeg2, 1);
552
26971b5a271d rl vlc table optimization (not yet used)
michaelni
parents: 545
diff changeset
1019
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2302
diff changeset
1020 init_2d_vlc_rl(&rl_mpeg1, 1);
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2302
diff changeset
1021 init_2d_vlc_rl(&rl_mpeg2, 1);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1022 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1023 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1024
986e461dc072 Initial revision
glantau
parents:
diff changeset
1025 static inline int get_dmv(MpegEncContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1026 {
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
1027 if(get_bits1(&s->gb))
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
1028 return 1 - (get_bits1(&s->gb) << 1);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1029 else
986e461dc072 Initial revision
glantau
parents:
diff changeset
1030 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1031 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1032
54
764f2eaf711e fixed mpeg2 qscale decoding
glantau
parents: 45
diff changeset
1033 static inline int get_qscale(MpegEncContext *s)
764f2eaf711e fixed mpeg2 qscale decoding
glantau
parents: 45
diff changeset
1034 {
1253
5642ebadf1b5 small optimize mpeg12.c/get_qscale patch by (BERO <bero at geocities dot co dot jp>) and the return idea by arpi
michaelni
parents: 1220
diff changeset
1035 int qscale = get_bits(&s->gb, 5);
1728
73a3699b8375 simplify
michael
parents: 1727
diff changeset
1036 if (s->q_scale_type) {
73a3699b8375 simplify
michael
parents: 1727
diff changeset
1037 return non_linear_qscale[qscale];
73a3699b8375 simplify
michael
parents: 1727
diff changeset
1038 } else {
73a3699b8375 simplify
michael
parents: 1727
diff changeset
1039 return qscale << 1;
54
764f2eaf711e fixed mpeg2 qscale decoding
glantau
parents: 45
diff changeset
1040 }
764f2eaf711e fixed mpeg2 qscale decoding
glantau
parents: 45
diff changeset
1041 }
764f2eaf711e fixed mpeg2 qscale decoding
glantau
parents: 45
diff changeset
1042
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1043 /* motion type (for mpeg2) */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1044 #define MT_FIELD 1
986e461dc072 Initial revision
glantau
parents:
diff changeset
1045 #define MT_FRAME 2
986e461dc072 Initial revision
glantau
parents:
diff changeset
1046 #define MT_16X8 2
986e461dc072 Initial revision
glantau
parents:
diff changeset
1047 #define MT_DMV 3
986e461dc072 Initial revision
glantau
parents:
diff changeset
1048
986e461dc072 Initial revision
glantau
parents:
diff changeset
1049 static int mpeg_decode_mb(MpegEncContext *s,
1848
c72589baee53 initial chroma_format changes,xvmc tweaks and codec_cap
iive
parents: 1841
diff changeset
1050 DCTELEM block[12][64])
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1051 {
751
cbe316f082bc warning fixes
michaelni
parents: 740
diff changeset
1052 int i, j, k, cbp, val, mb_type, motion_type;
2076
23280e1b8dbf better cbp handling and small speedup in mpeg12
iive
parents: 2074
diff changeset
1053 const int mb_block_count = 4 + (1<< s->chroma_format)
23280e1b8dbf better cbp handling and small speedup in mpeg12
iive
parents: 2074
diff changeset
1054
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1055 dprintf("decode_mb: x=%d y=%d\n", s->mb_x, s->mb_y);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1056
1021
2d7c9f5738de trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents: 947
diff changeset
1057 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
1058
1160
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1150
diff changeset
1059 if (s->mb_skip_run-- != 0) {
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1060 if(s->pict_type == I_TYPE){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1587
diff changeset
1061 av_log(s->avctx, AV_LOG_ERROR, "skiped MB in I frame at %d %d\n", s->mb_x, s->mb_y);
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1062 return -1;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1063 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1064
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1065 /* skip mb */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1066 s->mb_intra = 0;
1848
c72589baee53 initial chroma_format changes,xvmc tweaks and codec_cap
iive
parents: 1841
diff changeset
1067 for(i=0;i<12;i++)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1068 s->block_last_index[i] = -1;
1841
05017f3b87d9 mpeg2 field pic decoding fix
michael
parents: 1837
diff changeset
1069 if(s->picture_structure == PICT_FRAME)
05017f3b87d9 mpeg2 field pic decoding fix
michael
parents: 1837
diff changeset
1070 s->mv_type = MV_TYPE_16X16;
05017f3b87d9 mpeg2 field pic decoding fix
michael
parents: 1837
diff changeset
1071 else
05017f3b87d9 mpeg2 field pic decoding fix
michael
parents: 1837
diff changeset
1072 s->mv_type = MV_TYPE_FIELD;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1073 if (s->pict_type == P_TYPE) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1074 /* if P type, zero motion vector is implied */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1075 s->mv_dir = MV_DIR_FORWARD;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1076 s->mv[0][0][0] = s->mv[0][0][1] = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1077 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
1078 s->last_mv[0][1][0] = s->last_mv[0][1][1] = 0;
1841
05017f3b87d9 mpeg2 field pic decoding fix
michael
parents: 1837
diff changeset
1079 s->field_select[0][0]= s->picture_structure - 1;
1021
2d7c9f5738de trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents: 947
diff changeset
1080 s->mb_skiped = 1;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1081 s->current_picture.mb_type[ s->mb_x + s->mb_y*s->mb_stride ]= MB_TYPE_SKIP | MB_TYPE_L0 | MB_TYPE_16x16;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1082 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1083 /* if B type, reuse previous vectors and directions */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1084 s->mv[0][0][0] = s->last_mv[0][0][0];
986e461dc072 Initial revision
glantau
parents:
diff changeset
1085 s->mv[0][0][1] = s->last_mv[0][0][1];
986e461dc072 Initial revision
glantau
parents:
diff changeset
1086 s->mv[1][0][0] = s->last_mv[1][0][0];
986e461dc072 Initial revision
glantau
parents:
diff changeset
1087 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
1088
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1089 s->current_picture.mb_type[ s->mb_x + s->mb_y*s->mb_stride ]=
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1090 s->current_picture.mb_type[ s->mb_x + s->mb_y*s->mb_stride - 1] | MB_TYPE_SKIP;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1091 // assert(s->current_picture.mb_type[ s->mb_x + s->mb_y*s->mb_stride - 1]&(MB_TYPE_16x16|MB_TYPE_16x8));
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1092
1021
2d7c9f5738de trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents: 947
diff changeset
1093 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
1094 s->mb_skiped = 1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1095 }
930
6bcb214d6a17 more debug output
michaelni
parents: 925
diff changeset
1096
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1097 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1098 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1099
986e461dc072 Initial revision
glantau
parents:
diff changeset
1100 switch(s->pict_type) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1101 default:
986e461dc072 Initial revision
glantau
parents:
diff changeset
1102 case I_TYPE:
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
1103 if (get_bits1(&s->gb) == 0) {
1376
5d2435fb733d ATI VCR2 decoding support
michaelni
parents: 1372
diff changeset
1104 if (get_bits1(&s->gb) == 0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1587
diff changeset
1105 av_log(s->avctx, AV_LOG_ERROR, "invalid mb type in I Frame at %d %d\n", s->mb_x, s->mb_y);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1106 return -1;
1376
5d2435fb733d ATI VCR2 decoding support
michaelni
parents: 1372
diff changeset
1107 }
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1108 mb_type = MB_TYPE_QUANT | MB_TYPE_INTRA;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1109 } else {
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1110 mb_type = MB_TYPE_INTRA;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1111 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1112 break;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1113 case P_TYPE:
545
6df843af36cb optimization (get_vlc() -> get_vlc2())
michaelni
parents: 533
diff changeset
1114 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
1115 if (mb_type < 0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1587
diff changeset
1116 av_log(s->avctx, AV_LOG_ERROR, "invalid mb type in P Frame at %d %d\n", s->mb_x, s->mb_y);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1117 return -1;
568
7e7a7282608c hmm ABS(dc-diff) > 512 fix
michaelni
parents: 558
diff changeset
1118 }
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1119 mb_type = ptype2mb_type[ mb_type ];
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1120 break;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1121 case B_TYPE:
545
6df843af36cb optimization (get_vlc() -> get_vlc2())
michaelni
parents: 533
diff changeset
1122 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
1123 if (mb_type < 0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1587
diff changeset
1124 av_log(s->avctx, AV_LOG_ERROR, "invalid mb type in B Frame at %d %d\n", s->mb_x, s->mb_y);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1125 return -1;
568
7e7a7282608c hmm ABS(dc-diff) > 512 fix
michaelni
parents: 558
diff changeset
1126 }
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1127 mb_type = btype2mb_type[ mb_type ];
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1128 break;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1129 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1130 dprintf("mb_type=%x\n", mb_type);
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1131 // motion_type = 0; /* avoid warning */
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1132 if (IS_INTRA(mb_type)) {
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1133 /* compute dct type */
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1134 if (s->picture_structure == PICT_FRAME && //FIXME add a interlaced_dct coded var?
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1135 !s->frame_pred_frame_dct) {
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1136 s->interlaced_dct = get_bits1(&s->gb);
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1137 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1138
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1139 if (IS_QUANT(mb_type))
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1140 s->qscale = get_qscale(s);
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1141
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1142 if (s->concealment_motion_vectors) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1143 /* just parse them */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1144 if (s->picture_structure != PICT_FRAME)
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
1145 skip_bits1(&s->gb); /* field select */
1323
e9da5a651eab fixing concealment MVs prediction
michaelni
parents: 1311
diff changeset
1146
e9da5a651eab fixing concealment MVs prediction
michaelni
parents: 1311
diff changeset
1147 s->mv[0][0][0]= s->last_mv[0][0][0]= s->last_mv[0][1][0] =
e9da5a651eab fixing concealment MVs prediction
michaelni
parents: 1311
diff changeset
1148 mpeg_decode_motion(s, s->mpeg_f_code[0][0], s->last_mv[0][0][0]);
e9da5a651eab fixing concealment MVs prediction
michaelni
parents: 1311
diff changeset
1149 s->mv[0][0][1]= s->last_mv[0][0][1]= s->last_mv[0][1][1] =
e9da5a651eab fixing concealment MVs prediction
michaelni
parents: 1311
diff changeset
1150 mpeg_decode_motion(s, s->mpeg_f_code[0][1], s->last_mv[0][0][1]);
e9da5a651eab fixing concealment MVs prediction
michaelni
parents: 1311
diff changeset
1151
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1152 skip_bits1(&s->gb); /* marker */
1323
e9da5a651eab fixing concealment MVs prediction
michaelni
parents: 1311
diff changeset
1153 }else
e9da5a651eab fixing concealment MVs prediction
michaelni
parents: 1311
diff changeset
1154 memset(s->last_mv, 0, sizeof(s->last_mv)); /* reset mv prediction */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1155 s->mb_intra = 1;
1580
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1550
diff changeset
1156 #ifdef HAVE_XVMC
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1550
diff changeset
1157 //one 1 we memcpy blocks in xvmcvideo
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1550
diff changeset
1158 if(s->avctx->xvmc_acceleration > 1){
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1550
diff changeset
1159 XVMC_pack_pblocks(s,-1);//inter are always full blocks
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1550
diff changeset
1160 if(s->swap_uv){
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1550
diff changeset
1161 exchange_uv(s);
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1550
diff changeset
1162 }
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1550
diff changeset
1163 }
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1550
diff changeset
1164 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1165
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
1166 if (s->codec_id == CODEC_ID_MPEG2VIDEO) {
2076
23280e1b8dbf better cbp handling and small speedup in mpeg12
iive
parents: 2074
diff changeset
1167 for(i=0;i<mb_block_count;i++) {
1580
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1550
diff changeset
1168 if (mpeg2_decode_block_intra(s, s->pblocks[i], i) < 0)
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1169 return -1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1170 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1171 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1172 for(i=0;i<6;i++) {
1580
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1550
diff changeset
1173 if (mpeg1_decode_block_intra(s, s->pblocks[i], i) < 0)
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1174 return -1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1175 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1176 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1177 } else {
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1178 if (mb_type & MB_TYPE_ZERO_MV){
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1644
diff changeset
1179 assert(mb_type & MB_TYPE_CBP);
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1180
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1181 /* compute dct type */
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1182 if (s->picture_structure == PICT_FRAME && //FIXME add a interlaced_dct coded var?
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1183 !s->frame_pred_frame_dct) {
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1184 s->interlaced_dct = get_bits1(&s->gb);
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1185 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1186
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1187 if (IS_QUANT(mb_type))
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1188 s->qscale = get_qscale(s);
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1189
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1190 s->mv_dir = MV_DIR_FORWARD;
1841
05017f3b87d9 mpeg2 field pic decoding fix
michael
parents: 1837
diff changeset
1191 if(s->picture_structure == PICT_FRAME)
05017f3b87d9 mpeg2 field pic decoding fix
michael
parents: 1837
diff changeset
1192 s->mv_type = MV_TYPE_16X16;
05017f3b87d9 mpeg2 field pic decoding fix
michael
parents: 1837
diff changeset
1193 else{
05017f3b87d9 mpeg2 field pic decoding fix
michael
parents: 1837
diff changeset
1194 s->mv_type = MV_TYPE_FIELD;
05017f3b87d9 mpeg2 field pic decoding fix
michael
parents: 1837
diff changeset
1195 mb_type |= MB_TYPE_INTERLACED;
05017f3b87d9 mpeg2 field pic decoding fix
michael
parents: 1837
diff changeset
1196 s->field_select[0][0]= s->picture_structure - 1;
05017f3b87d9 mpeg2 field pic decoding fix
michael
parents: 1837
diff changeset
1197 }
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1198 s->last_mv[0][0][0] = 0;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1199 s->last_mv[0][0][1] = 0;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1200 s->last_mv[0][1][0] = 0;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1201 s->last_mv[0][1][1] = 0;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1202 s->mv[0][0][0] = 0;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1203 s->mv[0][0][1] = 0;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1204 }else{
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1205 assert(mb_type & MB_TYPE_L0L1);
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1206 //FIXME decide if MBs in field pictures are MB_TYPE_INTERLACED
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1207 /* get additionnal motion vector type */
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1208 if (s->frame_pred_frame_dct)
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1209 motion_type = MT_FRAME;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1210 else{
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1211 motion_type = get_bits(&s->gb, 2);
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1212 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1213
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1214 /* compute dct type */
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1215 if (s->picture_structure == PICT_FRAME && //FIXME add a interlaced_dct coded var?
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1644
diff changeset
1216 !s->frame_pred_frame_dct && HAS_CBP(mb_type)) {
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1217 s->interlaced_dct = get_bits1(&s->gb);
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1218 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1219
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1220 if (IS_QUANT(mb_type))
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1221 s->qscale = get_qscale(s);
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1222
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1223 /* motion vectors */
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1224 s->mv_dir = 0;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1225 for(i=0;i<2;i++) {
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1226 if (USES_LIST(mb_type, i)) {
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1227 s->mv_dir |= (MV_DIR_FORWARD >> i);
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1228 dprintf("motion_type=%d\n", motion_type);
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1229 switch(motion_type) {
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1230 case MT_FRAME: /* or MT_16X8 */
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1231 if (s->picture_structure == PICT_FRAME) {
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1232 /* MT_FRAME */
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1233 mb_type |= MB_TYPE_16x16;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1234 s->mv_type = MV_TYPE_16X16;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1235 s->mv[i][0][0]= s->last_mv[i][0][0]= s->last_mv[i][1][0] =
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1236 mpeg_decode_motion(s, s->mpeg_f_code[i][0], s->last_mv[i][0][0]);
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1237 s->mv[i][0][1]= s->last_mv[i][0][1]= s->last_mv[i][1][1] =
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1238 mpeg_decode_motion(s, s->mpeg_f_code[i][1], s->last_mv[i][0][1]);
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1239 /* full_pel: only for mpeg1 */
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1240 if (s->full_pel[i]){
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1241 s->mv[i][0][0] <<= 1;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1242 s->mv[i][0][1] <<= 1;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1243 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1244 } else {
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1245 /* MT_16X8 */
1673
f17ba52fec08 MB_TYPE_INTERLACED info fix
michael
parents: 1672
diff changeset
1246 mb_type |= MB_TYPE_16x8 | MB_TYPE_INTERLACED;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1247 s->mv_type = MV_TYPE_16X8;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1248 for(j=0;j<2;j++) {
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1249 s->field_select[i][j] = get_bits1(&s->gb);
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1250 for(k=0;k<2;k++) {
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1251 val = mpeg_decode_motion(s, s->mpeg_f_code[i][k],
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1252 s->last_mv[i][j][k]);
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1253 s->last_mv[i][j][k] = val;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1254 s->mv[i][j][k] = val;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1255 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1256 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1257 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1258 break;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1259 case MT_FIELD:
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1260 s->mv_type = MV_TYPE_FIELD;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1261 if (s->picture_structure == PICT_FRAME) {
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1262 mb_type |= MB_TYPE_16x8 | MB_TYPE_INTERLACED;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1263 for(j=0;j<2;j++) {
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1264 s->field_select[i][j] = get_bits1(&s->gb);
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1265 val = mpeg_decode_motion(s, s->mpeg_f_code[i][0],
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1266 s->last_mv[i][j][0]);
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1267 s->last_mv[i][j][0] = val;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1268 s->mv[i][j][0] = val;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1269 dprintf("fmx=%d\n", val);
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1270 val = mpeg_decode_motion(s, s->mpeg_f_code[i][1],
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1271 s->last_mv[i][j][1] >> 1);
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1272 s->last_mv[i][j][1] = val << 1;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1273 s->mv[i][j][1] = val;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1274 dprintf("fmy=%d\n", val);
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1275 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1276 } else {
1673
f17ba52fec08 MB_TYPE_INTERLACED info fix
michael
parents: 1672
diff changeset
1277 mb_type |= MB_TYPE_16x16 | MB_TYPE_INTERLACED;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1278 s->field_select[i][0] = get_bits1(&s->gb);
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1279 for(k=0;k<2;k++) {
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1280 val = mpeg_decode_motion(s, s->mpeg_f_code[i][k],
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1281 s->last_mv[i][0][k]);
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1282 s->last_mv[i][0][k] = val;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1283 s->last_mv[i][1][k] = val;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1284 s->mv[i][0][k] = val;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1285 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1286 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1287 break;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1288 case MT_DMV:
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1289 {
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1290 int dmx, dmy, mx, my, m;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1291
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1292 mx = mpeg_decode_motion(s, s->mpeg_f_code[i][0],
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1293 s->last_mv[i][0][0]);
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1294 s->last_mv[i][0][0] = mx;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1295 s->last_mv[i][1][0] = mx;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1296 dmx = get_dmv(s);
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1297 my = mpeg_decode_motion(s, s->mpeg_f_code[i][1],
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1298 s->last_mv[i][0][1] >> 1);
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1299 dmy = get_dmv(s);
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1300 s->mv_type = MV_TYPE_DMV;
1326
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1325
diff changeset
1301
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1325
diff changeset
1302
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1325
diff changeset
1303 s->last_mv[i][0][1] = my<<1;
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1325
diff changeset
1304 s->last_mv[i][1][1] = my<<1;
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1325
diff changeset
1305
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1325
diff changeset
1306 s->mv[i][0][0] = mx;
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1325
diff changeset
1307 s->mv[i][0][1] = my;
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1325
diff changeset
1308 s->mv[i][1][0] = mx;//not used
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1325
diff changeset
1309 s->mv[i][1][1] = my;//not used
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1325
diff changeset
1310
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1311 if (s->picture_structure == PICT_FRAME) {
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1312 mb_type |= MB_TYPE_16x16 | MB_TYPE_INTERLACED;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1313
1326
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1325
diff changeset
1314 //m = 1 + 2 * s->top_field_first;
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1325
diff changeset
1315 m = s->top_field_first ? 1 : 3;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1316
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1317 /* top -> top pred */
1326
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1325
diff changeset
1318 s->mv[i][2][0] = ((mx * m + (mx > 0)) >> 1) + dmx;
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1325
diff changeset
1319 s->mv[i][2][1] = ((my * m + (my > 0)) >> 1) + dmy - 1;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1320 m = 4 - m;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1321 s->mv[i][3][0] = ((mx * m + (mx > 0)) >> 1) + dmx;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1322 s->mv[i][3][1] = ((my * m + (my > 0)) >> 1) + dmy + 1;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1323 } else {
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1324 mb_type |= MB_TYPE_16x16;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1325
1326
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1325
diff changeset
1326 s->mv[i][2][0] = ((mx + (mx > 0)) >> 1) + dmx;
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1325
diff changeset
1327 s->mv[i][2][1] = ((my + (my > 0)) >> 1) + dmy;
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1325
diff changeset
1328 if(s->picture_structure == PICT_TOP_FIELD)
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1325
diff changeset
1329 s->mv[i][2][1]--;
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1325
diff changeset
1330 else
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1325
diff changeset
1331 s->mv[i][2][1]++;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1332 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1333 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1334 break;
1673
f17ba52fec08 MB_TYPE_INTERLACED info fix
michael
parents: 1672
diff changeset
1335 default:
f17ba52fec08 MB_TYPE_INTERLACED info fix
michael
parents: 1672
diff changeset
1336 av_log(s->avctx, AV_LOG_ERROR, "00 motion_type at %d %d\n", s->mb_x, s->mb_y);
f17ba52fec08 MB_TYPE_INTERLACED info fix
michael
parents: 1672
diff changeset
1337 return -1;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1338 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1339 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1340 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1341 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1342
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1343 s->mb_intra = 0;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1344
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1644
diff changeset
1345 if (HAS_CBP(mb_type)) {
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1346 cbp = get_vlc2(&s->gb, mb_pat_vlc.table, MB_PAT_VLC_BITS, 1);
1858
ea2a4058441c silence warnings
iive
parents: 1853
diff changeset
1347 if (cbp < 0 || ((cbp == 0) && (s->chroma_format < 2)) ){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1587
diff changeset
1348 av_log(s->avctx, AV_LOG_ERROR, "invalid cbp at %d %d\n", s->mb_x, s->mb_y);
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1349 return -1;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1350 }
2076
23280e1b8dbf better cbp handling and small speedup in mpeg12
iive
parents: 2074
diff changeset
1351 if(mb_block_count > 6){
23280e1b8dbf better cbp handling and small speedup in mpeg12
iive
parents: 2074
diff changeset
1352 cbp<<= mb_block_count-6;
23280e1b8dbf better cbp handling and small speedup in mpeg12
iive
parents: 2074
diff changeset
1353 cbp |= get_bits(&s->gb, mb_block_count-6);
1848
c72589baee53 initial chroma_format changes,xvmc tweaks and codec_cap
iive
parents: 1841
diff changeset
1354 }
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1355
1580
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1550
diff changeset
1356 #ifdef HAVE_XVMC
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1550
diff changeset
1357 //on 1 we memcpy blocks in xvmcvideo
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1550
diff changeset
1358 if(s->avctx->xvmc_acceleration > 1){
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1550
diff changeset
1359 XVMC_pack_pblocks(s,cbp);
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1550
diff changeset
1360 if(s->swap_uv){
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1550
diff changeset
1361 exchange_uv(s);
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1550
diff changeset
1362 }
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1550
diff changeset
1363 }
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1550
diff changeset
1364 #endif
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1550
diff changeset
1365
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
1366 if (s->codec_id == CODEC_ID_MPEG2VIDEO) {
2201
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1367 if(s->flags2 & CODEC_FLAG2_FAST){
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1368 for(i=0;i<6;i++) {
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1369 if(cbp & 32) {
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1370 mpeg2_fast_decode_block_non_intra(s, s->pblocks[i], i);
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1371 } else {
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1372 s->block_last_index[i] = -1;
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1373 }
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1374 cbp+=cbp;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1375 }
2201
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1376 }else{
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1377 cbp<<= 12-mb_block_count;
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1378
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1379 for(i=0;i<mb_block_count;i++) {
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1380 if ( cbp & (1<<11) ) {
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1381 if (mpeg2_decode_block_non_intra(s, s->pblocks[i], i) < 0)
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1382 return -1;
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1383 } else {
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1384 s->block_last_index[i] = -1;
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1385 }
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1386 cbp+=cbp;
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1387 }
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1388 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1389 } else {
2202
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1390 if(s->flags2 & CODEC_FLAG2_FAST){
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1391 for(i=0;i<6;i++) {
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1392 if (cbp & 32) {
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1393 mpeg1_fast_decode_block_inter(s, s->pblocks[i], i);
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1394 } else {
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1395 s->block_last_index[i] = -1;
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1396 }
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1397 cbp+=cbp;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1398 }
2202
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1399 }else{
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1400 for(i=0;i<6;i++) {
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1401 if (cbp & 32) {
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1402 if (mpeg1_decode_block_inter(s, s->pblocks[i], i) < 0)
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1403 return -1;
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1404 } else {
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1405 s->block_last_index[i] = -1;
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1406 }
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1407 cbp+=cbp;
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1408 }
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1409 }
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1410 }
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1411 }else{
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1412 for(i=0;i<6;i++)
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1413 s->block_last_index[i] = -1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1414 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1415 }
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1416
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1417 s->current_picture.mb_type[ s->mb_x + s->mb_y*s->mb_stride ]= mb_type;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1418
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1419 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1420 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1421
986e461dc072 Initial revision
glantau
parents:
diff changeset
1422 /* as h263, but only 17 codes */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1423 static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1424 {
1255
625ccacd1113 decode motion & modulo optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents: 1254
diff changeset
1425 int code, sign, val, l, shift;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1426
545
6df843af36cb optimization (get_vlc() -> get_vlc2())
michaelni
parents: 533
diff changeset
1427 code = get_vlc2(&s->gb, mv_vlc.table, MV_VLC_BITS, 2);
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1428 if (code == 0) {
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1429 return pred;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1430 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1431 if (code < 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1432 return 0xffff;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1433 }
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
1434
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
1435 sign = get_bits1(&s->gb);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1436 shift = fcode - 1;
1255
625ccacd1113 decode motion & modulo optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents: 1254
diff changeset
1437 val = code;
625ccacd1113 decode motion & modulo optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents: 1254
diff changeset
1438 if (shift) {
625ccacd1113 decode motion & modulo optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents: 1254
diff changeset
1439 val = (val - 1) << shift;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1440 val |= get_bits(&s->gb, shift);
1255
625ccacd1113 decode motion & modulo optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents: 1254
diff changeset
1441 val++;
625ccacd1113 decode motion & modulo optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents: 1254
diff changeset
1442 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1443 if (sign)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1444 val = -val;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1445 val += pred;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1446
986e461dc072 Initial revision
glantau
parents:
diff changeset
1447 /* modulo decoding */
2093
82816cad0e29 optimization
michael
parents: 2076
diff changeset
1448 l= INT_BIT - 5 - shift;
82816cad0e29 optimization
michael
parents: 2076
diff changeset
1449 val = (val<<l)>>l;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1450 return val;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1451 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1452
1410
524c904a66b8 PSX MDEC decoder, based upon some code from Sebastian Jedruszkiewicz <elf at frogger dot rules dot pl>
michaelni
parents: 1409
diff changeset
1453 static inline int decode_dc(GetBitContext *gb, int component)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1454 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1455 int code, diff;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1456
986e461dc072 Initial revision
glantau
parents:
diff changeset
1457 if (component == 0) {
1410
524c904a66b8 PSX MDEC decoder, based upon some code from Sebastian Jedruszkiewicz <elf at frogger dot rules dot pl>
michaelni
parents: 1409
diff changeset
1458 code = get_vlc2(gb, dc_lum_vlc.table, DC_VLC_BITS, 2);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1459 } else {
1410
524c904a66b8 PSX MDEC decoder, based upon some code from Sebastian Jedruszkiewicz <elf at frogger dot rules dot pl>
michaelni
parents: 1409
diff changeset
1460 code = get_vlc2(gb, dc_chroma_vlc.table, DC_VLC_BITS, 2);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1461 }
568
7e7a7282608c hmm ABS(dc-diff) > 512 fix
michaelni
parents: 558
diff changeset
1462 if (code < 0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1587
diff changeset
1463 av_log(NULL, AV_LOG_ERROR, "invalid dc code at\n");
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1464 return 0xffff;
568
7e7a7282608c hmm ABS(dc-diff) > 512 fix
michaelni
parents: 558
diff changeset
1465 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1466 if (code == 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1467 diff = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1468 } else {
1410
524c904a66b8 PSX MDEC decoder, based upon some code from Sebastian Jedruszkiewicz <elf at frogger dot rules dot pl>
michaelni
parents: 1409
diff changeset
1469 diff = get_xbits(gb, code);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1470 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1471 return diff;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1472 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1473
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1474 static inline int mpeg1_decode_block_intra(MpegEncContext *s,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1475 DCTELEM *block,
986e461dc072 Initial revision
glantau
parents:
diff changeset
1476 int n)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1477 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1478 int level, dc, diff, i, j, run;
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1479 int component;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1480 RLTable *rl = &rl_mpeg1;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
1481 uint8_t * const scantable= s->intra_scantable.permutated;
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
1482 const uint16_t *quant_matrix= s->intra_matrix;
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1483 const int qscale= s->qscale;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1484
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1485 /* DC coef */
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1486 component = (n <= 3 ? 0 : n - 4 + 1);
1410
524c904a66b8 PSX MDEC decoder, based upon some code from Sebastian Jedruszkiewicz <elf at frogger dot rules dot pl>
michaelni
parents: 1409
diff changeset
1487 diff = decode_dc(&s->gb, component);
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1488 if (diff >= 0xffff)
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1489 return -1;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1490 dc = s->last_dc[component];
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1491 dc += diff;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1492 s->last_dc[component] = dc;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1493 block[0] = dc<<3;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1494 dprintf("dc=%d diff=%d\n", dc, diff);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1495 i = 0;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1496 {
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1497 OPEN_READER(re, &s->gb);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1498 /* now quantify & encode AC coefs */
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1499 for(;;) {
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1500 UPDATE_CACHE(re, &s->gb);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1501 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
1502
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1503 if(level == 127){
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1504 break;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1505 } else if(level != 0) {
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1506 i += run;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1507 j = scantable[i];
1728
73a3699b8375 simplify
michael
parents: 1727
diff changeset
1508 level= (level*qscale*quant_matrix[j])>>4;
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1509 level= (level-1)|1;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1510 level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1511 LAST_SKIP_BITS(re, &s->gb, 1);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1512 } else {
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1513 /* escape */
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1514 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
1515 UPDATE_CACHE(re, &s->gb);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1516 level = SHOW_SBITS(re, &s->gb, 8); SKIP_BITS(re, &s->gb, 8);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1517 if (level == -128) {
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1518 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
1519 } else if (level == 0) {
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1520 level = SHOW_UBITS(re, &s->gb, 8) ; LAST_SKIP_BITS(re, &s->gb, 8);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1521 }
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1522 i += run;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1523 j = scantable[i];
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1524 if(level<0){
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1525 level= -level;
1728
73a3699b8375 simplify
michael
parents: 1727
diff changeset
1526 level= (level*qscale*quant_matrix[j])>>4;
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1527 level= (level-1)|1;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1528 level= -level;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1529 }else{
1728
73a3699b8375 simplify
michael
parents: 1727
diff changeset
1530 level= (level*qscale*quant_matrix[j])>>4;
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1531 level= (level-1)|1;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1532 }
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1533 }
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1534 if (i > 63){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1587
diff changeset
1535 av_log(s->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n", s->mb_x, s->mb_y);
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1536 return -1;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1537 }
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1538
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1539 block[j] = level;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1540 }
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1541 CLOSE_READER(re, &s->gb);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1542 }
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1543 s->block_last_index[n] = i;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1544 return 0;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1545 }
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1546
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1547 static inline int mpeg1_decode_block_inter(MpegEncContext *s,
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1548 DCTELEM *block,
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1549 int n)
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1550 {
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1551 int level, i, j, run;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1552 RLTable *rl = &rl_mpeg1;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
1553 uint8_t * const scantable= s->intra_scantable.permutated;
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
1554 const uint16_t *quant_matrix= s->inter_matrix;
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1555 const int qscale= s->qscale;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1556
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1557 {
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
1558 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
1559 OPEN_READER(re, &s->gb);
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1560 i = -1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1561 /* 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
1562 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
1563 v= SHOW_UBITS(re, &s->gb, 2);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1564 if (v & 2) {
714
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1565 LAST_SKIP_BITS(re, &s->gb, 2);
1728
73a3699b8375 simplify
michael
parents: 1727
diff changeset
1566 level= (3*qscale*quant_matrix[0])>>5;
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1567 level= (level-1)|1;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1568 if(v&1)
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1569 level= -level;
714
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1570 block[0] = level;
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1571 i++;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1572 }
714
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1573
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1574 /* now quantify & encode AC coefs */
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1575 for(;;) {
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1576 UPDATE_CACHE(re, &s->gb);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1577 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
1578
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1579 if(level == 127){
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1580 break;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1581 } else if(level != 0) {
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1582 i += run;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1583 j = scantable[i];
1728
73a3699b8375 simplify
michael
parents: 1727
diff changeset
1584 level= ((level*2+1)*qscale*quant_matrix[j])>>5;
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1585 level= (level-1)|1;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1586 level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1587 LAST_SKIP_BITS(re, &s->gb, 1);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1588 } else {
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1589 /* escape */
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1590 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
1591 UPDATE_CACHE(re, &s->gb);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1592 level = SHOW_SBITS(re, &s->gb, 8); SKIP_BITS(re, &s->gb, 8);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1593 if (level == -128) {
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1594 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
1595 } else if (level == 0) {
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1596 level = SHOW_UBITS(re, &s->gb, 8) ; LAST_SKIP_BITS(re, &s->gb, 8);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1597 }
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1598 i += run;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1599 j = scantable[i];
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1600 if(level<0){
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1601 level= -level;
1728
73a3699b8375 simplify
michael
parents: 1727
diff changeset
1602 level= ((level*2+1)*qscale*quant_matrix[j])>>5;
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1603 level= (level-1)|1;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1604 level= -level;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1605 }else{
1728
73a3699b8375 simplify
michael
parents: 1727
diff changeset
1606 level= ((level*2+1)*qscale*quant_matrix[j])>>5;
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1607 level= (level-1)|1;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1608 }
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1609 }
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1610 if (i > 63){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1587
diff changeset
1611 av_log(s->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n", s->mb_x, s->mb_y);
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1612 return -1;
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1613 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1614
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1615 block[j] = level;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1616 }
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1617 CLOSE_READER(re, &s->gb);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1618 }
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 710
diff changeset
1619 s->block_last_index[n] = i;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1620 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1621 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1622
2202
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1623 static inline int mpeg1_fast_decode_block_inter(MpegEncContext *s, DCTELEM *block, int n)
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1624 {
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1625 int level, i, j, run;
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1626 RLTable *rl = &rl_mpeg1;
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1627 uint8_t * const scantable= s->intra_scantable.permutated;
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1628 const int qscale= s->qscale;
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1629
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1630 {
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1631 int v;
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1632 OPEN_READER(re, &s->gb);
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1633 i = -1;
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1634 /* special case for the first coef. no need to add a second vlc table */
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1635 UPDATE_CACHE(re, &s->gb);
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1636 v= SHOW_UBITS(re, &s->gb, 2);
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1637 if (v & 2) {
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1638 LAST_SKIP_BITS(re, &s->gb, 2);
2203
michael
parents: 2202
diff changeset
1639 level= (3*qscale)>>1;
2202
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1640 level= (level-1)|1;
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1641 if(v&1)
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1642 level= -level;
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1643 block[0] = level;
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1644 i++;
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1645 }
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1646
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1647 /* now quantify & encode AC coefs */
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1648 for(;;) {
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1649 UPDATE_CACHE(re, &s->gb);
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1650 GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2);
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1651
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1652 if(level == 127){
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1653 break;
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1654 } else if(level != 0) {
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1655 i += run;
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1656 j = scantable[i];
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1657 level= ((level*2+1)*qscale)>>1;
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1658 level= (level-1)|1;
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1659 level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1);
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1660 LAST_SKIP_BITS(re, &s->gb, 1);
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1661 } else {
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1662 /* escape */
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1663 run = SHOW_UBITS(re, &s->gb, 6)+1; LAST_SKIP_BITS(re, &s->gb, 6);
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1664 UPDATE_CACHE(re, &s->gb);
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1665 level = SHOW_SBITS(re, &s->gb, 8); SKIP_BITS(re, &s->gb, 8);
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1666 if (level == -128) {
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1667 level = SHOW_UBITS(re, &s->gb, 8) - 256; LAST_SKIP_BITS(re, &s->gb, 8);
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1668 } else if (level == 0) {
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1669 level = SHOW_UBITS(re, &s->gb, 8) ; LAST_SKIP_BITS(re, &s->gb, 8);
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1670 }
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1671 i += run;
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1672 j = scantable[i];
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1673 if(level<0){
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1674 level= -level;
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1675 level= ((level*2+1)*qscale)>>1;
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1676 level= (level-1)|1;
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1677 level= -level;
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1678 }else{
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1679 level= ((level*2+1)*qscale)>>1;
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1680 level= (level-1)|1;
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1681 }
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1682 }
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1683
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1684 block[j] = level;
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1685 }
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1686 CLOSE_READER(re, &s->gb);
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1687 }
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1688 s->block_last_index[n] = i;
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1689 return 0;
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1690 }
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1691
8079b177ff5c optional non spec compliant optimizations for mpeg1
michael
parents: 2201
diff changeset
1692
714
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1693 static inline int mpeg2_decode_block_non_intra(MpegEncContext *s,
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1694 DCTELEM *block,
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1695 int n)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1696 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1697 int level, i, j, run;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1698 RLTable *rl = &rl_mpeg1;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
1699 uint8_t * const scantable= s->intra_scantable.permutated;
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
1700 const uint16_t *quant_matrix;
714
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1701 const int qscale= s->qscale;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1702 int mismatch;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1703
986e461dc072 Initial revision
glantau
parents:
diff changeset
1704 mismatch = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1705
986e461dc072 Initial revision
glantau
parents:
diff changeset
1706 {
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
1707 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
1708 OPEN_READER(re, &s->gb);
714
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1709 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
1710 if (n < 4)
714
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1711 quant_matrix = s->inter_matrix;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1712 else
714
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1713 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
1714
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1715 /* 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
1716 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
1717 v= SHOW_UBITS(re, &s->gb, 2);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1718 if (v & 2) {
714
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1719 LAST_SKIP_BITS(re, &s->gb, 2);
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1720 level= (3*qscale*quant_matrix[0])>>5;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1721 if(v&1)
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1722 level= -level;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1723 block[0] = level;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1724 mismatch ^= level;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1725 i++;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1726 }
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1727
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1728 /* now quantify & encode AC coefs */
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1729 for(;;) {
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1730 UPDATE_CACHE(re, &s->gb);
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1731 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
1732
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1733 if(level == 127){
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1734 break;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1735 } else if(level != 0) {
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1736 i += run;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1737 j = scantable[i];
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1738 level= ((level*2+1)*qscale*quant_matrix[j])>>5;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1739 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
1740 LAST_SKIP_BITS(re, &s->gb, 1);
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1741 } else {
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1742 /* escape */
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1743 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
1744 UPDATE_CACHE(re, &s->gb);
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1745 level = SHOW_SBITS(re, &s->gb, 12); SKIP_BITS(re, &s->gb, 12);
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1746
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1747 i += run;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1748 j = scantable[i];
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1749 if(level<0){
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1750 level= ((-level*2+1)*qscale*quant_matrix[j])>>5;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1751 level= -level;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1752 }else{
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1753 level= ((level*2+1)*qscale*quant_matrix[j])>>5;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1754 }
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1755 }
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1756 if (i > 63){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1587
diff changeset
1757 av_log(s->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n", s->mb_x, s->mb_y);
714
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1758 return -1;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1759 }
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1760
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1761 mismatch ^= level;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1762 block[j] = level;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1763 }
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
1764 CLOSE_READER(re, &s->gb);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1765 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1766 block[63] ^= (mismatch & 1);
714
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1767
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1768 s->block_last_index[n] = i;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1769 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1770 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1771
2201
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1772 static inline int mpeg2_fast_decode_block_non_intra(MpegEncContext *s,
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1773 DCTELEM *block,
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1774 int n)
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1775 {
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1776 int level, i, j, run;
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1777 RLTable *rl = &rl_mpeg1;
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1778 uint8_t * const scantable= s->intra_scantable.permutated;
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1779 const int qscale= s->qscale;
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1780 int v;
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1781 OPEN_READER(re, &s->gb);
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1782 i = -1;
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1783
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1784 /* special case for the first coef. no need to add a second vlc table */
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1785 UPDATE_CACHE(re, &s->gb);
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1786 v= SHOW_UBITS(re, &s->gb, 2);
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1787 if (v & 2) {
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1788 LAST_SKIP_BITS(re, &s->gb, 2);
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1789 level= (3*qscale)>>1;
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1790 if(v&1)
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1791 level= -level;
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1792 block[0] = level;
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1793 i++;
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1794 }
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1795
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1796 /* now quantify & encode AC coefs */
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1797 for(;;) {
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1798 UPDATE_CACHE(re, &s->gb);
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1799 GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2);
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1800
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1801 if(level == 127){
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1802 break;
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1803 } else if(level != 0) {
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1804 i += run;
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1805 j = scantable[i];
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1806 level= ((level*2+1)*qscale)>>1;
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1807 level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1);
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1808 LAST_SKIP_BITS(re, &s->gb, 1);
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1809 } else {
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1810 /* escape */
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1811 run = SHOW_UBITS(re, &s->gb, 6)+1; LAST_SKIP_BITS(re, &s->gb, 6);
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1812 UPDATE_CACHE(re, &s->gb);
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1813 level = SHOW_SBITS(re, &s->gb, 12); SKIP_BITS(re, &s->gb, 12);
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1814
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1815 i += run;
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1816 j = scantable[i];
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1817 if(level<0){
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1818 level= ((-level*2+1)*qscale)>>1;
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1819 level= -level;
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1820 }else{
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1821 level= ((level*2+1)*qscale)>>1;
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1822 }
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1823 }
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1824
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1825 block[j] = level;
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1826 }
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1827 CLOSE_READER(re, &s->gb);
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1828 s->block_last_index[n] = i;
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1829 return 0;
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1830 }
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1831
ccff80bb955f optional non spec compliant optimizations
michael
parents: 2167
diff changeset
1832
714
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1833 static inline int mpeg2_decode_block_intra(MpegEncContext *s,
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1834 DCTELEM *block,
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1835 int n)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1836 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1837 int level, dc, diff, i, j, run;
714
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1838 int component;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1839 RLTable *rl;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
1840 uint8_t * const scantable= s->intra_scantable.permutated;
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
1841 const uint16_t *quant_matrix;
714
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1842 const int qscale= s->qscale;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1843 int mismatch;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1844
986e461dc072 Initial revision
glantau
parents:
diff changeset
1845 /* DC coef */
714
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1846 if (n < 4){
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1847 quant_matrix = s->intra_matrix;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1848 component = 0;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1849 }else{
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1850 quant_matrix = s->chroma_intra_matrix;
1848
c72589baee53 initial chroma_format changes,xvmc tweaks and codec_cap
iive
parents: 1841
diff changeset
1851 component = (n&1) + 1;
714
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1852 }
1410
524c904a66b8 PSX MDEC decoder, based upon some code from Sebastian Jedruszkiewicz <elf at frogger dot rules dot pl>
michaelni
parents: 1409
diff changeset
1853 diff = decode_dc(&s->gb, component);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1854 if (diff >= 0xffff)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1855 return -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1856 dc = s->last_dc[component];
986e461dc072 Initial revision
glantau
parents:
diff changeset
1857 dc += diff;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1858 s->last_dc[component] = dc;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1859 block[0] = dc << (3 - s->intra_dc_precision);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1860 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
1861 mismatch = block[0] ^ 1;
714
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1862 i = 0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1863 if (s->intra_vlc_format)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1864 rl = &rl_mpeg2;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1865 else
986e461dc072 Initial revision
glantau
parents:
diff changeset
1866 rl = &rl_mpeg1;
59
efd3c19f6d62 fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents: 58
diff changeset
1867
714
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1868 {
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1869 OPEN_READER(re, &s->gb);
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1870 /* now quantify & encode AC coefs */
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1871 for(;;) {
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1872 UPDATE_CACHE(re, &s->gb);
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1873 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
1874
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1875 if(level == 127){
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1876 break;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1877 } else if(level != 0) {
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1878 i += run;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1879 j = scantable[i];
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1880 level= (level*qscale*quant_matrix[j])>>4;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1881 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
1882 LAST_SKIP_BITS(re, &s->gb, 1);
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1883 } else {
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1884 /* escape */
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1885 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
1886 UPDATE_CACHE(re, &s->gb);
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1887 level = SHOW_SBITS(re, &s->gb, 12); SKIP_BITS(re, &s->gb, 12);
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1888 i += run;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1889 j = scantable[i];
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1890 if(level<0){
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1891 level= (-level*qscale*quant_matrix[j])>>4;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1892 level= -level;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1893 }else{
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1894 level= (level*qscale*quant_matrix[j])>>4;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1895 }
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1896 }
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1897 if (i > 63){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1587
diff changeset
1898 av_log(s->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n", s->mb_x, s->mb_y);
714
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1899 return -1;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1900 }
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1901
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1902 mismatch^= level;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1903 block[j] = level;
568
7e7a7282608c hmm ABS(dc-diff) > 512 fix
michaelni
parents: 558
diff changeset
1904 }
714
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1905 CLOSE_READER(re, &s->gb);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1906 }
714
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1907 block[63]^= mismatch&1;
fd0e997616fe optimizing mpeg2 decode block stuff
michaelni
parents: 711
diff changeset
1908
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1909 s->block_last_index[n] = i;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1910 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1911 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1912
986e461dc072 Initial revision
glantau
parents:
diff changeset
1913 typedef struct Mpeg1Context {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1914 MpegEncContext mpeg_enc_ctx;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1915 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
1916 int repeat_field; /* true if we must repeat the field */
1546
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
1917 AVPanScan pan_scan; /** some temporary storage for the panscan */
1827
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
1918 int slice_count;
1888
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
1919 int swap_uv;//indicate VCR2
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
1920 int save_aspect_info;
2219
9b6eb06cc184 mess cleanup
michael
parents: 2203
diff changeset
1921 AVRational frame_rate_ext; ///< MPEG-2 specific framerate modificator
1888
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
1922
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1923 } Mpeg1Context;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1924
986e461dc072 Initial revision
glantau
parents:
diff changeset
1925 static int mpeg_decode_init(AVCodecContext *avctx)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1926 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1927 Mpeg1Context *s = avctx->priv_data;
1892
5ac49e7a1b8f init cleanup
michael
parents: 1891
diff changeset
1928 MpegEncContext *s2 = &s->mpeg_enc_ctx;
1990
11991f81afd6 cola test
iive
parents: 1988
diff changeset
1929 int i;
1892
5ac49e7a1b8f init cleanup
michael
parents: 1891
diff changeset
1930
1990
11991f81afd6 cola test
iive
parents: 1988
diff changeset
1931 //we need some parmutation to store
11991f81afd6 cola test
iive
parents: 1988
diff changeset
1932 //matrixes, until MPV_common_init()
11991f81afd6 cola test
iive
parents: 1988
diff changeset
1933 //set the real permutatuon
11991f81afd6 cola test
iive
parents: 1988
diff changeset
1934 for(i=0;i<64;i++)
11991f81afd6 cola test
iive
parents: 1988
diff changeset
1935 s2->dsp.idct_permutation[i]=i;
11991f81afd6 cola test
iive
parents: 1988
diff changeset
1936
1892
5ac49e7a1b8f init cleanup
michael
parents: 1891
diff changeset
1937 MPV_decode_defaults(s2);
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
1938
1732
f716b8f47d98 uninitalized variables fix by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 1728
diff changeset
1939 s->mpeg_enc_ctx.avctx= avctx;
558
michaelni
parents: 556
diff changeset
1940 s->mpeg_enc_ctx.flags= avctx->flags;
1754
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1749
diff changeset
1941 s->mpeg_enc_ctx.flags2= avctx->flags2;
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 494
diff changeset
1942 common_init(&s->mpeg_enc_ctx);
1410
524c904a66b8 PSX MDEC decoder, based upon some code from Sebastian Jedruszkiewicz <elf at frogger dot rules dot pl>
michaelni
parents: 1409
diff changeset
1943 init_vlcs();
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1944
986e461dc072 Initial revision
glantau
parents:
diff changeset
1945 s->mpeg_enc_ctx_allocated = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1946 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
1947 s->repeat_field = 0;
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 313
diff changeset
1948 s->mpeg_enc_ctx.codec_id= avctx->codec->id;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1949 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1950 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1951
1888
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
1952 static void quant_matrix_rebuild(uint16_t *matrix, const uint8_t *old_perm,
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
1953 const uint8_t *new_perm){
2219
9b6eb06cc184 mess cleanup
michael
parents: 2203
diff changeset
1954 uint16_t temp_matrix[64];
9b6eb06cc184 mess cleanup
michael
parents: 2203
diff changeset
1955 int i;
1888
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
1956
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
1957 memcpy(temp_matrix,matrix,64*sizeof(uint16_t));
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
1958
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
1959 for(i=0;i<64;i++){
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
1960 matrix[new_perm[i]] = temp_matrix[old_perm[i]];
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
1961 }
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
1962 }
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
1963
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
1964 //Call this function when we know all parameters
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
1965 //it may be called in different places for mpeg1 and mpeg2
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
1966 static int mpeg_decode_postinit(AVCodecContext *avctx){
2219
9b6eb06cc184 mess cleanup
michael
parents: 2203
diff changeset
1967 Mpeg1Context *s1 = avctx->priv_data;
9b6eb06cc184 mess cleanup
michael
parents: 2203
diff changeset
1968 MpegEncContext *s = &s1->mpeg_enc_ctx;
9b6eb06cc184 mess cleanup
michael
parents: 2203
diff changeset
1969 uint8_t old_permutation[64];
1888
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
1970
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
1971 if (
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
1972 (s1->mpeg_enc_ctx_allocated == 0)||
2270
21f450be6cb5 lowres width/height cleanup 3rd try
michael
parents: 2266
diff changeset
1973 avctx->coded_width != s->width ||
21f450be6cb5 lowres width/height cleanup 3rd try
michael
parents: 2266
diff changeset
1974 avctx->coded_height != s->height||
1888
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
1975 // s1->save_aspect_info != avctx->aspect_ratio_info||
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
1976 0)
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
1977 {
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
1978
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
1979 if (s1->mpeg_enc_ctx_allocated) {
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
1980 MPV_common_end(s);
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
1981 }
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
1982
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
1983 if( (s->width == 0 )||(s->height == 0))
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
1984 return -2;
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
1985
2270
21f450be6cb5 lowres width/height cleanup 3rd try
michael
parents: 2266
diff changeset
1986 avcodec_set_dimensions(avctx, s->width, s->height);
1888
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
1987 avctx->bit_rate = s->bit_rate;
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
1988 s1->save_aspect_info = s->aspect_ratio_info;
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
1989
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
1990 //low_delay may be forced, in this case we will have B frames
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
1991 //that behave like P frames
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
1992 avctx->has_b_frames = !(s->low_delay);
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
1993
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
1994 if(avctx->sub_id==1){//s->codec_id==avctx->codec_id==CODEC_ID
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
1995 //mpeg1 fps
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
1996 avctx->frame_rate = frame_rate_tab[s->frame_rate_index].num;
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
1997 avctx->frame_rate_base= frame_rate_tab[s->frame_rate_index].den;
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
1998 //mpeg1 aspect
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
1999 avctx->sample_aspect_ratio= av_d2q(
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2000 1.0/mpeg1_aspect[s->aspect_ratio_info], 255);
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2001
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2002 }else{//mpeg2
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2003 //mpeg2 fps
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2004 av_reduce(
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2005 &s->avctx->frame_rate,
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2006 &s->avctx->frame_rate_base,
2219
9b6eb06cc184 mess cleanup
michael
parents: 2203
diff changeset
2007 frame_rate_tab[s->frame_rate_index].num * s1->frame_rate_ext.num,
9b6eb06cc184 mess cleanup
michael
parents: 2203
diff changeset
2008 frame_rate_tab[s->frame_rate_index].den * s1->frame_rate_ext.den,
1888
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2009 1<<30);
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2010 //mpeg2 aspect
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2011 if(s->aspect_ratio_info > 1){
1891
f403b3e286b3 use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents: 1890
diff changeset
2012 if( (s1->pan_scan.width == 0 )||(s1->pan_scan.height == 0) ){
1888
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2013 s->avctx->sample_aspect_ratio=
1890
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
2014 av_div_q(
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
2015 mpeg2_aspect[s->aspect_ratio_info],
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
2016 (AVRational){s->width, s->height}
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
2017 );
1888
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2018 }else{
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2019 s->avctx->sample_aspect_ratio=
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2020 av_div_q(
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2021 mpeg2_aspect[s->aspect_ratio_info],
1891
f403b3e286b3 use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents: 1890
diff changeset
2022 (AVRational){s1->pan_scan.width, s1->pan_scan.height}
1888
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2023 );
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2024 }
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2025 }else{
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2026 s->avctx->sample_aspect_ratio=
1890
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
2027 mpeg2_aspect[s->aspect_ratio_info];
1888
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2028 }
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2029 }//mpeg2
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2030
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2031 if(avctx->xvmc_acceleration){
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2032 avctx->pix_fmt = avctx->get_format(avctx,pixfmt_xvmc_mpg2_420);
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2033 }else{
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2034 if(s->chroma_format < 2){
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2035 avctx->pix_fmt = avctx->get_format(avctx,pixfmt_yuv_420);
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2036 }else
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2037 if(s->chroma_format == 2){
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2038 avctx->pix_fmt = avctx->get_format(avctx,pixfmt_yuv_422);
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2039 }else
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2040 if(s->chroma_format > 2){
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2041 avctx->pix_fmt = avctx->get_format(avctx,pixfmt_yuv_444);
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2042 }
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2043 }
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2044 //until then pix_fmt may be changed right after codec init
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2045 if( avctx->pix_fmt == PIX_FMT_XVMC_MPEG2_IDCT )
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2046 if( avctx->idct_algo == FF_IDCT_AUTO )
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2047 avctx->idct_algo = FF_IDCT_SIMPLE;
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2048
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2049 //quantization matrixes may need reordering
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2050 //if dct permutation is changed
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2051 memcpy(old_permutation,s->dsp.idct_permutation,64*sizeof(uint8_t));
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2052
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2053 if (MPV_common_init(s) < 0)
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2054 return -2;
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2055
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2056 quant_matrix_rebuild(s->intra_matrix, old_permutation,s->dsp.idct_permutation);
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2057 quant_matrix_rebuild(s->inter_matrix, old_permutation,s->dsp.idct_permutation);
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2058 quant_matrix_rebuild(s->chroma_intra_matrix,old_permutation,s->dsp.idct_permutation);
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2059 quant_matrix_rebuild(s->chroma_inter_matrix,old_permutation,s->dsp.idct_permutation);
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2060
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2061 s1->mpeg_enc_ctx_allocated = 1;
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2062 }
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2063 return 0;
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2064 }
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2065
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2066 /* return the 8 bit start code value and update the search
986e461dc072 Initial revision
glantau
parents:
diff changeset
2067 state. Return -1 if no start code found */
1862
126e075e6034 * more consts
kabi
parents: 1861
diff changeset
2068 static int find_start_code(const uint8_t **pbuf_ptr, const uint8_t *buf_end)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2069 {
1870
d493ce1c4497 find_start_code() optimization (about 2x faster now) this may improve decoding speed with multiple threads
michael
parents: 1862
diff changeset
2070 const uint8_t *buf_ptr= *pbuf_ptr;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2071
1870
d493ce1c4497 find_start_code() optimization (about 2x faster now) this may improve decoding speed with multiple threads
michael
parents: 1862
diff changeset
2072 buf_ptr++; //gurantees that -1 is within the array
d493ce1c4497 find_start_code() optimization (about 2x faster now) this may improve decoding speed with multiple threads
michael
parents: 1862
diff changeset
2073 buf_end -= 2; // gurantees that +2 is within the array
d493ce1c4497 find_start_code() optimization (about 2x faster now) this may improve decoding speed with multiple threads
michael
parents: 1862
diff changeset
2074
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2075 while (buf_ptr < buf_end) {
1870
d493ce1c4497 find_start_code() optimization (about 2x faster now) this may improve decoding speed with multiple threads
michael
parents: 1862
diff changeset
2076 if(*buf_ptr==0){
d493ce1c4497 find_start_code() optimization (about 2x faster now) this may improve decoding speed with multiple threads
michael
parents: 1862
diff changeset
2077 while(buf_ptr < buf_end && buf_ptr[1]==0)
d493ce1c4497 find_start_code() optimization (about 2x faster now) this may improve decoding speed with multiple threads
michael
parents: 1862
diff changeset
2078 buf_ptr++;
d493ce1c4497 find_start_code() optimization (about 2x faster now) this may improve decoding speed with multiple threads
michael
parents: 1862
diff changeset
2079
d493ce1c4497 find_start_code() optimization (about 2x faster now) this may improve decoding speed with multiple threads
michael
parents: 1862
diff changeset
2080 if(buf_ptr[-1] == 0 && buf_ptr[1] == 1){
d493ce1c4497 find_start_code() optimization (about 2x faster now) this may improve decoding speed with multiple threads
michael
parents: 1862
diff changeset
2081 *pbuf_ptr = buf_ptr+3;
d493ce1c4497 find_start_code() optimization (about 2x faster now) this may improve decoding speed with multiple threads
michael
parents: 1862
diff changeset
2082 return buf_ptr[2] + 0x100;
d493ce1c4497 find_start_code() optimization (about 2x faster now) this may improve decoding speed with multiple threads
michael
parents: 1862
diff changeset
2083 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2084 }
1870
d493ce1c4497 find_start_code() optimization (about 2x faster now) this may improve decoding speed with multiple threads
michael
parents: 1862
diff changeset
2085 buf_ptr += 2;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2086 }
1870
d493ce1c4497 find_start_code() optimization (about 2x faster now) this may improve decoding speed with multiple threads
michael
parents: 1862
diff changeset
2087 buf_end += 2; //undo the hack above
d493ce1c4497 find_start_code() optimization (about 2x faster now) this may improve decoding speed with multiple threads
michael
parents: 1862
diff changeset
2088
d493ce1c4497 find_start_code() optimization (about 2x faster now) this may improve decoding speed with multiple threads
michael
parents: 1862
diff changeset
2089 *pbuf_ptr = buf_end;
d493ce1c4497 find_start_code() optimization (about 2x faster now) this may improve decoding speed with multiple threads
michael
parents: 1862
diff changeset
2090 return -1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2091 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2092
986e461dc072 Initial revision
glantau
parents:
diff changeset
2093 static int mpeg1_decode_picture(AVCodecContext *avctx,
1862
126e075e6034 * more consts
kabi
parents: 1861
diff changeset
2094 const uint8_t *buf, int buf_size)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2095 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
2096 Mpeg1Context *s1 = avctx->priv_data;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2097 MpegEncContext *s = &s1->mpeg_enc_ctx;
1697
f3287b5d8d9f vbv_delay
michael
parents: 1692
diff changeset
2098 int ref, f_code, vbv_delay;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2099
1888
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2100 if(mpeg_decode_postinit(s->avctx) < 0)
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2101 return -2;
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2102
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
2103 init_get_bits(&s->gb, buf, buf_size*8);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2104
986e461dc072 Initial revision
glantau
parents:
diff changeset
2105 ref = get_bits(&s->gb, 10); /* temporal ref */
986e461dc072 Initial revision
glantau
parents:
diff changeset
2106 s->pict_type = get_bits(&s->gb, 3);
872
8af5c366e3d9 hurry_up=5 support
michaelni
parents: 853
diff changeset
2107
1697
f3287b5d8d9f vbv_delay
michael
parents: 1692
diff changeset
2108 vbv_delay= get_bits(&s->gb, 16);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2109 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
2110 s->full_pel[0] = get_bits1(&s->gb);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2111 f_code = get_bits(&s->gb, 3);
986e461dc072 Initial revision
glantau
parents:
diff changeset
2112 if (f_code == 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
2113 return -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2114 s->mpeg_f_code[0][0] = f_code;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2115 s->mpeg_f_code[0][1] = f_code;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2116 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2117 if (s->pict_type == B_TYPE) {
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
2118 s->full_pel[1] = get_bits1(&s->gb);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2119 f_code = get_bits(&s->gb, 3);
986e461dc072 Initial revision
glantau
parents:
diff changeset
2120 if (f_code == 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
2121 return -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2122 s->mpeg_f_code[1][0] = f_code;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2123 s->mpeg_f_code[1][1] = f_code;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2124 }
903
22ee74da2cd3 cleanup
michaelni
parents: 890
diff changeset
2125 s->current_picture.pict_type= s->pict_type;
22ee74da2cd3 cleanup
michaelni
parents: 890
diff changeset
2126 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
2127
1727
1ed3664b3523 gop timestamp fix
michael
parents: 1725
diff changeset
2128 // if(avctx->debug & FF_DEBUG_PICT_INFO)
1ed3664b3523 gop timestamp fix
michael
parents: 1725
diff changeset
2129 // av_log(avctx, AV_LOG_DEBUG, "vbv_delay %d, ref %d\n", vbv_delay, ref);
1ed3664b3523 gop timestamp fix
michael
parents: 1725
diff changeset
2130
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2131 s->y_dc_scale = 8;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2132 s->c_dc_scale = 8;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2133 s->first_slice = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2134 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2135 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2136
2219
9b6eb06cc184 mess cleanup
michael
parents: 2203
diff changeset
2137 static void mpeg_decode_sequence_extension(Mpeg1Context *s1)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2138 {
2219
9b6eb06cc184 mess cleanup
michael
parents: 2203
diff changeset
2139 MpegEncContext *s= &s1->mpeg_enc_ctx;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2140 int horiz_size_ext, vert_size_ext;
1721
8158e66f1f75 SVCD scan offset stuff
michael
parents: 1710
diff changeset
2141 int bit_rate_ext;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2142
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
2143 skip_bits(&s->gb, 1); /* profil and level esc*/
2167
76334bbb5038 user overrideable level & profile
michael
parents: 2130
diff changeset
2144 s->avctx->profile= get_bits(&s->gb, 3);
76334bbb5038 user overrideable level & profile
michael
parents: 2130
diff changeset
2145 s->avctx->level= get_bits(&s->gb, 4);
267
e10840e4f773 - Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents: 241
diff changeset
2146 s->progressive_sequence = get_bits1(&s->gb); /* progressive_sequence */
1848
c72589baee53 initial chroma_format changes,xvmc tweaks and codec_cap
iive
parents: 1841
diff changeset
2147 s->chroma_format = get_bits(&s->gb, 2); /* chroma_format 1=420, 2=422, 3=444 */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2148 horiz_size_ext = get_bits(&s->gb, 2);
986e461dc072 Initial revision
glantau
parents:
diff changeset
2149 vert_size_ext = get_bits(&s->gb, 2);
986e461dc072 Initial revision
glantau
parents:
diff changeset
2150 s->width |= (horiz_size_ext << 12);
986e461dc072 Initial revision
glantau
parents:
diff changeset
2151 s->height |= (vert_size_ext << 12);
986e461dc072 Initial revision
glantau
parents:
diff changeset
2152 bit_rate_ext = get_bits(&s->gb, 12); /* XXX: handle it */
1848
c72589baee53 initial chroma_format changes,xvmc tweaks and codec_cap
iive
parents: 1841
diff changeset
2153 s->bit_rate += (bit_rate_ext << 12) * 400;
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
2154 skip_bits1(&s->gb); /* marker */
1710
4a68b20eeb2c print vbv buffer size & bitrate when decoding with -debug 1
michael
parents: 1708
diff changeset
2155 s->avctx->rc_buffer_size += get_bits(&s->gb, 8)*1024*16<<10;
1346
44c94325810c CODEC_FLAG_LOW_DELAY fix
michaelni
parents: 1328
diff changeset
2156
917
d3aa313dc373 mpeg1&2 aspect decoding
michaelni
parents: 911
diff changeset
2157 s->low_delay = get_bits1(&s->gb);
1346
44c94325810c CODEC_FLAG_LOW_DELAY fix
michaelni
parents: 1328
diff changeset
2158 if(s->flags & CODEC_FLAG_LOW_DELAY) s->low_delay=1;
44c94325810c CODEC_FLAG_LOW_DELAY fix
michaelni
parents: 1328
diff changeset
2159
2219
9b6eb06cc184 mess cleanup
michael
parents: 2203
diff changeset
2160 s1->frame_rate_ext.num = get_bits(&s->gb, 2)+1;
9b6eb06cc184 mess cleanup
michael
parents: 2203
diff changeset
2161 s1->frame_rate_ext.den = get_bits(&s->gb, 5)+1;
1126
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
2162
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2163 dprintf("sequence extension\n");
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
2164 s->codec_id= s->avctx->codec_id= CODEC_ID_MPEG2VIDEO;
401
e20655449d4a mpeg1/2 identifier - fixed frame rate for some bad mpeg1 streams
glantau
parents: 391
diff changeset
2165 s->avctx->sub_id = 2; /* indicates mpeg2 found */
917
d3aa313dc373 mpeg1&2 aspect decoding
michaelni
parents: 911
diff changeset
2166
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
2167 if(s->avctx->debug & FF_DEBUG_PICT_INFO)
1710
4a68b20eeb2c print vbv buffer size & bitrate when decoding with -debug 1
michael
parents: 1708
diff changeset
2168 av_log(s->avctx, AV_LOG_DEBUG, "profile: %d, level: %d vbv buffer: %d, bitrate:%d\n",
2167
76334bbb5038 user overrideable level & profile
michael
parents: 2130
diff changeset
2169 s->avctx->profile, s->avctx->level, s->avctx->rc_buffer_size, s->bit_rate);
1888
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2170
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2171 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2172
1546
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2173 static void mpeg_decode_sequence_display_extension(Mpeg1Context *s1)
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2174 {
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2175 MpegEncContext *s= &s1->mpeg_enc_ctx;
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2176 int color_description, w, h;
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2177
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2178 skip_bits(&s->gb, 3); /* video format */
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2179 color_description= get_bits1(&s->gb);
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2180 if(color_description){
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2181 skip_bits(&s->gb, 8); /* color primaries */
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2182 skip_bits(&s->gb, 8); /* transfer_characteristics */
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2183 skip_bits(&s->gb, 8); /* matrix_coefficients */
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2184 }
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2185 w= get_bits(&s->gb, 14);
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2186 skip_bits(&s->gb, 1); //marker
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2187 h= get_bits(&s->gb, 14);
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2188 skip_bits(&s->gb, 1); //marker
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2189
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2190 s1->pan_scan.width= 16*w;
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2191 s1->pan_scan.height=16*h;
1891
f403b3e286b3 use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents: 1890
diff changeset
2192
1546
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2193 if(s->avctx->debug & FF_DEBUG_PICT_INFO)
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1587
diff changeset
2194 av_log(s->avctx, AV_LOG_DEBUG, "sde w:%d, h:%d\n", w, h);
1546
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2195 }
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2196
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2197 static void mpeg_decode_picture_display_extension(Mpeg1Context *s1)
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2198 {
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2199 MpegEncContext *s= &s1->mpeg_enc_ctx;
1891
f403b3e286b3 use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents: 1890
diff changeset
2200 int i,nofco;
1546
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2201
1891
f403b3e286b3 use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents: 1890
diff changeset
2202 nofco = 1;
f403b3e286b3 use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents: 1890
diff changeset
2203 if(s->progressive_sequence){
f403b3e286b3 use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents: 1890
diff changeset
2204 if(s->repeat_first_field){
f403b3e286b3 use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents: 1890
diff changeset
2205 nofco++;
f403b3e286b3 use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents: 1890
diff changeset
2206 if(s->top_field_first)
f403b3e286b3 use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents: 1890
diff changeset
2207 nofco++;
f403b3e286b3 use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents: 1890
diff changeset
2208 }
f403b3e286b3 use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents: 1890
diff changeset
2209 }else{
f403b3e286b3 use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents: 1890
diff changeset
2210 if(s->picture_structure == PICT_FRAME){
f403b3e286b3 use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents: 1890
diff changeset
2211 nofco++;
f403b3e286b3 use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents: 1890
diff changeset
2212 if(s->repeat_first_field)
f403b3e286b3 use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents: 1890
diff changeset
2213 nofco++;
f403b3e286b3 use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents: 1890
diff changeset
2214 }
f403b3e286b3 use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents: 1890
diff changeset
2215 }
f403b3e286b3 use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents: 1890
diff changeset
2216 for(i=0; i<nofco; i++){
1546
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2217 s1->pan_scan.position[i][0]= get_sbits(&s->gb, 16);
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2218 skip_bits(&s->gb, 1); //marker
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2219 s1->pan_scan.position[i][1]= get_sbits(&s->gb, 16);
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2220 skip_bits(&s->gb, 1); //marker
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2221 }
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2222
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2223 if(s->avctx->debug & FF_DEBUG_PICT_INFO)
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1587
diff changeset
2224 av_log(s->avctx, AV_LOG_DEBUG, "pde (%d,%d) (%d,%d) (%d,%d)\n",
1546
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2225 s1->pan_scan.position[0][0], s1->pan_scan.position[0][1],
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2226 s1->pan_scan.position[1][0], s1->pan_scan.position[1][1],
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2227 s1->pan_scan.position[2][0], s1->pan_scan.position[2][1]
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2228 );
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2229 }
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2230
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2231 static void mpeg_decode_quant_matrix_extension(MpegEncContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
2232 {
38
5bf15419d47e changed quant matrix order (should fix mmx mpeg decoding bug)
glantau
parents: 21
diff changeset
2233 int i, v, j;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2234
59
efd3c19f6d62 fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents: 58
diff changeset
2235 dprintf("matrix extension\n");
efd3c19f6d62 fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents: 58
diff changeset
2236
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
2237 if (get_bits1(&s->gb)) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2238 for(i=0;i<64;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
2239 v = get_bits(&s->gb, 8);
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1085
diff changeset
2240 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
2241 s->intra_matrix[j] = v;
5bf15419d47e changed quant matrix order (should fix mmx mpeg decoding bug)
glantau
parents: 21
diff changeset
2242 s->chroma_intra_matrix[j] = v;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2243 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2244 }
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
2245 if (get_bits1(&s->gb)) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2246 for(i=0;i<64;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
2247 v = get_bits(&s->gb, 8);
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1085
diff changeset
2248 j= s->dsp.idct_permutation[ ff_zigzag_direct[i] ];
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 313
diff changeset
2249 s->inter_matrix[j] = v;
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 313
diff changeset
2250 s->chroma_inter_matrix[j] = v;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2251 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2252 }
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
2253 if (get_bits1(&s->gb)) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2254 for(i=0;i<64;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
2255 v = get_bits(&s->gb, 8);
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1085
diff changeset
2256 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
2257 s->chroma_intra_matrix[j] = v;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2258 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2259 }
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
2260 if (get_bits1(&s->gb)) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2261 for(i=0;i<64;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
2262 v = get_bits(&s->gb, 8);
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1085
diff changeset
2263 j= s->dsp.idct_permutation[ ff_zigzag_direct[i] ];
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 313
diff changeset
2264 s->chroma_inter_matrix[j] = v;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2265 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2266 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2267 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2268
986e461dc072 Initial revision
glantau
parents:
diff changeset
2269 static void mpeg_decode_picture_coding_extension(MpegEncContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
2270 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
2271 s->full_pel[0] = s->full_pel[1] = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2272 s->mpeg_f_code[0][0] = get_bits(&s->gb, 4);
986e461dc072 Initial revision
glantau
parents:
diff changeset
2273 s->mpeg_f_code[0][1] = get_bits(&s->gb, 4);
986e461dc072 Initial revision
glantau
parents:
diff changeset
2274 s->mpeg_f_code[1][0] = get_bits(&s->gb, 4);
986e461dc072 Initial revision
glantau
parents:
diff changeset
2275 s->mpeg_f_code[1][1] = get_bits(&s->gb, 4);
986e461dc072 Initial revision
glantau
parents:
diff changeset
2276 s->intra_dc_precision = get_bits(&s->gb, 2);
986e461dc072 Initial revision
glantau
parents:
diff changeset
2277 s->picture_structure = get_bits(&s->gb, 2);
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
2278 s->top_field_first = get_bits1(&s->gb);
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
2279 s->frame_pred_frame_dct = get_bits1(&s->gb);
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
2280 s->concealment_motion_vectors = get_bits1(&s->gb);
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
2281 s->q_scale_type = get_bits1(&s->gb);
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
2282 s->intra_vlc_format = get_bits1(&s->gb);
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
2283 s->alternate_scan = get_bits1(&s->gb);
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
2284 s->repeat_first_field = get_bits1(&s->gb);
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
2285 s->chroma_420_type = get_bits1(&s->gb);
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
2286 s->progressive_frame = get_bits1(&s->gb);
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1706
diff changeset
2287
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
2288 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
2289 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
2290 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
2291 s->first_field ^= 1;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
2292 memset(s->mbskip_table, 0, s->mb_stride*s->mb_height);
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
2293 }
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1092
diff changeset
2294
715
8b3ccabfce4a move scantable init from block-decode to header parser
michaelni
parents: 714
diff changeset
2295 if(s->alternate_scan){
1273
a979fab41ed8 ASV1 codec
michaelni
parents: 1255
diff changeset
2296 ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable , ff_alternate_vertical_scan);
a979fab41ed8 ASV1 codec
michaelni
parents: 1255
diff changeset
2297 ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable , ff_alternate_vertical_scan);
715
8b3ccabfce4a move scantable init from block-decode to header parser
michaelni
parents: 714
diff changeset
2298 }else{
1273
a979fab41ed8 ASV1 codec
michaelni
parents: 1255
diff changeset
2299 ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable , ff_zigzag_direct);
a979fab41ed8 ASV1 codec
michaelni
parents: 1255
diff changeset
2300 ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable , ff_zigzag_direct);
715
8b3ccabfce4a move scantable init from block-decode to header parser
michaelni
parents: 714
diff changeset
2301 }
8b3ccabfce4a move scantable init from block-decode to header parser
michaelni
parents: 714
diff changeset
2302
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2303 /* composite display not parsed */
267
e10840e4f773 - Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents: 241
diff changeset
2304 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
2305 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
2306 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
2307 dprintf("repeat first field=%d\n", s->repeat_first_field);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2308 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
2309 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
2310 dprintf("alternate_scan=%d\n", s->alternate_scan);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2311 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
2312 dprintf("progressive_frame=%d\n", s->progressive_frame);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2313 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2314
986e461dc072 Initial revision
glantau
parents:
diff changeset
2315 static void mpeg_decode_extension(AVCodecContext *avctx,
1862
126e075e6034 * more consts
kabi
parents: 1861
diff changeset
2316 const uint8_t *buf, int buf_size)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2317 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
2318 Mpeg1Context *s1 = avctx->priv_data;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2319 MpegEncContext *s = &s1->mpeg_enc_ctx;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2320 int ext_type;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2321
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
2322 init_get_bits(&s->gb, buf, buf_size*8);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2323
986e461dc072 Initial revision
glantau
parents:
diff changeset
2324 ext_type = get_bits(&s->gb, 4);
986e461dc072 Initial revision
glantau
parents:
diff changeset
2325 switch(ext_type) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
2326 case 0x1:
2219
9b6eb06cc184 mess cleanup
michael
parents: 2203
diff changeset
2327 mpeg_decode_sequence_extension(s1);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2328 break;
1546
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2329 case 0x2:
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2330 mpeg_decode_sequence_display_extension(s1);
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2331 break;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2332 case 0x3:
986e461dc072 Initial revision
glantau
parents:
diff changeset
2333 mpeg_decode_quant_matrix_extension(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
2334 break;
1546
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2335 case 0x7:
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2336 mpeg_decode_picture_display_extension(s1);
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2337 break;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2338 case 0x8:
986e461dc072 Initial revision
glantau
parents:
diff changeset
2339 mpeg_decode_picture_coding_extension(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
2340 break;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2341 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2342 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2343
1580
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1550
diff changeset
2344 static void exchange_uv(MpegEncContext *s){
2219
9b6eb06cc184 mess cleanup
michael
parents: 2203
diff changeset
2345 short * tmp = s->pblocks[4];
1580
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1550
diff changeset
2346 s->pblocks[4] = s->pblocks[5];
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1550
diff changeset
2347 s->pblocks[5] = tmp;
1380
b120aed7bf84 ati vcr2 uv swap
michaelni
parents: 1377
diff changeset
2348 }
b120aed7bf84 ati vcr2 uv swap
michaelni
parents: 1377
diff changeset
2349
1827
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2350 static int mpeg_field_start(MpegEncContext *s){
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2351 AVCodecContext *avctx= s->avctx;
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2352 Mpeg1Context *s1 = (Mpeg1Context*)s;
826
ce240888252d cleanup
michaelni
parents: 825
diff changeset
2353
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2354 /* start frame decoding */
1827
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2355 if(s->first_field || s->picture_structure==PICT_FRAME){
771
d4cc92144266 handle direct rendering buffer allocation failure
michaelni
parents: 751
diff changeset
2356 if(MPV_frame_start(s, avctx) < 0)
1827
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2357 return -1;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
2358
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
2359 ff_er_frame_start(s);
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
2360
1085
9acf4b552047 move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents: 1084
diff changeset
2361 /* first check if we must repeat the frame */
1409
62ea3b7d00f0 repeat_pict was never returned
bellard
parents: 1402
diff changeset
2362 s->current_picture_ptr->repeat_pict = 0;
1085
9acf4b552047 move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents: 1084
diff changeset
2363 if (s->repeat_first_field) {
9acf4b552047 move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents: 1084
diff changeset
2364 if (s->progressive_sequence) {
9acf4b552047 move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents: 1084
diff changeset
2365 if (s->top_field_first)
1409
62ea3b7d00f0 repeat_pict was never returned
bellard
parents: 1402
diff changeset
2366 s->current_picture_ptr->repeat_pict = 4;
1085
9acf4b552047 move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents: 1084
diff changeset
2367 else
1409
62ea3b7d00f0 repeat_pict was never returned
bellard
parents: 1402
diff changeset
2368 s->current_picture_ptr->repeat_pict = 2;
1085
9acf4b552047 move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents: 1084
diff changeset
2369 } else if (s->progressive_frame) {
1409
62ea3b7d00f0 repeat_pict was never returned
bellard
parents: 1402
diff changeset
2370 s->current_picture_ptr->repeat_pict = 1;
1085
9acf4b552047 move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents: 1084
diff changeset
2371 }
9acf4b552047 move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents: 1084
diff changeset
2372 }
1546
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2373
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1530
diff changeset
2374 *s->current_picture_ptr->pan_scan= s1->pan_scan;
1827
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2375 }else{ //second field
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1126
diff changeset
2376 int i;
1182
38e8b8f331cb some checks to avoid segfaults if the decoder is feeded with junk
michaelni
parents: 1181
diff changeset
2377
38e8b8f331cb some checks to avoid segfaults if the decoder is feeded with junk
michaelni
parents: 1181
diff changeset
2378 if(!s->current_picture_ptr){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1587
diff changeset
2379 av_log(s->avctx, AV_LOG_ERROR, "first field missing\n");
1182
38e8b8f331cb some checks to avoid segfaults if the decoder is feeded with junk
michaelni
parents: 1181
diff changeset
2380 return -1;
38e8b8f331cb some checks to avoid segfaults if the decoder is feeded with junk
michaelni
parents: 1181
diff changeset
2381 }
38e8b8f331cb some checks to avoid segfaults if the decoder is feeded with junk
michaelni
parents: 1181
diff changeset
2382
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1126
diff changeset
2383 for(i=0; i<4; i++){
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1126
diff changeset
2384 s->current_picture.data[i] = s->current_picture_ptr->data[i];
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1126
diff changeset
2385 if(s->picture_structure == PICT_BOTTOM_FIELD){
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1126
diff changeset
2386 s->current_picture.data[i] += s->current_picture_ptr->linesize[i];
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1126
diff changeset
2387 }
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1126
diff changeset
2388 }
1827
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2389 }
1381
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
2390 #ifdef HAVE_XVMC
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
2391 // MPV_frame_start will call this function too,
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
2392 // but we need to call it on every field
1827
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2393 if(s->avctx->xvmc_acceleration)
1381
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
2394 XVMC_field_start(s,avctx);
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
2395 #endif
1827
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2396
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2397 return 0;
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2398 }
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2399
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2400 #define DECODE_SLICE_ERROR -1
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2401 #define DECODE_SLICE_OK 0
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2402
1827
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2403 /**
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2404 * decodes a slice. MpegEncContext.mb_y must be set to the MB row from the startcode
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2405 * @return DECODE_SLICE_ERROR if the slice is damaged<br>
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2406 * DECODE_SLICE_OK if this slice is ok<br>
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2407 */
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2408 static int mpeg_decode_slice(Mpeg1Context *s1, int mb_y,
1862
126e075e6034 * more consts
kabi
parents: 1861
diff changeset
2409 const uint8_t **buf, int buf_size)
1827
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2410 {
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2411 MpegEncContext *s = &s1->mpeg_enc_ctx;
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2412 AVCodecContext *avctx= s->avctx;
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2413 int ret;
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2414 const int field_pic= s->picture_structure != PICT_FRAME;
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2219
diff changeset
2415 const int lowres= s->avctx->lowres;
1827
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2416
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2417 s->resync_mb_x=
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2418 s->resync_mb_y= -1;
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2419
1953
98d46737196b corrupted field pictures segfault fix
michael
parents: 1948
diff changeset
2420 if (mb_y<<field_pic >= s->mb_height){
98d46737196b corrupted field pictures segfault fix
michael
parents: 1948
diff changeset
2421 av_log(s->avctx, AV_LOG_ERROR, "slice below image (%d >= %d)\n", mb_y, s->mb_height);
1827
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2422 return -1;
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2423 }
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2424
1211
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2425 init_get_bits(&s->gb, *buf, buf_size*8);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2426
1827
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2427 ff_mpeg1_clean_buffers(s);
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2428 s->interlaced_dct = 0;
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2429
54
764f2eaf711e fixed mpeg2 qscale decoding
glantau
parents: 45
diff changeset
2430 s->qscale = get_qscale(s);
1690
db54bb946ab3 10l (printing qscale before parsing it)
michael
parents: 1682
diff changeset
2431
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
2432 if(s->qscale == 0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1587
diff changeset
2433 av_log(s->avctx, AV_LOG_ERROR, "qscale == 0\n");
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
2434 return -1;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
2435 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
2436
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2437 /* extra slice info */
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
2438 while (get_bits1(&s->gb) != 0) {
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
2439 skip_bits(&s->gb, 8);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2440 }
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
2441
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
2442 s->mb_x=0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2443
716
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
2444 for(;;) {
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
2445 int code = get_vlc2(&s->gb, mbincr_vlc.table, MBINCR_VLC_BITS, 2);
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
2446 if (code < 0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1587
diff changeset
2447 av_log(s->avctx, AV_LOG_ERROR, "first mb_incr damaged\n");
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
2448 return -1;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
2449 }
716
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
2450 if (code >= 33) {
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
2451 if (code == 33) {
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
2452 s->mb_x += 33;
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
2453 }
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
2454 /* otherwise, stuffing, nothing to do */
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
2455 } else {
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
2456 s->mb_x += code;
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
2457 break;
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
2458 }
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
2459 }
1827
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2460
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
2461 s->resync_mb_x= s->mb_x;
1827
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2462 s->resync_mb_y= s->mb_y= mb_y;
1160
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1150
diff changeset
2463 s->mb_skip_run= 0;
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1381
diff changeset
2464 ff_init_block_index(s);
716
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
2465
1827
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2466 if (s->mb_y==0 && s->mb_x==0 && (s->first_field || s->picture_structure==PICT_FRAME)) {
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2467 if(s->avctx->debug&FF_DEBUG_PICT_INFO){
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2468 av_log(s->avctx, AV_LOG_DEBUG, "qp:%d fc:%2d%2d%2d%2d %s %s %s %s %s dc:%d pstruct:%d fdct:%d cmv:%d qtype:%d ivlc:%d rff:%d %s\n",
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2469 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],
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2470 s->pict_type == I_TYPE ? "I" : (s->pict_type == P_TYPE ? "P" : (s->pict_type == B_TYPE ? "B" : "S")),
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2471 s->progressive_sequence ? "ps" :"", s->progressive_frame ? "pf" : "", s->alternate_scan ? "alt" :"", s->top_field_first ? "top" :"",
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2472 s->intra_dc_precision, s->picture_structure, s->frame_pred_frame_dct, s->concealment_motion_vectors,
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2473 s->q_scale_type, s->intra_vlc_format, s->repeat_first_field, s->chroma_420_type ? "420" :"");
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2474 }
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2475 }
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2476
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2477 for(;;) {
1580
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1550
diff changeset
2478 #ifdef HAVE_XVMC
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1550
diff changeset
2479 //one 1 we memcpy blocks in xvmcvideo
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1550
diff changeset
2480 if(s->avctx->xvmc_acceleration > 1)
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1550
diff changeset
2481 XVMC_init_block(s);//set s->block
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1550
diff changeset
2482 #endif
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1550
diff changeset
2483
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 844
diff changeset
2484 s->dsp.clear_blocks(s->block[0]);
2074
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2028
diff changeset
2485 if(!s->chroma_y_shift){
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2028
diff changeset
2486 s->dsp.clear_blocks(s->block[6]);
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2028
diff changeset
2487 }
12
4d50c7d89e0f use block[] in structure to have it aligned on 8 bytes for mmx optimizations
glantau
parents: 7
diff changeset
2488 ret = mpeg_decode_mb(s, s->block);
1644
835cf346975e h263 loop filter
michael
parents: 1620
diff changeset
2489 s->chroma_qscale= s->qscale;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
2490
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2491 dprintf("ret=%d\n", ret);
986e461dc072 Initial revision
glantau
parents:
diff changeset
2492 if (ret < 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
2493 return -1;
1668
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1655
diff changeset
2494
1692
c4a4c28cc556 mv vissualization & field picture fix
michael
parents: 1691
diff changeset
2495 if(s->current_picture.motion_val[0] && !s->encoding){ //note motion_val is normally NULL unless we want to extract the MVs
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1915
diff changeset
2496 const int wrap = field_pic ? 2*s->b8_stride : s->b8_stride;
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1915
diff changeset
2497 int xy = s->mb_x*2 + s->mb_y*2*wrap;
1841
05017f3b87d9 mpeg2 field pic decoding fix
michael
parents: 1837
diff changeset
2498 int motion_x, motion_y, dir, i;
1692
c4a4c28cc556 mv vissualization & field picture fix
michael
parents: 1691
diff changeset
2499 if(field_pic && !s->first_field)
c4a4c28cc556 mv vissualization & field picture fix
michael
parents: 1691
diff changeset
2500 xy += wrap/2;
c4a4c28cc556 mv vissualization & field picture fix
michael
parents: 1691
diff changeset
2501
1852
9ecbf5d23cdc 10l (segfault fix)
michael
parents: 1850
diff changeset
2502 for(i=0; i<2; i++){
9ecbf5d23cdc 10l (segfault fix)
michael
parents: 1850
diff changeset
2503 for(dir=0; dir<2; dir++){
1841
05017f3b87d9 mpeg2 field pic decoding fix
michael
parents: 1837
diff changeset
2504 if (s->mb_intra || (dir==1 && s->pict_type != B_TYPE)) {
05017f3b87d9 mpeg2 field pic decoding fix
michael
parents: 1837
diff changeset
2505 motion_x = motion_y = 0;
1946
f9212b59a802 fix exported motion vectors
michael
parents: 1938
diff changeset
2506 }else if (s->mv_type == MV_TYPE_16X16 || (s->mv_type == MV_TYPE_FIELD && field_pic)){
1841
05017f3b87d9 mpeg2 field pic decoding fix
michael
parents: 1837
diff changeset
2507 motion_x = s->mv[dir][0][0];
05017f3b87d9 mpeg2 field pic decoding fix
michael
parents: 1837
diff changeset
2508 motion_y = s->mv[dir][0][1];
05017f3b87d9 mpeg2 field pic decoding fix
michael
parents: 1837
diff changeset
2509 } else /*if ((s->mv_type == MV_TYPE_FIELD) || (s->mv_type == MV_TYPE_16X8))*/ {
05017f3b87d9 mpeg2 field pic decoding fix
michael
parents: 1837
diff changeset
2510 motion_x = s->mv[dir][i][0];
05017f3b87d9 mpeg2 field pic decoding fix
michael
parents: 1837
diff changeset
2511 motion_y = s->mv[dir][i][1];
05017f3b87d9 mpeg2 field pic decoding fix
michael
parents: 1837
diff changeset
2512 }
1948
d10578f7fd40 exporting field_select/ref_index values
michael
parents: 1946
diff changeset
2513
1841
05017f3b87d9 mpeg2 field pic decoding fix
michael
parents: 1837
diff changeset
2514 s->current_picture.motion_val[dir][xy ][0] = motion_x;
05017f3b87d9 mpeg2 field pic decoding fix
michael
parents: 1837
diff changeset
2515 s->current_picture.motion_val[dir][xy ][1] = motion_y;
05017f3b87d9 mpeg2 field pic decoding fix
michael
parents: 1837
diff changeset
2516 s->current_picture.motion_val[dir][xy + 1][0] = motion_x;
05017f3b87d9 mpeg2 field pic decoding fix
michael
parents: 1837
diff changeset
2517 s->current_picture.motion_val[dir][xy + 1][1] = motion_y;
1948
d10578f7fd40 exporting field_select/ref_index values
michael
parents: 1946
diff changeset
2518 s->current_picture.ref_index [dir][xy ]=
d10578f7fd40 exporting field_select/ref_index values
michael
parents: 1946
diff changeset
2519 s->current_picture.ref_index [dir][xy + 1]= s->field_select[dir][i];
1841
05017f3b87d9 mpeg2 field pic decoding fix
michael
parents: 1837
diff changeset
2520 }
1852
9ecbf5d23cdc 10l (segfault fix)
michael
parents: 1850
diff changeset
2521 xy += wrap;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
2522 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
2523 }
1668
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1655
diff changeset
2524
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2219
diff changeset
2525 s->dest[0] += 16 >> lowres;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2219
diff changeset
2526 s->dest[1] += 16 >> (s->chroma_x_shift + lowres);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2219
diff changeset
2527 s->dest[2] += 16 >> (s->chroma_x_shift + lowres);
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1381
diff changeset
2528
716
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
2529 MPV_decode_mb(s, s->block);
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1381
diff changeset
2530
716
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
2531 if (++s->mb_x >= s->mb_width) {
2261
bd09f4d1976f lowres slice fix
michael
parents: 2256
diff changeset
2532 const int mb_size= 16>>s->avctx->lowres;
1380
b120aed7bf84 ati vcr2 uv swap
michaelni
parents: 1377
diff changeset
2533
2261
bd09f4d1976f lowres slice fix
michael
parents: 2256
diff changeset
2534 ff_draw_horiz_band(s, mb_size*s->mb_y, mb_size);
716
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
2535
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
2536 s->mb_x = 0;
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
2537 s->mb_y++;
1289
57172377849a fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents: 1285
diff changeset
2538
57172377849a fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents: 1285
diff changeset
2539 if(s->mb_y<<field_pic >= s->mb_height){
57172377849a fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents: 1285
diff changeset
2540 int left= s->gb.size_in_bits - get_bits_count(&s->gb);
57172377849a fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents: 1285
diff changeset
2541
57172377849a fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents: 1285
diff changeset
2542 if(left < 0 || (left && show_bits(&s->gb, FFMIN(left, 23)))
57172377849a fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents: 1285
diff changeset
2543 || (avctx->error_resilience >= FF_ER_AGGRESSIVE && left>8)){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1587
diff changeset
2544 av_log(avctx, AV_LOG_ERROR, "end mismatch left=%d\n", left);
1289
57172377849a fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents: 1285
diff changeset
2545 return -1;
57172377849a fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents: 1285
diff changeset
2546 }else
57172377849a fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents: 1285
diff changeset
2547 goto eos;
57172377849a fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents: 1285
diff changeset
2548 }
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1381
diff changeset
2549
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1381
diff changeset
2550 ff_init_block_index(s);
716
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
2551 }
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
2552
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
2553 /* skip mb handling */
1160
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1150
diff changeset
2554 if (s->mb_skip_run == -1) {
716
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
2555 /* read again increment */
1160
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1150
diff changeset
2556 s->mb_skip_run = 0;
716
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
2557 for(;;) {
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
2558 int code = get_vlc2(&s->gb, mbincr_vlc.table, MBINCR_VLC_BITS, 2);
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
2559 if (code < 0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1587
diff changeset
2560 av_log(s->avctx, AV_LOG_ERROR, "mb incr damaged\n");
1181
4c2339f3863a 100l (mpeg2 decoding fixed)
michaelni
parents: 1177
diff changeset
2561 return -1;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
2562 }
716
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
2563 if (code >= 33) {
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
2564 if (code == 33) {
1160
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1150
diff changeset
2565 s->mb_skip_run += 33;
1181
4c2339f3863a 100l (mpeg2 decoding fixed)
michaelni
parents: 1177
diff changeset
2566 }else if(code == 35){
4c2339f3863a 100l (mpeg2 decoding fixed)
michaelni
parents: 1177
diff changeset
2567 if(s->mb_skip_run != 0 || show_bits(&s->gb, 15) != 0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1587
diff changeset
2568 av_log(s->avctx, AV_LOG_ERROR, "slice mismatch\n");
1181
4c2339f3863a 100l (mpeg2 decoding fixed)
michaelni
parents: 1177
diff changeset
2569 return -1;
4c2339f3863a 100l (mpeg2 decoding fixed)
michaelni
parents: 1177
diff changeset
2570 }
4c2339f3863a 100l (mpeg2 decoding fixed)
michaelni
parents: 1177
diff changeset
2571 goto eos; /* end of slice */
716
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
2572 }
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
2573 /* otherwise, stuffing, nothing to do */
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
2574 } else {
1160
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1150
diff changeset
2575 s->mb_skip_run += code;
716
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
2576 break;
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
2577 }
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
2578 }
2ec5bd9f7116 sliced mode for mpeg1/2
michaelni
parents: 715
diff changeset
2579 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2580 }
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
2581 eos: // end of slice
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
2582 *buf += get_bits_count(&s->gb)/8 - 1;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
2583 //printf("y %d %d %d %d\n", s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y);
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
2584 return 0;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
2585 }
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
2586
1827
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2587 static int slice_decode_thread(AVCodecContext *c, void *arg){
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2588 MpegEncContext *s= arg;
1861
ebad34888002 * const warn elimination
kabi
parents: 1858
diff changeset
2589 const uint8_t *buf= s->gb.buffer;
1827
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2590 int mb_y= s->start_mb_y;
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2591
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2592 s->error_count= 3*(s->end_mb_y - s->start_mb_y)*s->mb_width;
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2593
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2594 for(;;){
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2595 int start_code, ret;
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2596
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2597 ret= mpeg_decode_slice((Mpeg1Context*)s, mb_y, &buf, s->gb.buffer_end - buf);
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2598 emms_c();
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2599 //av_log(c, AV_LOG_DEBUG, "ret:%d resync:%d/%d mb:%d/%d ts:%d/%d ec:%d\n",
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2600 //ret, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, s->start_mb_y, s->end_mb_y, s->error_count);
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2601 if(ret < 0){
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2602 if(s->resync_mb_x>=0 && s->resync_mb_y>=0)
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2603 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, AC_ERROR|DC_ERROR|MV_ERROR);
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2604 }else{
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2605 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, AC_END|DC_END|MV_END);
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2606 }
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2607
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2608 if(s->mb_y == s->end_mb_y)
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2609 return 0;
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2610
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2611 start_code = find_start_code(&buf, s->gb.buffer_end);
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2612 mb_y= start_code - SLICE_MIN_START_CODE;
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2613 if(mb_y < 0 || mb_y >= s->end_mb_y)
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2614 return -1;
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2615 }
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2616
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2617 return 0; //not reached
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2618 }
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2619
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
2620 /**
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
2621 * handles slice ends.
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
2622 * @return 1 if it seems to be the last slice of
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
2623 */
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
2624 static int slice_end(AVCodecContext *avctx, AVFrame *pict)
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
2625 {
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
2626 Mpeg1Context *s1 = avctx->priv_data;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
2627 MpegEncContext *s = &s1->mpeg_enc_ctx;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
2628
1402
f662e9c86cf2 * fixing a regression in mpeg encoder (not setting pix_fmt),
romansh
parents: 1389
diff changeset
2629 if (!s1->mpeg_enc_ctx_allocated || !s->current_picture_ptr)
1311
fc858abf6b10 fixed segfault if sequence header has not been found before slice decoding
bellard
parents: 1289
diff changeset
2630 return 0;
fc858abf6b10 fixed segfault if sequence header has not been found before slice decoding
bellard
parents: 1289
diff changeset
2631
1381
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
2632 #ifdef HAVE_XVMC
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
2633 if(s->avctx->xvmc_acceleration)
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
2634 XVMC_field_end(s);
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
2635 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2636 /* end of slice reached */
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
2637 if (/*s->mb_y<<field_pic == s->mb_height &&*/ !s->first_field) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2638 /* end of image */
903
22ee74da2cd3 cleanup
michaelni
parents: 890
diff changeset
2639
1728
73a3699b8375 simplify
michael
parents: 1727
diff changeset
2640 s->current_picture_ptr->qscale_type= FF_QSCALE_TYPE_MPEG2;
1196
2e06398e4647 mpeg2 qscale flag
michaelni
parents: 1182
diff changeset
2641
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1164
diff changeset
2642 ff_er_frame_end(s);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2643
986e461dc072 Initial revision
glantau
parents:
diff changeset
2644 MPV_frame_end(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
2645
924
3814e9115672 cleanup / messup?
michaelni
parents: 918
diff changeset
2646 if (s->pict_type == B_TYPE || s->low_delay) {
1328
michaelni
parents: 1326
diff changeset
2647 *pict= *(AVFrame*)s->current_picture_ptr;
1706
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1697
diff changeset
2648 ff_print_debug_info(s, pict);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2649 } else {
903
22ee74da2cd3 cleanup
michaelni
parents: 890
diff changeset
2650 s->picture_number++;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2651 /* latency of 1 frame for I and P frames */
986e461dc072 Initial revision
glantau
parents:
diff changeset
2652 /* XXX: use another variable than picture_number */
1211
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2653 if (s->last_picture_ptr != NULL) {
1328
michaelni
parents: 1326
diff changeset
2654 *pict= *(AVFrame*)s->last_picture_ptr;
1706
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1697
diff changeset
2655 ff_print_debug_info(s, pict);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2656 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2657 }
1380
b120aed7bf84 ati vcr2 uv swap
michaelni
parents: 1377
diff changeset
2658
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
2659 return 1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2660 } else {
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
2661 return 0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2662 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2663 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2664
986e461dc072 Initial revision
glantau
parents:
diff changeset
2665 static int mpeg1_decode_sequence(AVCodecContext *avctx,
1862
126e075e6034 * more consts
kabi
parents: 1861
diff changeset
2666 const uint8_t *buf, int buf_size)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2667 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
2668 Mpeg1Context *s1 = avctx->priv_data;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2669 MpegEncContext *s = &s1->mpeg_enc_ctx;
1890
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
2670 int width,height;
1888
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2671 int i, v, j;
401
e20655449d4a mpeg1/2 identifier - fixed frame rate for some bad mpeg1 streams
glantau
parents: 391
diff changeset
2672
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
2673 init_get_bits(&s->gb, buf, buf_size*8);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2674
1890
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
2675 width = get_bits(&s->gb, 12);
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
2676 height = get_bits(&s->gb, 12);
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
2677 if (width <= 0 || height <= 0 ||
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
2678 (width % 2) != 0 || (height % 2) != 0)
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
2679 return -1;
917
d3aa313dc373 mpeg1&2 aspect decoding
michaelni
parents: 911
diff changeset
2680 s->aspect_ratio_info= get_bits(&s->gb, 4);
1674
835964e33ba2 fixed potential problem if aspect_ratio_info == 0 for MPEG stream - fixed aspect ratio problem if CODEC_ID_MPEG2VIDEO is used to decode an MPEG1 stream (which is the recommended codec id for mpeg video)
bellard
parents: 1673
diff changeset
2681 if (s->aspect_ratio_info == 0)
835964e33ba2 fixed potential problem if aspect_ratio_info == 0 for MPEG stream - fixed aspect ratio problem if CODEC_ID_MPEG2VIDEO is used to decode an MPEG1 stream (which is the recommended codec id for mpeg video)
bellard
parents: 1673
diff changeset
2682 return -1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2683 s->frame_rate_index = get_bits(&s->gb, 4);
1837
a4d9e8b4e2f8 AVCodec.supported_framerates
michael
parents: 1827
diff changeset
2684 if (s->frame_rate_index == 0 || s->frame_rate_index > 13)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2685 return -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2686 s->bit_rate = get_bits(&s->gb, 18) * 400;
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
2687 if (get_bits1(&s->gb) == 0) /* marker */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2688 return -1;
1890
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
2689 s->width = width;
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
2690 s->height = height;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2691
1710
4a68b20eeb2c print vbv buffer size & bitrate when decoding with -debug 1
michael
parents: 1708
diff changeset
2692 s->avctx->rc_buffer_size= get_bits(&s->gb, 10) * 1024*16;
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
2693 skip_bits(&s->gb, 1);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2694
986e461dc072 Initial revision
glantau
parents:
diff changeset
2695 /* get matrix */
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
2696 if (get_bits1(&s->gb)) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2697 for(i=0;i<64;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
2698 v = get_bits(&s->gb, 8);
1809
45a7f6690782 more error checks for the sequence header
michael
parents: 1799
diff changeset
2699 if(v==0){
45a7f6690782 more error checks for the sequence header
michael
parents: 1799
diff changeset
2700 av_log(s->avctx, AV_LOG_ERROR, "intra matrix damaged\n");
45a7f6690782 more error checks for the sequence header
michael
parents: 1799
diff changeset
2701 return -1;
45a7f6690782 more error checks for the sequence header
michael
parents: 1799
diff changeset
2702 }
1888
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2703 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
2704 s->intra_matrix[j] = v;
5bf15419d47e changed quant matrix order (should fix mmx mpeg decoding bug)
glantau
parents: 21
diff changeset
2705 s->chroma_intra_matrix[j] = v;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2706 }
59
efd3c19f6d62 fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents: 58
diff changeset
2707 #ifdef DEBUG
efd3c19f6d62 fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents: 58
diff changeset
2708 dprintf("intra matrix present\n");
efd3c19f6d62 fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents: 58
diff changeset
2709 for(i=0;i<64;i++)
1888
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2710 dprintf(" %d", s->intra_matrix[s->dsp.idct_permutation[i]);
59
efd3c19f6d62 fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents: 58
diff changeset
2711 printf("\n");
efd3c19f6d62 fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents: 58
diff changeset
2712 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2713 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
2714 for(i=0;i<64;i++) {
1888
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2715 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
2716 v = ff_mpeg1_default_intra_matrix[i];
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 694
diff changeset
2717 s->intra_matrix[j] = v;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 694
diff changeset
2718 s->chroma_intra_matrix[j] = v;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2719 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2720 }
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 18
diff changeset
2721 if (get_bits1(&s->gb)) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2722 for(i=0;i<64;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
2723 v = get_bits(&s->gb, 8);
1809
45a7f6690782 more error checks for the sequence header
michael
parents: 1799
diff changeset
2724 if(v==0){
45a7f6690782 more error checks for the sequence header
michael
parents: 1799
diff changeset
2725 av_log(s->avctx, AV_LOG_ERROR, "inter matrix damaged\n");
45a7f6690782 more error checks for the sequence header
michael
parents: 1799
diff changeset
2726 return -1;
45a7f6690782 more error checks for the sequence header
michael
parents: 1799
diff changeset
2727 }
1888
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2728 j = s->dsp.idct_permutation[ ff_zigzag_direct[i] ];
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 313
diff changeset
2729 s->inter_matrix[j] = v;
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 313
diff changeset
2730 s->chroma_inter_matrix[j] = v;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2731 }
59
efd3c19f6d62 fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents: 58
diff changeset
2732 #ifdef DEBUG
efd3c19f6d62 fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents: 58
diff changeset
2733 dprintf("non intra matrix present\n");
efd3c19f6d62 fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents: 58
diff changeset
2734 for(i=0;i<64;i++)
1888
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2735 dprintf(" %d", s->inter_matrix[s->dsp.idct_permutation[i]);
59
efd3c19f6d62 fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents: 58
diff changeset
2736 printf("\n");
efd3c19f6d62 fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents: 58
diff changeset
2737 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2738 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
2739 for(i=0;i<64;i++) {
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1085
diff changeset
2740 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
2741 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
2742 s->inter_matrix[j] = v;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 694
diff changeset
2743 s->chroma_inter_matrix[j] = v;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2744 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2745 }
1809
45a7f6690782 more error checks for the sequence header
michael
parents: 1799
diff changeset
2746
45a7f6690782 more error checks for the sequence header
michael
parents: 1799
diff changeset
2747 if(show_bits(&s->gb, 23) != 0){
45a7f6690782 more error checks for the sequence header
michael
parents: 1799
diff changeset
2748 av_log(s->avctx, AV_LOG_ERROR, "sequence header damaged\n");
45a7f6690782 more error checks for the sequence header
michael
parents: 1799
diff changeset
2749 return -1;
45a7f6690782 more error checks for the sequence header
michael
parents: 1799
diff changeset
2750 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2751
986e461dc072 Initial revision
glantau
parents:
diff changeset
2752 /* we set mpeg2 parameters so that it emulates mpeg1 */
986e461dc072 Initial revision
glantau
parents:
diff changeset
2753 s->progressive_sequence = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2754 s->progressive_frame = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2755 s->picture_structure = PICT_FRAME;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2756 s->frame_pred_frame_dct = 1;
1850
dc8353e2cc5f forgot default chroma_format value
iive
parents: 1848
diff changeset
2757 s->chroma_format = 1;
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
2758 s->codec_id= s->avctx->codec_id= CODEC_ID_MPEG1VIDEO;
401
e20655449d4a mpeg1/2 identifier - fixed frame rate for some bad mpeg1 streams
glantau
parents: 391
diff changeset
2759 avctx->sub_id = 1; /* indicates mpeg1 */
1888
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2760 s->out_format = FMT_MPEG1;
4bbe33eed9f0 move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents: 1880
diff changeset
2761 s->swap_uv = 0;//AFAIK VCR2 don't have SEQ_HEADER
1672
1c9e8e499c56 fixed low delay decoding
bellard
parents: 1668
diff changeset
2762 if(s->flags & CODEC_FLAG_LOW_DELAY) s->low_delay=1;
1710
4a68b20eeb2c print vbv buffer size & bitrate when decoding with -debug 1
michael
parents: 1708
diff changeset
2763
4a68b20eeb2c print vbv buffer size & bitrate when decoding with -debug 1
michael
parents: 1708
diff changeset
2764 if(s->avctx->debug & FF_DEBUG_PICT_INFO)
4a68b20eeb2c print vbv buffer size & bitrate when decoding with -debug 1
michael
parents: 1708
diff changeset
2765 av_log(s->avctx, AV_LOG_DEBUG, "vbv buffer: %d, bitrate:%d\n",
4a68b20eeb2c print vbv buffer size & bitrate when decoding with -debug 1
michael
parents: 1708
diff changeset
2766 s->avctx->rc_buffer_size, s->bit_rate);
4a68b20eeb2c print vbv buffer size & bitrate when decoding with -debug 1
michael
parents: 1708
diff changeset
2767
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2768 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2769 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2770
1376
5d2435fb733d ATI VCR2 decoding support
michaelni
parents: 1372
diff changeset
2771 static int vcr2_init_sequence(AVCodecContext *avctx)
5d2435fb733d ATI VCR2 decoding support
michaelni
parents: 1372
diff changeset
2772 {
5d2435fb733d ATI VCR2 decoding support
michaelni
parents: 1372
diff changeset
2773 Mpeg1Context *s1 = avctx->priv_data;
5d2435fb733d ATI VCR2 decoding support
michaelni
parents: 1372
diff changeset
2774 MpegEncContext *s = &s1->mpeg_enc_ctx;
1377
326852ff8fee vcr2 cleanup
michaelni
parents: 1376
diff changeset
2775 int i, v;
1376
5d2435fb733d ATI VCR2 decoding support
michaelni
parents: 1372
diff changeset
2776
5d2435fb733d ATI VCR2 decoding support
michaelni
parents: 1372
diff changeset
2777 /* start new mpeg1 context decoding */
5d2435fb733d ATI VCR2 decoding support
michaelni
parents: 1372
diff changeset
2778 s->out_format = FMT_MPEG1;
5d2435fb733d ATI VCR2 decoding support
michaelni
parents: 1372
diff changeset
2779 if (s1->mpeg_enc_ctx_allocated) {
5d2435fb733d ATI VCR2 decoding support
michaelni
parents: 1372
diff changeset
2780 MPV_common_end(s);
5d2435fb733d ATI VCR2 decoding support
michaelni
parents: 1372
diff changeset
2781 }
2270
21f450be6cb5 lowres width/height cleanup 3rd try
michael
parents: 2266
diff changeset
2782 s->width = avctx->coded_width;
21f450be6cb5 lowres width/height cleanup 3rd try
michael
parents: 2266
diff changeset
2783 s->height = avctx->coded_height;
1376
5d2435fb733d ATI VCR2 decoding support
michaelni
parents: 1372
diff changeset
2784 avctx->has_b_frames= 0; //true?
1380
b120aed7bf84 ati vcr2 uv swap
michaelni
parents: 1377
diff changeset
2785 s->low_delay= 1;
1381
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
2786
1821
1adbe0ab09fc use get_format
iive
parents: 1809
diff changeset
2787 if(avctx->xvmc_acceleration){
1adbe0ab09fc use get_format
iive
parents: 1809
diff changeset
2788 avctx->pix_fmt = avctx->get_format(avctx,pixfmt_xvmc_mpg2_420);
1adbe0ab09fc use get_format
iive
parents: 1809
diff changeset
2789 }else{
1adbe0ab09fc use get_format
iive
parents: 1809
diff changeset
2790 avctx->pix_fmt = avctx->get_format(avctx,pixfmt_yuv_420);
1adbe0ab09fc use get_format
iive
parents: 1809
diff changeset
2791 }
1adbe0ab09fc use get_format
iive
parents: 1809
diff changeset
2792
1381
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
2793 if( avctx->pix_fmt == PIX_FMT_XVMC_MPEG2_IDCT )
1580
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1550
diff changeset
2794 if( avctx->idct_algo == FF_IDCT_AUTO )
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1550
diff changeset
2795 avctx->idct_algo = FF_IDCT_SIMPLE;
1376
5d2435fb733d ATI VCR2 decoding support
michaelni
parents: 1372
diff changeset
2796
5d2435fb733d ATI VCR2 decoding support
michaelni
parents: 1372
diff changeset
2797 if (MPV_common_init(s) < 0)
5d2435fb733d ATI VCR2 decoding support
michaelni
parents: 1372
diff changeset
2798 return -1;
1580
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1550
diff changeset
2799 exchange_uv(s);//common init reset pblocks, so we swap them here
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1550
diff changeset
2800 s->swap_uv = 1;// in case of xvmc we need to swap uv for each MB
1376
5d2435fb733d ATI VCR2 decoding support
michaelni
parents: 1372
diff changeset
2801 s1->mpeg_enc_ctx_allocated = 1;
5d2435fb733d ATI VCR2 decoding support
michaelni
parents: 1372
diff changeset
2802
5d2435fb733d ATI VCR2 decoding support
michaelni
parents: 1372
diff changeset
2803 for(i=0;i<64;i++) {
5d2435fb733d ATI VCR2 decoding support
michaelni
parents: 1372
diff changeset
2804 int j= s->dsp.idct_permutation[i];
5d2435fb733d ATI VCR2 decoding support
michaelni
parents: 1372
diff changeset
2805 v = ff_mpeg1_default_intra_matrix[i];
5d2435fb733d ATI VCR2 decoding support
michaelni
parents: 1372
diff changeset
2806 s->intra_matrix[j] = v;
5d2435fb733d ATI VCR2 decoding support
michaelni
parents: 1372
diff changeset
2807 s->chroma_intra_matrix[j] = v;
5d2435fb733d ATI VCR2 decoding support
michaelni
parents: 1372
diff changeset
2808
5d2435fb733d ATI VCR2 decoding support
michaelni
parents: 1372
diff changeset
2809 v = ff_mpeg1_default_non_intra_matrix[i];
5d2435fb733d ATI VCR2 decoding support
michaelni
parents: 1372
diff changeset
2810 s->inter_matrix[j] = v;
5d2435fb733d ATI VCR2 decoding support
michaelni
parents: 1372
diff changeset
2811 s->chroma_inter_matrix[j] = v;
5d2435fb733d ATI VCR2 decoding support
michaelni
parents: 1372
diff changeset
2812 }
5d2435fb733d ATI VCR2 decoding support
michaelni
parents: 1372
diff changeset
2813
5d2435fb733d ATI VCR2 decoding support
michaelni
parents: 1372
diff changeset
2814 s->progressive_sequence = 1;
5d2435fb733d ATI VCR2 decoding support
michaelni
parents: 1372
diff changeset
2815 s->progressive_frame = 1;
5d2435fb733d ATI VCR2 decoding support
michaelni
parents: 1372
diff changeset
2816 s->picture_structure = PICT_FRAME;
5d2435fb733d ATI VCR2 decoding support
michaelni
parents: 1372
diff changeset
2817 s->frame_pred_frame_dct = 1;
1850
dc8353e2cc5f forgot default chroma_format value
iive
parents: 1848
diff changeset
2818 s->chroma_format = 1;
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1411
diff changeset
2819 s->codec_id= s->avctx->codec_id= CODEC_ID_MPEG2VIDEO;
1377
326852ff8fee vcr2 cleanup
michaelni
parents: 1376
diff changeset
2820 avctx->sub_id = 2; /* indicates mpeg2 */
1376
5d2435fb733d ATI VCR2 decoding support
michaelni
parents: 1372
diff changeset
2821 return 0;
5d2435fb733d ATI VCR2 decoding support
michaelni
parents: 1372
diff changeset
2822 }
5d2435fb733d ATI VCR2 decoding support
michaelni
parents: 1372
diff changeset
2823
5d2435fb733d ATI VCR2 decoding support
michaelni
parents: 1372
diff changeset
2824
1084
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2825 static void mpeg_decode_user_data(AVCodecContext *avctx,
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2826 const uint8_t *buf, int buf_size)
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2827 {
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2828 const uint8_t *p;
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2829 int len, flags;
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2830 p = buf;
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2831 len = buf_size;
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2832
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2833 /* we parse the DTG active format information */
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2834 if (len >= 5 &&
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2835 p[0] == 'D' && p[1] == 'T' && p[2] == 'G' && p[3] == '1') {
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2836 flags = p[4];
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2837 p += 5;
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2838 len -= 5;
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2839 if (flags & 0x80) {
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2840 /* skip event id */
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2841 if (len < 2)
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2842 return;
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2843 p += 2;
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2844 len -= 2;
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2845 }
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2846 if (flags & 0x40) {
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2847 if (len < 1)
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2848 return;
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2849 avctx->dtg_active_format = p[0] & 0x0f;
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2850 }
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2851 }
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2852 }
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
2853
1890
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
2854 static void mpeg_decode_gop(AVCodecContext *avctx,
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
2855 const uint8_t *buf, int buf_size){
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
2856 Mpeg1Context *s1 = avctx->priv_data;
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
2857 MpegEncContext *s = &s1->mpeg_enc_ctx;
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
2858
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
2859 int drop_frame_flag;
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
2860 int time_code_hours, time_code_minutes;
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
2861 int time_code_seconds, time_code_pictures;
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
2862 int broken_link;
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
2863
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
2864 init_get_bits(&s->gb, buf, buf_size*8);
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
2865
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
2866 drop_frame_flag = get_bits1(&s->gb);
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
2867
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
2868 time_code_hours=get_bits(&s->gb,5);
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
2869 time_code_minutes = get_bits(&s->gb,6);
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
2870 skip_bits1(&s->gb);//marker bit
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
2871 time_code_seconds = get_bits(&s->gb,6);
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
2872 time_code_pictures = get_bits(&s->gb,6);
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
2873
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
2874 /*broken_link indicate that after editing the
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
2875 reference frames of the first B-Frames after GOP I-Frame
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
2876 are missing (open gop)*/
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
2877 broken_link = get_bits1(&s->gb);
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
2878
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
2879 if(s->avctx->debug & FF_DEBUG_PICT_INFO)
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
2880 av_log(s->avctx, AV_LOG_DEBUG, "GOP (%2d:%02d:%02d.[%02d]) broken_link=%d\n",
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
2881 time_code_hours, time_code_minutes, time_code_seconds,
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
2882 time_code_pictures, broken_link);
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
2883 }
1211
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2884 /**
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2885 * finds the end of the current frame in the bitstream.
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2886 * @return the position of the first byte of the next frame, or -1
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2887 */
1988
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1986
diff changeset
2888 int ff_mpeg1_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size)
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1986
diff changeset
2889 {
1211
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2890 int i;
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2891 uint32_t state;
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2892
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2893 state= pc->state;
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2894
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2895 i=0;
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2896 if(!pc->frame_start_found){
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2897 for(i=0; i<buf_size; i++){
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2898 state= (state<<8) | buf[i];
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2899 if(state >= SLICE_MIN_START_CODE && state <= SLICE_MAX_START_CODE){
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2900 i++;
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2901 pc->frame_start_found=1;
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2902 break;
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2903 }
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2904 }
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2905 }
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2906
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2907 if(pc->frame_start_found){
1988
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1986
diff changeset
2908 /* EOF considered as end of frame */
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1986
diff changeset
2909 if (buf_size == 0)
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1986
diff changeset
2910 return 0;
1211
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2911 for(; i<buf_size; i++){
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2912 state= (state<<8) | buf[i];
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2913 if((state&0xFFFFFF00) == 0x100){
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2914 if(state < SLICE_MIN_START_CODE || state > SLICE_MAX_START_CODE){
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2915 pc->frame_start_found=0;
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2916 pc->state=-1;
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2917 return i-3;
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2918 }
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2919 }
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2920 }
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2921 }
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2922 pc->state= state;
1218
358bbc952e27 10l (returning negative number of consumed bytes if the first startcode of a frame was split between 2 buffers)
michaelni
parents: 1211
diff changeset
2923 return END_NOT_FOUND;
1211
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2924 }
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2925
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2926 /* handle buffering and image synchronisation */
986e461dc072 Initial revision
glantau
parents:
diff changeset
2927 static int mpeg_decode_frame(AVCodecContext *avctx,
986e461dc072 Initial revision
glantau
parents:
diff changeset
2928 void *data, int *data_size,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1051
diff changeset
2929 uint8_t *buf, int buf_size)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2930 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
2931 Mpeg1Context *s = avctx->priv_data;
1862
126e075e6034 * more consts
kabi
parents: 1861
diff changeset
2932 const uint8_t *buf_end;
126e075e6034 * more consts
kabi
parents: 1861
diff changeset
2933 const uint8_t *buf_ptr;
1211
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2934 int ret, start_code, input_size;
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
2935 AVFrame *picture = data;
267
e10840e4f773 - Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents: 241
diff changeset
2936 MpegEncContext *s2 = &s->mpeg_enc_ctx;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2937 dprintf("fill_buffer\n");
986e461dc072 Initial revision
glantau
parents:
diff changeset
2938
2130
50779a18844c Avoid segfault on ffmpeg "buffer flush" in mpeg12.c patch by (Wolfram Gloger <wmglo at dent dot med dot uni-muenchen dot de>)
michael
parents: 2111
diff changeset
2939 if (buf_size == 0) {
50779a18844c Avoid segfault on ffmpeg "buffer flush" in mpeg12.c patch by (Wolfram Gloger <wmglo at dent dot med dot uni-muenchen dot de>)
michael
parents: 2111
diff changeset
2940 /* special case for last picture */
50779a18844c Avoid segfault on ffmpeg "buffer flush" in mpeg12.c patch by (Wolfram Gloger <wmglo at dent dot med dot uni-muenchen dot de>)
michael
parents: 2111
diff changeset
2941 if (s2->low_delay==0 && s2->next_picture_ptr) {
50779a18844c Avoid segfault on ffmpeg "buffer flush" in mpeg12.c patch by (Wolfram Gloger <wmglo at dent dot med dot uni-muenchen dot de>)
michael
parents: 2111
diff changeset
2942 *picture= *(AVFrame*)s2->next_picture_ptr;
50779a18844c Avoid segfault on ffmpeg "buffer flush" in mpeg12.c patch by (Wolfram Gloger <wmglo at dent dot med dot uni-muenchen dot de>)
michael
parents: 2111
diff changeset
2943 s2->next_picture_ptr= NULL;
903
22ee74da2cd3 cleanup
michaelni
parents: 890
diff changeset
2944
2130
50779a18844c Avoid segfault on ffmpeg "buffer flush" in mpeg12.c patch by (Wolfram Gloger <wmglo at dent dot med dot uni-muenchen dot de>)
michael
parents: 2111
diff changeset
2945 *data_size = sizeof(AVFrame);
50779a18844c Avoid segfault on ffmpeg "buffer flush" in mpeg12.c patch by (Wolfram Gloger <wmglo at dent dot med dot uni-muenchen dot de>)
michael
parents: 2111
diff changeset
2946 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2947 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2948 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2949
1211
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2950 if(s2->flags&CODEC_FLAG_TRUNCATED){
1988
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1986
diff changeset
2951 int next= ff_mpeg1_find_frame_end(&s2->parse_context, buf, buf_size);
1211
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2952
1988
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1986
diff changeset
2953 if( ff_combine_frame(&s2->parse_context, next, &buf, &buf_size) < 0 )
1211
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2954 return buf_size;
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2955 }
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2956
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2957 buf_ptr = buf;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2958 buf_end = buf + buf_size;
383
e6b64bc3bc87 - repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents: 377
diff changeset
2959
e6b64bc3bc87 - repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents: 377
diff changeset
2960 #if 0
e6b64bc3bc87 - repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents: 377
diff changeset
2961 if (s->repeat_field % 2 == 1) {
267
e10840e4f773 - Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents: 241
diff changeset
2962 s->repeat_field++;
e10840e4f773 - Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents: 241
diff changeset
2963 //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
2964 // s2->picture_number, s->repeat_field);
e6b64bc3bc87 - repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents: 377
diff changeset
2965 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
2966 *data_size = sizeof(AVPicture);
e6b64bc3bc87 - repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents: 377
diff changeset
2967 goto the_end;
e6b64bc3bc87 - repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents: 377
diff changeset
2968 }
267
e10840e4f773 - Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents: 241
diff changeset
2969 }
383
e6b64bc3bc87 - repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents: 377
diff changeset
2970 #endif
1376
5d2435fb733d ATI VCR2 decoding support
michaelni
parents: 1372
diff changeset
2971
5d2435fb733d ATI VCR2 decoding support
michaelni
parents: 1372
diff changeset
2972 if(s->mpeg_enc_ctx_allocated==0 && avctx->codec_tag == ff_get_fourcc("VCR2"))
5d2435fb733d ATI VCR2 decoding support
michaelni
parents: 1372
diff changeset
2973 vcr2_init_sequence(avctx);
1827
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2974
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2975 s->slice_count= 0;
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2976
1211
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2977 for(;;) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2978 /* find start next code */
1211
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
2979 start_code = find_start_code(&buf_ptr, buf_end);
1220
michaelni
parents: 1218
diff changeset
2980 if (start_code < 0){
1484
a2930ee10a6b hurry_up fix?
michaelni
parents: 1479
diff changeset
2981 if(s2->pict_type != B_TYPE || avctx->hurry_up==0){
1827
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2982 if(avctx->thread_count > 1){
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2983 int i;
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2984
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2985 avctx->execute(avctx, slice_decode_thread, (void**)&(s2->thread_context[0]), NULL, s->slice_count);
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2986 for(i=0; i<s->slice_count; i++)
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2987 s2->error_count += s2->thread_context[i]->error_count;
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
2988 }
1484
a2930ee10a6b hurry_up fix?
michaelni
parents: 1479
diff changeset
2989 if (slice_end(avctx, picture)) {
1672
1c9e8e499c56 fixed low delay decoding
bellard
parents: 1668
diff changeset
2990 if(s2->last_picture_ptr || s2->low_delay) //FIXME merge with the stuff in mpeg_decode_slice
1484
a2930ee10a6b hurry_up fix?
michaelni
parents: 1479
diff changeset
2991 *data_size = sizeof(AVPicture);
a2930ee10a6b hurry_up fix?
michaelni
parents: 1479
diff changeset
2992 }
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
2993 }
1220
michaelni
parents: 1218
diff changeset
2994 return FFMAX(0, buf_ptr - buf - s2->parse_context.last_index);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2995 }
1289
57172377849a fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents: 1285
diff changeset
2996
57172377849a fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents: 1285
diff changeset
2997 input_size = buf_end - buf_ptr;
57172377849a fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents: 1285
diff changeset
2998
57172377849a fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents: 1285
diff changeset
2999 if(avctx->debug & FF_DEBUG_STARTCODE){
1904
129236143f2e warning patrol
mellum
parents: 1903
diff changeset
3000 av_log(avctx, AV_LOG_DEBUG, "%3X at %zd left %d\n", start_code, buf_ptr-buf, input_size);
1289
57172377849a fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents: 1285
diff changeset
3001 }
1211
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
3002
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3003 /* prepare data for next start code */
986e461dc072 Initial revision
glantau
parents:
diff changeset
3004 switch(start_code) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
3005 case SEQ_START_CODE:
1211
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
3006 mpeg1_decode_sequence(avctx, buf_ptr,
1862
126e075e6034 * more consts
kabi
parents: 1861
diff changeset
3007 input_size);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3008 break;
986e461dc072 Initial revision
glantau
parents:
diff changeset
3009
986e461dc072 Initial revision
glantau
parents:
diff changeset
3010 case PICTURE_START_CODE:
986e461dc072 Initial revision
glantau
parents:
diff changeset
3011 /* we have a complete image : we try to decompress it */
986e461dc072 Initial revision
glantau
parents:
diff changeset
3012 mpeg1_decode_picture(avctx,
1862
126e075e6034 * more consts
kabi
parents: 1861
diff changeset
3013 buf_ptr, input_size);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3014 break;
986e461dc072 Initial revision
glantau
parents:
diff changeset
3015 case EXT_START_CODE:
986e461dc072 Initial revision
glantau
parents:
diff changeset
3016 mpeg_decode_extension(avctx,
1211
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
3017 buf_ptr, input_size);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3018 break;
1084
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
3019 case USER_START_CODE:
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
3020 mpeg_decode_user_data(avctx,
1211
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
3021 buf_ptr, input_size);
1084
01154fced380 added DTG active format information
bellard
parents: 1070
diff changeset
3022 break;
1348
8f613147c6cb mpeg 2 seeking fix
michaelni
parents: 1346
diff changeset
3023 case GOP_START_CODE:
1880
56ccec0d08bd removing broken mpeg_decode_gop()
michael
parents: 1870
diff changeset
3024 s2->first_field=0;
1890
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
3025 mpeg_decode_gop(avctx,
a07406ac4725 mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents: 1888
diff changeset
3026 buf_ptr, input_size);
1348
8f613147c6cb mpeg 2 seeking fix
michaelni
parents: 1346
diff changeset
3027 break;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3028 default:
986e461dc072 Initial revision
glantau
parents:
diff changeset
3029 if (start_code >= SLICE_MIN_START_CODE &&
911
4b2c86f1fee9 drop b frames if there are no reference frames
michaelni
parents: 903
diff changeset
3030 start_code <= SLICE_MAX_START_CODE) {
1827
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
3031 int mb_y= start_code - SLICE_MIN_START_CODE;
917
d3aa313dc373 mpeg1&2 aspect decoding
michaelni
parents: 911
diff changeset
3032
d3aa313dc373 mpeg1&2 aspect decoding
michaelni
parents: 911
diff changeset
3033 /* skip b frames if we dont have reference frames */
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1126
diff changeset
3034 if(s2->last_picture_ptr==NULL && s2->pict_type==B_TYPE) break;
917
d3aa313dc373 mpeg1&2 aspect decoding
michaelni
parents: 911
diff changeset
3035 /* skip b frames if we are in a hurry */
d3aa313dc373 mpeg1&2 aspect decoding
michaelni
parents: 911
diff changeset
3036 if(avctx->hurry_up && s2->pict_type==B_TYPE) break;
d3aa313dc373 mpeg1&2 aspect decoding
michaelni
parents: 911
diff changeset
3037 /* skip everything if we are in a hurry>=5 */
d3aa313dc373 mpeg1&2 aspect decoding
michaelni
parents: 911
diff changeset
3038 if(avctx->hurry_up>=5) break;
1211
126f766bc4c5 cleanup mpeg1/2 bitstream parser
michaelni
parents: 1196
diff changeset
3039
1182
38e8b8f331cb some checks to avoid segfaults if the decoder is feeded with junk
michaelni
parents: 1181
diff changeset
3040 if (!s->mpeg_enc_ctx_allocated) break;
2095
5ab35105671a support skiping of mb rows during decoding
michael
parents: 2093
diff changeset
3041
5ab35105671a support skiping of mb rows during decoding
michael
parents: 2093
diff changeset
3042 if(s2->codec_id == CODEC_ID_MPEG2VIDEO){
5ab35105671a support skiping of mb rows during decoding
michael
parents: 2093
diff changeset
3043 if(mb_y < avctx->skip_top || mb_y >= s2->mb_height - avctx->skip_bottom)
5ab35105671a support skiping of mb rows during decoding
michael
parents: 2093
diff changeset
3044 break;
5ab35105671a support skiping of mb rows during decoding
michael
parents: 2093
diff changeset
3045 }
1827
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
3046
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
3047 if(s2->first_slice){
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
3048 s2->first_slice=0;
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
3049 if(mpeg_field_start(s2) < 0)
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
3050 return -1;
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
3051 }
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
3052
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
3053 if(avctx->thread_count > 1){
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
3054 int threshold= (s2->mb_height*s->slice_count + avctx->thread_count/2) / avctx->thread_count;
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
3055 if(threshold <= mb_y){
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
3056 MpegEncContext *thread_context= s2->thread_context[s->slice_count];
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
3057
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
3058 thread_context->start_mb_y= mb_y;
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
3059 thread_context->end_mb_y = s2->mb_height;
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
3060 if(s->slice_count){
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
3061 s2->thread_context[s->slice_count-1]->end_mb_y= mb_y;
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
3062 ff_update_duplicate_context(thread_context, s2);
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
3063 }
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
3064 init_get_bits(&thread_context->gb, buf_ptr, input_size*8);
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
3065 s->slice_count++;
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
3066 }
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
3067 buf_ptr += 2; //FIXME add minimum num of bytes per slice
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
3068 }else{
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
3069 ret = mpeg_decode_slice(s, mb_y, &buf_ptr, input_size);
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
3070 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
3071
1827
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
3072 if(ret < 0){
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
3073 if(s2->resync_mb_x>=0 && s2->resync_mb_y>=0)
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
3074 ff_er_add_slice(s2, s2->resync_mb_x, s2->resync_mb_y, s2->mb_x, s2->mb_y, AC_ERROR|DC_ERROR|MV_ERROR);
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
3075 }else{
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
3076 ff_er_add_slice(s2, s2->resync_mb_x, s2->resync_mb_y, s2->mb_x-1, s2->mb_y, AC_END|DC_END|MV_END);
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1821
diff changeset
3077 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3078 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
3079 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
3080 break;
986e461dc072 Initial revision
glantau
parents:
diff changeset
3081 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
3082 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
3083 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
3084
986e461dc072 Initial revision
glantau
parents:
diff changeset
3085 static int mpeg_decode_end(AVCodecContext *avctx)
986e461dc072 Initial revision
glantau
parents:
diff changeset
3086 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
3087 Mpeg1Context *s = avctx->priv_data;
986e461dc072 Initial revision
glantau
parents:
diff changeset
3088
986e461dc072 Initial revision
glantau
parents:
diff changeset
3089 if (s->mpeg_enc_ctx_allocated)
986e461dc072 Initial revision
glantau
parents:
diff changeset
3090 MPV_common_end(&s->mpeg_enc_ctx);
986e461dc072 Initial revision
glantau
parents:
diff changeset
3091 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
3092 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
3093
1423
2e590fee59bd mpeg2 regression test
michaelni
parents: 1421
diff changeset
3094 AVCodec mpeg1video_decoder = {
2e590fee59bd mpeg2 regression test
michaelni
parents: 1421
diff changeset
3095 "mpeg1video",
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3096 CODEC_TYPE_VIDEO,
986e461dc072 Initial revision
glantau
parents:
diff changeset
3097 CODEC_ID_MPEG1VIDEO,
986e461dc072 Initial revision
glantau
parents:
diff changeset
3098 sizeof(Mpeg1Context),
986e461dc072 Initial revision
glantau
parents:
diff changeset
3099 mpeg_decode_init,
986e461dc072 Initial revision
glantau
parents:
diff changeset
3100 NULL,
986e461dc072 Initial revision
glantau
parents:
diff changeset
3101 mpeg_decode_end,
986e461dc072 Initial revision
glantau
parents:
diff changeset
3102 mpeg_decode_frame,
2453
f67b63ed036d avoid buf_size == 0 checks in every decoder
michael
parents: 2370
diff changeset
3103 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY,
1368
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1348
diff changeset
3104 .flush= ff_mpeg_flush,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3105 };
1381
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
3106
1423
2e590fee59bd mpeg2 regression test
michaelni
parents: 1421
diff changeset
3107 AVCodec mpeg2video_decoder = {
2e590fee59bd mpeg2 regression test
michaelni
parents: 1421
diff changeset
3108 "mpeg2video",
2e590fee59bd mpeg2 regression test
michaelni
parents: 1421
diff changeset
3109 CODEC_TYPE_VIDEO,
2e590fee59bd mpeg2 regression test
michaelni
parents: 1421
diff changeset
3110 CODEC_ID_MPEG2VIDEO,
2e590fee59bd mpeg2 regression test
michaelni
parents: 1421
diff changeset
3111 sizeof(Mpeg1Context),
2e590fee59bd mpeg2 regression test
michaelni
parents: 1421
diff changeset
3112 mpeg_decode_init,
2e590fee59bd mpeg2 regression test
michaelni
parents: 1421
diff changeset
3113 NULL,
2e590fee59bd mpeg2 regression test
michaelni
parents: 1421
diff changeset
3114 mpeg_decode_end,
2e590fee59bd mpeg2 regression test
michaelni
parents: 1421
diff changeset
3115 mpeg_decode_frame,
2453
f67b63ed036d avoid buf_size == 0 checks in every decoder
michael
parents: 2370
diff changeset
3116 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY,
1423
2e590fee59bd mpeg2 regression test
michaelni
parents: 1421
diff changeset
3117 .flush= ff_mpeg_flush,
2e590fee59bd mpeg2 regression test
michaelni
parents: 1421
diff changeset
3118 };
2e590fee59bd mpeg2 regression test
michaelni
parents: 1421
diff changeset
3119
1615
721a76648a4b mpegvideo is back
iive
parents: 1598
diff changeset
3120 //legacy decoder
721a76648a4b mpegvideo is back
iive
parents: 1598
diff changeset
3121 AVCodec mpegvideo_decoder = {
721a76648a4b mpegvideo is back
iive
parents: 1598
diff changeset
3122 "mpegvideo",
721a76648a4b mpegvideo is back
iive
parents: 1598
diff changeset
3123 CODEC_TYPE_VIDEO,
721a76648a4b mpegvideo is back
iive
parents: 1598
diff changeset
3124 CODEC_ID_MPEG2VIDEO,
721a76648a4b mpegvideo is back
iive
parents: 1598
diff changeset
3125 sizeof(Mpeg1Context),
721a76648a4b mpegvideo is back
iive
parents: 1598
diff changeset
3126 mpeg_decode_init,
721a76648a4b mpegvideo is back
iive
parents: 1598
diff changeset
3127 NULL,
721a76648a4b mpegvideo is back
iive
parents: 1598
diff changeset
3128 mpeg_decode_end,
721a76648a4b mpegvideo is back
iive
parents: 1598
diff changeset
3129 mpeg_decode_frame,
2453
f67b63ed036d avoid buf_size == 0 checks in every decoder
michael
parents: 2370
diff changeset
3130 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY,
1615
721a76648a4b mpegvideo is back
iive
parents: 1598
diff changeset
3131 .flush= ff_mpeg_flush,
721a76648a4b mpegvideo is back
iive
parents: 1598
diff changeset
3132 };
721a76648a4b mpegvideo is back
iive
parents: 1598
diff changeset
3133
1749
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
3134 #ifdef CONFIG_ENCODERS
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
3135
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
3136 AVCodec mpeg1video_encoder = {
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
3137 "mpeg1video",
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
3138 CODEC_TYPE_VIDEO,
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
3139 CODEC_ID_MPEG1VIDEO,
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
3140 sizeof(MpegEncContext),
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
3141 encode_init,
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
3142 MPV_encode_picture,
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
3143 MPV_encode_end,
1837
a4d9e8b4e2f8 AVCodec.supported_framerates
michael
parents: 1827
diff changeset
3144 .supported_framerates= frame_rate_tab+1,
2111
3c1dba53954e 10l (fixes delayed frames during encoding)
michael
parents: 2095
diff changeset
3145 .capabilities= CODEC_CAP_DELAY,
1749
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
3146 };
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
3147
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
3148 #ifdef CONFIG_RISKY
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
3149
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
3150 AVCodec mpeg2video_encoder = {
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
3151 "mpeg2video",
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
3152 CODEC_TYPE_VIDEO,
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
3153 CODEC_ID_MPEG2VIDEO,
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
3154 sizeof(MpegEncContext),
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
3155 encode_init,
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
3156 MPV_encode_picture,
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
3157 MPV_encode_end,
1837
a4d9e8b4e2f8 AVCodec.supported_framerates
michael
parents: 1827
diff changeset
3158 .supported_framerates= frame_rate_tab+1,
2111
3c1dba53954e 10l (fixes delayed frames during encoding)
michael
parents: 2095
diff changeset
3159 .capabilities= CODEC_CAP_DELAY,
1749
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
3160 };
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
3161 #endif
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
3162 #endif
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1739
diff changeset
3163
1381
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
3164 #ifdef HAVE_XVMC
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
3165 static int mpeg_mc_decode_init(AVCodecContext *avctx){
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
3166 Mpeg1Context *s;
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
3167
2076
23280e1b8dbf better cbp handling and small speedup in mpeg12
iive
parents: 2074
diff changeset
3168 if( avctx->thread_count > 1)
23280e1b8dbf better cbp handling and small speedup in mpeg12
iive
parents: 2074
diff changeset
3169 return -1;
1381
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
3170 if( !(avctx->slice_flags & SLICE_FLAG_CODED_ORDER) )
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
3171 return -1;
1580
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1550
diff changeset
3172 if( !(avctx->slice_flags & SLICE_FLAG_ALLOW_FIELD) ){
1381
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
3173 dprintf("mpeg12.c: XvMC decoder will work better if SLICE_FLAG_ALLOW_FIELD is set\n");
1580
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1550
diff changeset
3174 }
1381
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
3175 mpeg_decode_init(avctx);
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
3176 s = avctx->priv_data;
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
3177
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
3178 avctx->pix_fmt = PIX_FMT_XVMC_MPEG2_IDCT;
1580
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1550
diff changeset
3179 avctx->xvmc_acceleration = 2;//2 - the blocks are packed!
1381
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
3180
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
3181 return 0;
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
3182 }
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
3183
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
3184 AVCodec mpeg_xvmc_decoder = {
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
3185 "mpegvideo_xvmc",
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
3186 CODEC_TYPE_VIDEO,
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
3187 CODEC_ID_MPEG2VIDEO_XVMC,
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
3188 sizeof(Mpeg1Context),
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
3189 mpeg_mc_decode_init,
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
3190 NULL,
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
3191 mpeg_decode_end,
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
3192 mpeg_decode_frame,
2453
f67b63ed036d avoid buf_size == 0 checks in every decoder
michael
parents: 2370
diff changeset
3193 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED| CODEC_CAP_HWACCEL | CODEC_CAP_DELAY,
1848
c72589baee53 initial chroma_format changes,xvmc tweaks and codec_cap
iive
parents: 1841
diff changeset
3194 .flush= ff_mpeg_flush,
1381
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
3195 };
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
3196
f07e17427140 initial XvMC support
iive
parents: 1380
diff changeset
3197 #endif
1410
524c904a66b8 PSX MDEC decoder, based upon some code from Sebastian Jedruszkiewicz <elf at frogger dot rules dot pl>
michaelni
parents: 1409
diff changeset
3198
524c904a66b8 PSX MDEC decoder, based upon some code from Sebastian Jedruszkiewicz <elf at frogger dot rules dot pl>
michaelni
parents: 1409
diff changeset
3199 /* this is ugly i know, but the alternative is too make
524c904a66b8 PSX MDEC decoder, based upon some code from Sebastian Jedruszkiewicz <elf at frogger dot rules dot pl>
michaelni
parents: 1409
diff changeset
3200 hundreds of vars global and prefix them with ff_mpeg1_
524c904a66b8 PSX MDEC decoder, based upon some code from Sebastian Jedruszkiewicz <elf at frogger dot rules dot pl>
michaelni
parents: 1409
diff changeset
3201 which is far uglier. */
524c904a66b8 PSX MDEC decoder, based upon some code from Sebastian Jedruszkiewicz <elf at frogger dot rules dot pl>
michaelni
parents: 1409
diff changeset
3202 #include "mdec.c"