annotate h264.c @ 5815:fb293531e983 libavcodec

Simplify tests for field macroblocks patch by Jeff Downs, heydowns a borg d com
author andoma
date Sat, 13 Oct 2007 05:50:11 +0000
parents 05e66f9c15bb
children b49be74d387c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1 /*
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2 * H.26L/H.264/AVC/JVT/14496-10/... encoder/decoder
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3 * Copyright (c) 2003 Michael Niedermayer <michaelni@gmx.at>
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3927
diff changeset
5 * This file is part of FFmpeg.
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3927
diff changeset
6 *
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3927
diff changeset
7 * FFmpeg is free software; you can redistribute it and/or
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
9 * License as published by the Free Software Foundation; either
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3927
diff changeset
10 * version 2.1 of the License, or (at your option) any later version.
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
11 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3927
diff changeset
12 * FFmpeg is distributed in the hope that it will be useful,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
15 * Lesser General Public License for more details.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
16 *
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
17 * You should have received a copy of the GNU Lesser General Public
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3927
diff changeset
18 * License along with FFmpeg; if not, write to the Free Software
3036
0b546eab515d Update licensing information: The FSF changed postal address.
diego
parents: 3029
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
20 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
21
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
22 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
23 * @file h264.c
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
24 * H.264 / AVC / MPEG4 part10 codec.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
25 * @author Michael Niedermayer <michaelni@gmx.at>
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
26 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
27
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
28 #include "dsputil.h"
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
29 #include "avcodec.h"
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
30 #include "mpegvideo.h"
4975
9a6a0818e93f split h264.c to move parser in its own file
aurel
parents: 4931
diff changeset
31 #include "h264.h"
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
32 #include "h264data.h"
4975
9a6a0818e93f split h264.c to move parser in its own file
aurel
parents: 4931
diff changeset
33 #include "h264_parser.h"
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
34 #include "golomb.h"
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
35
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
36 #include "cabac.h"
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
37
3284
a224d9752912 don't force asserts in release builds. 2% faster h264.
lorenm
parents: 3219
diff changeset
38 //#undef NDEBUG
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
39 #include <assert.h>
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
40
5723
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
41 /**
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
42 * Value of Picture.reference when Picture is not a reference picture, but
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
43 * is held for delayed output.
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
44 */
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
45 #define DELAYED_PIC_REF 4
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
46
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
47 static VLC coeff_token_vlc[4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
48 static VLC chroma_dc_coeff_token_vlc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
49
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
50 static VLC total_zeros_vlc[15];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
51 static VLC chroma_dc_total_zeros_vlc[3];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
52
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
53 static VLC run_vlc[6];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
54 static VLC run7_vlc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
55
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
56 static void svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
57 static void svq3_add_idct_c(uint8_t *dst, DCTELEM *block, int stride, int qp, int dc);
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
58 static void filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr, unsigned int linesize, unsigned int uvlinesize);
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
59 static void filter_mb_fast( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr, unsigned int linesize, unsigned int uvlinesize);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
60
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4277
diff changeset
61 static av_always_inline uint32_t pack16to32(int a, int b){
1269
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
62 #ifdef WORDS_BIGENDIAN
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
63 return (b&0xFFFF) + (a<<16);
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
64 #else
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
65 return (a&0xFFFF) + (b<<16);
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
66 #endif
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
67 }
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
68
4277
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
69 const uint8_t ff_rem6[52]={
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
70 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3,
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
71 };
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
72
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
73 const uint8_t ff_div6[52]={
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
74 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8,
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
75 };
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
76
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
77
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
78 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
79 * fill a rectangle.
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
80 * @param h height of the rectangle, should be a constant
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
81 * @param w width of the rectangle, should be a constant
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
82 * @param size the size of val (1 or 4), should be a constant
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
83 */
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4277
diff changeset
84 static av_always_inline void fill_rectangle(void *vp, int w, int h, int stride, uint32_t val, int size){
1187
f3c659bfdb8e minor cleanup / some warning fixes
michaelni
parents: 1184
diff changeset
85 uint8_t *p= (uint8_t*)vp;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
86 assert(size==1 || size==4);
3315
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
87 assert(w<=4);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
88
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
89 w *= size;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
90 stride *= size;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
91
2962
fde28cb7e3d5 use PRIxN, %zd, %td formats where needed
mru
parents: 2960
diff changeset
92 assert((((long)vp)&(FFMIN(w, STRIDE_ALIGN)-1)) == 0);
2669
a4e3a37ed57b some asserts()
michael
parents: 2650
diff changeset
93 assert((stride&(w-1))==0);
3315
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
94 if(w==2){
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
95 const uint16_t v= size==4 ? val : val*0x0101;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
96 *(uint16_t*)(p + 0*stride)= v;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
97 if(h==1) return;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
98 *(uint16_t*)(p + 1*stride)= v;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
99 if(h==2) return;
5545
397cb90b66d0 Statements like a = b = c = d = e; store from right-to-left, so if
gpoirier
parents: 5528
diff changeset
100 *(uint16_t*)(p + 2*stride)= v;
3315
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
101 *(uint16_t*)(p + 3*stride)= v;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
102 }else if(w==4){
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
103 const uint32_t v= size==4 ? val : val*0x01010101;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
104 *(uint32_t*)(p + 0*stride)= v;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
105 if(h==1) return;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
106 *(uint32_t*)(p + 1*stride)= v;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
107 if(h==2) return;
5545
397cb90b66d0 Statements like a = b = c = d = e; store from right-to-left, so if
gpoirier
parents: 5528
diff changeset
108 *(uint32_t*)(p + 2*stride)= v;
3315
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
109 *(uint32_t*)(p + 3*stride)= v;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
110 }else if(w==8){
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
111 //gcc can't optimize 64bit math on x86_32
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
112 #if defined(ARCH_X86_64) || (defined(MP_WORDSIZE) && MP_WORDSIZE >= 64)
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
113 const uint64_t v= val*0x0100000001ULL;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
114 *(uint64_t*)(p + 0*stride)= v;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
115 if(h==1) return;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
116 *(uint64_t*)(p + 1*stride)= v;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
117 if(h==2) return;
5545
397cb90b66d0 Statements like a = b = c = d = e; store from right-to-left, so if
gpoirier
parents: 5528
diff changeset
118 *(uint64_t*)(p + 2*stride)= v;
3315
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
119 *(uint64_t*)(p + 3*stride)= v;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
120 }else if(w==16){
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
121 const uint64_t v= val*0x0100000001ULL;
5545
397cb90b66d0 Statements like a = b = c = d = e; store from right-to-left, so if
gpoirier
parents: 5528
diff changeset
122 *(uint64_t*)(p + 0+0*stride)= v;
397cb90b66d0 Statements like a = b = c = d = e; store from right-to-left, so if
gpoirier
parents: 5528
diff changeset
123 *(uint64_t*)(p + 8+0*stride)= v;
397cb90b66d0 Statements like a = b = c = d = e; store from right-to-left, so if
gpoirier
parents: 5528
diff changeset
124 *(uint64_t*)(p + 0+1*stride)= v;
3315
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
125 *(uint64_t*)(p + 8+1*stride)= v;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
126 if(h==2) return;
5545
397cb90b66d0 Statements like a = b = c = d = e; store from right-to-left, so if
gpoirier
parents: 5528
diff changeset
127 *(uint64_t*)(p + 0+2*stride)= v;
397cb90b66d0 Statements like a = b = c = d = e; store from right-to-left, so if
gpoirier
parents: 5528
diff changeset
128 *(uint64_t*)(p + 8+2*stride)= v;
397cb90b66d0 Statements like a = b = c = d = e; store from right-to-left, so if
gpoirier
parents: 5528
diff changeset
129 *(uint64_t*)(p + 0+3*stride)= v;
3315
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
130 *(uint64_t*)(p + 8+3*stride)= v;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
131 #else
5545
397cb90b66d0 Statements like a = b = c = d = e; store from right-to-left, so if
gpoirier
parents: 5528
diff changeset
132 *(uint32_t*)(p + 0+0*stride)= val;
3315
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
133 *(uint32_t*)(p + 4+0*stride)= val;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
134 if(h==1) return;
5545
397cb90b66d0 Statements like a = b = c = d = e; store from right-to-left, so if
gpoirier
parents: 5528
diff changeset
135 *(uint32_t*)(p + 0+1*stride)= val;
3315
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
136 *(uint32_t*)(p + 4+1*stride)= val;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
137 if(h==2) return;
5545
397cb90b66d0 Statements like a = b = c = d = e; store from right-to-left, so if
gpoirier
parents: 5528
diff changeset
138 *(uint32_t*)(p + 0+2*stride)= val;
397cb90b66d0 Statements like a = b = c = d = e; store from right-to-left, so if
gpoirier
parents: 5528
diff changeset
139 *(uint32_t*)(p + 4+2*stride)= val;
397cb90b66d0 Statements like a = b = c = d = e; store from right-to-left, so if
gpoirier
parents: 5528
diff changeset
140 *(uint32_t*)(p + 0+3*stride)= val;
3315
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
141 *(uint32_t*)(p + 4+3*stride)= val;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
142 }else if(w==16){
5545
397cb90b66d0 Statements like a = b = c = d = e; store from right-to-left, so if
gpoirier
parents: 5528
diff changeset
143 *(uint32_t*)(p + 0+0*stride)= val;
397cb90b66d0 Statements like a = b = c = d = e; store from right-to-left, so if
gpoirier
parents: 5528
diff changeset
144 *(uint32_t*)(p + 4+0*stride)= val;
397cb90b66d0 Statements like a = b = c = d = e; store from right-to-left, so if
gpoirier
parents: 5528
diff changeset
145 *(uint32_t*)(p + 8+0*stride)= val;
397cb90b66d0 Statements like a = b = c = d = e; store from right-to-left, so if
gpoirier
parents: 5528
diff changeset
146 *(uint32_t*)(p +12+0*stride)= val;
397cb90b66d0 Statements like a = b = c = d = e; store from right-to-left, so if
gpoirier
parents: 5528
diff changeset
147 *(uint32_t*)(p + 0+1*stride)= val;
397cb90b66d0 Statements like a = b = c = d = e; store from right-to-left, so if
gpoirier
parents: 5528
diff changeset
148 *(uint32_t*)(p + 4+1*stride)= val;
397cb90b66d0 Statements like a = b = c = d = e; store from right-to-left, so if
gpoirier
parents: 5528
diff changeset
149 *(uint32_t*)(p + 8+1*stride)= val;
3315
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
150 *(uint32_t*)(p +12+1*stride)= val;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
151 if(h==2) return;
5545
397cb90b66d0 Statements like a = b = c = d = e; store from right-to-left, so if
gpoirier
parents: 5528
diff changeset
152 *(uint32_t*)(p + 0+2*stride)= val;
397cb90b66d0 Statements like a = b = c = d = e; store from right-to-left, so if
gpoirier
parents: 5528
diff changeset
153 *(uint32_t*)(p + 4+2*stride)= val;
397cb90b66d0 Statements like a = b = c = d = e; store from right-to-left, so if
gpoirier
parents: 5528
diff changeset
154 *(uint32_t*)(p + 8+2*stride)= val;
397cb90b66d0 Statements like a = b = c = d = e; store from right-to-left, so if
gpoirier
parents: 5528
diff changeset
155 *(uint32_t*)(p +12+2*stride)= val;
397cb90b66d0 Statements like a = b = c = d = e; store from right-to-left, so if
gpoirier
parents: 5528
diff changeset
156 *(uint32_t*)(p + 0+3*stride)= val;
397cb90b66d0 Statements like a = b = c = d = e; store from right-to-left, so if
gpoirier
parents: 5528
diff changeset
157 *(uint32_t*)(p + 4+3*stride)= val;
397cb90b66d0 Statements like a = b = c = d = e; store from right-to-left, so if
gpoirier
parents: 5528
diff changeset
158 *(uint32_t*)(p + 8+3*stride)= val;
3315
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
159 *(uint32_t*)(p +12+3*stride)= val;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
160 #endif
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
161 }else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
162 assert(0);
3315
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
163 assert(h==4);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
164 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
165
3028
1fadd4c26175 tweak inlines.
lorenm
parents: 3005
diff changeset
166 static void fill_caches(H264Context *h, int mb_type, int for_deblock){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
167 MpegEncContext * const s = &h->s;
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: 1174
diff changeset
168 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
169 int topleft_xy, top_xy, topright_xy, left_xy[2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
170 int topleft_type, top_type, topright_type, left_type[2];
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
171 int left_block[8];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
172 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
173
3482
c08b46172204 slightly faster h264 fill_caches()
lorenm
parents: 3455
diff changeset
174 //FIXME deblocking could skip the intra and nnz parts.
c08b46172204 slightly faster h264 fill_caches()
lorenm
parents: 3455
diff changeset
175 if(for_deblock && (h->slice_num == 1 || h->slice_table[mb_xy] == h->slice_table[mb_xy-s->mb_stride]) && !FRAME_MBAFF)
2623
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
176 return;
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
177
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
178 //wow what a mess, why didn't they simplify the interlacing&intra stuff, i can't imagine that these complex rules are worth it
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
179
5781
0b3aa6f4c313 Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents: 5780
diff changeset
180 top_xy = mb_xy - (s->mb_stride << FIELD_PICTURE);
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
181 topleft_xy = top_xy - 1;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
182 topright_xy= top_xy + 1;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
183 left_xy[1] = left_xy[0] = mb_xy-1;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
184 left_block[0]= 0;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
185 left_block[1]= 1;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
186 left_block[2]= 2;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
187 left_block[3]= 3;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
188 left_block[4]= 7;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
189 left_block[5]= 10;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
190 left_block[6]= 8;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
191 left_block[7]= 11;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
192 if(FRAME_MBAFF){
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
193 const int pair_xy = s->mb_x + (s->mb_y & ~1)*s->mb_stride;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
194 const int top_pair_xy = pair_xy - s->mb_stride;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
195 const int topleft_pair_xy = top_pair_xy - 1;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
196 const int topright_pair_xy = top_pair_xy + 1;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
197 const int topleft_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[topleft_pair_xy]);
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
198 const int top_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[top_pair_xy]);
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
199 const int topright_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[topright_pair_xy]);
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
200 const int left_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[pair_xy-1]);
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
201 const int curr_mb_frame_flag = !IS_INTERLACED(mb_type);
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
202 const int bottom = (s->mb_y & 1);
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
203 tprintf(s->avctx, "fill_caches: curr_mb_frame_flag:%d, left_mb_frame_flag:%d, topleft_mb_frame_flag:%d, top_mb_frame_flag:%d, topright_mb_frame_flag:%d\n", curr_mb_frame_flag, left_mb_frame_flag, topleft_mb_frame_flag, top_mb_frame_flag, topright_mb_frame_flag);
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
204 if (bottom
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
205 ? !curr_mb_frame_flag // bottom macroblock
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
206 : (!curr_mb_frame_flag && !top_mb_frame_flag) // top macroblock
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
207 ) {
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
208 top_xy -= s->mb_stride;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
209 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
210 if (bottom
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
211 ? !curr_mb_frame_flag // bottom macroblock
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
212 : (!curr_mb_frame_flag && !topleft_mb_frame_flag) // top macroblock
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
213 ) {
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
214 topleft_xy -= s->mb_stride;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
215 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
216 if (bottom
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
217 ? !curr_mb_frame_flag // bottom macroblock
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
218 : (!curr_mb_frame_flag && !topright_mb_frame_flag) // top macroblock
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
219 ) {
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
220 topright_xy -= s->mb_stride;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
221 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
222 if (left_mb_frame_flag != curr_mb_frame_flag) {
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
223 left_xy[1] = left_xy[0] = pair_xy - 1;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
224 if (curr_mb_frame_flag) {
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
225 if (bottom) {
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
226 left_block[0]= 2;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
227 left_block[1]= 2;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
228 left_block[2]= 3;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
229 left_block[3]= 3;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
230 left_block[4]= 8;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
231 left_block[5]= 11;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
232 left_block[6]= 8;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
233 left_block[7]= 11;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
234 } else {
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
235 left_block[0]= 0;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
236 left_block[1]= 0;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
237 left_block[2]= 1;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
238 left_block[3]= 1;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
239 left_block[4]= 7;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
240 left_block[5]= 10;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
241 left_block[6]= 7;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
242 left_block[7]= 10;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
243 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
244 } else {
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
245 left_xy[1] += s->mb_stride;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
246 //left_block[0]= 0;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
247 left_block[1]= 2;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
248 left_block[2]= 0;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
249 left_block[3]= 2;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
250 //left_block[4]= 7;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
251 left_block[5]= 10;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
252 left_block[6]= 7;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
253 left_block[7]= 10;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
254 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
255 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
256 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
257
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
258 h->top_mb_xy = top_xy;
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
259 h->left_mb_xy[0] = left_xy[0];
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
260 h->left_mb_xy[1] = left_xy[1];
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
261 if(for_deblock){
3482
c08b46172204 slightly faster h264 fill_caches()
lorenm
parents: 3455
diff changeset
262 topleft_type = 0;
c08b46172204 slightly faster h264 fill_caches()
lorenm
parents: 3455
diff changeset
263 topright_type = 0;
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
264 top_type = h->slice_table[top_xy ] < 255 ? s->current_picture.mb_type[top_xy] : 0;
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
265 left_type[0] = h->slice_table[left_xy[0] ] < 255 ? s->current_picture.mb_type[left_xy[0]] : 0;
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
266 left_type[1] = h->slice_table[left_xy[1] ] < 255 ? s->current_picture.mb_type[left_xy[1]] : 0;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
267
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
268 if(FRAME_MBAFF && !IS_INTRA(mb_type)){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
269 int list;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
270 int v = *(uint16_t*)&h->non_zero_count[mb_xy][14];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
271 for(i=0; i<16; i++)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
272 h->non_zero_count_cache[scan8[i]] = (v>>i)&1;
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
273 for(list=0; list<h->list_count; list++){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
274 if(USES_LIST(mb_type,list)){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
275 uint32_t *src = (uint32_t*)s->current_picture.motion_val[list][h->mb2b_xy[mb_xy]];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
276 uint32_t *dst = (uint32_t*)h->mv_cache[list][scan8[0]];
3776
1843a85123b7 fix some signedness warnings
mru
parents: 3651
diff changeset
277 int8_t *ref = &s->current_picture.ref_index[list][h->mb2b8_xy[mb_xy]];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
278 for(i=0; i<4; i++, dst+=8, src+=h->b_stride){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
279 dst[0] = src[0];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
280 dst[1] = src[1];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
281 dst[2] = src[2];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
282 dst[3] = src[3];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
283 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
284 *(uint32_t*)&h->ref_cache[list][scan8[ 0]] =
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
285 *(uint32_t*)&h->ref_cache[list][scan8[ 2]] = pack16to32(ref[0],ref[1])*0x0101;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
286 ref += h->b8_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
287 *(uint32_t*)&h->ref_cache[list][scan8[ 8]] =
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
288 *(uint32_t*)&h->ref_cache[list][scan8[10]] = pack16to32(ref[0],ref[1])*0x0101;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
289 }else{
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
290 fill_rectangle(&h-> mv_cache[list][scan8[ 0]], 4, 4, 8, 0, 4);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
291 fill_rectangle(&h->ref_cache[list][scan8[ 0]], 4, 4, 8, (uint8_t)LIST_NOT_USED, 1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
292 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
293 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
294 }
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
295 }else{
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
296 topleft_type = h->slice_table[topleft_xy ] == h->slice_num ? s->current_picture.mb_type[topleft_xy] : 0;
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
297 top_type = h->slice_table[top_xy ] == h->slice_num ? s->current_picture.mb_type[top_xy] : 0;
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
298 topright_type= h->slice_table[topright_xy] == h->slice_num ? s->current_picture.mb_type[topright_xy]: 0;
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
299 left_type[0] = h->slice_table[left_xy[0] ] == h->slice_num ? s->current_picture.mb_type[left_xy[0]] : 0;
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
300 left_type[1] = h->slice_table[left_xy[1] ] == h->slice_num ? s->current_picture.mb_type[left_xy[1]] : 0;
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
301 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
302
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
303 if(IS_INTRA(mb_type)){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
304 h->topleft_samples_available=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
305 h->top_samples_available=
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
306 h->left_samples_available= 0xFFFF;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
307 h->topright_samples_available= 0xEEEA;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
308
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
309 if(!IS_INTRA(top_type) && (top_type==0 || h->pps.constrained_intra_pred)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
310 h->topleft_samples_available= 0xB3FF;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
311 h->top_samples_available= 0x33FF;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
312 h->topright_samples_available= 0x26EA;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
313 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
314 for(i=0; i<2; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
315 if(!IS_INTRA(left_type[i]) && (left_type[i]==0 || h->pps.constrained_intra_pred)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
316 h->topleft_samples_available&= 0xDF5F;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
317 h->left_samples_available&= 0x5F5F;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
318 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
319 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
320
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
321 if(!IS_INTRA(topleft_type) && (topleft_type==0 || h->pps.constrained_intra_pred))
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
322 h->topleft_samples_available&= 0x7FFF;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
323
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
324 if(!IS_INTRA(topright_type) && (topright_type==0 || h->pps.constrained_intra_pred))
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
325 h->topright_samples_available&= 0xFBFF;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
326
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
327 if(IS_INTRA4x4(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
328 if(IS_INTRA4x4(top_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
329 h->intra4x4_pred_mode_cache[4+8*0]= h->intra4x4_pred_mode[top_xy][4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
330 h->intra4x4_pred_mode_cache[5+8*0]= h->intra4x4_pred_mode[top_xy][5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
331 h->intra4x4_pred_mode_cache[6+8*0]= h->intra4x4_pred_mode[top_xy][6];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
332 h->intra4x4_pred_mode_cache[7+8*0]= h->intra4x4_pred_mode[top_xy][3];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
333 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
334 int pred;
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
335 if(!top_type || (IS_INTER(top_type) && h->pps.constrained_intra_pred))
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
336 pred= -1;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
337 else{
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
338 pred= 2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
339 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
340 h->intra4x4_pred_mode_cache[4+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
341 h->intra4x4_pred_mode_cache[5+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
342 h->intra4x4_pred_mode_cache[6+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
343 h->intra4x4_pred_mode_cache[7+8*0]= pred;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
344 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
345 for(i=0; i<2; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
346 if(IS_INTRA4x4(left_type[i])){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
347 h->intra4x4_pred_mode_cache[3+8*1 + 2*8*i]= h->intra4x4_pred_mode[left_xy[i]][left_block[0+2*i]];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
348 h->intra4x4_pred_mode_cache[3+8*2 + 2*8*i]= h->intra4x4_pred_mode[left_xy[i]][left_block[1+2*i]];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
349 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
350 int pred;
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
351 if(!left_type[i] || (IS_INTER(left_type[i]) && h->pps.constrained_intra_pred))
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
352 pred= -1;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
353 else{
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
354 pred= 2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
355 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
356 h->intra4x4_pred_mode_cache[3+8*1 + 2*8*i]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
357 h->intra4x4_pred_mode_cache[3+8*2 + 2*8*i]= pred;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
358 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
359 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
360 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
361 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
362
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
363
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
364 /*
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
365 0 . T T. T T T T
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
366 1 L . .L . . . .
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
367 2 L . .L . . . .
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
368 3 . T TL . . . .
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
369 4 L . .L . . . .
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
370 5 L . .. . . . .
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
371 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
372 //FIXME constraint_intra_pred & partitioning & nnz (lets hope this is just a typo in the spec)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
373 if(top_type){
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
374 h->non_zero_count_cache[4+8*0]= h->non_zero_count[top_xy][4];
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
375 h->non_zero_count_cache[5+8*0]= h->non_zero_count[top_xy][5];
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
376 h->non_zero_count_cache[6+8*0]= h->non_zero_count[top_xy][6];
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
377 h->non_zero_count_cache[7+8*0]= h->non_zero_count[top_xy][3];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
378
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
379 h->non_zero_count_cache[1+8*0]= h->non_zero_count[top_xy][9];
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
380 h->non_zero_count_cache[2+8*0]= h->non_zero_count[top_xy][8];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
381
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
382 h->non_zero_count_cache[1+8*3]= h->non_zero_count[top_xy][12];
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
383 h->non_zero_count_cache[2+8*3]= h->non_zero_count[top_xy][11];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
384
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
385 }else{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
386 h->non_zero_count_cache[4+8*0]=
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
387 h->non_zero_count_cache[5+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
388 h->non_zero_count_cache[6+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
389 h->non_zero_count_cache[7+8*0]=
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
390
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
391 h->non_zero_count_cache[1+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
392 h->non_zero_count_cache[2+8*0]=
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
393
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
394 h->non_zero_count_cache[1+8*3]=
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
395 h->non_zero_count_cache[2+8*3]= h->pps.cabac && !IS_INTRA(mb_type) ? 0 : 64;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
396
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
397 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
398
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
399 for (i=0; i<2; i++) {
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
400 if(left_type[i]){
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
401 h->non_zero_count_cache[3+8*1 + 2*8*i]= h->non_zero_count[left_xy[i]][left_block[0+2*i]];
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
402 h->non_zero_count_cache[3+8*2 + 2*8*i]= h->non_zero_count[left_xy[i]][left_block[1+2*i]];
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
403 h->non_zero_count_cache[0+8*1 + 8*i]= h->non_zero_count[left_xy[i]][left_block[4+2*i]];
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
404 h->non_zero_count_cache[0+8*4 + 8*i]= h->non_zero_count[left_xy[i]][left_block[5+2*i]];
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
405 }else{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
406 h->non_zero_count_cache[3+8*1 + 2*8*i]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
407 h->non_zero_count_cache[3+8*2 + 2*8*i]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
408 h->non_zero_count_cache[0+8*1 + 8*i]=
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
409 h->non_zero_count_cache[0+8*4 + 8*i]= h->pps.cabac && !IS_INTRA(mb_type) ? 0 : 64;
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
410 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
411 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
412
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
413 if( h->pps.cabac ) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
414 // top_cbp
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
415 if(top_type) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
416 h->top_cbp = h->cbp_table[top_xy];
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
417 } else if(IS_INTRA(mb_type)) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
418 h->top_cbp = 0x1C0;
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
419 } else {
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
420 h->top_cbp = 0;
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
421 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
422 // left_cbp
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
423 if (left_type[0]) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
424 h->left_cbp = h->cbp_table[left_xy[0]] & 0x1f0;
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
425 } else if(IS_INTRA(mb_type)) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
426 h->left_cbp = 0x1C0;
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
427 } else {
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
428 h->left_cbp = 0;
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
429 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
430 if (left_type[0]) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
431 h->left_cbp |= ((h->cbp_table[left_xy[0]]>>((left_block[0]&(~1))+1))&0x1) << 1;
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
432 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
433 if (left_type[1]) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
434 h->left_cbp |= ((h->cbp_table[left_xy[1]]>>((left_block[2]&(~1))+1))&0x1) << 3;
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
435 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
436 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
437
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
438 #if 1
2623
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
439 if(IS_INTER(mb_type) || IS_DIRECT(mb_type)){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
440 int list;
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
441 for(list=0; list<h->list_count; list++){
2623
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
442 if(!USES_LIST(mb_type, list) && !IS_DIRECT(mb_type) && !h->deblocking_filter){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
443 /*if(!h->mv_cache_clean[list]){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
444 memset(h->mv_cache [list], 0, 8*5*2*sizeof(int16_t)); //FIXME clean only input? clean at all?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
445 memset(h->ref_cache[list], PART_NOT_AVAILABLE, 8*5*sizeof(int8_t));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
446 h->mv_cache_clean[list]= 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
447 }*/
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
448 continue;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
449 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
450 h->mv_cache_clean[list]= 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
451
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
452 if(USES_LIST(top_type, list)){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
453 const int b_xy= h->mb2b_xy[top_xy] + 3*h->b_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
454 const int b8_xy= h->mb2b8_xy[top_xy] + h->b8_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
455 *(uint32_t*)h->mv_cache[list][scan8[0] + 0 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
456 *(uint32_t*)h->mv_cache[list][scan8[0] + 1 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
457 *(uint32_t*)h->mv_cache[list][scan8[0] + 2 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
458 *(uint32_t*)h->mv_cache[list][scan8[0] + 3 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 3];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
459 h->ref_cache[list][scan8[0] + 0 - 1*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
460 h->ref_cache[list][scan8[0] + 1 - 1*8]= s->current_picture.ref_index[list][b8_xy + 0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
461 h->ref_cache[list][scan8[0] + 2 - 1*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
462 h->ref_cache[list][scan8[0] + 3 - 1*8]= s->current_picture.ref_index[list][b8_xy + 1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
463 }else{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
464 *(uint32_t*)h->mv_cache [list][scan8[0] + 0 - 1*8]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
465 *(uint32_t*)h->mv_cache [list][scan8[0] + 1 - 1*8]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
466 *(uint32_t*)h->mv_cache [list][scan8[0] + 2 - 1*8]=
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
467 *(uint32_t*)h->mv_cache [list][scan8[0] + 3 - 1*8]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
468 *(uint32_t*)&h->ref_cache[list][scan8[0] + 0 - 1*8]= ((top_type ? LIST_NOT_USED : PART_NOT_AVAILABLE)&0xFF)*0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
469 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
470
4546
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
471 for(i=0; i<2; i++){
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
472 int cache_idx = scan8[0] - 1 + i*2*8;
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
473 if(USES_LIST(left_type[i], list)){
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
474 const int b_xy= h->mb2b_xy[left_xy[i]] + 3;
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
475 const int b8_xy= h->mb2b8_xy[left_xy[i]] + 1;
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
476 *(uint32_t*)h->mv_cache[list][cache_idx ]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + h->b_stride*left_block[0+i*2]];
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
477 *(uint32_t*)h->mv_cache[list][cache_idx+8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + h->b_stride*left_block[1+i*2]];
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
478 h->ref_cache[list][cache_idx ]= s->current_picture.ref_index[list][b8_xy + h->b8_stride*(left_block[0+i*2]>>1)];
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
479 h->ref_cache[list][cache_idx+8]= s->current_picture.ref_index[list][b8_xy + h->b8_stride*(left_block[1+i*2]>>1)];
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
480 }else{
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
481 *(uint32_t*)h->mv_cache [list][cache_idx ]=
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
482 *(uint32_t*)h->mv_cache [list][cache_idx+8]= 0;
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
483 h->ref_cache[list][cache_idx ]=
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
484 h->ref_cache[list][cache_idx+8]= left_type[i] ? LIST_NOT_USED : PART_NOT_AVAILABLE;
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
485 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
486 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
487
3519
5ef29058581e 10l in r5768 (broke mbaff)
lorenm
parents: 3482
diff changeset
488 if((for_deblock || (IS_DIRECT(mb_type) && !h->direct_spatial_mv_pred)) && !FRAME_MBAFF)
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
489 continue;
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
490
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
491 if(USES_LIST(topleft_type, list)){
2623
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
492 const int b_xy = h->mb2b_xy[topleft_xy] + 3 + 3*h->b_stride;
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
493 const int b8_xy= h->mb2b8_xy[topleft_xy] + 1 + h->b8_stride;
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
494 *(uint32_t*)h->mv_cache[list][scan8[0] - 1 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy];
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
495 h->ref_cache[list][scan8[0] - 1 - 1*8]= s->current_picture.ref_index[list][b8_xy];
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
496 }else{
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
497 *(uint32_t*)h->mv_cache[list][scan8[0] - 1 - 1*8]= 0;
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
498 h->ref_cache[list][scan8[0] - 1 - 1*8]= topleft_type ? LIST_NOT_USED : PART_NOT_AVAILABLE;
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
499 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
500
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
501 if(USES_LIST(topright_type, list)){
2623
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
502 const int b_xy= h->mb2b_xy[topright_xy] + 3*h->b_stride;
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
503 const int b8_xy= h->mb2b8_xy[topright_xy] + h->b8_stride;
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
504 *(uint32_t*)h->mv_cache[list][scan8[0] + 4 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy];
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
505 h->ref_cache[list][scan8[0] + 4 - 1*8]= s->current_picture.ref_index[list][b8_xy];
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
506 }else{
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
507 *(uint32_t*)h->mv_cache [list][scan8[0] + 4 - 1*8]= 0;
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
508 h->ref_cache[list][scan8[0] + 4 - 1*8]= topright_type ? LIST_NOT_USED : PART_NOT_AVAILABLE;
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
509 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
510
3519
5ef29058581e 10l in r5768 (broke mbaff)
lorenm
parents: 3482
diff changeset
511 if((IS_SKIP(mb_type) || IS_DIRECT(mb_type)) && !FRAME_MBAFF)
3482
c08b46172204 slightly faster h264 fill_caches()
lorenm
parents: 3455
diff changeset
512 continue;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
513
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
514 h->ref_cache[list][scan8[5 ]+1] =
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
515 h->ref_cache[list][scan8[7 ]+1] =
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
516 h->ref_cache[list][scan8[13]+1] = //FIXME remove past 3 (init somewhere else)
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
517 h->ref_cache[list][scan8[4 ]] =
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
518 h->ref_cache[list][scan8[12]] = PART_NOT_AVAILABLE;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
519 *(uint32_t*)h->mv_cache [list][scan8[5 ]+1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
520 *(uint32_t*)h->mv_cache [list][scan8[7 ]+1]=
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
521 *(uint32_t*)h->mv_cache [list][scan8[13]+1]= //FIXME remove past 3 (init somewhere else)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
522 *(uint32_t*)h->mv_cache [list][scan8[4 ]]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
523 *(uint32_t*)h->mv_cache [list][scan8[12]]= 0;
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
524
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
525 if( h->pps.cabac ) {
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
526 /* XXX beurk, Load mvd */
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
527 if(USES_LIST(top_type, list)){
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
528 const int b_xy= h->mb2b_xy[top_xy] + 3*h->b_stride;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
529 *(uint32_t*)h->mvd_cache[list][scan8[0] + 0 - 1*8]= *(uint32_t*)h->mvd_table[list][b_xy + 0];
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
530 *(uint32_t*)h->mvd_cache[list][scan8[0] + 1 - 1*8]= *(uint32_t*)h->mvd_table[list][b_xy + 1];
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
531 *(uint32_t*)h->mvd_cache[list][scan8[0] + 2 - 1*8]= *(uint32_t*)h->mvd_table[list][b_xy + 2];
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
532 *(uint32_t*)h->mvd_cache[list][scan8[0] + 3 - 1*8]= *(uint32_t*)h->mvd_table[list][b_xy + 3];
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
533 }else{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
534 *(uint32_t*)h->mvd_cache [list][scan8[0] + 0 - 1*8]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
535 *(uint32_t*)h->mvd_cache [list][scan8[0] + 1 - 1*8]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
536 *(uint32_t*)h->mvd_cache [list][scan8[0] + 2 - 1*8]=
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
537 *(uint32_t*)h->mvd_cache [list][scan8[0] + 3 - 1*8]= 0;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
538 }
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
539 if(USES_LIST(left_type[0], list)){
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
540 const int b_xy= h->mb2b_xy[left_xy[0]] + 3;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
541 *(uint32_t*)h->mvd_cache[list][scan8[0] - 1 + 0*8]= *(uint32_t*)h->mvd_table[list][b_xy + h->b_stride*left_block[0]];
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
542 *(uint32_t*)h->mvd_cache[list][scan8[0] - 1 + 1*8]= *(uint32_t*)h->mvd_table[list][b_xy + h->b_stride*left_block[1]];
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
543 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
544 *(uint32_t*)h->mvd_cache [list][scan8[0] - 1 + 0*8]=
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
545 *(uint32_t*)h->mvd_cache [list][scan8[0] - 1 + 1*8]= 0;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
546 }
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
547 if(USES_LIST(left_type[1], list)){
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
548 const int b_xy= h->mb2b_xy[left_xy[1]] + 3;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
549 *(uint32_t*)h->mvd_cache[list][scan8[0] - 1 + 2*8]= *(uint32_t*)h->mvd_table[list][b_xy + h->b_stride*left_block[2]];
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
550 *(uint32_t*)h->mvd_cache[list][scan8[0] - 1 + 3*8]= *(uint32_t*)h->mvd_table[list][b_xy + h->b_stride*left_block[3]];
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
551 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
552 *(uint32_t*)h->mvd_cache [list][scan8[0] - 1 + 2*8]=
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
553 *(uint32_t*)h->mvd_cache [list][scan8[0] - 1 + 3*8]= 0;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
554 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
555 *(uint32_t*)h->mvd_cache [list][scan8[5 ]+1]=
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
556 *(uint32_t*)h->mvd_cache [list][scan8[7 ]+1]=
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
557 *(uint32_t*)h->mvd_cache [list][scan8[13]+1]= //FIXME remove past 3 (init somewhere else)
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
558 *(uint32_t*)h->mvd_cache [list][scan8[4 ]]=
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
559 *(uint32_t*)h->mvd_cache [list][scan8[12]]= 0;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
560
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
561 if(h->slice_type == B_TYPE){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
562 fill_rectangle(&h->direct_cache[scan8[0]], 4, 4, 8, 0, 1);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
563
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
564 if(IS_DIRECT(top_type)){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
565 *(uint32_t*)&h->direct_cache[scan8[0] - 1*8]= 0x01010101;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
566 }else if(IS_8X8(top_type)){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
567 int b8_xy = h->mb2b8_xy[top_xy] + h->b8_stride;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
568 h->direct_cache[scan8[0] + 0 - 1*8]= h->direct_table[b8_xy];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
569 h->direct_cache[scan8[0] + 2 - 1*8]= h->direct_table[b8_xy + 1];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
570 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
571 *(uint32_t*)&h->direct_cache[scan8[0] - 1*8]= 0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
572 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
573
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
574 if(IS_DIRECT(left_type[0]))
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
575 h->direct_cache[scan8[0] - 1 + 0*8]= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
576 else if(IS_8X8(left_type[0]))
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
577 h->direct_cache[scan8[0] - 1 + 0*8]= h->direct_table[h->mb2b8_xy[left_xy[0]] + 1 + h->b8_stride*(left_block[0]>>1)];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
578 else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
579 h->direct_cache[scan8[0] - 1 + 0*8]= 0;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
580
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
581 if(IS_DIRECT(left_type[1]))
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
582 h->direct_cache[scan8[0] - 1 + 2*8]= 1;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
583 else if(IS_8X8(left_type[1]))
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
584 h->direct_cache[scan8[0] - 1 + 2*8]= h->direct_table[h->mb2b8_xy[left_xy[1]] + 1 + h->b8_stride*(left_block[2]>>1)];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
585 else
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
586 h->direct_cache[scan8[0] - 1 + 2*8]= 0;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
587 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
588 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
589
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
590 if(FRAME_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
591 #define MAP_MVS\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
592 MAP_F2F(scan8[0] - 1 - 1*8, topleft_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
593 MAP_F2F(scan8[0] + 0 - 1*8, top_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
594 MAP_F2F(scan8[0] + 1 - 1*8, top_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
595 MAP_F2F(scan8[0] + 2 - 1*8, top_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
596 MAP_F2F(scan8[0] + 3 - 1*8, top_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
597 MAP_F2F(scan8[0] + 4 - 1*8, topright_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
598 MAP_F2F(scan8[0] - 1 + 0*8, left_type[0])\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
599 MAP_F2F(scan8[0] - 1 + 1*8, left_type[0])\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
600 MAP_F2F(scan8[0] - 1 + 2*8, left_type[1])\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
601 MAP_F2F(scan8[0] - 1 + 3*8, left_type[1])
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
602 if(MB_FIELD){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
603 #define MAP_F2F(idx, mb_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
604 if(!IS_INTERLACED(mb_type) && h->ref_cache[list][idx] >= 0){\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
605 h->ref_cache[list][idx] <<= 1;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
606 h->mv_cache[list][idx][1] /= 2;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
607 h->mvd_cache[list][idx][1] /= 2;\
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
608 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
609 MAP_MVS
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
610 #undef MAP_F2F
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
611 }else{
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
612 #define MAP_F2F(idx, mb_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
613 if(IS_INTERLACED(mb_type) && h->ref_cache[list][idx] >= 0){\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
614 h->ref_cache[list][idx] >>= 1;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
615 h->mv_cache[list][idx][1] <<= 1;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
616 h->mvd_cache[list][idx][1] <<= 1;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
617 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
618 MAP_MVS
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
619 #undef MAP_F2F
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
620 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
621 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
622 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
623 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
624 #endif
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
625
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
626 h->neighbor_transform_size= !!IS_8x8DCT(top_type) + !!IS_8x8DCT(left_type[0]);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
627 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
628
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
629 static inline void write_back_intra_pred_mode(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
630 MpegEncContext * const s = &h->s;
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: 1174
diff changeset
631 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
632
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
633 h->intra4x4_pred_mode[mb_xy][0]= h->intra4x4_pred_mode_cache[7+8*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
634 h->intra4x4_pred_mode[mb_xy][1]= h->intra4x4_pred_mode_cache[7+8*2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
635 h->intra4x4_pred_mode[mb_xy][2]= h->intra4x4_pred_mode_cache[7+8*3];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
636 h->intra4x4_pred_mode[mb_xy][3]= h->intra4x4_pred_mode_cache[7+8*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
637 h->intra4x4_pred_mode[mb_xy][4]= h->intra4x4_pred_mode_cache[4+8*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
638 h->intra4x4_pred_mode[mb_xy][5]= h->intra4x4_pred_mode_cache[5+8*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
639 h->intra4x4_pred_mode[mb_xy][6]= h->intra4x4_pred_mode_cache[6+8*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
640 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
641
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
642 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
643 * checks if the top & left blocks are available if needed & changes the dc mode so it only uses the available blocks.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
644 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
645 static inline int check_intra4x4_pred_mode(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
646 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
647 static const int8_t top [12]= {-1, 0,LEFT_DC_PRED,-1,-1,-1,-1,-1, 0};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
648 static const int8_t left[12]= { 0,-1, TOP_DC_PRED, 0,-1,-1,-1, 0,-1,DC_128_PRED};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
649 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
650
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
651 if(!(h->top_samples_available&0x8000)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
652 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
653 int status= top[ h->intra4x4_pred_mode_cache[scan8[0] + i] ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
654 if(status<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
655 av_log(h->s.avctx, AV_LOG_ERROR, "top block unavailable for requested intra4x4 mode %d at %d %d\n", status, s->mb_x, s->mb_y);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
656 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
657 } else if(status){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
658 h->intra4x4_pred_mode_cache[scan8[0] + i]= status;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
659 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
660 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
661 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
662
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
663 if(!(h->left_samples_available&0x8000)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
664 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
665 int status= left[ h->intra4x4_pred_mode_cache[scan8[0] + 8*i] ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
666 if(status<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
667 av_log(h->s.avctx, AV_LOG_ERROR, "left block unavailable for requested intra4x4 mode %d at %d %d\n", status, s->mb_x, s->mb_y);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
668 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
669 } else if(status){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
670 h->intra4x4_pred_mode_cache[scan8[0] + 8*i]= status;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
671 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
672 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
673 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
674
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
675 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
676 } //FIXME cleanup like next
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
677
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
678 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
679 * checks if the top & left blocks are available if needed & changes the dc mode so it only uses the available blocks.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
680 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
681 static inline int check_intra_pred_mode(H264Context *h, int mode){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
682 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
683 static const int8_t top [7]= {LEFT_DC_PRED8x8, 1,-1,-1};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
684 static const int8_t left[7]= { TOP_DC_PRED8x8,-1, 2,-1,DC_128_PRED8x8};
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
685
4529
a8082e1ed672 simplify
michael
parents: 4507
diff changeset
686 if(mode > 6U) {
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
687 av_log(h->s.avctx, AV_LOG_ERROR, "out of range intra chroma pred mode at %d %d\n", s->mb_x, s->mb_y);
2163
b25df257eab0 segfault fix
michael
parents: 2116
diff changeset
688 return -1;
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
689 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
690
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
691 if(!(h->top_samples_available&0x8000)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
692 mode= top[ mode ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
693 if(mode<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
694 av_log(h->s.avctx, AV_LOG_ERROR, "top block unavailable for requested intra mode at %d %d\n", s->mb_x, s->mb_y);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
695 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
696 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
697 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
698
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
699 if(!(h->left_samples_available&0x8000)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
700 mode= left[ mode ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
701 if(mode<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
702 av_log(h->s.avctx, AV_LOG_ERROR, "left block unavailable for requested intra mode at %d %d\n", s->mb_x, s->mb_y);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
703 return -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
704 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
705 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
706
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
707 return mode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
708 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
709
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
710 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
711 * gets the predicted intra4x4 prediction mode.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
712 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
713 static inline int pred_intra_mode(H264Context *h, int n){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
714 const int index8= scan8[n];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
715 const int left= h->intra4x4_pred_mode_cache[index8 - 1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
716 const int top = h->intra4x4_pred_mode_cache[index8 - 8];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
717 const int min= FFMIN(left, top);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
718
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
719 tprintf(h->s.avctx, "mode:%d %d min:%d\n", left ,top, min);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
720
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
721 if(min<0) return DC_PRED;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
722 else return min;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
723 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
724
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
725 static inline void write_back_non_zero_count(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
726 MpegEncContext * const s = &h->s;
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: 1174
diff changeset
727 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
728
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
729 h->non_zero_count[mb_xy][0]= h->non_zero_count_cache[7+8*1];
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
730 h->non_zero_count[mb_xy][1]= h->non_zero_count_cache[7+8*2];
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
731 h->non_zero_count[mb_xy][2]= h->non_zero_count_cache[7+8*3];
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
732 h->non_zero_count[mb_xy][3]= h->non_zero_count_cache[7+8*4];
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
733 h->non_zero_count[mb_xy][4]= h->non_zero_count_cache[4+8*4];
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
734 h->non_zero_count[mb_xy][5]= h->non_zero_count_cache[5+8*4];
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
735 h->non_zero_count[mb_xy][6]= h->non_zero_count_cache[6+8*4];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
736
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
737 h->non_zero_count[mb_xy][9]= h->non_zero_count_cache[1+8*2];
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
738 h->non_zero_count[mb_xy][8]= h->non_zero_count_cache[2+8*2];
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
739 h->non_zero_count[mb_xy][7]= h->non_zero_count_cache[2+8*1];
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
740
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
741 h->non_zero_count[mb_xy][12]=h->non_zero_count_cache[1+8*5];
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
742 h->non_zero_count[mb_xy][11]=h->non_zero_count_cache[2+8*5];
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
743 h->non_zero_count[mb_xy][10]=h->non_zero_count_cache[2+8*4];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
744
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
745 if(FRAME_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
746 // store all luma nnzs, for deblocking
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
747 int v = 0, i;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
748 for(i=0; i<16; i++)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
749 v += (!!h->non_zero_count_cache[scan8[i]]) << i;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
750 *(uint16_t*)&h->non_zero_count[mb_xy][14] = v;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
751 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
752 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
753
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
754 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
755 * gets the predicted number of non zero coefficients.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
756 * @param n block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
757 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
758 static inline int pred_non_zero_count(H264Context *h, int n){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
759 const int index8= scan8[n];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
760 const int left= h->non_zero_count_cache[index8 - 1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
761 const int top = h->non_zero_count_cache[index8 - 8];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
762 int i= left + top;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
763
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
764 if(i<64) i= (i+1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
765
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
766 tprintf(h->s.avctx, "pred_nnz L%X T%X n%d s%d P%X\n", left, top, n, scan8[n], i&31);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
767
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
768 return i&31;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
769 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
770
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
771 static inline int fetch_diagonal_mv(H264Context *h, const int16_t **C, int i, int list, int part_width){
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
772 const int topright_ref= h->ref_cache[list][ i - 8 + part_width ];
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
773 MpegEncContext *s = &h->s;
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
774
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
775 /* there is no consistent mapping of mvs to neighboring locations that will
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
776 * make mbaff happy, so we can't move all this logic to fill_caches */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
777 if(FRAME_MBAFF){
3776
1843a85123b7 fix some signedness warnings
mru
parents: 3651
diff changeset
778 const uint32_t *mb_types = s->current_picture_ptr->mb_type;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
779 const int16_t *mv;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
780 *(uint32_t*)h->mv_cache[list][scan8[0]-2] = 0;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
781 *C = h->mv_cache[list][scan8[0]-2];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
782
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
783 if(!MB_FIELD
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
784 && (s->mb_y&1) && i < scan8[0]+8 && topright_ref != PART_NOT_AVAILABLE){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
785 int topright_xy = s->mb_x + (s->mb_y-1)*s->mb_stride + (i == scan8[0]+3);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
786 if(IS_INTERLACED(mb_types[topright_xy])){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
787 #define SET_DIAG_MV(MV_OP, REF_OP, X4, Y4)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
788 const int x4 = X4, y4 = Y4;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
789 const int mb_type = mb_types[(x4>>2)+(y4>>2)*s->mb_stride];\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
790 if(!USES_LIST(mb_type,list) && !IS_8X8(mb_type))\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
791 return LIST_NOT_USED;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
792 mv = s->current_picture_ptr->motion_val[list][x4 + y4*h->b_stride];\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
793 h->mv_cache[list][scan8[0]-2][0] = mv[0];\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
794 h->mv_cache[list][scan8[0]-2][1] = mv[1] MV_OP;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
795 return s->current_picture_ptr->ref_index[list][(x4>>1) + (y4>>1)*h->b8_stride] REF_OP;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
796
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
797 SET_DIAG_MV(*2, >>1, s->mb_x*4+(i&7)-4+part_width, s->mb_y*4-1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
798 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
799 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
800 if(topright_ref == PART_NOT_AVAILABLE
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
801 && ((s->mb_y&1) || i >= scan8[0]+8) && (i&7)==4
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
802 && h->ref_cache[list][scan8[0]-1] != PART_NOT_AVAILABLE){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
803 if(!MB_FIELD
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
804 && IS_INTERLACED(mb_types[h->left_mb_xy[0]])){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
805 SET_DIAG_MV(*2, >>1, s->mb_x*4-1, (s->mb_y|1)*4+(s->mb_y&1)*2+(i>>4)-1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
806 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
807 if(MB_FIELD
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
808 && !IS_INTERLACED(mb_types[h->left_mb_xy[0]])
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
809 && i >= scan8[0]+8){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
810 // leftshift will turn LIST_NOT_USED into PART_NOT_AVAILABLE, but that's ok.
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
811 SET_DIAG_MV(>>1, <<1, s->mb_x*4-1, (s->mb_y&~1)*4 - 1 + ((i-scan8[0])>>3)*2);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
812 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
813 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
814 #undef SET_DIAG_MV
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
815 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
816
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
817 if(topright_ref != PART_NOT_AVAILABLE){
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
818 *C= h->mv_cache[list][ i - 8 + part_width ];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
819 return topright_ref;
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
820 }else{
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
821 tprintf(s->avctx, "topright MV not available\n");
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
822
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
823 *C= h->mv_cache[list][ i - 8 - 1 ];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
824 return h->ref_cache[list][ i - 8 - 1 ];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
825 }
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
826 }
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
827
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
828 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
829 * gets the predicted MV.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
830 * @param n the block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
831 * @param part_width the width of the partition (4, 8,16) -> (1, 2, 4)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
832 * @param mx the x component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
833 * @param my the y component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
834 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
835 static inline void pred_motion(H264Context * const h, int n, int part_width, int list, int ref, int * const mx, int * const my){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
836 const int index8= scan8[n];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
837 const int top_ref= h->ref_cache[list][ index8 - 8 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
838 const int left_ref= h->ref_cache[list][ index8 - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
839 const int16_t * const A= h->mv_cache[list][ index8 - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
840 const int16_t * const B= h->mv_cache[list][ index8 - 8 ];
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
841 const int16_t * C;
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
842 int diagonal_ref, match_count;
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
843
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
844 assert(part_width==1 || part_width==2 || part_width==4);
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
845
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
846 /* mv_cache
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
847 B . . A T T T T
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
848 U . . L . . , .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
849 U . . L . . . .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
850 U . . L . . , .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
851 . . . L . . . .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
852 */
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
853
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
854 diagonal_ref= fetch_diagonal_mv(h, &C, index8, list, part_width);
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
855 match_count= (diagonal_ref==ref) + (top_ref==ref) + (left_ref==ref);
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
856 tprintf(h->s.avctx, "pred_motion match_count=%d\n", match_count);
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
857 if(match_count > 1){ //most common
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
858 *mx= mid_pred(A[0], B[0], C[0]);
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
859 *my= mid_pred(A[1], B[1], C[1]);
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
860 }else if(match_count==1){
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
861 if(left_ref==ref){
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
862 *mx= A[0];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
863 *my= A[1];
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
864 }else if(top_ref==ref){
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
865 *mx= B[0];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
866 *my= B[1];
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
867 }else{
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
868 *mx= C[0];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
869 *my= C[1];
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
870 }
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
871 }else{
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
872 if(top_ref == PART_NOT_AVAILABLE && diagonal_ref == PART_NOT_AVAILABLE && left_ref != PART_NOT_AVAILABLE){
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
873 *mx= A[0];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
874 *my= A[1];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
875 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
876 *mx= mid_pred(A[0], B[0], C[0]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
877 *my= mid_pred(A[1], B[1], C[1]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
878 }
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
879 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
880
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
881 tprintf(h->s.avctx, "pred_motion (%2d %2d %2d) (%2d %2d %2d) (%2d %2d %2d) -> (%2d %2d %2d) at %2d %2d %d list %d\n", top_ref, B[0], B[1], diagonal_ref, C[0], C[1], left_ref, A[0], A[1], ref, *mx, *my, h->s.mb_x, h->s.mb_y, n, list);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
882 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
883
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
884 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
885 * gets the directionally predicted 16x8 MV.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
886 * @param n the block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
887 * @param mx the x component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
888 * @param my the y component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
889 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
890 static inline void pred_16x8_motion(H264Context * const h, int n, int list, int ref, int * const mx, int * const my){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
891 if(n==0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
892 const int top_ref= h->ref_cache[list][ scan8[0] - 8 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
893 const int16_t * const B= h->mv_cache[list][ scan8[0] - 8 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
894
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
895 tprintf(h->s.avctx, "pred_16x8: (%2d %2d %2d) at %2d %2d %d list %d\n", top_ref, B[0], B[1], h->s.mb_x, h->s.mb_y, n, list);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
896
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
897 if(top_ref == ref){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
898 *mx= B[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
899 *my= B[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
900 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
901 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
902 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
903 const int left_ref= h->ref_cache[list][ scan8[8] - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
904 const int16_t * const A= h->mv_cache[list][ scan8[8] - 1 ];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
905
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
906 tprintf(h->s.avctx, "pred_16x8: (%2d %2d %2d) at %2d %2d %d list %d\n", left_ref, A[0], A[1], h->s.mb_x, h->s.mb_y, n, list);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
907
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
908 if(left_ref == ref){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
909 *mx= A[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
910 *my= A[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
911 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
912 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
913 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
914
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
915 //RARE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
916 pred_motion(h, n, 4, list, ref, mx, my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
917 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
918
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
919 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
920 * gets the directionally predicted 8x16 MV.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
921 * @param n the block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
922 * @param mx the x component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
923 * @param my the y component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
924 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
925 static inline void pred_8x16_motion(H264Context * const h, int n, int list, int ref, int * const mx, int * const my){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
926 if(n==0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
927 const int left_ref= h->ref_cache[list][ scan8[0] - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
928 const int16_t * const A= h->mv_cache[list][ scan8[0] - 1 ];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
929
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
930 tprintf(h->s.avctx, "pred_8x16: (%2d %2d %2d) at %2d %2d %d list %d\n", left_ref, A[0], A[1], h->s.mb_x, h->s.mb_y, n, list);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
931
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
932 if(left_ref == ref){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
933 *mx= A[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
934 *my= A[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
935 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
936 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
937 }else{
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
938 const int16_t * C;
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
939 int diagonal_ref;
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
940
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
941 diagonal_ref= fetch_diagonal_mv(h, &C, scan8[4], list, 2);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
942
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
943 tprintf(h->s.avctx, "pred_8x16: (%2d %2d %2d) at %2d %2d %d list %d\n", diagonal_ref, C[0], C[1], h->s.mb_x, h->s.mb_y, n, list);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
944
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
945 if(diagonal_ref == ref){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
946 *mx= C[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
947 *my= C[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
948 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
949 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
950 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
951
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
952 //RARE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
953 pred_motion(h, n, 2, list, ref, mx, my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
954 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
955
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
956 static inline void pred_pskip_motion(H264Context * const h, int * const mx, int * const my){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
957 const int top_ref = h->ref_cache[0][ scan8[0] - 8 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
958 const int left_ref= h->ref_cache[0][ scan8[0] - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
959
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
960 tprintf(h->s.avctx, "pred_pskip: (%d) (%d) at %2d %2d\n", top_ref, left_ref, h->s.mb_x, h->s.mb_y);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
961
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
962 if(top_ref == PART_NOT_AVAILABLE || left_ref == PART_NOT_AVAILABLE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
963 || (top_ref == 0 && *(uint32_t*)h->mv_cache[0][ scan8[0] - 8 ] == 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
964 || (left_ref == 0 && *(uint32_t*)h->mv_cache[0][ scan8[0] - 1 ] == 0)){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
965
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
966 *mx = *my = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
967 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
968 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
969
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
970 pred_motion(h, 0, 4, 0, 0, mx, my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
971
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
972 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
973 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
974
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
975 static inline void direct_dist_scale_factor(H264Context * const h){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
976 const int poc = h->s.current_picture_ptr->poc;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
977 const int poc1 = h->ref_list[1][0].poc;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
978 int i;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
979 for(i=0; i<h->ref_count[0]; i++){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
980 int poc0 = h->ref_list[0][i].poc;
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
981 int td = av_clip(poc1 - poc0, -128, 127);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
982 if(td == 0 /* FIXME || pic0 is a long-term ref */){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
983 h->dist_scale_factor[i] = 256;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
984 }else{
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
985 int tb = av_clip(poc - poc0, -128, 127);
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
986 int tx = (16384 + (FFABS(td) >> 1)) / td;
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
987 h->dist_scale_factor[i] = av_clip((tb*tx + 32) >> 6, -1024, 1023);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
988 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
989 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
990 if(FRAME_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
991 for(i=0; i<h->ref_count[0]; i++){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
992 h->dist_scale_factor_field[2*i] =
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
993 h->dist_scale_factor_field[2*i+1] = h->dist_scale_factor[i];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
994 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
995 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
996 }
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
997 static inline void direct_ref_list_init(H264Context * const h){
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
998 MpegEncContext * const s = &h->s;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
999 Picture * const ref1 = &h->ref_list[1][0];
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1000 Picture * const cur = s->current_picture_ptr;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1001 int list, i, j;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1002 if(cur->pict_type == I_TYPE)
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1003 cur->ref_count[0] = 0;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1004 if(cur->pict_type != B_TYPE)
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1005 cur->ref_count[1] = 0;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1006 for(list=0; list<2; list++){
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1007 cur->ref_count[list] = h->ref_count[list];
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1008 for(j=0; j<h->ref_count[list]; j++)
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1009 cur->ref_poc[list][j] = h->ref_list[list][j].poc;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1010 }
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1011 if(cur->pict_type != B_TYPE || h->direct_spatial_mv_pred)
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1012 return;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1013 for(list=0; list<2; list++){
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1014 for(i=0; i<ref1->ref_count[list]; i++){
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1015 const int poc = ref1->ref_poc[list][i];
3125
16f9d33c027d fix some crashes when missing frames
lorenm
parents: 3105
diff changeset
1016 h->map_col_to_list0[list][i] = 0; /* bogus; fills in for missing frames */
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1017 for(j=0; j<h->ref_count[list]; j++)
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1018 if(h->ref_list[list][j].poc == poc){
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1019 h->map_col_to_list0[list][i] = j;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1020 break;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1021 }
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1022 }
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1023 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1024 if(FRAME_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1025 for(list=0; list<2; list++){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1026 for(i=0; i<ref1->ref_count[list]; i++){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1027 j = h->map_col_to_list0[list][i];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1028 h->map_col_to_list0_field[list][2*i] = 2*j;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1029 h->map_col_to_list0_field[list][2*i+1] = 2*j+1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1030 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1031 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1032 }
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1033 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1034
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1035 static inline void pred_direct_motion(H264Context * const h, int *mb_type){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1036 MpegEncContext * const s = &h->s;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1037 const int mb_xy = s->mb_x + s->mb_y*s->mb_stride;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1038 const int b8_xy = 2*s->mb_x + 2*s->mb_y*h->b8_stride;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1039 const int b4_xy = 4*s->mb_x + 4*s->mb_y*h->b_stride;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1040 const int mb_type_col = h->ref_list[1][0].mb_type[mb_xy];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1041 const int16_t (*l1mv0)[2] = (const int16_t (*)[2]) &h->ref_list[1][0].motion_val[0][b4_xy];
2808
932ec96933f5 fixing colocated mv if colocated block is L1 predicted
michael
parents: 2803
diff changeset
1042 const int16_t (*l1mv1)[2] = (const int16_t (*)[2]) &h->ref_list[1][0].motion_val[1][b4_xy];
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1043 const int8_t *l1ref0 = &h->ref_list[1][0].ref_index[0][b8_xy];
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1044 const int8_t *l1ref1 = &h->ref_list[1][0].ref_index[1][b8_xy];
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1045 const int is_b8x8 = IS_8X8(*mb_type);
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
1046 unsigned int sub_mb_type;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1047 int i8, i4;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1048
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1049 #define MB_TYPE_16x16_OR_INTRA (MB_TYPE_16x16|MB_TYPE_INTRA4x4|MB_TYPE_INTRA16x16|MB_TYPE_INTRA_PCM)
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1050 if(IS_8X8(mb_type_col) && !h->sps.direct_8x8_inference_flag){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1051 /* FIXME save sub mb types from previous frames (or derive from MVs)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1052 * so we know exactly what block size to use */
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1053 sub_mb_type = MB_TYPE_8x8|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_4x4 */
2536
943b0615fc93 oops, other half of the vismv patch
lorenm
parents: 2535
diff changeset
1054 *mb_type = MB_TYPE_8x8|MB_TYPE_L0L1;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1055 }else if(!is_b8x8 && (mb_type_col & MB_TYPE_16x16_OR_INTRA)){
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1056 sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1057 *mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_16x16 */
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1058 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1059 sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */
2536
943b0615fc93 oops, other half of the vismv patch
lorenm
parents: 2535
diff changeset
1060 *mb_type = MB_TYPE_8x8|MB_TYPE_L0L1;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1061 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1062 if(!is_b8x8)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1063 *mb_type |= MB_TYPE_DIRECT2;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1064 if(MB_FIELD)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1065 *mb_type |= MB_TYPE_INTERLACED;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1066
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
1067 tprintf(s->avctx, "mb_type = %08x, sub_mb_type = %08x, is_b8x8 = %d, mb_type_col = %08x\n", *mb_type, sub_mb_type, is_b8x8, mb_type_col);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1068
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1069 if(h->direct_spatial_mv_pred){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1070 int ref[2];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1071 int mv[2][2];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1072 int list;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1073
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1074 /* FIXME interlacing + spatial direct uses wrong colocated block positions */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1075
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1076 /* ref = min(neighbors) */
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1077 for(list=0; list<2; list++){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1078 int refa = h->ref_cache[list][scan8[0] - 1];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1079 int refb = h->ref_cache[list][scan8[0] - 8];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1080 int refc = h->ref_cache[list][scan8[0] - 8 + 4];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1081 if(refc == -2)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1082 refc = h->ref_cache[list][scan8[0] - 8 - 1];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1083 ref[list] = refa;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1084 if(ref[list] < 0 || (refb < ref[list] && refb >= 0))
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1085 ref[list] = refb;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1086 if(ref[list] < 0 || (refc < ref[list] && refc >= 0))
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1087 ref[list] = refc;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1088 if(ref[list] < 0)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1089 ref[list] = -1;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1090 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1091
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1092 if(ref[0] < 0 && ref[1] < 0){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1093 ref[0] = ref[1] = 0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1094 mv[0][0] = mv[0][1] =
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1095 mv[1][0] = mv[1][1] = 0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1096 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1097 for(list=0; list<2; list++){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1098 if(ref[list] >= 0)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1099 pred_motion(h, 0, 4, list, ref[list], &mv[list][0], &mv[list][1]);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1100 else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1101 mv[list][0] = mv[list][1] = 0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1102 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1103 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1104
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1105 if(ref[1] < 0){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1106 *mb_type &= ~MB_TYPE_P0L1;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1107 sub_mb_type &= ~MB_TYPE_P0L1;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1108 }else if(ref[0] < 0){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1109 *mb_type &= ~MB_TYPE_P0L0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1110 sub_mb_type &= ~MB_TYPE_P0L0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1111 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1112
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1113 if(IS_16X16(*mb_type)){
4540
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
1114 int a=0, b=0;
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
1115
3001
b52d8ee430f6 fix some potential arithmetic overflows in pred_direct_motion() and
lorenm
parents: 2979
diff changeset
1116 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, (uint8_t)ref[0], 1);
b52d8ee430f6 fix some potential arithmetic overflows in pred_direct_motion() and
lorenm
parents: 2979
diff changeset
1117 fill_rectangle(&h->ref_cache[1][scan8[0]], 4, 4, 8, (uint8_t)ref[1], 1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1118 if(!IS_INTRA(mb_type_col)
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
1119 && ( (l1ref0[0] == 0 && FFABS(l1mv0[0][0]) <= 1 && FFABS(l1mv0[0][1]) <= 1)
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
1120 || (l1ref0[0] < 0 && l1ref1[0] == 0 && FFABS(l1mv1[0][0]) <= 1 && FFABS(l1mv1[0][1]) <= 1
2834
fd5d7c732c6b kill a bunch of compiler warnings
mru
parents: 2815
diff changeset
1121 && (h->x264_build>33 || !h->x264_build)))){
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1122 if(ref[0] > 0)
4540
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
1123 a= pack16to32(mv[0][0],mv[0][1]);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1124 if(ref[1] > 0)
4540
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
1125 b= pack16to32(mv[1][0],mv[1][1]);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1126 }else{
4540
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
1127 a= pack16to32(mv[0][0],mv[0][1]);
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
1128 b= pack16to32(mv[1][0],mv[1][1]);
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
1129 }
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
1130 fill_rectangle(&h->mv_cache[0][scan8[0]], 4, 4, 8, a, 4);
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
1131 fill_rectangle(&h->mv_cache[1][scan8[0]], 4, 4, 8, b, 4);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1132 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1133 for(i8=0; i8<4; i8++){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1134 const int x8 = i8&1;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1135 const int y8 = i8>>1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1136
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1137 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8]))
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1138 continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1139 h->sub_mb_type[i8] = sub_mb_type;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1140
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1141 fill_rectangle(&h->mv_cache[0][scan8[i8*4]], 2, 2, 8, pack16to32(mv[0][0],mv[0][1]), 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1142 fill_rectangle(&h->mv_cache[1][scan8[i8*4]], 2, 2, 8, pack16to32(mv[1][0],mv[1][1]), 4);
3001
b52d8ee430f6 fix some potential arithmetic overflows in pred_direct_motion() and
lorenm
parents: 2979
diff changeset
1143 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, (uint8_t)ref[0], 1);
b52d8ee430f6 fix some potential arithmetic overflows in pred_direct_motion() and
lorenm
parents: 2979
diff changeset
1144 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, (uint8_t)ref[1], 1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1145
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1146 /* col_zero_flag */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1147 if(!IS_INTRA(mb_type_col) && ( l1ref0[x8 + y8*h->b8_stride] == 0
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1148 || (l1ref0[x8 + y8*h->b8_stride] < 0 && l1ref1[x8 + y8*h->b8_stride] == 0
2834
fd5d7c732c6b kill a bunch of compiler warnings
mru
parents: 2815
diff changeset
1149 && (h->x264_build>33 || !h->x264_build)))){
2808
932ec96933f5 fixing colocated mv if colocated block is L1 predicted
michael
parents: 2803
diff changeset
1150 const int16_t (*l1mv)[2]= l1ref0[x8 + y8*h->b8_stride] == 0 ? l1mv0 : l1mv1;
3002
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1151 if(IS_SUB_8X8(sub_mb_type)){
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1152 const int16_t *mv_col = l1mv[x8*3 + y8*3*h->b_stride];
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
1153 if(FFABS(mv_col[0]) <= 1 && FFABS(mv_col[1]) <= 1){
3002
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1154 if(ref[0] == 0)
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1155 fill_rectangle(&h->mv_cache[0][scan8[i8*4]], 2, 2, 8, 0, 4);
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1156 if(ref[1] == 0)
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1157 fill_rectangle(&h->mv_cache[1][scan8[i8*4]], 2, 2, 8, 0, 4);
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1158 }
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1159 }else
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1160 for(i4=0; i4<4; i4++){
2808
932ec96933f5 fixing colocated mv if colocated block is L1 predicted
michael
parents: 2803
diff changeset
1161 const int16_t *mv_col = l1mv[x8*2 + (i4&1) + (y8*2 + (i4>>1))*h->b_stride];
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
1162 if(FFABS(mv_col[0]) <= 1 && FFABS(mv_col[1]) <= 1){
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1163 if(ref[0] == 0)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1164 *(uint32_t*)h->mv_cache[0][scan8[i8*4+i4]] = 0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1165 if(ref[1] == 0)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1166 *(uint32_t*)h->mv_cache[1][scan8[i8*4+i4]] = 0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1167 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1168 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1169 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1170 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1171 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1172 }else{ /* direct temporal mv pred */
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1173 const int *map_col_to_list0[2] = {h->map_col_to_list0[0], h->map_col_to_list0[1]};
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1174 const int *dist_scale_factor = h->dist_scale_factor;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1175
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1176 if(FRAME_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1177 if(IS_INTERLACED(*mb_type)){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1178 map_col_to_list0[0] = h->map_col_to_list0_field[0];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1179 map_col_to_list0[1] = h->map_col_to_list0_field[1];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1180 dist_scale_factor = h->dist_scale_factor_field;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1181 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1182 if(IS_INTERLACED(*mb_type) != IS_INTERLACED(mb_type_col)){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1183 /* FIXME assumes direct_8x8_inference == 1 */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1184 const int pair_xy = s->mb_x + (s->mb_y&~1)*s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1185 int mb_types_col[2];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1186 int y_shift;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1187
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1188 *mb_type = MB_TYPE_8x8|MB_TYPE_L0L1
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1189 | (is_b8x8 ? 0 : MB_TYPE_DIRECT2)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1190 | (*mb_type & MB_TYPE_INTERLACED);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1191 sub_mb_type = MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2|MB_TYPE_16x16;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1192
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1193 if(IS_INTERLACED(*mb_type)){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1194 /* frame to field scaling */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1195 mb_types_col[0] = h->ref_list[1][0].mb_type[pair_xy];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1196 mb_types_col[1] = h->ref_list[1][0].mb_type[pair_xy+s->mb_stride];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1197 if(s->mb_y&1){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1198 l1ref0 -= 2*h->b8_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1199 l1ref1 -= 2*h->b8_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1200 l1mv0 -= 4*h->b_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1201 l1mv1 -= 4*h->b_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1202 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1203 y_shift = 0;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1204
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1205 if( (mb_types_col[0] & MB_TYPE_16x16_OR_INTRA)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1206 && (mb_types_col[1] & MB_TYPE_16x16_OR_INTRA)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1207 && !is_b8x8)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1208 *mb_type |= MB_TYPE_16x8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1209 else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1210 *mb_type |= MB_TYPE_8x8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1211 }else{
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1212 /* field to frame scaling */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1213 /* col_mb_y = (mb_y&~1) + (topAbsDiffPOC < bottomAbsDiffPOC ? 0 : 1)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1214 * but in MBAFF, top and bottom POC are equal */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1215 int dy = (s->mb_y&1) ? 1 : 2;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1216 mb_types_col[0] =
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1217 mb_types_col[1] = h->ref_list[1][0].mb_type[pair_xy+s->mb_stride];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1218 l1ref0 += dy*h->b8_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1219 l1ref1 += dy*h->b8_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1220 l1mv0 += 2*dy*h->b_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1221 l1mv1 += 2*dy*h->b_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1222 y_shift = 2;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1223
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1224 if((mb_types_col[0] & (MB_TYPE_16x16_OR_INTRA|MB_TYPE_16x8))
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1225 && !is_b8x8)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1226 *mb_type |= MB_TYPE_16x16;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1227 else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1228 *mb_type |= MB_TYPE_8x8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1229 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1230
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1231 for(i8=0; i8<4; i8++){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1232 const int x8 = i8&1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1233 const int y8 = i8>>1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1234 int ref0, scale;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1235 const int16_t (*l1mv)[2]= l1mv0;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1236
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1237 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8]))
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1238 continue;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1239 h->sub_mb_type[i8] = sub_mb_type;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1240
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1241 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, 0, 1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1242 if(IS_INTRA(mb_types_col[y8])){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1243 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, 0, 1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1244 fill_rectangle(&h-> mv_cache[0][scan8[i8*4]], 2, 2, 8, 0, 4);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1245 fill_rectangle(&h-> mv_cache[1][scan8[i8*4]], 2, 2, 8, 0, 4);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1246 continue;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1247 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1248
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1249 ref0 = l1ref0[x8 + (y8*2>>y_shift)*h->b8_stride];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1250 if(ref0 >= 0)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1251 ref0 = map_col_to_list0[0][ref0*2>>y_shift];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1252 else{
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1253 ref0 = map_col_to_list0[1][l1ref1[x8 + (y8*2>>y_shift)*h->b8_stride]*2>>y_shift];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1254 l1mv= l1mv1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1255 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1256 scale = dist_scale_factor[ref0];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1257 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, ref0, 1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1258
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1259 {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1260 const int16_t *mv_col = l1mv[x8*3 + (y8*6>>y_shift)*h->b_stride];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1261 int my_col = (mv_col[1]<<y_shift)/2;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1262 int mx = (scale * mv_col[0] + 128) >> 8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1263 int my = (scale * my_col + 128) >> 8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1264 fill_rectangle(&h->mv_cache[0][scan8[i8*4]], 2, 2, 8, pack16to32(mx,my), 4);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1265 fill_rectangle(&h->mv_cache[1][scan8[i8*4]], 2, 2, 8, pack16to32(mx-mv_col[0],my-my_col), 4);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1266 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1267 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1268 return;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1269 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1270 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1271
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1272 /* one-to-one mv scaling */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1273
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1274 if(IS_16X16(*mb_type)){
4541
1c8bc533da57 factorize more calls to fill_rectangle()
michael
parents: 4540
diff changeset
1275 int ref, mv0, mv1;
1c8bc533da57 factorize more calls to fill_rectangle()
michael
parents: 4540
diff changeset
1276
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1277 fill_rectangle(&h->ref_cache[1][scan8[0]], 4, 4, 8, 0, 1);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1278 if(IS_INTRA(mb_type_col)){
4541
1c8bc533da57 factorize more calls to fill_rectangle()
michael
parents: 4540
diff changeset
1279 ref=mv0=mv1=0;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1280 }else{
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1281 const int ref0 = l1ref0[0] >= 0 ? map_col_to_list0[0][l1ref0[0]]
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1282 : map_col_to_list0[1][l1ref1[0]];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1283 const int scale = dist_scale_factor[ref0];
2809
75400dfbe117 fixing colocated mv if colocated block is L1 predicted for the temporal direct case
michael
parents: 2808
diff changeset
1284 const int16_t *mv_col = l1ref0[0] >= 0 ? l1mv0[0] : l1mv1[0];
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1285 int mv_l0[2];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1286 mv_l0[0] = (scale * mv_col[0] + 128) >> 8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1287 mv_l0[1] = (scale * mv_col[1] + 128) >> 8;
4541
1c8bc533da57 factorize more calls to fill_rectangle()
michael
parents: 4540
diff changeset
1288 ref= ref0;
1c8bc533da57 factorize more calls to fill_rectangle()
michael
parents: 4540
diff changeset
1289 mv0= pack16to32(mv_l0[0],mv_l0[1]);
1c8bc533da57 factorize more calls to fill_rectangle()
michael
parents: 4540
diff changeset
1290 mv1= pack16to32(mv_l0[0]-mv_col[0],mv_l0[1]-mv_col[1]);
1c8bc533da57 factorize more calls to fill_rectangle()
michael
parents: 4540
diff changeset
1291 }
1c8bc533da57 factorize more calls to fill_rectangle()
michael
parents: 4540
diff changeset
1292 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, ref, 1);
1c8bc533da57 factorize more calls to fill_rectangle()
michael
parents: 4540
diff changeset
1293 fill_rectangle(&h-> mv_cache[0][scan8[0]], 4, 4, 8, mv0, 4);
1c8bc533da57 factorize more calls to fill_rectangle()
michael
parents: 4540
diff changeset
1294 fill_rectangle(&h-> mv_cache[1][scan8[0]], 4, 4, 8, mv1, 4);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1295 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1296 for(i8=0; i8<4; i8++){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1297 const int x8 = i8&1;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1298 const int y8 = i8>>1;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1299 int ref0, scale;
2834
fd5d7c732c6b kill a bunch of compiler warnings
mru
parents: 2815
diff changeset
1300 const int16_t (*l1mv)[2]= l1mv0;
2809
75400dfbe117 fixing colocated mv if colocated block is L1 predicted for the temporal direct case
michael
parents: 2808
diff changeset
1301
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1302 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8]))
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1303 continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1304 h->sub_mb_type[i8] = sub_mb_type;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1305 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, 0, 1);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1306 if(IS_INTRA(mb_type_col)){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1307 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, 0, 1);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1308 fill_rectangle(&h-> mv_cache[0][scan8[i8*4]], 2, 2, 8, 0, 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1309 fill_rectangle(&h-> mv_cache[1][scan8[i8*4]], 2, 2, 8, 0, 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1310 continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1311 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1312
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1313 ref0 = l1ref0[x8 + y8*h->b8_stride];
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1314 if(ref0 >= 0)
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1315 ref0 = map_col_to_list0[0][ref0];
2809
75400dfbe117 fixing colocated mv if colocated block is L1 predicted for the temporal direct case
michael
parents: 2808
diff changeset
1316 else{
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1317 ref0 = map_col_to_list0[1][l1ref1[x8 + y8*h->b8_stride]];
2809
75400dfbe117 fixing colocated mv if colocated block is L1 predicted for the temporal direct case
michael
parents: 2808
diff changeset
1318 l1mv= l1mv1;
75400dfbe117 fixing colocated mv if colocated block is L1 predicted for the temporal direct case
michael
parents: 2808
diff changeset
1319 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1320 scale = dist_scale_factor[ref0];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1321
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1322 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, ref0, 1);
3002
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1323 if(IS_SUB_8X8(sub_mb_type)){
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1324 const int16_t *mv_col = l1mv[x8*3 + y8*3*h->b_stride];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1325 int mx = (scale * mv_col[0] + 128) >> 8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1326 int my = (scale * mv_col[1] + 128) >> 8;
3002
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1327 fill_rectangle(&h->mv_cache[0][scan8[i8*4]], 2, 2, 8, pack16to32(mx,my), 4);
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1328 fill_rectangle(&h->mv_cache[1][scan8[i8*4]], 2, 2, 8, pack16to32(mx-mv_col[0],my-mv_col[1]), 4);
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1329 }else
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1330 for(i4=0; i4<4; i4++){
2809
75400dfbe117 fixing colocated mv if colocated block is L1 predicted for the temporal direct case
michael
parents: 2808
diff changeset
1331 const int16_t *mv_col = l1mv[x8*2 + (i4&1) + (y8*2 + (i4>>1))*h->b_stride];
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1332 int16_t *mv_l0 = h->mv_cache[0][scan8[i8*4+i4]];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1333 mv_l0[0] = (scale * mv_col[0] + 128) >> 8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1334 mv_l0[1] = (scale * mv_col[1] + 128) >> 8;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1335 *(uint32_t*)h->mv_cache[1][scan8[i8*4+i4]] =
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1336 pack16to32(mv_l0[0]-mv_col[0],mv_l0[1]-mv_col[1]);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1337 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1338 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1339 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1340 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1341 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1342
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1343 static inline void write_back_motion(H264Context *h, int mb_type){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1344 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1345 const int b_xy = 4*s->mb_x + 4*s->mb_y*h->b_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1346 const int b8_xy= 2*s->mb_x + 2*s->mb_y*h->b8_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1347 int list;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1348
3219
cf233efbcece 10l in 1.199 (write_back_motion with B-pyramid + spatial)
lorenm
parents: 3215
diff changeset
1349 if(!USES_LIST(mb_type, 0))
cf233efbcece 10l in 1.199 (write_back_motion with B-pyramid + spatial)
lorenm
parents: 3215
diff changeset
1350 fill_rectangle(&s->current_picture.ref_index[0][b8_xy], 2, 2, h->b8_stride, (uint8_t)LIST_NOT_USED, 1);
cf233efbcece 10l in 1.199 (write_back_motion with B-pyramid + spatial)
lorenm
parents: 3215
diff changeset
1351
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
1352 for(list=0; list<h->list_count; list++){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1353 int y;
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
1354 if(!USES_LIST(mb_type, list))
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1355 continue;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1356
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1357 for(y=0; y<4; y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1358 *(uint64_t*)s->current_picture.motion_val[list][b_xy + 0 + y*h->b_stride]= *(uint64_t*)h->mv_cache[list][scan8[0]+0 + 8*y];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1359 *(uint64_t*)s->current_picture.motion_val[list][b_xy + 2 + y*h->b_stride]= *(uint64_t*)h->mv_cache[list][scan8[0]+2 + 8*y];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1360 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
1361 if( h->pps.cabac ) {
3927
f44a3341bfdf simplify write_back_motion for skip mbs
lorenm
parents: 3807
diff changeset
1362 if(IS_SKIP(mb_type))
f44a3341bfdf simplify write_back_motion for skip mbs
lorenm
parents: 3807
diff changeset
1363 fill_rectangle(h->mvd_table[list][b_xy], 4, 4, h->b_stride, 0, 4);
f44a3341bfdf simplify write_back_motion for skip mbs
lorenm
parents: 3807
diff changeset
1364 else
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
1365 for(y=0; y<4; y++){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
1366 *(uint64_t*)h->mvd_table[list][b_xy + 0 + y*h->b_stride]= *(uint64_t*)h->mvd_cache[list][scan8[0]+0 + 8*y];
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
1367 *(uint64_t*)h->mvd_table[list][b_xy + 2 + y*h->b_stride]= *(uint64_t*)h->mvd_cache[list][scan8[0]+2 + 8*y];
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
1368 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
1369 }
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
1370
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
1371 {
3776
1843a85123b7 fix some signedness warnings
mru
parents: 3651
diff changeset
1372 int8_t *ref_index = &s->current_picture.ref_index[list][b8_xy];
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
1373 ref_index[0+0*h->b8_stride]= h->ref_cache[list][scan8[0]];
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
1374 ref_index[1+0*h->b8_stride]= h->ref_cache[list][scan8[4]];
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
1375 ref_index[0+1*h->b8_stride]= h->ref_cache[list][scan8[8]];
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
1376 ref_index[1+1*h->b8_stride]= h->ref_cache[list][scan8[12]];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1377 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1378 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1379
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1380 if(h->slice_type == B_TYPE && h->pps.cabac){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1381 if(IS_8X8(mb_type)){
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
1382 uint8_t *direct_table = &h->direct_table[b8_xy];
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
1383 direct_table[1+0*h->b8_stride] = IS_DIRECT(h->sub_mb_type[1]) ? 1 : 0;
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
1384 direct_table[0+1*h->b8_stride] = IS_DIRECT(h->sub_mb_type[2]) ? 1 : 0;
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
1385 direct_table[1+1*h->b8_stride] = IS_DIRECT(h->sub_mb_type[3]) ? 1 : 0;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1386 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1387 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1388 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1389
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1390 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1391 * Decodes a network abstraction layer unit.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1392 * @param consumed is the number of bytes used as input
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1393 * @param length is the length of the array
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
1394 * @param dst_length is the number of decoded bytes FIXME here or a decode rbsp tailing?
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1395 * @returns decoded bytes, might be src+1 if no escapes
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1396 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1397 static uint8_t *decode_nal(H264Context *h, uint8_t *src, int *dst_length, int *consumed, int length){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1398 int i, si, di;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1399 uint8_t *dst;
5174
2e038003cdfb Do not reuse the rbsp de-escape buffer if both
benoit
parents: 5172
diff changeset
1400 int bufidx;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1401
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2971
diff changeset
1402 // src[0]&0x80; //forbidden bit
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1403 h->nal_ref_idc= src[0]>>5;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1404 h->nal_unit_type= src[0]&0x1F;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1405
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1406 src++; length--;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1407 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1408 for(i=0; i<length; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1409 printf("%2X ", src[i]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1410 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1411 for(i=0; i+1<length; i+=2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1412 if(src[i]) continue;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1413 if(i>0 && src[i-1]==0) i--;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1414 if(i+2<length && src[i+1]==0 && src[i+2]<=3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1415 if(src[i+2]!=3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1416 /* startcode, so we must be past the end */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1417 length=i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1418 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1419 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1420 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1421 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1422
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1423 if(i>=length-1){ //no escaped 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1424 *dst_length= length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1425 *consumed= length+1; //+1 for the header
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1426 return src;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1427 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1428
5174
2e038003cdfb Do not reuse the rbsp de-escape buffer if both
benoit
parents: 5172
diff changeset
1429 bufidx = h->nal_unit_type == NAL_DPC ? 1 : 0; // use second escape buffer for inter data
2e038003cdfb Do not reuse the rbsp de-escape buffer if both
benoit
parents: 5172
diff changeset
1430 h->rbsp_buffer[bufidx]= av_fast_realloc(h->rbsp_buffer[bufidx], &h->rbsp_buffer_size[bufidx], length);
2e038003cdfb Do not reuse the rbsp de-escape buffer if both
benoit
parents: 5172
diff changeset
1431 dst= h->rbsp_buffer[bufidx];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1432
4362
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
1433 if (dst == NULL){
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
1434 return NULL;
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
1435 }
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
1436
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
1437 //printf("decoding esc\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1438 si=di=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1439 while(si<length){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1440 //remove escapes (very rare 1:2^22)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1441 if(si+2<length && src[si]==0 && src[si+1]==0 && src[si+2]<=3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1442 if(src[si+2]==3){ //escape
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1443 dst[di++]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1444 dst[di++]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1445 si+=3;
1957
54411768fa38 h264 nal decoding fix by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1956
diff changeset
1446 continue;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1447 }else //next start code
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1448 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1449 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1450
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1451 dst[di++]= src[si++];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1452 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1453
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1454 *dst_length= di;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1455 *consumed= si + 1;//+1 for the header
5129
0244bba24b43 misc typo fixes
diego
parents: 5127
diff changeset
1456 //FIXME store exact number of bits in the getbitcontext (it is needed for decoding)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1457 return dst;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1458 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1459
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1460 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1461 * identifies the exact end of the bitstream
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1462 * @return the length of the trailing, or 0 if damaged
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1463 */
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
1464 static int decode_rbsp_trailing(H264Context *h, uint8_t *src){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1465 int v= *src;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1466 int r;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1467
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
1468 tprintf(h->s.avctx, "rbsp trailing %X\n", v);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1469
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1470 for(r=1; r<9; r++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1471 if(v&1) return r;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1472 v>>=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1473 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1474 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1475 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1476
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1477 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1478 * idct tranforms the 16 dc values and dequantize them.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1479 * @param qp quantization parameter
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1480 */
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1481 static void h264_luma_dc_dequant_idct_c(DCTELEM *block, int qp, int qmul){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1482 #define stride 16
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1483 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1484 int temp[16]; //FIXME check if this is a good idea
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1485 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1486 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1487
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1488 //memset(block, 64, 2*256);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1489 //return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1490 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1491 const int offset= y_offset[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1492 const int z0= block[offset+stride*0] + block[offset+stride*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1493 const int z1= block[offset+stride*0] - block[offset+stride*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1494 const int z2= block[offset+stride*1] - block[offset+stride*5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1495 const int z3= block[offset+stride*1] + block[offset+stride*5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1496
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1497 temp[4*i+0]= z0+z3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1498 temp[4*i+1]= z1+z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1499 temp[4*i+2]= z1-z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1500 temp[4*i+3]= z0-z3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1501 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1502
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1503 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1504 const int offset= x_offset[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1505 const int z0= temp[4*0+i] + temp[4*2+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1506 const int z1= temp[4*0+i] - temp[4*2+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1507 const int z2= temp[4*1+i] - temp[4*3+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1508 const int z3= temp[4*1+i] + temp[4*3+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1509
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1510 block[stride*0 +offset]= ((((z0 + z3)*qmul + 128 ) >> 8)); //FIXME think about merging this into decode_resdual
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1511 block[stride*2 +offset]= ((((z1 + z2)*qmul + 128 ) >> 8));
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1512 block[stride*8 +offset]= ((((z1 - z2)*qmul + 128 ) >> 8));
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1513 block[stride*10+offset]= ((((z0 - z3)*qmul + 128 ) >> 8));
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1514 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1515 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1516
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1517 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1518 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1519 * dct tranforms the 16 dc values.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1520 * @param qp quantization parameter ??? FIXME
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1521 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1522 static void h264_luma_dc_dct_c(DCTELEM *block/*, int qp*/){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1523 // const int qmul= dequant_coeff[qp][0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1524 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1525 int temp[16]; //FIXME check if this is a good idea
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1526 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1527 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1528
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1529 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1530 const int offset= y_offset[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1531 const int z0= block[offset+stride*0] + block[offset+stride*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1532 const int z1= block[offset+stride*0] - block[offset+stride*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1533 const int z2= block[offset+stride*1] - block[offset+stride*5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1534 const int z3= block[offset+stride*1] + block[offset+stride*5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1535
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1536 temp[4*i+0]= z0+z3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1537 temp[4*i+1]= z1+z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1538 temp[4*i+2]= z1-z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1539 temp[4*i+3]= z0-z3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1540 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1541
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1542 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1543 const int offset= x_offset[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1544 const int z0= temp[4*0+i] + temp[4*2+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1545 const int z1= temp[4*0+i] - temp[4*2+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1546 const int z2= temp[4*1+i] - temp[4*3+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1547 const int z3= temp[4*1+i] + temp[4*3+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1548
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1549 block[stride*0 +offset]= (z0 + z3)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1550 block[stride*2 +offset]= (z1 + z2)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1551 block[stride*8 +offset]= (z1 - z2)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1552 block[stride*10+offset]= (z0 - z3)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1553 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1554 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1555 #endif
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1556
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1557 #undef xStride
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1558 #undef stride
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1559
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1560 static void chroma_dc_dequant_idct_c(DCTELEM *block, int qp, int qmul){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1561 const int stride= 16*2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1562 const int xStride= 16;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1563 int a,b,c,d,e;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1564
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1565 a= block[stride*0 + xStride*0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1566 b= block[stride*0 + xStride*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1567 c= block[stride*1 + xStride*0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1568 d= block[stride*1 + xStride*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1569
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1570 e= a-b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1571 a= a+b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1572 b= c-d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1573 c= c+d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1574
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1575 block[stride*0 + xStride*0]= ((a+c)*qmul) >> 7;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1576 block[stride*0 + xStride*1]= ((e+b)*qmul) >> 7;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1577 block[stride*1 + xStride*0]= ((a-c)*qmul) >> 7;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1578 block[stride*1 + xStride*1]= ((e-b)*qmul) >> 7;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1579 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1580
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1581 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1582 static void chroma_dc_dct_c(DCTELEM *block){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1583 const int stride= 16*2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1584 const int xStride= 16;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1585 int a,b,c,d,e;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1586
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1587 a= block[stride*0 + xStride*0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1588 b= block[stride*0 + xStride*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1589 c= block[stride*1 + xStride*0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1590 d= block[stride*1 + xStride*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1591
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1592 e= a-b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1593 a= a+b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1594 b= c-d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1595 c= c+d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1596
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1597 block[stride*0 + xStride*0]= (a+c);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1598 block[stride*0 + xStride*1]= (e+b);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1599 block[stride*1 + xStride*0]= (a-c);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1600 block[stride*1 + xStride*1]= (e-b);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1601 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1602 #endif
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1603
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1604 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1605 * gets the chroma qp.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1606 */
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
1607 static inline int get_chroma_qp(H264Context *h, int t, int qscale){
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
1608 return h->pps.chroma_qp_table[t][qscale & 0xff];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1609 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1610
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5106
diff changeset
1611 //FIXME need to check that this does not overflow signed 32 bit for low qp, i am not sure, it's very close
4553
1a714d3f0233 cosmetics: Fix a common typo, sepErate --> sepArate.
diego
parents: 4546
diff changeset
1612 //FIXME check that gcc inlines this (and optimizes intra & separate_dc stuff away)
1a714d3f0233 cosmetics: Fix a common typo, sepErate --> sepArate.
diego
parents: 4546
diff changeset
1613 static inline int quantize_c(DCTELEM *block, uint8_t *scantable, int qscale, int intra, int separate_dc){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1614 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1615 const int * const quant_table= quant_coeff[qscale];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1616 const int bias= intra ? (1<<QUANT_SHIFT)/3 : (1<<QUANT_SHIFT)/6;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1617 const unsigned int threshold1= (1<<QUANT_SHIFT) - bias - 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1618 const unsigned int threshold2= (threshold1<<1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1619 int last_non_zero;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1620
4553
1a714d3f0233 cosmetics: Fix a common typo, sepErate --> sepArate.
diego
parents: 4546
diff changeset
1621 if(separate_dc){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1622 if(qscale<=18){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1623 //avoid overflows
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1624 const int dc_bias= intra ? (1<<(QUANT_SHIFT-2))/3 : (1<<(QUANT_SHIFT-2))/6;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1625 const unsigned int dc_threshold1= (1<<(QUANT_SHIFT-2)) - dc_bias - 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1626 const unsigned int dc_threshold2= (dc_threshold1<<1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1627
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1628 int level= block[0]*quant_coeff[qscale+18][0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1629 if(((unsigned)(level+dc_threshold1))>dc_threshold2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1630 if(level>0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1631 level= (dc_bias + level)>>(QUANT_SHIFT-2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1632 block[0]= level;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1633 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1634 level= (dc_bias - level)>>(QUANT_SHIFT-2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1635 block[0]= -level;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1636 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1637 // last_non_zero = i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1638 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1639 block[0]=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1640 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1641 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1642 const int dc_bias= intra ? (1<<(QUANT_SHIFT+1))/3 : (1<<(QUANT_SHIFT+1))/6;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1643 const unsigned int dc_threshold1= (1<<(QUANT_SHIFT+1)) - dc_bias - 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1644 const unsigned int dc_threshold2= (dc_threshold1<<1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1645
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1646 int level= block[0]*quant_table[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1647 if(((unsigned)(level+dc_threshold1))>dc_threshold2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1648 if(level>0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1649 level= (dc_bias + level)>>(QUANT_SHIFT+1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1650 block[0]= level;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1651 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1652 level= (dc_bias - level)>>(QUANT_SHIFT+1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1653 block[0]= -level;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1654 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1655 // last_non_zero = i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1656 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1657 block[0]=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1658 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1659 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1660 last_non_zero= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1661 i=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1662 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1663 last_non_zero= -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1664 i=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1665 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1666
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1667 for(; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1668 const int j= scantable[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1669 int level= block[j]*quant_table[j];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1670
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1671 // if( bias+level >= (1<<(QMAT_SHIFT - 3))
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1672 // || bias-level >= (1<<(QMAT_SHIFT - 3))){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1673 if(((unsigned)(level+threshold1))>threshold2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1674 if(level>0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1675 level= (bias + level)>>QUANT_SHIFT;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1676 block[j]= level;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1677 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1678 level= (bias - level)>>QUANT_SHIFT;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1679 block[j]= -level;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1680 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1681 last_non_zero = i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1682 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1683 block[j]=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1684 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1685 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1686
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1687 return last_non_zero;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1688 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1689
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1690 static inline void mc_dir_part(H264Context *h, Picture *pic, int n, int square, int chroma_height, int delta, int list,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1691 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1692 int src_x_offset, int src_y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1693 qpel_mc_func *qpix_op, h264_chroma_mc_func chroma_op){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1694 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1695 const int mx= h->mv_cache[list][ scan8[n] ][0] + src_x_offset*8;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1696 int my= h->mv_cache[list][ scan8[n] ][1] + src_y_offset*8;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1697 const int luma_xy= (mx&3) + ((my&3)<<2);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1698 uint8_t * src_y = pic->data[0] + (mx>>2) + (my>>2)*h->mb_linesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1699 uint8_t * src_cb, * src_cr;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1700 int extra_width= h->emu_edge_width;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1701 int extra_height= h->emu_edge_height;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1702 int emu=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1703 const int full_mx= mx>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1704 const int full_my= my>>2;
2861
3b920e274b26 fix emulated edge motion compensation when resolution%16!=0
lorenm
parents: 2846
diff changeset
1705 const int pic_width = 16*s->mb_width;
5815
fb293531e983 Simplify tests for field macroblocks
andoma
parents: 5812
diff changeset
1706 const int pic_height = 16*s->mb_height >> MB_FIELD;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1707
4390
michael
parents: 4389
diff changeset
1708 if(!pic->data[0]) //FIXME this is unacceptable, some senseable error concealment must be done for missing reference frames
3125
16f9d33c027d fix some crashes when missing frames
lorenm
parents: 3105
diff changeset
1709 return;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1710
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1711 if(mx&7) extra_width -= 3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1712 if(my&7) extra_height -= 3;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1713
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1714 if( full_mx < 0-extra_width
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1715 || full_my < 0-extra_height
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1716 || full_mx + 16/*FIXME*/ > pic_width + extra_width
2861
3b920e274b26 fix emulated edge motion compensation when resolution%16!=0
lorenm
parents: 2846
diff changeset
1717 || full_my + 16/*FIXME*/ > pic_height + extra_height){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1718 ff_emulated_edge_mc(s->edge_emu_buffer, src_y - 2 - 2*h->mb_linesize, h->mb_linesize, 16+5, 16+5/*FIXME*/, full_mx-2, full_my-2, pic_width, pic_height);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1719 src_y= s->edge_emu_buffer + 2 + 2*h->mb_linesize;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1720 emu=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1721 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1722
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1723 qpix_op[luma_xy](dest_y, src_y, h->mb_linesize); //FIXME try variable height perhaps?
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1724 if(!square){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1725 qpix_op[luma_xy](dest_y + delta, src_y + delta, h->mb_linesize);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1726 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1727
5434
4f2e3ef72b32 use ENABLE_GRAY
michael
parents: 5425
diff changeset
1728 if(ENABLE_GRAY && s->flags&CODEC_FLAG_GRAY) return;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1729
5815
fb293531e983 Simplify tests for field macroblocks
andoma
parents: 5812
diff changeset
1730 if(MB_FIELD){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1731 // chroma offset when predicting from a field of opposite parity
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1732 my += 2 * ((s->mb_y & 1) - (h->ref_cache[list][scan8[n]] & 1));
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1733 emu |= (my>>3) < 0 || (my>>3) + 8 >= (pic_height>>1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1734 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1735 src_cb= pic->data[1] + (mx>>3) + (my>>3)*h->mb_uvlinesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1736 src_cr= pic->data[2] + (mx>>3) + (my>>3)*h->mb_uvlinesize;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1737
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1738 if(emu){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1739 ff_emulated_edge_mc(s->edge_emu_buffer, src_cb, h->mb_uvlinesize, 9, 9/*FIXME*/, (mx>>3), (my>>3), pic_width>>1, pic_height>>1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1740 src_cb= s->edge_emu_buffer;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1741 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1742 chroma_op(dest_cb, src_cb, h->mb_uvlinesize, chroma_height, mx&7, my&7);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1743
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1744 if(emu){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1745 ff_emulated_edge_mc(s->edge_emu_buffer, src_cr, h->mb_uvlinesize, 9, 9/*FIXME*/, (mx>>3), (my>>3), pic_width>>1, pic_height>>1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1746 src_cr= s->edge_emu_buffer;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1747 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1748 chroma_op(dest_cr, src_cr, h->mb_uvlinesize, chroma_height, mx&7, my&7);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1749 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1750
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1751 static inline void mc_part_std(H264Context *h, int n, int square, int chroma_height, int delta,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1752 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1753 int x_offset, int y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1754 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1755 qpel_mc_func *qpix_avg, h264_chroma_mc_func chroma_avg,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1756 int list0, int list1){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1757 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1758 qpel_mc_func *qpix_op= qpix_put;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1759 h264_chroma_mc_func chroma_op= chroma_put;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1760
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1761 dest_y += 2*x_offset + 2*y_offset*h-> mb_linesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1762 dest_cb += x_offset + y_offset*h->mb_uvlinesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1763 dest_cr += x_offset + y_offset*h->mb_uvlinesize;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1764 x_offset += 8*s->mb_x;
5815
fb293531e983 Simplify tests for field macroblocks
andoma
parents: 5812
diff changeset
1765 y_offset += 8*(s->mb_y >> MB_FIELD);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1766
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1767 if(list0){
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1768 Picture *ref= &h->ref_list[0][ h->ref_cache[0][ scan8[n] ] ];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1769 mc_dir_part(h, ref, n, square, chroma_height, delta, 0,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1770 dest_y, dest_cb, dest_cr, x_offset, y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1771 qpix_op, chroma_op);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1772
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1773 qpix_op= qpix_avg;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1774 chroma_op= chroma_avg;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1775 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1776
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1777 if(list1){
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1778 Picture *ref= &h->ref_list[1][ h->ref_cache[1][ scan8[n] ] ];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1779 mc_dir_part(h, ref, n, square, chroma_height, delta, 1,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1780 dest_y, dest_cb, dest_cr, x_offset, y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1781 qpix_op, chroma_op);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1782 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1783 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1784
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1785 static inline void mc_part_weighted(H264Context *h, int n, int square, int chroma_height, int delta,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1786 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1787 int x_offset, int y_offset,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1788 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1789 h264_weight_func luma_weight_op, h264_weight_func chroma_weight_op,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1790 h264_biweight_func luma_weight_avg, h264_biweight_func chroma_weight_avg,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1791 int list0, int list1){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1792 MpegEncContext * const s = &h->s;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1793
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1794 dest_y += 2*x_offset + 2*y_offset*h-> mb_linesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1795 dest_cb += x_offset + y_offset*h->mb_uvlinesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1796 dest_cr += x_offset + y_offset*h->mb_uvlinesize;
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1797 x_offset += 8*s->mb_x;
5815
fb293531e983 Simplify tests for field macroblocks
andoma
parents: 5812
diff changeset
1798 y_offset += 8*(s->mb_y >> MB_FIELD);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1799
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1800 if(list0 && list1){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1801 /* don't optimize for luma-only case, since B-frames usually
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1802 * use implicit weights => chroma too. */
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1803 uint8_t *tmp_cb = s->obmc_scratchpad;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1804 uint8_t *tmp_cr = s->obmc_scratchpad + 8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1805 uint8_t *tmp_y = s->obmc_scratchpad + 8*h->mb_uvlinesize;
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1806 int refn0 = h->ref_cache[0][ scan8[n] ];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1807 int refn1 = h->ref_cache[1][ scan8[n] ];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1808
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1809 mc_dir_part(h, &h->ref_list[0][refn0], n, square, chroma_height, delta, 0,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1810 dest_y, dest_cb, dest_cr,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1811 x_offset, y_offset, qpix_put, chroma_put);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1812 mc_dir_part(h, &h->ref_list[1][refn1], n, square, chroma_height, delta, 1,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1813 tmp_y, tmp_cb, tmp_cr,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1814 x_offset, y_offset, qpix_put, chroma_put);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1815
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1816 if(h->use_weight == 2){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1817 int weight0 = h->implicit_weight[refn0][refn1];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1818 int weight1 = 64 - weight0;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1819 luma_weight_avg( dest_y, tmp_y, h-> mb_linesize, 5, weight0, weight1, 0);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1820 chroma_weight_avg(dest_cb, tmp_cb, h->mb_uvlinesize, 5, weight0, weight1, 0);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1821 chroma_weight_avg(dest_cr, tmp_cr, h->mb_uvlinesize, 5, weight0, weight1, 0);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1822 }else{
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1823 luma_weight_avg(dest_y, tmp_y, h->mb_linesize, h->luma_log2_weight_denom,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1824 h->luma_weight[0][refn0], h->luma_weight[1][refn1],
3029
7a92269a3ccd tweak h264_biweight
lorenm
parents: 3028
diff changeset
1825 h->luma_offset[0][refn0] + h->luma_offset[1][refn1]);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1826 chroma_weight_avg(dest_cb, tmp_cb, h->mb_uvlinesize, h->chroma_log2_weight_denom,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1827 h->chroma_weight[0][refn0][0], h->chroma_weight[1][refn1][0],
3029
7a92269a3ccd tweak h264_biweight
lorenm
parents: 3028
diff changeset
1828 h->chroma_offset[0][refn0][0] + h->chroma_offset[1][refn1][0]);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1829 chroma_weight_avg(dest_cr, tmp_cr, h->mb_uvlinesize, h->chroma_log2_weight_denom,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1830 h->chroma_weight[0][refn0][1], h->chroma_weight[1][refn1][1],
3029
7a92269a3ccd tweak h264_biweight
lorenm
parents: 3028
diff changeset
1831 h->chroma_offset[0][refn0][1] + h->chroma_offset[1][refn1][1]);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1832 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1833 }else{
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1834 int list = list1 ? 1 : 0;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1835 int refn = h->ref_cache[list][ scan8[n] ];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1836 Picture *ref= &h->ref_list[list][refn];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1837 mc_dir_part(h, ref, n, square, chroma_height, delta, list,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1838 dest_y, dest_cb, dest_cr, x_offset, y_offset,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1839 qpix_put, chroma_put);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1840
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1841 luma_weight_op(dest_y, h->mb_linesize, h->luma_log2_weight_denom,
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1842 h->luma_weight[list][refn], h->luma_offset[list][refn]);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1843 if(h->use_weight_chroma){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1844 chroma_weight_op(dest_cb, h->mb_uvlinesize, h->chroma_log2_weight_denom,
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1845 h->chroma_weight[list][refn][0], h->chroma_offset[list][refn][0]);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1846 chroma_weight_op(dest_cr, h->mb_uvlinesize, h->chroma_log2_weight_denom,
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1847 h->chroma_weight[list][refn][1], h->chroma_offset[list][refn][1]);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1848 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1849 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1850 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1851
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1852 static inline void mc_part(H264Context *h, int n, int square, int chroma_height, int delta,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1853 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1854 int x_offset, int y_offset,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1855 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1856 qpel_mc_func *qpix_avg, h264_chroma_mc_func chroma_avg,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1857 h264_weight_func *weight_op, h264_biweight_func *weight_avg,
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1858 int list0, int list1){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1859 if((h->use_weight==2 && list0 && list1
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1860 && (h->implicit_weight[ h->ref_cache[0][scan8[n]] ][ h->ref_cache[1][scan8[n]] ] != 32))
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1861 || h->use_weight==1)
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1862 mc_part_weighted(h, n, square, chroma_height, delta, dest_y, dest_cb, dest_cr,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1863 x_offset, y_offset, qpix_put, chroma_put,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1864 weight_op[0], weight_op[3], weight_avg[0], weight_avg[3], list0, list1);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1865 else
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1866 mc_part_std(h, n, square, chroma_height, delta, dest_y, dest_cb, dest_cr,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1867 x_offset, y_offset, qpix_put, chroma_put, qpix_avg, chroma_avg, list0, list1);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1868 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1869
3215
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1870 static inline void prefetch_motion(H264Context *h, int list){
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1871 /* fetch pixels for estimated mv 4 macroblocks ahead
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1872 * optimized for 64byte cache lines */
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1873 MpegEncContext * const s = &h->s;
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1874 const int refn = h->ref_cache[list][scan8[0]];
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1875 if(refn >= 0){
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1876 const int mx= (h->mv_cache[list][scan8[0]][0]>>2) + 16*s->mb_x + 8;
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1877 const int my= (h->mv_cache[list][scan8[0]][1]>>2) + 16*s->mb_y;
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1878 uint8_t **src= h->ref_list[list][refn].data;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1879 int off= mx + (my + (s->mb_x&3)*4)*h->mb_linesize + 64;
3215
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1880 s->dsp.prefetch(src[0]+off, s->linesize, 4);
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1881 off= (mx>>1) + ((my>>1) + (s->mb_x&7))*s->uvlinesize + 64;
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1882 s->dsp.prefetch(src[1]+off, src[2]-src[1], 2);
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1883 }
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1884 }
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1885
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1886 static void hl_motion(H264Context *h, uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1887 qpel_mc_func (*qpix_put)[16], h264_chroma_mc_func (*chroma_put),
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1888 qpel_mc_func (*qpix_avg)[16], h264_chroma_mc_func (*chroma_avg),
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1889 h264_weight_func *weight_op, h264_biweight_func *weight_avg){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1890 MpegEncContext * const s = &h->s;
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: 1174
diff changeset
1891 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1892 const int mb_type= s->current_picture.mb_type[mb_xy];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1893
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1894 assert(IS_INTER(mb_type));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1895
3215
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1896 prefetch_motion(h, 0);
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1897
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1898 if(IS_16X16(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1899 mc_part(h, 0, 1, 8, 0, dest_y, dest_cb, dest_cr, 0, 0,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1900 qpix_put[0], chroma_put[0], qpix_avg[0], chroma_avg[0],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1901 &weight_op[0], &weight_avg[0],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1902 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1903 }else if(IS_16X8(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1904 mc_part(h, 0, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 0,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1905 qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1906 &weight_op[1], &weight_avg[1],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1907 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1908 mc_part(h, 8, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 4,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1909 qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1910 &weight_op[1], &weight_avg[1],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1911 IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1912 }else if(IS_8X16(mb_type)){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1913 mc_part(h, 0, 0, 8, 8*h->mb_linesize, dest_y, dest_cb, dest_cr, 0, 0,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1914 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1915 &weight_op[2], &weight_avg[2],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1916 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1));
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1917 mc_part(h, 4, 0, 8, 8*h->mb_linesize, dest_y, dest_cb, dest_cr, 4, 0,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1918 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1919 &weight_op[2], &weight_avg[2],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1920 IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1921 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1922 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1923
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1924 assert(IS_8X8(mb_type));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1925
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1926 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1927 const int sub_mb_type= h->sub_mb_type[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1928 const int n= 4*i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1929 int x_offset= (i&1)<<2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1930 int y_offset= (i&2)<<1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1931
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1932 if(IS_SUB_8X8(sub_mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1933 mc_part(h, n, 1, 4, 0, dest_y, dest_cb, dest_cr, x_offset, y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1934 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1935 &weight_op[3], &weight_avg[3],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1936 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1937 }else if(IS_SUB_8X4(sub_mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1938 mc_part(h, n , 0, 2, 4, dest_y, dest_cb, dest_cr, x_offset, y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1939 qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1940 &weight_op[4], &weight_avg[4],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1941 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1942 mc_part(h, n+2, 0, 2, 4, dest_y, dest_cb, dest_cr, x_offset, y_offset+2,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1943 qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1944 &weight_op[4], &weight_avg[4],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1945 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1946 }else if(IS_SUB_4X8(sub_mb_type)){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1947 mc_part(h, n , 0, 4, 4*h->mb_linesize, dest_y, dest_cb, dest_cr, x_offset, y_offset,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1948 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1949 &weight_op[5], &weight_avg[5],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1950 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1951 mc_part(h, n+1, 0, 4, 4*h->mb_linesize, dest_y, dest_cb, dest_cr, x_offset+2, y_offset,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1952 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1953 &weight_op[5], &weight_avg[5],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1954 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1955 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1956 int j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1957 assert(IS_SUB_4X4(sub_mb_type));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1958 for(j=0; j<4; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1959 int sub_x_offset= x_offset + 2*(j&1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1960 int sub_y_offset= y_offset + (j&2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1961 mc_part(h, n+j, 1, 2, 0, dest_y, dest_cb, dest_cr, sub_x_offset, sub_y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1962 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1963 &weight_op[6], &weight_avg[6],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1964 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1965 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1966 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1967 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1968 }
3215
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1969
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1970 prefetch_motion(h, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1971 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1972
4783
011fb289e3b0 changes some function declarations from () to (void) as per ansi c.
gpoirier
parents: 4745
diff changeset
1973 static void decode_init_vlc(void){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1974 static int done = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1975
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1976 if (!done) {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1977 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1978 done = 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1979
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1980 init_vlc(&chroma_dc_coeff_token_vlc, CHROMA_DC_COEFF_TOKEN_VLC_BITS, 4*5,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1981 &chroma_dc_coeff_token_len [0], 1, 1,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2365
diff changeset
1982 &chroma_dc_coeff_token_bits[0], 1, 1, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1983
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1984 for(i=0; i<4; i++){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1985 init_vlc(&coeff_token_vlc[i], COEFF_TOKEN_VLC_BITS, 4*17,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1986 &coeff_token_len [i][0], 1, 1,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2365
diff changeset
1987 &coeff_token_bits[i][0], 1, 1, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1988 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1989
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1990 for(i=0; i<3; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1991 init_vlc(&chroma_dc_total_zeros_vlc[i], CHROMA_DC_TOTAL_ZEROS_VLC_BITS, 4,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1992 &chroma_dc_total_zeros_len [i][0], 1, 1,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2365
diff changeset
1993 &chroma_dc_total_zeros_bits[i][0], 1, 1, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1994 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1995 for(i=0; i<15; i++){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1996 init_vlc(&total_zeros_vlc[i], TOTAL_ZEROS_VLC_BITS, 16,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1997 &total_zeros_len [i][0], 1, 1,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2365
diff changeset
1998 &total_zeros_bits[i][0], 1, 1, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1999 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2000
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2001 for(i=0; i<6; i++){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2002 init_vlc(&run_vlc[i], RUN_VLC_BITS, 7,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2003 &run_len [i][0], 1, 1,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2365
diff changeset
2004 &run_bits[i][0], 1, 1, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2005 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2006 init_vlc(&run7_vlc, RUN7_VLC_BITS, 16,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2007 &run_len [6][0], 1, 1,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2365
diff changeset
2008 &run_bits[6][0], 1, 1, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2009 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2010 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2011
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2012 static void free_tables(H264Context *h){
5079
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
2013 int i;
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2014 H264Context *hx;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2015 av_freep(&h->intra4x4_pred_mode);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2016 av_freep(&h->chroma_pred_mode_table);
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2017 av_freep(&h->cbp_table);
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
2018 av_freep(&h->mvd_table[0]);
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
2019 av_freep(&h->mvd_table[1]);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
2020 av_freep(&h->direct_table);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2021 av_freep(&h->non_zero_count);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2022 av_freep(&h->slice_table_base);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2023 h->slice_table= NULL;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2024
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2025 av_freep(&h->mb2b_xy);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2026 av_freep(&h->mb2b8_xy);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2027
5079
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
2028 for(i = 0; i < MAX_SPS_COUNT; i++)
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
2029 av_freep(h->sps_buffers + i);
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
2030
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
2031 for(i = 0; i < MAX_PPS_COUNT; i++)
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
2032 av_freep(h->pps_buffers + i);
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2033
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2034 for(i = 0; i < h->s.avctx->thread_count; i++) {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2035 hx = h->thread_context[i];
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2036 if(!hx) continue;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2037 av_freep(&hx->top_borders[1]);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2038 av_freep(&hx->top_borders[0]);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2039 av_freep(&hx->s.obmc_scratchpad);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2040 av_freep(&hx->s.allocated_edge_emu_buffer);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2041 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2042 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2043
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2044 static void init_dequant8_coeff_table(H264Context *h){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2045 int i,q,x;
3174
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
2046 const int transpose = (h->s.dsp.h264_idct8_add != ff_h264_idct8_add_c); //FIXME ugly
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2047 h->dequant8_coeff[0] = h->dequant8_buffer[0];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2048 h->dequant8_coeff[1] = h->dequant8_buffer[1];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2049
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2050 for(i=0; i<2; i++ ){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2051 if(i && !memcmp(h->pps.scaling_matrix8[0], h->pps.scaling_matrix8[1], 64*sizeof(uint8_t))){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2052 h->dequant8_coeff[1] = h->dequant8_buffer[0];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2053 break;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2054 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2055
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2056 for(q=0; q<52; q++){
4277
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
2057 int shift = ff_div6[q];
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
2058 int idx = ff_rem6[q];
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2059 for(x=0; x<64; x++)
3174
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
2060 h->dequant8_coeff[i][q][transpose ? (x>>3)|((x&7)<<3) : x] =
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
2061 ((uint32_t)dequant8_coeff_init[idx][ dequant8_coeff_init_scan[((x>>1)&12) | (x&3)] ] *
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
2062 h->pps.scaling_matrix8[i][x]) << shift;
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2063 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2064 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2065 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2066
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2067 static void init_dequant4_coeff_table(H264Context *h){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2068 int i,j,q,x;
3005
6f6f307cffac fix asymmetric CQMs with pre-transposed DCT.
lorenm
parents: 3004
diff changeset
2069 const int transpose = (h->s.dsp.h264_idct_add != ff_h264_idct_add_c); //FIXME ugly
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2070 for(i=0; i<6; i++ ){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2071 h->dequant4_coeff[i] = h->dequant4_buffer[i];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2072 for(j=0; j<i; j++){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2073 if(!memcmp(h->pps.scaling_matrix4[j], h->pps.scaling_matrix4[i], 16*sizeof(uint8_t))){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2074 h->dequant4_coeff[i] = h->dequant4_buffer[j];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2075 break;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2076 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2077 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2078 if(j<i)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2079 continue;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2080
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2081 for(q=0; q<52; q++){
4277
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
2082 int shift = ff_div6[q] + 2;
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
2083 int idx = ff_rem6[q];
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2084 for(x=0; x<16; x++)
3005
6f6f307cffac fix asymmetric CQMs with pre-transposed DCT.
lorenm
parents: 3004
diff changeset
2085 h->dequant4_coeff[i][q][transpose ? (x>>2)|((x<<2)&0xF) : x] =
6f6f307cffac fix asymmetric CQMs with pre-transposed DCT.
lorenm
parents: 3004
diff changeset
2086 ((uint32_t)dequant4_coeff_init[idx][(x&1) + ((x>>2)&1)] *
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2087 h->pps.scaling_matrix4[i][x]) << shift;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2088 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2089 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2090 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2091
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2092 static void init_dequant_tables(H264Context *h){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2093 int i,x;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2094 init_dequant4_coeff_table(h);
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2095 if(h->pps.transform_8x8_mode)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2096 init_dequant8_coeff_table(h);
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2097 if(h->sps.transform_bypass){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2098 for(i=0; i<6; i++)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2099 for(x=0; x<16; x++)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2100 h->dequant4_coeff[i][0][x] = 1<<6;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2101 if(h->pps.transform_8x8_mode)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2102 for(i=0; i<2; i++)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2103 for(x=0; x<64; x++)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2104 h->dequant8_coeff[i][0][x] = 1<<6;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2105 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2106 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2107
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2108
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2109 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2110 * allocates tables.
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
2111 * needs width/height
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2112 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2113 static int alloc_tables(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2114 MpegEncContext * const s = &h->s;
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: 1174
diff changeset
2115 const int big_mb_num= s->mb_stride * (s->mb_height+1);
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2116 int x,y;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2117
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2118 CHECKED_ALLOCZ(h->intra4x4_pred_mode, big_mb_num * 8 * sizeof(uint8_t))
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2119
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2120 CHECKED_ALLOCZ(h->non_zero_count , big_mb_num * 16 * sizeof(uint8_t))
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2121 CHECKED_ALLOCZ(h->slice_table_base , (big_mb_num+s->mb_stride) * sizeof(uint8_t))
2336
9cd834fc7325 segfault fix
michael
parents: 2317
diff changeset
2122 CHECKED_ALLOCZ(h->cbp_table, big_mb_num * sizeof(uint16_t))
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2123
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2124 if( h->pps.cabac ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2125 CHECKED_ALLOCZ(h->chroma_pred_mode_table, big_mb_num * sizeof(uint8_t))
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
2126 CHECKED_ALLOCZ(h->mvd_table[0], 32*big_mb_num * sizeof(uint16_t));
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
2127 CHECKED_ALLOCZ(h->mvd_table[1], 32*big_mb_num * sizeof(uint16_t));
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
2128 CHECKED_ALLOCZ(h->direct_table, 32*big_mb_num * sizeof(uint8_t));
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2129 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2130
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2131 memset(h->slice_table_base, -1, (big_mb_num+s->mb_stride) * sizeof(uint8_t));
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2132 h->slice_table= h->slice_table_base + s->mb_stride*2 + 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2133
2641
c337f851d0f9 fix storage of motion vectors for frames with more than 4096 macroblocks.
lorenm
parents: 2640
diff changeset
2134 CHECKED_ALLOCZ(h->mb2b_xy , big_mb_num * sizeof(uint32_t));
c337f851d0f9 fix storage of motion vectors for frames with more than 4096 macroblocks.
lorenm
parents: 2640
diff changeset
2135 CHECKED_ALLOCZ(h->mb2b8_xy , big_mb_num * sizeof(uint32_t));
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2136 for(y=0; y<s->mb_height; y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2137 for(x=0; x<s->mb_width; x++){
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: 1174
diff changeset
2138 const int mb_xy= x + y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2139 const int b_xy = 4*x + 4*y*h->b_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2140 const int b8_xy= 2*x + 2*y*h->b8_stride;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2141
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2142 h->mb2b_xy [mb_xy]= b_xy;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2143 h->mb2b8_xy[mb_xy]= b8_xy;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2144 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2145 }
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2146
2417
991f39305057 10l (obmc_scratchpad not always initialize)
lorenm
parents: 2416
diff changeset
2147 s->obmc_scratchpad = NULL;
991f39305057 10l (obmc_scratchpad not always initialize)
lorenm
parents: 2416
diff changeset
2148
2920
1443b4d3f4ab 10l: cqm weren't initialized in svq3.
lorenm
parents: 2919
diff changeset
2149 if(!h->dequant4_coeff[0])
1443b4d3f4ab 10l: cqm weren't initialized in svq3.
lorenm
parents: 2919
diff changeset
2150 init_dequant_tables(h);
1443b4d3f4ab 10l: cqm weren't initialized in svq3.
lorenm
parents: 2919
diff changeset
2151
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2152 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2153 fail:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2154 free_tables(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2155 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2156 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2157
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2158 /**
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2159 * Mimic alloc_tables(), but for every context thread.
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2160 */
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2161 static void clone_tables(H264Context *dst, H264Context *src){
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2162 dst->intra4x4_pred_mode = src->intra4x4_pred_mode;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2163 dst->non_zero_count = src->non_zero_count;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2164 dst->slice_table = src->slice_table;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2165 dst->cbp_table = src->cbp_table;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2166 dst->mb2b_xy = src->mb2b_xy;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2167 dst->mb2b8_xy = src->mb2b8_xy;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2168 dst->chroma_pred_mode_table = src->chroma_pred_mode_table;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2169 dst->mvd_table[0] = src->mvd_table[0];
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2170 dst->mvd_table[1] = src->mvd_table[1];
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2171 dst->direct_table = src->direct_table;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2172
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2173 dst->s.obmc_scratchpad = NULL;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2174 ff_h264_pred_init(&dst->hpc, src->s.codec_id);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2175 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2176
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2177 /**
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2178 * Init context
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2179 * Allocate buffers which are not shared amongst multiple threads.
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2180 */
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2181 static int context_init(H264Context *h){
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2182 MpegEncContext * const s = &h->s;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2183
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2184 CHECKED_ALLOCZ(h->top_borders[0], h->s.mb_width * (16+8+8) * sizeof(uint8_t))
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2185 CHECKED_ALLOCZ(h->top_borders[1], h->s.mb_width * (16+8+8) * sizeof(uint8_t))
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2186
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2187 // edge emu needs blocksize + filter length - 1 (=17x17 for halfpel / 21x21 for h264)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2188 CHECKED_ALLOCZ(s->allocated_edge_emu_buffer,
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2189 (s->width+64)*2*21*2); //(width + edge + align)*interlaced*MBsize*tolerance
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2190 s->edge_emu_buffer= s->allocated_edge_emu_buffer + (s->width+64)*2*21;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2191 return 0;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2192 fail:
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2193 return -1; // free_tables will clean up for us
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2194 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2195
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2196 static void common_init(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2197 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2198
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2199 s->width = s->avctx->width;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2200 s->height = s->avctx->height;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2201 s->codec_id= s->avctx->codec->id;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2202
5638
4a26dc4ca11d Move H.264 intra prediction functions into their own context
kostya
parents: 5631
diff changeset
2203 ff_h264_pred_init(&h->hpc, s->codec_id);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2204
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2205 h->dequant_coeff_pps= -1;
1698
420cac032278 svq3 fix
michael
parents: 1636
diff changeset
2206 s->unrestricted_mv=1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2207 s->decode=1; //FIXME
2920
1443b4d3f4ab 10l: cqm weren't initialized in svq3.
lorenm
parents: 2919
diff changeset
2208
1443b4d3f4ab 10l: cqm weren't initialized in svq3.
lorenm
parents: 2919
diff changeset
2209 memset(h->pps.scaling_matrix4, 16, 6*16*sizeof(uint8_t));
1443b4d3f4ab 10l: cqm weren't initialized in svq3.
lorenm
parents: 2919
diff changeset
2210 memset(h->pps.scaling_matrix8, 16, 2*64*sizeof(uint8_t));
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2211 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2212
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2213 static int decode_init(AVCodecContext *avctx){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2214 H264Context *h= avctx->priv_data;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2215 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2216
1892
5ac49e7a1b8f init cleanup
michael
parents: 1786
diff changeset
2217 MPV_decode_defaults(s);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2218
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2219 s->avctx = avctx;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2220 common_init(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2221
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2222 s->out_format = FMT_H264;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2223 s->workaround_bugs= avctx->workaround_bugs;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2224
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2225 // set defaults
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2226 // s->decode_mb= ff_h263_decode_mb;
5338
5c1695f0f3e4 fix visual painting of MVs from h264: they are painted twice too long
gpoirier
parents: 5262
diff changeset
2227 s->quarter_sample = 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2228 s->low_delay= 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2229 avctx->pix_fmt= PIX_FMT_YUV420P;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2230
4164
171e768324cd Remove the H264Context parameter from decode_init_vlc() as it is not being used.
takis
parents: 4118
diff changeset
2231 decode_init_vlc();
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2232
2547
c5781912ad8a improved detection of "AVC1" style H.264 patch by (M«©ns Rullg«©rd <mru inprovide com>)
michael
parents: 2538
diff changeset
2233 if(avctx->extradata_size > 0 && avctx->extradata &&
c5781912ad8a improved detection of "AVC1" style H.264 patch by (M«©ns Rullg«©rd <mru inprovide com>)
michael
parents: 2538
diff changeset
2234 *(char *)avctx->extradata == 1){
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2235 h->is_avc = 1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2236 h->got_avcC = 0;
2547
c5781912ad8a improved detection of "AVC1" style H.264 patch by (M«©ns Rullg«©rd <mru inprovide com>)
michael
parents: 2538
diff changeset
2237 } else {
c5781912ad8a improved detection of "AVC1" style H.264 patch by (M«©ns Rullg«©rd <mru inprovide com>)
michael
parents: 2538
diff changeset
2238 h->is_avc = 0;
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2239 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2240
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2241 h->thread_context[0] = h;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2242 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2243 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2244
2935
b564bb15e63c check MPV_frame_start() return value
michael
parents: 2928
diff changeset
2245 static int frame_start(H264Context *h){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2246 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2247 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2248
2935
b564bb15e63c check MPV_frame_start() return value
michael
parents: 2928
diff changeset
2249 if(MPV_frame_start(s, s->avctx) < 0)
b564bb15e63c check MPV_frame_start() return value
michael
parents: 2928
diff changeset
2250 return -1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2251 ff_er_frame_start(s);
5773
e3d7a78e2df3 Fix Picture.key_frame setting to be compatible with frame and field contexts. Part of PAFF implementation.
andoma
parents: 5772
diff changeset
2252 /*
e3d7a78e2df3 Fix Picture.key_frame setting to be compatible with frame and field contexts. Part of PAFF implementation.
andoma
parents: 5772
diff changeset
2253 * MPV_frame_start uses pict_type to derive key_frame.
e3d7a78e2df3 Fix Picture.key_frame setting to be compatible with frame and field contexts. Part of PAFF implementation.
andoma
parents: 5772
diff changeset
2254 * This is incorrect for H.264; IDR markings must be used.
e3d7a78e2df3 Fix Picture.key_frame setting to be compatible with frame and field contexts. Part of PAFF implementation.
andoma
parents: 5772
diff changeset
2255 * Zero here; IDR markings per slice in frame or fields are OR'd in later.
e3d7a78e2df3 Fix Picture.key_frame setting to be compatible with frame and field contexts. Part of PAFF implementation.
andoma
parents: 5772
diff changeset
2256 * See decode_nal_units().
e3d7a78e2df3 Fix Picture.key_frame setting to be compatible with frame and field contexts. Part of PAFF implementation.
andoma
parents: 5772
diff changeset
2257 */
e3d7a78e2df3 Fix Picture.key_frame setting to be compatible with frame and field contexts. Part of PAFF implementation.
andoma
parents: 5772
diff changeset
2258 s->current_picture_ptr->key_frame= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2259
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2260 assert(s->linesize && s->uvlinesize);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2261
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2262 for(i=0; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2263 h->block_offset[i]= 4*((scan8[i] - scan8[0])&7) + 4*s->linesize*((scan8[i] - scan8[0])>>3);
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2264 h->block_offset[24+i]= 4*((scan8[i] - scan8[0])&7) + 8*s->linesize*((scan8[i] - scan8[0])>>3);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2265 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2266 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2267 h->block_offset[16+i]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2268 h->block_offset[20+i]= 4*((scan8[i] - scan8[0])&7) + 4*s->uvlinesize*((scan8[i] - scan8[0])>>3);
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2269 h->block_offset[24+16+i]=
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2270 h->block_offset[24+20+i]= 4*((scan8[i] - scan8[0])&7) + 8*s->uvlinesize*((scan8[i] - scan8[0])>>3);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2271 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2272
2416
06b7d678b582 10l: scratchpad could be allocated before its size was known.
lorenm
parents: 2415
diff changeset
2273 /* can't be in alloc_tables because linesize isn't known there.
06b7d678b582 10l: scratchpad could be allocated before its size was known.
lorenm
parents: 2415
diff changeset
2274 * FIXME: redo bipred weight to not require extra buffer? */
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2275 for(i = 0; i < s->avctx->thread_count; i++)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2276 if(!h->thread_context[i]->s.obmc_scratchpad)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2277 h->thread_context[i]->s.obmc_scratchpad = av_malloc(16*2*s->linesize + 8*2*s->uvlinesize);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2278
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2279 /* some macroblocks will be accessed before they're available */
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2280 if(FRAME_MBAFF || s->avctx->thread_count > 1)
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2281 memset(h->slice_table, -1, (s->mb_height*s->mb_stride-1) * sizeof(uint8_t));
2416
06b7d678b582 10l: scratchpad could be allocated before its size was known.
lorenm
parents: 2415
diff changeset
2282
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2283 // s->decode= (s->flags&CODEC_FLAG_PSNR) || !s->encoding || s->current_picture.reference /*|| h->contains_intra*/ || 1;
2935
b564bb15e63c check MPV_frame_start() return value
michael
parents: 2928
diff changeset
2284 return 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2285 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2286
5106
ddb5abe164f3 h264: use 'simple' in border backup / xchg
benoit
parents: 5093
diff changeset
2287 static inline void backup_mb_border(H264Context *h, uint8_t *src_y, uint8_t *src_cb, uint8_t *src_cr, int linesize, int uvlinesize, int simple){
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2288 MpegEncContext * const s = &h->s;
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2289 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2290
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2291 src_y -= linesize;
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2292 src_cb -= uvlinesize;
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2293 src_cr -= uvlinesize;
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2294
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
2295 // There are two lines saved, the line above the the top macroblock of a pair,
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2296 // and the line above the bottom macroblock
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2297 h->left_border[0]= h->top_borders[0][s->mb_x][15];
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2298 for(i=1; i<17; i++){
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2299 h->left_border[i]= src_y[15+i* linesize];
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2300 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2301
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2302 *(uint64_t*)(h->top_borders[0][s->mb_x]+0)= *(uint64_t*)(src_y + 16*linesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2303 *(uint64_t*)(h->top_borders[0][s->mb_x]+8)= *(uint64_t*)(src_y +8+16*linesize);
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2304
5434
4f2e3ef72b32 use ENABLE_GRAY
michael
parents: 5425
diff changeset
2305 if(simple || !ENABLE_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2306 h->left_border[17 ]= h->top_borders[0][s->mb_x][16+7];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2307 h->left_border[17+9]= h->top_borders[0][s->mb_x][24+7];
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2308 for(i=1; i<9; i++){
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2309 h->left_border[i+17 ]= src_cb[7+i*uvlinesize];
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2310 h->left_border[i+17+9]= src_cr[7+i*uvlinesize];
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2311 }
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2312 *(uint64_t*)(h->top_borders[0][s->mb_x]+16)= *(uint64_t*)(src_cb+8*uvlinesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2313 *(uint64_t*)(h->top_borders[0][s->mb_x]+24)= *(uint64_t*)(src_cr+8*uvlinesize);
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2314 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2315 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2316
5106
ddb5abe164f3 h264: use 'simple' in border backup / xchg
benoit
parents: 5093
diff changeset
2317 static inline void xchg_mb_border(H264Context *h, uint8_t *src_y, uint8_t *src_cb, uint8_t *src_cr, int linesize, int uvlinesize, int xchg, int simple){
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2318 MpegEncContext * const s = &h->s;
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2319 int temp8, i;
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2320 uint64_t temp64;
5177
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2321 int deblock_left;
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2322 int deblock_top;
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2323 int mb_xy;
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2324
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2325 if(h->deblocking_filter == 2) {
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2326 mb_xy = s->mb_x + s->mb_y*s->mb_stride;
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2327 deblock_left = h->slice_table[mb_xy] == h->slice_table[mb_xy - 1];
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2328 deblock_top = h->slice_table[mb_xy] == h->slice_table[h->top_mb_xy];
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2329 } else {
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2330 deblock_left = (s->mb_x > 0);
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2331 deblock_top = (s->mb_y > 0);
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2332 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2333
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2334 src_y -= linesize + 1;
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2335 src_cb -= uvlinesize + 1;
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2336 src_cr -= uvlinesize + 1;
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2337
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2338 #define XCHG(a,b,t,xchg)\
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2339 t= a;\
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2340 if(xchg)\
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2341 a= b;\
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2342 b= t;
2200
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2343
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2344 if(deblock_left){
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2345 for(i = !deblock_top; i<17; i++){
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2346 XCHG(h->left_border[i ], src_y [i* linesize], temp8, xchg);
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2347 }
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2348 }
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2349
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2350 if(deblock_top){
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2351 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+0), *(uint64_t*)(src_y +1), temp64, xchg);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2352 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+8), *(uint64_t*)(src_y +9), temp64, 1);
2803
26970df644f1 Add missing +1 in bounds check.
reimar
parents: 2793
diff changeset
2353 if(s->mb_x+1 < s->mb_width){
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2354 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x+1]), *(uint64_t*)(src_y +17), temp64, 1);
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2355 }
2200
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2356 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2357
5434
4f2e3ef72b32 use ENABLE_GRAY
michael
parents: 5425
diff changeset
2358 if(simple || !ENABLE_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
2200
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2359 if(deblock_left){
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2360 for(i = !deblock_top; i<9; i++){
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2361 XCHG(h->left_border[i+17 ], src_cb[i*uvlinesize], temp8, xchg);
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2362 XCHG(h->left_border[i+17+9], src_cr[i*uvlinesize], temp8, xchg);
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2363 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2364 }
2200
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2365 if(deblock_top){
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2366 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+16), *(uint64_t*)(src_cb+1), temp64, 1);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2367 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+24), *(uint64_t*)(src_cr+1), temp64, 1);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2368 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2369 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2370 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2371
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2372 static inline void backup_pair_border(H264Context *h, uint8_t *src_y, uint8_t *src_cb, uint8_t *src_cr, int linesize, int uvlinesize){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2373 MpegEncContext * const s = &h->s;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2374 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2375
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2376 src_y -= 2 * linesize;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2377 src_cb -= 2 * uvlinesize;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2378 src_cr -= 2 * uvlinesize;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2379
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
2380 // There are two lines saved, the line above the the top macroblock of a pair,
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2381 // and the line above the bottom macroblock
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2382 h->left_border[0]= h->top_borders[0][s->mb_x][15];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2383 h->left_border[1]= h->top_borders[1][s->mb_x][15];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2384 for(i=2; i<34; i++){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2385 h->left_border[i]= src_y[15+i* linesize];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2386 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2387
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2388 *(uint64_t*)(h->top_borders[0][s->mb_x]+0)= *(uint64_t*)(src_y + 32*linesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2389 *(uint64_t*)(h->top_borders[0][s->mb_x]+8)= *(uint64_t*)(src_y +8+32*linesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2390 *(uint64_t*)(h->top_borders[1][s->mb_x]+0)= *(uint64_t*)(src_y + 33*linesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2391 *(uint64_t*)(h->top_borders[1][s->mb_x]+8)= *(uint64_t*)(src_y +8+33*linesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2392
5434
4f2e3ef72b32 use ENABLE_GRAY
michael
parents: 5425
diff changeset
2393 if(!ENABLE_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2394 h->left_border[34 ]= h->top_borders[0][s->mb_x][16+7];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2395 h->left_border[34+ 1]= h->top_borders[1][s->mb_x][16+7];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2396 h->left_border[34+18 ]= h->top_borders[0][s->mb_x][24+7];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2397 h->left_border[34+18+1]= h->top_borders[1][s->mb_x][24+7];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2398 for(i=2; i<18; i++){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2399 h->left_border[i+34 ]= src_cb[7+i*uvlinesize];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2400 h->left_border[i+34+18]= src_cr[7+i*uvlinesize];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2401 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2402 *(uint64_t*)(h->top_borders[0][s->mb_x]+16)= *(uint64_t*)(src_cb+16*uvlinesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2403 *(uint64_t*)(h->top_borders[0][s->mb_x]+24)= *(uint64_t*)(src_cr+16*uvlinesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2404 *(uint64_t*)(h->top_borders[1][s->mb_x]+16)= *(uint64_t*)(src_cb+17*uvlinesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2405 *(uint64_t*)(h->top_borders[1][s->mb_x]+24)= *(uint64_t*)(src_cr+17*uvlinesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2406 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2407 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2408
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2409 static inline void xchg_pair_border(H264Context *h, uint8_t *src_y, uint8_t *src_cb, uint8_t *src_cr, int linesize, int uvlinesize, int xchg){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2410 MpegEncContext * const s = &h->s;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2411 int temp8, i;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2412 uint64_t temp64;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2413 int deblock_left = (s->mb_x > 0);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2414 int deblock_top = (s->mb_y > 1);
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2415
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
2416 tprintf(s->avctx, "xchg_pair_border: src_y:%p src_cb:%p src_cr:%p ls:%d uvls:%d\n", src_y, src_cb, src_cr, linesize, uvlinesize);
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2417
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2418 src_y -= 2 * linesize + 1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2419 src_cb -= 2 * uvlinesize + 1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2420 src_cr -= 2 * uvlinesize + 1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2421
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2422 #define XCHG(a,b,t,xchg)\
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2423 t= a;\
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2424 if(xchg)\
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2425 a= b;\
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2426 b= t;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2427
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2428 if(deblock_left){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2429 for(i = (!deblock_top)<<1; i<34; i++){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2430 XCHG(h->left_border[i ], src_y [i* linesize], temp8, xchg);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2431 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2432 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2433
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2434 if(deblock_top){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2435 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+0), *(uint64_t*)(src_y +1), temp64, xchg);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2436 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+8), *(uint64_t*)(src_y +9), temp64, 1);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2437 XCHG(*(uint64_t*)(h->top_borders[1][s->mb_x]+0), *(uint64_t*)(src_y +1 +linesize), temp64, xchg);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2438 XCHG(*(uint64_t*)(h->top_borders[1][s->mb_x]+8), *(uint64_t*)(src_y +9 +linesize), temp64, 1);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2439 if(s->mb_x+1 < s->mb_width){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2440 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x+1]), *(uint64_t*)(src_y +17), temp64, 1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2441 XCHG(*(uint64_t*)(h->top_borders[1][s->mb_x+1]), *(uint64_t*)(src_y +17 +linesize), temp64, 1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2442 }
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2443 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2444
5434
4f2e3ef72b32 use ENABLE_GRAY
michael
parents: 5425
diff changeset
2445 if(!ENABLE_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2446 if(deblock_left){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2447 for(i = (!deblock_top) << 1; i<18; i++){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2448 XCHG(h->left_border[i+34 ], src_cb[i*uvlinesize], temp8, xchg);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2449 XCHG(h->left_border[i+34+18], src_cr[i*uvlinesize], temp8, xchg);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2450 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2451 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2452 if(deblock_top){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2453 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+16), *(uint64_t*)(src_cb+1), temp64, 1);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2454 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+24), *(uint64_t*)(src_cr+1), temp64, 1);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2455 XCHG(*(uint64_t*)(h->top_borders[1][s->mb_x]+16), *(uint64_t*)(src_cb+1 +uvlinesize), temp64, 1);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2456 XCHG(*(uint64_t*)(h->top_borders[1][s->mb_x]+24), *(uint64_t*)(src_cr+1 +uvlinesize), temp64, 1);
2200
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2457 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2458 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2459 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2460
4908
777f250df232 Fix multiple "¡Æinline/static¡Ç is not at beginning of declaration" warnings.
diego
parents: 4896
diff changeset
2461 static av_always_inline void hl_decode_mb_internal(H264Context *h, int simple){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2462 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2463 const int mb_x= s->mb_x;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2464 const int mb_y= 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: 1174
diff changeset
2465 const int mb_xy= mb_x + mb_y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2466 const int mb_type= s->current_picture.mb_type[mb_xy];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2467 uint8_t *dest_y, *dest_cb, *dest_cr;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2468 int linesize, uvlinesize /*dct_offset*/;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2469 int i;
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2470 int *block_offset = &h->block_offset[0];
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2471 const unsigned int bottom = mb_y & 1;
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2472 const int transform_bypass = (s->qscale == 0 && h->sps.transform_bypass), is_h264 = (simple || s->codec_id == CODEC_ID_H264);
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
2473 void (*idct_add)(uint8_t *dst, DCTELEM *block, int stride);
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2474 void (*idct_dc_add)(uint8_t *dst, DCTELEM *block, int stride);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2475
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2476 dest_y = s->current_picture.data[0] + (mb_y * 16* s->linesize ) + mb_x * 16;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2477 dest_cb = s->current_picture.data[1] + (mb_y * 8 * s->uvlinesize) + mb_x * 8;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2478 dest_cr = s->current_picture.data[2] + (mb_y * 8 * s->uvlinesize) + mb_x * 8;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2479
4000
eeab02251056 more prefetches, 2% faster h264
lorenm
parents: 3993
diff changeset
2480 s->dsp.prefetch(dest_y + (s->mb_x&3)*4*s->linesize + 64, s->linesize, 4);
eeab02251056 more prefetches, 2% faster h264
lorenm
parents: 3993
diff changeset
2481 s->dsp.prefetch(dest_cb + (s->mb_x&7)*s->uvlinesize + 64, dest_cr - dest_cb, 2);
eeab02251056 more prefetches, 2% faster h264
lorenm
parents: 3993
diff changeset
2482
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2483 if (!simple && MB_FIELD) {
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2484 linesize = h->mb_linesize = s->linesize * 2;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2485 uvlinesize = h->mb_uvlinesize = s->uvlinesize * 2;
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2486 block_offset = &h->block_offset[24];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2487 if(mb_y&1){ //FIXME move out of this func?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2488 dest_y -= s->linesize*15;
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2489 dest_cb-= s->uvlinesize*7;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2490 dest_cr-= s->uvlinesize*7;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2491 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2492 if(FRAME_MBAFF) {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2493 int list;
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
2494 for(list=0; list<h->list_count; list++){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2495 if(!USES_LIST(mb_type, list))
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2496 continue;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2497 if(IS_16X16(mb_type)){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2498 int8_t *ref = &h->ref_cache[list][scan8[0]];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2499 fill_rectangle(ref, 4, 4, 8, 16+*ref^(s->mb_y&1), 1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2500 }else{
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2501 for(i=0; i<16; i+=4){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2502 //FIXME can refs be smaller than 8x8 when !direct_8x8_inference ?
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2503 int ref = h->ref_cache[list][scan8[i]];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2504 if(ref >= 0)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2505 fill_rectangle(&h->ref_cache[list][scan8[i]], 2, 2, 8, 16+ref^(s->mb_y&1), 1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2506 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2507 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2508 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2509 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2510 } else {
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2511 linesize = h->mb_linesize = s->linesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2512 uvlinesize = h->mb_uvlinesize = s->uvlinesize;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2513 // dct_offset = s->linesize * 16;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2514 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2515
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2516 if(transform_bypass){
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2517 idct_dc_add =
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2518 idct_add = IS_8x8DCT(mb_type) ? s->dsp.add_pixels8 : s->dsp.add_pixels4;
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2519 }else if(IS_8x8DCT(mb_type)){
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2520 idct_dc_add = s->dsp.h264_idct8_dc_add;
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2521 idct_add = s->dsp.h264_idct8_add;
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2522 }else{
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2523 idct_dc_add = s->dsp.h264_idct_dc_add;
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2524 idct_add = s->dsp.h264_idct_add;
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2525 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2526
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2527 if(!simple && FRAME_MBAFF && h->deblocking_filter && IS_INTRA(mb_type)
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2528 && (!bottom || !IS_INTRA(s->current_picture.mb_type[mb_xy-s->mb_stride]))){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2529 int mbt_y = mb_y&~1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2530 uint8_t *top_y = s->current_picture.data[0] + (mbt_y * 16* s->linesize ) + mb_x * 16;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2531 uint8_t *top_cb = s->current_picture.data[1] + (mbt_y * 8 * s->uvlinesize) + mb_x * 8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2532 uint8_t *top_cr = s->current_picture.data[2] + (mbt_y * 8 * s->uvlinesize) + mb_x * 8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2533 xchg_pair_border(h, top_y, top_cb, top_cr, s->linesize, s->uvlinesize, 1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2534 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2535
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2536 if (!simple && IS_INTRA_PCM(mb_type)) {
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2537 unsigned int x, y;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2538
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2539 // The pixels are stored in h->mb array in the same order as levels,
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2540 // copy them in output in the correct order.
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2541 for(i=0; i<16; i++) {
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2542 for (y=0; y<4; y++) {
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2543 for (x=0; x<4; x++) {
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2544 *(dest_y + block_offset[i] + y*linesize + x) = h->mb[i*16+y*4+x];
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2545 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2546 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2547 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2548 for(i=16; i<16+4; i++) {
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2549 for (y=0; y<4; y++) {
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2550 for (x=0; x<4; x++) {
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2551 *(dest_cb + block_offset[i] + y*uvlinesize + x) = h->mb[i*16+y*4+x];
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2552 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2553 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2554 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2555 for(i=20; i<20+4; i++) {
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2556 for (y=0; y<4; y++) {
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2557 for (x=0; x<4; x++) {
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2558 *(dest_cr + block_offset[i] + y*uvlinesize + x) = h->mb[i*16+y*4+x];
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2559 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2560 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2561 }
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2562 } else {
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2563 if(IS_INTRA(mb_type)){
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2564 if(h->deblocking_filter && (simple || !FRAME_MBAFF))
5106
ddb5abe164f3 h264: use 'simple' in border backup / xchg
benoit
parents: 5093
diff changeset
2565 xchg_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, 1, simple);
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2566
5434
4f2e3ef72b32 use ENABLE_GRAY
michael
parents: 5425
diff changeset
2567 if(simple || !ENABLE_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
5638
4a26dc4ca11d Move H.264 intra prediction functions into their own context
kostya
parents: 5631
diff changeset
2568 h->hpc.pred8x8[ h->chroma_pred_mode ](dest_cb, uvlinesize);
4a26dc4ca11d Move H.264 intra prediction functions into their own context
kostya
parents: 5631
diff changeset
2569 h->hpc.pred8x8[ h->chroma_pred_mode ](dest_cr, uvlinesize);
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2570 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2571
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2572 if(IS_INTRA4x4(mb_type)){
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2573 if(simple || !s->encoding){
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2574 if(IS_8x8DCT(mb_type)){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2575 for(i=0; i<16; i+=4){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2576 uint8_t * const ptr= dest_y + block_offset[i];
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2577 const int dir= h->intra4x4_pred_mode_cache[ scan8[i] ];
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2578 const int nnz = h->non_zero_count_cache[ scan8[i] ];
5638
4a26dc4ca11d Move H.264 intra prediction functions into their own context
kostya
parents: 5631
diff changeset
2579 h->hpc.pred8x8l[ dir ](ptr, (h->topleft_samples_available<<i)&0x8000,
4546
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
2580 (h->topright_samples_available<<i)&0x4000, linesize);
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2581 if(nnz){
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2582 if(nnz == 1 && h->mb[i*16])
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2583 idct_dc_add(ptr, h->mb + i*16, linesize);
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2584 else
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2585 idct_add(ptr, h->mb + i*16, linesize);
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2586 }
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2587 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2588 }else
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2589 for(i=0; i<16; i++){
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2590 uint8_t * const ptr= dest_y + block_offset[i];
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2591 uint8_t *topright;
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2592 const int dir= h->intra4x4_pred_mode_cache[ scan8[i] ];
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2593 int nnz, tr;
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2594
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2595 if(dir == DIAG_DOWN_LEFT_PRED || dir == VERT_LEFT_PRED){
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2596 const int topright_avail= (h->topright_samples_available<<i)&0x8000;
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2597 assert(mb_y || linesize <= block_offset[i]);
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2598 if(!topright_avail){
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2599 tr= ptr[3 - linesize]*0x01010101;
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2600 topright= (uint8_t*) &tr;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2601 }else
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2602 topright= ptr + 4 - linesize;
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2603 }else
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2604 topright= NULL;
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2605
5638
4a26dc4ca11d Move H.264 intra prediction functions into their own context
kostya
parents: 5631
diff changeset
2606 h->hpc.pred4x4[ dir ](ptr, topright, linesize);
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2607 nnz = h->non_zero_count_cache[ scan8[i] ];
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2608 if(nnz){
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2609 if(is_h264){
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2610 if(nnz == 1 && h->mb[i*16])
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2611 idct_dc_add(ptr, h->mb + i*16, linesize);
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2612 else
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2613 idct_add(ptr, h->mb + i*16, linesize);
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2614 }else
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2615 svq3_add_idct_c(ptr, h->mb + i*16, linesize, s->qscale, 0);
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2616 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2617 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2618 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2619 }else{
5638
4a26dc4ca11d Move H.264 intra prediction functions into their own context
kostya
parents: 5631
diff changeset
2620 h->hpc.pred16x16[ h->intra16x16_pred_mode ](dest_y , linesize);
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2621 if(is_h264){
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
2622 if(!transform_bypass)
5727
0591d5928fe8 Remove redundant test.
takis
parents: 5723
diff changeset
2623 h264_luma_dc_dequant_idct_c(h->mb, s->qscale, h->dequant4_coeff[0][s->qscale][0]);
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
2624 }else
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2625 svq3_luma_dc_dequant_idct_c(h->mb, s->qscale);
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2626 }
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2627 if(h->deblocking_filter && (simple || !FRAME_MBAFF))
5106
ddb5abe164f3 h264: use 'simple' in border backup / xchg
benoit
parents: 5093
diff changeset
2628 xchg_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, 0, simple);
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2629 }else if(is_h264){
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2630 hl_motion(h, dest_y, dest_cb, dest_cr,
3807
6a40092eb9e6 approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents: 3776
diff changeset
2631 s->me.qpel_put, s->dsp.put_h264_chroma_pixels_tab,
6a40092eb9e6 approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents: 3776
diff changeset
2632 s->me.qpel_avg, s->dsp.avg_h264_chroma_pixels_tab,
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2633 s->dsp.weight_h264_pixels_tab, s->dsp.biweight_h264_pixels_tab);
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2634 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2635
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2636
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2637 if(!IS_INTRA4x4(mb_type)){
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2638 if(is_h264){
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2639 if(IS_INTRA16x16(mb_type)){
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2640 for(i=0; i<16; i++){
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2641 if(h->non_zero_count_cache[ scan8[i] ])
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2642 idct_add(dest_y + block_offset[i], h->mb + i*16, linesize);
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2643 else if(h->mb[i*16])
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2644 idct_dc_add(dest_y + block_offset[i], h->mb + i*16, linesize);
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2645 }
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2646 }else{
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2647 const int di = IS_8x8DCT(mb_type) ? 4 : 1;
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2648 for(i=0; i<16; i+=di){
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2649 int nnz = h->non_zero_count_cache[ scan8[i] ];
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2650 if(nnz){
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2651 if(nnz==1 && h->mb[i*16])
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2652 idct_dc_add(dest_y + block_offset[i], h->mb + i*16, linesize);
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2653 else
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2654 idct_add(dest_y + block_offset[i], h->mb + i*16, linesize);
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2655 }
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2656 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2657 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2658 }else{
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2659 for(i=0; i<16; i++){
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2660 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ //FIXME benchmark weird rule, & below
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2661 uint8_t * const ptr= dest_y + block_offset[i];
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2662 svq3_add_idct_c(ptr, h->mb + i*16, linesize, s->qscale, IS_INTRA(mb_type) ? 1 : 0);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2663 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2664 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2665 }
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2666 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2667
5434
4f2e3ef72b32 use ENABLE_GRAY
michael
parents: 5425
diff changeset
2668 if(simple || !ENABLE_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2669 uint8_t *dest[2] = {dest_cb, dest_cr};
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2670 if(transform_bypass){
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2671 idct_add = idct_dc_add = s->dsp.add_pixels4;
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2672 }else{
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2673 idct_add = s->dsp.h264_idct_add;
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2674 idct_dc_add = s->dsp.h264_idct_dc_add;
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
2675 chroma_dc_dequant_idct_c(h->mb + 16*16, h->chroma_qp[0], h->dequant4_coeff[IS_INTRA(mb_type) ? 1:4][h->chroma_qp[0]][0]);
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
2676 chroma_dc_dequant_idct_c(h->mb + 16*16+4*16, h->chroma_qp[1], h->dequant4_coeff[IS_INTRA(mb_type) ? 2:5][h->chroma_qp[1]][0]);
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
2677 }
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2678 if(is_h264){
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2679 for(i=16; i<16+8; i++){
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2680 if(h->non_zero_count_cache[ scan8[i] ])
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2681 idct_add(dest[(i&4)>>2] + block_offset[i], h->mb + i*16, uvlinesize);
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2682 else if(h->mb[i*16])
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2683 idct_dc_add(dest[(i&4)>>2] + block_offset[i], h->mb + i*16, uvlinesize);
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2684 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2685 }else{
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2686 for(i=16; i<16+8; i++){
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2687 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2688 uint8_t * const ptr= dest[(i&4)>>2] + block_offset[i];
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2689 svq3_add_idct_c(ptr, h->mb + i*16, uvlinesize, chroma_qp[s->qscale + 12] - 12, 2);
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2690 }
1250
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
2691 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2692 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2693 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2694 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2695 if(h->deblocking_filter) {
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2696 if (!simple && FRAME_MBAFF) {
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2697 //FIXME try deblocking one mb at a time?
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2698 // the reduction in load/storing mvs and such might outweigh the extra backup/xchg_border
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2699 const int mb_y = s->mb_y - 1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2700 uint8_t *pair_dest_y, *pair_dest_cb, *pair_dest_cr;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2701 const int mb_xy= mb_x + mb_y*s->mb_stride;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2702 const int mb_type_top = s->current_picture.mb_type[mb_xy];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2703 const int mb_type_bottom= s->current_picture.mb_type[mb_xy+s->mb_stride];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2704 if (!bottom) return;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2705 pair_dest_y = s->current_picture.data[0] + (mb_y * 16* s->linesize ) + mb_x * 16;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2706 pair_dest_cb = s->current_picture.data[1] + (mb_y * 8 * s->uvlinesize) + mb_x * 8;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2707 pair_dest_cr = s->current_picture.data[2] + (mb_y * 8 * s->uvlinesize) + mb_x * 8;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2708
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2709 if(IS_INTRA(mb_type_top | mb_type_bottom))
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2710 xchg_pair_border(h, pair_dest_y, pair_dest_cb, pair_dest_cr, s->linesize, s->uvlinesize, 0);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2711
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2712 backup_pair_border(h, pair_dest_y, pair_dest_cb, pair_dest_cr, s->linesize, s->uvlinesize);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2713 // deblock a pair
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2714 // top
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2715 s->mb_y--;
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
2716 tprintf(h->s.avctx, "call mbaff filter_mb mb_x:%d mb_y:%d pair_dest_y = %p, dest_y = %p\n", mb_x, mb_y, pair_dest_y, dest_y);
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
2717 fill_caches(h, mb_type_top, 1); //FIXME don't fill stuff which isn't used by filter_mb
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
2718 h->chroma_qp[0] = get_chroma_qp(h, 0, s->current_picture.qscale_table[mb_xy]);
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
2719 h->chroma_qp[1] = get_chroma_qp(h, 1, s->current_picture.qscale_table[mb_xy]);
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2720 filter_mb(h, mb_x, mb_y, pair_dest_y, pair_dest_cb, pair_dest_cr, linesize, uvlinesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2721 // bottom
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2722 s->mb_y++;
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
2723 tprintf(h->s.avctx, "call mbaff filter_mb\n");
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
2724 fill_caches(h, mb_type_bottom, 1); //FIXME don't fill stuff which isn't used by filter_mb
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
2725 h->chroma_qp[0] = get_chroma_qp(h, 0, s->current_picture.qscale_table[mb_xy+s->mb_stride]);
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
2726 h->chroma_qp[1] = get_chroma_qp(h, 1, s->current_picture.qscale_table[mb_xy+s->mb_stride]);
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2727 filter_mb(h, mb_x, mb_y+1, dest_y, dest_cb, dest_cr, linesize, uvlinesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2728 } else {
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
2729 tprintf(h->s.avctx, "call filter_mb\n");
5106
ddb5abe164f3 h264: use 'simple' in border backup / xchg
benoit
parents: 5093
diff changeset
2730 backup_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, simple);
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
2731 fill_caches(h, mb_type, 1); //FIXME don't fill stuff which isn't used by filter_mb
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
2732 filter_mb_fast(h, mb_x, mb_y, dest_y, dest_cb, dest_cr, linesize, uvlinesize);
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2733 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2734 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2735 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2736
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2737 /**
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2738 * Process a macroblock; this case avoids checks for expensive uncommon cases.
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2739 */
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2740 static void hl_decode_mb_simple(H264Context *h){
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2741 hl_decode_mb_internal(h, 1);
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2742 }
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2743
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2744 /**
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2745 * Process a macroblock; this handles edge cases, such as interlacing.
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2746 */
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2747 static void av_noinline hl_decode_mb_complex(H264Context *h){
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2748 hl_decode_mb_internal(h, 0);
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2749 }
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2750
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2751 static void hl_decode_mb(H264Context *h){
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2752 MpegEncContext * const s = &h->s;
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2753 const int mb_x= s->mb_x;
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2754 const int mb_y= s->mb_y;
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2755 const int mb_xy= mb_x + mb_y*s->mb_stride;
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2756 const int mb_type= s->current_picture.mb_type[mb_xy];
5434
4f2e3ef72b32 use ENABLE_GRAY
michael
parents: 5425
diff changeset
2757 int is_complex = FRAME_MBAFF || MB_FIELD || IS_INTRA_PCM(mb_type) || s->codec_id != CODEC_ID_H264 || (ENABLE_GRAY && (s->flags&CODEC_FLAG_GRAY)) || s->encoding;
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2758
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2759 if(!s->decode)
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2760 return;
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2761
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2762 if (is_complex)
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2763 hl_decode_mb_complex(h);
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2764 else hl_decode_mb_simple(h);
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2765 }
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2766
5778
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2767 static void pic_as_field(Picture *pic, const int bottom){
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2768 int i;
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2769 for (i = 0; i < 4; ++i) {
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2770 if (bottom)
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2771 pic->data[i] += pic->linesize[i];
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2772 pic->linesize[i] *= 2;
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2773 }
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2774 }
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2775
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2776 static int split_field_copy(Picture *dest, Picture *src,
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2777 int parity, int id_add){
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2778 int match = !!(src->reference & parity);
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2779
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2780 if (match) {
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2781 *dest = *src;
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2782 pic_as_field(dest, parity == PICT_BOTTOM_FIELD);
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2783 dest->pic_id *= 2;
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2784 dest->pic_id += id_add;
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2785 }
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2786
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2787 return match;
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2788 }
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2789
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2790 /**
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2791 * Split one reference list into field parts, interleaving by parity
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2792 * as per H.264 spec section 8.2.4.2.5. Output fields have their data pointers
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2793 * set to look at the actual start of data for that field.
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2794 *
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2795 * @param dest output list
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2796 * @param dest_len maximum number of fields to put in dest
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2797 * @param src the source reference list containing fields and/or field pairs
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2798 * (aka short_ref/long_ref, or
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2799 * refFrameListXShortTerm/refFrameListLongTerm in spec-speak)
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2800 * @param src_len number of Picture's in source (pairs and unmatched fields)
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2801 * @param parity the parity of the picture being decoded/needing
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2802 * these ref pics (PICT_{TOP,BOTTOM}_FIELD)
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2803 * @return number of fields placed in dest
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2804 */
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2805 static int split_field_half_ref_list(Picture *dest, int dest_len,
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2806 Picture *src, int src_len, int parity){
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2807 int same_parity = 1;
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2808 int same_i = 0;
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2809 int opp_i = 0;
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2810 int out_i;
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2811 int field_output;
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2812
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2813 for (out_i = 0; out_i < dest_len; out_i += field_output) {
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2814 if (same_parity && same_i < src_len) {
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2815 field_output = split_field_copy(dest + out_i, src + same_i,
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2816 parity, 1);
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2817 same_parity = !field_output;
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2818 same_i++;
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2819
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2820 } else if (opp_i < src_len) {
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2821 field_output = split_field_copy(dest + out_i, src + opp_i,
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2822 PICT_FRAME - parity, 0);
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2823 same_parity = field_output;
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2824 opp_i++;
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2825
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2826 } else {
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2827 break;
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2828 }
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2829 }
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2830
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2831 return out_i;
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2832 }
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2833
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2834 /**
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2835 * Split the reference frame list into a reference field list.
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2836 * This implements H.264 spec 8.2.4.2.5 for a combined input list.
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2837 * The input list contains both reference field pairs and
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2838 * unmatched reference fields; it is ordered as spec describes
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2839 * RefPicListX for frames in 8.2.4.2.1 and 8.2.4.2.3, except that
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2840 * unmatched field pairs are also present. Conceptually this is equivalent
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2841 * to concatenation of refFrameListXShortTerm with refFrameListLongTerm.
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2842 *
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2843 * @param dest output reference list where ordered fields are to be placed
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2844 * @param dest_len max number of fields to place at dest
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2845 * @param src source reference list, as described above
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2846 * @param src_len number of pictures (pairs and unmatched fields) in src
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2847 * @param parity parity of field being currently decoded
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2848 * (one of PICT_{TOP,BOTTOM}_FIELD)
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2849 * @param long_i index into src array that holds first long reference picture,
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2850 * or src_len if no long refs present.
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2851 */
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2852 static int split_field_ref_list(Picture *dest, int dest_len,
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2853 Picture *src, int src_len,
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2854 int parity, int long_i){
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2855
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2856 int i = split_field_half_ref_list(dest, dest_len, src, long_i, parity);
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2857 dest += i;
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2858 dest_len -= i;
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2859
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2860 i += split_field_half_ref_list(dest, dest_len, src + long_i,
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2861 src_len - long_i, parity);
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2862 return i;
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2863 }
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2864
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2865 /**
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2866 * fills the default_ref_list.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2867 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2868 static int fill_default_ref_list(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2869 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2870 int i;
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
2871 int smallest_poc_greater_than_current = -1;
5778
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2872 int structure_sel;
2582
3c27a074de7a allow 16 refs with B-frames
lorenm
parents: 2581
diff changeset
2873 Picture sorted_short_ref[32];
5778
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2874 Picture field_entry_list[2][32];
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2875 Picture *frame_list[2];
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2876
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2877 if (FIELD_PICTURE) {
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2878 structure_sel = PICT_FRAME;
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2879 frame_list[0] = field_entry_list[0];
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2880 frame_list[1] = field_entry_list[1];
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2881 } else {
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2882 structure_sel = 0;
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2883 frame_list[0] = h->default_ref_list[0];
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2884 frame_list[1] = h->default_ref_list[1];
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2885 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2886
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2887 if(h->slice_type==B_TYPE){
5778
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2888 int list;
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2889 int len[2];
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2890 int short_len[2];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2891 int out_i;
2713
16258de8ae06 fix crash on negative POC
lorenm
parents: 2707
diff changeset
2892 int limit= INT_MIN;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2893
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
2894 /* sort frame according to poc in B slice */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2895 for(out_i=0; out_i<h->short_ref_count; out_i++){
2713
16258de8ae06 fix crash on negative POC
lorenm
parents: 2707
diff changeset
2896 int best_i=INT_MIN;
2255
507690ff49a2 assertion when playing AVC/H.264 streams fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2254
diff changeset
2897 int best_poc=INT_MAX;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2898
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2899 for(i=0; i<h->short_ref_count; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2900 const int poc= h->short_ref[i]->poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2901 if(poc > limit && poc < best_poc){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2902 best_poc= poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2903 best_i= i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2904 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2905 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2906
2713
16258de8ae06 fix crash on negative POC
lorenm
parents: 2707
diff changeset
2907 assert(best_i != INT_MIN);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2908
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2909 limit= best_poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2910 sorted_short_ref[out_i]= *h->short_ref[best_i];
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
2911 tprintf(h->s.avctx, "sorted poc: %d->%d poc:%d fn:%d\n", best_i, out_i, sorted_short_ref[out_i].poc, sorted_short_ref[out_i].frame_num);
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
2912 if (-1 == smallest_poc_greater_than_current) {
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
2913 if (h->short_ref[best_i]->poc >= s->current_picture_ptr->poc) {
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
2914 smallest_poc_greater_than_current = out_i;
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
2915 }
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
2916 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2917 }
5778
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2918
5779
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2919 tprintf(h->s.avctx, "current poc: %d, smallest_poc_greater_than_current: %d\n", s->current_picture_ptr->poc, smallest_poc_greater_than_current);
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2920
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2921 // find the largest poc
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2922 for(list=0; list<2; list++){
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2923 int index = 0;
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2924 int j= -99;
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2925 int step= list ? -1 : 1;
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2926
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2927 for(i=0; i<h->short_ref_count && index < h->ref_count[list]; i++, j+=step) {
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2928 int sel;
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2929 while(j<0 || j>= h->short_ref_count){
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2930 if(j != -99 && step == (list ? -1 : 1))
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2931 return -1;
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2932 step = -step;
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2933 j= smallest_poc_greater_than_current + (step>>1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2934 }
5779
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2935 sel = sorted_short_ref[j].reference | structure_sel;
5778
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2936 if(sel != PICT_FRAME) continue;
5779
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2937 frame_list[list][index ]= sorted_short_ref[j];
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2938 frame_list[list][index++].pic_id= sorted_short_ref[j].frame_num;
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2939 }
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2940 short_len[list] = index;
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2941
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2942 for(i = 0; i < 16 && index < h->ref_count[ list ]; i++){
5778
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2943 int sel;
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
2944 if(h->long_ref[i] == NULL) continue;
5778
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2945 sel = h->long_ref[i]->reference | structure_sel;
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2946 if(sel != PICT_FRAME) continue;
5779
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2947
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2948 frame_list[ list ][index ]= *h->long_ref[i];
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2949 frame_list[ list ][index++].pic_id= i;;
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2950 }
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2951 len[list] = index;
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2952
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2953 if(list && (smallest_poc_greater_than_current<=0 || smallest_poc_greater_than_current>=h->short_ref_count) && (1 < index)){
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2954 // swap the two first elements of L1 when
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2955 // L0 and L1 are identical
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2956 Picture temp= frame_list[1][0];
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2957 frame_list[1][0] = frame_list[1][1];
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2958 frame_list[1][1] = temp;
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2959 }
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2960
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2961 }
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2962
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2963 for(list=0; list<2; list++){
5778
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2964 if (FIELD_PICTURE)
5779
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2965 len[list] = split_field_ref_list(h->default_ref_list[list],
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2966 h->ref_count[list],
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2967 frame_list[list],
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2968 len[list],
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2969 s->picture_structure,
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2970 short_len[list]);
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2971
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2972 if(len[list] < h->ref_count[ list ])
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2973 memset(&h->default_ref_list[list][len[list]], 0, sizeof(Picture)*(h->ref_count[ list ] - len[list]));
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2974 }
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2975
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2976
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2977 }else{
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2978 int index=0;
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2979 int short_len;
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2980 for(i=0; i<h->short_ref_count; i++){
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2981 int sel;
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2982 sel = h->short_ref[i]->reference | structure_sel;
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2983 if(sel != PICT_FRAME) continue;
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2984 frame_list[0][index ]= *h->short_ref[i];
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2985 frame_list[0][index++].pic_id= h->short_ref[i]->frame_num;
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2986 }
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2987 short_len = index;
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2988 for(i = 0; i < 16; i++){
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2989 int sel;
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2990 if(h->long_ref[i] == NULL) continue;
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2991 sel = h->long_ref[i]->reference | structure_sel;
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2992 if(sel != PICT_FRAME) continue;
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2993 frame_list[0][index ]= *h->long_ref[i];
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2994 frame_list[0][index++].pic_id= i;;
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2995 }
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2996
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2997 if (FIELD_PICTURE)
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2998 index = split_field_ref_list(h->default_ref_list[0],
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2999 h->ref_count[0], frame_list[0],
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
3000 index, s->picture_structure,
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
3001 short_len);
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
3002
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
3003 if(index < h->ref_count[0])
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
3004 memset(&h->default_ref_list[0][index], 0, sizeof(Picture)*(h->ref_count[0] - index));
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3005 }
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3006 #ifdef TRACE
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3007 for (i=0; i<h->ref_count[0]; i++) {
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
3008 tprintf(h->s.avctx, "List0: %s fn:%d 0x%p\n", (h->default_ref_list[0][i].long_ref ? "LT" : "ST"), h->default_ref_list[0][i].pic_id, h->default_ref_list[0][i].data[0]);
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3009 }
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3010 if(h->slice_type==B_TYPE){
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3011 for (i=0; i<h->ref_count[1]; i++) {
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
3012 tprintf(h->s.avctx, "List1: %s fn:%d 0x%p\n", (h->default_ref_list[1][i].long_ref ? "LT" : "ST"), h->default_ref_list[1][i].pic_id, h->default_ref_list[0][i].data[0]);
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3013 }
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3014 }
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3015 #endif
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3016 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3017 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3018
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3019 static void print_short_term(H264Context *h);
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3020 static void print_long_term(H264Context *h);
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3021
5780
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3022 /**
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3023 * Extract structure information about the picture described by pic_num in
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3024 * the current decoding context (frame or field). Note that pic_num is
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3025 * picture number without wrapping (so, 0<=pic_num<max_pic_num).
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3026 * @param pic_num picture number for which to extract structure information
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3027 * @param structure one of PICT_XXX describing structure of picture
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3028 * with pic_num
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3029 * @return frame number (short term) or long term index of picture
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3030 * described by pic_num
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3031 */
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3032 static int pic_num_extract(H264Context *h, int pic_num, int *structure){
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3033 MpegEncContext * const s = &h->s;
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3034
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3035 *structure = s->picture_structure;
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3036 if(FIELD_PICTURE){
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3037 if (!(pic_num & 1))
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3038 /* opposite field */
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3039 *structure ^= PICT_FRAME;
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3040 pic_num >>= 1;
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3041 }
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3042
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3043 return pic_num;
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3044 }
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3045
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3046 static int decode_ref_pic_list_reordering(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3047 MpegEncContext * const s = &h->s;
5780
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3048 int list, index, pic_structure;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3049
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3050 print_short_term(h);
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3051 print_long_term(h);
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
3052 if(h->slice_type==I_TYPE || h->slice_type==SI_TYPE) return 0; //FIXME move before func
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3053
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
3054 for(list=0; list<h->list_count; list++){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3055 memcpy(h->ref_list[list], h->default_ref_list[list], sizeof(Picture)*h->ref_count[list]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3056
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3057 if(get_bits1(&s->gb)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3058 int pred= h->curr_pic_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3059
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3060 for(index=0; ; index++){
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3061 unsigned int reordering_of_pic_nums_idc= get_ue_golomb(&s->gb);
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3062 unsigned int pic_id;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3063 int i;
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
3064 Picture *ref = NULL;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3065
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3066 if(reordering_of_pic_nums_idc==3)
2284
6d26e105f68f h.264 ref list reordering bugfix patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2272
diff changeset
3067 break;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3068
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3069 if(index >= h->ref_count[list]){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3070 av_log(h->s.avctx, AV_LOG_ERROR, "reference count overflow\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3071 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3072 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3073
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3074 if(reordering_of_pic_nums_idc<3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3075 if(reordering_of_pic_nums_idc<2){
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3076 const unsigned int abs_diff_pic_num= get_ue_golomb(&s->gb) + 1;
5780
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3077 int frame_num;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3078
5805
12b1717f80a3 fix incorrect check for abs_diff_pic_num overflow
andoma
parents: 5803
diff changeset
3079 if(abs_diff_pic_num > h->max_pic_num){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3080 av_log(h->s.avctx, AV_LOG_ERROR, "abs_diff_pic_num overflow\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3081 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3082 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3083
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3084 if(reordering_of_pic_nums_idc == 0) pred-= abs_diff_pic_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3085 else pred+= abs_diff_pic_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3086 pred &= h->max_pic_num - 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3087
5780
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3088 frame_num = pic_num_extract(h, pred, &pic_structure);
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3089
2683
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
3090 for(i= h->short_ref_count-1; i>=0; i--){
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
3091 ref = h->short_ref[i];
5780
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3092 assert(ref->reference);
2683
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
3093 assert(!ref->long_ref);
5780
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3094 if(ref->data[0] != NULL &&
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3095 ref->frame_num == frame_num &&
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3096 (ref->reference & pic_structure) &&
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3097 ref->long_ref == 0) // ignore non existing pictures by testing data[0] pointer
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3098 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3099 }
2683
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
3100 if(i>=0)
5780
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3101 ref->pic_id= pred;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3102 }else{
5780
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3103 int long_idx;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3104 pic_id= get_ue_golomb(&s->gb); //long_term_pic_idx
5780
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3105
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3106 long_idx= pic_num_extract(h, pic_id, &pic_structure);
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3107
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3108 if(long_idx>31){
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3109 av_log(h->s.avctx, AV_LOG_ERROR, "long_term_pic_idx overflow\n");
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3110 return -1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3111 }
5780
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3112 ref = h->long_ref[long_idx];
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3113 assert(!(ref && !ref->reference));
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3114 if(ref && (ref->reference & pic_structure)){
4362
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
3115 ref->pic_id= pic_id;
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
3116 assert(ref->long_ref);
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
3117 i=0;
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
3118 }else{
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
3119 i=-1;
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
3120 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3121 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3122
2485
2844b8cf4e11 H.264 multiplce instance in reference list patch by (Loic <lll+ffmpeg m4x org )
michael
parents: 2484
diff changeset
3123 if (i < 0) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3124 av_log(h->s.avctx, AV_LOG_ERROR, "reference picture missing during reorder\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3125 memset(&h->ref_list[list][index], 0, sizeof(Picture)); //FIXME
2683
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
3126 } else {
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
3127 for(i=index; i+1<h->ref_count[list]; i++){
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
3128 if(ref->long_ref == h->ref_list[list][i].long_ref && ref->pic_id == h->ref_list[list][i].pic_id)
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
3129 break;
2650
d321fbf0b2ce reverse 1 hunk from 1.96->1.97, fixes decoding of (MR1_BT_A.h264 and MR1_MW_A.264)
michael
parents: 2649
diff changeset
3130 }
d321fbf0b2ce reverse 1 hunk from 1.96->1.97, fixes decoding of (MR1_BT_A.h264 and MR1_MW_A.264)
michael
parents: 2649
diff changeset
3131 for(; i > index; i--){
d321fbf0b2ce reverse 1 hunk from 1.96->1.97, fixes decoding of (MR1_BT_A.h264 and MR1_MW_A.264)
michael
parents: 2649
diff changeset
3132 h->ref_list[list][i]= h->ref_list[list][i-1];
d321fbf0b2ce reverse 1 hunk from 1.96->1.97, fixes decoding of (MR1_BT_A.h264 and MR1_MW_A.264)
michael
parents: 2649
diff changeset
3133 }
2683
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
3134 h->ref_list[list][index]= *ref;
5780
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3135 if (FIELD_PICTURE){
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3136 int bot = pic_structure == PICT_BOTTOM_FIELD;
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3137 pic_as_field(&h->ref_list[list][index], bot);
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
3138 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3139 }
2284
6d26e105f68f h.264 ref list reordering bugfix patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2272
diff changeset
3140 }else{
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3141 av_log(h->s.avctx, AV_LOG_ERROR, "illegal reordering_of_pic_nums_idc\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3142 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3143 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3144 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3145 }
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
3146 }
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
3147 for(list=0; list<h->list_count; list++){
2680
1a6192e0b1f9 fill missing reference pictures with something to avoid assertion failure
michael
parents: 2675
diff changeset
3148 for(index= 0; index < h->ref_count[list]; index++){
1a6192e0b1f9 fill missing reference pictures with something to avoid assertion failure
michael
parents: 2675
diff changeset
3149 if(!h->ref_list[list][index].data[0])
1a6192e0b1f9 fill missing reference pictures with something to avoid assertion failure
michael
parents: 2675
diff changeset
3150 h->ref_list[list][index]= s->current_picture;
1a6192e0b1f9 fill missing reference pictures with something to avoid assertion failure
michael
parents: 2675
diff changeset
3151 }
1a6192e0b1f9 fill missing reference pictures with something to avoid assertion failure
michael
parents: 2675
diff changeset
3152 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3153
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3154 if(h->slice_type==B_TYPE && !h->direct_spatial_mv_pred)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3155 direct_dist_scale_factor(h);
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
3156 direct_ref_list_init(h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3157 return 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3158 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3159
3379
69901769c811 fill_mbaff_ref_list is missing a return statement, its return value
mru
parents: 3341
diff changeset
3160 static void fill_mbaff_ref_list(H264Context *h){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3161 int list, i, j;
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
3162 for(list=0; list<2; list++){ //FIXME try list_count
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3163 for(i=0; i<h->ref_count[list]; i++){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3164 Picture *frame = &h->ref_list[list][i];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3165 Picture *field = &h->ref_list[list][16+2*i];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3166 field[0] = *frame;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3167 for(j=0; j<3; j++)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3168 field[0].linesize[j] <<= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3169 field[1] = field[0];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3170 for(j=0; j<3; j++)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3171 field[1].data[j] += frame->linesize[j];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3172
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3173 h->luma_weight[list][16+2*i] = h->luma_weight[list][16+2*i+1] = h->luma_weight[list][i];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3174 h->luma_offset[list][16+2*i] = h->luma_offset[list][16+2*i+1] = h->luma_offset[list][i];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3175 for(j=0; j<2; j++){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3176 h->chroma_weight[list][16+2*i][j] = h->chroma_weight[list][16+2*i+1][j] = h->chroma_weight[list][i][j];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3177 h->chroma_offset[list][16+2*i][j] = h->chroma_offset[list][16+2*i+1][j] = h->chroma_offset[list][i][j];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3178 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3179 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3180 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3181 for(j=0; j<h->ref_count[1]; j++){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3182 for(i=0; i<h->ref_count[0]; i++)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3183 h->implicit_weight[j][16+2*i] = h->implicit_weight[j][16+2*i+1] = h->implicit_weight[j][i];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3184 memcpy(h->implicit_weight[16+2*j], h->implicit_weight[j], sizeof(*h->implicit_weight));
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3185 memcpy(h->implicit_weight[16+2*j+1], h->implicit_weight[j], sizeof(*h->implicit_weight));
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3186 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3187 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3188
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3189 static int pred_weight_table(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3190 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3191 int list, i;
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3192 int luma_def, chroma_def;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3193
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3194 h->use_weight= 0;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3195 h->use_weight_chroma= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3196 h->luma_log2_weight_denom= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3197 h->chroma_log2_weight_denom= get_ue_golomb(&s->gb);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3198 luma_def = 1<<h->luma_log2_weight_denom;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3199 chroma_def = 1<<h->chroma_log2_weight_denom;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3200
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3201 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3202 for(i=0; i<h->ref_count[list]; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3203 int luma_weight_flag, chroma_weight_flag;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3204
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3205 luma_weight_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3206 if(luma_weight_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3207 h->luma_weight[list][i]= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3208 h->luma_offset[list][i]= get_se_golomb(&s->gb);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3209 if( h->luma_weight[list][i] != luma_def
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3210 || h->luma_offset[list][i] != 0)
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3211 h->use_weight= 1;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3212 }else{
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3213 h->luma_weight[list][i]= luma_def;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3214 h->luma_offset[list][i]= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3215 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3216
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3217 chroma_weight_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3218 if(chroma_weight_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3219 int j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3220 for(j=0; j<2; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3221 h->chroma_weight[list][i][j]= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3222 h->chroma_offset[list][i][j]= get_se_golomb(&s->gb);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3223 if( h->chroma_weight[list][i][j] != chroma_def
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3224 || h->chroma_offset[list][i][j] != 0)
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3225 h->use_weight_chroma= 1;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3226 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3227 }else{
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3228 int j;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3229 for(j=0; j<2; j++){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3230 h->chroma_weight[list][i][j]= chroma_def;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3231 h->chroma_offset[list][i][j]= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3232 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3233 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3234 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3235 if(h->slice_type != B_TYPE) break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3236 }
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3237 h->use_weight= h->use_weight || h->use_weight_chroma;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3238 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3239 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3240
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3241 static void implicit_weight_table(H264Context *h){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3242 MpegEncContext * const s = &h->s;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3243 int ref0, ref1;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3244 int cur_poc = s->current_picture_ptr->poc;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3245
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3246 if( h->ref_count[0] == 1 && h->ref_count[1] == 1
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3247 && h->ref_list[0][0].poc + h->ref_list[1][0].poc == 2*cur_poc){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3248 h->use_weight= 0;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3249 h->use_weight_chroma= 0;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3250 return;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3251 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3252
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3253 h->use_weight= 2;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3254 h->use_weight_chroma= 2;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3255 h->luma_log2_weight_denom= 5;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3256 h->chroma_log2_weight_denom= 5;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3257
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3258 for(ref0=0; ref0 < h->ref_count[0]; ref0++){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3259 int poc0 = h->ref_list[0][ref0].poc;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3260 for(ref1=0; ref1 < h->ref_count[1]; ref1++){
2519
b34f2cac6a71 10l in implicit_weight_table
lorenm
parents: 2509
diff changeset
3261 int poc1 = h->ref_list[1][ref1].poc;
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
3262 int td = av_clip(poc1 - poc0, -128, 127);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3263 if(td){
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
3264 int tb = av_clip(cur_poc - poc0, -128, 127);
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
3265 int tx = (16384 + (FFABS(td) >> 1)) / td;
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
3266 int dist_scale_factor = av_clip((tb*tx + 32) >> 6, -1024, 1023) >> 2;
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3267 if(dist_scale_factor < -64 || dist_scale_factor > 128)
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3268 h->implicit_weight[ref0][ref1] = 32;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3269 else
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3270 h->implicit_weight[ref0][ref1] = 64 - dist_scale_factor;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3271 }else
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3272 h->implicit_weight[ref0][ref1] = 32;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3273 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3274 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3275 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3276
5768
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3277 /**
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3278 * Mark a picture as no longer needed for reference. The refmask
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3279 * argument allows unreferencing of individual fields or the whole frame.
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3280 * If the picture becomes entirely unreferenced, but is being held for
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3281 * display purposes, it is marked as such.
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3282 * @param refmask mask of fields to unreference; the mask is bitwise
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3283 * anded with the reference marking of pic
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3284 * @return non-zero if pic becomes entirely unreferenced (except possibly
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3285 * for display purposes) zero if one of the fields remains in
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3286 * reference
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3287 */
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3288 static inline int unreference_pic(H264Context *h, Picture *pic, int refmask){
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3289 int i;
5768
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3290 if (pic->reference &= refmask) {
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3291 return 0;
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3292 } else {
5769
59049863494c Re-indent unreference_pic.
andoma
parents: 5768
diff changeset
3293 if(pic == h->delayed_output_pic)
59049863494c Re-indent unreference_pic.
andoma
parents: 5768
diff changeset
3294 pic->reference=DELAYED_PIC_REF;
59049863494c Re-indent unreference_pic.
andoma
parents: 5768
diff changeset
3295 else{
59049863494c Re-indent unreference_pic.
andoma
parents: 5768
diff changeset
3296 for(i = 0; h->delayed_pic[i]; i++)
59049863494c Re-indent unreference_pic.
andoma
parents: 5768
diff changeset
3297 if(pic == h->delayed_pic[i]){
59049863494c Re-indent unreference_pic.
andoma
parents: 5768
diff changeset
3298 pic->reference=DELAYED_PIC_REF;
59049863494c Re-indent unreference_pic.
andoma
parents: 5768
diff changeset
3299 break;
59049863494c Re-indent unreference_pic.
andoma
parents: 5768
diff changeset
3300 }
59049863494c Re-indent unreference_pic.
andoma
parents: 5768
diff changeset
3301 }
5768
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3302 return 1;
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3303 }
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3304 }
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3305
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3306 /**
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
3307 * instantaneous decoder refresh.
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3308 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3309 static void idr(H264Context *h){
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3310 int i;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3311
2484
a3188eb4266c correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents: 2471
diff changeset
3312 for(i=0; i<16; i++){
a3188eb4266c correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents: 2471
diff changeset
3313 if (h->long_ref[i] != NULL) {
5768
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3314 unreference_pic(h, h->long_ref[i], 0);
2484
a3188eb4266c correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents: 2471
diff changeset
3315 h->long_ref[i]= NULL;
a3188eb4266c correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents: 2471
diff changeset
3316 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3317 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3318 h->long_ref_count=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3319
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3320 for(i=0; i<h->short_ref_count; i++){
5768
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3321 unreference_pic(h, h->short_ref[i], 0);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3322 h->short_ref[i]= NULL;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3323 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3324 h->short_ref_count=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3325 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3326
2640
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3327 /* forget old pics after a seek */
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3328 static void flush_dpb(AVCodecContext *avctx){
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3329 H264Context *h= avctx->priv_data;
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3330 int i;
3144
84406a59134c fix a memory leak on seeking.
lorenm
parents: 3138
diff changeset
3331 for(i=0; i<16; i++) {
84406a59134c fix a memory leak on seeking.
lorenm
parents: 3138
diff changeset
3332 if(h->delayed_pic[i])
84406a59134c fix a memory leak on seeking.
lorenm
parents: 3138
diff changeset
3333 h->delayed_pic[i]->reference= 0;
2640
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3334 h->delayed_pic[i]= NULL;
3144
84406a59134c fix a memory leak on seeking.
lorenm
parents: 3138
diff changeset
3335 }
84406a59134c fix a memory leak on seeking.
lorenm
parents: 3138
diff changeset
3336 if(h->delayed_output_pic)
84406a59134c fix a memory leak on seeking.
lorenm
parents: 3138
diff changeset
3337 h->delayed_output_pic->reference= 0;
2640
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3338 h->delayed_output_pic= NULL;
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3339 idr(h);
2751
3247049dfc7a fix segfault if flush is called before the first frame
mru
parents: 2748
diff changeset
3340 if(h->s.current_picture_ptr)
3247049dfc7a fix segfault if flush is called before the first frame
mru
parents: 2748
diff changeset
3341 h->s.current_picture_ptr->reference= 0;
5798
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3342 h->s.first_field= 0;
2640
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3343 }
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3344
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3345 /**
5770
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3346 * Find a Picture in the short term reference list by frame number.
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3347 * @param frame_num frame number to search for
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3348 * @param idx the index into h->short_ref where returned picture is found
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3349 * undefined if no picture found.
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3350 * @return pointer to the found picture, or NULL if no pic with the provided
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3351 * frame number is found
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3352 */
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3353 static Picture * find_short(H264Context *h, int frame_num, int *idx){
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3354 MpegEncContext * const s = &h->s;
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3355 int i;
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3356
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3357 for(i=0; i<h->short_ref_count; i++){
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3358 Picture *pic= h->short_ref[i];
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3359 if(s->avctx->debug&FF_DEBUG_MMCO)
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3360 av_log(h->s.avctx, AV_LOG_DEBUG, "%d %d %p\n", i, pic->frame_num, pic);
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3361 if(pic->frame_num == frame_num) {
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3362 *idx = i;
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3363 return pic;
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3364 }
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3365 }
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3366 return NULL;
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3367 }
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3368
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3369 /**
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3370 * Remove a picture from the short term reference list by its index in
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3371 * that list. This does no checking on the provided index; it is assumed
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3372 * to be valid. Other list entries are shifted down.
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3373 * @param i index into h->short_ref of picture to remove.
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3374 */
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3375 static void remove_short_at_index(H264Context *h, int i){
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3376 assert(i > 0 && i < h->short_ref_count);
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3377 h->short_ref[i]= NULL;
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3378 if (--h->short_ref_count)
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3379 memmove(&h->short_ref[i], &h->short_ref[i+1], (h->short_ref_count - i)*sizeof(Picture*));
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3380 }
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3381
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3382 /**
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3383 *
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
3384 * @return the removed picture or NULL if an error occurs
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3385 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3386 static Picture * remove_short(H264Context *h, int frame_num){
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
3387 MpegEncContext * const s = &h->s;
5770
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3388 Picture *pic;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3389 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3390
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
3391 if(s->avctx->debug&FF_DEBUG_MMCO)
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3392 av_log(h->s.avctx, AV_LOG_DEBUG, "remove short %d count %d\n", frame_num, h->short_ref_count);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3393
5770
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3394 pic = find_short(h, frame_num, &i);
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3395 if (pic)
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3396 remove_short_at_index(h, i);
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3397
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3398 return pic;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3399 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3400
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3401 /**
5774
e71de81878c4 Reorganize long reference management to minimize code duplication in upcoming PAFF implementation.
andoma
parents: 5773
diff changeset
3402 * Remove a picture from the long term reference list by its index in
e71de81878c4 Reorganize long reference management to minimize code duplication in upcoming PAFF implementation.
andoma
parents: 5773
diff changeset
3403 * that list. This does no checking on the provided index; it is assumed
e71de81878c4 Reorganize long reference management to minimize code duplication in upcoming PAFF implementation.
andoma
parents: 5773
diff changeset
3404 * to be valid. The removed entry is set to NULL. Other entries are unaffected.
e71de81878c4 Reorganize long reference management to minimize code duplication in upcoming PAFF implementation.
andoma
parents: 5773
diff changeset
3405 * @param i index into h->long_ref of picture to remove.
e71de81878c4 Reorganize long reference management to minimize code duplication in upcoming PAFF implementation.
andoma
parents: 5773
diff changeset
3406 */
e71de81878c4 Reorganize long reference management to minimize code duplication in upcoming PAFF implementation.
andoma
parents: 5773
diff changeset
3407 static void remove_long_at_index(H264Context *h, int i){
e71de81878c4 Reorganize long reference management to minimize code duplication in upcoming PAFF implementation.
andoma
parents: 5773
diff changeset
3408 h->long_ref[i]= NULL;
e71de81878c4 Reorganize long reference management to minimize code duplication in upcoming PAFF implementation.
andoma
parents: 5773
diff changeset
3409 h->long_ref_count--;
e71de81878c4 Reorganize long reference management to minimize code duplication in upcoming PAFF implementation.
andoma
parents: 5773
diff changeset
3410 }
e71de81878c4 Reorganize long reference management to minimize code duplication in upcoming PAFF implementation.
andoma
parents: 5773
diff changeset
3411
e71de81878c4 Reorganize long reference management to minimize code duplication in upcoming PAFF implementation.
andoma
parents: 5773
diff changeset
3412 /**
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3413 *
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
3414 * @return the removed picture or NULL if an error occurs
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3415 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3416 static Picture * remove_long(H264Context *h, int i){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3417 Picture *pic;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3418
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3419 pic= h->long_ref[i];
5774
e71de81878c4 Reorganize long reference management to minimize code duplication in upcoming PAFF implementation.
andoma
parents: 5773
diff changeset
3420 if (pic)
e71de81878c4 Reorganize long reference management to minimize code duplication in upcoming PAFF implementation.
andoma
parents: 5773
diff changeset
3421 remove_long_at_index(h, i);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3422
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3423 return pic;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3424 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3425
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3426 /**
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3427 * print short term list
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3428 */
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3429 static void print_short_term(H264Context *h) {
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3430 uint32_t i;
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3431 if(h->s.avctx->debug&FF_DEBUG_MMCO) {
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3432 av_log(h->s.avctx, AV_LOG_DEBUG, "short term list:\n");
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3433 for(i=0; i<h->short_ref_count; i++){
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3434 Picture *pic= h->short_ref[i];
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3435 av_log(h->s.avctx, AV_LOG_DEBUG, "%d fn:%d poc:%d %p\n", i, pic->frame_num, pic->poc, pic->data[0]);
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3436 }
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3437 }
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3438 }
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3439
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3440 /**
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3441 * print long term list
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3442 */
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3443 static void print_long_term(H264Context *h) {
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3444 uint32_t i;
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3445 if(h->s.avctx->debug&FF_DEBUG_MMCO) {
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3446 av_log(h->s.avctx, AV_LOG_DEBUG, "long term list:\n");
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3447 for(i = 0; i < 16; i++){
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3448 Picture *pic= h->long_ref[i];
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3449 if (pic) {
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3450 av_log(h->s.avctx, AV_LOG_DEBUG, "%d fn:%d poc:%d %p\n", i, pic->frame_num, pic->poc, pic->data[0]);
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3451 }
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3452 }
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3453 }
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3454 }
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3455
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3456 /**
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3457 * Executes the reference picture marking (memory management control operations).
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3458 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3459 static int execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3460 MpegEncContext * const s = &h->s;
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3461 int i, j;
5785
74fa2587b8de Cosmetic renaming variable so that it makes more sense for forthcoming PAFF mmco patches.
andoma
parents: 5784
diff changeset
3462 int current_ref_assigned=0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3463 Picture *pic;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3464
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3465 if((s->avctx->debug&FF_DEBUG_MMCO) && mmco_count==0)
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3466 av_log(h->s.avctx, AV_LOG_DEBUG, "no mmco here\n");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3467
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3468 for(i=0; i<mmco_count; i++){
5786
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3469 int structure, frame_num, unref_pic;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3470 if(s->avctx->debug&FF_DEBUG_MMCO)
5756
db5a041fd77c Rename MMCO stuff to prepare for h264/PAFF implementation.
andoma
parents: 5727
diff changeset
3471 av_log(h->s.avctx, AV_LOG_DEBUG, "mmco:%d %d %d\n", h->mmco[i].opcode, h->mmco[i].short_pic_num, h->mmco[i].long_arg);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3472
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3473 switch(mmco[i].opcode){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3474 case MMCO_SHORT2UNUSED:
5786
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3475 if(s->avctx->debug&FF_DEBUG_MMCO)
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3476 av_log(h->s.avctx, AV_LOG_DEBUG, "mmco: unref short %d count %d\n", h->mmco[i].short_pic_num, h->short_ref_count);
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3477 frame_num = pic_num_extract(h, mmco[i].short_pic_num, &structure);
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3478 pic = find_short(h, frame_num, &j);
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3479 if (pic) {
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3480 if (unreference_pic(h, pic, structure ^ PICT_FRAME))
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3481 remove_short_at_index(h, j);
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3482 } else if(s->avctx->debug&FF_DEBUG_MMCO)
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3483 av_log(h->s.avctx, AV_LOG_DEBUG, "mmco: unref short failure\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3484 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3485 case MMCO_SHORT2LONG:
5786
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3486 if (FIELD_PICTURE && mmco[i].long_arg < h->long_ref_count &&
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3487 h->long_ref[mmco[i].long_arg]->frame_num ==
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3488 mmco[i].short_pic_num / 2) {
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3489 /* do nothing, we've already moved this field pair. */
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3490 } else {
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3491 int frame_num = mmco[i].short_pic_num >> FIELD_PICTURE;
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3492
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3493 pic= remove_long(h, mmco[i].long_arg);
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3494 if(pic) unreference_pic(h, pic, 0);
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3495
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3496 h->long_ref[ mmco[i].long_arg ]= remove_short(h, frame_num);
5787
b92c03847d60 Re-indent after PAFF MMCO implementation patch.
cehoyos
parents: 5786
diff changeset
3497 if (h->long_ref[ mmco[i].long_arg ]){
b92c03847d60 Re-indent after PAFF MMCO implementation patch.
cehoyos
parents: 5786
diff changeset
3498 h->long_ref[ mmco[i].long_arg ]->long_ref=1;
b92c03847d60 Re-indent after PAFF MMCO implementation patch.
cehoyos
parents: 5786
diff changeset
3499 h->long_ref_count++;
b92c03847d60 Re-indent after PAFF MMCO implementation patch.
cehoyos
parents: 5786
diff changeset
3500 }
5786
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3501 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3502 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3503 case MMCO_LONG2UNUSED:
5786
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3504 j = pic_num_extract(h, mmco[i].long_arg, &structure);
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3505 pic = h->long_ref[j];
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3506 if (pic) {
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3507 if (unreference_pic(h, pic, structure ^ PICT_FRAME))
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3508 remove_long_at_index(h, j);
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3509 } else if(s->avctx->debug&FF_DEBUG_MMCO)
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3510 av_log(h->s.avctx, AV_LOG_DEBUG, "mmco: unref long failure\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3511 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3512 case MMCO_LONG:
5786
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3513 unref_pic = 1;
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3514 if (FIELD_PICTURE && !s->first_field) {
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3515 if (h->long_ref[mmco[i].long_arg] == s->current_picture_ptr) {
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3516 /* Just mark second field as referenced */
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3517 unref_pic = 0;
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3518 } else if (s->current_picture_ptr->reference) {
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3519 /* First field in pair is in short term list or
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3520 * at a different long term index.
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3521 * This is not allowed; see 7.4.3, notes 2 and 3.
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3522 * Report the problem and keep the pair where it is,
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3523 * and mark this field valid.
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3524 */
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3525 av_log(h->s.avctx, AV_LOG_ERROR,
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3526 "illegal long term reference assignment for second "
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3527 "field in complementary field pair (first field is "
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3528 "short term or has non-matching long index)\n");
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3529 unref_pic = 0;
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3530 }
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3531 }
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3532
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3533 if (unref_pic) {
5787
b92c03847d60 Re-indent after PAFF MMCO implementation patch.
cehoyos
parents: 5786
diff changeset
3534 pic= remove_long(h, mmco[i].long_arg);
b92c03847d60 Re-indent after PAFF MMCO implementation patch.
cehoyos
parents: 5786
diff changeset
3535 if(pic) unreference_pic(h, pic, 0);
b92c03847d60 Re-indent after PAFF MMCO implementation patch.
cehoyos
parents: 5786
diff changeset
3536
b92c03847d60 Re-indent after PAFF MMCO implementation patch.
cehoyos
parents: 5786
diff changeset
3537 h->long_ref[ mmco[i].long_arg ]= s->current_picture_ptr;
b92c03847d60 Re-indent after PAFF MMCO implementation patch.
cehoyos
parents: 5786
diff changeset
3538 h->long_ref[ mmco[i].long_arg ]->long_ref=1;
b92c03847d60 Re-indent after PAFF MMCO implementation patch.
cehoyos
parents: 5786
diff changeset
3539 h->long_ref_count++;
5786
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3540 }
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3541
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3542 s->current_picture_ptr->reference |= s->picture_structure;
5785
74fa2587b8de Cosmetic renaming variable so that it makes more sense for forthcoming PAFF mmco patches.
andoma
parents: 5784
diff changeset
3543 current_ref_assigned=1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3544 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3545 case MMCO_SET_MAX_LONG:
5756
db5a041fd77c Rename MMCO stuff to prepare for h264/PAFF implementation.
andoma
parents: 5727
diff changeset
3546 assert(mmco[i].long_arg <= 16);
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3547 // just remove the long term which index is greater than new max
5756
db5a041fd77c Rename MMCO stuff to prepare for h264/PAFF implementation.
andoma
parents: 5727
diff changeset
3548 for(j = mmco[i].long_arg; j<16; j++){
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3549 pic = remove_long(h, j);
5768
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3550 if (pic) unreference_pic(h, pic, 0);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3551 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3552 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3553 case MMCO_RESET:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3554 while(h->short_ref_count){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3555 pic= remove_short(h, h->short_ref[0]->frame_num);
5768
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3556 if(pic) unreference_pic(h, pic, 0);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3557 }
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3558 for(j = 0; j < 16; j++) {
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3559 pic= remove_long(h, j);
5768
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3560 if(pic) unreference_pic(h, pic, 0);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3561 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3562 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3563 default: assert(0);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3564 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3565 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3566
5786
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3567 if (!current_ref_assigned && FIELD_PICTURE &&
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3568 !s->first_field && s->current_picture_ptr->reference) {
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3569
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3570 /* Second field of complementary field pair; the first field of
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3571 * which is already referenced. If short referenced, it
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3572 * should be first entry in short_ref. If not, it must exist
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3573 * in long_ref; trying to put it on the short list here is an
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3574 * error in the encoded bit stream (ref: 7.4.3, NOTE 2 and 3).
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3575 */
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3576 if (h->short_ref_count && h->short_ref[0] == s->current_picture_ptr) {
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3577 /* Just mark the second field valid */
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3578 s->current_picture_ptr->reference = PICT_FRAME;
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3579 } else if (s->current_picture_ptr->long_ref) {
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3580 av_log(h->s.avctx, AV_LOG_ERROR, "illegal short term reference "
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3581 "assignment for second field "
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3582 "in complementary field pair "
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3583 "(first field is long term)\n");
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3584 } else {
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3585 /*
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3586 * First field in reference, but not in any sensible place on our
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3587 * reference lists. This shouldn't happen unless reference
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3588 * handling somewhere else is wrong.
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3589 */
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3590 assert(0);
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3591 }
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3592 current_ref_assigned = 1;
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3593 }
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3594
5785
74fa2587b8de Cosmetic renaming variable so that it makes more sense for forthcoming PAFF mmco patches.
andoma
parents: 5784
diff changeset
3595 if(!current_ref_assigned){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3596 pic= remove_short(h, s->current_picture_ptr->frame_num);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3597 if(pic){
5768
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3598 unreference_pic(h, pic, 0);
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3599 av_log(h->s.avctx, AV_LOG_ERROR, "illegal short term buffer state detected\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3600 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3601
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3602 if(h->short_ref_count)
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
3603 memmove(&h->short_ref[1], &h->short_ref[0], h->short_ref_count*sizeof(Picture*));
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
3604
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
3605 h->short_ref[0]= s->current_picture_ptr;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3606 h->short_ref[0]->long_ref=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3607 h->short_ref_count++;
5786
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3608 s->current_picture_ptr->reference |= s->picture_structure;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3609 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3610
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3611 print_short_term(h);
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3612 print_long_term(h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3613 return 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3614 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3615
5172
60a4f209838b Decouple bit context from h264 context in decode_ref_pic_marking()
gpoirier
parents: 5170
diff changeset
3616 static int decode_ref_pic_marking(H264Context *h, GetBitContext *gb){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3617 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3618 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3619
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3620 if(h->nal_unit_type == NAL_IDR_SLICE){ //FIXME fields
5172
60a4f209838b Decouple bit context from h264 context in decode_ref_pic_marking()
gpoirier
parents: 5170
diff changeset
3621 s->broken_link= get_bits1(gb) -1;
5756
db5a041fd77c Rename MMCO stuff to prepare for h264/PAFF implementation.
andoma
parents: 5727
diff changeset
3622 h->mmco[0].long_arg= get_bits1(gb) - 1; // current_long_term_idx
db5a041fd77c Rename MMCO stuff to prepare for h264/PAFF implementation.
andoma
parents: 5727
diff changeset
3623 if(h->mmco[0].long_arg == -1)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3624 h->mmco_index= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3625 else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3626 h->mmco[0].opcode= MMCO_LONG;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3627 h->mmco_index= 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3628 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3629 }else{
5172
60a4f209838b Decouple bit context from h264 context in decode_ref_pic_marking()
gpoirier
parents: 5170
diff changeset
3630 if(get_bits1(gb)){ // adaptive_ref_pic_marking_mode_flag
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3631 for(i= 0; i<MAX_MMCO_COUNT; i++) {
5172
60a4f209838b Decouple bit context from h264 context in decode_ref_pic_marking()
gpoirier
parents: 5170
diff changeset
3632 MMCOOpcode opcode= get_ue_golomb(gb);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3633
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3634 h->mmco[i].opcode= opcode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3635 if(opcode==MMCO_SHORT2UNUSED || opcode==MMCO_SHORT2LONG){
5784
af2dab646def Augment mmcodecoding process to work properly with fields. Part of PAFF implementation.
andoma
parents: 5783
diff changeset
3636 h->mmco[i].short_pic_num= (h->curr_pic_num - get_ue_golomb(gb) - 1) & (h->max_pic_num - 1);
5756
db5a041fd77c Rename MMCO stuff to prepare for h264/PAFF implementation.
andoma
parents: 5727
diff changeset
3637 /* if(h->mmco[i].short_pic_num >= h->short_ref_count || h->short_ref[ h->mmco[i].short_pic_num ] == NULL){
2846
40765c51a7a9 Compilation fixes part 1 patch by (Arvind R. and Burkhard Plaum, plaum, ipf uni-stuttgart de)
michael
parents: 2844
diff changeset
3638 av_log(s->avctx, AV_LOG_ERROR, "illegal short ref in memory management control operation %d\n", mmco);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3639 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3640 }*/
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3641 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3642 if(opcode==MMCO_SHORT2LONG || opcode==MMCO_LONG2UNUSED || opcode==MMCO_LONG || opcode==MMCO_SET_MAX_LONG){
5771
5290a3850c03 Rename variable to make sense in both field and frame contexts (support of PAFF implementation).
andoma
parents: 5770
diff changeset
3643 unsigned int long_arg= get_ue_golomb(gb);
5784
af2dab646def Augment mmcodecoding process to work properly with fields. Part of PAFF implementation.
andoma
parents: 5783
diff changeset
3644 if(long_arg >= 32 || (long_arg >= 16 && !(opcode == MMCO_LONG2UNUSED && FIELD_PICTURE))){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3645 av_log(h->s.avctx, AV_LOG_ERROR, "illegal long ref in memory management control operation %d\n", opcode);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3646 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3647 }
5771
5290a3850c03 Rename variable to make sense in both field and frame contexts (support of PAFF implementation).
andoma
parents: 5770
diff changeset
3648 h->mmco[i].long_arg= long_arg;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3649 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3650
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3651 if(opcode > (unsigned)MMCO_LONG){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3652 av_log(h->s.avctx, AV_LOG_ERROR, "illegal memory management control operation %d\n", opcode);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3653 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3654 }
2255
507690ff49a2 assertion when playing AVC/H.264 streams fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2254
diff changeset
3655 if(opcode == MMCO_END)
507690ff49a2 assertion when playing AVC/H.264 streams fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2254
diff changeset
3656 break;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3657 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3658 h->mmco_index= i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3659 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3660 assert(h->long_ref_count + h->short_ref_count <= h->sps.ref_frame_count);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3661
5784
af2dab646def Augment mmcodecoding process to work properly with fields. Part of PAFF implementation.
andoma
parents: 5783
diff changeset
3662 if(h->long_ref_count + h->short_ref_count == h->sps.ref_frame_count &&
af2dab646def Augment mmcodecoding process to work properly with fields. Part of PAFF implementation.
andoma
parents: 5783
diff changeset
3663 !(FIELD_PICTURE && !s->first_field && s->current_picture_ptr->reference)) {
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3664 h->mmco[0].opcode= MMCO_SHORT2UNUSED;
5756
db5a041fd77c Rename MMCO stuff to prepare for h264/PAFF implementation.
andoma
parents: 5727
diff changeset
3665 h->mmco[0].short_pic_num= h->short_ref[ h->short_ref_count - 1 ]->frame_num;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3666 h->mmco_index= 1;
5784
af2dab646def Augment mmcodecoding process to work properly with fields. Part of PAFF implementation.
andoma
parents: 5783
diff changeset
3667 if (FIELD_PICTURE) {
af2dab646def Augment mmcodecoding process to work properly with fields. Part of PAFF implementation.
andoma
parents: 5783
diff changeset
3668 h->mmco[0].short_pic_num *= 2;
af2dab646def Augment mmcodecoding process to work properly with fields. Part of PAFF implementation.
andoma
parents: 5783
diff changeset
3669 h->mmco[1].opcode= MMCO_SHORT2UNUSED;
af2dab646def Augment mmcodecoding process to work properly with fields. Part of PAFF implementation.
andoma
parents: 5783
diff changeset
3670 h->mmco[1].short_pic_num= h->mmco[0].short_pic_num + 1;
af2dab646def Augment mmcodecoding process to work properly with fields. Part of PAFF implementation.
andoma
parents: 5783
diff changeset
3671 h->mmco_index= 2;
af2dab646def Augment mmcodecoding process to work properly with fields. Part of PAFF implementation.
andoma
parents: 5783
diff changeset
3672 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3673 }else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3674 h->mmco_index= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3675 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3676 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3677
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3678 return 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3679 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3680
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3681 static int init_poc(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3682 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3683 const int max_frame_num= 1<<h->sps.log2_max_frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3684 int field_poc[2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3685
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3686 if(h->nal_unit_type == NAL_IDR_SLICE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3687 h->frame_num_offset= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3688 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3689 if(h->frame_num < h->prev_frame_num)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3690 h->frame_num_offset= h->prev_frame_num_offset + max_frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3691 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3692 h->frame_num_offset= h->prev_frame_num_offset;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3693 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3694
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3695 if(h->sps.poc_type==0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3696 const int max_poc_lsb= 1<<h->sps.log2_max_poc_lsb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3697
2649
b2e6c5e9240b fix decoding of conformace streams AUD_MW_E.264 and BA1_FT_C.264 again (there where last correctly decoded with h264.c rev 1.96)
michael
parents: 2648
diff changeset
3698 if(h->nal_unit_type == NAL_IDR_SLICE){
b2e6c5e9240b fix decoding of conformace streams AUD_MW_E.264 and BA1_FT_C.264 again (there where last correctly decoded with h264.c rev 1.96)
michael
parents: 2648
diff changeset
3699 h->prev_poc_msb=
b2e6c5e9240b fix decoding of conformace streams AUD_MW_E.264 and BA1_FT_C.264 again (there where last correctly decoded with h264.c rev 1.96)
michael
parents: 2648
diff changeset
3700 h->prev_poc_lsb= 0;
b2e6c5e9240b fix decoding of conformace streams AUD_MW_E.264 and BA1_FT_C.264 again (there where last correctly decoded with h264.c rev 1.96)
michael
parents: 2648
diff changeset
3701 }
b2e6c5e9240b fix decoding of conformace streams AUD_MW_E.264 and BA1_FT_C.264 again (there where last correctly decoded with h264.c rev 1.96)
michael
parents: 2648
diff changeset
3702
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3703 if (h->poc_lsb < h->prev_poc_lsb && h->prev_poc_lsb - h->poc_lsb >= max_poc_lsb/2)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3704 h->poc_msb = h->prev_poc_msb + max_poc_lsb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3705 else if(h->poc_lsb > h->prev_poc_lsb && h->prev_poc_lsb - h->poc_lsb < -max_poc_lsb/2)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3706 h->poc_msb = h->prev_poc_msb - max_poc_lsb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3707 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3708 h->poc_msb = h->prev_poc_msb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3709 //printf("poc: %d %d\n", h->poc_msb, h->poc_lsb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3710 field_poc[0] =
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3711 field_poc[1] = h->poc_msb + h->poc_lsb;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3712 if(s->picture_structure == PICT_FRAME)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3713 field_poc[1] += h->delta_poc_bottom;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3714 }else if(h->sps.poc_type==1){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3715 int abs_frame_num, expected_delta_per_poc_cycle, expectedpoc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3716 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3717
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3718 if(h->sps.poc_cycle_length != 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3719 abs_frame_num = h->frame_num_offset + h->frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3720 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3721 abs_frame_num = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3722
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3723 if(h->nal_ref_idc==0 && abs_frame_num > 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3724 abs_frame_num--;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3725
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3726 expected_delta_per_poc_cycle = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3727 for(i=0; i < h->sps.poc_cycle_length; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3728 expected_delta_per_poc_cycle += h->sps.offset_for_ref_frame[ i ]; //FIXME integrate during sps parse
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3729
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3730 if(abs_frame_num > 0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3731 int poc_cycle_cnt = (abs_frame_num - 1) / h->sps.poc_cycle_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3732 int frame_num_in_poc_cycle = (abs_frame_num - 1) % h->sps.poc_cycle_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3733
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3734 expectedpoc = poc_cycle_cnt * expected_delta_per_poc_cycle;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3735 for(i = 0; i <= frame_num_in_poc_cycle; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3736 expectedpoc = expectedpoc + h->sps.offset_for_ref_frame[ i ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3737 } else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3738 expectedpoc = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3739
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3740 if(h->nal_ref_idc == 0)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3741 expectedpoc = expectedpoc + h->sps.offset_for_non_ref_pic;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3742
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3743 field_poc[0] = expectedpoc + h->delta_poc[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3744 field_poc[1] = field_poc[0] + h->sps.offset_for_top_to_bottom_field;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3745
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3746 if(s->picture_structure == PICT_FRAME)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3747 field_poc[1] += h->delta_poc[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3748 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3749 int poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3750 if(h->nal_unit_type == NAL_IDR_SLICE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3751 poc= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3752 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3753 if(h->nal_ref_idc) poc= 2*(h->frame_num_offset + h->frame_num);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3754 else poc= 2*(h->frame_num_offset + h->frame_num) - 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3755 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3756 field_poc[0]= poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3757 field_poc[1]= poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3758 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3759
5782
58647a83d416 Set Picture.poc for fields and field pairs. Part of PAFF implementation.
andoma
parents: 5781
diff changeset
3760 if(s->picture_structure != PICT_BOTTOM_FIELD) {
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3761 s->current_picture_ptr->field_poc[0]= field_poc[0];
5782
58647a83d416 Set Picture.poc for fields and field pairs. Part of PAFF implementation.
andoma
parents: 5781
diff changeset
3762 s->current_picture_ptr->poc = field_poc[0];
58647a83d416 Set Picture.poc for fields and field pairs. Part of PAFF implementation.
andoma
parents: 5781
diff changeset
3763 }
58647a83d416 Set Picture.poc for fields and field pairs. Part of PAFF implementation.
andoma
parents: 5781
diff changeset
3764 if(s->picture_structure != PICT_TOP_FIELD) {
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3765 s->current_picture_ptr->field_poc[1]= field_poc[1];
5782
58647a83d416 Set Picture.poc for fields and field pairs. Part of PAFF implementation.
andoma
parents: 5781
diff changeset
3766 s->current_picture_ptr->poc = field_poc[1];
58647a83d416 Set Picture.poc for fields and field pairs. Part of PAFF implementation.
andoma
parents: 5781
diff changeset
3767 }
58647a83d416 Set Picture.poc for fields and field pairs. Part of PAFF implementation.
andoma
parents: 5781
diff changeset
3768 if(!FIELD_PICTURE || !s->first_field)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3769 s->current_picture_ptr->poc= FFMIN(field_poc[0], field_poc[1]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3770
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3771 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3772 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3773
5160
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3774
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3775 /**
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3776 * initialize scan tables
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3777 */
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3778 static void init_scan_tables(H264Context *h){
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3779 MpegEncContext * const s = &h->s;
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3780 int i;
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3781 if(s->dsp.h264_idct_add == ff_h264_idct_add_c){ //FIXME little ugly
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3782 memcpy(h->zigzag_scan, zigzag_scan, 16*sizeof(uint8_t));
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3783 memcpy(h-> field_scan, field_scan, 16*sizeof(uint8_t));
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3784 }else{
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3785 for(i=0; i<16; i++){
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3786 #define T(x) (x>>2) | ((x<<2) & 0xF)
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3787 h->zigzag_scan[i] = T(zigzag_scan[i]);
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3788 h-> field_scan[i] = T( field_scan[i]);
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3789 #undef T
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3790 }
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3791 }
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3792 if(s->dsp.h264_idct8_add == ff_h264_idct8_add_c){
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3793 memcpy(h->zigzag_scan8x8, zigzag_scan8x8, 64*sizeof(uint8_t));
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3794 memcpy(h->zigzag_scan8x8_cavlc, zigzag_scan8x8_cavlc, 64*sizeof(uint8_t));
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3795 memcpy(h->field_scan8x8, field_scan8x8, 64*sizeof(uint8_t));
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3796 memcpy(h->field_scan8x8_cavlc, field_scan8x8_cavlc, 64*sizeof(uint8_t));
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3797 }else{
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3798 for(i=0; i<64; i++){
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3799 #define T(x) (x>>3) | ((x&7)<<3)
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3800 h->zigzag_scan8x8[i] = T(zigzag_scan8x8[i]);
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3801 h->zigzag_scan8x8_cavlc[i] = T(zigzag_scan8x8_cavlc[i]);
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3802 h->field_scan8x8[i] = T(field_scan8x8[i]);
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3803 h->field_scan8x8_cavlc[i] = T(field_scan8x8_cavlc[i]);
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3804 #undef T
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3805 }
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3806 }
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3807 if(h->sps.transform_bypass){ //FIXME same ugly
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3808 h->zigzag_scan_q0 = zigzag_scan;
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3809 h->zigzag_scan8x8_q0 = zigzag_scan8x8;
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3810 h->zigzag_scan8x8_cavlc_q0 = zigzag_scan8x8_cavlc;
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3811 h->field_scan_q0 = field_scan;
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3812 h->field_scan8x8_q0 = field_scan8x8;
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3813 h->field_scan8x8_cavlc_q0 = field_scan8x8_cavlc;
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3814 }else{
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3815 h->zigzag_scan_q0 = h->zigzag_scan;
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3816 h->zigzag_scan8x8_q0 = h->zigzag_scan8x8;
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3817 h->zigzag_scan8x8_cavlc_q0 = h->zigzag_scan8x8_cavlc;
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3818 h->field_scan_q0 = h->field_scan;
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3819 h->field_scan8x8_q0 = h->field_scan8x8;
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3820 h->field_scan8x8_cavlc_q0 = h->field_scan8x8_cavlc;
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3821 }
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3822 }
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3823
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3824 /**
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3825 * Replicates H264 "master" context to thread contexts.
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3826 */
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3827 static void clone_slice(H264Context *dst, H264Context *src)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3828 {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3829 memcpy(dst->block_offset, src->block_offset, sizeof(dst->block_offset));
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3830 dst->s.current_picture_ptr = src->s.current_picture_ptr;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3831 dst->s.current_picture = src->s.current_picture;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3832 dst->s.linesize = src->s.linesize;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3833 dst->s.uvlinesize = src->s.uvlinesize;
5798
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3834 dst->s.first_field = src->s.first_field;
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3835
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3836 dst->prev_poc_msb = src->prev_poc_msb;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3837 dst->prev_poc_lsb = src->prev_poc_lsb;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3838 dst->prev_frame_num_offset = src->prev_frame_num_offset;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3839 dst->prev_frame_num = src->prev_frame_num;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3840 dst->short_ref_count = src->short_ref_count;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3841
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3842 memcpy(dst->short_ref, src->short_ref, sizeof(dst->short_ref));
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3843 memcpy(dst->long_ref, src->long_ref, sizeof(dst->long_ref));
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3844 memcpy(dst->default_ref_list, src->default_ref_list, sizeof(dst->default_ref_list));
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3845 memcpy(dst->ref_list, src->ref_list, sizeof(dst->ref_list));
5685
070a376d496b fix image corruption when with multi-threaded decoding.
gpoirier
parents: 5647
diff changeset
3846
070a376d496b fix image corruption when with multi-threaded decoding.
gpoirier
parents: 5647
diff changeset
3847 memcpy(dst->dequant4_coeff, src->dequant4_coeff, sizeof(src->dequant4_coeff));
070a376d496b fix image corruption when with multi-threaded decoding.
gpoirier
parents: 5647
diff changeset
3848 memcpy(dst->dequant8_coeff, src->dequant8_coeff, sizeof(src->dequant8_coeff));
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3849 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3850
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3851 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3852 * decodes a slice header.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3853 * this will allso call MPV_common_init() and frame_start() as needed
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3854 *
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3855 * @param h h264context
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3856 * @param h0 h264 master context (differs from 'h' when doing sliced based parallel decoding)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3857 *
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3858 * @return 0 if okay, <0 if an error occured, 1 if decoding must not be multithreaded
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3859 */
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3860 static int decode_slice_header(H264Context *h, H264Context *h0){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3861 MpegEncContext * const s = &h->s;
5798
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3862 MpegEncContext * const s0 = &h0->s;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3863 unsigned int first_mb_in_slice;
4362
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
3864 unsigned int pps_id;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3865 int num_ref_idx_active_override_flag;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3866 static const uint8_t slice_type_map[5]= {P_TYPE, B_TYPE, I_TYPE, SP_TYPE, SI_TYPE};
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3867 unsigned int slice_type, tmp, i;
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3868 int default_ref_list_done = 0;
5798
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3869 int last_pic_structure;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3870
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
3871 s->dropable= h->nal_ref_idc == 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3872
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3873 first_mb_in_slice= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3874
4616
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
3875 if((s->flags2 & CODEC_FLAG2_CHUNKS) && first_mb_in_slice == 0){
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3876 h0->current_slice = 0;
5798
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3877 if (!s0->first_field)
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
3878 s->current_picture_ptr= NULL;
4616
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
3879 }
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
3880
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3881 slice_type= get_ue_golomb(&s->gb);
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3882 if(slice_type > 9){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3883 av_log(h->s.avctx, AV_LOG_ERROR, "slice type too large (%d) at %d %d\n", h->slice_type, s->mb_x, s->mb_y);
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
3884 return -1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3885 }
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3886 if(slice_type > 4){
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3887 slice_type -= 5;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3888 h->slice_type_fixed=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3889 }else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3890 h->slice_type_fixed=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3891
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3892 slice_type= slice_type_map[ slice_type ];
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3893 if (slice_type == I_TYPE
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3894 || (h0->current_slice != 0 && slice_type == h0->last_slice_type) ) {
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3895 default_ref_list_done = 1;
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3896 }
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3897 h->slice_type= slice_type;
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3898
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
3899 s->pict_type= h->slice_type; // to make a few old func happy, it's wrong though
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3900
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3901 pps_id= get_ue_golomb(&s->gb);
4362
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
3902 if(pps_id>=MAX_PPS_COUNT){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3903 av_log(h->s.avctx, AV_LOG_ERROR, "pps_id out of range\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3904 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3905 }
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3906 if(!h0->pps_buffers[pps_id]) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3907 av_log(h->s.avctx, AV_LOG_ERROR, "non existing PPS referenced\n");
1174
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
3908 return -1;
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
3909 }
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3910 h->pps= *h0->pps_buffers[pps_id];
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3911
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3912 if(!h0->sps_buffers[h->pps.sps_id]) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3913 av_log(h->s.avctx, AV_LOG_ERROR, "non existing SPS referenced\n");
1174
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
3914 return -1;
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
3915 }
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3916 h->sps = *h0->sps_buffers[h->pps.sps_id];
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3917
5685
070a376d496b fix image corruption when with multi-threaded decoding.
gpoirier
parents: 5647
diff changeset
3918 if(h == h0 && h->dequant_coeff_pps != pps_id){
4363
9b7662fa4905 remove useless cast that makes code unreadable
gpoirier
parents: 4362
diff changeset
3919 h->dequant_coeff_pps = pps_id;
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3920 init_dequant_tables(h);
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3921 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3922
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3923 s->mb_width= h->sps.mb_width;
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3924 s->mb_height= h->sps.mb_height * (2 - h->sps.frame_mbs_only_flag);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3925
3178
bd995b8c64fd Alignment fixes, caused problems on SPARC.
diego
parents: 3177
diff changeset
3926 h->b_stride= s->mb_width*4;
bd995b8c64fd Alignment fixes, caused problems on SPARC.
diego
parents: 3177
diff changeset
3927 h->b8_stride= s->mb_width*2;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3928
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
3929 s->width = 16*s->mb_width - 2*(h->sps.crop_left + h->sps.crop_right );
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3930 if(h->sps.frame_mbs_only_flag)
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
3931 s->height= 16*s->mb_height - 2*(h->sps.crop_top + h->sps.crop_bottom);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3932 else
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
3933 s->height= 16*s->mb_height - 4*(h->sps.crop_top + h->sps.crop_bottom); //FIXME recheck
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3934
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3935 if (s->context_initialized
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
3936 && ( s->width != s->avctx->width || s->height != s->avctx->height)) {
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3937 if(h != h0)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3938 return -1; // width / height changed during parallelized decoding
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3939 free_tables(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3940 MPV_common_end(s);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3941 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3942 if (!s->context_initialized) {
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3943 if(h != h0)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3944 return -1; // we cant (re-)initialize context during parallel decoding
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3945 if (MPV_common_init(s) < 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3946 return -1;
5798
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3947 s->first_field = 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3948
5160
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3949 init_scan_tables(h);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3950 alloc_tables(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3951
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3952 for(i = 1; i < s->avctx->thread_count; i++) {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3953 H264Context *c;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3954 c = h->thread_context[i] = av_malloc(sizeof(H264Context));
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3955 memcpy(c, h, sizeof(MpegEncContext));
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3956 memset(&c->s + 1, 0, sizeof(H264Context) - sizeof(MpegEncContext));
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3957 c->sps = h->sps;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3958 c->pps = h->pps;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3959 init_scan_tables(c);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3960 clone_tables(c, h);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3961 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3962
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3963 for(i = 0; i < s->avctx->thread_count; i++)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3964 if(context_init(h->thread_context[i]) < 0)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3965 return -1;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3966
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3967 s->avctx->width = s->width;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3968 s->avctx->height = s->height;
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
3969 s->avctx->sample_aspect_ratio= h->sps.sar;
2440
cf97353f94c6 div by zero aspect fix
michael
parents: 2422
diff changeset
3970 if(!s->avctx->sample_aspect_ratio.den)
cf97353f94c6 div by zero aspect fix
michael
parents: 2422
diff changeset
3971 s->avctx->sample_aspect_ratio.den = 1;
2174
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
3972
2648
c3a06b0b00e2 set time_base for variable fps too
michael
parents: 2645
diff changeset
3973 if(h->sps.timing_info_present_flag){
3052
6c3f87300378 interpret H264 VUI timing info correctly
mru
parents: 3036
diff changeset
3974 s->avctx->time_base= (AVRational){h->sps.num_units_in_tick * 2, h->sps.time_scale};
3063
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3052
diff changeset
3975 if(h->x264_build > 0 && h->x264_build < 44)
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3052
diff changeset
3976 s->avctx->time_base.den *= 2;
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3052
diff changeset
3977 av_reduce(&s->avctx->time_base.num, &s->avctx->time_base.den,
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3052
diff changeset
3978 s->avctx->time_base.num, s->avctx->time_base.den, 1<<30);
2174
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
3979 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3980 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3981
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3982 h->frame_num= get_bits(&s->gb, h->sps.log2_max_frame_num);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3983
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3984 h->mb_mbaff = 0;
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3985 h->mb_aff_frame = 0;
5798
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3986 last_pic_structure = s0->picture_structure;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3987 if(h->sps.frame_mbs_only_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3988 s->picture_structure= PICT_FRAME;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3989 }else{
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3990 if(get_bits1(&s->gb)) { //field_pic_flag
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3991 s->picture_structure= PICT_TOP_FIELD + get_bits1(&s->gb); //bottom_field_flag
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3992 } else {
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3993 s->picture_structure= PICT_FRAME;
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3994 h->mb_aff_frame = h->sps.mb_aff;
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3995 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3996 }
5723
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
3997
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
3998 if(h0->current_slice == 0){
5798
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3999 /* See if we have a decoded first field looking for a pair... */
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
4000 if (s0->first_field) {
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
4001 assert(s0->current_picture_ptr);
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
4002 assert(s0->current_picture_ptr->data[0]);
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
4003 assert(s0->current_picture_ptr->reference != DELAYED_PIC_REF);
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
4004
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
4005 /* figure out if we have a complementary field pair */
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
4006 if (!FIELD_PICTURE || s->picture_structure == last_pic_structure) {
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
4007 /*
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
4008 * Previous field is unmatched. Don't display it, but let it
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
4009 * remain for reference if marked as such.
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
4010 */
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
4011 s0->current_picture_ptr = NULL;
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
4012 s0->first_field = FIELD_PICTURE;
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
4013
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
4014 } else {
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
4015 if (h->nal_ref_idc &&
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
4016 s0->current_picture_ptr->reference &&
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
4017 s0->current_picture_ptr->frame_num != h->frame_num) {
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
4018 /*
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
4019 * This and previous field were reference, but had
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
4020 * different frame_nums. Consider this field first in
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
4021 * pair. Throw away previous field except for reference
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
4022 * purposes.
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
4023 */
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
4024 s0->first_field = 1;
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
4025 s0->current_picture_ptr = NULL;
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
4026
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
4027 } else {
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
4028 /* Second field in complementary pair */
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
4029 s0->first_field = 0;
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
4030 }
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
4031 }
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
4032
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
4033 } else {
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
4034 /* Frame or first field in a potentially complementary pair */
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
4035 assert(!s0->current_picture_ptr);
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
4036 s0->first_field = FIELD_PICTURE;
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
4037 }
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
4038
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
4039 if((!FIELD_PICTURE || s0->first_field) && frame_start(h) < 0) {
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
4040 s0->first_field = 0;
5723
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
4041 return -1;
5798
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
4042 }
5723
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
4043 }
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
4044 if(h != h0)
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
4045 clone_slice(h, h0);
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
4046
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
4047 s->current_picture_ptr->frame_num= h->frame_num; //FIXME frame_num cleanup
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
4048
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4049 assert(s->mb_num == s->mb_width * s->mb_height);
5781
0b3aa6f4c313 Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents: 5780
diff changeset
4050 if(first_mb_in_slice << FIELD_OR_MBAFF_PICTURE >= s->mb_num ||
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4051 first_mb_in_slice >= s->mb_num){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4052 av_log(h->s.avctx, AV_LOG_ERROR, "first_mb_in_slice overflow\n");
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4053 return -1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4054 }
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
4055 s->resync_mb_x = s->mb_x = first_mb_in_slice % s->mb_width;
5781
0b3aa6f4c313 Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents: 5780
diff changeset
4056 s->resync_mb_y = s->mb_y = (first_mb_in_slice / s->mb_width) << FIELD_OR_MBAFF_PICTURE;
0b3aa6f4c313 Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents: 5780
diff changeset
4057 if (s->picture_structure == PICT_BOTTOM_FIELD)
0b3aa6f4c313 Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents: 5780
diff changeset
4058 s->resync_mb_y = s->mb_y = s->mb_y + 1;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4059 assert(s->mb_y < s->mb_height);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4060
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4061 if(s->picture_structure==PICT_FRAME){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4062 h->curr_pic_num= h->frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4063 h->max_pic_num= 1<< h->sps.log2_max_frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4064 }else{
5772
65b71bd21a4d Fix h->curr_pic_num for field pictures. Necessary for proper PAFF support.
andoma
parents: 5771
diff changeset
4065 h->curr_pic_num= 2*h->frame_num + 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4066 h->max_pic_num= 1<<(h->sps.log2_max_frame_num + 1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4067 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4068
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4069 if(h->nal_unit_type == NAL_IDR_SLICE){
1453
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
4070 get_ue_golomb(&s->gb); /* idr_pic_id */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4071 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4072
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4073 if(h->sps.poc_type==0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4074 h->poc_lsb= get_bits(&s->gb, h->sps.log2_max_poc_lsb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4075
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4076 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4077 h->delta_poc_bottom= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4078 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4079 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4080
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4081 if(h->sps.poc_type==1 && !h->sps.delta_pic_order_always_zero_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4082 h->delta_poc[0]= get_se_golomb(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4083
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4084 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4085 h->delta_poc[1]= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4086 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4087
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4088 init_poc(h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4089
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4090 if(h->pps.redundant_pic_cnt_present){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4091 h->redundant_pic_count= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4092 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4093
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4094 //set defaults, might be overriden a few line later
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4095 h->ref_count[0]= h->pps.ref_count[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4096 h->ref_count[1]= h->pps.ref_count[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4097
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4098 if(h->slice_type == P_TYPE || h->slice_type == SP_TYPE || h->slice_type == B_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4099 if(h->slice_type == B_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4100 h->direct_spatial_mv_pred= get_bits1(&s->gb);
5812
05e66f9c15bb Interlaced pictures (not just MBAFF) + spatial direct mode is not
cehoyos
parents: 5806
diff changeset
4101 if(FIELD_OR_MBAFF_PICTURE && h->direct_spatial_mv_pred)
05e66f9c15bb Interlaced pictures (not just MBAFF) + spatial direct mode is not
cehoyos
parents: 5806
diff changeset
4102 av_log(h->s.avctx, AV_LOG_ERROR, "Interlaced pictures + spatial direct mode is not implemented\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4103 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4104 num_ref_idx_active_override_flag= get_bits1(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4105
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4106 if(num_ref_idx_active_override_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4107 h->ref_count[0]= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4108 if(h->slice_type==B_TYPE)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4109 h->ref_count[1]= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4110
4532
c296efb7575e fix 2nd ref_count check
michael
parents: 4531
diff changeset
4111 if(h->ref_count[0]-1 > 32-1 || h->ref_count[1]-1 > 32-1){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
4112 av_log(h->s.avctx, AV_LOG_ERROR, "reference overflow\n");
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4113 h->ref_count[0]= h->ref_count[1]= 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4114 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4115 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4116 }
4532
c296efb7575e fix 2nd ref_count check
michael
parents: 4531
diff changeset
4117 if(h->slice_type == B_TYPE)
c296efb7575e fix 2nd ref_count check
michael
parents: 4531
diff changeset
4118 h->list_count= 2;
c296efb7575e fix 2nd ref_count check
michael
parents: 4531
diff changeset
4119 else
c296efb7575e fix 2nd ref_count check
michael
parents: 4531
diff changeset
4120 h->list_count= 1;
c296efb7575e fix 2nd ref_count check
michael
parents: 4531
diff changeset
4121 }else
c296efb7575e fix 2nd ref_count check
michael
parents: 4531
diff changeset
4122 h->list_count= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4123
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4124 if(!default_ref_list_done){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4125 fill_default_ref_list(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4126 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4127
2766
0609f405e000 make decoder a little bit more tolerant to missing NAL units
michael
parents: 2763
diff changeset
4128 if(decode_ref_pic_list_reordering(h) < 0)
0609f405e000 make decoder a little bit more tolerant to missing NAL units
michael
parents: 2763
diff changeset
4129 return -1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4130
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4131 if( (h->pps.weighted_pred && (h->slice_type == P_TYPE || h->slice_type == SP_TYPE ))
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4132 || (h->pps.weighted_bipred_idc==1 && h->slice_type==B_TYPE ) )
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4133 pred_weight_table(h);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4134 else if(h->pps.weighted_bipred_idc==2 && h->slice_type==B_TYPE)
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4135 implicit_weight_table(h);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4136 else
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4137 h->use_weight = 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4138
5723
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
4139 if(h->nal_ref_idc)
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
4140 decode_ref_pic_marking(h0, &s->gb);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4141
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4142 if(FRAME_MBAFF)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4143 fill_mbaff_ref_list(h);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4144
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4145 if( h->slice_type != I_TYPE && h->slice_type != SI_TYPE && h->pps.cabac ){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4146 tmp = get_ue_golomb(&s->gb);
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4147 if(tmp > 2){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4148 av_log(s->avctx, AV_LOG_ERROR, "cabac_init_idc overflow\n");
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4149 return -1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4150 }
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4151 h->cabac_init_idc= tmp;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4152 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4153
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4154 h->last_qscale_diff = 0;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4155 tmp = h->pps.init_qp + get_se_golomb(&s->gb);
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4156 if(tmp>51){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4157 av_log(s->avctx, AV_LOG_ERROR, "QP %u out of range\n", tmp);
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4158 return -1;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4159 }
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4160 s->qscale= tmp;
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
4161 h->chroma_qp[0] = get_chroma_qp(h, 0, s->qscale);
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
4162 h->chroma_qp[1] = get_chroma_qp(h, 1, s->qscale);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4163 //FIXME qscale / qp ... stuff
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4164 if(h->slice_type == SP_TYPE){
1453
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
4165 get_bits1(&s->gb); /* sp_for_switch_flag */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4166 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4167 if(h->slice_type==SP_TYPE || h->slice_type == SI_TYPE){
1453
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
4168 get_se_golomb(&s->gb); /* slice_qs_delta */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4169 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4170
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
4171 h->deblocking_filter = 1;
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4172 h->slice_alpha_c0_offset = 0;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4173 h->slice_beta_offset = 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4174 if( h->pps.deblocking_filter_parameters_present ) {
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4175 tmp= get_ue_golomb(&s->gb);
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4176 if(tmp > 2){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4177 av_log(s->avctx, AV_LOG_ERROR, "deblocking_filter_idc %u out of range\n", tmp);
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4178 return -1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4179 }
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4180 h->deblocking_filter= tmp;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4181 if(h->deblocking_filter < 2)
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
4182 h->deblocking_filter^= 1; // 1<->0
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
4183
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
4184 if( h->deblocking_filter ) {
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
4185 h->slice_alpha_c0_offset = get_se_golomb(&s->gb) << 1;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
4186 h->slice_beta_offset = get_se_golomb(&s->gb) << 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4187 }
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
4188 }
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
4189
5698
9a26cb6747a9 Apply skip_loop_filter before checking if we can parallelize with the selected
reimar
parents: 5694
diff changeset
4190 if( s->avctx->skip_loop_filter >= AVDISCARD_ALL
9a26cb6747a9 Apply skip_loop_filter before checking if we can parallelize with the selected
reimar
parents: 5694
diff changeset
4191 ||(s->avctx->skip_loop_filter >= AVDISCARD_NONKEY && h->slice_type != I_TYPE)
9a26cb6747a9 Apply skip_loop_filter before checking if we can parallelize with the selected
reimar
parents: 5694
diff changeset
4192 ||(s->avctx->skip_loop_filter >= AVDISCARD_BIDIR && h->slice_type == B_TYPE)
9a26cb6747a9 Apply skip_loop_filter before checking if we can parallelize with the selected
reimar
parents: 5694
diff changeset
4193 ||(s->avctx->skip_loop_filter >= AVDISCARD_NONREF && h->nal_ref_idc == 0))
9a26cb6747a9 Apply skip_loop_filter before checking if we can parallelize with the selected
reimar
parents: 5694
diff changeset
4194 h->deblocking_filter= 0;
9a26cb6747a9 Apply skip_loop_filter before checking if we can parallelize with the selected
reimar
parents: 5694
diff changeset
4195
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
4196 if(h->deblocking_filter == 1 && h0->max_contexts > 1) {
5646
adc9ec0f7385 Let H.264 decoder skip deblocking across slices
benoit
parents: 5643
diff changeset
4197 if(s->avctx->flags2 & CODEC_FLAG2_FAST) {
adc9ec0f7385 Let H.264 decoder skip deblocking across slices
benoit
parents: 5643
diff changeset
4198 /* Cheat slightly for speed:
adc9ec0f7385 Let H.264 decoder skip deblocking across slices
benoit
parents: 5643
diff changeset
4199 Dont bother to deblock across slices */
adc9ec0f7385 Let H.264 decoder skip deblocking across slices
benoit
parents: 5643
diff changeset
4200 h->deblocking_filter = 2;
adc9ec0f7385 Let H.264 decoder skip deblocking across slices
benoit
parents: 5643
diff changeset
4201 } else {
5647
7c139ea9065e Indentation
benoit
parents: 5646
diff changeset
4202 h0->max_contexts = 1;
7c139ea9065e Indentation
benoit
parents: 5646
diff changeset
4203 if(!h0->single_decode_warning) {
7c139ea9065e Indentation
benoit
parents: 5646
diff changeset
4204 av_log(s->avctx, AV_LOG_INFO, "Cannot parallelize deblocking type 1, decoding such frames in sequential order\n");
7c139ea9065e Indentation
benoit
parents: 5646
diff changeset
4205 h0->single_decode_warning = 1;
7c139ea9065e Indentation
benoit
parents: 5646
diff changeset
4206 }
7c139ea9065e Indentation
benoit
parents: 5646
diff changeset
4207 if(h != h0)
7c139ea9065e Indentation
benoit
parents: 5646
diff changeset
4208 return 1; // deblocking switched inside frame
5646
adc9ec0f7385 Let H.264 decoder skip deblocking across slices
benoit
parents: 5643
diff changeset
4209 }
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
4210 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
4211
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4212 #if 0 //FMO
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4213 if( h->pps.num_slice_groups > 1 && h->pps.mb_slice_group_map_type >= 3 && h->pps.mb_slice_group_map_type <= 5)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4214 slice_group_change_cycle= get_bits(&s->gb, ?);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4215 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4216
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
4217 h0->last_slice_type = slice_type;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
4218 h->slice_num = ++h0->current_slice;
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
4219
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4220 h->emu_edge_width= (s->flags&CODEC_FLAG_EMU_EDGE) ? 0 : 16;
5783
4b5dc5ad7410 Edge emulation for fields. Part of PAFF implementation
andoma
parents: 5782
diff changeset
4221 h->emu_edge_height= (FRAME_MBAFF || FIELD_PICTURE) ? 0 : h->emu_edge_width;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4222
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4223 if(s->avctx->debug&FF_DEBUG_PICT_INFO){
4362
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
4224 av_log(h->s.avctx, AV_LOG_DEBUG, "slice:%d %s mb:%d %c pps:%u frame:%d poc:%d/%d ref:%d/%d qp:%d loop:%d:%d:%d weight:%d%s\n",
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
4225 h->slice_num,
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
4226 (s->picture_structure==PICT_FRAME ? "F" : s->picture_structure==PICT_TOP_FIELD ? "T" : "B"),
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4227 first_mb_in_slice,
1264
2fa34e615c76 cleanup
michaelni
parents: 1252
diff changeset
4228 av_get_pict_type_char(h->slice_type),
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4229 pps_id, h->frame_num,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4230 s->current_picture_ptr->field_poc[0], s->current_picture_ptr->field_poc[1],
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4231 h->ref_count[0], h->ref_count[1],
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4232 s->qscale,
2583
61a08e2b9822 display deblocking strength in FF_DEBUG_PICT_INFO
lorenm
parents: 2582
diff changeset
4233 h->deblocking_filter, h->slice_alpha_c0_offset/2, h->slice_beta_offset/2,
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4234 h->use_weight,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4235 h->use_weight==1 && h->use_weight_chroma ? "c" : ""
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4236 );
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4237 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4238
5723
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
4239 if((s->avctx->flags2 & CODEC_FLAG2_FAST) && !h->nal_ref_idc){
3807
6a40092eb9e6 approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents: 3776
diff changeset
4240 s->me.qpel_put= s->dsp.put_2tap_qpel_pixels_tab;
6a40092eb9e6 approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents: 3776
diff changeset
4241 s->me.qpel_avg= s->dsp.avg_2tap_qpel_pixels_tab;
6a40092eb9e6 approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents: 3776
diff changeset
4242 }else{
6a40092eb9e6 approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents: 3776
diff changeset
4243 s->me.qpel_put= s->dsp.put_h264_qpel_pixels_tab;
6a40092eb9e6 approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents: 3776
diff changeset
4244 s->me.qpel_avg= s->dsp.avg_h264_qpel_pixels_tab;
6a40092eb9e6 approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents: 3776
diff changeset
4245 }
6a40092eb9e6 approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents: 3776
diff changeset
4246
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4247 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4248 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4249
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4250 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4251 *
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4252 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4253 static inline int get_level_prefix(GetBitContext *gb){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4254 unsigned int buf;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4255 int log;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4256
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4257 OPEN_READER(re, gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4258 UPDATE_CACHE(re, gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4259 buf=GET_CACHE(re, gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4260
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4261 log= 32 - av_log2(buf);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4262 #ifdef TRACE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4263 print_bin(buf>>(32-log), log);
2272
cd43603c46f9 move h264 idct to its own file and call via function pointer in DspContext
michael
parents: 2255
diff changeset
4264 av_log(NULL, AV_LOG_DEBUG, "%5d %2d %3d lpr @%5d in %s get_level_prefix\n", buf>>(32-log), log, log-1, get_bits_count(gb), __FILE__);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4265 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4266
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4267 LAST_SKIP_BITS(re, gb, log);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4268 CLOSE_READER(re, gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4269
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4270 return log-1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4271 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4272
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4273 static inline int get_dct8x8_allowed(H264Context *h){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4274 int i;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4275 for(i=0; i<4; i++){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4276 if(!IS_SUB_8X8(h->sub_mb_type[i])
2781
899a2ea0907c parenthesing to avoid compiler errors in the future - compared asm outputs, behaviour didnt changed
alex
parents: 2774
diff changeset
4277 || (!h->sps.direct_8x8_inference_flag && IS_DIRECT(h->sub_mb_type[i])))
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4278 return 0;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4279 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4280 return 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4281 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4282
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4283 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4284 * decodes a residual block.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4285 * @param n block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4286 * @param scantable scantable
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4287 * @param max_coeff number of coefficients in the block
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4288 * @return <0 if an error occured
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4289 */
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
4290 static int decode_residual(H264Context *h, GetBitContext *gb, DCTELEM *block, int n, const uint8_t *scantable, const uint32_t *qmul, int max_coeff){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4291 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4292 static const int coeff_token_table_index[17]= {0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3};
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4293 int level[16];
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4294 int zeros_left, coeff_num, coeff_token, total_coeff, i, j, trailing_ones, run_before;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4295
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4296 //FIXME put trailing_onex into the context
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4297
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4298 if(n == CHROMA_DC_BLOCK_INDEX){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4299 coeff_token= get_vlc2(gb, chroma_dc_coeff_token_vlc.table, CHROMA_DC_COEFF_TOKEN_VLC_BITS, 1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4300 total_coeff= coeff_token>>2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4301 }else{
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4302 if(n == LUMA_DC_BLOCK_INDEX){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4303 total_coeff= pred_non_zero_count(h, 0);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4304 coeff_token= get_vlc2(gb, coeff_token_vlc[ coeff_token_table_index[total_coeff] ].table, COEFF_TOKEN_VLC_BITS, 2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4305 total_coeff= coeff_token>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4306 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4307 total_coeff= pred_non_zero_count(h, n);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4308 coeff_token= get_vlc2(gb, coeff_token_vlc[ coeff_token_table_index[total_coeff] ].table, COEFF_TOKEN_VLC_BITS, 2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4309 total_coeff= coeff_token>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4310 h->non_zero_count_cache[ scan8[n] ]= total_coeff;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4311 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4312 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4313
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4314 //FIXME set last_non_zero?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4315
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4316 if(total_coeff==0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4317 return 0;
4391
20944c70a3c0 fix segfault with darkkben.free.fr/corrupted_h264.mp4
michael
parents: 4390
diff changeset
4318 if(total_coeff > (unsigned)max_coeff) {
20944c70a3c0 fix segfault with darkkben.free.fr/corrupted_h264.mp4
michael
parents: 4390
diff changeset
4319 av_log(h->s.avctx, AV_LOG_ERROR, "corrupted macroblock %d %d (total_coeff=%d)\n", s->mb_x, s->mb_y, total_coeff);
4270
758ba4a18478 fix crash when decoding a truncated H264 slice
gpoirier
parents: 4269
diff changeset
4320 return -1;
758ba4a18478 fix crash when decoding a truncated H264 slice
gpoirier
parents: 4269
diff changeset
4321 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4322
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4323 trailing_ones= coeff_token&3;
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
4324 tprintf(h->s.avctx, "trailing:%d, total:%d\n", trailing_ones, total_coeff);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4325 assert(total_coeff<=16);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4326
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4327 for(i=0; i<trailing_ones; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4328 level[i]= 1 - 2*get_bits1(gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4329 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4330
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4331 if(i<total_coeff) {
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4332 int level_code, mask;
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4333 int suffix_length = total_coeff > 10 && trailing_ones < 3;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4334 int prefix= get_level_prefix(gb);
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4335
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4336 //first coefficient has suffix_length equal to 0 or 1
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4337 if(prefix<14){ //FIXME try to build a large unified VLC table for all this
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4338 if(suffix_length)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4339 level_code= (prefix<<suffix_length) + get_bits(gb, suffix_length); //part
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4340 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4341 level_code= (prefix<<suffix_length); //part
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4342 }else if(prefix==14){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4343 if(suffix_length)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4344 level_code= (prefix<<suffix_length) + get_bits(gb, suffix_length); //part
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4345 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4346 level_code= prefix + get_bits(gb, 4); //part
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4347 }else if(prefix==15){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4348 level_code= (prefix<<suffix_length) + get_bits(gb, 12); //part
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
4349 if(suffix_length==0) level_code+=15; //FIXME doesn't make (much)sense
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4350 }else{
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
4351 av_log(h->s.avctx, AV_LOG_ERROR, "prefix too large at %d %d\n", s->mb_x, s->mb_y);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4352 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4353 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4354
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4355 if(trailing_ones < 3) level_code += 2;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4356
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4357 suffix_length = 1;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4358 if(level_code > 5)
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4359 suffix_length++;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4360 mask= -(level_code&1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4361 level[i]= (((2+level_code)>>1) ^ mask) - mask;
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4362 i++;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4363
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4364 //remaining coefficients have suffix_length > 0
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4365 for(;i<total_coeff;i++) {
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4366 static const int suffix_limit[7] = {0,5,11,23,47,95,INT_MAX };
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4367 prefix = get_level_prefix(gb);
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4368 if(prefix<15){
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4369 level_code = (prefix<<suffix_length) + get_bits(gb, suffix_length);
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4370 }else if(prefix==15){
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4371 level_code = (prefix<<suffix_length) + get_bits(gb, 12);
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4372 }else{
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4373 av_log(h->s.avctx, AV_LOG_ERROR, "prefix too large at %d %d\n", s->mb_x, s->mb_y);
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4374 return -1;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4375 }
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4376 mask= -(level_code&1);
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4377 level[i]= (((2+level_code)>>1) ^ mask) - mask;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4378 if(level_code > suffix_limit[suffix_length])
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4379 suffix_length++;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4380 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4381 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4382
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4383 if(total_coeff == max_coeff)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4384 zeros_left=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4385 else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4386 if(n == CHROMA_DC_BLOCK_INDEX)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4387 zeros_left= get_vlc2(gb, chroma_dc_total_zeros_vlc[ total_coeff-1 ].table, CHROMA_DC_TOTAL_ZEROS_VLC_BITS, 1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4388 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4389 zeros_left= get_vlc2(gb, total_zeros_vlc[ total_coeff-1 ].table, TOTAL_ZEROS_VLC_BITS, 1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4390 }
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4391
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4392 coeff_num = zeros_left + total_coeff - 1;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4393 j = scantable[coeff_num];
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4394 if(n > 24){
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4395 block[j] = level[0];
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4396 for(i=1;i<total_coeff;i++) {
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4397 if(zeros_left <= 0)
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4398 run_before = 0;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4399 else if(zeros_left < 7){
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4400 run_before= get_vlc2(gb, run_vlc[zeros_left-1].table, RUN_VLC_BITS, 1);
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4401 }else{
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4402 run_before= get_vlc2(gb, run7_vlc.table, RUN7_VLC_BITS, 2);
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4403 }
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4404 zeros_left -= run_before;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4405 coeff_num -= 1 + run_before;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4406 j= scantable[ coeff_num ];
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4407
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4408 block[j]= level[i];
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4409 }
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4410 }else{
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
4411 block[j] = (level[0] * qmul[j] + 32)>>6;
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4412 for(i=1;i<total_coeff;i++) {
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4413 if(zeros_left <= 0)
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4414 run_before = 0;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4415 else if(zeros_left < 7){
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4416 run_before= get_vlc2(gb, run_vlc[zeros_left-1].table, RUN_VLC_BITS, 1);
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4417 }else{
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4418 run_before= get_vlc2(gb, run7_vlc.table, RUN7_VLC_BITS, 2);
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4419 }
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4420 zeros_left -= run_before;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4421 coeff_num -= 1 + run_before;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4422 j= scantable[ coeff_num ];
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4423
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
4424 block[j]= (level[i] * qmul[j] + 32)>>6;
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4425 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4426 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4427
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4428 if(zeros_left<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
4429 av_log(h->s.avctx, AV_LOG_ERROR, "negative number of zero coeffs at %d %d\n", s->mb_x, s->mb_y);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4430 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4431 }
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4432
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4433 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4434 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4435
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4436 static void predict_field_decoding_flag(H264Context *h){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4437 MpegEncContext * const s = &h->s;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4438 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4439 int mb_type = (h->slice_table[mb_xy-1] == h->slice_num)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4440 ? s->current_picture.mb_type[mb_xy-1]
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4441 : (h->slice_table[mb_xy-s->mb_stride] == h->slice_num)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4442 ? s->current_picture.mb_type[mb_xy-s->mb_stride]
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4443 : 0;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4444 h->mb_mbaff = h->mb_field_decoding_flag = IS_INTERLACED(mb_type) ? 1 : 0;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4445 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4446
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4447 /**
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4448 * decodes a P_SKIP or B_SKIP macroblock
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4449 */
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4450 static void decode_mb_skip(H264Context *h){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4451 MpegEncContext * const s = &h->s;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4452 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
2674
58fb8e1efcae 10l (mb_type uninitalized and then changed and overwritten)
michael
parents: 2673
diff changeset
4453 int mb_type=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4454
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4455 memset(h->non_zero_count[mb_xy], 0, 16);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4456 memset(h->non_zero_count_cache + 8, 0, 8*5); //FIXME ugly, remove pfui
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4457
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4458 if(MB_FIELD)
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
4459 mb_type|= MB_TYPE_INTERLACED;
2674
58fb8e1efcae 10l (mb_type uninitalized and then changed and overwritten)
michael
parents: 2673
diff changeset
4460
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4461 if( h->slice_type == B_TYPE )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4462 {
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4463 // just for fill_caches. pred_direct_motion will set the real mb_type
2674
58fb8e1efcae 10l (mb_type uninitalized and then changed and overwritten)
michael
parents: 2673
diff changeset
4464 mb_type|= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2|MB_TYPE_SKIP;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4465
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
4466 fill_caches(h, mb_type, 0); //FIXME check what is needed and what not ...
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4467 pred_direct_motion(h, &mb_type);
3927
f44a3341bfdf simplify write_back_motion for skip mbs
lorenm
parents: 3807
diff changeset
4468 mb_type|= MB_TYPE_SKIP;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4469 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4470 else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4471 {
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4472 int mx, my;
2674
58fb8e1efcae 10l (mb_type uninitalized and then changed and overwritten)
michael
parents: 2673
diff changeset
4473 mb_type|= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P1L0|MB_TYPE_SKIP;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4474
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
4475 fill_caches(h, mb_type, 0); //FIXME check what is needed and what not ...
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4476 pred_pskip_motion(h, &mx, &my);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4477 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, 0, 1);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4478 fill_rectangle( h->mv_cache[0][scan8[0]], 4, 4, 8, pack16to32(mx,my), 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4479 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4480
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4481 write_back_motion(h, mb_type);
3927
f44a3341bfdf simplify write_back_motion for skip mbs
lorenm
parents: 3807
diff changeset
4482 s->current_picture.mb_type[mb_xy]= mb_type;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4483 s->current_picture.qscale_table[mb_xy]= s->qscale;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4484 h->slice_table[ mb_xy ]= h->slice_num;
2628
511e3afc43e1 Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents: 2623
diff changeset
4485 h->prev_mb_skipped= 1;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4486 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4487
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4488 /**
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4489 * decodes a macroblock
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4490 * @returns 0 if ok, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4491 */
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4492 static int decode_mb_cavlc(H264Context *h){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4493 MpegEncContext * const s = &h->s;
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: 1174
diff changeset
4494 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4495 int partition_count;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4496 unsigned int mb_type, cbp;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4497 int dct8x8_allowed= h->pps.transform_8x8_mode;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4498
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4499 s->dsp.clear_blocks(h->mb); //FIXME avoid if already clear (move after skip handlong?
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4500
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
4501 tprintf(s->avctx, "pic:%d mb:%d/%d\n", h->frame_num, s->mb_x, s->mb_y);
1453
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
4502 cbp = 0; /* avoid warning. FIXME: find a solution without slowing
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
4503 down the code */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4504 if(h->slice_type != I_TYPE && h->slice_type != SI_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4505 if(s->mb_skip_run==-1)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4506 s->mb_skip_run= get_ue_golomb(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4507
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4508 if (s->mb_skip_run--) {
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4509 if(FRAME_MBAFF && (s->mb_y&1) == 0){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4510 if(s->mb_skip_run==0)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4511 h->mb_mbaff = h->mb_field_decoding_flag = get_bits1(&s->gb);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4512 else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4513 predict_field_decoding_flag(h);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4514 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4515 decode_mb_skip(h);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4516 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4517 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4518 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4519 if(FRAME_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4520 if( (s->mb_y&1) == 0 )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4521 h->mb_mbaff = h->mb_field_decoding_flag = get_bits1(&s->gb);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4522 }else
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
4523 h->mb_field_decoding_flag= (s->picture_structure!=PICT_FRAME);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4524
2628
511e3afc43e1 Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents: 2623
diff changeset
4525 h->prev_mb_skipped= 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4526
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4527 mb_type= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4528 if(h->slice_type == B_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4529 if(mb_type < 23){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4530 partition_count= b_mb_type_info[mb_type].partition_count;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4531 mb_type= b_mb_type_info[mb_type].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4532 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4533 mb_type -= 23;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4534 goto decode_intra_mb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4535 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4536 }else if(h->slice_type == P_TYPE /*|| h->slice_type == SP_TYPE */){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4537 if(mb_type < 5){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4538 partition_count= p_mb_type_info[mb_type].partition_count;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4539 mb_type= p_mb_type_info[mb_type].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4540 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4541 mb_type -= 5;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4542 goto decode_intra_mb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4543 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4544 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4545 assert(h->slice_type == I_TYPE);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4546 decode_intra_mb:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4547 if(mb_type > 25){
3954
00a12ef7d800 output typo fixes
diego
parents: 3948
diff changeset
4548 av_log(h->s.avctx, AV_LOG_ERROR, "mb_type %d in %c slice too large at %d %d\n", mb_type, av_get_pict_type_char(h->slice_type), s->mb_x, s->mb_y);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4549 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4550 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4551 partition_count=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4552 cbp= i_mb_type_info[mb_type].cbp;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4553 h->intra16x16_pred_mode= i_mb_type_info[mb_type].pred_mode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4554 mb_type= i_mb_type_info[mb_type].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4555 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4556
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4557 if(MB_FIELD)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4558 mb_type |= MB_TYPE_INTERLACED;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4559
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4560 h->slice_table[ mb_xy ]= h->slice_num;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4561
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4562 if(IS_INTRA_PCM(mb_type)){
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4563 unsigned int x, y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4564
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5106
diff changeset
4565 // We assume these blocks are very rare so we do not optimize it.
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4566 align_get_bits(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4567
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4568 // The pixels are stored in the same order as levels in h->mb array.
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4569 for(y=0; y<16; y++){
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4570 const int index= 4*(y&3) + 32*((y>>2)&1) + 128*(y>>3);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4571 for(x=0; x<16; x++){
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
4572 tprintf(s->avctx, "LUMA ICPM LEVEL (%3d)\n", show_bits(&s->gb, 8));
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4573 h->mb[index + (x&3) + 16*((x>>2)&1) + 64*(x>>3)]= get_bits(&s->gb, 8);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4574 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4575 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4576 for(y=0; y<8; y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4577 const int index= 256 + 4*(y&3) + 32*(y>>2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4578 for(x=0; x<8; x++){
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
4579 tprintf(s->avctx, "CHROMA U ICPM LEVEL (%3d)\n", show_bits(&s->gb, 8));
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4580 h->mb[index + (x&3) + 16*(x>>2)]= get_bits(&s->gb, 8);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4581 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4582 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4583 for(y=0; y<8; y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4584 const int index= 256 + 64 + 4*(y&3) + 32*(y>>2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4585 for(x=0; x<8; x++){
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
4586 tprintf(s->avctx, "CHROMA V ICPM LEVEL (%3d)\n", show_bits(&s->gb, 8));
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4587 h->mb[index + (x&3) + 16*(x>>2)]= get_bits(&s->gb, 8);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4588 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4589 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4590
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
4591 // In deblocking, the quantizer is 0
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4592 s->current_picture.qscale_table[mb_xy]= 0;
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
4593 h->chroma_qp[0] = get_chroma_qp(h, 0, 0);
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
4594 h->chroma_qp[1] = get_chroma_qp(h, 1, 0);
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
4595 // All coeffs are present
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
4596 memset(h->non_zero_count[mb_xy], 16, 16);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4597
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4598 s->current_picture.mb_type[mb_xy]= mb_type;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4599 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4600 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4601
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4602 if(MB_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4603 h->ref_count[0] <<= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4604 h->ref_count[1] <<= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4605 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4606
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
4607 fill_caches(h, mb_type, 0);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4608
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4609 //mb_pred
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4610 if(IS_INTRA(mb_type)){
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4611 int pred_mode;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4612 // init_top_left_availability(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4613 if(IS_INTRA4x4(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4614 int i;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4615 int di = 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4616 if(dct8x8_allowed && get_bits1(&s->gb)){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4617 mb_type |= MB_TYPE_8x8DCT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4618 di = 4;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4619 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4620
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4621 // fill_intra4x4_pred_table(h);
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4622 for(i=0; i<16; i+=di){
3409
584ff6431043 simplify intra prediction mode decoding
michael
parents: 3379
diff changeset
4623 int mode= pred_intra_mode(h, i);
584ff6431043 simplify intra prediction mode decoding
michael
parents: 3379
diff changeset
4624
584ff6431043 simplify intra prediction mode decoding
michael
parents: 3379
diff changeset
4625 if(!get_bits1(&s->gb)){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4626 const int rem_mode= get_bits(&s->gb, 3);
3409
584ff6431043 simplify intra prediction mode decoding
michael
parents: 3379
diff changeset
4627 mode = rem_mode + (rem_mode >= mode);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4628 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4629
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4630 if(di==4)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4631 fill_rectangle( &h->intra4x4_pred_mode_cache[ scan8[i] ], 2, 2, 8, mode, 1 );
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4632 else
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4633 h->intra4x4_pred_mode_cache[ scan8[i] ] = mode;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4634 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4635 write_back_intra_pred_mode(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4636 if( check_intra4x4_pred_mode(h) < 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4637 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4638 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4639 h->intra16x16_pred_mode= check_intra_pred_mode(h, h->intra16x16_pred_mode);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4640 if(h->intra16x16_pred_mode < 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4641 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4642 }
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4643
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4644 pred_mode= check_intra_pred_mode(h, get_ue_golomb(&s->gb));
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4645 if(pred_mode < 0)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4646 return -1;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4647 h->chroma_pred_mode= pred_mode;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4648 }else if(partition_count==4){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4649 int i, j, sub_partition_count[4], list, ref[2][4];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4650
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4651 if(h->slice_type == B_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4652 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4653 h->sub_mb_type[i]= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4654 if(h->sub_mb_type[i] >=13){
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4655 av_log(h->s.avctx, AV_LOG_ERROR, "B sub_mb_type %u out of range at %d %d\n", h->sub_mb_type[i], s->mb_x, s->mb_y);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4656 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4657 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4658 sub_partition_count[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4659 h->sub_mb_type[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4660 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4661 if( IS_DIRECT(h->sub_mb_type[0]) || IS_DIRECT(h->sub_mb_type[1])
3003
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
4662 || IS_DIRECT(h->sub_mb_type[2]) || IS_DIRECT(h->sub_mb_type[3])) {
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4663 pred_direct_motion(h, &mb_type);
3003
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
4664 h->ref_cache[0][scan8[4]] =
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
4665 h->ref_cache[1][scan8[4]] =
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
4666 h->ref_cache[0][scan8[12]] =
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
4667 h->ref_cache[1][scan8[12]] = PART_NOT_AVAILABLE;
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
4668 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4669 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4670 assert(h->slice_type == P_TYPE || h->slice_type == SP_TYPE); //FIXME SP correct ?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4671 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4672 h->sub_mb_type[i]= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4673 if(h->sub_mb_type[i] >=4){
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4674 av_log(h->s.avctx, AV_LOG_ERROR, "P sub_mb_type %u out of range at %d %d\n", h->sub_mb_type[i], s->mb_x, s->mb_y);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4675 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4676 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4677 sub_partition_count[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4678 h->sub_mb_type[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4679 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4680 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4681
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
4682 for(list=0; list<h->list_count; list++){
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4683 int ref_count= IS_REF0(mb_type) ? 1 : h->ref_count[list];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4684 for(i=0; i<4; i++){
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4685 if(IS_DIRECT(h->sub_mb_type[i])) continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4686 if(IS_DIR(h->sub_mb_type[i], 0, list)){
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4687 unsigned int tmp = get_te0_golomb(&s->gb, ref_count); //FIXME init to 0 before and skip?
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4688 if(tmp>=ref_count){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4689 av_log(h->s.avctx, AV_LOG_ERROR, "ref %u overflow\n", tmp);
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4690 return -1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4691 }
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4692 ref[list][i]= tmp;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4693 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4694 //FIXME
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4695 ref[list][i] = -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4696 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4697 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4698 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4699
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4700 if(dct8x8_allowed)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4701 dct8x8_allowed = get_dct8x8_allowed(h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4702
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
4703 for(list=0; list<h->list_count; list++){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4704 for(i=0; i<4; i++){
3003
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
4705 if(IS_DIRECT(h->sub_mb_type[i])) {
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
4706 h->ref_cache[list][ scan8[4*i] ] = h->ref_cache[list][ scan8[4*i]+1 ];
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
4707 continue;
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
4708 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4709 h->ref_cache[list][ scan8[4*i] ]=h->ref_cache[list][ scan8[4*i]+1 ]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4710 h->ref_cache[list][ scan8[4*i]+8 ]=h->ref_cache[list][ scan8[4*i]+9 ]= ref[list][i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4711
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4712 if(IS_DIR(h->sub_mb_type[i], 0, list)){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4713 const int sub_mb_type= h->sub_mb_type[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4714 const int block_width= (sub_mb_type & (MB_TYPE_16x16|MB_TYPE_16x8)) ? 2 : 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4715 for(j=0; j<sub_partition_count[i]; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4716 int mx, my;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4717 const int index= 4*i + block_width*j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4718 int16_t (* mv_cache)[2]= &h->mv_cache[list][ scan8[index] ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4719 pred_motion(h, index, block_width, list, h->ref_cache[list][ scan8[index] ], &mx, &my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4720 mx += get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4721 my += get_se_golomb(&s->gb);
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
4722 tprintf(s->avctx, "final mv:%d %d\n", mx, my);
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
4723
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4724 if(IS_SUB_8X8(sub_mb_type)){
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
4725 mv_cache[ 1 ][0]=
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4726 mv_cache[ 8 ][0]= mv_cache[ 9 ][0]= mx;
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
4727 mv_cache[ 1 ][1]=
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4728 mv_cache[ 8 ][1]= mv_cache[ 9 ][1]= my;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4729 }else if(IS_SUB_8X4(sub_mb_type)){
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
4730 mv_cache[ 1 ][0]= mx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
4731 mv_cache[ 1 ][1]= my;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4732 }else if(IS_SUB_4X8(sub_mb_type)){
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
4733 mv_cache[ 8 ][0]= mx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
4734 mv_cache[ 8 ][1]= my;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4735 }
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
4736 mv_cache[ 0 ][0]= mx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
4737 mv_cache[ 0 ][1]= my;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4738 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4739 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4740 uint32_t *p= (uint32_t *)&h->mv_cache[list][ scan8[4*i] ][0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4741 p[0] = p[1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4742 p[8] = p[9]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4743 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4744 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4745 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4746 }else if(IS_DIRECT(mb_type)){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4747 pred_direct_motion(h, &mb_type);
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4748 dct8x8_allowed &= h->sps.direct_8x8_inference_flag;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4749 }else{
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4750 int list, mx, my, i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4751 //FIXME we should set ref_idx_l? to 0 if we use that later ...
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4752 if(IS_16X16(mb_type)){
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4753 for(list=0; list<h->list_count; list++){
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4754 unsigned int val;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4755 if(IS_DIR(mb_type, 0, list)){
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4756 val= get_te0_golomb(&s->gb, h->ref_count[list]);
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4757 if(val >= h->ref_count[list]){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4758 av_log(h->s.avctx, AV_LOG_ERROR, "ref %u overflow\n", val);
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4759 return -1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4760 }
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
4761 }else
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4762 val= LIST_NOT_USED&0xFF;
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4763 fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, val, 1);
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4764 }
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4765 for(list=0; list<h->list_count; list++){
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4766 unsigned int val;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4767 if(IS_DIR(mb_type, 0, list)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4768 pred_motion(h, 0, 4, list, h->ref_cache[list][ scan8[0] ], &mx, &my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4769 mx += get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4770 my += get_se_golomb(&s->gb);
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
4771 tprintf(s->avctx, "final mv:%d %d\n", mx, my);
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
4772
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4773 val= pack16to32(mx,my);
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
4774 }else
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4775 val=0;
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4776 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, val, 4);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4777 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4778 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4779 else if(IS_16X8(mb_type)){
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4780 for(list=0; list<h->list_count; list++){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4781 for(i=0; i<2; i++){
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4782 unsigned int val;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4783 if(IS_DIR(mb_type, i, list)){
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4784 val= get_te0_golomb(&s->gb, h->ref_count[list]);
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4785 if(val >= h->ref_count[list]){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4786 av_log(h->s.avctx, AV_LOG_ERROR, "ref %u overflow\n", val);
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4787 return -1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4788 }
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
4789 }else
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4790 val= LIST_NOT_USED&0xFF;
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4791 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, val, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4792 }
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4793 }
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4794 for(list=0; list<h->list_count; list++){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4795 for(i=0; i<2; i++){
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4796 unsigned int val;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4797 if(IS_DIR(mb_type, i, list)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4798 pred_16x8_motion(h, 8*i, list, h->ref_cache[list][scan8[0] + 16*i], &mx, &my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4799 mx += get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4800 my += get_se_golomb(&s->gb);
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
4801 tprintf(s->avctx, "final mv:%d %d\n", mx, my);
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
4802
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4803 val= pack16to32(mx,my);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4804 }else
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4805 val=0;
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4806 fill_rectangle(h->mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, val, 4);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4807 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4808 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4809 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4810 assert(IS_8X16(mb_type));
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4811 for(list=0; list<h->list_count; list++){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4812 for(i=0; i<2; i++){
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4813 unsigned int val;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4814 if(IS_DIR(mb_type, i, list)){ //FIXME optimize
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4815 val= get_te0_golomb(&s->gb, h->ref_count[list]);
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4816 if(val >= h->ref_count[list]){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4817 av_log(h->s.avctx, AV_LOG_ERROR, "ref %u overflow\n", val);
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4818 return -1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4819 }
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
4820 }else
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4821 val= LIST_NOT_USED&0xFF;
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4822 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, val, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4823 }
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4824 }
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4825 for(list=0; list<h->list_count; list++){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4826 for(i=0; i<2; i++){
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4827 unsigned int val;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4828 if(IS_DIR(mb_type, i, list)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4829 pred_8x16_motion(h, i*4, list, h->ref_cache[list][ scan8[0] + 2*i ], &mx, &my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4830 mx += get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4831 my += get_se_golomb(&s->gb);
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
4832 tprintf(s->avctx, "final mv:%d %d\n", mx, my);
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
4833
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4834 val= pack16to32(mx,my);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4835 }else
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4836 val=0;
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4837 fill_rectangle(h->mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, val, 4);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4838 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4839 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4840 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4841 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4842
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4843 if(IS_INTER(mb_type))
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4844 write_back_motion(h, mb_type);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4845
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4846 if(!IS_INTRA16x16(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4847 cbp= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4848 if(cbp > 47){
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4849 av_log(h->s.avctx, AV_LOG_ERROR, "cbp too large (%u) at %d %d\n", cbp, s->mb_x, s->mb_y);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4850 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4851 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4852
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4853 if(IS_INTRA4x4(mb_type))
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4854 cbp= golomb_to_intra4x4_cbp[cbp];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4855 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4856 cbp= golomb_to_inter_cbp[cbp];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4857 }
3651
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
4858 h->cbp = cbp;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4859
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4860 if(dct8x8_allowed && (cbp&15) && !IS_INTRA(mb_type)){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4861 if(get_bits1(&s->gb))
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4862 mb_type |= MB_TYPE_8x8DCT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4863 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4864 s->current_picture.mb_type[mb_xy]= mb_type;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4865
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4866 if(cbp || IS_INTRA16x16(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4867 int i8x8, i4x4, chroma_idx;
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
4868 int dquant;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4869 GetBitContext *gb= IS_INTRA(mb_type) ? h->intra_gb_ptr : h->inter_gb_ptr;
3174
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
4870 const uint8_t *scan, *scan8x8, *dc_scan;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4871
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4872 // fill_non_zero_count_cache(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4873
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4874 if(IS_INTERLACED(mb_type)){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4875 scan8x8= s->qscale ? h->field_scan8x8_cavlc : h->field_scan8x8_cavlc_q0;
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
4876 scan= s->qscale ? h->field_scan : h->field_scan_q0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4877 dc_scan= luma_dc_field_scan;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4878 }else{
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4879 scan8x8= s->qscale ? h->zigzag_scan8x8_cavlc : h->zigzag_scan8x8_cavlc_q0;
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
4880 scan= s->qscale ? h->zigzag_scan : h->zigzag_scan_q0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4881 dc_scan= luma_dc_zigzag_scan;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4882 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4883
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4884 dquant= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4885
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4886 if( dquant > 25 || dquant < -26 ){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
4887 av_log(h->s.avctx, AV_LOG_ERROR, "dquant out of range (%d) at %d %d\n", dquant, s->mb_x, s->mb_y);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4888 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4889 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4890
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4891 s->qscale += dquant;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4892 if(((unsigned)s->qscale) > 51){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4893 if(s->qscale<0) s->qscale+= 52;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4894 else s->qscale-= 52;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4895 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4896
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
4897 h->chroma_qp[0]= get_chroma_qp(h, 0, s->qscale);
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
4898 h->chroma_qp[1]= get_chroma_qp(h, 1, s->qscale);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4899 if(IS_INTRA16x16(mb_type)){
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
4900 if( decode_residual(h, h->intra_gb_ptr, h->mb, LUMA_DC_BLOCK_INDEX, dc_scan, h->dequant4_coeff[0][s->qscale], 16) < 0){
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
4901 return -1; //FIXME continue if partitioned and other return -1 too
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4902 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4903
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4904 assert((cbp&15) == 0 || (cbp&15) == 15);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4905
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4906 if(cbp&15){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4907 for(i8x8=0; i8x8<4; i8x8++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4908 for(i4x4=0; i4x4<4; i4x4++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4909 const int index= i4x4 + 4*i8x8;
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
4910 if( decode_residual(h, h->intra_gb_ptr, h->mb + 16*index, index, scan + 1, h->dequant4_coeff[0][s->qscale], 15) < 0 ){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4911 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4912 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4913 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4914 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4915 }else{
1636
d9d98cdcfcde intra16x16 fix
michael
parents: 1598
diff changeset
4916 fill_rectangle(&h->non_zero_count_cache[scan8[0]], 4, 4, 8, 0, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4917 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4918 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4919 for(i8x8=0; i8x8<4; i8x8++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4920 if(cbp & (1<<i8x8)){
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4921 if(IS_8x8DCT(mb_type)){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4922 DCTELEM *buf = &h->mb[64*i8x8];
2757
fa1c8955e291 remove mixed code/declarations
mru
parents: 2755
diff changeset
4923 uint8_t *nnz;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4924 for(i4x4=0; i4x4<4; i4x4++){
3174
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
4925 if( decode_residual(h, gb, buf, i4x4+4*i8x8, scan8x8+16*i4x4,
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
4926 h->dequant8_coeff[IS_INTRA( mb_type ) ? 0:1][s->qscale], 16) <0 )
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4927 return -1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4928 }
2757
fa1c8955e291 remove mixed code/declarations
mru
parents: 2755
diff changeset
4929 nnz= &h->non_zero_count_cache[ scan8[4*i8x8] ];
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
4930 nnz[0] += nnz[1] + nnz[8] + nnz[9];
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4931 }else{
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4932 for(i4x4=0; i4x4<4; i4x4++){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4933 const int index= i4x4 + 4*i8x8;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4934
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
4935 if( decode_residual(h, gb, h->mb + 16*index, index, scan, h->dequant4_coeff[IS_INTRA( mb_type ) ? 0:3][s->qscale], 16) <0 ){
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4936 return -1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4937 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4938 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4939 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4940 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4941 uint8_t * const nnz= &h->non_zero_count_cache[ scan8[4*i8x8] ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4942 nnz[0] = nnz[1] = nnz[8] = nnz[9] = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4943 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4944 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4945 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4946
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4947 if(cbp&0x30){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4948 for(chroma_idx=0; chroma_idx<2; chroma_idx++)
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
4949 if( decode_residual(h, gb, h->mb + 256 + 16*4*chroma_idx, CHROMA_DC_BLOCK_INDEX, chroma_dc_scan, NULL, 4) < 0){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4950 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4951 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4952 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4953
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4954 if(cbp&0x20){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4955 for(chroma_idx=0; chroma_idx<2; chroma_idx++){
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
4956 const uint32_t *qmul = h->dequant4_coeff[chroma_idx+1+(IS_INTRA( mb_type ) ? 0:3)][h->chroma_qp[chroma_idx]];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4957 for(i4x4=0; i4x4<4; i4x4++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4958 const int index= 16 + 4*chroma_idx + i4x4;
5225
099c495618c1 Compute the dequant coefficient table ptr outside the loop,
gpoirier
parents: 5215
diff changeset
4959 if( decode_residual(h, gb, h->mb + 16*index, index, scan + 1, qmul, 15) < 0){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4960 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4961 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4962 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4963 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4964 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4965 uint8_t * const nnz= &h->non_zero_count_cache[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4966 nnz[ scan8[16]+0 ] = nnz[ scan8[16]+1 ] =nnz[ scan8[16]+8 ] =nnz[ scan8[16]+9 ] =
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4967 nnz[ scan8[20]+0 ] = nnz[ scan8[20]+1 ] =nnz[ scan8[20]+8 ] =nnz[ scan8[20]+9 ] = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4968 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4969 }else{
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
4970 uint8_t * const nnz= &h->non_zero_count_cache[0];
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
4971 fill_rectangle(&nnz[scan8[0]], 4, 4, 8, 0, 1);
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
4972 nnz[ scan8[16]+0 ] = nnz[ scan8[16]+1 ] =nnz[ scan8[16]+8 ] =nnz[ scan8[16]+9 ] =
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
4973 nnz[ scan8[20]+0 ] = nnz[ scan8[20]+1 ] =nnz[ scan8[20]+8 ] =nnz[ scan8[20]+9 ] = 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4974 }
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
4975 s->current_picture.qscale_table[mb_xy]= s->qscale;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4976 write_back_non_zero_count(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4977
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4978 if(MB_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4979 h->ref_count[0] >>= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4980 h->ref_count[1] >>= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4981 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4982
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4983 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4984 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4985
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4986 static int decode_cabac_field_decoding_flag(H264Context *h) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4987 MpegEncContext * const s = &h->s;
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4988 const int mb_x = s->mb_x;
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4989 const int mb_y = s->mb_y & ~1;
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4990 const int mba_xy = mb_x - 1 + mb_y *s->mb_stride;
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4991 const int mbb_xy = mb_x + (mb_y-2)*s->mb_stride;
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4992
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4993 unsigned int ctx = 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4994
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4995 if( h->slice_table[mba_xy] == h->slice_num && IS_INTERLACED( s->current_picture.mb_type[mba_xy] ) ) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4996 ctx += 1;
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4997 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4998 if( h->slice_table[mbb_xy] == h->slice_num && IS_INTERLACED( s->current_picture.mb_type[mbb_xy] ) ) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4999 ctx += 1;
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5000 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5001
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5002 return get_cabac_noinline( &h->cabac, &h->cabac_state[70 + ctx] );
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5003 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5004
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5005 static int decode_cabac_intra_mb_type(H264Context *h, int ctx_base, int intra_slice) {
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5006 uint8_t *state= &h->cabac_state[ctx_base];
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5007 int mb_type;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5008
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5009 if(intra_slice){
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5010 MpegEncContext * const s = &h->s;
2597
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5011 const int mba_xy = h->left_mb_xy[0];
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5012 const int mbb_xy = h->top_mb_xy;
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5013 int ctx=0;
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
5014 if( h->slice_table[mba_xy] == h->slice_num && !IS_INTRA4x4( s->current_picture.mb_type[mba_xy] ) )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5015 ctx++;
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
5016 if( h->slice_table[mbb_xy] == h->slice_num && !IS_INTRA4x4( s->current_picture.mb_type[mbb_xy] ) )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5017 ctx++;
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5018 if( get_cabac_noinline( &h->cabac, &state[ctx] ) == 0 )
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5019 return 0; /* I4x4 */
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5020 state += 2;
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5021 }else{
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5022 if( get_cabac_noinline( &h->cabac, &state[0] ) == 0 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5023 return 0; /* I4x4 */
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5024 }
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5025
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5026 if( get_cabac_terminate( &h->cabac ) )
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5027 return 25; /* PCM */
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5028
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5029 mb_type = 1; /* I16x16 */
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5030 mb_type += 12 * get_cabac_noinline( &h->cabac, &state[1] ); /* cbp_luma != 0 */
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5031 if( get_cabac_noinline( &h->cabac, &state[2] ) ) /* cbp_chroma */
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5032 mb_type += 4 + 4 * get_cabac_noinline( &h->cabac, &state[2+intra_slice] );
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5033 mb_type += 2 * get_cabac_noinline( &h->cabac, &state[3+intra_slice] );
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5034 mb_type += 1 * get_cabac_noinline( &h->cabac, &state[3+2*intra_slice] );
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5035 return mb_type;
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5036 }
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5037
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5038 static int decode_cabac_mb_type( H264Context *h ) {
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5039 MpegEncContext * const s = &h->s;
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5040
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5041 if( h->slice_type == I_TYPE ) {
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5042 return decode_cabac_intra_mb_type(h, 3, 1);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5043 } else if( h->slice_type == P_TYPE ) {
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5044 if( get_cabac_noinline( &h->cabac, &h->cabac_state[14] ) == 0 ) {
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5045 /* P-type */
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5046 if( get_cabac_noinline( &h->cabac, &h->cabac_state[15] ) == 0 ) {
3138
c12fc3d1c612 minor simplifications in cabac_mb_type
lorenm
parents: 3128
diff changeset
5047 /* P_L0_D16x16, P_8x8 */
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5048 return 3 * get_cabac_noinline( &h->cabac, &h->cabac_state[16] );
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5049 } else {
3138
c12fc3d1c612 minor simplifications in cabac_mb_type
lorenm
parents: 3128
diff changeset
5050 /* P_L0_D8x16, P_L0_D16x8 */
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5051 return 2 - get_cabac_noinline( &h->cabac, &h->cabac_state[17] );
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5052 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5053 } else {
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5054 return decode_cabac_intra_mb_type(h, 17, 0) + 5;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5055 }
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5056 } else if( h->slice_type == B_TYPE ) {
2597
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5057 const int mba_xy = h->left_mb_xy[0];
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5058 const int mbb_xy = h->top_mb_xy;
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5059 int ctx = 0;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5060 int bits;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5061
3138
c12fc3d1c612 minor simplifications in cabac_mb_type
lorenm
parents: 3128
diff changeset
5062 if( h->slice_table[mba_xy] == h->slice_num && !IS_DIRECT( s->current_picture.mb_type[mba_xy] ) )
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5063 ctx++;
3138
c12fc3d1c612 minor simplifications in cabac_mb_type
lorenm
parents: 3128
diff changeset
5064 if( h->slice_table[mbb_xy] == h->slice_num && !IS_DIRECT( s->current_picture.mb_type[mbb_xy] ) )
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5065 ctx++;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5066
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5067 if( !get_cabac_noinline( &h->cabac, &h->cabac_state[27+ctx] ) )
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5068 return 0; /* B_Direct_16x16 */
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5069
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5070 if( !get_cabac_noinline( &h->cabac, &h->cabac_state[27+3] ) ) {
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5071 return 1 + get_cabac_noinline( &h->cabac, &h->cabac_state[27+5] ); /* B_L[01]_16x16 */
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5072 }
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5073
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5074 bits = get_cabac_noinline( &h->cabac, &h->cabac_state[27+4] ) << 3;
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5075 bits|= get_cabac_noinline( &h->cabac, &h->cabac_state[27+5] ) << 2;
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5076 bits|= get_cabac_noinline( &h->cabac, &h->cabac_state[27+5] ) << 1;
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5077 bits|= get_cabac_noinline( &h->cabac, &h->cabac_state[27+5] );
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5078 if( bits < 8 )
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5079 return bits + 3; /* B_Bi_16x16 through B_L1_L0_16x8 */
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5080 else if( bits == 13 ) {
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5081 return decode_cabac_intra_mb_type(h, 32, 0) + 23;
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5082 } else if( bits == 14 )
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5083 return 11; /* B_L1_L0_8x16 */
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5084 else if( bits == 15 )
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5085 return 22; /* B_8x8 */
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5086
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5087 bits= ( bits<<1 ) | get_cabac_noinline( &h->cabac, &h->cabac_state[27+5] );
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5088 return bits - 4; /* B_L0_Bi_* through B_Bi_Bi_* */
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5089 } else {
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5090 /* TODO SI/SP frames? */
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5091 return -1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5092 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5093 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5094
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5095 static int decode_cabac_mb_skip( H264Context *h, int mb_x, int mb_y ) {
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5096 MpegEncContext * const s = &h->s;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5097 int mba_xy, mbb_xy;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5098 int ctx = 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5099
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5100 if(FRAME_MBAFF){ //FIXME merge with the stuff in fill_caches?
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5101 int mb_xy = mb_x + (mb_y&~1)*s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5102 mba_xy = mb_xy - 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5103 if( (mb_y&1)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5104 && h->slice_table[mba_xy] == h->slice_num
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5105 && MB_FIELD == !!IS_INTERLACED( s->current_picture.mb_type[mba_xy] ) )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5106 mba_xy += s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5107 if( MB_FIELD ){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5108 mbb_xy = mb_xy - s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5109 if( !(mb_y&1)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5110 && h->slice_table[mbb_xy] == h->slice_num
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5111 && IS_INTERLACED( s->current_picture.mb_type[mbb_xy] ) )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5112 mbb_xy -= s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5113 }else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5114 mbb_xy = mb_x + (mb_y-1)*s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5115 }else{
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5116 int mb_xy = mb_x + mb_y*s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5117 mba_xy = mb_xy - 1;
5781
0b3aa6f4c313 Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents: 5780
diff changeset
5118 mbb_xy = mb_xy - (s->mb_stride << FIELD_PICTURE);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5119 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5120
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
5121 if( h->slice_table[mba_xy] == h->slice_num && !IS_SKIP( s->current_picture.mb_type[mba_xy] ))
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5122 ctx++;
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
5123 if( h->slice_table[mbb_xy] == h->slice_num && !IS_SKIP( s->current_picture.mb_type[mbb_xy] ))
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5124 ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5125
3138
c12fc3d1c612 minor simplifications in cabac_mb_type
lorenm
parents: 3128
diff changeset
5126 if( h->slice_type == B_TYPE )
c12fc3d1c612 minor simplifications in cabac_mb_type
lorenm
parents: 3128
diff changeset
5127 ctx += 13;
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5128 return get_cabac_noinline( &h->cabac, &h->cabac_state[11+ctx] );
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5129 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5130
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5131 static int decode_cabac_mb_intra4x4_pred_mode( H264Context *h, int pred_mode ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5132 int mode = 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5133
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5134 if( get_cabac( &h->cabac, &h->cabac_state[68] ) )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5135 return pred_mode;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5136
2928
16d67170715c tidier cabac_intra4x4_pred_mode
lorenm
parents: 2926
diff changeset
5137 mode += 1 * get_cabac( &h->cabac, &h->cabac_state[69] );
16d67170715c tidier cabac_intra4x4_pred_mode
lorenm
parents: 2926
diff changeset
5138 mode += 2 * get_cabac( &h->cabac, &h->cabac_state[69] );
16d67170715c tidier cabac_intra4x4_pred_mode
lorenm
parents: 2926
diff changeset
5139 mode += 4 * get_cabac( &h->cabac, &h->cabac_state[69] );
16d67170715c tidier cabac_intra4x4_pred_mode
lorenm
parents: 2926
diff changeset
5140
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5141 if( mode >= pred_mode )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5142 return mode + 1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5143 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5144 return mode;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5145 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5146
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5147 static int decode_cabac_mb_chroma_pre_mode( H264Context *h) {
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5148 const int mba_xy = h->left_mb_xy[0];
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5149 const int mbb_xy = h->top_mb_xy;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5150
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5151 int ctx = 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5152
1956
0eb2947f56f6 h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1935
diff changeset
5153 /* No need to test for IS_INTRA4x4 and IS_INTRA16x16, as we set chroma_pred_mode_table to 0 */
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
5154 if( h->slice_table[mba_xy] == h->slice_num && h->chroma_pred_mode_table[mba_xy] != 0 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5155 ctx++;
1956
0eb2947f56f6 h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1935
diff changeset
5156
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
5157 if( h->slice_table[mbb_xy] == h->slice_num && h->chroma_pred_mode_table[mbb_xy] != 0 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5158 ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5159
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5160 if( get_cabac_noinline( &h->cabac, &h->cabac_state[64+ctx] ) == 0 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5161 return 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5162
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5163 if( get_cabac_noinline( &h->cabac, &h->cabac_state[64+3] ) == 0 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5164 return 1;
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5165 if( get_cabac_noinline( &h->cabac, &h->cabac_state[64+3] ) == 0 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5166 return 2;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5167 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5168 return 3;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5169 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5170
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5171 static int decode_cabac_mb_cbp_luma( H264Context *h) {
5694
7c2ce28a0314 Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.
diego
parents: 5685
diff changeset
5172 int cbp_b, cbp_a, ctx, cbp = 0;
7c2ce28a0314 Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.
diego
parents: 5685
diff changeset
5173
7c2ce28a0314 Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.
diego
parents: 5685
diff changeset
5174 cbp_a = h->slice_table[h->left_mb_xy[0]] == h->slice_num ? h->left_cbp : -1;
7c2ce28a0314 Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.
diego
parents: 5685
diff changeset
5175 cbp_b = h->slice_table[h->top_mb_xy] == h->slice_num ? h->top_cbp : -1;
7c2ce28a0314 Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.
diego
parents: 5685
diff changeset
5176
7c2ce28a0314 Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.
diego
parents: 5685
diff changeset
5177 ctx = !(cbp_a & 0x02) + 2 * !(cbp_b & 0x04);
7c2ce28a0314 Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.
diego
parents: 5685
diff changeset
5178 cbp |= get_cabac_noinline(&h->cabac, &h->cabac_state[73 + ctx]);
7c2ce28a0314 Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.
diego
parents: 5685
diff changeset
5179 ctx = !(cbp & 0x01) + 2 * !(cbp_b & 0x08);
7c2ce28a0314 Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.
diego
parents: 5685
diff changeset
5180 cbp |= get_cabac_noinline(&h->cabac, &h->cabac_state[73 + ctx]) << 1;
7c2ce28a0314 Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.
diego
parents: 5685
diff changeset
5181 ctx = !(cbp_a & 0x08) + 2 * !(cbp & 0x01);
7c2ce28a0314 Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.
diego
parents: 5685
diff changeset
5182 cbp |= get_cabac_noinline(&h->cabac, &h->cabac_state[73 + ctx]) << 2;
7c2ce28a0314 Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.
diego
parents: 5685
diff changeset
5183 ctx = !(cbp & 0x04) + 2 * !(cbp & 0x02);
7c2ce28a0314 Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.
diego
parents: 5685
diff changeset
5184 cbp |= get_cabac_noinline(&h->cabac, &h->cabac_state[73 + ctx]) << 3;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5185 return cbp;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5186 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5187 static int decode_cabac_mb_cbp_chroma( H264Context *h) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5188 int ctx;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5189 int cbp_a, cbp_b;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5190
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5191 cbp_a = (h->left_cbp>>4)&0x03;
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5192 cbp_b = (h-> top_cbp>>4)&0x03;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5193
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5194 ctx = 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5195 if( cbp_a > 0 ) ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5196 if( cbp_b > 0 ) ctx += 2;
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5197 if( get_cabac_noinline( &h->cabac, &h->cabac_state[77 + ctx] ) == 0 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5198 return 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5199
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5200 ctx = 4;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5201 if( cbp_a == 2 ) ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5202 if( cbp_b == 2 ) ctx += 2;
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5203 return 1 + get_cabac_noinline( &h->cabac, &h->cabac_state[77 + ctx] );
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5204 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5205 static int decode_cabac_mb_dqp( H264Context *h) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5206 int ctx = 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5207 int val = 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5208
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5209 if( h->last_qscale_diff != 0 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5210 ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5211
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5212 while( get_cabac_noinline( &h->cabac, &h->cabac_state[60 + ctx] ) ) {
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5213 if( ctx < 2 )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5214 ctx = 2;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5215 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5216 ctx = 3;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5217 val++;
3128
dd3f6be492bd don't arbitrarily limit delta_qp
lorenm
parents: 3126
diff changeset
5218 if(val > 102) //prevent infinite loop
2844
5f20ab245501 prevent assert failures and infinite loops with broken streams
michael
parents: 2834
diff changeset
5219 return INT_MIN;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5220 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5221
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5222 if( val&0x01 )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5223 return (val + 1)/2;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5224 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5225 return -(val + 1)/2;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5226 }
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5227 static int decode_cabac_p_mb_sub_type( H264Context *h ) {
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5228 if( get_cabac( &h->cabac, &h->cabac_state[21] ) )
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5229 return 0; /* 8x8 */
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5230 if( !get_cabac( &h->cabac, &h->cabac_state[22] ) )
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5231 return 1; /* 8x4 */
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5232 if( get_cabac( &h->cabac, &h->cabac_state[23] ) )
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5233 return 2; /* 4x8 */
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5234 return 3; /* 4x4 */
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5235 }
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5236 static int decode_cabac_b_mb_sub_type( H264Context *h ) {
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5237 int type;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5238 if( !get_cabac( &h->cabac, &h->cabac_state[36] ) )
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5239 return 0; /* B_Direct_8x8 */
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5240 if( !get_cabac( &h->cabac, &h->cabac_state[37] ) )
2311
cdbb2f30e08b small typo patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 2310
diff changeset
5241 return 1 + get_cabac( &h->cabac, &h->cabac_state[39] ); /* B_L0_8x8, B_L1_8x8 */
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5242 type = 3;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5243 if( get_cabac( &h->cabac, &h->cabac_state[38] ) ) {
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5244 if( get_cabac( &h->cabac, &h->cabac_state[39] ) )
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5245 return 11 + get_cabac( &h->cabac, &h->cabac_state[39] ); /* B_L1_4x4, B_Bi_4x4 */
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5246 type += 4;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5247 }
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5248 type += 2*get_cabac( &h->cabac, &h->cabac_state[39] );
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5249 type += get_cabac( &h->cabac, &h->cabac_state[39] );
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5250 return type;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5251 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5252
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5253 static inline int decode_cabac_mb_transform_size( H264Context *h ) {
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5254 return get_cabac_noinline( &h->cabac, &h->cabac_state[399 + h->neighbor_transform_size] );
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5255 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5256
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5257 static int decode_cabac_mb_ref( H264Context *h, int list, int n ) {
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5258 int refa = h->ref_cache[list][scan8[n] - 1];
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5259 int refb = h->ref_cache[list][scan8[n] - 8];
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5260 int ref = 0;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5261 int ctx = 0;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5262
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5263 if( h->slice_type == B_TYPE) {
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5264 if( refa > 0 && !h->direct_cache[scan8[n] - 1] )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5265 ctx++;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5266 if( refb > 0 && !h->direct_cache[scan8[n] - 8] )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5267 ctx += 2;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5268 } else {
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5269 if( refa > 0 )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5270 ctx++;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5271 if( refb > 0 )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5272 ctx += 2;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5273 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5274
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5275 while( get_cabac( &h->cabac, &h->cabac_state[54+ctx] ) ) {
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5276 ref++;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5277 if( ctx < 4 )
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5278 ctx = 4;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5279 else
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5280 ctx = 5;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
5281 if(ref >= 32 /*h->ref_list[list]*/){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
5282 av_log(h->s.avctx, AV_LOG_ERROR, "overflow in decode_cabac_mb_ref\n");
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
5283 return 0; //FIXME we should return -1 and check the return everywhere
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
5284 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5285 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5286 return ref;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5287 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5288
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5289 static int decode_cabac_mb_mvd( H264Context *h, int list, int n, int l ) {
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5290 int amvd = abs( h->mvd_cache[list][scan8[n] - 1][l] ) +
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5291 abs( h->mvd_cache[list][scan8[n] - 8][l] );
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5292 int ctxbase = (l == 0) ? 40 : 47;
2317
2865f759882a optimzation
michael
parents: 2316
diff changeset
5293 int ctx, mvd;
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5294
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5295 if( amvd < 3 )
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5296 ctx = 0;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5297 else if( amvd > 32 )
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5298 ctx = 2;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5299 else
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5300 ctx = 1;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5301
2317
2865f759882a optimzation
michael
parents: 2316
diff changeset
5302 if(!get_cabac(&h->cabac, &h->cabac_state[ctxbase+ctx]))
2865f759882a optimzation
michael
parents: 2316
diff changeset
5303 return 0;
2865f759882a optimzation
michael
parents: 2316
diff changeset
5304
2865f759882a optimzation
michael
parents: 2316
diff changeset
5305 mvd= 1;
2865f759882a optimzation
michael
parents: 2316
diff changeset
5306 ctx= 3;
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5307 while( mvd < 9 && get_cabac( &h->cabac, &h->cabac_state[ctxbase+ctx] ) ) {
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5308 mvd++;
2317
2865f759882a optimzation
michael
parents: 2316
diff changeset
5309 if( ctx < 6 )
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5310 ctx++;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5311 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5312
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5313 if( mvd >= 9 ) {
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5314 int k = 3;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5315 while( get_cabac_bypass( &h->cabac ) ) {
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5316 mvd += 1 << k;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5317 k++;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
5318 if(k>24){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
5319 av_log(h->s.avctx, AV_LOG_ERROR, "overflow in decode_cabac_mb_mvd\n");
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
5320 return INT_MIN;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
5321 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5322 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5323 while( k-- ) {
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5324 if( get_cabac_bypass( &h->cabac ) )
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5325 mvd += 1 << k;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5326 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5327 }
4042
643cdc58bd69 slightly faster decode_cabac_mb_mvd()
michael
parents: 4041
diff changeset
5328 return get_cabac_bypass_sign( &h->cabac, -mvd );
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5329 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5330
4908
777f250df232 Fix multiple "¡Æinline/static¡Ç is not at beginning of declaration" warnings.
diego
parents: 4896
diff changeset
5331 static inline int get_cabac_cbf_ctx( H264Context *h, int cat, int idx ) {
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5332 int nza, nzb;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5333 int ctx = 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5334
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5335 if( cat == 0 ) {
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5336 nza = h->left_cbp&0x100;
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5337 nzb = h-> top_cbp&0x100;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5338 } else if( cat == 1 || cat == 2 ) {
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5339 nza = h->non_zero_count_cache[scan8[idx] - 1];
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5340 nzb = h->non_zero_count_cache[scan8[idx] - 8];
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5341 } else if( cat == 3 ) {
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5342 nza = (h->left_cbp>>(6+idx))&0x01;
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5343 nzb = (h-> top_cbp>>(6+idx))&0x01;
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5344 } else {
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5345 assert(cat == 4);
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5346 nza = h->non_zero_count_cache[scan8[16+idx] - 1];
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5347 nzb = h->non_zero_count_cache[scan8[16+idx] - 8];
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5348 }
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5349
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5350 if( nza > 0 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5351 ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5352
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5353 if( nzb > 0 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5354 ctx += 2;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5355
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5356 return ctx + 4 * cat;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5357 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5358
5006
28ebdd244a07 Change some leftover __attribute__((unused)) and __attribute__((used)) to
reimar
parents: 4984
diff changeset
5359 static const attribute_used uint8_t last_coeff_flag_offset_8x8[63] = {
4051
19f07b651d79 decode_significance_8x8_x86()
michael
parents: 4042
diff changeset
5360 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
19f07b651d79 decode_significance_8x8_x86()
michael
parents: 4042
diff changeset
5361 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
19f07b651d79 decode_significance_8x8_x86()
michael
parents: 4042
diff changeset
5362 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4,
19f07b651d79 decode_significance_8x8_x86()
michael
parents: 4042
diff changeset
5363 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8
19f07b651d79 decode_significance_8x8_x86()
michael
parents: 4042
diff changeset
5364 };
19f07b651d79 decode_significance_8x8_x86()
michael
parents: 4042
diff changeset
5365
5528
4c3b1222ff57 Don't check the return value of decode_cabac_residual since it always
conrad
parents: 5508
diff changeset
5366 static void decode_cabac_residual( H264Context *h, DCTELEM *block, int cat, int n, const uint8_t *scantable, const uint32_t *qmul, int max_coeff) {
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5367 const int mb_xy = h->s.mb_x + h->s.mb_y*h->s.mb_stride;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5368 static const int significant_coeff_flag_offset[2][6] = {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5369 { 105+0, 105+15, 105+29, 105+44, 105+47, 402 },
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5370 { 277+0, 277+15, 277+29, 277+44, 277+47, 436 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5371 };
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5372 static const int last_coeff_flag_offset[2][6] = {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5373 { 166+0, 166+15, 166+29, 166+44, 166+47, 417 },
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5374 { 338+0, 338+15, 338+29, 338+44, 338+47, 451 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5375 };
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5376 static const int coeff_abs_level_m1_offset[6] = {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5377 227+0, 227+10, 227+20, 227+30, 227+39, 426
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5378 };
4007
33d3d4ab9f59 int->uint8_t for 2 tables
michael
parents: 4001
diff changeset
5379 static const uint8_t significant_coeff_flag_offset_8x8[2][63] = {
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5380 { 0, 1, 2, 3, 4, 5, 5, 4, 4, 3, 3, 4, 4, 4, 5, 5,
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5381 4, 4, 4, 4, 3, 3, 6, 7, 7, 7, 8, 9,10, 9, 8, 7,
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5382 7, 6,11,12,13,11, 6, 7, 8, 9,14,10, 9, 8, 6,11,
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5383 12,13,11, 6, 9,14,10, 9,11,12,13,11,14,10,12 },
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5384 { 0, 1, 1, 2, 2, 3, 3, 4, 5, 6, 7, 7, 7, 8, 4, 5,
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5385 6, 9,10,10, 8,11,12,11, 9, 9,10,10, 8,11,12,11,
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5386 9, 9,10,10, 8,11,12,11, 9, 9,10,10, 8,13,13, 9,
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5387 9,10,10, 8,13,13, 9, 9,10,10,14,14,14,14,14 }
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5388 };
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5389
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5390 int index[64];
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5391
5262
b2a95ab5d017 bring back h264 build
benoit
parents: 5254
diff changeset
5392 int av_unused last;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5393 int coeff_count = 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5394
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5395 int abslevel1 = 1;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5396 int abslevelgt1 = 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5397
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5398 uint8_t *significant_coeff_ctx_base;
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5399 uint8_t *last_coeff_ctx_base;
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5400 uint8_t *abs_level_m1_ctx_base;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5401
4038
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
5402 #ifndef ARCH_X86
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
5403 #define CABAC_ON_STACK
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
5404 #endif
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
5405 #ifdef CABAC_ON_STACK
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
5406 #define CC &cc
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
5407 CABACContext cc;
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
5408 cc.range = h->cabac.range;
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
5409 cc.low = h->cabac.low;
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
5410 cc.bytestream= h->cabac.bytestream;
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
5411 #else
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
5412 #define CC &h->cabac
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
5413 #endif
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
5414
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
5415
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5416 /* cat: 0-> DC 16x16 n = 0
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5417 * 1-> AC 16x16 n = luma4x4idx
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5418 * 2-> Luma4x4 n = luma4x4idx
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5419 * 3-> DC Chroma n = iCbCr
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5420 * 4-> AC Chroma n = 4 * iCbCr + chroma4x4idx
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5421 * 5-> Luma8x8 n = 4 * luma8x8idx
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5422 */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5423
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5424 /* read coded block flag */
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5425 if( cat != 5 ) {
4038
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
5426 if( get_cabac( CC, &h->cabac_state[85 + get_cabac_cbf_ctx( h, cat, n ) ] ) == 0 ) {
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5427 if( cat == 1 || cat == 2 )
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5428 h->non_zero_count_cache[scan8[n]] = 0;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5429 else if( cat == 4 )
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5430 h->non_zero_count_cache[scan8[16+n]] = 0;
4038
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
5431 #ifdef CABAC_ON_STACK
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
5432 h->cabac.range = cc.range ;
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
5433 h->cabac.low = cc.low ;
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
5434 h->cabac.bytestream= cc.bytestream;
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
5435 #endif
5528
4c3b1222ff57 Don't check the return value of decode_cabac_residual since it always
conrad
parents: 5508
diff changeset
5436 return;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5437 }
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5438 }
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5439
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5440 significant_coeff_ctx_base = h->cabac_state
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5441 + significant_coeff_flag_offset[MB_FIELD][cat];
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5442 last_coeff_ctx_base = h->cabac_state
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5443 + last_coeff_flag_offset[MB_FIELD][cat];
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5444 abs_level_m1_ctx_base = h->cabac_state
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5445 + coeff_abs_level_m1_offset[cat];
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5446
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5447 if( cat == 5 ) {
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5448 #define DECODE_SIGNIFICANCE( coefs, sig_off, last_off ) \
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5449 for(last= 0; last < coefs; last++) { \
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5450 uint8_t *sig_ctx = significant_coeff_ctx_base + sig_off; \
4038
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
5451 if( get_cabac( CC, sig_ctx )) { \
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5452 uint8_t *last_ctx = last_coeff_ctx_base + last_off; \
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5453 index[coeff_count++] = last; \
4038
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
5454 if( get_cabac( CC, last_ctx ) ) { \
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5455 last= max_coeff; \
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5456 break; \
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5457 } \
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5458 } \
4037
53be304c7f54 x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents: 4016
diff changeset
5459 }\
53be304c7f54 x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents: 4016
diff changeset
5460 if( last == max_coeff -1 ) {\
53be304c7f54 x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents: 4016
diff changeset
5461 index[coeff_count++] = last;\
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5462 }
4009
e5f7797e53c7 10l int vs uint8_t
michael
parents: 4008
diff changeset
5463 const uint8_t *sig_off = significant_coeff_flag_offset_8x8[MB_FIELD];
5547
81226e690378 CONFIG_7REGS -> HAVE_7REGS
ramiro
parents: 5545
diff changeset
5464 #if defined(ARCH_X86) && defined(HAVE_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS)
4051
19f07b651d79 decode_significance_8x8_x86()
michael
parents: 4042
diff changeset
5465 coeff_count= decode_significance_8x8_x86(CC, significant_coeff_ctx_base, index, sig_off);
19f07b651d79 decode_significance_8x8_x86()
michael
parents: 4042
diff changeset
5466 } else {
19f07b651d79 decode_significance_8x8_x86()
michael
parents: 4042
diff changeset
5467 coeff_count= decode_significance_x86(CC, max_coeff, significant_coeff_ctx_base, index);
19f07b651d79 decode_significance_8x8_x86()
michael
parents: 4042
diff changeset
5468 #else
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5469 DECODE_SIGNIFICANCE( 63, sig_off[last], last_coeff_flag_offset_8x8[last] );
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5470 } else {
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5471 DECODE_SIGNIFICANCE( max_coeff - 1, last, last );
4037
53be304c7f54 x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents: 4016
diff changeset
5472 #endif
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5473 }
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5474 assert(coeff_count > 0);
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5475
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5476 if( cat == 0 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5477 h->cbp_table[mb_xy] |= 0x100;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5478 else if( cat == 1 || cat == 2 )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5479 h->non_zero_count_cache[scan8[n]] = coeff_count;
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5480 else if( cat == 3 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5481 h->cbp_table[mb_xy] |= 0x40 << n;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5482 else if( cat == 4 )
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5483 h->non_zero_count_cache[scan8[16+n]] = coeff_count;
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5484 else {
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5485 assert( cat == 5 );
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
5486 fill_rectangle(&h->non_zero_count_cache[scan8[n]], 2, 2, 8, coeff_count, 1);
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5487 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5488
4041
0113ceb0f953 1 variable less in decode_cabac_residual() no speed change (but less vars means less things gcc can load and store redundantly)
michael
parents: 4040
diff changeset
5489 for( coeff_count--; coeff_count >= 0; coeff_count-- ) {
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5490 uint8_t *ctx = (abslevelgt1 != 0 ? 0 : FFMIN( 4, abslevel1 )) + abs_level_m1_ctx_base;
4041
0113ceb0f953 1 variable less in decode_cabac_residual() no speed change (but less vars means less things gcc can load and store redundantly)
michael
parents: 4040
diff changeset
5491 int j= scantable[index[coeff_count]];
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5492
4038
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
5493 if( get_cabac( CC, ctx ) == 0 ) {
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5494 if( !qmul ) {
4040
9eaea06c5ba6 optimize sign decoding code in decode_residual()
michael
parents: 4038
diff changeset
5495 block[j] = get_cabac_bypass_sign( CC, -1);
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5496 }else{
4040
9eaea06c5ba6 optimize sign decoding code in decode_residual()
michael
parents: 4038
diff changeset
5497 block[j] = (get_cabac_bypass_sign( CC, -qmul[j]) + 32) >> 6;;
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5498 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5499
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5500 abslevel1++;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5501 } else {
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5502 int coeff_abs = 2;
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5503 ctx = 5 + FFMIN( 4, abslevelgt1 ) + abs_level_m1_ctx_base;
4038
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
5504 while( coeff_abs < 15 && get_cabac( CC, ctx ) ) {
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5505 coeff_abs++;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5506 }
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5507
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5508 if( coeff_abs >= 15 ) {
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5509 int j = 0;
4038
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
5510 while( get_cabac_bypass( CC ) ) {
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5511 j++;
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5512 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5513
4016
29ea06410ce7 simplify escape decoding
michael
parents: 4009
diff changeset
5514 coeff_abs=1;
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5515 while( j-- ) {
4038
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
5516 coeff_abs += coeff_abs + get_cabac_bypass( CC );
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5517 }
4016
29ea06410ce7 simplify escape decoding
michael
parents: 4009
diff changeset
5518 coeff_abs+= 14;
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5519 }
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5520
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5521 if( !qmul ) {
4038
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
5522 if( get_cabac_bypass( CC ) ) block[j] = -coeff_abs;
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5523 else block[j] = coeff_abs;
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5524 }else{
4038
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
5525 if( get_cabac_bypass( CC ) ) block[j] = (-coeff_abs * qmul[j] + 32) >> 6;
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
5526 else block[j] = ( coeff_abs * qmul[j] + 32) >> 6;
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5527 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5528
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5529 abslevelgt1++;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5530 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5531 }
4038
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
5532 #ifdef CABAC_ON_STACK
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
5533 h->cabac.range = cc.range ;
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
5534 h->cabac.low = cc.low ;
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
5535 h->cabac.bytestream= cc.bytestream;
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
5536 #endif
5528
4c3b1222ff57 Don't check the return value of decode_cabac_residual since it always
conrad
parents: 5508
diff changeset
5537
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5538 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5539
4908
777f250df232 Fix multiple "¡Æinline/static¡Ç is not at beginning of declaration" warnings.
diego
parents: 4896
diff changeset
5540 static inline void compute_mb_neighbors(H264Context *h)
2597
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5541 {
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5542 MpegEncContext * const s = &h->s;
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5543 const int mb_xy = s->mb_x + s->mb_y*s->mb_stride;
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5544 h->top_mb_xy = mb_xy - s->mb_stride;
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5545 h->left_mb_xy[0] = mb_xy - 1;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5546 if(FRAME_MBAFF){
2597
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5547 const int pair_xy = s->mb_x + (s->mb_y & ~1)*s->mb_stride;
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5548 const int top_pair_xy = pair_xy - s->mb_stride;
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5549 const int top_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[top_pair_xy]);
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5550 const int left_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[pair_xy-1]);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5551 const int curr_mb_frame_flag = !MB_FIELD;
2597
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5552 const int bottom = (s->mb_y & 1);
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5553 if (bottom
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5554 ? !curr_mb_frame_flag // bottom macroblock
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5555 : (!curr_mb_frame_flag && !top_mb_frame_flag) // top macroblock
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5556 ) {
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5557 h->top_mb_xy -= s->mb_stride;
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5558 }
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5559 if (left_mb_frame_flag != curr_mb_frame_flag) {
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5560 h->left_mb_xy[0] = pair_xy - 1;
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5561 }
5781
0b3aa6f4c313 Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents: 5780
diff changeset
5562 } else if (FIELD_PICTURE) {
0b3aa6f4c313 Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents: 5780
diff changeset
5563 h->top_mb_xy -= s->mb_stride;
2597
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5564 }
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5565 return;
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5566 }
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5567
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5568 /**
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5569 * decodes a macroblock
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5570 * @returns 0 if ok, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5571 */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5572 static int decode_mb_cabac(H264Context *h) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5573 MpegEncContext * const s = &h->s;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5574 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5575 int mb_type, partition_count, cbp = 0;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5576 int dct8x8_allowed= h->pps.transform_8x8_mode;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5577
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
5578 s->dsp.clear_blocks(h->mb); //FIXME avoid if already clear (move after skip handlong?)
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5579
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
5580 tprintf(s->avctx, "pic:%d mb:%d/%d\n", h->frame_num, s->mb_x, s->mb_y);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5581 if( h->slice_type != I_TYPE && h->slice_type != SI_TYPE ) {
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5582 int skip;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5583 /* a skipped mb needs the aff flag from the following mb */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5584 if( FRAME_MBAFF && s->mb_x==0 && (s->mb_y&1)==0 )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5585 predict_field_decoding_flag(h);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5586 if( FRAME_MBAFF && (s->mb_y&1)==1 && h->prev_mb_skipped )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5587 skip = h->next_mb_skipped;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5588 else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5589 skip = decode_cabac_mb_skip( h, s->mb_x, s->mb_y );
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5590 /* read skip flags */
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5591 if( skip ) {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5592 if( FRAME_MBAFF && (s->mb_y&1)==0 ){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5593 s->current_picture.mb_type[mb_xy] = MB_TYPE_SKIP;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5594 h->next_mb_skipped = decode_cabac_mb_skip( h, s->mb_x, s->mb_y+1 );
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5595 if(h->next_mb_skipped)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5596 predict_field_decoding_flag(h);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5597 else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5598 h->mb_mbaff = h->mb_field_decoding_flag = decode_cabac_field_decoding_flag(h);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5599 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5600
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5601 decode_mb_skip(h);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5602
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5603 h->cbp_table[mb_xy] = 0;
1956
0eb2947f56f6 h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1935
diff changeset
5604 h->chroma_pred_mode_table[mb_xy] = 0;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5605 h->last_qscale_diff = 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5606
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5607 return 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5608
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5609 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5610 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5611 if(FRAME_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5612 if( (s->mb_y&1) == 0 )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5613 h->mb_mbaff =
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5614 h->mb_field_decoding_flag = decode_cabac_field_decoding_flag(h);
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5615 }else
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5616 h->mb_field_decoding_flag= (s->picture_structure!=PICT_FRAME);
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5617
2628
511e3afc43e1 Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents: 2623
diff changeset
5618 h->prev_mb_skipped = 0;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5619
3077
385e54795a9e Fix silly typos.
diego
parents: 3071
diff changeset
5620 compute_mb_neighbors(h);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5621 if( ( mb_type = decode_cabac_mb_type( h ) ) < 0 ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5622 av_log( h->s.avctx, AV_LOG_ERROR, "decode_cabac_mb_type failed\n" );
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5623 return -1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5624 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5625
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5626 if( h->slice_type == B_TYPE ) {
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5627 if( mb_type < 23 ){
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5628 partition_count= b_mb_type_info[mb_type].partition_count;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5629 mb_type= b_mb_type_info[mb_type].type;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5630 }else{
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5631 mb_type -= 23;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5632 goto decode_intra_mb;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5633 }
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5634 } else if( h->slice_type == P_TYPE ) {
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5635 if( mb_type < 5) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5636 partition_count= p_mb_type_info[mb_type].partition_count;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5637 mb_type= p_mb_type_info[mb_type].type;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5638 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5639 mb_type -= 5;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5640 goto decode_intra_mb;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5641 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5642 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5643 assert(h->slice_type == I_TYPE);
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5644 decode_intra_mb:
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5645 partition_count = 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5646 cbp= i_mb_type_info[mb_type].cbp;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5647 h->intra16x16_pred_mode= i_mb_type_info[mb_type].pred_mode;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5648 mb_type= i_mb_type_info[mb_type].type;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5649 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5650 if(MB_FIELD)
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5651 mb_type |= MB_TYPE_INTERLACED;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5652
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5653 h->slice_table[ mb_xy ]= h->slice_num;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5654
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5655 if(IS_INTRA_PCM(mb_type)) {
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5656 const uint8_t *ptr;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5657 unsigned int x, y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5658
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5106
diff changeset
5659 // We assume these blocks are very rare so we do not optimize it.
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5660 // FIXME The two following lines get the bitstream position in the cabac
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5661 // decode, I think it should be done by a function in cabac.h (or cabac.c).
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5662 ptr= h->cabac.bytestream;
4344
4aa24216f71a fix 16 CABAC_BIT * 10l bug introduced in r6578
michael
parents: 4283
diff changeset
5663 if(h->cabac.low&0x1) ptr--;
4aa24216f71a fix 16 CABAC_BIT * 10l bug introduced in r6578
michael
parents: 4283
diff changeset
5664 if(CABAC_BITS==16){
4aa24216f71a fix 16 CABAC_BIT * 10l bug introduced in r6578
michael
parents: 4283
diff changeset
5665 if(h->cabac.low&0x1FF) ptr--;
4aa24216f71a fix 16 CABAC_BIT * 10l bug introduced in r6578
michael
parents: 4283
diff changeset
5666 }
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5667
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5668 // The pixels are stored in the same order as levels in h->mb array.
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5669 for(y=0; y<16; y++){
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5670 const int index= 4*(y&3) + 32*((y>>2)&1) + 128*(y>>3);
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5671 for(x=0; x<16; x++){
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
5672 tprintf(s->avctx, "LUMA ICPM LEVEL (%3d)\n", *ptr);
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5673 h->mb[index + (x&3) + 16*((x>>2)&1) + 64*(x>>3)]= *ptr++;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5674 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5675 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5676 for(y=0; y<8; y++){
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5677 const int index= 256 + 4*(y&3) + 32*(y>>2);
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5678 for(x=0; x<8; x++){
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
5679 tprintf(s->avctx, "CHROMA U ICPM LEVEL (%3d)\n", *ptr);
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5680 h->mb[index + (x&3) + 16*(x>>2)]= *ptr++;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5681 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5682 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5683 for(y=0; y<8; y++){
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5684 const int index= 256 + 64 + 4*(y&3) + 32*(y>>2);
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5685 for(x=0; x<8; x++){
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
5686 tprintf(s->avctx, "CHROMA V ICPM LEVEL (%3d)\n", *ptr);
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5687 h->mb[index + (x&3) + 16*(x>>2)]= *ptr++;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5688 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5689 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5690
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5691 ff_init_cabac_decoder(&h->cabac, ptr, h->cabac.bytestream_end - ptr);
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5692
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
5693 // All blocks are present
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5694 h->cbp_table[mb_xy] = 0x1ef;
1956
0eb2947f56f6 h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1935
diff changeset
5695 h->chroma_pred_mode_table[mb_xy] = 0;
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
5696 // In deblocking, the quantizer is 0
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5697 s->current_picture.qscale_table[mb_xy]= 0;
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
5698 h->chroma_qp[0] = get_chroma_qp(h, 0, 0);
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
5699 h->chroma_qp[1] = get_chroma_qp(h, 1, 0);
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
5700 // All coeffs are present
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5701 memset(h->non_zero_count[mb_xy], 16, 16);
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5702 s->current_picture.mb_type[mb_xy]= mb_type;
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5703 return 0;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5704 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5705
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5706 if(MB_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5707 h->ref_count[0] <<= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5708 h->ref_count[1] <<= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5709 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5710
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
5711 fill_caches(h, mb_type, 0);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5712
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5713 if( IS_INTRA( mb_type ) ) {
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
5714 int i, pred_mode;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5715 if( IS_INTRA4x4( mb_type ) ) {
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5716 if( dct8x8_allowed && decode_cabac_mb_transform_size( h ) ) {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5717 mb_type |= MB_TYPE_8x8DCT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5718 for( i = 0; i < 16; i+=4 ) {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5719 int pred = pred_intra_mode( h, i );
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5720 int mode = decode_cabac_mb_intra4x4_pred_mode( h, pred );
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5721 fill_rectangle( &h->intra4x4_pred_mode_cache[ scan8[i] ], 2, 2, 8, mode, 1 );
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5722 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5723 } else {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5724 for( i = 0; i < 16; i++ ) {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5725 int pred = pred_intra_mode( h, i );
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5726 h->intra4x4_pred_mode_cache[ scan8[i] ] = decode_cabac_mb_intra4x4_pred_mode( h, pred );
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5727
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5728 //av_log( s->avctx, AV_LOG_ERROR, "i4x4 pred=%d mode=%d\n", pred, h->intra4x4_pred_mode_cache[ scan8[i] ] );
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5729 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5730 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5731 write_back_intra_pred_mode(h);
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5732 if( check_intra4x4_pred_mode(h) < 0 ) return -1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5733 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5734 h->intra16x16_pred_mode= check_intra_pred_mode( h, h->intra16x16_pred_mode );
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5735 if( h->intra16x16_pred_mode < 0 ) return -1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5736 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5737 h->chroma_pred_mode_table[mb_xy] =
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
5738 pred_mode = decode_cabac_mb_chroma_pre_mode( h );
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
5739
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
5740 pred_mode= check_intra_pred_mode( h, pred_mode );
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
5741 if( pred_mode < 0 ) return -1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
5742 h->chroma_pred_mode= pred_mode;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5743 } else if( partition_count == 4 ) {
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5744 int i, j, sub_partition_count[4], list, ref[2][4];
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5745
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5746 if( h->slice_type == B_TYPE ) {
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5747 for( i = 0; i < 4; i++ ) {
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5748 h->sub_mb_type[i] = decode_cabac_b_mb_sub_type( h );
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5749 sub_partition_count[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5750 h->sub_mb_type[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].type;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5751 }
3482
c08b46172204 slightly faster h264 fill_caches()
lorenm
parents: 3455
diff changeset
5752 if( IS_DIRECT(h->sub_mb_type[0] | h->sub_mb_type[1] |
c08b46172204 slightly faster h264 fill_caches()
lorenm
parents: 3455
diff changeset
5753 h->sub_mb_type[2] | h->sub_mb_type[3]) ) {
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5754 pred_direct_motion(h, &mb_type);
5425
1fdfea5024a7 fix cabac decoding with some Blue-Ray sources
gpoirier
parents: 5380
diff changeset
5755 h->ref_cache[0][scan8[4]] =
1fdfea5024a7 fix cabac decoding with some Blue-Ray sources
gpoirier
parents: 5380
diff changeset
5756 h->ref_cache[1][scan8[4]] =
1fdfea5024a7 fix cabac decoding with some Blue-Ray sources
gpoirier
parents: 5380
diff changeset
5757 h->ref_cache[0][scan8[12]] =
1fdfea5024a7 fix cabac decoding with some Blue-Ray sources
gpoirier
parents: 5380
diff changeset
5758 h->ref_cache[1][scan8[12]] = PART_NOT_AVAILABLE;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5759 if( h->ref_count[0] > 1 || h->ref_count[1] > 1 ) {
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5760 for( i = 0; i < 4; i++ )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5761 if( IS_DIRECT(h->sub_mb_type[i]) )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5762 fill_rectangle( &h->direct_cache[scan8[4*i]], 2, 2, 8, 1, 1 );
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5763 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5764 }
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5765 } else {
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5766 for( i = 0; i < 4; i++ ) {
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5767 h->sub_mb_type[i] = decode_cabac_p_mb_sub_type( h );
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5768 sub_partition_count[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5769 h->sub_mb_type[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].type;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5770 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5771 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5772
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
5773 for( list = 0; list < h->list_count; list++ ) {
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5774 for( i = 0; i < 4; i++ ) {
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5775 if(IS_DIRECT(h->sub_mb_type[i])) continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5776 if(IS_DIR(h->sub_mb_type[i], 0, list)){
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5777 if( h->ref_count[list] > 1 )
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5778 ref[list][i] = decode_cabac_mb_ref( h, list, 4*i );
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5779 else
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5780 ref[list][i] = 0;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5781 } else {
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5782 ref[list][i] = -1;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5783 }
2110
michael
parents: 2099
diff changeset
5784 h->ref_cache[list][ scan8[4*i]+1 ]=
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5785 h->ref_cache[list][ scan8[4*i]+8 ]=h->ref_cache[list][ scan8[4*i]+9 ]= ref[list][i];
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5786 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5787 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5788
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5789 if(dct8x8_allowed)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5790 dct8x8_allowed = get_dct8x8_allowed(h);
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5791
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
5792 for(list=0; list<h->list_count; list++){
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5793 for(i=0; i<4; i++){
5425
1fdfea5024a7 fix cabac decoding with some Blue-Ray sources
gpoirier
parents: 5380
diff changeset
5794 h->ref_cache[list][ scan8[4*i] ]=h->ref_cache[list][ scan8[4*i]+1 ];
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5795 if(IS_DIRECT(h->sub_mb_type[i])){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5796 fill_rectangle(h->mvd_cache[list][scan8[4*i]], 2, 2, 8, 0, 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5797 continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5798 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5799
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5800 if(IS_DIR(h->sub_mb_type[i], 0, list) && !IS_DIRECT(h->sub_mb_type[i])){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5801 const int sub_mb_type= h->sub_mb_type[i];
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5802 const int block_width= (sub_mb_type & (MB_TYPE_16x16|MB_TYPE_16x8)) ? 2 : 1;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5803 for(j=0; j<sub_partition_count[i]; j++){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5804 int mpx, mpy;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5805 int mx, my;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5806 const int index= 4*i + block_width*j;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5807 int16_t (* mv_cache)[2]= &h->mv_cache[list][ scan8[index] ];
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5808 int16_t (* mvd_cache)[2]= &h->mvd_cache[list][ scan8[index] ];
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5809 pred_motion(h, index, block_width, list, h->ref_cache[list][ scan8[index] ], &mpx, &mpy);
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5810
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5811 mx = mpx + decode_cabac_mb_mvd( h, list, index, 0 );
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5812 my = mpy + decode_cabac_mb_mvd( h, list, index, 1 );
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
5813 tprintf(s->avctx, "final mv:%d %d\n", mx, my);
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5814
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5815 if(IS_SUB_8X8(sub_mb_type)){
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5816 mv_cache[ 1 ][0]=
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5817 mv_cache[ 8 ][0]= mv_cache[ 9 ][0]= mx;
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5818 mv_cache[ 1 ][1]=
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5819 mv_cache[ 8 ][1]= mv_cache[ 9 ][1]= my;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5820
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5821 mvd_cache[ 1 ][0]=
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5822 mvd_cache[ 8 ][0]= mvd_cache[ 9 ][0]= mx - mpx;
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5823 mvd_cache[ 1 ][1]=
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5824 mvd_cache[ 8 ][1]= mvd_cache[ 9 ][1]= my - mpy;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5825 }else if(IS_SUB_8X4(sub_mb_type)){
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5826 mv_cache[ 1 ][0]= mx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5827 mv_cache[ 1 ][1]= my;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5828
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5829 mvd_cache[ 1 ][0]= mx - mpx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5830 mvd_cache[ 1 ][1]= my - mpy;
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5831 }else if(IS_SUB_4X8(sub_mb_type)){
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5832 mv_cache[ 8 ][0]= mx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5833 mv_cache[ 8 ][1]= my;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5834
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5835 mvd_cache[ 8 ][0]= mx - mpx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5836 mvd_cache[ 8 ][1]= my - mpy;
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5837 }
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5838 mv_cache[ 0 ][0]= mx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5839 mv_cache[ 0 ][1]= my;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5840
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5841 mvd_cache[ 0 ][0]= mx - mpx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5842 mvd_cache[ 0 ][1]= my - mpy;
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5843 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5844 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5845 uint32_t *p= (uint32_t *)&h->mv_cache[list][ scan8[4*i] ][0];
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5846 uint32_t *pd= (uint32_t *)&h->mvd_cache[list][ scan8[4*i] ][0];
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5847 p[0] = p[1] = p[8] = p[9] = 0;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5848 pd[0]= pd[1]= pd[8]= pd[9]= 0;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5849 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5850 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5851 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5852 } else if( IS_DIRECT(mb_type) ) {
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5853 pred_direct_motion(h, &mb_type);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5854 fill_rectangle(h->mvd_cache[0][scan8[0]], 4, 4, 8, 0, 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5855 fill_rectangle(h->mvd_cache[1][scan8[0]], 4, 4, 8, 0, 4);
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5856 dct8x8_allowed &= h->sps.direct_8x8_inference_flag;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5857 } else {
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5858 int list, mx, my, i, mpx, mpy;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5859 if(IS_16X16(mb_type)){
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
5860 for(list=0; list<h->list_count; list++){
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5861 if(IS_DIR(mb_type, 0, list)){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5862 const int ref = h->ref_count[list] > 1 ? decode_cabac_mb_ref( h, list, 0 ) : 0;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5863 fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, ref, 1);
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
5864 }else
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
5865 fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, (uint8_t)LIST_NOT_USED, 1); //FIXME factorize and the other fill_rect below too
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
5866 }
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
5867 for(list=0; list<h->list_count; list++){
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5868 if(IS_DIR(mb_type, 0, list)){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5869 pred_motion(h, 0, 4, list, h->ref_cache[list][ scan8[0] ], &mpx, &mpy);
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5870
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5871 mx = mpx + decode_cabac_mb_mvd( h, list, 0, 0 );
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5872 my = mpy + decode_cabac_mb_mvd( h, list, 0, 1 );
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
5873 tprintf(s->avctx, "final mv:%d %d\n", mx, my);
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5874
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5875 fill_rectangle(h->mvd_cache[list][ scan8[0] ], 4, 4, 8, pack16to32(mx-mpx,my-mpy), 4);
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5876 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, pack16to32(mx,my), 4);
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
5877 }else
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
5878 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, 0, 4);
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5879 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5880 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5881 else if(IS_16X8(mb_type)){
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
5882 for(list=0; list<h->list_count; list++){
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5883 for(i=0; i<2; i++){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5884 if(IS_DIR(mb_type, i, list)){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5885 const int ref= h->ref_count[list] > 1 ? decode_cabac_mb_ref( h, list, 8*i ) : 0;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5886 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, ref, 1);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5887 }else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5888 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, (LIST_NOT_USED&0xFF), 1);
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5889 }
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
5890 }
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
5891 for(list=0; list<h->list_count; list++){
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5892 for(i=0; i<2; i++){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5893 if(IS_DIR(mb_type, i, list)){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5894 pred_16x8_motion(h, 8*i, list, h->ref_cache[list][scan8[0] + 16*i], &mpx, &mpy);
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5895 mx = mpx + decode_cabac_mb_mvd( h, list, 8*i, 0 );
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5896 my = mpy + decode_cabac_mb_mvd( h, list, 8*i, 1 );
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
5897 tprintf(s->avctx, "final mv:%d %d\n", mx, my);
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5898
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5899 fill_rectangle(h->mvd_cache[list][ scan8[0] + 16*i ], 4, 2, 8, pack16to32(mx-mpx,my-mpy), 4);
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5900 fill_rectangle(h->mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, pack16to32(mx,my), 4);
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
5901 }else{
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5902 fill_rectangle(h->mvd_cache[list][ scan8[0] + 16*i ], 4, 2, 8, 0, 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5903 fill_rectangle(h-> mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, 0, 4);
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5904 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5905 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5906 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5907 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5908 assert(IS_8X16(mb_type));
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
5909 for(list=0; list<h->list_count; list++){
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5910 for(i=0; i<2; i++){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5911 if(IS_DIR(mb_type, i, list)){ //FIXME optimize
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5912 const int ref= h->ref_count[list] > 1 ? decode_cabac_mb_ref( h, list, 4*i ) : 0;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5913 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, ref, 1);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5914 }else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5915 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, (LIST_NOT_USED&0xFF), 1);
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5916 }
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
5917 }
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
5918 for(list=0; list<h->list_count; list++){
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5919 for(i=0; i<2; i++){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5920 if(IS_DIR(mb_type, i, list)){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5921 pred_8x16_motion(h, i*4, list, h->ref_cache[list][ scan8[0] + 2*i ], &mpx, &mpy);
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5922 mx = mpx + decode_cabac_mb_mvd( h, list, 4*i, 0 );
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5923 my = mpy + decode_cabac_mb_mvd( h, list, 4*i, 1 );
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5924
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
5925 tprintf(s->avctx, "final mv:%d %d\n", mx, my);
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5926 fill_rectangle(h->mvd_cache[list][ scan8[0] + 2*i ], 2, 4, 8, pack16to32(mx-mpx,my-mpy), 4);
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5927 fill_rectangle(h->mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, pack16to32(mx,my), 4);
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
5928 }else{
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5929 fill_rectangle(h->mvd_cache[list][ scan8[0] + 2*i ], 2, 4, 8, 0, 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5930 fill_rectangle(h-> mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, 0, 4);
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5931 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5932 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5933 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5934 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5935 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5936
1956
0eb2947f56f6 h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1935
diff changeset
5937 if( IS_INTER( mb_type ) ) {
0eb2947f56f6 h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1935
diff changeset
5938 h->chroma_pred_mode_table[mb_xy] = 0;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5939 write_back_motion( h, mb_type );
1956
0eb2947f56f6 h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1935
diff changeset
5940 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5941
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5942 if( !IS_INTRA16x16( mb_type ) ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5943 cbp = decode_cabac_mb_cbp_luma( h );
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5944 cbp |= decode_cabac_mb_cbp_chroma( h ) << 4;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5945 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5946
3651
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
5947 h->cbp_table[mb_xy] = h->cbp = cbp;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5948
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5949 if( dct8x8_allowed && (cbp&15) && !IS_INTRA( mb_type ) ) {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5950 if( decode_cabac_mb_transform_size( h ) )
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5951 mb_type |= MB_TYPE_8x8DCT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5952 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5953 s->current_picture.mb_type[mb_xy]= mb_type;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5954
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5955 if( cbp || IS_INTRA16x16( mb_type ) ) {
3174
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
5956 const uint8_t *scan, *scan8x8, *dc_scan;
5705
c08c9340c7ca factor out dequant table lookup outside loops, gives a 1-2% speed-up
gpoirier
parents: 5698
diff changeset
5957 const uint32_t *qmul;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5958 int dqp;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5959
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5960 if(IS_INTERLACED(mb_type)){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5961 scan8x8= s->qscale ? h->field_scan8x8 : h->field_scan8x8_q0;
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
5962 scan= s->qscale ? h->field_scan : h->field_scan_q0;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5963 dc_scan= luma_dc_field_scan;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5964 }else{
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5965 scan8x8= s->qscale ? h->zigzag_scan8x8 : h->zigzag_scan8x8_q0;
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
5966 scan= s->qscale ? h->zigzag_scan : h->zigzag_scan_q0;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5967 dc_scan= luma_dc_zigzag_scan;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5968 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5969
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5970 h->last_qscale_diff = dqp = decode_cabac_mb_dqp( h );
2883
a95e55679dfa check return value of decode_cabac_mb_dqp, it is INT_MIN on error.
reimar
parents: 2867
diff changeset
5971 if( dqp == INT_MIN ){
a95e55679dfa check return value of decode_cabac_mb_dqp, it is INT_MIN on error.
reimar
parents: 2867
diff changeset
5972 av_log(h->s.avctx, AV_LOG_ERROR, "cabac decode of qscale diff failed at %d %d\n", s->mb_x, s->mb_y);
a95e55679dfa check return value of decode_cabac_mb_dqp, it is INT_MIN on error.
reimar
parents: 2867
diff changeset
5973 return -1;
a95e55679dfa check return value of decode_cabac_mb_dqp, it is INT_MIN on error.
reimar
parents: 2867
diff changeset
5974 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5975 s->qscale += dqp;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5976 if(((unsigned)s->qscale) > 51){
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5977 if(s->qscale<0) s->qscale+= 52;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5978 else s->qscale-= 52;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5979 }
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
5980 h->chroma_qp[0] = get_chroma_qp(h, 0, s->qscale);
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
5981 h->chroma_qp[1] = get_chroma_qp(h, 1, s->qscale);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5982
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5983 if( IS_INTRA16x16( mb_type ) ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5984 int i;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5985 //av_log( s->avctx, AV_LOG_ERROR, "INTRA16x16 DC\n" );
5528
4c3b1222ff57 Don't check the return value of decode_cabac_residual since it always
conrad
parents: 5508
diff changeset
5986 decode_cabac_residual( h, h->mb, 0, 0, dc_scan, NULL, 16);
4c3b1222ff57 Don't check the return value of decode_cabac_residual since it always
conrad
parents: 5508
diff changeset
5987
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5988 if( cbp&15 ) {
5705
c08c9340c7ca factor out dequant table lookup outside loops, gives a 1-2% speed-up
gpoirier
parents: 5698
diff changeset
5989 qmul = h->dequant4_coeff[0][s->qscale];
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5990 for( i = 0; i < 16; i++ ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5991 //av_log( s->avctx, AV_LOG_ERROR, "INTRA16x16 AC:%d\n", i );
5705
c08c9340c7ca factor out dequant table lookup outside loops, gives a 1-2% speed-up
gpoirier
parents: 5698
diff changeset
5992 decode_cabac_residual(h, h->mb + 16*i, 1, i, scan + 1, qmul, 15);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5993 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5994 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5995 fill_rectangle(&h->non_zero_count_cache[scan8[0]], 4, 4, 8, 0, 1);
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5996 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5997 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5998 int i8x8, i4x4;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5999 for( i8x8 = 0; i8x8 < 4; i8x8++ ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6000 if( cbp & (1<<i8x8) ) {
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6001 if( IS_8x8DCT(mb_type) ) {
5528
4c3b1222ff57 Don't check the return value of decode_cabac_residual since it always
conrad
parents: 5508
diff changeset
6002 decode_cabac_residual(h, h->mb + 64*i8x8, 5, 4*i8x8,
4c3b1222ff57 Don't check the return value of decode_cabac_residual since it always
conrad
parents: 5508
diff changeset
6003 scan8x8, h->dequant8_coeff[IS_INTRA( mb_type ) ? 0:1][s->qscale], 64);
5705
c08c9340c7ca factor out dequant table lookup outside loops, gives a 1-2% speed-up
gpoirier
parents: 5698
diff changeset
6004 } else {
5713
f45228f65e06 reindent
andoma
parents: 5705
diff changeset
6005 qmul = h->dequant4_coeff[IS_INTRA( mb_type ) ? 0:3][s->qscale];
f45228f65e06 reindent
andoma
parents: 5705
diff changeset
6006 for( i4x4 = 0; i4x4 < 4; i4x4++ ) {
f45228f65e06 reindent
andoma
parents: 5705
diff changeset
6007 const int index = 4*i8x8 + i4x4;
f45228f65e06 reindent
andoma
parents: 5705
diff changeset
6008 //av_log( s->avctx, AV_LOG_ERROR, "Luma4x4: %d\n", index );
3972
f5f1c9af095d move outcommented START/STOP_TIMER to a hopefully better place for benchmarking ...
michael
parents: 3955
diff changeset
6009 //START_TIMER
5713
f45228f65e06 reindent
andoma
parents: 5705
diff changeset
6010 decode_cabac_residual(h, h->mb + 16*index, 2, index, scan, qmul, 16);
3972
f5f1c9af095d move outcommented START/STOP_TIMER to a hopefully better place for benchmarking ...
michael
parents: 3955
diff changeset
6011 //STOP_TIMER("decode_residual")
5713
f45228f65e06 reindent
andoma
parents: 5705
diff changeset
6012 }
5705
c08c9340c7ca factor out dequant table lookup outside loops, gives a 1-2% speed-up
gpoirier
parents: 5698
diff changeset
6013 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6014 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6015 uint8_t * const nnz= &h->non_zero_count_cache[ scan8[4*i8x8] ];
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6016 nnz[0] = nnz[1] = nnz[8] = nnz[9] = 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6017 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6018 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6019 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6020
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6021 if( cbp&0x30 ){
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6022 int c;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6023 for( c = 0; c < 2; c++ ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6024 //av_log( s->avctx, AV_LOG_ERROR, "INTRA C%d-DC\n",c );
5528
4c3b1222ff57 Don't check the return value of decode_cabac_residual since it always
conrad
parents: 5508
diff changeset
6025 decode_cabac_residual(h, h->mb + 256 + 16*4*c, 3, c, chroma_dc_scan, NULL, 4);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6026 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6027 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6028
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6029 if( cbp&0x20 ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6030 int c, i;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6031 for( c = 0; c < 2; c++ ) {
5705
c08c9340c7ca factor out dequant table lookup outside loops, gives a 1-2% speed-up
gpoirier
parents: 5698
diff changeset
6032 qmul = h->dequant4_coeff[c+1+(IS_INTRA( mb_type ) ? 0:3)][h->chroma_qp[c]];
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6033 for( i = 0; i < 4; i++ ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6034 const int index = 16 + 4 * c + i;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6035 //av_log( s->avctx, AV_LOG_ERROR, "INTRA C%d-AC %d\n",c, index - 16 );
5528
4c3b1222ff57 Don't check the return value of decode_cabac_residual since it always
conrad
parents: 5508
diff changeset
6036 decode_cabac_residual(h, h->mb + 16*index, 4, index - 16, scan + 1, qmul, 15);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6037 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6038 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6039 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6040 uint8_t * const nnz= &h->non_zero_count_cache[0];
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6041 nnz[ scan8[16]+0 ] = nnz[ scan8[16]+1 ] =nnz[ scan8[16]+8 ] =nnz[ scan8[16]+9 ] =
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6042 nnz[ scan8[20]+0 ] = nnz[ scan8[20]+1 ] =nnz[ scan8[20]+8 ] =nnz[ scan8[20]+9 ] = 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6043 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6044 } else {
2315
29b67549d0cc fix CABAC+LOOP missmatch
michael
parents: 2314
diff changeset
6045 uint8_t * const nnz= &h->non_zero_count_cache[0];
29b67549d0cc fix CABAC+LOOP missmatch
michael
parents: 2314
diff changeset
6046 fill_rectangle(&nnz[scan8[0]], 4, 4, 8, 0, 1);
29b67549d0cc fix CABAC+LOOP missmatch
michael
parents: 2314
diff changeset
6047 nnz[ scan8[16]+0 ] = nnz[ scan8[16]+1 ] =nnz[ scan8[16]+8 ] =nnz[ scan8[16]+9 ] =
29b67549d0cc fix CABAC+LOOP missmatch
michael
parents: 2314
diff changeset
6048 nnz[ scan8[20]+0 ] = nnz[ scan8[20]+1 ] =nnz[ scan8[20]+8 ] =nnz[ scan8[20]+9 ] = 0;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6049 h->last_qscale_diff = 0;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6050 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6051
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6052 s->current_picture.qscale_table[mb_xy]= s->qscale;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6053 write_back_non_zero_count(h);
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6054
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6055 if(MB_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6056 h->ref_count[0] >>= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6057 h->ref_count[1] >>= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6058 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6059
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6060 return 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6061 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6062
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6063
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6064 static void filter_mb_edgev( H264Context *h, uint8_t *pix, int stride, int16_t bS[4], int qp ) {
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6065 int i, d;
4118
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
6066 const int index_a = qp + h->slice_alpha_c0_offset;
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
6067 const int alpha = (alpha_table+52)[index_a];
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
6068 const int beta = (beta_table+52)[qp + h->slice_beta_offset];
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6069
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6070 if( bS[0] < 4 ) {
2707
360024d31dab H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents: 2683
diff changeset
6071 int8_t tc[4];
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6072 for(i=0; i<4; i++)
4118
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
6073 tc[i] = bS[i] ? (tc0_table+52)[index_a][bS[i] - 1] : -1;
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6074 h->s.dsp.h264_h_loop_filter_luma(pix, stride, alpha, beta, tc);
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6075 } else {
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6076 /* 16px edge length, because bS=4 is triggered by being at
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6077 * the edge of an intra MB, so all 4 bS are the same */
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6078 for( d = 0; d < 16; d++ ) {
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6079 const int p0 = pix[-1];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6080 const int p1 = pix[-2];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6081 const int p2 = pix[-3];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6082
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6083 const int q0 = pix[0];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6084 const int q1 = pix[1];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6085 const int q2 = pix[2];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6086
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6087 if( FFABS( p0 - q0 ) < alpha &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6088 FFABS( p1 - p0 ) < beta &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6089 FFABS( q1 - q0 ) < beta ) {
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6090
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6091 if(FFABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6092 if( FFABS( p2 - p0 ) < beta)
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6093 {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6094 const int p3 = pix[-4];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6095 /* p0', p1', p2' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6096 pix[-1] = ( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6097 pix[-2] = ( p2 + p1 + p0 + q0 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6098 pix[-3] = ( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6099 } else {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6100 /* p0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6101 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6102 }
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6103 if( FFABS( q2 - q0 ) < beta)
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6104 {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6105 const int q3 = pix[3];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6106 /* q0', q1', q2' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6107 pix[0] = ( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6108 pix[1] = ( p0 + q0 + q1 + q2 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6109 pix[2] = ( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6110 } else {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6111 /* q0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6112 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6113 }
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6114 }else{
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6115 /* p0', q0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6116 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6117 pix[ 0] = ( 2*q1 + q0 + p1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6118 }
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
6119 tprintf(h->s.avctx, "filter_mb_edgev i:%d d:%d\n# bS:4 -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x]\n", i, d, p2, p1, p0, q0, q1, q2, pix[-2], pix[-1], pix[0], pix[1]);
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6120 }
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6121 pix += stride;
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6122 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6123 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6124 }
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6125 static void filter_mb_edgecv( H264Context *h, uint8_t *pix, int stride, int16_t bS[4], int qp ) {
2834
fd5d7c732c6b kill a bunch of compiler warnings
mru
parents: 2815
diff changeset
6126 int i;
4118
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
6127 const int index_a = qp + h->slice_alpha_c0_offset;
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
6128 const int alpha = (alpha_table+52)[index_a];
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
6129 const int beta = (beta_table+52)[qp + h->slice_beta_offset];
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6130
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6131 if( bS[0] < 4 ) {
2707
360024d31dab H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents: 2683
diff changeset
6132 int8_t tc[4];
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6133 for(i=0; i<4; i++)
4118
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
6134 tc[i] = bS[i] ? (tc0_table+52)[index_a][bS[i] - 1] + 1 : 0;
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6135 h->s.dsp.h264_h_loop_filter_chroma(pix, stride, alpha, beta, tc);
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6136 } else {
2707
360024d31dab H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents: 2683
diff changeset
6137 h->s.dsp.h264_h_loop_filter_chroma_intra(pix, stride, alpha, beta);
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6138 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6139 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6140
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6141 static void filter_mb_mbaff_edgev( H264Context *h, uint8_t *pix, int stride, int16_t bS[8], int qp[2] ) {
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6142 int i;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6143 for( i = 0; i < 16; i++, pix += stride) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6144 int index_a;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6145 int alpha;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6146 int beta;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6147
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6148 int qp_index;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6149 int bS_index = (i >> 1);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6150 if (!MB_FIELD) {
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6151 bS_index &= ~1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6152 bS_index |= (i & 1);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6153 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6154
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6155 if( bS[bS_index] == 0 ) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6156 continue;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6157 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6158
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6159 qp_index = MB_FIELD ? (i >> 3) : (i & 1);
4118
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
6160 index_a = qp[qp_index] + h->slice_alpha_c0_offset;
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
6161 alpha = (alpha_table+52)[index_a];
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
6162 beta = (beta_table+52)[qp[qp_index] + h->slice_beta_offset];
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6163
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6164 if( bS[bS_index] < 4 ) {
4118
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
6165 const int tc0 = (tc0_table+52)[index_a][bS[bS_index] - 1];
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6166 const int p0 = pix[-1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6167 const int p1 = pix[-2];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6168 const int p2 = pix[-3];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6169 const int q0 = pix[0];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6170 const int q1 = pix[1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6171 const int q2 = pix[2];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6172
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6173 if( FFABS( p0 - q0 ) < alpha &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6174 FFABS( p1 - p0 ) < beta &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6175 FFABS( q1 - q0 ) < beta ) {
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6176 int tc = tc0;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6177 int i_delta;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6178
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6179 if( FFABS( p2 - p0 ) < beta ) {
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
6180 pix[-2] = p1 + av_clip( ( p2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( p1 << 1 ) ) >> 1, -tc0, tc0 );
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6181 tc++;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6182 }
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6183 if( FFABS( q2 - q0 ) < beta ) {
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
6184 pix[1] = q1 + av_clip( ( q2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( q1 << 1 ) ) >> 1, -tc0, tc0 );
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6185 tc++;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6186 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6187
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
6188 i_delta = av_clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc );
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
6189 pix[-1] = av_clip_uint8( p0 + i_delta ); /* p0' */
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
6190 pix[0] = av_clip_uint8( q0 - i_delta ); /* q0' */
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
6191 tprintf(h->s.avctx, "filter_mb_mbaff_edgev i:%d, qp:%d, indexA:%d, alpha:%d, beta:%d, tc:%d\n# bS:%d -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x]\n", i, qp[qp_index], index_a, alpha, beta, tc, bS[bS_index], pix[-3], p1, p0, q0, q1, pix[2], p1, pix[-1], pix[0], q1);
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6192 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6193 }else{
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6194 const int p0 = pix[-1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6195 const int p1 = pix[-2];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6196 const int p2 = pix[-3];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6197
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6198 const int q0 = pix[0];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6199 const int q1 = pix[1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6200 const int q2 = pix[2];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6201
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6202 if( FFABS( p0 - q0 ) < alpha &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6203 FFABS( p1 - p0 ) < beta &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6204 FFABS( q1 - q0 ) < beta ) {
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6205
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6206 if(FFABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6207 if( FFABS( p2 - p0 ) < beta)
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6208 {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6209 const int p3 = pix[-4];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6210 /* p0', p1', p2' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6211 pix[-1] = ( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6212 pix[-2] = ( p2 + p1 + p0 + q0 + 2 ) >> 2;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6213 pix[-3] = ( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6214 } else {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6215 /* p0' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6216 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6217 }
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6218 if( FFABS( q2 - q0 ) < beta)
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6219 {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6220 const int q3 = pix[3];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6221 /* q0', q1', q2' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6222 pix[0] = ( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6223 pix[1] = ( p0 + q0 + q1 + q2 + 2 ) >> 2;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6224 pix[2] = ( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6225 } else {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6226 /* q0' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6227 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6228 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6229 }else{
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6230 /* p0', q0' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6231 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6232 pix[ 0] = ( 2*q1 + q0 + p1 + 2 ) >> 2;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6233 }
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
6234 tprintf(h->s.avctx, "filter_mb_mbaff_edgev i:%d, qp:%d, indexA:%d, alpha:%d, beta:%d\n# bS:4 -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x, %02x, %02x]\n", i, qp[qp_index], index_a, alpha, beta, p2, p1, p0, q0, q1, q2, pix[-3], pix[-2], pix[-1], pix[0], pix[1], pix[2]);
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6235 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6236 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6237 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6238 }
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6239 static void filter_mb_mbaff_edgecv( H264Context *h, uint8_t *pix, int stride, int16_t bS[8], int qp[2] ) {
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6240 int i;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6241 for( i = 0; i < 8; i++, pix += stride) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6242 int index_a;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6243 int alpha;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6244 int beta;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6245
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6246 int qp_index;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6247 int bS_index = i;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6248
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6249 if( bS[bS_index] == 0 ) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6250 continue;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6251 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6252
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6253 qp_index = MB_FIELD ? (i >> 2) : (i & 1);
4118
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
6254 index_a = qp[qp_index] + h->slice_alpha_c0_offset;
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
6255 alpha = (alpha_table+52)[index_a];
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
6256 beta = (beta_table+52)[qp[qp_index] + h->slice_beta_offset];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6257
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6258 if( bS[bS_index] < 4 ) {
4118
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
6259 const int tc = (tc0_table+52)[index_a][bS[bS_index] - 1] + 1;
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6260 const int p0 = pix[-1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6261 const int p1 = pix[-2];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6262 const int q0 = pix[0];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6263 const int q1 = pix[1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6264
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6265 if( FFABS( p0 - q0 ) < alpha &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6266 FFABS( p1 - p0 ) < beta &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6267 FFABS( q1 - q0 ) < beta ) {
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
6268 const int i_delta = av_clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc );
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
6269
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
6270 pix[-1] = av_clip_uint8( p0 + i_delta ); /* p0' */
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
6271 pix[0] = av_clip_uint8( q0 - i_delta ); /* q0' */
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
6272 tprintf(h->s.avctx, "filter_mb_mbaff_edgecv i:%d, qp:%d, indexA:%d, alpha:%d, beta:%d, tc:%d\n# bS:%d -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x]\n", i, qp[qp_index], index_a, alpha, beta, tc, bS[bS_index], pix[-3], p1, p0, q0, q1, pix[2], p1, pix[-1], pix[0], q1);
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6273 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6274 }else{
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6275 const int p0 = pix[-1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6276 const int p1 = pix[-2];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6277 const int q0 = pix[0];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6278 const int q1 = pix[1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6279
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6280 if( FFABS( p0 - q0 ) < alpha &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6281 FFABS( p1 - p0 ) < beta &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6282 FFABS( q1 - q0 ) < beta ) {
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6283
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6284 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2; /* p0' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6285 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; /* q0' */
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
6286 tprintf(h->s.avctx, "filter_mb_mbaff_edgecv i:%d\n# bS:4 -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x, %02x, %02x]\n", i, pix[-3], p1, p0, q0, q1, pix[2], pix[-3], pix[-2], pix[-1], pix[0], pix[1], pix[2]);
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6287 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6288 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6289 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6290 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6291
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6292 static void filter_mb_edgeh( H264Context *h, uint8_t *pix, int stride, int16_t bS[4], int qp ) {
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6293 int i, d;
4118
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
6294 const int index_a = qp + h->slice_alpha_c0_offset;
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
6295 const int alpha = (alpha_table+52)[index_a];
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
6296 const int beta = (beta_table+52)[qp + h->slice_beta_offset];
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6297 const int pix_next = stride;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6298
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6299 if( bS[0] < 4 ) {
2707
360024d31dab H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents: 2683
diff changeset
6300 int8_t tc[4];
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6301 for(i=0; i<4; i++)
4118
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
6302 tc[i] = bS[i] ? (tc0_table+52)[index_a][bS[i] - 1] : -1;
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6303 h->s.dsp.h264_v_loop_filter_luma(pix, stride, alpha, beta, tc);
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6304 } else {
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6305 /* 16px edge length, see filter_mb_edgev */
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6306 for( d = 0; d < 16; d++ ) {
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6307 const int p0 = pix[-1*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6308 const int p1 = pix[-2*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6309 const int p2 = pix[-3*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6310 const int q0 = pix[0];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6311 const int q1 = pix[1*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6312 const int q2 = pix[2*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6313
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6314 if( FFABS( p0 - q0 ) < alpha &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6315 FFABS( p1 - p0 ) < beta &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6316 FFABS( q1 - q0 ) < beta ) {
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6317
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6318 const int p3 = pix[-4*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6319 const int q3 = pix[ 3*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6320
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6321 if(FFABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6322 if( FFABS( p2 - p0 ) < beta) {
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6323 /* p0', p1', p2' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6324 pix[-1*pix_next] = ( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6325 pix[-2*pix_next] = ( p2 + p1 + p0 + q0 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6326 pix[-3*pix_next] = ( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6327 } else {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6328 /* p0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6329 pix[-1*pix_next] = ( 2*p1 + p0 + q1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6330 }
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6331 if( FFABS( q2 - q0 ) < beta) {
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6332 /* q0', q1', q2' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6333 pix[0*pix_next] = ( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6334 pix[1*pix_next] = ( p0 + q0 + q1 + q2 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6335 pix[2*pix_next] = ( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6336 } else {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6337 /* q0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6338 pix[0*pix_next] = ( 2*q1 + q0 + p1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6339 }
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6340 }else{
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6341 /* p0', q0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6342 pix[-1*pix_next] = ( 2*p1 + p0 + q1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6343 pix[ 0*pix_next] = ( 2*q1 + q0 + p1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6344 }
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
6345 tprintf(h->s.avctx, "filter_mb_edgeh i:%d d:%d, qp:%d, indexA:%d, alpha:%d, beta:%d\n# bS:%d -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x]\n", i, d, qp, index_a, alpha, beta, bS[i], p2, p1, p0, q0, q1, q2, pix[-2*pix_next], pix[-pix_next], pix[0], pix[pix_next]);
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6346 }
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6347 pix++;
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6348 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6349 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6350 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6351
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6352 static void filter_mb_edgech( H264Context *h, uint8_t *pix, int stride, int16_t bS[4], int qp ) {
2834
fd5d7c732c6b kill a bunch of compiler warnings
mru
parents: 2815
diff changeset
6353 int i;
4118
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
6354 const int index_a = qp + h->slice_alpha_c0_offset;
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
6355 const int alpha = (alpha_table+52)[index_a];
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
6356 const int beta = (beta_table+52)[qp + h->slice_beta_offset];
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6357
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6358 if( bS[0] < 4 ) {
2707
360024d31dab H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents: 2683
diff changeset
6359 int8_t tc[4];
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6360 for(i=0; i<4; i++)
4118
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
6361 tc[i] = bS[i] ? (tc0_table+52)[index_a][bS[i] - 1] + 1 : 0;
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6362 h->s.dsp.h264_v_loop_filter_chroma(pix, stride, alpha, beta, tc);
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6363 } else {
2707
360024d31dab H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents: 2683
diff changeset
6364 h->s.dsp.h264_v_loop_filter_chroma_intra(pix, stride, alpha, beta);
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6365 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6366 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6367
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6368 static void filter_mb_fast( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr, unsigned int linesize, unsigned int uvlinesize) {
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6369 MpegEncContext * const s = &h->s;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6370 int mb_xy, mb_type;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6371 int qp, qp0, qp1, qpc, qpc0, qpc1, qp_thresh;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6372
5093
f0ffa056b77c filter_mb_fast() doesn't handle h->deblocking_filter==2 (skip slice edges), so delegate that case to filter_mb().
lorenm
parents: 5083
diff changeset
6373 mb_xy = mb_x + mb_y*s->mb_stride;
f0ffa056b77c filter_mb_fast() doesn't handle h->deblocking_filter==2 (skip slice edges), so delegate that case to filter_mb().
lorenm
parents: 5083
diff changeset
6374
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6375 if(mb_x==0 || mb_y==0 || !s->dsp.h264_loop_filter_strength || h->pps.chroma_qp_diff ||
5093
f0ffa056b77c filter_mb_fast() doesn't handle h->deblocking_filter==2 (skip slice edges), so delegate that case to filter_mb().
lorenm
parents: 5083
diff changeset
6376 (h->deblocking_filter == 2 && (h->slice_table[mb_xy] != h->slice_table[h->top_mb_xy] ||
f0ffa056b77c filter_mb_fast() doesn't handle h->deblocking_filter==2 (skip slice edges), so delegate that case to filter_mb().
lorenm
parents: 5083
diff changeset
6377 h->slice_table[mb_xy] != h->slice_table[mb_xy - 1]))) {
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6378 filter_mb(h, mb_x, mb_y, img_y, img_cb, img_cr, linesize, uvlinesize);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6379 return;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6380 }
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6381 assert(!FRAME_MBAFF);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6382
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6383 mb_type = s->current_picture.mb_type[mb_xy];
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6384 qp = s->current_picture.qscale_table[mb_xy];
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6385 qp0 = s->current_picture.qscale_table[mb_xy-1];
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6386 qp1 = s->current_picture.qscale_table[h->top_mb_xy];
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6387 qpc = get_chroma_qp( h, 0, qp );
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6388 qpc0 = get_chroma_qp( h, 0, qp0 );
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6389 qpc1 = get_chroma_qp( h, 0, qp1 );
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6390 qp0 = (qp + qp0 + 1) >> 1;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6391 qp1 = (qp + qp1 + 1) >> 1;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6392 qpc0 = (qpc + qpc0 + 1) >> 1;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6393 qpc1 = (qpc + qpc1 + 1) >> 1;
3651
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6394 qp_thresh = 15 - h->slice_alpha_c0_offset;
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6395 if(qp <= qp_thresh && qp0 <= qp_thresh && qp1 <= qp_thresh &&
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6396 qpc <= qp_thresh && qpc0 <= qp_thresh && qpc1 <= qp_thresh)
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6397 return;
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6398
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6399 if( IS_INTRA(mb_type) ) {
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6400 int16_t bS4[4] = {4,4,4,4};
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6401 int16_t bS3[4] = {3,3,3,3};
5797
cd21fd29cf7c Fix deblocking for PAFF content
andoma
parents: 5787
diff changeset
6402 int16_t *bSH = FIELD_PICTURE ? bS3 : bS4;
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6403 if( IS_8x8DCT(mb_type) ) {
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6404 filter_mb_edgev( h, &img_y[4*0], linesize, bS4, qp0 );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6405 filter_mb_edgev( h, &img_y[4*2], linesize, bS3, qp );
5797
cd21fd29cf7c Fix deblocking for PAFF content
andoma
parents: 5787
diff changeset
6406 filter_mb_edgeh( h, &img_y[4*0*linesize], linesize, bSH, qp1 );
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6407 filter_mb_edgeh( h, &img_y[4*2*linesize], linesize, bS3, qp );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6408 } else {
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6409 filter_mb_edgev( h, &img_y[4*0], linesize, bS4, qp0 );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6410 filter_mb_edgev( h, &img_y[4*1], linesize, bS3, qp );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6411 filter_mb_edgev( h, &img_y[4*2], linesize, bS3, qp );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6412 filter_mb_edgev( h, &img_y[4*3], linesize, bS3, qp );
5797
cd21fd29cf7c Fix deblocking for PAFF content
andoma
parents: 5787
diff changeset
6413 filter_mb_edgeh( h, &img_y[4*0*linesize], linesize, bSH, qp1 );
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6414 filter_mb_edgeh( h, &img_y[4*1*linesize], linesize, bS3, qp );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6415 filter_mb_edgeh( h, &img_y[4*2*linesize], linesize, bS3, qp );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6416 filter_mb_edgeh( h, &img_y[4*3*linesize], linesize, bS3, qp );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6417 }
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6418 filter_mb_edgecv( h, &img_cb[2*0], uvlinesize, bS4, qpc0 );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6419 filter_mb_edgecv( h, &img_cb[2*2], uvlinesize, bS3, qpc );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6420 filter_mb_edgecv( h, &img_cr[2*0], uvlinesize, bS4, qpc0 );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6421 filter_mb_edgecv( h, &img_cr[2*2], uvlinesize, bS3, qpc );
5797
cd21fd29cf7c Fix deblocking for PAFF content
andoma
parents: 5787
diff changeset
6422 filter_mb_edgech( h, &img_cb[2*0*uvlinesize], uvlinesize, bSH, qpc1 );
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6423 filter_mb_edgech( h, &img_cb[2*2*uvlinesize], uvlinesize, bS3, qpc );
5797
cd21fd29cf7c Fix deblocking for PAFF content
andoma
parents: 5787
diff changeset
6424 filter_mb_edgech( h, &img_cr[2*0*uvlinesize], uvlinesize, bSH, qpc1 );
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6425 filter_mb_edgech( h, &img_cr[2*2*uvlinesize], uvlinesize, bS3, qpc );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6426 return;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6427 } else {
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6428 DECLARE_ALIGNED_8(int16_t, bS[2][4][4]);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6429 uint64_t (*bSv)[4] = (uint64_t(*)[4])bS;
3651
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6430 int edges;
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6431 if( IS_8x8DCT(mb_type) && (h->cbp&7) == 7 ) {
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6432 edges = 4;
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6433 bSv[0][0] = bSv[0][2] = bSv[1][0] = bSv[1][2] = 0x0002000200020002ULL;
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6434 } else {
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6435 int mask_edge1 = (mb_type & (MB_TYPE_16x16 | MB_TYPE_8x16)) ? 3 :
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6436 (mb_type & MB_TYPE_16x8) ? 1 : 0;
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6437 int mask_edge0 = (mb_type & (MB_TYPE_16x16 | MB_TYPE_8x16))
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6438 && (s->current_picture.mb_type[mb_xy-1] & (MB_TYPE_16x16 | MB_TYPE_8x16))
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6439 ? 3 : 0;
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6440 int step = IS_8x8DCT(mb_type) ? 2 : 1;
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6441 edges = (mb_type & MB_TYPE_16x16) && !(h->cbp & 15) ? 1 : 4;
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6442 s->dsp.h264_loop_filter_strength( bS, h->non_zero_count_cache, h->ref_cache, h->mv_cache,
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6443 (h->slice_type == B_TYPE), edges, step, mask_edge0, mask_edge1 );
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6444 }
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6445 if( IS_INTRA(s->current_picture.mb_type[mb_xy-1]) )
5797
cd21fd29cf7c Fix deblocking for PAFF content
andoma
parents: 5787
diff changeset
6446 bSv[0][0] = FIELD_PICTURE ? 0x0003000300030003ULL : 0x0004000400040004ULL;
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6447 if( IS_INTRA(s->current_picture.mb_type[h->top_mb_xy]) )
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6448 bSv[1][0] = 0x0004000400040004ULL;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6449
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6450 #define FILTER(hv,dir,edge)\
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6451 if(bSv[dir][edge]) {\
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6452 filter_mb_edge##hv( h, &img_y[4*edge*(dir?linesize:1)], linesize, bS[dir][edge], edge ? qp : qp##dir );\
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6453 if(!(edge&1)) {\
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6454 filter_mb_edgec##hv( h, &img_cb[2*edge*(dir?uvlinesize:1)], uvlinesize, bS[dir][edge], edge ? qpc : qpc##dir );\
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6455 filter_mb_edgec##hv( h, &img_cr[2*edge*(dir?uvlinesize:1)], uvlinesize, bS[dir][edge], edge ? qpc : qpc##dir );\
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6456 }\
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6457 }
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6458 if( edges == 1 ) {
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6459 FILTER(v,0,0);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6460 FILTER(h,1,0);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6461 } else if( IS_8x8DCT(mb_type) ) {
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6462 FILTER(v,0,0);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6463 FILTER(v,0,2);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6464 FILTER(h,1,0);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6465 FILTER(h,1,2);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6466 } else {
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6467 FILTER(v,0,0);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6468 FILTER(v,0,1);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6469 FILTER(v,0,2);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6470 FILTER(v,0,3);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6471 FILTER(h,1,0);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6472 FILTER(h,1,1);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6473 FILTER(h,1,2);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6474 FILTER(h,1,3);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6475 }
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6476 #undef FILTER
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6477 }
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6478 }
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6479
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6480 static void filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr, unsigned int linesize, unsigned int uvlinesize) {
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6481 MpegEncContext * const s = &h->s;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6482 const int mb_xy= mb_x + mb_y*s->mb_stride;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6483 const int mb_type = s->current_picture.mb_type[mb_xy];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6484 const int mvy_limit = IS_INTERLACED(mb_type) ? 2 : 4;
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6485 int first_vertical_edge_done = 0;
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6486 int dir;
2629
202cd69d8d2e fix ref comparison in B-frame deblocker ('unused' and 'unavailable' were treated as different)
lorenm
parents: 2628
diff changeset
6487 /* FIXME: A given frame may occupy more than one position in
202cd69d8d2e fix ref comparison in B-frame deblocker ('unused' and 'unavailable' were treated as different)
lorenm
parents: 2628
diff changeset
6488 * the reference list. So ref2frm should be populated with
202cd69d8d2e fix ref comparison in B-frame deblocker ('unused' and 'unavailable' were treated as different)
lorenm
parents: 2628
diff changeset
6489 * frame numbers, not indices. */
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6490 static const int ref2frm[34] = {-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6491 16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31};
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6492
3101
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
6493 //for sufficiently low qp, filtering wouldn't do anything
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
6494 //this is a conservative estimate: could also check beta_offset and more accurate chroma_qp
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6495 if(!FRAME_MBAFF){
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6496 int qp_thresh = 15 - h->slice_alpha_c0_offset - FFMAX(0, FFMAX(h->pps.chroma_qp_index_offset[0], h->pps.chroma_qp_index_offset[1]));
3101
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
6497 int qp = s->current_picture.qscale_table[mb_xy];
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
6498 if(qp <= qp_thresh
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
6499 && (mb_x == 0 || ((qp + s->current_picture.qscale_table[mb_xy-1] + 1)>>1) <= qp_thresh)
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
6500 && (mb_y == 0 || ((qp + s->current_picture.qscale_table[h->top_mb_xy] + 1)>>1) <= qp_thresh)){
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
6501 return;
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
6502 }
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
6503 }
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
6504
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6505 if (FRAME_MBAFF
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6506 // left mb is in picture
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6507 && h->slice_table[mb_xy-1] != 255
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6508 // and current and left pair do not have the same interlaced type
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6509 && (IS_INTERLACED(mb_type) != IS_INTERLACED(s->current_picture.mb_type[mb_xy-1]))
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6510 // and left mb is in the same slice if deblocking_filter == 2
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6511 && (h->deblocking_filter!=2 || h->slice_table[mb_xy-1] == h->slice_table[mb_xy])) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6512 /* First vertical edge is different in MBAFF frames
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
6513 * There are 8 different bS to compute and 2 different Qp
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6514 */
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6515 const int pair_xy = mb_x + (mb_y&~1)*s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6516 const int left_mb_xy[2] = { pair_xy-1, pair_xy-1+s->mb_stride };
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6517 int16_t bS[8];
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6518 int qp[2];
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6519 int bqp[2];
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6520 int rqp[2];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6521 int mb_qp, mbn0_qp, mbn1_qp;
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6522 int i;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6523 first_vertical_edge_done = 1;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6524
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6525 if( IS_INTRA(mb_type) )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6526 bS[0] = bS[1] = bS[2] = bS[3] = bS[4] = bS[5] = bS[6] = bS[7] = 4;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6527 else {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6528 for( i = 0; i < 8; i++ ) {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6529 int mbn_xy = MB_FIELD ? left_mb_xy[i>>2] : left_mb_xy[i&1];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6530
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6531 if( IS_INTRA( s->current_picture.mb_type[mbn_xy] ) )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6532 bS[i] = 4;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6533 else if( h->non_zero_count_cache[12+8*(i>>1)] != 0 ||
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6534 /* FIXME: with 8x8dct + cavlc, should check cbp instead of nnz */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6535 h->non_zero_count[mbn_xy][MB_FIELD ? i&3 : (i>>2)+(mb_y&1)*2] )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6536 bS[i] = 2;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6537 else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6538 bS[i] = 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6539 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6540 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6541
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6542 mb_qp = s->current_picture.qscale_table[mb_xy];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6543 mbn0_qp = s->current_picture.qscale_table[left_mb_xy[0]];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6544 mbn1_qp = s->current_picture.qscale_table[left_mb_xy[1]];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6545 qp[0] = ( mb_qp + mbn0_qp + 1 ) >> 1;
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6546 bqp[0] = ( get_chroma_qp( h, 0, mb_qp ) +
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6547 get_chroma_qp( h, 0, mbn0_qp ) + 1 ) >> 1;
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6548 rqp[0] = ( get_chroma_qp( h, 1, mb_qp ) +
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6549 get_chroma_qp( h, 1, mbn0_qp ) + 1 ) >> 1;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6550 qp[1] = ( mb_qp + mbn1_qp + 1 ) >> 1;
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6551 bqp[1] = ( get_chroma_qp( h, 0, mb_qp ) +
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6552 get_chroma_qp( h, 0, mbn1_qp ) + 1 ) >> 1;
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6553 rqp[1] = ( get_chroma_qp( h, 1, mb_qp ) +
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6554 get_chroma_qp( h, 1, mbn1_qp ) + 1 ) >> 1;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6555
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6556 /* Filter edge */
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6557 tprintf(s->avctx, "filter mb:%d/%d MBAFF, QPy:%d/%d, QPb:%d/%d QPr:%d/%d ls:%d uvls:%d", mb_x, mb_y, qp[0], qp[1], bqp[0], bqp[1], rqp[0], rqp[1], linesize, uvlinesize);
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
6558 { int i; for (i = 0; i < 8; i++) tprintf(s->avctx, " bS[%d]:%d", i, bS[i]); tprintf(s->avctx, "\n"); }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6559 filter_mb_mbaff_edgev ( h, &img_y [0], linesize, bS, qp );
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6560 filter_mb_mbaff_edgecv( h, &img_cb[0], uvlinesize, bS, bqp );
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6561 filter_mb_mbaff_edgecv( h, &img_cr[0], uvlinesize, bS, rqp );
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6562 }
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6563 /* dir : 0 -> vertical edge, 1 -> horizontal edge */
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6564 for( dir = 0; dir < 2; dir++ )
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6565 {
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6566 int edge;
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6567 const int mbm_xy = dir == 0 ? mb_xy -1 : h->top_mb_xy;
2924
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6568 const int mbm_type = s->current_picture.mb_type[mbm_xy];
2454
300f1207768d simplify
michael
parents: 2453
diff changeset
6569 int start = h->slice_table[mbm_xy] == 255 ? 1 : 0;
300f1207768d simplify
michael
parents: 2453
diff changeset
6570
3101
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
6571 const int edges = (mb_type & (MB_TYPE_16x16|MB_TYPE_SKIP))
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
6572 == (MB_TYPE_16x16|MB_TYPE_SKIP) ? 1 : 4;
2926
dfdbef4bfdc5 no mixing of code and declarations
mru
parents: 2924
diff changeset
6573 // how often to recheck mv-based bS when iterating between edges
dfdbef4bfdc5 no mixing of code and declarations
mru
parents: 2924
diff changeset
6574 const int mask_edge = (mb_type & (MB_TYPE_16x16 | (MB_TYPE_16x8 << dir))) ? 3 :
dfdbef4bfdc5 no mixing of code and declarations
mru
parents: 2924
diff changeset
6575 (mb_type & (MB_TYPE_8x16 >> dir)) ? 1 : 0;
dfdbef4bfdc5 no mixing of code and declarations
mru
parents: 2924
diff changeset
6576 // how often to recheck mv-based bS when iterating along each edge
dfdbef4bfdc5 no mixing of code and declarations
mru
parents: 2924
diff changeset
6577 const int mask_par0 = mb_type & (MB_TYPE_16x16 | (MB_TYPE_8x16 >> dir));
dfdbef4bfdc5 no mixing of code and declarations
mru
parents: 2924
diff changeset
6578
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6579 if (first_vertical_edge_done) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6580 start = 1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6581 first_vertical_edge_done = 0;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6582 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6583
2454
300f1207768d simplify
michael
parents: 2453
diff changeset
6584 if (h->deblocking_filter==2 && h->slice_table[mbm_xy] != h->slice_table[mb_xy])
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6585 start = 1;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6586
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6587 if (FRAME_MBAFF && (dir == 1) && ((mb_y&1) == 0) && start == 0
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6588 && !IS_INTERLACED(mb_type)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6589 && IS_INTERLACED(mbm_type)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6590 ) {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6591 // This is a special case in the norm where the filtering must
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6592 // be done twice (one each of the field) even if we are in a
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6593 // frame macroblock.
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6594 //
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6595 static const int nnz_idx[4] = {4,5,6,3};
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6596 unsigned int tmp_linesize = 2 * linesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6597 unsigned int tmp_uvlinesize = 2 * uvlinesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6598 int mbn_xy = mb_xy - 2 * s->mb_stride;
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6599 int qp;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6600 int i, j;
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6601 int16_t bS[4];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6602
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6603 for(j=0; j<2; j++, mbn_xy += s->mb_stride){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6604 if( IS_INTRA(mb_type) ||
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6605 IS_INTRA(s->current_picture.mb_type[mbn_xy]) ) {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6606 bS[0] = bS[1] = bS[2] = bS[3] = 3;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6607 } else {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6608 const uint8_t *mbn_nnz = h->non_zero_count[mbn_xy];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6609 for( i = 0; i < 4; i++ ) {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6610 if( h->non_zero_count_cache[scan8[0]+i] != 0 ||
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6611 mbn_nnz[nnz_idx[i]] != 0 )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6612 bS[i] = 2;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6613 else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6614 bS[i] = 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6615 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6616 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6617 // Do not use s->qscale as luma quantizer because it has not the same
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6618 // value in IPCM macroblocks.
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6619 qp = ( s->current_picture.qscale_table[mb_xy] + s->current_picture.qscale_table[mbn_xy] + 1 ) >> 1;
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
6620 tprintf(s->avctx, "filter mb:%d/%d dir:%d edge:%d, QPy:%d ls:%d uvls:%d", mb_x, mb_y, dir, edge, qp, tmp_linesize, tmp_uvlinesize);
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
6621 { int i; for (i = 0; i < 4; i++) tprintf(s->avctx, " bS[%d]:%d", i, bS[i]); tprintf(s->avctx, "\n"); }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6622 filter_mb_edgeh( h, &img_y[j*linesize], tmp_linesize, bS, qp );
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6623 filter_mb_edgech( h, &img_cb[j*uvlinesize], tmp_uvlinesize, bS,
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6624 ( h->chroma_qp[0] + get_chroma_qp( h, 0, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1);
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6625 filter_mb_edgech( h, &img_cr[j*uvlinesize], tmp_uvlinesize, bS,
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6626 ( h->chroma_qp[1] + get_chroma_qp( h, 1, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6627 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6628
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6629 start = 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6630 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6631
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6632 /* Calculate bS */
2924
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6633 for( edge = start; edge < edges; edge++ ) {
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
6634 /* mbn_xy: neighbor macroblock */
2924
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6635 const int mbn_xy = edge > 0 ? mb_xy : mbm_xy;
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6636 const int mbn_type = s->current_picture.mb_type[mbn_xy];
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6637 int16_t bS[4];
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6638 int qp;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6639
2924
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6640 if( (edge&1) && IS_8x8DCT(mb_type) )
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6641 continue;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6642
2924
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6643 if( IS_INTRA(mb_type) ||
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6644 IS_INTRA(mbn_type) ) {
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6645 int value;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6646 if (edge == 0) {
2924
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6647 if ( (!IS_INTERLACED(mb_type) && !IS_INTERLACED(mbm_type))
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6648 || ((FRAME_MBAFF || (s->picture_structure != PICT_FRAME)) && (dir == 0))
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6649 ) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6650 value = 4;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6651 } else {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6652 value = 3;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6653 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6654 } else {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6655 value = 3;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6656 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6657 bS[0] = bS[1] = bS[2] = bS[3] = value;
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6658 } else {
2924
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6659 int i, l;
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6660 int mv_done;
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6661
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6662 if( edge & mask_edge ) {
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6663 bS[0] = bS[1] = bS[2] = bS[3] = 0;
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6664 mv_done = 1;
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6665 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6666 else if( FRAME_MBAFF && IS_INTERLACED(mb_type ^ mbn_type)) {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6667 bS[0] = bS[1] = bS[2] = bS[3] = 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6668 mv_done = 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6669 }
2924
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6670 else if( mask_par0 && (edge || (mbn_type & (MB_TYPE_16x16 | (MB_TYPE_8x16 >> dir)))) ) {
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6671 int b_idx= 8 + 4 + edge * (dir ? 8:1);
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6672 int bn_idx= b_idx - (dir ? 8:1);
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6673 int v = 0;
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6674 for( l = 0; !v && l < 1 + (h->slice_type == B_TYPE); l++ ) {
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6675 v |= ref2frm[h->ref_cache[l][b_idx]+2] != ref2frm[h->ref_cache[l][bn_idx]+2] ||
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6676 FFABS( h->mv_cache[l][b_idx][0] - h->mv_cache[l][bn_idx][0] ) >= 4 ||
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6677 FFABS( h->mv_cache[l][b_idx][1] - h->mv_cache[l][bn_idx][1] ) >= mvy_limit;
2924
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6678 }
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6679 bS[0] = bS[1] = bS[2] = bS[3] = v;
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6680 mv_done = 1;
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6681 }
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6682 else
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6683 mv_done = 0;
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6684
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6685 for( i = 0; i < 4; i++ ) {
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6686 int x = dir == 0 ? edge : i;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6687 int y = dir == 0 ? i : edge;
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
6688 int b_idx= 8 + 4 + x + 8*y;
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
6689 int bn_idx= b_idx - (dir ? 8:1);
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
6690
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
6691 if( h->non_zero_count_cache[b_idx] != 0 ||
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
6692 h->non_zero_count_cache[bn_idx] != 0 ) {
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6693 bS[i] = 2;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6694 }
2924
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6695 else if(!mv_done)
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
6696 {
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
6697 bS[i] = 0;
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
6698 for( l = 0; l < 1 + (h->slice_type == B_TYPE); l++ ) {
2629
202cd69d8d2e fix ref comparison in B-frame deblocker ('unused' and 'unavailable' were treated as different)
lorenm
parents: 2628
diff changeset
6699 if( ref2frm[h->ref_cache[l][b_idx]+2] != ref2frm[h->ref_cache[l][bn_idx]+2] ||
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6700 FFABS( h->mv_cache[l][b_idx][0] - h->mv_cache[l][bn_idx][0] ) >= 4 ||
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6701 FFABS( h->mv_cache[l][b_idx][1] - h->mv_cache[l][bn_idx][1] ) >= mvy_limit ) {
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
6702 bS[i] = 1;
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
6703 break;
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
6704 }
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
6705 }
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6706 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6707 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
6708
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
6709 if(bS[0]+bS[1]+bS[2]+bS[3] == 0)
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
6710 continue;
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6711 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6712
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6713 /* Filter edge */
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
6714 // Do not use s->qscale as luma quantizer because it has not the same
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6715 // value in IPCM macroblocks.
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6716 qp = ( s->current_picture.qscale_table[mb_xy] + s->current_picture.qscale_table[mbn_xy] + 1 ) >> 1;
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
6717 //tprintf(s->avctx, "filter mb:%d/%d dir:%d edge:%d, QPy:%d, QPc:%d, QPcn:%d\n", mb_x, mb_y, dir, edge, qp, h->chroma_qp, s->current_picture.qscale_table[mbn_xy]);
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
6718 tprintf(s->avctx, "filter mb:%d/%d dir:%d edge:%d, QPy:%d ls:%d uvls:%d", mb_x, mb_y, dir, edge, qp, linesize, uvlinesize);
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
6719 { int i; for (i = 0; i < 4; i++) tprintf(s->avctx, " bS[%d]:%d", i, bS[i]); tprintf(s->avctx, "\n"); }
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6720 if( dir == 0 ) {
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6721 filter_mb_edgev( h, &img_y[4*edge], linesize, bS, qp );
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6722 if( (edge&1) == 0 ) {
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6723 filter_mb_edgecv( h, &img_cb[2*edge], uvlinesize, bS,
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6724 ( h->chroma_qp[0] + get_chroma_qp( h, 0, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1);
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6725 filter_mb_edgecv( h, &img_cr[2*edge], uvlinesize, bS,
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6726 ( h->chroma_qp[1] + get_chroma_qp( h, 1, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1);
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6727 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6728 } else {
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6729 filter_mb_edgeh( h, &img_y[4*edge*linesize], linesize, bS, qp );
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6730 if( (edge&1) == 0 ) {
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6731 filter_mb_edgech( h, &img_cb[2*edge*uvlinesize], uvlinesize, bS,
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6732 ( h->chroma_qp[0] + get_chroma_qp( h, 0, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1);
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6733 filter_mb_edgech( h, &img_cr[2*edge*uvlinesize], uvlinesize, bS,
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6734 ( h->chroma_qp[1] + get_chroma_qp( h, 1, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1);
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6735 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6736 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6737 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6738 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6739 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6740
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6741 static int decode_slice(struct AVCodecContext *avctx, H264Context *h){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6742 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6743 const int part_mask= s->partitioned_frame ? (AC_END|AC_ERROR) : 0x7F;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6744
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6745 s->mb_skip_run= -1;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6746
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6747 if( h->pps.cabac ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6748 int i;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6749
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6750 /* realign */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6751 align_get_bits( &s->gb );
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6752
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6753 /* init cabac */
3993
8b7c59b7af01 make state transition tables global as they are constant and the code is slightly faster that way
michael
parents: 3991
diff changeset
6754 ff_init_cabac_states( &h->cabac);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6755 ff_init_cabac_decoder( &h->cabac,
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6756 s->gb.buffer + get_bits_count(&s->gb)/8,
2116
48d9f86fb047 overread fix
michael
parents: 2110
diff changeset
6757 ( s->gb.size_in_bits - get_bits_count(&s->gb) + 7)/8);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6758 /* calculate pre-state */
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6759 for( i= 0; i < 460; i++ ) {
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6760 int pre;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6761 if( h->slice_type == I_TYPE )
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
6762 pre = av_clip( ((cabac_context_init_I[i][0] * s->qscale) >>4 ) + cabac_context_init_I[i][1], 1, 126 );
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6763 else
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
6764 pre = av_clip( ((cabac_context_init_PB[h->cabac_init_idc][i][0] * s->qscale) >>4 ) + cabac_context_init_PB[h->cabac_init_idc][i][1], 1, 126 );
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6765
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6766 if( pre <= 63 )
3976
27e90123b346 reverse remainder of the failed attempt to optimize *state=c->mps_state[s]
michael
parents: 3972
diff changeset
6767 h->cabac_state[i] = 2 * ( 63 - pre ) + 0;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6768 else
3976
27e90123b346 reverse remainder of the failed attempt to optimize *state=c->mps_state[s]
michael
parents: 3972
diff changeset
6769 h->cabac_state[i] = 2 * ( pre - 64 ) + 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6770 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6771
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6772 for(;;){
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
6773 //START_TIMER
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6774 int ret = decode_mb_cabac(h);
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
6775 int eos;
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
6776 //STOP_TIMER("decode_mb_cabac")
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6777
2163
b25df257eab0 segfault fix
michael
parents: 2116
diff changeset
6778 if(ret>=0) hl_decode_mb(h);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6779
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6780 if( ret >= 0 && FRAME_MBAFF ) { //FIXME optimal? or let mb_decode decode 16x32 ?
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6781 s->mb_y++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6782
2163
b25df257eab0 segfault fix
michael
parents: 2116
diff changeset
6783 if(ret>=0) ret = decode_mb_cabac(h);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6784
2844
5f20ab245501 prevent assert failures and infinite loops with broken streams
michael
parents: 2834
diff changeset
6785 if(ret>=0) hl_decode_mb(h);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6786 s->mb_y--;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6787 }
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
6788 eos = get_cabac_terminate( &h->cabac );
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6789
3948
3edbf131ee44 refill cabac variables in 16bit steps, 3% faster get_cabac()
michael
parents: 3947
diff changeset
6790 if( ret < 0 || h->cabac.bytestream > h->cabac.bytestream_end + 2) {
5153
b985439e3e15 fix some printf format specifiers
mru
parents: 5129
diff changeset
6791 av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding MB %d %d, bytestream (%td)\n", s->mb_x, s->mb_y, h->cabac.bytestream_end - h->cabac.bytestream);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6792 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)&part_mask);
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6793 return -1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6794 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6795
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6796 if( ++s->mb_x >= s->mb_width ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6797 s->mb_x = 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6798 ff_draw_horiz_band(s, 16*s->mb_y, 16);
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
6799 ++s->mb_y;
5781
0b3aa6f4c313 Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents: 5780
diff changeset
6800 if(FIELD_OR_MBAFF_PICTURE) {
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
6801 ++s->mb_y;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
6802 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6803 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6804
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6805 if( eos || s->mb_y >= s->mb_height ) {
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
6806 tprintf(s->avctx, "slice end %d %d\n", get_bits_count(&s->gb), s->gb.size_in_bits);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6807 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)&part_mask);
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6808 return 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6809 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6810 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6811
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6812 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6813 for(;;){
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6814 int ret = decode_mb_cavlc(h);
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6815
2163
b25df257eab0 segfault fix
michael
parents: 2116
diff changeset
6816 if(ret>=0) hl_decode_mb(h);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6817
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6818 if(ret>=0 && FRAME_MBAFF){ //FIXME optimal? or let mb_decode decode 16x32 ?
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6819 s->mb_y++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6820 ret = decode_mb_cavlc(h);
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6821
2163
b25df257eab0 segfault fix
michael
parents: 2116
diff changeset
6822 if(ret>=0) hl_decode_mb(h);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6823 s->mb_y--;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6824 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6825
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6826 if(ret<0){
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6827 av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding MB %d %d\n", s->mb_x, s->mb_y);
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6828 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)&part_mask);
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6829
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6830 return -1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6831 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6832
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6833 if(++s->mb_x >= s->mb_width){
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6834 s->mb_x=0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6835 ff_draw_horiz_band(s, 16*s->mb_y, 16);
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
6836 ++s->mb_y;
5781
0b3aa6f4c313 Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents: 5780
diff changeset
6837 if(FIELD_OR_MBAFF_PICTURE) {
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
6838 ++s->mb_y;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
6839 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
6840 if(s->mb_y >= s->mb_height){
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
6841 tprintf(s->avctx, "slice end %d %d\n", get_bits_count(&s->gb), s->gb.size_in_bits);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6842
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6843 if(get_bits_count(&s->gb) == s->gb.size_in_bits ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6844 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)&part_mask);
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6845
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6846 return 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6847 }else{
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6848 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, (AC_END|DC_END|MV_END)&part_mask);
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6849
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6850 return -1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6851 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6852 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6853 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6854
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6855 if(get_bits_count(&s->gb) >= s->gb.size_in_bits && s->mb_skip_run<=0){
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
6856 tprintf(s->avctx, "slice end %d %d\n", get_bits_count(&s->gb), s->gb.size_in_bits);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6857 if(get_bits_count(&s->gb) == s->gb.size_in_bits ){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6858 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)&part_mask);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6859
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6860 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6861 }else{
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6862 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)&part_mask);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6863
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6864 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6865 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6866 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6867 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6868 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6869
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6870 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6871 for(;s->mb_y < s->mb_height; s->mb_y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6872 for(;s->mb_x < s->mb_width; s->mb_x++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6873 int ret= decode_mb(h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6874
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6875 hl_decode_mb(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6876
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6877 if(ret<0){
3177
8d1b2cc2a75b (f)printf --> av_log conversion
diego
parents: 3174
diff changeset
6878 av_log(s->avctx, AV_LOG_ERROR, "error while decoding MB %d %d\n", s->mb_x, s->mb_y);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6879 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)&part_mask);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6880
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6881 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6882 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6883
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6884 if(++s->mb_x >= s->mb_width){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6885 s->mb_x=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6886 if(++s->mb_y >= s->mb_height){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6887 if(get_bits_count(s->gb) == s->gb.size_in_bits){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6888 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)&part_mask);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6889
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6890 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6891 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6892 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, (AC_END|DC_END|MV_END)&part_mask);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6893
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6894 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6895 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6896 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6897 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6898
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6899 if(get_bits_count(s->?gb) >= s->gb?.size_in_bits){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6900 if(get_bits_count(s->gb) == s->gb.size_in_bits){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6901 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)&part_mask);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6902
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6903 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6904 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6905 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)&part_mask);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6906
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6907 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6908 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6909 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6910 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6911 s->mb_x=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6912 ff_draw_horiz_band(s, 16*s->mb_y, 16);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6913 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6914 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6915 return -1; //not reached
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6916 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6917
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6918 static int decode_unregistered_user_data(H264Context *h, int size){
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6919 MpegEncContext * const s = &h->s;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6920 uint8_t user_data[16+256];
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6921 int e, build, i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6922
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6923 if(size<16)
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6924 return -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6925
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6926 for(i=0; i<sizeof(user_data)-1 && i<size; i++){
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6927 user_data[i]= get_bits(&s->gb, 8);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6928 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6929
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6930 user_data[i]= 0;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6931 e= sscanf(user_data+16, "x264 - core %d"/*%s - H.264/MPEG-4 AVC codec - Copyleft 2005 - http://www.videolan.org/x264.html*/, &build);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6932 if(e==1 && build>=0)
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6933 h->x264_build= build;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6934
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6935 if(s->avctx->debug & FF_DEBUG_BUGS)
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6936 av_log(s->avctx, AV_LOG_DEBUG, "user data:\"%s\"\n", user_data+16);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6937
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6938 for(; i<size; i++)
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6939 skip_bits(&s->gb, 8);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6940
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6941 return 0;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6942 }
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6943
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6944 static int decode_sei(H264Context *h){
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6945 MpegEncContext * const s = &h->s;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6946
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6947 while(get_bits_count(&s->gb) + 16 < s->gb.size_in_bits){
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6948 int size, type;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6949
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6950 type=0;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6951 do{
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6952 type+= show_bits(&s->gb, 8);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6953 }while(get_bits(&s->gb, 8) == 255);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6954
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6955 size=0;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6956 do{
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6957 size+= show_bits(&s->gb, 8);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6958 }while(get_bits(&s->gb, 8) == 255);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6959
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6960 switch(type){
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6961 case 5:
3318
8dc886b9568a typo me thinks ...
michael
parents: 3316
diff changeset
6962 if(decode_unregistered_user_data(h, size) < 0)
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6963 return -1;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6964 break;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6965 default:
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6966 skip_bits(&s->gb, 8*size);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6967 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6968
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6969 //FIXME check bits here
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6970 align_get_bits(&s->gb);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6971 }
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6972
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6973 return 0;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6974 }
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6975
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6976 static inline void decode_hrd_parameters(H264Context *h, SPS *sps){
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6977 MpegEncContext * const s = &h->s;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6978 int cpb_count, i;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6979 cpb_count = get_ue_golomb(&s->gb) + 1;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6980 get_bits(&s->gb, 4); /* bit_rate_scale */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6981 get_bits(&s->gb, 4); /* cpb_size_scale */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6982 for(i=0; i<cpb_count; i++){
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6983 get_ue_golomb(&s->gb); /* bit_rate_value_minus1 */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6984 get_ue_golomb(&s->gb); /* cpb_size_value_minus1 */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6985 get_bits1(&s->gb); /* cbr_flag */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6986 }
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6987 get_bits(&s->gb, 5); /* initial_cpb_removal_delay_length_minus1 */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6988 get_bits(&s->gb, 5); /* cpb_removal_delay_length_minus1 */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6989 get_bits(&s->gb, 5); /* dpb_output_delay_length_minus1 */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6990 get_bits(&s->gb, 5); /* time_offset_length */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6991 }
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6992
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6993 static inline int decode_vui_parameters(H264Context *h, SPS *sps){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6994 MpegEncContext * const s = &h->s;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
6995 int aspect_ratio_info_present_flag;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
6996 unsigned int aspect_ratio_idc;
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6997 int nal_hrd_parameters_present_flag, vcl_hrd_parameters_present_flag;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6998
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6999 aspect_ratio_info_present_flag= get_bits1(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7000
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7001 if( aspect_ratio_info_present_flag ) {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7002 aspect_ratio_idc= get_bits(&s->gb, 8);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7003 if( aspect_ratio_idc == EXTENDED_SAR ) {
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
7004 sps->sar.num= get_bits(&s->gb, 16);
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
7005 sps->sar.den= get_bits(&s->gb, 16);
3196
15157293beea fixing coverity warnig CID: 253 (reading over the end of the aspect_ratio array for illegal aspect ratios)
michael
parents: 3178
diff changeset
7006 }else if(aspect_ratio_idc < 14){
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
7007 sps->sar= pixel_aspect[aspect_ratio_idc];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7008 }else{
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
7009 av_log(h->s.avctx, AV_LOG_ERROR, "illegal aspect ratio\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7010 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7011 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7012 }else{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7013 sps->sar.num=
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
7014 sps->sar.den= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7015 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7016 // s->avctx->aspect_ratio= sar_width*s->width / (float)(s->height*sar_height);
2174
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7017
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7018 if(get_bits1(&s->gb)){ /* overscan_info_present_flag */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7019 get_bits1(&s->gb); /* overscan_appropriate_flag */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7020 }
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7021
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7022 if(get_bits1(&s->gb)){ /* video_signal_type_present_flag */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7023 get_bits(&s->gb, 3); /* video_format */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7024 get_bits1(&s->gb); /* video_full_range_flag */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7025 if(get_bits1(&s->gb)){ /* colour_description_present_flag */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7026 get_bits(&s->gb, 8); /* colour_primaries */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7027 get_bits(&s->gb, 8); /* transfer_characteristics */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7028 get_bits(&s->gb, 8); /* matrix_coefficients */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7029 }
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7030 }
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7031
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7032 if(get_bits1(&s->gb)){ /* chroma_location_info_present_flag */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7033 get_ue_golomb(&s->gb); /* chroma_sample_location_type_top_field */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7034 get_ue_golomb(&s->gb); /* chroma_sample_location_type_bottom_field */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7035 }
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7036
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7037 sps->timing_info_present_flag = get_bits1(&s->gb);
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7038 if(sps->timing_info_present_flag){
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7039 sps->num_units_in_tick = get_bits_long(&s->gb, 32);
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7040 sps->time_scale = get_bits_long(&s->gb, 32);
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7041 sps->fixed_frame_rate_flag = get_bits1(&s->gb);
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7042 }
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7043
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7044 nal_hrd_parameters_present_flag = get_bits1(&s->gb);
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7045 if(nal_hrd_parameters_present_flag)
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7046 decode_hrd_parameters(h, sps);
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7047 vcl_hrd_parameters_present_flag = get_bits1(&s->gb);
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7048 if(vcl_hrd_parameters_present_flag)
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7049 decode_hrd_parameters(h, sps);
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7050 if(nal_hrd_parameters_present_flag || vcl_hrd_parameters_present_flag)
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7051 get_bits1(&s->gb); /* low_delay_hrd_flag */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7052 get_bits1(&s->gb); /* pic_struct_present_flag */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7053
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7054 sps->bitstream_restriction_flag = get_bits1(&s->gb);
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7055 if(sps->bitstream_restriction_flag){
4389
3afddc65631b check num_reorder_frames for validity
michael
parents: 4388
diff changeset
7056 unsigned int num_reorder_frames;
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7057 get_bits1(&s->gb); /* motion_vectors_over_pic_boundaries_flag */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7058 get_ue_golomb(&s->gb); /* max_bytes_per_pic_denom */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7059 get_ue_golomb(&s->gb); /* max_bits_per_mb_denom */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7060 get_ue_golomb(&s->gb); /* log2_max_mv_length_horizontal */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7061 get_ue_golomb(&s->gb); /* log2_max_mv_length_vertical */
4389
3afddc65631b check num_reorder_frames for validity
michael
parents: 4388
diff changeset
7062 num_reorder_frames= get_ue_golomb(&s->gb);
3afddc65631b check num_reorder_frames for validity
michael
parents: 4388
diff changeset
7063 get_ue_golomb(&s->gb); /*max_dec_frame_buffering*/
3afddc65631b check num_reorder_frames for validity
michael
parents: 4388
diff changeset
7064
3afddc65631b check num_reorder_frames for validity
michael
parents: 4388
diff changeset
7065 if(num_reorder_frames > 16 /*max_dec_frame_buffering || max_dec_frame_buffering > 16*/){
3afddc65631b check num_reorder_frames for validity
michael
parents: 4388
diff changeset
7066 av_log(h->s.avctx, AV_LOG_ERROR, "illegal num_reorder_frames %d\n", num_reorder_frames);
3afddc65631b check num_reorder_frames for validity
michael
parents: 4388
diff changeset
7067 return -1;
3afddc65631b check num_reorder_frames for validity
michael
parents: 4388
diff changeset
7068 }
3afddc65631b check num_reorder_frames for validity
michael
parents: 4388
diff changeset
7069
3afddc65631b check num_reorder_frames for validity
michael
parents: 4388
diff changeset
7070 sps->num_reorder_frames= num_reorder_frames;
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7071 }
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7072
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7073 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7074 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7075
3004
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
7076 static void decode_scaling_list(H264Context *h, uint8_t *factors, int size,
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
7077 const uint8_t *jvt_list, const uint8_t *fallback_list){
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7078 MpegEncContext * const s = &h->s;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7079 int i, last = 8, next = 8;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7080 const uint8_t *scan = size == 16 ? zigzag_scan : zigzag_scan8x8;
3004
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
7081 if(!get_bits1(&s->gb)) /* matrix not written, we use the predicted one */
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
7082 memcpy(factors, fallback_list, size*sizeof(uint8_t));
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7083 else
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7084 for(i=0;i<size;i++){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7085 if(next)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7086 next = (last + get_se_golomb(&s->gb)) & 0xff;
3004
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
7087 if(!i && !next){ /* matrix not written, we use the preset one */
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
7088 memcpy(factors, jvt_list, size*sizeof(uint8_t));
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7089 break;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7090 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7091 last = factors[scan[i]] = next ? next : last;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7092 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7093 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7094
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7095 static void decode_scaling_matrices(H264Context *h, SPS *sps, PPS *pps, int is_sps,
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7096 uint8_t (*scaling_matrix4)[16], uint8_t (*scaling_matrix8)[64]){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7097 MpegEncContext * const s = &h->s;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7098 int fallback_sps = !is_sps && sps->scaling_matrix_present;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7099 const uint8_t *fallback[4] = {
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7100 fallback_sps ? sps->scaling_matrix4[0] : default_scaling4[0],
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7101 fallback_sps ? sps->scaling_matrix4[3] : default_scaling4[1],
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7102 fallback_sps ? sps->scaling_matrix8[0] : default_scaling8[0],
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7103 fallback_sps ? sps->scaling_matrix8[1] : default_scaling8[1]
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7104 };
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7105 if(get_bits1(&s->gb)){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7106 sps->scaling_matrix_present |= is_sps;
3004
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
7107 decode_scaling_list(h,scaling_matrix4[0],16,default_scaling4[0],fallback[0]); // Intra, Y
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
7108 decode_scaling_list(h,scaling_matrix4[1],16,default_scaling4[0],scaling_matrix4[0]); // Intra, Cr
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
7109 decode_scaling_list(h,scaling_matrix4[2],16,default_scaling4[0],scaling_matrix4[1]); // Intra, Cb
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
7110 decode_scaling_list(h,scaling_matrix4[3],16,default_scaling4[1],fallback[1]); // Inter, Y
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
7111 decode_scaling_list(h,scaling_matrix4[4],16,default_scaling4[1],scaling_matrix4[3]); // Inter, Cr
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
7112 decode_scaling_list(h,scaling_matrix4[5],16,default_scaling4[1],scaling_matrix4[4]); // Inter, Cb
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7113 if(is_sps || pps->transform_8x8_mode){
3004
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
7114 decode_scaling_list(h,scaling_matrix8[0],64,default_scaling8[0],fallback[2]); // Intra, Y
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
7115 decode_scaling_list(h,scaling_matrix8[1],64,default_scaling8[1],fallback[3]); // Inter, Y
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7116 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7117 } else if(fallback_sps) {
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7118 memcpy(scaling_matrix4, sps->scaling_matrix4, 6*16*sizeof(uint8_t));
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7119 memcpy(scaling_matrix8, sps->scaling_matrix8, 2*64*sizeof(uint8_t));
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7120 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7121 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7122
5079
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7123 /**
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7124 * Returns and optionally allocates SPS / PPS structures in the supplied array 'vec'
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7125 */
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7126 static void *
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7127 alloc_parameter_set(H264Context *h, void **vec, const unsigned int id, const unsigned int max,
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7128 const size_t size, const char *name)
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7129 {
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7130 if(id>=max) {
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7131 av_log(h->s.avctx, AV_LOG_ERROR, "%s_id (%d) out of range\n", name, id);
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7132 return NULL;
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7133 }
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7134
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7135 if(!vec[id]) {
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7136 vec[id] = av_mallocz(size);
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7137 if(vec[id] == NULL)
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7138 av_log(h->s.avctx, AV_LOG_ERROR, "cannot allocate memory for %s\n", name);
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7139 }
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7140 return vec[id];
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7141 }
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7142
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7143 static inline int decode_seq_parameter_set(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7144 MpegEncContext * const s = &h->s;
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7145 int profile_idc, level_idc;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7146 unsigned int sps_id, tmp, mb_width, mb_height;
4362
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
7147 int i;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7148 SPS *sps;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7149
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7150 profile_idc= get_bits(&s->gb, 8);
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7151 get_bits1(&s->gb); //constraint_set0_flag
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7152 get_bits1(&s->gb); //constraint_set1_flag
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7153 get_bits1(&s->gb); //constraint_set2_flag
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
7154 get_bits1(&s->gb); //constraint_set3_flag
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
7155 get_bits(&s->gb, 4); // reserved
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7156 level_idc= get_bits(&s->gb, 8);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7157 sps_id= get_ue_golomb(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7158
5079
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7159 sps = alloc_parameter_set(h, (void **)h->sps_buffers, sps_id, MAX_SPS_COUNT, sizeof(SPS), "sps");
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7160 if(sps == NULL)
4362
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
7161 return -1;
5079
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7162
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7163 sps->profile_idc= profile_idc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7164 sps->level_idc= level_idc;
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
7165
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7166 if(sps->profile_idc >= 100){ //high profile
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7167 if(get_ue_golomb(&s->gb) == 3) //chroma_format_idc
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7168 get_bits1(&s->gb); //residual_color_transform_flag
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7169 get_ue_golomb(&s->gb); //bit_depth_luma_minus8
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7170 get_ue_golomb(&s->gb); //bit_depth_chroma_minus8
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
7171 sps->transform_bypass = get_bits1(&s->gb);
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7172 decode_scaling_matrices(h, sps, NULL, 1, sps->scaling_matrix4, sps->scaling_matrix8);
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7173 }else
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7174 sps->scaling_matrix_present = 0;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7175
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7176 sps->log2_max_frame_num= get_ue_golomb(&s->gb) + 4;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7177 sps->poc_type= get_ue_golomb(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7178
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7179 if(sps->poc_type == 0){ //FIXME #define
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7180 sps->log2_max_poc_lsb= get_ue_golomb(&s->gb) + 4;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7181 } else if(sps->poc_type == 1){//FIXME #define
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7182 sps->delta_pic_order_always_zero_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7183 sps->offset_for_non_ref_pic= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7184 sps->offset_for_top_to_bottom_field= get_se_golomb(&s->gb);
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7185 tmp= get_ue_golomb(&s->gb);
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7186
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7187 if(tmp >= sizeof(sps->offset_for_ref_frame) / sizeof(sps->offset_for_ref_frame[0])){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7188 av_log(h->s.avctx, AV_LOG_ERROR, "poc_cycle_length overflow %u\n", tmp);
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7189 return -1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7190 }
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7191 sps->poc_cycle_length= tmp;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7192
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7193 for(i=0; i<sps->poc_cycle_length; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7194 sps->offset_for_ref_frame[i]= get_se_golomb(&s->gb);
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7195 }else if(sps->poc_type != 2){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
7196 av_log(h->s.avctx, AV_LOG_ERROR, "illegal POC type %d\n", sps->poc_type);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7197 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7198 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7199
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7200 tmp= get_ue_golomb(&s->gb);
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7201 if(tmp > MAX_PICTURE_COUNT-2){
2254
0dfe4e32b19c H.264 max reference pictures fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2227
diff changeset
7202 av_log(h->s.avctx, AV_LOG_ERROR, "too many reference frames\n");
0dfe4e32b19c H.264 max reference pictures fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2227
diff changeset
7203 }
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7204 sps->ref_frame_count= tmp;
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7205 sps->gaps_in_frame_num_allowed_flag= get_bits1(&s->gb);
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7206 mb_width= get_ue_golomb(&s->gb) + 1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7207 mb_height= get_ue_golomb(&s->gb) + 1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7208 if(mb_width >= INT_MAX/16 || mb_height >= INT_MAX/16 ||
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7209 avcodec_check_dimensions(NULL, 16*mb_width, 16*mb_height)){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7210 av_log(h->s.avctx, AV_LOG_ERROR, "mb_width/height overflow\n");
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2417
diff changeset
7211 return -1;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7212 }
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7213 sps->mb_width = mb_width;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7214 sps->mb_height= mb_height;
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2417
diff changeset
7215
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7216 sps->frame_mbs_only_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7217 if(!sps->frame_mbs_only_flag)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7218 sps->mb_aff= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7219 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7220 sps->mb_aff= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7221
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7222 sps->direct_8x8_inference_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7223
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7224 #ifndef ALLOW_INTERLACE
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7225 if(sps->mb_aff)
3954
00a12ef7d800 output typo fixes
diego
parents: 3948
diff changeset
7226 av_log(h->s.avctx, AV_LOG_ERROR, "MBAFF support not included; enable it at compile-time.\n");
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7227 #endif
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7228 if(!sps->direct_8x8_inference_flag && sps->mb_aff)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7229 av_log(h->s.avctx, AV_LOG_ERROR, "MBAFF + !direct_8x8_inference is not implemented\n");
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7230
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7231 sps->crop= get_bits1(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7232 if(sps->crop){
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7233 sps->crop_left = get_ue_golomb(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7234 sps->crop_right = get_ue_golomb(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7235 sps->crop_top = get_ue_golomb(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7236 sps->crop_bottom= get_ue_golomb(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7237 if(sps->crop_left || sps->crop_top){
2628
511e3afc43e1 Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents: 2623
diff changeset
7238 av_log(h->s.avctx, AV_LOG_ERROR, "insane cropping not completely supported, this could look slightly wrong ...\n");
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7239 }
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7240 }else{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7241 sps->crop_left =
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7242 sps->crop_right =
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7243 sps->crop_top =
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7244 sps->crop_bottom= 0;
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7245 }
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7246
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7247 sps->vui_parameters_present_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7248 if( sps->vui_parameters_present_flag )
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7249 decode_vui_parameters(h, sps);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7250
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7251 if(s->avctx->debug&FF_DEBUG_PICT_INFO){
4362
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
7252 av_log(h->s.avctx, AV_LOG_DEBUG, "sps:%u profile:%d/%d poc:%d ref:%d %dx%d %s %s crop:%d/%d/%d/%d %s\n",
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7253 sps_id, sps->profile_idc, sps->level_idc,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7254 sps->poc_type,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7255 sps->ref_frame_count,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7256 sps->mb_width, sps->mb_height,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7257 sps->frame_mbs_only_flag ? "FRM" : (sps->mb_aff ? "MB-AFF" : "PIC-AFF"),
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7258 sps->direct_8x8_inference_flag ? "8B8" : "",
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7259 sps->crop_left, sps->crop_right,
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7260 sps->crop_top, sps->crop_bottom,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7261 sps->vui_parameters_present_flag ? "VUI" : ""
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7262 );
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7263 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7264 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7265 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7266
5226
65bffcc5571a Precompute a chroma_qp table with index offset for each pps,
gpoirier
parents: 5225
diff changeset
7267 static void
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
7268 build_qp_table(PPS *pps, int t, int index)
5226
65bffcc5571a Precompute a chroma_qp table with index offset for each pps,
gpoirier
parents: 5225
diff changeset
7269 {
65bffcc5571a Precompute a chroma_qp table with index offset for each pps,
gpoirier
parents: 5225
diff changeset
7270 int i;
65bffcc5571a Precompute a chroma_qp table with index offset for each pps,
gpoirier
parents: 5225
diff changeset
7271 for(i = 0; i < 255; i++)
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
7272 pps->chroma_qp_table[t][i & 0xff] = chroma_qp[av_clip(i + index, 0, 51)];
5226
65bffcc5571a Precompute a chroma_qp table with index offset for each pps,
gpoirier
parents: 5225
diff changeset
7273 }
65bffcc5571a Precompute a chroma_qp table with index offset for each pps,
gpoirier
parents: 5225
diff changeset
7274
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7275 static inline int decode_picture_parameter_set(H264Context *h, int bit_length){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7276 MpegEncContext * const s = &h->s;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7277 unsigned int tmp, pps_id= get_ue_golomb(&s->gb);
4362
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
7278 PPS *pps;
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
7279
5079
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7280 pps = alloc_parameter_set(h, (void **)h->pps_buffers, pps_id, MAX_PPS_COUNT, sizeof(PPS), "pps");
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7281 if(pps == NULL)
4362
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
7282 return -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7283
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7284 tmp= get_ue_golomb(&s->gb);
5079
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7285 if(tmp>=MAX_SPS_COUNT || h->sps_buffers[tmp] == NULL){
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7286 av_log(h->s.avctx, AV_LOG_ERROR, "sps_id out of range\n");
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7287 return -1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7288 }
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7289 pps->sps_id= tmp;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7290
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7291 pps->cabac= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7292 pps->pic_order_present= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7293 pps->slice_group_count= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7294 if(pps->slice_group_count > 1 ){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7295 pps->mb_slice_group_map_type= get_ue_golomb(&s->gb);
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
7296 av_log(h->s.avctx, AV_LOG_ERROR, "FMO not supported\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7297 switch(pps->mb_slice_group_map_type){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7298 case 0:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7299 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7300 | for( i = 0; i <= num_slice_groups_minus1; i++ ) | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7301 | run_length[ i ] |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7302 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7303 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7304 case 2:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7305 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7306 | for( i = 0; i < num_slice_groups_minus1; i++ ) | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7307 |{ | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7308 | top_left_mb[ i ] |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7309 | bottom_right_mb[ i ] |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7310 | } | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7311 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7312 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7313 case 3:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7314 case 4:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7315 case 5:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7316 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7317 | slice_group_change_direction_flag |1 |u(1) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7318 | slice_group_change_rate_minus1 |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7319 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7320 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7321 case 6:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7322 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7323 | slice_group_id_cnt_minus1 |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7324 | for( i = 0; i <= slice_group_id_cnt_minus1; i++ | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7325 |) | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7326 | slice_group_id[ i ] |1 |u(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7327 #endif
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1187
diff changeset
7328 break;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7329 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7330 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7331 pps->ref_count[0]= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7332 pps->ref_count[1]= get_ue_golomb(&s->gb) + 1;
4531
8a5a3dd25390 fix ref_count check
michael
parents: 4530
diff changeset
7333 if(pps->ref_count[0]-1 > 32-1 || pps->ref_count[1]-1 > 32-1){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
7334 av_log(h->s.avctx, AV_LOG_ERROR, "reference overflow (pps)\n");
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7335 pps->ref_count[0]= pps->ref_count[1]= 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7336 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7337 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7338
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7339 pps->weighted_pred= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7340 pps->weighted_bipred_idc= get_bits(&s->gb, 2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7341 pps->init_qp= get_se_golomb(&s->gb) + 26;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7342 pps->init_qs= get_se_golomb(&s->gb) + 26;
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
7343 pps->chroma_qp_index_offset[0]= get_se_golomb(&s->gb);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7344 pps->deblocking_filter_parameters_present= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7345 pps->constrained_intra_pred= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7346 pps->redundant_pic_cnt_present = get_bits1(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7347
3291
454de57e45cf reinit quant matrices if pps is overwritten by another of the same pps_id.
lorenm
parents: 3285
diff changeset
7348 pps->transform_8x8_mode= 0;
454de57e45cf reinit quant matrices if pps is overwritten by another of the same pps_id.
lorenm
parents: 3285
diff changeset
7349 h->dequant_coeff_pps= -1; //contents of sps/pps can change even if id doesn't, so reinit
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7350 memset(pps->scaling_matrix4, 16, 6*16*sizeof(uint8_t));
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7351 memset(pps->scaling_matrix8, 16, 2*64*sizeof(uint8_t));
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7352
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7353 if(get_bits_count(&s->gb) < bit_length){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7354 pps->transform_8x8_mode= get_bits1(&s->gb);
5079
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7355 decode_scaling_matrices(h, h->sps_buffers[pps->sps_id], pps, 0, pps->scaling_matrix4, pps->scaling_matrix8);
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
7356 pps->chroma_qp_index_offset[1]= get_se_golomb(&s->gb); //second_chroma_qp_index_offset
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
7357 } else {
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
7358 pps->chroma_qp_index_offset[1]= pps->chroma_qp_index_offset[0];
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
7359 }
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
7360
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
7361 build_qp_table(pps, 0, pps->chroma_qp_index_offset[0]);
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
7362 if(pps->chroma_qp_index_offset[0] != pps->chroma_qp_index_offset[1]) {
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
7363 build_qp_table(pps, 1, pps->chroma_qp_index_offset[1]);
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
7364 h->pps.chroma_qp_diff= 1;
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
7365 } else
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
7366 memcpy(pps->chroma_qp_table[1], pps->chroma_qp_table[0], 256);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7367
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7368 if(s->avctx->debug&FF_DEBUG_PICT_INFO){
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
7369 av_log(h->s.avctx, AV_LOG_DEBUG, "pps:%u sps:%u %s slice_groups:%d ref:%d/%d %s qp:%d/%d/%d/%d %s %s %s %s\n",
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7370 pps_id, pps->sps_id,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7371 pps->cabac ? "CABAC" : "CAVLC",
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7372 pps->slice_group_count,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7373 pps->ref_count[0], pps->ref_count[1],
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7374 pps->weighted_pred ? "weighted" : "",
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
7375 pps->init_qp, pps->init_qs, pps->chroma_qp_index_offset[0], pps->chroma_qp_index_offset[1],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7376 pps->deblocking_filter_parameters_present ? "LPAR" : "",
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7377 pps->constrained_intra_pred ? "CONSTR" : "",
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7378 pps->redundant_pic_cnt_present ? "REDU" : "",
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7379 pps->transform_8x8_mode ? "8x8DCT" : ""
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7380 );
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7381 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7382
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7383 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7384 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7385
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7386 /**
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7387 * Call decode_slice() for each context.
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7388 *
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7389 * @param h h264 master context
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7390 * @param context_count number of contexts to execute
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7391 */
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7392 static void execute_decode_slices(H264Context *h, int context_count){
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7393 MpegEncContext * const s = &h->s;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7394 AVCodecContext * const avctx= s->avctx;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7395 H264Context *hx;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7396 int i;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7397
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7398 if(context_count == 1) {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7399 decode_slice(avctx, h);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7400 } else {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7401 for(i = 1; i < context_count; i++) {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7402 hx = h->thread_context[i];
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7403 hx->s.error_resilience = avctx->error_resilience;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7404 hx->s.error_count = 0;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7405 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7406
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7407 avctx->execute(avctx, (void *)decode_slice,
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7408 (void **)h->thread_context, NULL, context_count);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7409
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7410 /* pull back stuff from slices to master context */
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7411 hx = h->thread_context[context_count - 1];
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7412 s->mb_x = hx->s.mb_x;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7413 s->mb_y = hx->s.mb_y;
5798
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
7414 s->dropable = hx->s.dropable;
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
7415 s->picture_structure = hx->s.picture_structure;
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7416 for(i = 1; i < context_count; i++)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7417 h->s.error_count += h->thread_context[i]->s.error_count;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7418 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7419 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7420
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7421
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7422 static int decode_nal_units(H264Context *h, uint8_t *buf, int buf_size){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7423 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7424 AVCodecContext * const avctx= s->avctx;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7425 int buf_index=0;
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7426 H264Context *hx; ///< thread context
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7427 int context_count = 0;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7428
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7429 h->max_contexts = avctx->thread_count;
1322
f78341ab5fba some warning fixes
al3x
parents: 1319
diff changeset
7430 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7431 int i;
2867
7c7edddaa835 dont be so picky with .mp4 ... fixes Mr&MrsSmith.mp4
michael
parents: 2861
diff changeset
7432 for(i=0; i<50; i++){
7c7edddaa835 dont be so picky with .mp4 ... fixes Mr&MrsSmith.mp4
michael
parents: 2861
diff changeset
7433 av_log(NULL, AV_LOG_ERROR,"%02X ", buf[i]);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7434 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7435 #endif
4616
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7436 if(!(s->flags2 & CODEC_FLAG2_CHUNKS)){
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7437 h->current_slice = 0;
5798
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
7438 if (!s->first_field)
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7439 s->current_picture_ptr= NULL;
4616
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7440 }
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7441
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7442 for(;;){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7443 int consumed;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7444 int dst_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7445 int bit_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7446 uint8_t *ptr;
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7447 int i, nalsize = 0;
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7448 int err;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7449
5170
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7450 if(h->is_avc) {
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7451 if(buf_index >= buf_size) break;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7452 nalsize = 0;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7453 for(i = 0; i < h->nal_length_size; i++)
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7454 nalsize = (nalsize << 8) | buf[buf_index++];
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7455 if(nalsize <= 1 || (nalsize+buf_index > buf_size)){
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7456 if(nalsize == 1){
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7457 buf_index++;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7458 continue;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7459 }else{
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7460 av_log(h->s.avctx, AV_LOG_ERROR, "AVC: nal size %d\n", nalsize);
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7461 break;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7462 }
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7463 }
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7464 } else {
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7465 // start code prefix search
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7466 for(; buf_index + 3 < buf_size; buf_index++){
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7467 // This should always succeed in the first iteration.
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7468 if(buf[buf_index] == 0 && buf[buf_index+1] == 0 && buf[buf_index+2] == 1)
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7469 break;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7470 }
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7471
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7472 if(buf_index+3 >= buf_size) break;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7473
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7474 buf_index+=3;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7475 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7476
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7477 hx = h->thread_context[context_count];
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7478
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7479 ptr= decode_nal(hx, buf + buf_index, &dst_length, &consumed, h->is_avc ? nalsize : buf_size - buf_index);
4828
58f1856608f6 scenario: A properly coded frame is followed by an end of sequence NAL unit,
diego
parents: 4795
diff changeset
7480 if (ptr==NULL || dst_length < 0){
4362
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
7481 return -1;
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
7482 }
4829
e3161603a048 Remove a NAL unit's trailing zero bytes even when dst_length is 1.
diego
parents: 4828
diff changeset
7483 while(ptr[dst_length - 1] == 0 && dst_length > 0)
3341
bd7a496e44c9 h264: accept rbsp_trailing longer than 1 byte
lorenm
parents: 3318
diff changeset
7484 dst_length--;
4830
5a523aee7379 When dst_length == 0 bit_length has to be 0, too, but the current code still
diego
parents: 4829
diff changeset
7485 bit_length= !dst_length ? 0 : (8*dst_length - decode_rbsp_trailing(h, ptr + dst_length - 1));
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7486
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7487 if(s->avctx->debug&FF_DEBUG_STARTCODE){
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7488 av_log(h->s.avctx, AV_LOG_DEBUG, "NAL %d at %d/%d length %d\n", hx->nal_unit_type, buf_index, buf_size, dst_length);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7489 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7490
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7491 if (h->is_avc && (nalsize != consumed))
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7492 av_log(h->s.avctx, AV_LOG_ERROR, "AVC: Consumed only %d bytes instead of %d\n", consumed, nalsize);
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7493
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7494 buf_index += consumed;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7495
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5106
diff changeset
7496 if( (s->hurry_up == 1 && h->nal_ref_idc == 0) //FIXME do not discard SEI id
2792
0a8c847ad5e7 skip_idct
michael
parents: 2781
diff changeset
7497 ||(avctx->skip_frame >= AVDISCARD_NONREF && h->nal_ref_idc == 0))
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7498 continue;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7499
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7500 again:
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7501 err = 0;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7502 switch(hx->nal_unit_type){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7503 case NAL_IDR_SLICE:
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7504 if (h->nal_unit_type != NAL_IDR_SLICE) {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7505 av_log(h->s.avctx, AV_LOG_ERROR, "Invalid mix of idr and non-idr slices");
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7506 return -1;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7507 }
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
7508 idr(h); //FIXME ensure we don't loose some frames if there is reordering
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7509 case NAL_SLICE:
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7510 init_get_bits(&hx->s.gb, ptr, bit_length);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7511 hx->intra_gb_ptr=
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7512 hx->inter_gb_ptr= &hx->s.gb;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7513 hx->s.data_partitioning = 0;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7514
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7515 if((err = decode_slice_header(hx, h)))
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7516 break;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7517
5773
e3d7a78e2df3 Fix Picture.key_frame setting to be compatible with frame and field contexts. Part of PAFF implementation.
andoma
parents: 5772
diff changeset
7518 s->current_picture_ptr->key_frame|= (hx->nal_unit_type == NAL_IDR_SLICE);
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7519 if(hx->redundant_pic_count==0 && hx->s.hurry_up < 5
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7520 && (avctx->skip_frame < AVDISCARD_NONREF || hx->nal_ref_idc)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7521 && (avctx->skip_frame < AVDISCARD_BIDIR || hx->slice_type!=B_TYPE)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7522 && (avctx->skip_frame < AVDISCARD_NONKEY || hx->slice_type==I_TYPE)
2793
ae85da6c5c2f more fine grained skip_frame
michael
parents: 2792
diff changeset
7523 && avctx->skip_frame < AVDISCARD_ALL)
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7524 context_count++;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7525 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7526 case NAL_DPA:
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7527 init_get_bits(&hx->s.gb, ptr, bit_length);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7528 hx->intra_gb_ptr=
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7529 hx->inter_gb_ptr= NULL;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7530 hx->s.data_partitioning = 1;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7531
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7532 err = decode_slice_header(hx, h);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7533 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7534 case NAL_DPB:
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7535 init_get_bits(&hx->intra_gb, ptr, bit_length);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7536 hx->intra_gb_ptr= &hx->intra_gb;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7537 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7538 case NAL_DPC:
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7539 init_get_bits(&hx->inter_gb, ptr, bit_length);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7540 hx->inter_gb_ptr= &hx->inter_gb;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7541
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7542 if(hx->redundant_pic_count==0 && hx->intra_gb_ptr && hx->s.data_partitioning
4354
d18568fb0187 Avoid calling decode_slice when context_initialized is not set.
reimar
parents: 4344
diff changeset
7543 && s->context_initialized
2793
ae85da6c5c2f more fine grained skip_frame
michael
parents: 2792
diff changeset
7544 && s->hurry_up < 5
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7545 && (avctx->skip_frame < AVDISCARD_NONREF || hx->nal_ref_idc)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7546 && (avctx->skip_frame < AVDISCARD_BIDIR || hx->slice_type!=B_TYPE)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7547 && (avctx->skip_frame < AVDISCARD_NONKEY || hx->slice_type==I_TYPE)
2793
ae85da6c5c2f more fine grained skip_frame
michael
parents: 2792
diff changeset
7548 && avctx->skip_frame < AVDISCARD_ALL)
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7549 context_count++;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7550 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7551 case NAL_SEI:
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7552 init_get_bits(&s->gb, ptr, bit_length);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7553 decode_sei(h);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7554 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7555 case NAL_SPS:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7556 init_get_bits(&s->gb, ptr, bit_length);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7557 decode_seq_parameter_set(h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7558
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7559 if(s->flags& CODEC_FLAG_LOW_DELAY)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7560 s->low_delay=1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7561
2538
34b0996cc10d 10l (fix reordering when B-frames are not present)
lorenm
parents: 2537
diff changeset
7562 if(avctx->has_b_frames < 2)
34b0996cc10d 10l (fix reordering when B-frames are not present)
lorenm
parents: 2537
diff changeset
7563 avctx->has_b_frames= !s->low_delay;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7564 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7565 case NAL_PPS:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7566 init_get_bits(&s->gb, ptr, bit_length);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7567
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7568 decode_picture_parameter_set(h, bit_length);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7569
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7570 break;
2960
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
7571 case NAL_AUD:
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
7572 case NAL_END_SEQUENCE:
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
7573 case NAL_END_STREAM:
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
7574 case NAL_FILLER_DATA:
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
7575 case NAL_SPS_EXT:
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
7576 case NAL_AUXILIARY_SLICE:
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7577 break;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2971
diff changeset
7578 default:
5631
550e37ec2204 Silence warnings about NAL_SVC_NON_IDR in H.264.
diego
parents: 5629
diff changeset
7579 av_log(avctx, AV_LOG_DEBUG, "Unknown NAL code: %d (%d bits)\n", h->nal_unit_type, bit_length);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7580 }
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7581
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7582 if(context_count == h->max_contexts) {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7583 execute_decode_slices(h, context_count);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7584 context_count = 0;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7585 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7586
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7587 if (err < 0)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7588 av_log(h->s.avctx, AV_LOG_ERROR, "decode_slice_header error\n");
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7589 else if(err == 1) {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7590 /* Slice could not be decoded in parallel mode, copy down
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7591 * NAL unit stuff to context 0 and restart. Note that
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7592 * rbsp_buffer is not transfered, but since we no longer
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7593 * run in parallel mode this should not be an issue. */
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7594 h->nal_unit_type = hx->nal_unit_type;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7595 h->nal_ref_idc = hx->nal_ref_idc;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7596 hx = h;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7597 goto again;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7598 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7599 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7600 if(context_count)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7601 execute_decode_slices(h, context_count);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7602 return buf_index;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7603 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7604
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7605 /**
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
7606 * returns the number of bytes consumed for building the current frame
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7607 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7608 static int get_consumed_bytes(MpegEncContext *s, int pos, int buf_size){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7609 if(s->flags&CODEC_FLAG_TRUNCATED){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7610 pos -= s->parse_context.last_index;
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
7611 if(pos<0) pos=0; // FIXME remove (unneeded?)
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7612
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7613 return pos;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7614 }else{
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5106
diff changeset
7615 if(pos==0) pos=1; //avoid infinite loops (i doubt that is needed but ...)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7616 if(pos+10>buf_size) pos=buf_size; // oops ;)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7617
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7618 return pos;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7619 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7620 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7621
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7622 static int decode_frame(AVCodecContext *avctx,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7623 void *data, int *data_size,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7624 uint8_t *buf, int buf_size)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7625 {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7626 H264Context *h = avctx->priv_data;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7627 MpegEncContext *s = &h->s;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7628 AVFrame *pict = data;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7629 int buf_index;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7630
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7631 s->flags= avctx->flags;
1754
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1706
diff changeset
7632 s->flags2= avctx->flags2;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7633
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7634 /* no supplementary picture */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7635 if (buf_size == 0) {
4556
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7636 Picture *out;
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7637 int i, out_idx;
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7638
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7639 //FIXME factorize this with the output code below
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7640 out = h->delayed_pic[0];
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7641 out_idx = 0;
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7642 for(i=1; h->delayed_pic[i] && !h->delayed_pic[i]->key_frame; i++)
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7643 if(h->delayed_pic[i]->poc < out->poc){
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7644 out = h->delayed_pic[i];
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7645 out_idx = i;
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7646 }
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7647
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7648 for(i=out_idx; h->delayed_pic[i]; i++)
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7649 h->delayed_pic[i] = h->delayed_pic[i+1];
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7650
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7651 if(out){
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7652 *data_size = sizeof(AVFrame);
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7653 *pict= *(AVFrame*)out;
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7654 }
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7655
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7656 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7657 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7658
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7659 if(s->flags&CODEC_FLAG_TRUNCATED){
4975
9a6a0818e93f split h264.c to move parser in its own file
aurel
parents: 4931
diff changeset
7660 int next= ff_h264_find_frame_end(h, buf, buf_size);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7661
4931
0d1cc37d9430 make some parser parameters const to avoid casting const to non-const
aurel
parents: 4908
diff changeset
7662 if( ff_combine_frame(&s->parse_context, next, (const uint8_t **)&buf, &buf_size) < 0 )
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7663 return buf_size;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7664 //printf("next:%d buf_size:%d last_index:%d\n", next, buf_size, s->parse_context.last_index);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7665 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7666
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7667 if(h->is_avc && !h->got_avcC) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7668 int i, cnt, nalsize;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7669 unsigned char *p = avctx->extradata;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7670 if(avctx->extradata_size < 7) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7671 av_log(avctx, AV_LOG_ERROR, "avcC too short\n");
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7672 return -1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7673 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7674 if(*p != 1) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7675 av_log(avctx, AV_LOG_ERROR, "Unknown avcC version %d\n", *p);
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7676 return -1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7677 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7678 /* sps and pps in the avcC always have length coded with 2 bytes,
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7679 so put a fake nal_length_size = 2 while parsing them */
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7680 h->nal_length_size = 2;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7681 // Decode sps from avcC
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7682 cnt = *(p+5) & 0x1f; // Number of sps
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7683 p += 6;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7684 for (i = 0; i < cnt; i++) {
4364
05e932ddaaa9 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 4363
diff changeset
7685 nalsize = AV_RB16(p) + 2;
2867
7c7edddaa835 dont be so picky with .mp4 ... fixes Mr&MrsSmith.mp4
michael
parents: 2861
diff changeset
7686 if(decode_nal_units(h, p, nalsize) < 0) {
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7687 av_log(avctx, AV_LOG_ERROR, "Decoding sps %d from avcC failed\n", i);
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7688 return -1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7689 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7690 p += nalsize;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7691 }
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7692 // Decode pps from avcC
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7693 cnt = *(p++); // Number of pps
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7694 for (i = 0; i < cnt; i++) {
4364
05e932ddaaa9 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 4363
diff changeset
7695 nalsize = AV_RB16(p) + 2;
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7696 if(decode_nal_units(h, p, nalsize) != nalsize) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7697 av_log(avctx, AV_LOG_ERROR, "Decoding pps %d from avcC failed\n", i);
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7698 return -1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7699 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7700 p += nalsize;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7701 }
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7702 // Now store right nal length size, that will be use to parse all other nals
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7703 h->nal_length_size = ((*(((char*)(avctx->extradata))+4))&0x03)+1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7704 // Do not reparse avcC
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7705 h->got_avcC = 1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7706 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7707
4507
b80c704183e9 always decode extradata when of non-avc stream (like RTSP)
gpoirier
parents: 4391
diff changeset
7708 if(avctx->frame_number==0 && !h->is_avc && s->avctx->extradata_size){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7709 if(decode_nal_units(h, s->avctx->extradata, s->avctx->extradata_size) < 0)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7710 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7711 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7712
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7713 buf_index=decode_nal_units(h, buf, buf_size);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7714 if(buf_index < 0)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7715 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7716
4620
f23c20cf7579 check for no frame and prevent segfault
michael
parents: 4616
diff changeset
7717 if(!(s->flags2 & CODEC_FLAG2_CHUNKS) && !s->current_picture_ptr){
5629
7e5ebda833e9 Remove error raising when explicitely skipping frame
benoit
parents: 5547
diff changeset
7718 if (avctx->skip_frame >= AVDISCARD_NONREF || s->hurry_up) return 0;
4620
f23c20cf7579 check for no frame and prevent segfault
michael
parents: 4616
diff changeset
7719 av_log(avctx, AV_LOG_ERROR, "no frame!\n");
f23c20cf7579 check for no frame and prevent segfault
michael
parents: 4616
diff changeset
7720 return -1;
f23c20cf7579 check for no frame and prevent segfault
michael
parents: 4616
diff changeset
7721 }
f23c20cf7579 check for no frame and prevent segfault
michael
parents: 4616
diff changeset
7722
4616
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7723 if(!(s->flags2 & CODEC_FLAG2_CHUNKS) || (s->mb_y >= s->mb_height && s->mb_height)){
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7724 Picture *out = s->current_picture_ptr;
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7725 Picture *cur = s->current_picture_ptr;
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7726 Picture *prev = h->delayed_output_pic;
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7727 int i, pics, cross_idr, out_of_order, out_idx;
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7728
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7729 s->mb_y= 0;
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7730
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7731 s->current_picture_ptr->qscale_type= FF_QSCALE_TYPE_H264;
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7732 s->current_picture_ptr->pict_type= s->pict_type;
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7733
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7734 h->prev_frame_num_offset= h->frame_num_offset;
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7735 h->prev_frame_num= h->frame_num;
5798
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
7736 if(!s->dropable) {
4616
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7737 h->prev_poc_msb= h->poc_msb;
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7738 h->prev_poc_lsb= h->poc_lsb;
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7739 execute_ref_pic_marking(h, h->mmco, h->mmco_index);
5723
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
7740 }
4616
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7741
5798
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
7742 /*
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
7743 * FIXME: Error handling code does not seem to support interlaced
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
7744 * when slices span multiple rows
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
7745 * The ff_er_add_slice calls don't work right for bottom
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
7746 * fields; they cause massive erroneous error concealing
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
7747 * Error marking covers both fields (top and bottom).
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
7748 * This causes a mismatched s->error_count
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
7749 * and a bad error table. Further, the error count goes to
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
7750 * INT_MAX when called for bottom field, because mb_y is
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
7751 * past end by one (callers fault) and resync_mb_y != 0
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
7752 * causes problems for the first MB line, too.
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
7753 */
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
7754 if (!FIELD_PICTURE)
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7755 ff_er_frame_end(s);
4616
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7756
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7757 MPV_frame_end(s);
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7758
5798
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
7759 if (s->first_field) {
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
7760 /* Wait for second field. */
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
7761 *data_size = 0;
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
7762
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
7763 } else {
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7764 //FIXME do something with unavailable reference frames
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7765
2561
eb72c01df6ed 10l (compile fix)
lorenm
parents: 2560
diff changeset
7766 #if 0 //decode order
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7767 *data_size = sizeof(AVFrame);
2561
eb72c01df6ed 10l (compile fix)
lorenm
parents: 2560
diff changeset
7768 #else
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7769 /* Sort B-frames into display order */
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7770
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7771 if(h->sps.bitstream_restriction_flag
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7772 && s->avctx->has_b_frames < h->sps.num_reorder_frames){
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7773 s->avctx->has_b_frames = h->sps.num_reorder_frames;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7774 s->low_delay = 0;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7775 }
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7776
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7777 pics = 0;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7778 while(h->delayed_pic[pics]) pics++;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7779
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7780 assert(pics+1 < sizeof(h->delayed_pic) / sizeof(h->delayed_pic[0]));
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7781
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7782 h->delayed_pic[pics++] = cur;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7783 if(cur->reference == 0)
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7784 cur->reference = DELAYED_PIC_REF;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7785
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7786 cross_idr = 0;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7787 for(i=0; h->delayed_pic[i]; i++)
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7788 if(h->delayed_pic[i]->key_frame || h->delayed_pic[i]->poc==0)
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7789 cross_idr = 1;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7790
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7791 out = h->delayed_pic[0];
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7792 out_idx = 0;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7793 for(i=1; h->delayed_pic[i] && !h->delayed_pic[i]->key_frame; i++)
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7794 if(h->delayed_pic[i]->poc < out->poc){
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7795 out = h->delayed_pic[i];
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7796 out_idx = i;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7797 }
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7798
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7799 out_of_order = !cross_idr && prev && out->poc < prev->poc;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7800 if(h->sps.bitstream_restriction_flag && s->avctx->has_b_frames >= h->sps.num_reorder_frames)
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7801 { }
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7802 else if(prev && pics <= s->avctx->has_b_frames)
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7803 out = prev;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7804 else if((out_of_order && pics-1 == s->avctx->has_b_frames && pics < 15)
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7805 || (s->low_delay &&
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7806 ((!cross_idr && prev && out->poc > prev->poc + 2)
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7807 || cur->pict_type == B_TYPE)))
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7808 {
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7809 s->low_delay = 0;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7810 s->avctx->has_b_frames++;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7811 out = prev;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7812 }
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7813 else if(out_of_order)
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7814 out = prev;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7815
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7816 if(out_of_order || pics > s->avctx->has_b_frames){
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7817 for(i=out_idx; h->delayed_pic[i]; i++)
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7818 h->delayed_pic[i] = h->delayed_pic[i+1];
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7819 }
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7820
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7821 if(prev == out)
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7822 *data_size = 0;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7823 else
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7824 *data_size = sizeof(AVFrame);
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7825 if(prev && prev != out && prev->reference == DELAYED_PIC_REF)
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7826 prev->reference = 0;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7827 h->delayed_output_pic = out;
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
7828 #endif
2409
26778a857b5b Sort B-frames into display order.
lorenm
parents: 2404
diff changeset
7829
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7830 if(out)
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7831 *pict= *(AVFrame*)out;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7832 else
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7833 av_log(avctx, AV_LOG_DEBUG, "no picture\n");
5798
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
7834 }
2937
e63bbb945ebd fix a crash on seeking to an invalid frame
lorenm
parents: 2935
diff changeset
7835 }
e63bbb945ebd fix a crash on seeking to an invalid frame
lorenm
parents: 2935
diff changeset
7836
e63bbb945ebd fix a crash on seeking to an invalid frame
lorenm
parents: 2935
diff changeset
7837 assert(pict->data[0] || !*data_size);
1706
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1698
diff changeset
7838 ff_print_debug_info(s, pict);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7839 //printf("out %d\n", (int)pict->data[0]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7840 #if 0 //?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7841
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7842 /* Return the Picture timestamp as the frame number */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7843 /* we substract 1 because it is added on utils.c */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7844 avctx->frame_number = s->picture_number - 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7845 #endif
5806
62fc35411cb1 Set pict->interlaced_frame if returned frame is MBAFF or PAFF.
cehoyos
parents: 5805
diff changeset
7846 pict->interlaced_frame = FIELD_OR_MBAFF_PICTURE;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7847 return get_consumed_bytes(s, buf_index, buf_size);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7848 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7849 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7850 static inline void fill_mb_avail(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7851 MpegEncContext * const s = &h->s;
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: 1174
diff changeset
7852 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7853
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7854 if(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: 1174
diff changeset
7855 h->mb_avail[0]= s->mb_x && h->slice_table[mb_xy - s->mb_stride - 1] == h->slice_num;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1174
diff changeset
7856 h->mb_avail[1]= h->slice_table[mb_xy - s->mb_stride ] == h->slice_num;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1174
diff changeset
7857 h->mb_avail[2]= s->mb_x+1 < s->mb_width && h->slice_table[mb_xy - s->mb_stride + 1] == h->slice_num;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7858 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7859 h->mb_avail[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7860 h->mb_avail[1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7861 h->mb_avail[2]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7862 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7863 h->mb_avail[3]= s->mb_x && h->slice_table[mb_xy - 1] == h->slice_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7864 h->mb_avail[4]= 1; //FIXME move out
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7865 h->mb_avail[5]= 0; //FIXME move out
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7866 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7867 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7868
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7869 #if 0 //selftest
5380
389366aa3458 Fix the self tests which are contained in some codecs and are using random().
takis
parents: 5338
diff changeset
7870 #undef random
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7871 #define COUNT 8000
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7872 #define SIZE (COUNT*40)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7873 int main(){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7874 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7875 uint8_t temp[SIZE];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7876 PutBitContext pb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7877 GetBitContext gb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7878 // int int_temp[10000];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7879 DSPContext dsp;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7880 AVCodecContext avctx;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7881
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7882 dsputil_init(&dsp, &avctx);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7883
1522
79dddc5cd990 removed the obsolete and unused parameters of init_put_bits
alex
parents: 1453
diff changeset
7884 init_put_bits(&pb, temp, SIZE);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7885 printf("testing unsigned exp golomb\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7886 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7887 START_TIMER
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7888 set_ue_golomb(&pb, i);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7889 STOP_TIMER("set_ue_golomb");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7890 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7891 flush_put_bits(&pb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7892
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7893 init_get_bits(&gb, temp, 8*SIZE);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7894 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7895 int j, s;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7896
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7897 s= show_bits(&gb, 24);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7898
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7899 START_TIMER
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7900 j= get_ue_golomb(&gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7901 if(j != i){
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5106
diff changeset
7902 printf("mismatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7903 // return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7904 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7905 STOP_TIMER("get_ue_golomb");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7906 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7907
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7908
1524
alex
parents: 1522
diff changeset
7909 init_put_bits(&pb, temp, SIZE);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7910 printf("testing signed exp golomb\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7911 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7912 START_TIMER
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7913 set_se_golomb(&pb, i - COUNT/2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7914 STOP_TIMER("set_se_golomb");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7915 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7916 flush_put_bits(&pb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7917
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7918 init_get_bits(&gb, temp, 8*SIZE);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7919 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7920 int j, s;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7921
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7922 s= show_bits(&gb, 24);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7923
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7924 START_TIMER
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7925 j= get_se_golomb(&gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7926 if(j != i - COUNT/2){
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5106
diff changeset
7927 printf("mismatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7928 // return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7929 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7930 STOP_TIMER("get_se_golomb");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7931 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7932
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7933 printf("testing 4x4 (I)DCT\n");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7934
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7935 DCTELEM block[16];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7936 uint8_t src[16], ref[16];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7937 uint64_t error= 0, max_error=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7938
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7939 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7940 int j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7941 // printf("%d %d %d\n", r1, r2, (r2-r1)*16);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7942 for(j=0; j<16; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7943 ref[j]= random()%255;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7944 src[j]= random()%255;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7945 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7946
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7947 h264_diff_dct_c(block, src, ref, 4);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7948
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7949 //normalize
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7950 for(j=0; j<16; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7951 // printf("%d ", block[j]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7952 block[j]= block[j]*4;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7953 if(j&1) block[j]= (block[j]*4 + 2)/5;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7954 if(j&4) block[j]= (block[j]*4 + 2)/5;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7955 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7956 // printf("\n");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7957
2272
cd43603c46f9 move h264 idct to its own file and call via function pointer in DspContext
michael
parents: 2255
diff changeset
7958 s->dsp.h264_idct_add(ref, block, 4);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7959 /* for(j=0; j<16; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7960 printf("%d ", ref[j]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7961 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7962 printf("\n");*/
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7963
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7964 for(j=0; j<16; j++){
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
7965 int diff= FFABS(src[j] - ref[j]);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7966
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7967 error+= diff*diff;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7968 max_error= FFMAX(max_error, diff);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7969 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7970 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7971 printf("error=%f max_error=%d\n", ((float)error)/COUNT/16, (int)max_error );
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7972 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7973 printf("testing quantizer\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7974 for(qp=0; qp<52; qp++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7975 for(i=0; i<16; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7976 src1_block[i]= src2_block[i]= random()%255;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7977
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7978 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7979 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7980 printf("Testing NAL layer\n");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7981
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7982 uint8_t bitstream[COUNT];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7983 uint8_t nal[COUNT*2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7984 H264Context h;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7985 memset(&h, 0, sizeof(H264Context));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7986
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7987 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7988 int zeros= i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7989 int nal_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7990 int consumed;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7991 int out_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7992 uint8_t *out;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7993 int j;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7994
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7995 for(j=0; j<COUNT; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7996 bitstream[j]= (random() % 255) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7997 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7998
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7999 for(j=0; j<zeros; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8000 int pos= random() % COUNT;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8001 while(bitstream[pos] == 0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8002 pos++;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8003 pos %= COUNT;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8004 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8005 bitstream[pos]=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8006 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8007
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8008 START_TIMER
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8009
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8010 nal_length= encode_nal(&h, nal, bitstream, COUNT, COUNT*2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8011 if(nal_length<0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8012 printf("encoding failed\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8013 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8014 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8015
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8016 out= decode_nal(&h, nal, &out_length, &consumed, nal_length);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8017
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8018 STOP_TIMER("NAL")
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8019
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8020 if(out_length != COUNT){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8021 printf("incorrect length %d %d\n", out_length, COUNT);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8022 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8023 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8024
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8025 if(consumed != nal_length){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8026 printf("incorrect consumed length %d %d\n", nal_length, consumed);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8027 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8028 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8029
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8030 if(memcmp(bitstream, out, COUNT)){
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5106
diff changeset
8031 printf("mismatch\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8032 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8033 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8034 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8035
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8036 printf("Testing RBSP\n");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8037
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8038
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8039 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8040 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8041 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8042
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8043
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8044 static int decode_end(AVCodecContext *avctx)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8045 {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8046 H264Context *h = avctx->priv_data;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8047 MpegEncContext *s = &h->s;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8048
5174
2e038003cdfb Do not reuse the rbsp de-escape buffer if both
benoit
parents: 5172
diff changeset
8049 av_freep(&h->rbsp_buffer[0]);
2e038003cdfb Do not reuse the rbsp de-escape buffer if both
benoit
parents: 5172
diff changeset
8050 av_freep(&h->rbsp_buffer[1]);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8051 free_tables(h); //FIXME cleanup init stuff perhaps
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8052 MPV_common_end(s);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8053
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8054 // memset(h, 0, sizeof(H264Context));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8055
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8056 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8057 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8058
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8059
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8060 AVCodec h264_decoder = {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8061 "h264",
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8062 CODEC_TYPE_VIDEO,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8063 CODEC_ID_H264,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8064 sizeof(H264Context),
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8065 decode_init,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8066 NULL,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8067 decode_end,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8068 decode_frame,
2453
f67b63ed036d avoid buf_size == 0 checks in every decoder
michael
parents: 2449
diff changeset
8069 /*CODEC_CAP_DRAW_HORIZ_BAND |*/ CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY,
2640
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
8070 .flush= flush_dpb,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8071 };
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8072
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
8073 #include "svq3.c"