annotate mpeg12.c @ 2841:bceeca1bb30f libavcodec

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