annotate h264.c @ 5642:d2598034f2a9 libavcodec

Add slice-based parallel H.264 decoding Patch by Andreas ªÓman % andreas A olebyn P nu % NB: depends on having a thread library activated at config time, and on having a source encoded with multiple slices Original threads: date: May 18, 2007 11:00 PM subject: [FFmpeg-devel] Parallelized h264 proof-of-concept date: Jun 15, 2007 10:10 PM subject: [FFmpeg-devel] [PATCH] h264 parallelized, (was: Parallelized h264 proof-of-concept) date: Jun 25, 2007 7:02 PM subject: Re: [FFmpeg-devel] [PATCH] h264 parallelized
author gpoirier
date Wed, 05 Sep 2007 16:18:15 +0000
parents 4a26dc4ca11d
children bf02fa211648
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
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
41 static VLC coeff_token_vlc[4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
42 static VLC chroma_dc_coeff_token_vlc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
43
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
44 static VLC total_zeros_vlc[15];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
45 static VLC chroma_dc_total_zeros_vlc[3];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
46
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
47 static VLC run_vlc[6];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
48 static VLC run7_vlc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
49
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
50 static void svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
51 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
52 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
53 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
54
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4277
diff changeset
55 static av_always_inline uint32_t pack16to32(int a, int b){
1269
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
56 #ifdef WORDS_BIGENDIAN
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
57 return (b&0xFFFF) + (a<<16);
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
58 #else
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
59 return (a&0xFFFF) + (b<<16);
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
60 #endif
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
61 }
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
62
4277
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
63 const uint8_t ff_rem6[52]={
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
64 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
65 };
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
66
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
67 const uint8_t ff_div6[52]={
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
68 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
69 };
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
70
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
71
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
72 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
73 * fill a rectangle.
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
74 * @param h height of the rectangle, should be a constant
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
75 * @param w width of the rectangle, should be a constant
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
76 * @param size the size of val (1 or 4), should be a constant
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
77 */
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4277
diff changeset
78 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
79 uint8_t *p= (uint8_t*)vp;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
80 assert(size==1 || size==4);
3315
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
81 assert(w<=4);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
82
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
83 w *= size;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
84 stride *= size;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
85
2962
fde28cb7e3d5 use PRIxN, %zd, %td formats where needed
mru
parents: 2960
diff changeset
86 assert((((long)vp)&(FFMIN(w, STRIDE_ALIGN)-1)) == 0);
2669
a4e3a37ed57b some asserts()
michael
parents: 2650
diff changeset
87 assert((stride&(w-1))==0);
3315
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
88 if(w==2){
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
89 const uint16_t v= size==4 ? val : val*0x0101;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
90 *(uint16_t*)(p + 0*stride)= v;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
91 if(h==1) return;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
92 *(uint16_t*)(p + 1*stride)= v;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
93 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
94 *(uint16_t*)(p + 2*stride)= v;
3315
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
95 *(uint16_t*)(p + 3*stride)= v;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
96 }else if(w==4){
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
97 const uint32_t v= size==4 ? val : val*0x01010101;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
98 *(uint32_t*)(p + 0*stride)= v;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
99 if(h==1) return;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
100 *(uint32_t*)(p + 1*stride)= v;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
101 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
102 *(uint32_t*)(p + 2*stride)= v;
3315
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
103 *(uint32_t*)(p + 3*stride)= v;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
104 }else if(w==8){
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
105 //gcc can't optimize 64bit math on x86_32
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
106 #if defined(ARCH_X86_64) || (defined(MP_WORDSIZE) && MP_WORDSIZE >= 64)
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
107 const uint64_t v= val*0x0100000001ULL;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
108 *(uint64_t*)(p + 0*stride)= v;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
109 if(h==1) return;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
110 *(uint64_t*)(p + 1*stride)= v;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
111 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
112 *(uint64_t*)(p + 2*stride)= v;
3315
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
113 *(uint64_t*)(p + 3*stride)= v;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
114 }else if(w==16){
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
115 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
116 *(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
117 *(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
118 *(uint64_t*)(p + 0+1*stride)= v;
3315
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
119 *(uint64_t*)(p + 8+1*stride)= v;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
120 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
121 *(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
122 *(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
123 *(uint64_t*)(p + 0+3*stride)= v;
3315
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
124 *(uint64_t*)(p + 8+3*stride)= v;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
125 #else
5545
397cb90b66d0 Statements like a = b = c = d = e; store from right-to-left, so if
gpoirier
parents: 5528
diff changeset
126 *(uint32_t*)(p + 0+0*stride)= val;
3315
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
127 *(uint32_t*)(p + 4+0*stride)= val;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
128 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
129 *(uint32_t*)(p + 0+1*stride)= val;
3315
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
130 *(uint32_t*)(p + 4+1*stride)= val;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
131 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
132 *(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
133 *(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
134 *(uint32_t*)(p + 0+3*stride)= val;
3315
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
135 *(uint32_t*)(p + 4+3*stride)= val;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
136 }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
137 *(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
138 *(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
139 *(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
140 *(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
141 *(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
142 *(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
143 *(uint32_t*)(p + 8+1*stride)= val;
3315
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
144 *(uint32_t*)(p +12+1*stride)= val;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
145 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
146 *(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
147 *(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
148 *(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
149 *(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
150 *(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
151 *(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
152 *(uint32_t*)(p + 8+3*stride)= val;
3315
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
153 *(uint32_t*)(p +12+3*stride)= val;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
154 #endif
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
155 }else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
156 assert(0);
3315
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
157 assert(h==4);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
158 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
159
3028
1fadd4c26175 tweak inlines.
lorenm
parents: 3005
diff changeset
160 static void fill_caches(H264Context *h, int mb_type, int for_deblock){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
161 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
162 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
163 int topleft_xy, top_xy, topright_xy, left_xy[2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
164 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
165 int left_block[8];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
166 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
167
3482
c08b46172204 slightly faster h264 fill_caches()
lorenm
parents: 3455
diff changeset
168 //FIXME deblocking could skip the intra and nnz parts.
c08b46172204 slightly faster h264 fill_caches()
lorenm
parents: 3455
diff changeset
169 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
170 return;
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
171
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
172 //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
173
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
174 top_xy = mb_xy - s->mb_stride;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
175 topleft_xy = top_xy - 1;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
176 topright_xy= top_xy + 1;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
177 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
178 left_block[0]= 0;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
179 left_block[1]= 1;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
180 left_block[2]= 2;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
181 left_block[3]= 3;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
182 left_block[4]= 7;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
183 left_block[5]= 10;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
184 left_block[6]= 8;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
185 left_block[7]= 11;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
186 if(FRAME_MBAFF){
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
187 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
188 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
189 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
190 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
191 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
192 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
193 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
194 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
195 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
196 const int bottom = (s->mb_y & 1);
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
197 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
198 if (bottom
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
199 ? !curr_mb_frame_flag // bottom macroblock
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
200 : (!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
201 ) {
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
202 top_xy -= s->mb_stride;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
203 }
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 && !topleft_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 topleft_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 && !topright_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 topright_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 (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
217 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
218 if (curr_mb_frame_flag) {
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
219 if (bottom) {
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
220 left_block[0]= 2;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
221 left_block[1]= 2;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
222 left_block[2]= 3;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
223 left_block[3]= 3;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
224 left_block[4]= 8;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
225 left_block[5]= 11;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
226 left_block[6]= 8;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
227 left_block[7]= 11;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
228 } else {
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
229 left_block[0]= 0;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
230 left_block[1]= 0;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
231 left_block[2]= 1;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
232 left_block[3]= 1;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
233 left_block[4]= 7;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
234 left_block[5]= 10;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
235 left_block[6]= 7;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
236 left_block[7]= 10;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
237 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
238 } else {
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
239 left_xy[1] += s->mb_stride;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
240 //left_block[0]= 0;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
241 left_block[1]= 2;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
242 left_block[2]= 0;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
243 left_block[3]= 2;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
244 //left_block[4]= 7;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
245 left_block[5]= 10;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
246 left_block[6]= 7;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
247 left_block[7]= 10;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
248 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
249 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
250 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
251
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
252 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
253 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
254 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
255 if(for_deblock){
3482
c08b46172204 slightly faster h264 fill_caches()
lorenm
parents: 3455
diff changeset
256 topleft_type = 0;
c08b46172204 slightly faster h264 fill_caches()
lorenm
parents: 3455
diff changeset
257 topright_type = 0;
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
258 top_type = h->slice_table[top_xy ] < 255 ? s->current_picture.mb_type[top_xy] : 0;
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
259 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
260 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
261
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
262 if(FRAME_MBAFF && !IS_INTRA(mb_type)){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
263 int list;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
264 int v = *(uint16_t*)&h->non_zero_count[mb_xy][14];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
265 for(i=0; i<16; i++)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
266 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
267 for(list=0; list<h->list_count; list++){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
268 if(USES_LIST(mb_type,list)){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
269 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
270 uint32_t *dst = (uint32_t*)h->mv_cache[list][scan8[0]];
3776
1843a85123b7 fix some signedness warnings
mru
parents: 3651
diff changeset
271 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
272 for(i=0; i<4; i++, dst+=8, src+=h->b_stride){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
273 dst[0] = src[0];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
274 dst[1] = src[1];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
275 dst[2] = src[2];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
276 dst[3] = src[3];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
277 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
278 *(uint32_t*)&h->ref_cache[list][scan8[ 0]] =
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
279 *(uint32_t*)&h->ref_cache[list][scan8[ 2]] = pack16to32(ref[0],ref[1])*0x0101;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
280 ref += h->b8_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
281 *(uint32_t*)&h->ref_cache[list][scan8[ 8]] =
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
282 *(uint32_t*)&h->ref_cache[list][scan8[10]] = pack16to32(ref[0],ref[1])*0x0101;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
283 }else{
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
284 fill_rectangle(&h-> mv_cache[list][scan8[ 0]], 4, 4, 8, 0, 4);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
285 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
286 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
287 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
288 }
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
289 }else{
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
290 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
291 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
292 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
293 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
294 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
295 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
296
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
297 if(IS_INTRA(mb_type)){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
298 h->topleft_samples_available=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
299 h->top_samples_available=
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
300 h->left_samples_available= 0xFFFF;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
301 h->topright_samples_available= 0xEEEA;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
302
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
303 if(!IS_INTRA(top_type) && (top_type==0 || h->pps.constrained_intra_pred)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
304 h->topleft_samples_available= 0xB3FF;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
305 h->top_samples_available= 0x33FF;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
306 h->topright_samples_available= 0x26EA;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
307 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
308 for(i=0; i<2; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
309 if(!IS_INTRA(left_type[i]) && (left_type[i]==0 || h->pps.constrained_intra_pred)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
310 h->topleft_samples_available&= 0xDF5F;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
311 h->left_samples_available&= 0x5F5F;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
312 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
313 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
314
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
315 if(!IS_INTRA(topleft_type) && (topleft_type==0 || h->pps.constrained_intra_pred))
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
316 h->topleft_samples_available&= 0x7FFF;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
317
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
318 if(!IS_INTRA(topright_type) && (topright_type==0 || h->pps.constrained_intra_pred))
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
319 h->topright_samples_available&= 0xFBFF;
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_INTRA4x4(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
322 if(IS_INTRA4x4(top_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
323 h->intra4x4_pred_mode_cache[4+8*0]= h->intra4x4_pred_mode[top_xy][4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
324 h->intra4x4_pred_mode_cache[5+8*0]= h->intra4x4_pred_mode[top_xy][5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
325 h->intra4x4_pred_mode_cache[6+8*0]= h->intra4x4_pred_mode[top_xy][6];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
326 h->intra4x4_pred_mode_cache[7+8*0]= h->intra4x4_pred_mode[top_xy][3];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
327 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
328 int pred;
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
329 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
330 pred= -1;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
331 else{
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
332 pred= 2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
333 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
334 h->intra4x4_pred_mode_cache[4+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
335 h->intra4x4_pred_mode_cache[5+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
336 h->intra4x4_pred_mode_cache[6+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
337 h->intra4x4_pred_mode_cache[7+8*0]= pred;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
338 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
339 for(i=0; i<2; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
340 if(IS_INTRA4x4(left_type[i])){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
341 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
342 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
343 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
344 int pred;
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
345 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
346 pred= -1;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
347 else{
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
348 pred= 2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
349 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
350 h->intra4x4_pred_mode_cache[3+8*1 + 2*8*i]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
351 h->intra4x4_pred_mode_cache[3+8*2 + 2*8*i]= pred;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
352 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
353 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
354 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
355 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
356
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
357
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
358 /*
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
359 0 . T T. T T T T
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
360 1 L . .L . . . .
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
361 2 L . .L . . . .
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
362 3 . T TL . . . .
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
363 4 L . .L . . . .
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
364 5 L . .. . . . .
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
365 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
366 //FIXME constraint_intra_pred & partitioning & nnz (lets hope this is just a typo in the spec)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
367 if(top_type){
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
368 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
369 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
370 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
371 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
372
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
373 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
374 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
375
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
376 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
377 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
378
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
379 }else{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
380 h->non_zero_count_cache[4+8*0]=
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
381 h->non_zero_count_cache[5+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
382 h->non_zero_count_cache[6+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
383 h->non_zero_count_cache[7+8*0]=
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
384
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
385 h->non_zero_count_cache[1+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
386 h->non_zero_count_cache[2+8*0]=
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
387
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
388 h->non_zero_count_cache[1+8*3]=
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
389 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
390
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
391 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
392
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
393 for (i=0; i<2; i++) {
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
394 if(left_type[i]){
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
395 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
396 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
397 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
398 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
399 }else{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
400 h->non_zero_count_cache[3+8*1 + 2*8*i]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
401 h->non_zero_count_cache[3+8*2 + 2*8*i]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
402 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
403 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
404 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
405 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
406
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
407 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
408 // top_cbp
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
409 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
410 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
411 } 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
412 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
413 } else {
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
414 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
415 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
416 // left_cbp
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
417 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
418 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
419 } 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
420 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
421 } else {
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
422 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
423 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
424 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
425 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
426 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
427 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
428 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
429 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
430 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
431
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
432 #if 1
2623
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
433 if(IS_INTER(mb_type) || IS_DIRECT(mb_type)){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
434 int list;
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
435 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
436 if(!USES_LIST(mb_type, list) && !IS_DIRECT(mb_type) && !h->deblocking_filter){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
437 /*if(!h->mv_cache_clean[list]){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
438 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
439 memset(h->ref_cache[list], PART_NOT_AVAILABLE, 8*5*sizeof(int8_t));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
440 h->mv_cache_clean[list]= 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
441 }*/
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
442 continue;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
443 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
444 h->mv_cache_clean[list]= 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
445
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
446 if(USES_LIST(top_type, list)){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
447 const int b_xy= h->mb2b_xy[top_xy] + 3*h->b_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
448 const int b8_xy= h->mb2b8_xy[top_xy] + h->b8_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
449 *(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
450 *(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
451 *(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
452 *(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
453 h->ref_cache[list][scan8[0] + 0 - 1*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
454 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
455 h->ref_cache[list][scan8[0] + 2 - 1*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
456 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
457 }else{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
458 *(uint32_t*)h->mv_cache [list][scan8[0] + 0 - 1*8]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
459 *(uint32_t*)h->mv_cache [list][scan8[0] + 1 - 1*8]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
460 *(uint32_t*)h->mv_cache [list][scan8[0] + 2 - 1*8]=
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
461 *(uint32_t*)h->mv_cache [list][scan8[0] + 3 - 1*8]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
462 *(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
463 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
464
4546
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
465 for(i=0; i<2; i++){
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
466 int cache_idx = scan8[0] - 1 + i*2*8;
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
467 if(USES_LIST(left_type[i], list)){
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
468 const int b_xy= h->mb2b_xy[left_xy[i]] + 3;
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
469 const int b8_xy= h->mb2b8_xy[left_xy[i]] + 1;
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
470 *(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
471 *(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
472 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
473 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
474 }else{
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
475 *(uint32_t*)h->mv_cache [list][cache_idx ]=
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
476 *(uint32_t*)h->mv_cache [list][cache_idx+8]= 0;
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
477 h->ref_cache[list][cache_idx ]=
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
478 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
479 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
480 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
481
3519
5ef29058581e 10l in r5768 (broke mbaff)
lorenm
parents: 3482
diff changeset
482 if((for_deblock || (IS_DIRECT(mb_type) && !h->direct_spatial_mv_pred)) && !FRAME_MBAFF)
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
483 continue;
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
484
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
485 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
486 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
487 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
488 *(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
489 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
490 }else{
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
491 *(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
492 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
493 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
494
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
495 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
496 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
497 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
498 *(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
499 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
500 }else{
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
501 *(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
502 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
503 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
504
3519
5ef29058581e 10l in r5768 (broke mbaff)
lorenm
parents: 3482
diff changeset
505 if((IS_SKIP(mb_type) || IS_DIRECT(mb_type)) && !FRAME_MBAFF)
3482
c08b46172204 slightly faster h264 fill_caches()
lorenm
parents: 3455
diff changeset
506 continue;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
507
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
508 h->ref_cache[list][scan8[5 ]+1] =
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
509 h->ref_cache[list][scan8[7 ]+1] =
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
510 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
511 h->ref_cache[list][scan8[4 ]] =
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
512 h->ref_cache[list][scan8[12]] = PART_NOT_AVAILABLE;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
513 *(uint32_t*)h->mv_cache [list][scan8[5 ]+1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
514 *(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
515 *(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
516 *(uint32_t*)h->mv_cache [list][scan8[4 ]]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
517 *(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
518
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
519 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
520 /* XXX beurk, Load mvd */
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
521 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
522 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
523 *(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
524 *(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
525 *(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
526 *(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
527 }else{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
528 *(uint32_t*)h->mvd_cache [list][scan8[0] + 0 - 1*8]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
529 *(uint32_t*)h->mvd_cache [list][scan8[0] + 1 - 1*8]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
530 *(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
531 *(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
532 }
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
533 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
534 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
535 *(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
536 *(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
537 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
538 *(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
539 *(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
540 }
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
541 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
542 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
543 *(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
544 *(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
545 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
546 *(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
547 *(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
548 }
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[5 ]+1]=
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[7 ]+1]=
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
551 *(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
552 *(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
553 *(uint32_t*)h->mvd_cache [list][scan8[12]]= 0;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
554
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
555 if(h->slice_type == B_TYPE){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
556 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
557
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
558 if(IS_DIRECT(top_type)){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
559 *(uint32_t*)&h->direct_cache[scan8[0] - 1*8]= 0x01010101;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
560 }else if(IS_8X8(top_type)){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
561 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
562 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
563 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
564 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
565 *(uint32_t*)&h->direct_cache[scan8[0] - 1*8]= 0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
566 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
567
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
568 if(IS_DIRECT(left_type[0]))
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
569 h->direct_cache[scan8[0] - 1 + 0*8]= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
570 else if(IS_8X8(left_type[0]))
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
571 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
572 else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
573 h->direct_cache[scan8[0] - 1 + 0*8]= 0;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
574
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
575 if(IS_DIRECT(left_type[1]))
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
576 h->direct_cache[scan8[0] - 1 + 2*8]= 1;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
577 else if(IS_8X8(left_type[1]))
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
578 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
579 else
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
580 h->direct_cache[scan8[0] - 1 + 2*8]= 0;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
581 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
582 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
583
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
584 if(FRAME_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
585 #define MAP_MVS\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
586 MAP_F2F(scan8[0] - 1 - 1*8, topleft_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
587 MAP_F2F(scan8[0] + 0 - 1*8, top_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
588 MAP_F2F(scan8[0] + 1 - 1*8, top_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
589 MAP_F2F(scan8[0] + 2 - 1*8, top_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
590 MAP_F2F(scan8[0] + 3 - 1*8, top_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
591 MAP_F2F(scan8[0] + 4 - 1*8, topright_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
592 MAP_F2F(scan8[0] - 1 + 0*8, left_type[0])\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
593 MAP_F2F(scan8[0] - 1 + 1*8, left_type[0])\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
594 MAP_F2F(scan8[0] - 1 + 2*8, left_type[1])\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
595 MAP_F2F(scan8[0] - 1 + 3*8, left_type[1])
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
596 if(MB_FIELD){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
597 #define MAP_F2F(idx, mb_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
598 if(!IS_INTERLACED(mb_type) && h->ref_cache[list][idx] >= 0){\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
599 h->ref_cache[list][idx] <<= 1;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
600 h->mv_cache[list][idx][1] /= 2;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
601 h->mvd_cache[list][idx][1] /= 2;\
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
602 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
603 MAP_MVS
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
604 #undef MAP_F2F
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
605 }else{
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
606 #define MAP_F2F(idx, mb_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
607 if(IS_INTERLACED(mb_type) && h->ref_cache[list][idx] >= 0){\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
608 h->ref_cache[list][idx] >>= 1;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
609 h->mv_cache[list][idx][1] <<= 1;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
610 h->mvd_cache[list][idx][1] <<= 1;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
611 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
612 MAP_MVS
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
613 #undef MAP_F2F
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
614 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
615 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
616 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
617 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
618 #endif
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
619
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
620 h->neighbor_transform_size= !!IS_8x8DCT(top_type) + !!IS_8x8DCT(left_type[0]);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
621 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
622
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
623 static inline void write_back_intra_pred_mode(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
624 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
625 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
626
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
627 h->intra4x4_pred_mode[mb_xy][0]= h->intra4x4_pred_mode_cache[7+8*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
628 h->intra4x4_pred_mode[mb_xy][1]= h->intra4x4_pred_mode_cache[7+8*2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
629 h->intra4x4_pred_mode[mb_xy][2]= h->intra4x4_pred_mode_cache[7+8*3];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
630 h->intra4x4_pred_mode[mb_xy][3]= h->intra4x4_pred_mode_cache[7+8*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
631 h->intra4x4_pred_mode[mb_xy][4]= h->intra4x4_pred_mode_cache[4+8*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
632 h->intra4x4_pred_mode[mb_xy][5]= h->intra4x4_pred_mode_cache[5+8*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
633 h->intra4x4_pred_mode[mb_xy][6]= h->intra4x4_pred_mode_cache[6+8*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
634 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
635
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
636 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
637 * 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
638 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
639 static inline int check_intra4x4_pred_mode(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
640 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
641 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
642 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
643 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
644
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
645 if(!(h->top_samples_available&0x8000)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
646 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
647 int status= top[ h->intra4x4_pred_mode_cache[scan8[0] + i] ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
648 if(status<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
649 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
650 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
651 } else if(status){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
652 h->intra4x4_pred_mode_cache[scan8[0] + i]= status;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
653 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
654 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
655 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
656
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
657 if(!(h->left_samples_available&0x8000)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
658 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
659 int status= left[ h->intra4x4_pred_mode_cache[scan8[0] + 8*i] ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
660 if(status<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
661 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
662 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
663 } else if(status){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
664 h->intra4x4_pred_mode_cache[scan8[0] + 8*i]= status;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
665 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
666 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
667 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
668
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
669 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
670 } //FIXME cleanup like next
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 * 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
674 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
675 static inline int check_intra_pred_mode(H264Context *h, int mode){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
676 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
677 static const int8_t top [7]= {LEFT_DC_PRED8x8, 1,-1,-1};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
678 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
679
4529
a8082e1ed672 simplify
michael
parents: 4507
diff changeset
680 if(mode > 6U) {
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
681 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
682 return -1;
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
683 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
684
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
685 if(!(h->top_samples_available&0x8000)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
686 mode= top[ mode ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
687 if(mode<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
688 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
689 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
690 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
691 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
692
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
693 if(!(h->left_samples_available&0x8000)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
694 mode= left[ mode ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
695 if(mode<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
696 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
697 return -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
698 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
699 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
700
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
701 return mode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
702 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
703
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
704 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
705 * gets the predicted intra4x4 prediction mode.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
706 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
707 static inline int pred_intra_mode(H264Context *h, int n){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
708 const int index8= scan8[n];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
709 const int left= h->intra4x4_pred_mode_cache[index8 - 1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
710 const int top = h->intra4x4_pred_mode_cache[index8 - 8];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
711 const int min= FFMIN(left, top);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
712
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
713 tprintf(h->s.avctx, "mode:%d %d min:%d\n", left ,top, min);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
714
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
715 if(min<0) return DC_PRED;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
716 else return min;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
717 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
718
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
719 static inline void write_back_non_zero_count(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
720 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
721 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
722
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
723 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
724 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
725 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
726 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
727 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
728 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
729 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
730
2551
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][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
732 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
733 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
734
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][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
736 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
737 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
738
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
739 if(FRAME_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
740 // store all luma nnzs, for deblocking
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
741 int v = 0, i;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
742 for(i=0; i<16; i++)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
743 v += (!!h->non_zero_count_cache[scan8[i]]) << i;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
744 *(uint16_t*)&h->non_zero_count[mb_xy][14] = v;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
745 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
746 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
747
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
748 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
749 * gets the predicted number of non zero coefficients.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
750 * @param n block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
751 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
752 static inline int pred_non_zero_count(H264Context *h, int n){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
753 const int index8= scan8[n];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
754 const int left= h->non_zero_count_cache[index8 - 1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
755 const int top = h->non_zero_count_cache[index8 - 8];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
756 int i= left + top;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
757
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
758 if(i<64) i= (i+1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
759
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
760 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
761
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
762 return i&31;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
763 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
764
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
765 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
766 const int topright_ref= h->ref_cache[list][ i - 8 + part_width ];
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
767 MpegEncContext *s = &h->s;
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
768
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
769 /* there is no consistent mapping of mvs to neighboring locations that will
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
770 * make mbaff happy, so we can't move all this logic to fill_caches */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
771 if(FRAME_MBAFF){
3776
1843a85123b7 fix some signedness warnings
mru
parents: 3651
diff changeset
772 const uint32_t *mb_types = s->current_picture_ptr->mb_type;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
773 const int16_t *mv;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
774 *(uint32_t*)h->mv_cache[list][scan8[0]-2] = 0;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
775 *C = h->mv_cache[list][scan8[0]-2];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
776
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
777 if(!MB_FIELD
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
778 && (s->mb_y&1) && i < scan8[0]+8 && topright_ref != PART_NOT_AVAILABLE){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
779 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
780 if(IS_INTERLACED(mb_types[topright_xy])){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
781 #define SET_DIAG_MV(MV_OP, REF_OP, X4, Y4)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
782 const int x4 = X4, y4 = Y4;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
783 const int mb_type = mb_types[(x4>>2)+(y4>>2)*s->mb_stride];\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
784 if(!USES_LIST(mb_type,list) && !IS_8X8(mb_type))\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
785 return LIST_NOT_USED;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
786 mv = s->current_picture_ptr->motion_val[list][x4 + y4*h->b_stride];\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
787 h->mv_cache[list][scan8[0]-2][0] = mv[0];\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
788 h->mv_cache[list][scan8[0]-2][1] = mv[1] MV_OP;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
789 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
790
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
791 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
792 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
793 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
794 if(topright_ref == PART_NOT_AVAILABLE
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
795 && ((s->mb_y&1) || i >= scan8[0]+8) && (i&7)==4
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
796 && h->ref_cache[list][scan8[0]-1] != PART_NOT_AVAILABLE){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
797 if(!MB_FIELD
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
798 && IS_INTERLACED(mb_types[h->left_mb_xy[0]])){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
799 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
800 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
801 if(MB_FIELD
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
802 && !IS_INTERLACED(mb_types[h->left_mb_xy[0]])
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
803 && i >= scan8[0]+8){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
804 // leftshift will turn LIST_NOT_USED into PART_NOT_AVAILABLE, but that's ok.
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
805 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
806 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
807 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
808 #undef SET_DIAG_MV
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
809 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
810
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
811 if(topright_ref != PART_NOT_AVAILABLE){
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
812 *C= h->mv_cache[list][ i - 8 + part_width ];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
813 return topright_ref;
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
814 }else{
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
815 tprintf(s->avctx, "topright MV not available\n");
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
816
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
817 *C= h->mv_cache[list][ i - 8 - 1 ];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
818 return h->ref_cache[list][ i - 8 - 1 ];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
819 }
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
820 }
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
821
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
822 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
823 * gets the predicted MV.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
824 * @param n the block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
825 * @param part_width the width of the partition (4, 8,16) -> (1, 2, 4)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
826 * @param mx the x component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
827 * @param my the y component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
828 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
829 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
830 const int index8= scan8[n];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
831 const int top_ref= h->ref_cache[list][ index8 - 8 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
832 const int left_ref= h->ref_cache[list][ index8 - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
833 const int16_t * const A= h->mv_cache[list][ index8 - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
834 const int16_t * const B= h->mv_cache[list][ index8 - 8 ];
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
835 const int16_t * C;
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
836 int diagonal_ref, match_count;
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
837
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
838 assert(part_width==1 || part_width==2 || part_width==4);
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
839
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
840 /* mv_cache
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
841 B . . A T T T T
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
842 U . . L . . , .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
843 U . . L . . . .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
844 U . . L . . , .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
845 . . . L . . . .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
846 */
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
847
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
848 diagonal_ref= fetch_diagonal_mv(h, &C, index8, list, part_width);
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
849 match_count= (diagonal_ref==ref) + (top_ref==ref) + (left_ref==ref);
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
850 tprintf(h->s.avctx, "pred_motion match_count=%d\n", match_count);
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
851 if(match_count > 1){ //most common
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
852 *mx= mid_pred(A[0], B[0], C[0]);
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
853 *my= mid_pred(A[1], B[1], C[1]);
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
854 }else if(match_count==1){
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
855 if(left_ref==ref){
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
856 *mx= A[0];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
857 *my= A[1];
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
858 }else if(top_ref==ref){
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
859 *mx= B[0];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
860 *my= B[1];
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
861 }else{
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
862 *mx= C[0];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
863 *my= C[1];
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
864 }
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
865 }else{
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
866 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
867 *mx= A[0];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
868 *my= A[1];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
869 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
870 *mx= mid_pred(A[0], B[0], C[0]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
871 *my= mid_pred(A[1], B[1], C[1]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
872 }
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
873 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
874
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
875 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
876 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
877
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
878 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
879 * gets the directionally predicted 16x8 MV.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
880 * @param n the block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
881 * @param mx the x component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
882 * @param my the y component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
883 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
884 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
885 if(n==0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
886 const int top_ref= h->ref_cache[list][ scan8[0] - 8 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
887 const int16_t * const B= h->mv_cache[list][ scan8[0] - 8 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
888
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
889 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
890
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
891 if(top_ref == ref){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
892 *mx= B[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
893 *my= B[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
894 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
895 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
896 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
897 const int left_ref= h->ref_cache[list][ scan8[8] - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
898 const int16_t * const A= h->mv_cache[list][ scan8[8] - 1 ];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
899
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
900 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
901
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
902 if(left_ref == ref){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
903 *mx= A[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
904 *my= A[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
905 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
906 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
907 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
908
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
909 //RARE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
910 pred_motion(h, n, 4, list, ref, mx, my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
911 }
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 * gets the directionally predicted 8x16 MV.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
915 * @param n the block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
916 * @param mx the x component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
917 * @param my the y component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
918 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
919 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
920 if(n==0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
921 const int left_ref= h->ref_cache[list][ scan8[0] - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
922 const int16_t * const A= h->mv_cache[list][ scan8[0] - 1 ];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
923
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
924 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
925
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
926 if(left_ref == ref){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
927 *mx= A[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
928 *my= A[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
929 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
930 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
931 }else{
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
932 const int16_t * C;
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
933 int diagonal_ref;
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
934
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
935 diagonal_ref= fetch_diagonal_mv(h, &C, scan8[4], list, 2);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
936
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
937 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
938
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
939 if(diagonal_ref == ref){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
940 *mx= C[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
941 *my= C[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
942 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
943 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
944 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
945
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
946 //RARE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
947 pred_motion(h, n, 2, list, ref, mx, my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
948 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
949
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
950 static inline void pred_pskip_motion(H264Context * const h, int * const mx, int * const my){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
951 const int top_ref = h->ref_cache[0][ scan8[0] - 8 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
952 const int left_ref= h->ref_cache[0][ scan8[0] - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
953
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
954 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
955
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
956 if(top_ref == PART_NOT_AVAILABLE || left_ref == PART_NOT_AVAILABLE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
957 || (top_ref == 0 && *(uint32_t*)h->mv_cache[0][ scan8[0] - 8 ] == 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
958 || (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
959
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
960 *mx = *my = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
961 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
962 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
963
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
964 pred_motion(h, 0, 4, 0, 0, mx, my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
965
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
966 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
967 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
968
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
969 static inline void direct_dist_scale_factor(H264Context * const h){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
970 const int poc = h->s.current_picture_ptr->poc;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
971 const int poc1 = h->ref_list[1][0].poc;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
972 int i;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
973 for(i=0; i<h->ref_count[0]; i++){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
974 int poc0 = h->ref_list[0][i].poc;
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
975 int td = av_clip(poc1 - poc0, -128, 127);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
976 if(td == 0 /* FIXME || pic0 is a long-term ref */){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
977 h->dist_scale_factor[i] = 256;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
978 }else{
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
979 int tb = av_clip(poc - poc0, -128, 127);
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
980 int tx = (16384 + (FFABS(td) >> 1)) / td;
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
981 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
982 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
983 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
984 if(FRAME_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
985 for(i=0; i<h->ref_count[0]; i++){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
986 h->dist_scale_factor_field[2*i] =
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
987 h->dist_scale_factor_field[2*i+1] = h->dist_scale_factor[i];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
988 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
989 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
990 }
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
991 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
992 MpegEncContext * const s = &h->s;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
993 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
994 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
995 int list, i, j;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
996 if(cur->pict_type == I_TYPE)
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
997 cur->ref_count[0] = 0;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
998 if(cur->pict_type != B_TYPE)
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
999 cur->ref_count[1] = 0;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1000 for(list=0; list<2; list++){
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1001 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
1002 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
1003 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
1004 }
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1005 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
1006 return;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1007 for(list=0; list<2; list++){
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1008 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
1009 const int poc = ref1->ref_poc[list][i];
3125
16f9d33c027d fix some crashes when missing frames
lorenm
parents: 3105
diff changeset
1010 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
1011 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
1012 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
1013 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
1014 break;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1015 }
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1016 }
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1017 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1018 if(FRAME_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1019 for(list=0; list<2; list++){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1020 for(i=0; i<ref1->ref_count[list]; i++){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1021 j = h->map_col_to_list0[list][i];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1022 h->map_col_to_list0_field[list][2*i] = 2*j;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1023 h->map_col_to_list0_field[list][2*i+1] = 2*j+1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1024 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1025 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1026 }
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1027 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1028
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1029 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
1030 MpegEncContext * const s = &h->s;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1031 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
1032 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
1033 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
1034 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
1035 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
1036 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
1037 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
1038 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
1039 const int is_b8x8 = IS_8X8(*mb_type);
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
1040 unsigned int sub_mb_type;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1041 int i8, i4;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1042
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1043 #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
1044 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
1045 /* 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
1046 * so we know exactly what block size to use */
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1047 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
1048 *mb_type = MB_TYPE_8x8|MB_TYPE_L0L1;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1049 }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
1050 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
1051 *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
1052 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1053 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
1054 *mb_type = MB_TYPE_8x8|MB_TYPE_L0L1;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1055 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1056 if(!is_b8x8)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1057 *mb_type |= MB_TYPE_DIRECT2;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1058 if(MB_FIELD)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1059 *mb_type |= MB_TYPE_INTERLACED;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1060
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
1061 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
1062
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1063 if(h->direct_spatial_mv_pred){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1064 int ref[2];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1065 int mv[2][2];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1066 int list;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1067
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1068 /* FIXME interlacing + spatial direct uses wrong colocated block positions */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1069
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1070 /* ref = min(neighbors) */
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1071 for(list=0; list<2; list++){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1072 int refa = h->ref_cache[list][scan8[0] - 1];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1073 int refb = h->ref_cache[list][scan8[0] - 8];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1074 int refc = h->ref_cache[list][scan8[0] - 8 + 4];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1075 if(refc == -2)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1076 refc = h->ref_cache[list][scan8[0] - 8 - 1];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1077 ref[list] = refa;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1078 if(ref[list] < 0 || (refb < ref[list] && refb >= 0))
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1079 ref[list] = refb;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1080 if(ref[list] < 0 || (refc < ref[list] && refc >= 0))
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1081 ref[list] = refc;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1082 if(ref[list] < 0)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1083 ref[list] = -1;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1084 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1085
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1086 if(ref[0] < 0 && ref[1] < 0){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1087 ref[0] = ref[1] = 0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1088 mv[0][0] = mv[0][1] =
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1089 mv[1][0] = mv[1][1] = 0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1090 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1091 for(list=0; list<2; list++){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1092 if(ref[list] >= 0)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1093 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
1094 else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1095 mv[list][0] = mv[list][1] = 0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1096 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1097 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1098
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1099 if(ref[1] < 0){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1100 *mb_type &= ~MB_TYPE_P0L1;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1101 sub_mb_type &= ~MB_TYPE_P0L1;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1102 }else if(ref[0] < 0){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1103 *mb_type &= ~MB_TYPE_P0L0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1104 sub_mb_type &= ~MB_TYPE_P0L0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1105 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1106
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1107 if(IS_16X16(*mb_type)){
4540
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
1108 int a=0, b=0;
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
1109
3001
b52d8ee430f6 fix some potential arithmetic overflows in pred_direct_motion() and
lorenm
parents: 2979
diff changeset
1110 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
1111 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
1112 if(!IS_INTRA(mb_type_col)
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
1113 && ( (l1ref0[0] == 0 && FFABS(l1mv0[0][0]) <= 1 && FFABS(l1mv0[0][1]) <= 1)
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
1114 || (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
1115 && (h->x264_build>33 || !h->x264_build)))){
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1116 if(ref[0] > 0)
4540
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
1117 a= pack16to32(mv[0][0],mv[0][1]);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1118 if(ref[1] > 0)
4540
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
1119 b= pack16to32(mv[1][0],mv[1][1]);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1120 }else{
4540
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
1121 a= pack16to32(mv[0][0],mv[0][1]);
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
1122 b= pack16to32(mv[1][0],mv[1][1]);
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
1123 }
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
1124 fill_rectangle(&h->mv_cache[0][scan8[0]], 4, 4, 8, a, 4);
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
1125 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
1126 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1127 for(i8=0; i8<4; i8++){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1128 const int x8 = i8&1;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1129 const int y8 = i8>>1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1130
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1131 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8]))
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1132 continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1133 h->sub_mb_type[i8] = sub_mb_type;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1134
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1135 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
1136 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
1137 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
1138 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
1139
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1140 /* col_zero_flag */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1141 if(!IS_INTRA(mb_type_col) && ( l1ref0[x8 + y8*h->b8_stride] == 0
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1142 || (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
1143 && (h->x264_build>33 || !h->x264_build)))){
2808
932ec96933f5 fixing colocated mv if colocated block is L1 predicted
michael
parents: 2803
diff changeset
1144 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
1145 if(IS_SUB_8X8(sub_mb_type)){
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1146 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
1147 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
1148 if(ref[0] == 0)
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1149 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
1150 if(ref[1] == 0)
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1151 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
1152 }
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1153 }else
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1154 for(i4=0; i4<4; i4++){
2808
932ec96933f5 fixing colocated mv if colocated block is L1 predicted
michael
parents: 2803
diff changeset
1155 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
1156 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
1157 if(ref[0] == 0)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1158 *(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
1159 if(ref[1] == 0)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1160 *(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
1161 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1162 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1163 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1164 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1165 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1166 }else{ /* direct temporal mv pred */
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1167 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
1168 const int *dist_scale_factor = h->dist_scale_factor;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1169
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1170 if(FRAME_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1171 if(IS_INTERLACED(*mb_type)){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1172 map_col_to_list0[0] = h->map_col_to_list0_field[0];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1173 map_col_to_list0[1] = h->map_col_to_list0_field[1];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1174 dist_scale_factor = h->dist_scale_factor_field;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1175 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1176 if(IS_INTERLACED(*mb_type) != IS_INTERLACED(mb_type_col)){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1177 /* FIXME assumes direct_8x8_inference == 1 */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1178 const int pair_xy = s->mb_x + (s->mb_y&~1)*s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1179 int mb_types_col[2];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1180 int y_shift;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1181
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1182 *mb_type = MB_TYPE_8x8|MB_TYPE_L0L1
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1183 | (is_b8x8 ? 0 : MB_TYPE_DIRECT2)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1184 | (*mb_type & MB_TYPE_INTERLACED);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1185 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
1186
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1187 if(IS_INTERLACED(*mb_type)){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1188 /* frame to field scaling */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1189 mb_types_col[0] = h->ref_list[1][0].mb_type[pair_xy];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1190 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
1191 if(s->mb_y&1){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1192 l1ref0 -= 2*h->b8_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1193 l1ref1 -= 2*h->b8_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1194 l1mv0 -= 4*h->b_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1195 l1mv1 -= 4*h->b_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1196 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1197 y_shift = 0;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1198
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1199 if( (mb_types_col[0] & MB_TYPE_16x16_OR_INTRA)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1200 && (mb_types_col[1] & MB_TYPE_16x16_OR_INTRA)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1201 && !is_b8x8)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1202 *mb_type |= MB_TYPE_16x8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1203 else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1204 *mb_type |= MB_TYPE_8x8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1205 }else{
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1206 /* field to frame scaling */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1207 /* col_mb_y = (mb_y&~1) + (topAbsDiffPOC < bottomAbsDiffPOC ? 0 : 1)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1208 * but in MBAFF, top and bottom POC are equal */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1209 int dy = (s->mb_y&1) ? 1 : 2;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1210 mb_types_col[0] =
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1211 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
1212 l1ref0 += dy*h->b8_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1213 l1ref1 += dy*h->b8_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1214 l1mv0 += 2*dy*h->b_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1215 l1mv1 += 2*dy*h->b_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1216 y_shift = 2;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1217
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1218 if((mb_types_col[0] & (MB_TYPE_16x16_OR_INTRA|MB_TYPE_16x8))
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1219 && !is_b8x8)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1220 *mb_type |= MB_TYPE_16x16;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1221 else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1222 *mb_type |= MB_TYPE_8x8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1223 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1224
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1225 for(i8=0; i8<4; i8++){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1226 const int x8 = i8&1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1227 const int y8 = i8>>1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1228 int ref0, scale;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1229 const int16_t (*l1mv)[2]= l1mv0;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1230
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1231 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8]))
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1232 continue;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1233 h->sub_mb_type[i8] = sub_mb_type;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1234
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1235 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, 0, 1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1236 if(IS_INTRA(mb_types_col[y8])){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1237 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, 0, 1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1238 fill_rectangle(&h-> mv_cache[0][scan8[i8*4]], 2, 2, 8, 0, 4);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1239 fill_rectangle(&h-> mv_cache[1][scan8[i8*4]], 2, 2, 8, 0, 4);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1240 continue;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1241 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1242
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1243 ref0 = l1ref0[x8 + (y8*2>>y_shift)*h->b8_stride];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1244 if(ref0 >= 0)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1245 ref0 = map_col_to_list0[0][ref0*2>>y_shift];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1246 else{
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1247 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
1248 l1mv= l1mv1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1249 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1250 scale = dist_scale_factor[ref0];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1251 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, ref0, 1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1252
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1253 {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1254 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
1255 int my_col = (mv_col[1]<<y_shift)/2;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1256 int mx = (scale * mv_col[0] + 128) >> 8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1257 int my = (scale * my_col + 128) >> 8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1258 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
1259 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
1260 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1261 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1262 return;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1263 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1264 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1265
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1266 /* one-to-one mv scaling */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1267
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1268 if(IS_16X16(*mb_type)){
4541
1c8bc533da57 factorize more calls to fill_rectangle()
michael
parents: 4540
diff changeset
1269 int ref, mv0, mv1;
1c8bc533da57 factorize more calls to fill_rectangle()
michael
parents: 4540
diff changeset
1270
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1271 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
1272 if(IS_INTRA(mb_type_col)){
4541
1c8bc533da57 factorize more calls to fill_rectangle()
michael
parents: 4540
diff changeset
1273 ref=mv0=mv1=0;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1274 }else{
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1275 const int ref0 = l1ref0[0] >= 0 ? map_col_to_list0[0][l1ref0[0]]
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1276 : map_col_to_list0[1][l1ref1[0]];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1277 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
1278 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
1279 int mv_l0[2];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1280 mv_l0[0] = (scale * mv_col[0] + 128) >> 8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1281 mv_l0[1] = (scale * mv_col[1] + 128) >> 8;
4541
1c8bc533da57 factorize more calls to fill_rectangle()
michael
parents: 4540
diff changeset
1282 ref= ref0;
1c8bc533da57 factorize more calls to fill_rectangle()
michael
parents: 4540
diff changeset
1283 mv0= pack16to32(mv_l0[0],mv_l0[1]);
1c8bc533da57 factorize more calls to fill_rectangle()
michael
parents: 4540
diff changeset
1284 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
1285 }
1c8bc533da57 factorize more calls to fill_rectangle()
michael
parents: 4540
diff changeset
1286 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
1287 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
1288 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
1289 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1290 for(i8=0; i8<4; i8++){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1291 const int x8 = i8&1;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1292 const int y8 = i8>>1;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1293 int ref0, scale;
2834
fd5d7c732c6b kill a bunch of compiler warnings
mru
parents: 2815
diff changeset
1294 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
1295
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1296 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8]))
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1297 continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1298 h->sub_mb_type[i8] = sub_mb_type;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1299 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
1300 if(IS_INTRA(mb_type_col)){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1301 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
1302 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
1303 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
1304 continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1305 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1306
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1307 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
1308 if(ref0 >= 0)
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1309 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
1310 else{
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1311 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
1312 l1mv= l1mv1;
75400dfbe117 fixing colocated mv if colocated block is L1 predicted for the temporal direct case
michael
parents: 2808
diff changeset
1313 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1314 scale = dist_scale_factor[ref0];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1315
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1316 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
1317 if(IS_SUB_8X8(sub_mb_type)){
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1318 const int16_t *mv_col = l1mv[x8*3 + y8*3*h->b_stride];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1319 int mx = (scale * mv_col[0] + 128) >> 8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1320 int my = (scale * mv_col[1] + 128) >> 8;
3002
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1321 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
1322 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
1323 }else
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1324 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
1325 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
1326 int16_t *mv_l0 = h->mv_cache[0][scan8[i8*4+i4]];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1327 mv_l0[0] = (scale * mv_col[0] + 128) >> 8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1328 mv_l0[1] = (scale * mv_col[1] + 128) >> 8;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1329 *(uint32_t*)h->mv_cache[1][scan8[i8*4+i4]] =
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1330 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
1331 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1332 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1333 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1334 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1335 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1336
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1337 static inline void write_back_motion(H264Context *h, int mb_type){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1338 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1339 const int b_xy = 4*s->mb_x + 4*s->mb_y*h->b_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1340 const int b8_xy= 2*s->mb_x + 2*s->mb_y*h->b8_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1341 int list;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1342
3219
cf233efbcece 10l in 1.199 (write_back_motion with B-pyramid + spatial)
lorenm
parents: 3215
diff changeset
1343 if(!USES_LIST(mb_type, 0))
cf233efbcece 10l in 1.199 (write_back_motion with B-pyramid + spatial)
lorenm
parents: 3215
diff changeset
1344 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
1345
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
1346 for(list=0; list<h->list_count; list++){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1347 int y;
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
1348 if(!USES_LIST(mb_type, list))
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1349 continue;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1350
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1351 for(y=0; y<4; y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1352 *(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
1353 *(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
1354 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
1355 if( h->pps.cabac ) {
3927
f44a3341bfdf simplify write_back_motion for skip mbs
lorenm
parents: 3807
diff changeset
1356 if(IS_SKIP(mb_type))
f44a3341bfdf simplify write_back_motion for skip mbs
lorenm
parents: 3807
diff changeset
1357 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
1358 else
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
1359 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
1360 *(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
1361 *(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
1362 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
1363 }
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
1364
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
1365 {
3776
1843a85123b7 fix some signedness warnings
mru
parents: 3651
diff changeset
1366 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
1367 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
1368 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
1369 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
1370 ref_index[1+1*h->b8_stride]= h->ref_cache[list][scan8[12]];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1371 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1372 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1373
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1374 if(h->slice_type == B_TYPE && h->pps.cabac){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1375 if(IS_8X8(mb_type)){
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
1376 uint8_t *direct_table = &h->direct_table[b8_xy];
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
1377 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
1378 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
1379 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
1380 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1381 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1382 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1383
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1384 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1385 * Decodes a network abstraction layer unit.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1386 * @param consumed is the number of bytes used as input
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1387 * @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
1388 * @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
1389 * @returns decoded bytes, might be src+1 if no escapes
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1390 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1391 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
1392 int i, si, di;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1393 uint8_t *dst;
5174
2e038003cdfb Do not reuse the rbsp de-escape buffer if both
benoit
parents: 5172
diff changeset
1394 int bufidx;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1395
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2971
diff changeset
1396 // src[0]&0x80; //forbidden bit
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1397 h->nal_ref_idc= src[0]>>5;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1398 h->nal_unit_type= src[0]&0x1F;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1399
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1400 src++; length--;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1401 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1402 for(i=0; i<length; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1403 printf("%2X ", src[i]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1404 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1405 for(i=0; i+1<length; i+=2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1406 if(src[i]) continue;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1407 if(i>0 && src[i-1]==0) i--;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1408 if(i+2<length && src[i+1]==0 && src[i+2]<=3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1409 if(src[i+2]!=3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1410 /* startcode, so we must be past the end */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1411 length=i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1412 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1413 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1414 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1415 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1416
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1417 if(i>=length-1){ //no escaped 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1418 *dst_length= length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1419 *consumed= length+1; //+1 for the header
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1420 return src;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1421 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1422
5174
2e038003cdfb Do not reuse the rbsp de-escape buffer if both
benoit
parents: 5172
diff changeset
1423 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
1424 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
1425 dst= h->rbsp_buffer[bufidx];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1426
4362
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
1427 if (dst == NULL){
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
1428 return NULL;
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
1429 }
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
1430
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
1431 //printf("decoding esc\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1432 si=di=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1433 while(si<length){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1434 //remove escapes (very rare 1:2^22)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1435 if(si+2<length && src[si]==0 && src[si+1]==0 && src[si+2]<=3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1436 if(src[si+2]==3){ //escape
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1437 dst[di++]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1438 dst[di++]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1439 si+=3;
1957
54411768fa38 h264 nal decoding fix by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1956
diff changeset
1440 continue;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1441 }else //next start code
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1442 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1443 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1444
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1445 dst[di++]= src[si++];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1446 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1447
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1448 *dst_length= di;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1449 *consumed= si + 1;//+1 for the header
5129
0244bba24b43 misc typo fixes
diego
parents: 5127
diff changeset
1450 //FIXME store exact number of bits in the getbitcontext (it is needed for decoding)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1451 return dst;
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 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1455 * identifies the exact end of the bitstream
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1456 * @return the length of the trailing, or 0 if damaged
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1457 */
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
1458 static int decode_rbsp_trailing(H264Context *h, uint8_t *src){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1459 int v= *src;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1460 int r;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1461
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
1462 tprintf(h->s.avctx, "rbsp trailing %X\n", v);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1463
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1464 for(r=1; r<9; r++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1465 if(v&1) return r;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1466 v>>=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1467 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1468 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1469 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1470
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1471 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1472 * idct tranforms the 16 dc values and dequantize them.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1473 * @param qp quantization parameter
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1474 */
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1475 static void h264_luma_dc_dequant_idct_c(DCTELEM *block, int qp, int qmul){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1476 #define stride 16
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1477 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1478 int temp[16]; //FIXME check if this is a good idea
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1479 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1480 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1481
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1482 //memset(block, 64, 2*256);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1483 //return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1484 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1485 const int offset= y_offset[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1486 const int z0= block[offset+stride*0] + block[offset+stride*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1487 const int z1= block[offset+stride*0] - block[offset+stride*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1488 const int z2= block[offset+stride*1] - block[offset+stride*5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1489 const int z3= block[offset+stride*1] + block[offset+stride*5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1490
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1491 temp[4*i+0]= z0+z3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1492 temp[4*i+1]= z1+z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1493 temp[4*i+2]= z1-z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1494 temp[4*i+3]= z0-z3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1495 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1496
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1497 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1498 const int offset= x_offset[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1499 const int z0= temp[4*0+i] + temp[4*2+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1500 const int z1= temp[4*0+i] - temp[4*2+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1501 const int z2= temp[4*1+i] - temp[4*3+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1502 const int z3= temp[4*1+i] + temp[4*3+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1503
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1504 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
1505 block[stride*2 +offset]= ((((z1 + z2)*qmul + 128 ) >> 8));
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1506 block[stride*8 +offset]= ((((z1 - z2)*qmul + 128 ) >> 8));
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1507 block[stride*10+offset]= ((((z0 - z3)*qmul + 128 ) >> 8));
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1508 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1509 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1510
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1511 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1512 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1513 * dct tranforms the 16 dc values.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1514 * @param qp quantization parameter ??? FIXME
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1515 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1516 static void h264_luma_dc_dct_c(DCTELEM *block/*, int qp*/){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1517 // const int qmul= dequant_coeff[qp][0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1518 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1519 int temp[16]; //FIXME check if this is a good idea
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1520 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1521 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1522
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1523 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1524 const int offset= y_offset[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1525 const int z0= block[offset+stride*0] + block[offset+stride*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1526 const int z1= block[offset+stride*0] - block[offset+stride*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1527 const int z2= block[offset+stride*1] - block[offset+stride*5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1528 const int z3= block[offset+stride*1] + block[offset+stride*5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1529
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1530 temp[4*i+0]= z0+z3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1531 temp[4*i+1]= z1+z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1532 temp[4*i+2]= z1-z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1533 temp[4*i+3]= z0-z3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1534 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1535
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1536 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1537 const int offset= x_offset[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1538 const int z0= temp[4*0+i] + temp[4*2+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1539 const int z1= temp[4*0+i] - temp[4*2+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1540 const int z2= temp[4*1+i] - temp[4*3+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1541 const int z3= temp[4*1+i] + temp[4*3+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1542
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1543 block[stride*0 +offset]= (z0 + z3)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1544 block[stride*2 +offset]= (z1 + z2)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1545 block[stride*8 +offset]= (z1 - z2)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1546 block[stride*10+offset]= (z0 - z3)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1547 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1548 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1549 #endif
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1550
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1551 #undef xStride
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1552 #undef stride
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1553
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1554 static void chroma_dc_dequant_idct_c(DCTELEM *block, int qp, int qmul){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1555 const int stride= 16*2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1556 const int xStride= 16;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1557 int a,b,c,d,e;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1558
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1559 a= block[stride*0 + xStride*0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1560 b= block[stride*0 + xStride*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1561 c= block[stride*1 + xStride*0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1562 d= block[stride*1 + xStride*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1563
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1564 e= a-b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1565 a= a+b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1566 b= c-d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1567 c= c+d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1568
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1569 block[stride*0 + xStride*0]= ((a+c)*qmul) >> 7;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1570 block[stride*0 + xStride*1]= ((e+b)*qmul) >> 7;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1571 block[stride*1 + xStride*0]= ((a-c)*qmul) >> 7;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1572 block[stride*1 + xStride*1]= ((e-b)*qmul) >> 7;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1573 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1574
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1575 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1576 static void chroma_dc_dct_c(DCTELEM *block){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1577 const int stride= 16*2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1578 const int xStride= 16;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1579 int a,b,c,d,e;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1580
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1581 a= block[stride*0 + xStride*0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1582 b= block[stride*0 + xStride*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1583 c= block[stride*1 + xStride*0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1584 d= block[stride*1 + xStride*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1585
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1586 e= a-b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1587 a= a+b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1588 b= c-d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1589 c= c+d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1590
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1591 block[stride*0 + xStride*0]= (a+c);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1592 block[stride*0 + xStride*1]= (e+b);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1593 block[stride*1 + xStride*0]= (a-c);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1594 block[stride*1 + xStride*1]= (e-b);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1595 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1596 #endif
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1597
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1598 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1599 * gets the chroma qp.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1600 */
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
1601 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
1602 return h->pps.chroma_qp_table[t][qscale & 0xff];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1603 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1604
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5106
diff changeset
1605 //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
1606 //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
1607 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
1608 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1609 const int * const quant_table= quant_coeff[qscale];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1610 const int bias= intra ? (1<<QUANT_SHIFT)/3 : (1<<QUANT_SHIFT)/6;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1611 const unsigned int threshold1= (1<<QUANT_SHIFT) - bias - 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1612 const unsigned int threshold2= (threshold1<<1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1613 int last_non_zero;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1614
4553
1a714d3f0233 cosmetics: Fix a common typo, sepErate --> sepArate.
diego
parents: 4546
diff changeset
1615 if(separate_dc){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1616 if(qscale<=18){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1617 //avoid overflows
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1618 const int dc_bias= intra ? (1<<(QUANT_SHIFT-2))/3 : (1<<(QUANT_SHIFT-2))/6;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1619 const unsigned int dc_threshold1= (1<<(QUANT_SHIFT-2)) - dc_bias - 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1620 const unsigned int dc_threshold2= (dc_threshold1<<1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1621
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1622 int level= block[0]*quant_coeff[qscale+18][0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1623 if(((unsigned)(level+dc_threshold1))>dc_threshold2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1624 if(level>0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1625 level= (dc_bias + level)>>(QUANT_SHIFT-2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1626 block[0]= level;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1627 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1628 level= (dc_bias - level)>>(QUANT_SHIFT-2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1629 block[0]= -level;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1630 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1631 // last_non_zero = i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1632 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1633 block[0]=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1634 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1635 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1636 const int dc_bias= intra ? (1<<(QUANT_SHIFT+1))/3 : (1<<(QUANT_SHIFT+1))/6;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1637 const unsigned int dc_threshold1= (1<<(QUANT_SHIFT+1)) - dc_bias - 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1638 const unsigned int dc_threshold2= (dc_threshold1<<1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1639
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1640 int level= block[0]*quant_table[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1641 if(((unsigned)(level+dc_threshold1))>dc_threshold2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1642 if(level>0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1643 level= (dc_bias + level)>>(QUANT_SHIFT+1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1644 block[0]= level;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1645 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1646 level= (dc_bias - level)>>(QUANT_SHIFT+1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1647 block[0]= -level;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1648 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1649 // last_non_zero = i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1650 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1651 block[0]=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1652 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1653 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1654 last_non_zero= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1655 i=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1656 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1657 last_non_zero= -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1658 i=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1659 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1660
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1661 for(; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1662 const int j= scantable[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1663 int level= block[j]*quant_table[j];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1664
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1665 // if( bias+level >= (1<<(QMAT_SHIFT - 3))
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1666 // || bias-level >= (1<<(QMAT_SHIFT - 3))){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1667 if(((unsigned)(level+threshold1))>threshold2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1668 if(level>0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1669 level= (bias + level)>>QUANT_SHIFT;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1670 block[j]= level;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1671 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1672 level= (bias - level)>>QUANT_SHIFT;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1673 block[j]= -level;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1674 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1675 last_non_zero = i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1676 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1677 block[j]=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1678 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1679 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1680
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1681 return last_non_zero;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1682 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1683
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1684 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
1685 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1686 int src_x_offset, int src_y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1687 qpel_mc_func *qpix_op, h264_chroma_mc_func chroma_op){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1688 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1689 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
1690 int my= h->mv_cache[list][ scan8[n] ][1] + src_y_offset*8;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1691 const int luma_xy= (mx&3) + ((my&3)<<2);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1692 uint8_t * src_y = pic->data[0] + (mx>>2) + (my>>2)*h->mb_linesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1693 uint8_t * src_cb, * src_cr;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1694 int extra_width= h->emu_edge_width;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1695 int extra_height= h->emu_edge_height;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1696 int emu=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1697 const int full_mx= mx>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1698 const int full_my= my>>2;
2861
3b920e274b26 fix emulated edge motion compensation when resolution%16!=0
lorenm
parents: 2846
diff changeset
1699 const int pic_width = 16*s->mb_width;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1700 const int pic_height = 16*s->mb_height >> MB_MBAFF;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1701
4390
michael
parents: 4389
diff changeset
1702 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
1703 return;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1704
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1705 if(mx&7) extra_width -= 3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1706 if(my&7) extra_height -= 3;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1707
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1708 if( full_mx < 0-extra_width
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1709 || full_my < 0-extra_height
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1710 || full_mx + 16/*FIXME*/ > pic_width + extra_width
2861
3b920e274b26 fix emulated edge motion compensation when resolution%16!=0
lorenm
parents: 2846
diff changeset
1711 || full_my + 16/*FIXME*/ > pic_height + extra_height){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1712 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
1713 src_y= s->edge_emu_buffer + 2 + 2*h->mb_linesize;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1714 emu=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1715 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1716
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1717 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
1718 if(!square){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1719 qpix_op[luma_xy](dest_y + delta, src_y + delta, h->mb_linesize);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1720 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1721
5434
4f2e3ef72b32 use ENABLE_GRAY
michael
parents: 5425
diff changeset
1722 if(ENABLE_GRAY && s->flags&CODEC_FLAG_GRAY) return;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1723
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1724 if(MB_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1725 // chroma offset when predicting from a field of opposite parity
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1726 my += 2 * ((s->mb_y & 1) - (h->ref_cache[list][scan8[n]] & 1));
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1727 emu |= (my>>3) < 0 || (my>>3) + 8 >= (pic_height>>1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1728 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1729 src_cb= pic->data[1] + (mx>>3) + (my>>3)*h->mb_uvlinesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1730 src_cr= pic->data[2] + (mx>>3) + (my>>3)*h->mb_uvlinesize;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1731
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1732 if(emu){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1733 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
1734 src_cb= s->edge_emu_buffer;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1735 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1736 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
1737
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1738 if(emu){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1739 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
1740 src_cr= s->edge_emu_buffer;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1741 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1742 chroma_op(dest_cr, src_cr, h->mb_uvlinesize, chroma_height, mx&7, my&7);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1743 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1744
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1745 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
1746 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1747 int x_offset, int y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1748 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1749 qpel_mc_func *qpix_avg, h264_chroma_mc_func chroma_avg,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1750 int list0, int list1){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1751 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1752 qpel_mc_func *qpix_op= qpix_put;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1753 h264_chroma_mc_func chroma_op= chroma_put;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1754
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1755 dest_y += 2*x_offset + 2*y_offset*h-> mb_linesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1756 dest_cb += x_offset + y_offset*h->mb_uvlinesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1757 dest_cr += x_offset + y_offset*h->mb_uvlinesize;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1758 x_offset += 8*s->mb_x;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1759 y_offset += 8*(s->mb_y >> MB_MBAFF);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1760
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1761 if(list0){
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1762 Picture *ref= &h->ref_list[0][ h->ref_cache[0][ scan8[n] ] ];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1763 mc_dir_part(h, ref, n, square, chroma_height, delta, 0,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1764 dest_y, dest_cb, dest_cr, x_offset, y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1765 qpix_op, chroma_op);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1766
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1767 qpix_op= qpix_avg;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1768 chroma_op= chroma_avg;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1769 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1770
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1771 if(list1){
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1772 Picture *ref= &h->ref_list[1][ h->ref_cache[1][ scan8[n] ] ];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1773 mc_dir_part(h, ref, n, square, chroma_height, delta, 1,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1774 dest_y, dest_cb, dest_cr, x_offset, y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1775 qpix_op, chroma_op);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1776 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1777 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1778
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1779 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
1780 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1781 int x_offset, int y_offset,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1782 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1783 h264_weight_func luma_weight_op, h264_weight_func chroma_weight_op,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1784 h264_biweight_func luma_weight_avg, h264_biweight_func chroma_weight_avg,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1785 int list0, int list1){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1786 MpegEncContext * const s = &h->s;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1787
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1788 dest_y += 2*x_offset + 2*y_offset*h-> mb_linesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1789 dest_cb += x_offset + y_offset*h->mb_uvlinesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1790 dest_cr += x_offset + y_offset*h->mb_uvlinesize;
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1791 x_offset += 8*s->mb_x;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1792 y_offset += 8*(s->mb_y >> MB_MBAFF);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1793
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1794 if(list0 && list1){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1795 /* don't optimize for luma-only case, since B-frames usually
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1796 * use implicit weights => chroma too. */
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1797 uint8_t *tmp_cb = s->obmc_scratchpad;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1798 uint8_t *tmp_cr = s->obmc_scratchpad + 8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1799 uint8_t *tmp_y = s->obmc_scratchpad + 8*h->mb_uvlinesize;
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1800 int refn0 = h->ref_cache[0][ scan8[n] ];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1801 int refn1 = h->ref_cache[1][ scan8[n] ];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1802
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1803 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
1804 dest_y, dest_cb, dest_cr,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1805 x_offset, y_offset, qpix_put, chroma_put);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1806 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
1807 tmp_y, tmp_cb, tmp_cr,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1808 x_offset, y_offset, qpix_put, chroma_put);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1809
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1810 if(h->use_weight == 2){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1811 int weight0 = h->implicit_weight[refn0][refn1];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1812 int weight1 = 64 - weight0;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1813 luma_weight_avg( dest_y, tmp_y, h-> mb_linesize, 5, weight0, weight1, 0);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1814 chroma_weight_avg(dest_cb, tmp_cb, h->mb_uvlinesize, 5, weight0, weight1, 0);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1815 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
1816 }else{
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1817 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
1818 h->luma_weight[0][refn0], h->luma_weight[1][refn1],
3029
7a92269a3ccd tweak h264_biweight
lorenm
parents: 3028
diff changeset
1819 h->luma_offset[0][refn0] + h->luma_offset[1][refn1]);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1820 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
1821 h->chroma_weight[0][refn0][0], h->chroma_weight[1][refn1][0],
3029
7a92269a3ccd tweak h264_biweight
lorenm
parents: 3028
diff changeset
1822 h->chroma_offset[0][refn0][0] + h->chroma_offset[1][refn1][0]);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1823 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
1824 h->chroma_weight[0][refn0][1], h->chroma_weight[1][refn1][1],
3029
7a92269a3ccd tweak h264_biweight
lorenm
parents: 3028
diff changeset
1825 h->chroma_offset[0][refn0][1] + h->chroma_offset[1][refn1][1]);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1826 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1827 }else{
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1828 int list = list1 ? 1 : 0;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1829 int refn = h->ref_cache[list][ scan8[n] ];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1830 Picture *ref= &h->ref_list[list][refn];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1831 mc_dir_part(h, ref, n, square, chroma_height, delta, list,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1832 dest_y, dest_cb, dest_cr, x_offset, y_offset,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1833 qpix_put, chroma_put);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1834
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1835 luma_weight_op(dest_y, h->mb_linesize, h->luma_log2_weight_denom,
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1836 h->luma_weight[list][refn], h->luma_offset[list][refn]);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1837 if(h->use_weight_chroma){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1838 chroma_weight_op(dest_cb, h->mb_uvlinesize, h->chroma_log2_weight_denom,
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1839 h->chroma_weight[list][refn][0], h->chroma_offset[list][refn][0]);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1840 chroma_weight_op(dest_cr, h->mb_uvlinesize, h->chroma_log2_weight_denom,
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1841 h->chroma_weight[list][refn][1], h->chroma_offset[list][refn][1]);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1842 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1843 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1844 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1845
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1846 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
1847 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1848 int x_offset, int y_offset,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1849 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1850 qpel_mc_func *qpix_avg, h264_chroma_mc_func chroma_avg,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1851 h264_weight_func *weight_op, h264_biweight_func *weight_avg,
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1852 int list0, int list1){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1853 if((h->use_weight==2 && list0 && list1
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1854 && (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
1855 || h->use_weight==1)
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1856 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
1857 x_offset, y_offset, qpix_put, chroma_put,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1858 weight_op[0], weight_op[3], weight_avg[0], weight_avg[3], list0, list1);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1859 else
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1860 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
1861 x_offset, y_offset, qpix_put, chroma_put, qpix_avg, chroma_avg, list0, list1);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1862 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1863
3215
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1864 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
1865 /* fetch pixels for estimated mv 4 macroblocks ahead
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1866 * optimized for 64byte cache lines */
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1867 MpegEncContext * const s = &h->s;
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1868 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
1869 if(refn >= 0){
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1870 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
1871 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
1872 uint8_t **src= h->ref_list[list][refn].data;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1873 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
1874 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
1875 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
1876 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
1877 }
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1878 }
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1879
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1880 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
1881 qpel_mc_func (*qpix_put)[16], h264_chroma_mc_func (*chroma_put),
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1882 qpel_mc_func (*qpix_avg)[16], h264_chroma_mc_func (*chroma_avg),
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1883 h264_weight_func *weight_op, h264_biweight_func *weight_avg){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1884 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
1885 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1886 const int mb_type= s->current_picture.mb_type[mb_xy];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1887
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1888 assert(IS_INTER(mb_type));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1889
3215
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1890 prefetch_motion(h, 0);
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1891
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1892 if(IS_16X16(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1893 mc_part(h, 0, 1, 8, 0, dest_y, dest_cb, dest_cr, 0, 0,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1894 qpix_put[0], chroma_put[0], qpix_avg[0], chroma_avg[0],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1895 &weight_op[0], &weight_avg[0],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1896 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1897 }else if(IS_16X8(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1898 mc_part(h, 0, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 0,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1899 qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1900 &weight_op[1], &weight_avg[1],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1901 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1902 mc_part(h, 8, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 4,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1903 qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1904 &weight_op[1], &weight_avg[1],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1905 IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1906 }else if(IS_8X16(mb_type)){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1907 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
1908 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1909 &weight_op[2], &weight_avg[2],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1910 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1));
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1911 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
1912 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1913 &weight_op[2], &weight_avg[2],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1914 IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1915 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1916 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1917
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1918 assert(IS_8X8(mb_type));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1919
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1920 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1921 const int sub_mb_type= h->sub_mb_type[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1922 const int n= 4*i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1923 int x_offset= (i&1)<<2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1924 int y_offset= (i&2)<<1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1925
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1926 if(IS_SUB_8X8(sub_mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1927 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
1928 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1929 &weight_op[3], &weight_avg[3],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1930 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1931 }else if(IS_SUB_8X4(sub_mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1932 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
1933 qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1934 &weight_op[4], &weight_avg[4],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1935 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1936 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
1937 qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1938 &weight_op[4], &weight_avg[4],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1939 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1940 }else if(IS_SUB_4X8(sub_mb_type)){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1941 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
1942 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1943 &weight_op[5], &weight_avg[5],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1944 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
1945 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
1946 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1947 &weight_op[5], &weight_avg[5],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1948 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1949 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1950 int j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1951 assert(IS_SUB_4X4(sub_mb_type));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1952 for(j=0; j<4; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1953 int sub_x_offset= x_offset + 2*(j&1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1954 int sub_y_offset= y_offset + (j&2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1955 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
1956 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1957 &weight_op[6], &weight_avg[6],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1958 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1959 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1960 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1961 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1962 }
3215
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1963
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1964 prefetch_motion(h, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1965 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1966
4783
011fb289e3b0 changes some function declarations from () to (void) as per ansi c.
gpoirier
parents: 4745
diff changeset
1967 static void decode_init_vlc(void){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1968 static int done = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1969
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1970 if (!done) {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1971 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1972 done = 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1973
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1974 init_vlc(&chroma_dc_coeff_token_vlc, CHROMA_DC_COEFF_TOKEN_VLC_BITS, 4*5,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1975 &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
1976 &chroma_dc_coeff_token_bits[0], 1, 1, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1977
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1978 for(i=0; i<4; i++){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1979 init_vlc(&coeff_token_vlc[i], COEFF_TOKEN_VLC_BITS, 4*17,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1980 &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
1981 &coeff_token_bits[i][0], 1, 1, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1982 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1983
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1984 for(i=0; i<3; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1985 init_vlc(&chroma_dc_total_zeros_vlc[i], CHROMA_DC_TOTAL_ZEROS_VLC_BITS, 4,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1986 &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
1987 &chroma_dc_total_zeros_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 for(i=0; i<15; i++){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1990 init_vlc(&total_zeros_vlc[i], TOTAL_ZEROS_VLC_BITS, 16,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1991 &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
1992 &total_zeros_bits[i][0], 1, 1, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1993 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1994
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1995 for(i=0; i<6; i++){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1996 init_vlc(&run_vlc[i], RUN_VLC_BITS, 7,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1997 &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
1998 &run_bits[i][0], 1, 1, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1999 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2000 init_vlc(&run7_vlc, RUN7_VLC_BITS, 16,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2001 &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
2002 &run_bits[6][0], 1, 1, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2003 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2004 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2005
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2006 static void free_tables(H264Context *h){
5079
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
2007 int i;
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2008 H264Context *hx;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2009 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
2010 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
2011 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
2012 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
2013 av_freep(&h->mvd_table[1]);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
2014 av_freep(&h->direct_table);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2015 av_freep(&h->non_zero_count);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2016 av_freep(&h->slice_table_base);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2017 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
2018
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2019 av_freep(&h->mb2b_xy);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2020 av_freep(&h->mb2b8_xy);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2021
5079
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
2022 for(i = 0; i < MAX_SPS_COUNT; i++)
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
2023 av_freep(h->sps_buffers + i);
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
2024
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
2025 for(i = 0; i < MAX_PPS_COUNT; i++)
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
2026 av_freep(h->pps_buffers + i);
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2027
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2028 for(i = 0; i < h->s.avctx->thread_count; i++) {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2029 hx = h->thread_context[i];
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2030 if(!hx) continue;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2031 av_freep(&hx->top_borders[1]);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2032 av_freep(&hx->top_borders[0]);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2033 av_freep(&hx->s.obmc_scratchpad);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2034 av_freep(&hx->s.allocated_edge_emu_buffer);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2035 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2036 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2037
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2038 static void init_dequant8_coeff_table(H264Context *h){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2039 int i,q,x;
3174
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
2040 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
2041 h->dequant8_coeff[0] = h->dequant8_buffer[0];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2042 h->dequant8_coeff[1] = h->dequant8_buffer[1];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2043
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2044 for(i=0; i<2; i++ ){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2045 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
2046 h->dequant8_coeff[1] = h->dequant8_buffer[0];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2047 break;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2048 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2049
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2050 for(q=0; q<52; q++){
4277
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
2051 int shift = ff_div6[q];
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
2052 int idx = ff_rem6[q];
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2053 for(x=0; x<64; x++)
3174
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
2054 h->dequant8_coeff[i][q][transpose ? (x>>3)|((x&7)<<3) : x] =
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
2055 ((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
2056 h->pps.scaling_matrix8[i][x]) << shift;
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2057 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2058 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2059 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2060
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2061 static void init_dequant4_coeff_table(H264Context *h){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2062 int i,j,q,x;
3005
6f6f307cffac fix asymmetric CQMs with pre-transposed DCT.
lorenm
parents: 3004
diff changeset
2063 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
2064 for(i=0; i<6; i++ ){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2065 h->dequant4_coeff[i] = h->dequant4_buffer[i];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2066 for(j=0; j<i; j++){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2067 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
2068 h->dequant4_coeff[i] = h->dequant4_buffer[j];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2069 break;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2070 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2071 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2072 if(j<i)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2073 continue;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2074
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2075 for(q=0; q<52; q++){
4277
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
2076 int shift = ff_div6[q] + 2;
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
2077 int idx = ff_rem6[q];
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2078 for(x=0; x<16; x++)
3005
6f6f307cffac fix asymmetric CQMs with pre-transposed DCT.
lorenm
parents: 3004
diff changeset
2079 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
2080 ((uint32_t)dequant4_coeff_init[idx][(x&1) + ((x>>2)&1)] *
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2081 h->pps.scaling_matrix4[i][x]) << shift;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2082 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2083 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2084 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2085
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2086 static void init_dequant_tables(H264Context *h){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2087 int i,x;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2088 init_dequant4_coeff_table(h);
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2089 if(h->pps.transform_8x8_mode)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2090 init_dequant8_coeff_table(h);
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2091 if(h->sps.transform_bypass){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2092 for(i=0; i<6; i++)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2093 for(x=0; x<16; x++)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2094 h->dequant4_coeff[i][0][x] = 1<<6;
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 for(i=0; i<2; i++)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2097 for(x=0; x<64; x++)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2098 h->dequant8_coeff[i][0][x] = 1<<6;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2099 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2100 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2101
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2102
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2103 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2104 * allocates tables.
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
2105 * needs width/height
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2106 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2107 static int alloc_tables(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2108 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
2109 const int big_mb_num= s->mb_stride * (s->mb_height+1);
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2110 int x,y;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2111
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2112 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
2113
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2114 CHECKED_ALLOCZ(h->non_zero_count , big_mb_num * 16 * sizeof(uint8_t))
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2115 CHECKED_ALLOCZ(h->slice_table_base , (big_mb_num+s->mb_stride) * sizeof(uint8_t))
2336
9cd834fc7325 segfault fix
michael
parents: 2317
diff changeset
2116 CHECKED_ALLOCZ(h->cbp_table, big_mb_num * sizeof(uint16_t))
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2117
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2118 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
2119 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
2120 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
2121 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
2122 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
2123 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2124
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2125 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
2126 h->slice_table= h->slice_table_base + s->mb_stride*2 + 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2127
2641
c337f851d0f9 fix storage of motion vectors for frames with more than 4096 macroblocks.
lorenm
parents: 2640
diff changeset
2128 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
2129 CHECKED_ALLOCZ(h->mb2b8_xy , big_mb_num * sizeof(uint32_t));
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2130 for(y=0; y<s->mb_height; y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2131 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
2132 const int mb_xy= x + y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2133 const int b_xy = 4*x + 4*y*h->b_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2134 const int b8_xy= 2*x + 2*y*h->b8_stride;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2135
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2136 h->mb2b_xy [mb_xy]= b_xy;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2137 h->mb2b8_xy[mb_xy]= b8_xy;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2138 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2139 }
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2140
2417
991f39305057 10l (obmc_scratchpad not always initialize)
lorenm
parents: 2416
diff changeset
2141 s->obmc_scratchpad = NULL;
991f39305057 10l (obmc_scratchpad not always initialize)
lorenm
parents: 2416
diff changeset
2142
2920
1443b4d3f4ab 10l: cqm weren't initialized in svq3.
lorenm
parents: 2919
diff changeset
2143 if(!h->dequant4_coeff[0])
1443b4d3f4ab 10l: cqm weren't initialized in svq3.
lorenm
parents: 2919
diff changeset
2144 init_dequant_tables(h);
1443b4d3f4ab 10l: cqm weren't initialized in svq3.
lorenm
parents: 2919
diff changeset
2145
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2146 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2147 fail:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2148 free_tables(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2149 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2150 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2151
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2152 /**
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2153 * Mimic alloc_tables(), but for every context thread.
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2154 */
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2155 static void clone_tables(H264Context *dst, H264Context *src){
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2156 dst->intra4x4_pred_mode = src->intra4x4_pred_mode;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2157 dst->non_zero_count = src->non_zero_count;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2158 dst->slice_table = src->slice_table;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2159 dst->cbp_table = src->cbp_table;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2160 dst->mb2b_xy = src->mb2b_xy;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2161 dst->mb2b8_xy = src->mb2b8_xy;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2162 dst->chroma_pred_mode_table = src->chroma_pred_mode_table;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2163 dst->mvd_table[0] = src->mvd_table[0];
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2164 dst->mvd_table[1] = src->mvd_table[1];
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2165 dst->direct_table = src->direct_table;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2166
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2167 if(!dst->dequant4_coeff[0])
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2168 init_dequant_tables(dst);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2169 dst->s.obmc_scratchpad = NULL;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2170 ff_h264_pred_init(&dst->hpc, src->s.codec_id);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2171 dst->dequant_coeff_pps= -1;
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
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2174 /**
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2175 * Init context
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2176 * Allocate buffers which are not shared amongst multiple threads.
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 static int context_init(H264Context *h){
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2179 MpegEncContext * const s = &h->s;
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 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
2182 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
2183
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2184 // 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
2185 CHECKED_ALLOCZ(s->allocated_edge_emu_buffer,
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2186 (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
2187 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
2188 return 0;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2189 fail:
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2190 return -1; // free_tables will clean up for us
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2191 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2192
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2193 static void common_init(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2194 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2195
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2196 s->width = s->avctx->width;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2197 s->height = s->avctx->height;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2198 s->codec_id= s->avctx->codec->id;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2199
5638
4a26dc4ca11d Move H.264 intra prediction functions into their own context
kostya
parents: 5631
diff changeset
2200 ff_h264_pred_init(&h->hpc, s->codec_id);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2201
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2202 h->dequant_coeff_pps= -1;
1698
420cac032278 svq3 fix
michael
parents: 1636
diff changeset
2203 s->unrestricted_mv=1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2204 s->decode=1; //FIXME
2920
1443b4d3f4ab 10l: cqm weren't initialized in svq3.
lorenm
parents: 2919
diff changeset
2205
1443b4d3f4ab 10l: cqm weren't initialized in svq3.
lorenm
parents: 2919
diff changeset
2206 memset(h->pps.scaling_matrix4, 16, 6*16*sizeof(uint8_t));
1443b4d3f4ab 10l: cqm weren't initialized in svq3.
lorenm
parents: 2919
diff changeset
2207 memset(h->pps.scaling_matrix8, 16, 2*64*sizeof(uint8_t));
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2208 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2209
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2210 static int decode_init(AVCodecContext *avctx){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2211 H264Context *h= avctx->priv_data;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2212 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2213
1892
5ac49e7a1b8f init cleanup
michael
parents: 1786
diff changeset
2214 MPV_decode_defaults(s);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2215
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2216 s->avctx = avctx;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2217 common_init(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2218
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2219 s->out_format = FMT_H264;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2220 s->workaround_bugs= avctx->workaround_bugs;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2221
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2222 // set defaults
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2223 // 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
2224 s->quarter_sample = 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2225 s->low_delay= 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2226 avctx->pix_fmt= PIX_FMT_YUV420P;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2227
4164
171e768324cd Remove the H264Context parameter from decode_init_vlc() as it is not being used.
takis
parents: 4118
diff changeset
2228 decode_init_vlc();
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2229
2547
c5781912ad8a improved detection of "AVC1" style H.264 patch by (M«©ns Rullg«©rd <mru inprovide com>)
michael
parents: 2538
diff changeset
2230 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
2231 *(char *)avctx->extradata == 1){
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2232 h->is_avc = 1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2233 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
2234 } else {
c5781912ad8a improved detection of "AVC1" style H.264 patch by (M«©ns Rullg«©rd <mru inprovide com>)
michael
parents: 2538
diff changeset
2235 h->is_avc = 0;
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2236 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2237
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2238 h->thread_context[0] = h;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2239 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2240 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2241
2935
b564bb15e63c check MPV_frame_start() return value
michael
parents: 2928
diff changeset
2242 static int frame_start(H264Context *h){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2243 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2244 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2245
2935
b564bb15e63c check MPV_frame_start() return value
michael
parents: 2928
diff changeset
2246 if(MPV_frame_start(s, s->avctx) < 0)
b564bb15e63c check MPV_frame_start() return value
michael
parents: 2928
diff changeset
2247 return -1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2248 ff_er_frame_start(s);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2249
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2250 assert(s->linesize && s->uvlinesize);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2251
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2252 for(i=0; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2253 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
2254 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
2255 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2256 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2257 h->block_offset[16+i]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2258 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
2259 h->block_offset[24+16+i]=
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2260 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
2261 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2262
2416
06b7d678b582 10l: scratchpad could be allocated before its size was known.
lorenm
parents: 2415
diff changeset
2263 /* 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
2264 * FIXME: redo bipred weight to not require extra buffer? */
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2265 for(i = 0; i < s->avctx->thread_count; i++)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2266 if(!h->thread_context[i]->s.obmc_scratchpad)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2267 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
2268
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2269 /* some macroblocks will be accessed before they're available */
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2270 if(FRAME_MBAFF || s->avctx->thread_count > 1)
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2271 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
2272
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2273 // 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
2274 return 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2275 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2276
5106
ddb5abe164f3 h264: use 'simple' in border backup / xchg
benoit
parents: 5093
diff changeset
2277 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
2278 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
2279 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2280
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2281 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
2282 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
2283 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
2284
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
2285 // 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
2286 // 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
2287 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
2288 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
2289 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
2290 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2291
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2292 *(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
2293 *(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
2294
5434
4f2e3ef72b32 use ENABLE_GRAY
michael
parents: 5425
diff changeset
2295 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
2296 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
2297 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
2298 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
2299 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
2300 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
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]+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
2303 *(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
2304 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2305 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2306
5106
ddb5abe164f3 h264: use 'simple' in border backup / xchg
benoit
parents: 5093
diff changeset
2307 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
2308 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
2309 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
2310 uint64_t temp64;
5177
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2311 int deblock_left;
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2312 int deblock_top;
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2313 int mb_xy;
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2314
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2315 if(h->deblocking_filter == 2) {
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2316 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
2317 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
2318 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
2319 } else {
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2320 deblock_left = (s->mb_x > 0);
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2321 deblock_top = (s->mb_y > 0);
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2322 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2323
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2324 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
2325 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
2326 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
2327
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2328 #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
2329 t= a;\
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2330 if(xchg)\
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2331 a= b;\
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2332 b= t;
2200
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2333
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2334 if(deblock_left){
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2335 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
2336 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
2337 }
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2338 }
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2339
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2340 if(deblock_top){
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2341 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
2342 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
2343 if(s->mb_x+1 < s->mb_width){
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2344 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
2345 }
2200
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2346 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2347
5434
4f2e3ef72b32 use ENABLE_GRAY
michael
parents: 5425
diff changeset
2348 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
2349 if(deblock_left){
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2350 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
2351 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
2352 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
2353 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2354 }
2200
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2355 if(deblock_top){
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2356 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
2357 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
2358 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2359 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2360 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2361
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2362 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
2363 MpegEncContext * const s = &h->s;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2364 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2365
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2366 src_y -= 2 * linesize;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2367 src_cb -= 2 * uvlinesize;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2368 src_cr -= 2 * uvlinesize;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2369
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
2370 // 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
2371 // 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
2372 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
2373 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
2374 for(i=2; i<34; i++){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2375 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
2376 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2377
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2378 *(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
2379 *(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
2380 *(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
2381 *(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
2382
5434
4f2e3ef72b32 use ENABLE_GRAY
michael
parents: 5425
diff changeset
2383 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
2384 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
2385 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
2386 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
2387 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
2388 for(i=2; i<18; i++){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2389 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
2390 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
2391 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2392 *(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
2393 *(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
2394 *(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
2395 *(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
2396 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2397 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2398
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2399 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
2400 MpegEncContext * const s = &h->s;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2401 int temp8, i;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2402 uint64_t temp64;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2403 int deblock_left = (s->mb_x > 0);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2404 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
2405
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
2406 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
2407
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2408 src_y -= 2 * linesize + 1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2409 src_cb -= 2 * uvlinesize + 1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2410 src_cr -= 2 * uvlinesize + 1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2411
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2412 #define XCHG(a,b,t,xchg)\
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2413 t= a;\
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2414 if(xchg)\
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2415 a= b;\
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2416 b= t;
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 if(deblock_left){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2419 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
2420 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
2421 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2422 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2423
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2424 if(deblock_top){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2425 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
2426 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
2427 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
2428 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
2429 if(s->mb_x+1 < s->mb_width){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2430 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
2431 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
2432 }
2581
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
5434
4f2e3ef72b32 use ENABLE_GRAY
michael
parents: 5425
diff changeset
2435 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
2436 if(deblock_left){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2437 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
2438 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
2439 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
2440 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2441 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2442 if(deblock_top){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2443 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
2444 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
2445 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
2446 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
2447 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2448 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2449 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2450
4908
777f250df232 Fix multiple "¡Æinline/static¡Ç is not at beginning of declaration" warnings.
diego
parents: 4896
diff changeset
2451 static av_always_inline void hl_decode_mb_internal(H264Context *h, int simple){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2452 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2453 const int mb_x= s->mb_x;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2454 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
2455 const int mb_xy= mb_x + mb_y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2456 const int mb_type= s->current_picture.mb_type[mb_xy];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2457 uint8_t *dest_y, *dest_cb, *dest_cr;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2458 int linesize, uvlinesize /*dct_offset*/;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2459 int i;
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2460 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
2461 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
2462 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
2463 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
2464 void (*idct_dc_add)(uint8_t *dst, DCTELEM *block, int stride);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2465
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2466 dest_y = s->current_picture.data[0] + (mb_y * 16* s->linesize ) + mb_x * 16;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2467 dest_cb = s->current_picture.data[1] + (mb_y * 8 * s->uvlinesize) + mb_x * 8;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2468 dest_cr = s->current_picture.data[2] + (mb_y * 8 * s->uvlinesize) + mb_x * 8;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2469
4000
eeab02251056 more prefetches, 2% faster h264
lorenm
parents: 3993
diff changeset
2470 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
2471 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
2472
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2473 if (!simple && MB_FIELD) {
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2474 linesize = h->mb_linesize = s->linesize * 2;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2475 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
2476 block_offset = &h->block_offset[24];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2477 if(mb_y&1){ //FIXME move out of this func?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2478 dest_y -= s->linesize*15;
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2479 dest_cb-= s->uvlinesize*7;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2480 dest_cr-= s->uvlinesize*7;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2481 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2482 if(FRAME_MBAFF) {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2483 int list;
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
2484 for(list=0; list<h->list_count; list++){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2485 if(!USES_LIST(mb_type, list))
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2486 continue;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2487 if(IS_16X16(mb_type)){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2488 int8_t *ref = &h->ref_cache[list][scan8[0]];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2489 fill_rectangle(ref, 4, 4, 8, 16+*ref^(s->mb_y&1), 1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2490 }else{
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2491 for(i=0; i<16; i+=4){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2492 //FIXME can refs be smaller than 8x8 when !direct_8x8_inference ?
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2493 int ref = h->ref_cache[list][scan8[i]];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2494 if(ref >= 0)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2495 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
2496 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2497 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2498 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2499 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2500 } else {
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2501 linesize = h->mb_linesize = s->linesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2502 uvlinesize = h->mb_uvlinesize = s->uvlinesize;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2503 // dct_offset = s->linesize * 16;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2504 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2505
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2506 if(transform_bypass){
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2507 idct_dc_add =
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2508 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
2509 }else if(IS_8x8DCT(mb_type)){
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2510 idct_dc_add = s->dsp.h264_idct8_dc_add;
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2511 idct_add = s->dsp.h264_idct8_add;
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2512 }else{
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2513 idct_dc_add = s->dsp.h264_idct_dc_add;
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2514 idct_add = s->dsp.h264_idct_add;
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2515 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2516
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2517 if(!simple && FRAME_MBAFF && h->deblocking_filter && IS_INTRA(mb_type)
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2518 && (!bottom || !IS_INTRA(s->current_picture.mb_type[mb_xy-s->mb_stride]))){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2519 int mbt_y = mb_y&~1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2520 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
2521 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
2522 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
2523 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
2524 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2525
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2526 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
2527 unsigned int x, y;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2528
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2529 // 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
2530 // 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
2531 for(i=0; i<16; i++) {
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2532 for (y=0; y<4; y++) {
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2533 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
2534 *(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
2535 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2536 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2537 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2538 for(i=16; i<16+4; i++) {
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2539 for (y=0; y<4; y++) {
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2540 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
2541 *(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
2542 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2543 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2544 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2545 for(i=20; i<20+4; i++) {
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2546 for (y=0; y<4; y++) {
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2547 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
2548 *(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
2549 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2550 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2551 }
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2552 } else {
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2553 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
2554 if(h->deblocking_filter && (simple || !FRAME_MBAFF))
5106
ddb5abe164f3 h264: use 'simple' in border backup / xchg
benoit
parents: 5093
diff changeset
2555 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
2556
5434
4f2e3ef72b32 use ENABLE_GRAY
michael
parents: 5425
diff changeset
2557 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
2558 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
2559 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
2560 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2561
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2562 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
2563 if(simple || !s->encoding){
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2564 if(IS_8x8DCT(mb_type)){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2565 for(i=0; i<16; i+=4){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2566 uint8_t * const ptr= dest_y + block_offset[i];
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2567 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
2568 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
2569 h->hpc.pred8x8l[ dir ](ptr, (h->topleft_samples_available<<i)&0x8000,
4546
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
2570 (h->topright_samples_available<<i)&0x4000, linesize);
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2571 if(nnz){
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2572 if(nnz == 1 && h->mb[i*16])
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2573 idct_dc_add(ptr, h->mb + i*16, linesize);
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2574 else
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2575 idct_add(ptr, h->mb + i*16, linesize);
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2576 }
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2577 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2578 }else
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2579 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
2580 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
2581 uint8_t *topright;
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2582 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
2583 int nnz, tr;
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2584
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2585 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
2586 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
2587 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
2588 if(!topright_avail){
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2589 tr= ptr[3 - linesize]*0x01010101;
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2590 topright= (uint8_t*) &tr;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2591 }else
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2592 topright= ptr + 4 - linesize;
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2593 }else
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2594 topright= NULL;
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2595
5638
4a26dc4ca11d Move H.264 intra prediction functions into their own context
kostya
parents: 5631
diff changeset
2596 h->hpc.pred4x4[ dir ](ptr, topright, linesize);
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2597 nnz = h->non_zero_count_cache[ scan8[i] ];
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2598 if(nnz){
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2599 if(is_h264){
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2600 if(nnz == 1 && h->mb[i*16])
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2601 idct_dc_add(ptr, h->mb + i*16, linesize);
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2602 else
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2603 idct_add(ptr, h->mb + i*16, linesize);
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2604 }else
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2605 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
2606 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2607 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2608 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2609 }else{
5638
4a26dc4ca11d Move H.264 intra prediction functions into their own context
kostya
parents: 5631
diff changeset
2610 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
2611 if(is_h264){
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
2612 if(!transform_bypass)
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2613 h264_luma_dc_dequant_idct_c(h->mb, s->qscale, h->dequant4_coeff[IS_INTRA(mb_type) ? 0:3][s->qscale][0]);
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
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_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
2616 }
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2617 if(h->deblocking_filter && (simple || !FRAME_MBAFF))
5106
ddb5abe164f3 h264: use 'simple' in border backup / xchg
benoit
parents: 5093
diff changeset
2618 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
2619 }else if(is_h264){
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2620 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
2621 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
2622 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
2623 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
2624 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2625
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2626
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2627 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
2628 if(is_h264){
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2629 if(IS_INTRA16x16(mb_type)){
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2630 for(i=0; i<16; i++){
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2631 if(h->non_zero_count_cache[ scan8[i] ])
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2632 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
2633 else if(h->mb[i*16])
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2634 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
2635 }
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2636 }else{
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2637 const int di = IS_8x8DCT(mb_type) ? 4 : 1;
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2638 for(i=0; i<16; i+=di){
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2639 int nnz = h->non_zero_count_cache[ scan8[i] ];
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2640 if(nnz){
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2641 if(nnz==1 && h->mb[i*16])
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2642 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
2643 else
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2644 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
2645 }
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2646 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2647 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2648 }else{
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2649 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
2650 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
2651 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
2652 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
2653 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2654 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
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
5434
4f2e3ef72b32 use ENABLE_GRAY
michael
parents: 5425
diff changeset
2658 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
2659 uint8_t *dest[2] = {dest_cb, dest_cr};
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2660 if(transform_bypass){
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2661 idct_add = idct_dc_add = s->dsp.add_pixels4;
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2662 }else{
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2663 idct_add = s->dsp.h264_idct_add;
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2664 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
2665 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
2666 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
2667 }
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2668 if(is_h264){
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2669 for(i=16; i<16+8; i++){
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2670 if(h->non_zero_count_cache[ scan8[i] ])
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2671 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
2672 else if(h->mb[i*16])
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2673 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
2674 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2675 }else{
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2676 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
2677 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
2678 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
2679 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
2680 }
1250
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
2681 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2682 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2683 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2684 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2685 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
2686 if (!simple && FRAME_MBAFF) {
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2687 //FIXME try deblocking one mb at a time?
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2688 // 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
2689 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
2690 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
2691 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
2692 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
2693 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
2694 if (!bottom) return;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2695 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
2696 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
2697 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
2698
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2699 if(IS_INTRA(mb_type_top | mb_type_bottom))
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2700 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
2701
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2702 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
2703 // deblock a pair
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2704 // top
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2705 s->mb_y--;
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
2706 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
2707 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
2708 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
2709 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
2710 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
2711 // bottom
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2712 s->mb_y++;
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
2713 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
2714 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
2715 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
2716 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
2717 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
2718 } else {
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
2719 tprintf(h->s.avctx, "call filter_mb\n");
5106
ddb5abe164f3 h264: use 'simple' in border backup / xchg
benoit
parents: 5093
diff changeset
2720 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
2721 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
2722 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
2723 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2724 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2725 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2726
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2727 /**
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2728 * 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
2729 */
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2730 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
2731 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
2732 }
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2733
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2734 /**
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2735 * 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
2736 */
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2737 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
2738 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
2739 }
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2740
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2741 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
2742 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
2743 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
2744 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
2745 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
2746 const int mb_type= s->current_picture.mb_type[mb_xy];
5434
4f2e3ef72b32 use ENABLE_GRAY
michael
parents: 5425
diff changeset
2747 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
2748
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2749 if(!s->decode)
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2750 return;
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2751
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2752 if (is_complex)
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2753 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
2754 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
2755 }
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2756
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2757 /**
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2758 * fills the default_ref_list.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2759 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2760 static int fill_default_ref_list(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2761 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2762 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
2763 int smallest_poc_greater_than_current = -1;
2582
3c27a074de7a allow 16 refs with B-frames
lorenm
parents: 2581
diff changeset
2764 Picture sorted_short_ref[32];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2765
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2766 if(h->slice_type==B_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2767 int out_i;
2713
16258de8ae06 fix crash on negative POC
lorenm
parents: 2707
diff changeset
2768 int limit= INT_MIN;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2769
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
2770 /* sort frame according to poc in B slice */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2771 for(out_i=0; out_i<h->short_ref_count; out_i++){
2713
16258de8ae06 fix crash on negative POC
lorenm
parents: 2707
diff changeset
2772 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
2773 int best_poc=INT_MAX;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2774
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2775 for(i=0; i<h->short_ref_count; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2776 const int poc= h->short_ref[i]->poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2777 if(poc > limit && poc < best_poc){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2778 best_poc= poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2779 best_i= i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2780 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2781 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2782
2713
16258de8ae06 fix crash on negative POC
lorenm
parents: 2707
diff changeset
2783 assert(best_i != INT_MIN);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2784
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2785 limit= best_poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2786 sorted_short_ref[out_i]= *h->short_ref[best_i];
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
2787 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
2788 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
2789 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
2790 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
2791 }
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
2792 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2793 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2794 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2795
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2796 if(s->picture_structure == PICT_FRAME){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2797 if(h->slice_type==B_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2798 int list;
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
2799 tprintf(h->s.avctx, "current poc: %d, smallest_poc_greater_than_current: %d\n", s->current_picture_ptr->poc, smallest_poc_greater_than_current);
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
2800
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
2801 // find the largest poc
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2802 for(list=0; list<2; list++){
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
2803 int index = 0;
2447
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
2804 int j= -99;
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
2805 int step= list ? -1 : 1;
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
2806
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
2807 for(i=0; i<h->short_ref_count && index < h->ref_count[list]; i++, j+=step) {
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
2808 while(j<0 || j>= h->short_ref_count){
2680
1a6192e0b1f9 fill missing reference pictures with something to avoid assertion failure
michael
parents: 2675
diff changeset
2809 if(j != -99 && step == (list ? -1 : 1))
1a6192e0b1f9 fill missing reference pictures with something to avoid assertion failure
michael
parents: 2675
diff changeset
2810 return -1;
2447
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
2811 step = -step;
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
2812 j= smallest_poc_greater_than_current + (step>>1);
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
2813 }
2447
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
2814 if(sorted_short_ref[j].reference != 3) continue;
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
2815 h->default_ref_list[list][index ]= sorted_short_ref[j];
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
2816 h->default_ref_list[list][index++].pic_id= sorted_short_ref[j].frame_num;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2817 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2818
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
2819 for(i = 0; i < 16 && index < h->ref_count[ list ]; 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
2820 if(h->long_ref[i] == NULL) continue;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2821 if(h->long_ref[i]->reference != 3) continue;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2822
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2823 h->default_ref_list[ list ][index ]= *h->long_ref[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2824 h->default_ref_list[ list ][index++].pic_id= i;;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2825 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2826
2447
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
2827 if(list && (smallest_poc_greater_than_current<=0 || smallest_poc_greater_than_current>=h->short_ref_count) && (1 < index)){
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
2828 // swap the two first elements of L1 when
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
2829 // L0 and L1 are identical
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2830 Picture temp= h->default_ref_list[1][0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2831 h->default_ref_list[1][0] = h->default_ref_list[1][1];
2673
6f04c7a5bf24 typo found by Chengji Zhao
michael
parents: 2669
diff changeset
2832 h->default_ref_list[1][1] = temp;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2833 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2834
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2835 if(index < h->ref_count[ list ])
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2836 memset(&h->default_ref_list[list][index], 0, sizeof(Picture)*(h->ref_count[ list ] - index));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2837 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2838 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2839 int index=0;
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
2840 for(i=0; i<h->short_ref_count; i++){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2841 if(h->short_ref[i]->reference != 3) continue; //FIXME refernce field shit
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2842 h->default_ref_list[0][index ]= *h->short_ref[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2843 h->default_ref_list[0][index++].pic_id= h->short_ref[i]->frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2844 }
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
2845 for(i = 0; i < 16; 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
2846 if(h->long_ref[i] == NULL) continue;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2847 if(h->long_ref[i]->reference != 3) continue;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2848 h->default_ref_list[0][index ]= *h->long_ref[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2849 h->default_ref_list[0][index++].pic_id= i;;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2850 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2851 if(index < h->ref_count[0])
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2852 memset(&h->default_ref_list[0][index], 0, sizeof(Picture)*(h->ref_count[0] - index));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2853 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2854 }else{ //FIELD
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2855 if(h->slice_type==B_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2856 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2857 //FIXME second field balh
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2858 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2859 }
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
2860 #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
2861 for (i=0; i<h->ref_count[0]; i++) {
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
2862 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
2863 }
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
2864 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
2865 for (i=0; i<h->ref_count[1]; i++) {
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
2866 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
2867 }
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
2868 }
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
2869 #endif
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2870 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2871 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2872
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
2873 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
2874 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
2875
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2876 static int decode_ref_pic_list_reordering(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2877 MpegEncContext * const s = &h->s;
2680
1a6192e0b1f9 fill missing reference pictures with something to avoid assertion failure
michael
parents: 2675
diff changeset
2878 int list, index;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2879
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
2880 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
2881 print_long_term(h);
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
2882 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
2883
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
2884 for(list=0; list<h->list_count; list++){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2885 memcpy(h->ref_list[list], h->default_ref_list[list], sizeof(Picture)*h->ref_count[list]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2886
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2887 if(get_bits1(&s->gb)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2888 int pred= h->curr_pic_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2889
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2890 for(index=0; ; index++){
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
2891 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
2892 unsigned int pic_id;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2893 int i;
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
2894 Picture *ref = NULL;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2895
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2896 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
2897 break;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2898
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2899 if(index >= h->ref_count[list]){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
2900 av_log(h->s.avctx, AV_LOG_ERROR, "reference count overflow\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2901 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2902 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2903
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2904 if(reordering_of_pic_nums_idc<3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2905 if(reordering_of_pic_nums_idc<2){
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
2906 const unsigned int abs_diff_pic_num= get_ue_golomb(&s->gb) + 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2907
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2908 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
2909 av_log(h->s.avctx, AV_LOG_ERROR, "abs_diff_pic_num overflow\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2910 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2911 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2912
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2913 if(reordering_of_pic_nums_idc == 0) pred-= abs_diff_pic_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2914 else pred+= abs_diff_pic_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2915 pred &= h->max_pic_num - 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2916
2683
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
2917 for(i= h->short_ref_count-1; i>=0; i--){
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
2918 ref = h->short_ref[i];
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
2919 assert(ref->reference == 3);
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
2920 assert(!ref->long_ref);
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
2921 if(ref->data[0] != NULL && ref->frame_num == pred && ref->long_ref == 0) // ignore non existing pictures by testing data[0] pointer
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2922 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2923 }
2683
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
2924 if(i>=0)
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
2925 ref->pic_id= ref->frame_num;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2926 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2927 pic_id= get_ue_golomb(&s->gb); //long_term_pic_idx
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
2928 if(pic_id>31){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
2929 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
2930 return -1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
2931 }
2683
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
2932 ref = h->long_ref[pic_id];
4362
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
2933 if(ref){
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
2934 ref->pic_id= pic_id;
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
2935 assert(ref->reference == 3);
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
2936 assert(ref->long_ref);
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
2937 i=0;
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
2938 }else{
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
2939 i=-1;
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
2940 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2941 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2942
2485
2844b8cf4e11 H.264 multiplce instance in reference list patch by (Loic <lll+ffmpeg m4x org )
michael
parents: 2484
diff changeset
2943 if (i < 0) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
2944 av_log(h->s.avctx, AV_LOG_ERROR, "reference picture missing during reorder\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2945 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
2946 } else {
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
2947 for(i=index; i+1<h->ref_count[list]; i++){
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
2948 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
2949 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
2950 }
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
2951 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
2952 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
2953 }
2683
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
2954 h->ref_list[list][index]= *ref;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2955 }
2284
6d26e105f68f h.264 ref list reordering bugfix patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2272
diff changeset
2956 }else{
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
2957 av_log(h->s.avctx, AV_LOG_ERROR, "illegal reordering_of_pic_nums_idc\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2958 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2959 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2960 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2961 }
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
2962 }
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
2963 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
2964 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
2965 if(!h->ref_list[list][index].data[0])
1a6192e0b1f9 fill missing reference pictures with something to avoid assertion failure
michael
parents: 2675
diff changeset
2966 h->ref_list[list][index]= s->current_picture;
1a6192e0b1f9 fill missing reference pictures with something to avoid assertion failure
michael
parents: 2675
diff changeset
2967 }
1a6192e0b1f9 fill missing reference pictures with something to avoid assertion failure
michael
parents: 2675
diff changeset
2968 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2969
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
2970 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
2971 direct_dist_scale_factor(h);
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
2972 direct_ref_list_init(h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2973 return 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2974 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2975
3379
69901769c811 fill_mbaff_ref_list is missing a return statement, its return value
mru
parents: 3341
diff changeset
2976 static void fill_mbaff_ref_list(H264Context *h){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2977 int list, i, j;
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
2978 for(list=0; list<2; list++){ //FIXME try list_count
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2979 for(i=0; i<h->ref_count[list]; i++){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2980 Picture *frame = &h->ref_list[list][i];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2981 Picture *field = &h->ref_list[list][16+2*i];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2982 field[0] = *frame;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2983 for(j=0; j<3; j++)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2984 field[0].linesize[j] <<= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2985 field[1] = field[0];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2986 for(j=0; j<3; j++)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2987 field[1].data[j] += frame->linesize[j];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2988
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2989 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
2990 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
2991 for(j=0; j<2; j++){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2992 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
2993 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
2994 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2995 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2996 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2997 for(j=0; j<h->ref_count[1]; j++){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2998 for(i=0; i<h->ref_count[0]; i++)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2999 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
3000 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
3001 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
3002 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3003 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3004
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3005 static int pred_weight_table(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3006 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3007 int list, i;
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3008 int luma_def, chroma_def;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3009
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3010 h->use_weight= 0;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3011 h->use_weight_chroma= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3012 h->luma_log2_weight_denom= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3013 h->chroma_log2_weight_denom= get_ue_golomb(&s->gb);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3014 luma_def = 1<<h->luma_log2_weight_denom;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3015 chroma_def = 1<<h->chroma_log2_weight_denom;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3016
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3017 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3018 for(i=0; i<h->ref_count[list]; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3019 int luma_weight_flag, chroma_weight_flag;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3020
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3021 luma_weight_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3022 if(luma_weight_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3023 h->luma_weight[list][i]= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3024 h->luma_offset[list][i]= get_se_golomb(&s->gb);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3025 if( h->luma_weight[list][i] != luma_def
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3026 || h->luma_offset[list][i] != 0)
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3027 h->use_weight= 1;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3028 }else{
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3029 h->luma_weight[list][i]= luma_def;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3030 h->luma_offset[list][i]= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3031 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3032
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3033 chroma_weight_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3034 if(chroma_weight_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3035 int j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3036 for(j=0; j<2; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3037 h->chroma_weight[list][i][j]= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3038 h->chroma_offset[list][i][j]= get_se_golomb(&s->gb);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3039 if( h->chroma_weight[list][i][j] != chroma_def
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3040 || h->chroma_offset[list][i][j] != 0)
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3041 h->use_weight_chroma= 1;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3042 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3043 }else{
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3044 int j;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3045 for(j=0; j<2; j++){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3046 h->chroma_weight[list][i][j]= chroma_def;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3047 h->chroma_offset[list][i][j]= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3048 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3049 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3050 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3051 if(h->slice_type != B_TYPE) break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3052 }
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3053 h->use_weight= h->use_weight || h->use_weight_chroma;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3054 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3055 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3056
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3057 static void implicit_weight_table(H264Context *h){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3058 MpegEncContext * const s = &h->s;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3059 int ref0, ref1;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3060 int cur_poc = s->current_picture_ptr->poc;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3061
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3062 if( h->ref_count[0] == 1 && h->ref_count[1] == 1
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3063 && 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
3064 h->use_weight= 0;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3065 h->use_weight_chroma= 0;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3066 return;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3067 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3068
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3069 h->use_weight= 2;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3070 h->use_weight_chroma= 2;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3071 h->luma_log2_weight_denom= 5;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3072 h->chroma_log2_weight_denom= 5;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3073
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3074 for(ref0=0; ref0 < h->ref_count[0]; ref0++){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3075 int poc0 = h->ref_list[0][ref0].poc;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3076 for(ref1=0; ref1 < h->ref_count[1]; ref1++){
2519
b34f2cac6a71 10l in implicit_weight_table
lorenm
parents: 2509
diff changeset
3077 int poc1 = h->ref_list[1][ref1].poc;
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
3078 int td = av_clip(poc1 - poc0, -128, 127);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3079 if(td){
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
3080 int tb = av_clip(cur_poc - poc0, -128, 127);
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
3081 int tx = (16384 + (FFABS(td) >> 1)) / td;
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
3082 int dist_scale_factor = av_clip((tb*tx + 32) >> 6, -1024, 1023) >> 2;
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3083 if(dist_scale_factor < -64 || dist_scale_factor > 128)
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3084 h->implicit_weight[ref0][ref1] = 32;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3085 else
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3086 h->implicit_weight[ref0][ref1] = 64 - dist_scale_factor;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3087 }else
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3088 h->implicit_weight[ref0][ref1] = 32;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3089 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3090 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3091 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3092
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3093 static inline void unreference_pic(H264Context *h, Picture *pic){
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3094 int i;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3095 pic->reference=0;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3096 if(pic == h->delayed_output_pic)
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3097 pic->reference=1;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3098 else{
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3099 for(i = 0; h->delayed_pic[i]; i++)
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3100 if(pic == h->delayed_pic[i]){
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3101 pic->reference=1;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3102 break;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3103 }
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3104 }
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3105 }
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3106
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3107 /**
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
3108 * instantaneous decoder refresh.
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3109 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3110 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
3111 int i;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3112
2484
a3188eb4266c correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents: 2471
diff changeset
3113 for(i=0; i<16; i++){
a3188eb4266c correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents: 2471
diff changeset
3114 if (h->long_ref[i] != NULL) {
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3115 unreference_pic(h, h->long_ref[i]);
2484
a3188eb4266c correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents: 2471
diff changeset
3116 h->long_ref[i]= NULL;
a3188eb4266c correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents: 2471
diff changeset
3117 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3118 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3119 h->long_ref_count=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3120
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3121 for(i=0; i<h->short_ref_count; i++){
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3122 unreference_pic(h, h->short_ref[i]);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3123 h->short_ref[i]= NULL;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3124 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3125 h->short_ref_count=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3126 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3127
2640
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3128 /* forget old pics after a seek */
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3129 static void flush_dpb(AVCodecContext *avctx){
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3130 H264Context *h= avctx->priv_data;
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3131 int i;
3144
84406a59134c fix a memory leak on seeking.
lorenm
parents: 3138
diff changeset
3132 for(i=0; i<16; i++) {
84406a59134c fix a memory leak on seeking.
lorenm
parents: 3138
diff changeset
3133 if(h->delayed_pic[i])
84406a59134c fix a memory leak on seeking.
lorenm
parents: 3138
diff changeset
3134 h->delayed_pic[i]->reference= 0;
2640
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3135 h->delayed_pic[i]= NULL;
3144
84406a59134c fix a memory leak on seeking.
lorenm
parents: 3138
diff changeset
3136 }
84406a59134c fix a memory leak on seeking.
lorenm
parents: 3138
diff changeset
3137 if(h->delayed_output_pic)
84406a59134c fix a memory leak on seeking.
lorenm
parents: 3138
diff changeset
3138 h->delayed_output_pic->reference= 0;
2640
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3139 h->delayed_output_pic= NULL;
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3140 idr(h);
2751
3247049dfc7a fix segfault if flush is called before the first frame
mru
parents: 2748
diff changeset
3141 if(h->s.current_picture_ptr)
3247049dfc7a fix segfault if flush is called before the first frame
mru
parents: 2748
diff changeset
3142 h->s.current_picture_ptr->reference= 0;
2640
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3143 }
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3144
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3145 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3146 *
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
3147 * @return the removed picture or NULL if an error occurs
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3148 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3149 static Picture * remove_short(H264Context *h, int frame_num){
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
3150 MpegEncContext * const s = &h->s;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3151 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3152
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
3153 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
3154 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
3155
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3156 for(i=0; i<h->short_ref_count; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3157 Picture *pic= h->short_ref[i];
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
3158 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
3159 av_log(h->s.avctx, AV_LOG_DEBUG, "%d %d %p\n", i, pic->frame_num, pic);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3160 if(pic->frame_num == frame_num){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3161 h->short_ref[i]= NULL;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3162 memmove(&h->short_ref[i], &h->short_ref[i+1], (h->short_ref_count - i - 1)*sizeof(Picture*));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3163 h->short_ref_count--;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3164 return pic;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3165 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3166 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3167 return NULL;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3168 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3169
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3170 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3171 *
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
3172 * @return the removed picture or NULL if an error occurs
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3173 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3174 static Picture * remove_long(H264Context *h, int i){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3175 Picture *pic;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3176
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3177 pic= h->long_ref[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3178 h->long_ref[i]= NULL;
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
3179 if(pic) h->long_ref_count--;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3180
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3181 return pic;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3182 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3183
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3184 /**
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
3185 * 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
3186 */
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
3187 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
3188 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
3189 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
3190 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
3191 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
3192 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
3193 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
3194 }
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
3195 }
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
3196 }
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
3197
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
3198 /**
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
3199 * 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
3200 */
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
3201 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
3202 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
3203 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
3204 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
3205 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
3206 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
3207 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
3208 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
3209 }
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
3210 }
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
3211 }
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
3212 }
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
3213
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
3214 /**
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3215 * Executes the reference picture marking (memory management control operations).
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3216 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3217 static int execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3218 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
3219 int i, j;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3220 int current_is_long=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3221 Picture *pic;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3222
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3223 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
3224 av_log(h->s.avctx, AV_LOG_DEBUG, "no mmco here\n");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3225
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3226 for(i=0; i<mmco_count; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3227 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
3228 av_log(h->s.avctx, AV_LOG_DEBUG, "mmco:%d %d %d\n", h->mmco[i].opcode, h->mmco[i].short_frame_num, h->mmco[i].long_index);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3229
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3230 switch(mmco[i].opcode){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3231 case MMCO_SHORT2UNUSED:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3232 pic= remove_short(h, mmco[i].short_frame_num);
2766
0609f405e000 make decoder a little bit more tolerant to missing NAL units
michael
parents: 2763
diff changeset
3233 if(pic)
0609f405e000 make decoder a little bit more tolerant to missing NAL units
michael
parents: 2763
diff changeset
3234 unreference_pic(h, pic);
0609f405e000 make decoder a little bit more tolerant to missing NAL units
michael
parents: 2763
diff changeset
3235 else if(s->avctx->debug&FF_DEBUG_MMCO)
0609f405e000 make decoder a little bit more tolerant to missing NAL units
michael
parents: 2763
diff changeset
3236 av_log(h->s.avctx, AV_LOG_DEBUG, "mmco: remove_short() failure\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3237 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3238 case MMCO_SHORT2LONG:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3239 pic= remove_long(h, mmco[i].long_index);
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3240 if(pic) unreference_pic(h, pic);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3241
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3242 h->long_ref[ mmco[i].long_index ]= remove_short(h, mmco[i].short_frame_num);
4362
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
3243 if (h->long_ref[ mmco[i].long_index ]){
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
3244 h->long_ref[ mmco[i].long_index ]->long_ref=1;
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
3245 h->long_ref_count++;
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
3246 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3247 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3248 case MMCO_LONG2UNUSED:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3249 pic= remove_long(h, mmco[i].long_index);
2766
0609f405e000 make decoder a little bit more tolerant to missing NAL units
michael
parents: 2763
diff changeset
3250 if(pic)
0609f405e000 make decoder a little bit more tolerant to missing NAL units
michael
parents: 2763
diff changeset
3251 unreference_pic(h, pic);
0609f405e000 make decoder a little bit more tolerant to missing NAL units
michael
parents: 2763
diff changeset
3252 else if(s->avctx->debug&FF_DEBUG_MMCO)
0609f405e000 make decoder a little bit more tolerant to missing NAL units
michael
parents: 2763
diff changeset
3253 av_log(h->s.avctx, AV_LOG_DEBUG, "mmco: remove_long() failure\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3254 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3255 case MMCO_LONG:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3256 pic= remove_long(h, mmco[i].long_index);
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3257 if(pic) unreference_pic(h, pic);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3258
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3259 h->long_ref[ mmco[i].long_index ]= s->current_picture_ptr;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3260 h->long_ref[ mmco[i].long_index ]->long_ref=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3261 h->long_ref_count++;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3262
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3263 current_is_long=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3264 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3265 case MMCO_SET_MAX_LONG:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3266 assert(mmco[i].long_index <= 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
3267 // just remove the long term which index is greater than new max
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
3268 for(j = mmco[i].long_index; 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
3269 pic = remove_long(h, j);
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3270 if (pic) unreference_pic(h, pic);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3271 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3272 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3273 case MMCO_RESET:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3274 while(h->short_ref_count){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3275 pic= remove_short(h, h->short_ref[0]->frame_num);
4362
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
3276 if(pic) unreference_pic(h, pic);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3277 }
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
3278 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
3279 pic= remove_long(h, j);
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3280 if(pic) unreference_pic(h, pic);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3281 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3282 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3283 default: assert(0);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3284 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3285 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3286
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3287 if(!current_is_long){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3288 pic= remove_short(h, s->current_picture_ptr->frame_num);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3289 if(pic){
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3290 unreference_pic(h, pic);
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3291 av_log(h->s.avctx, AV_LOG_ERROR, "illegal short term buffer state detected\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3292 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3293
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3294 if(h->short_ref_count)
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
3295 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
3296
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
3297 h->short_ref[0]= s->current_picture_ptr;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3298 h->short_ref[0]->long_ref=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3299 h->short_ref_count++;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3300 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3301
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
3302 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
3303 print_long_term(h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3304 return 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3305 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3306
5172
60a4f209838b Decouple bit context from h264 context in decode_ref_pic_marking()
gpoirier
parents: 5170
diff changeset
3307 static int decode_ref_pic_marking(H264Context *h, GetBitContext *gb){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3308 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3309 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3310
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3311 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
3312 s->broken_link= get_bits1(gb) -1;
60a4f209838b Decouple bit context from h264 context in decode_ref_pic_marking()
gpoirier
parents: 5170
diff changeset
3313 h->mmco[0].long_index= get_bits1(gb) - 1; // current_long_term_idx
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3314 if(h->mmco[0].long_index == -1)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3315 h->mmco_index= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3316 else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3317 h->mmco[0].opcode= MMCO_LONG;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3318 h->mmco_index= 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3319 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3320 }else{
5172
60a4f209838b Decouple bit context from h264 context in decode_ref_pic_marking()
gpoirier
parents: 5170
diff changeset
3321 if(get_bits1(gb)){ // adaptive_ref_pic_marking_mode_flag
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3322 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
3323 MMCOOpcode opcode= get_ue_golomb(gb);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3324
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3325 h->mmco[i].opcode= opcode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3326 if(opcode==MMCO_SHORT2UNUSED || opcode==MMCO_SHORT2LONG){
5172
60a4f209838b Decouple bit context from h264 context in decode_ref_pic_marking()
gpoirier
parents: 5170
diff changeset
3327 h->mmco[i].short_frame_num= (h->frame_num - get_ue_golomb(gb) - 1) & ((1<<h->sps.log2_max_frame_num)-1); //FIXME fields
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3328 /* if(h->mmco[i].short_frame_num >= h->short_ref_count || h->short_ref[ h->mmco[i].short_frame_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
3329 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
3330 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3331 }*/
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3332 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3333 if(opcode==MMCO_SHORT2LONG || opcode==MMCO_LONG2UNUSED || opcode==MMCO_LONG || opcode==MMCO_SET_MAX_LONG){
5172
60a4f209838b Decouple bit context from h264 context in decode_ref_pic_marking()
gpoirier
parents: 5170
diff changeset
3334 unsigned int long_index= get_ue_golomb(gb);
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3335 if(/*h->mmco[i].long_index >= h->long_ref_count || h->long_ref[ h->mmco[i].long_index ] == NULL*/ long_index >= 16){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3336 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
3337 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3338 }
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3339 h->mmco[i].long_index= long_index;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3340 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3341
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3342 if(opcode > (unsigned)MMCO_LONG){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3343 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
3344 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3345 }
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
3346 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
3347 break;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3348 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3349 h->mmco_index= i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3350 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3351 assert(h->long_ref_count + h->short_ref_count <= h->sps.ref_frame_count);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3352
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3353 if(h->long_ref_count + h->short_ref_count == h->sps.ref_frame_count){ //FIXME fields
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3354 h->mmco[0].opcode= MMCO_SHORT2UNUSED;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3355 h->mmco[0].short_frame_num= h->short_ref[ h->short_ref_count - 1 ]->frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3356 h->mmco_index= 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3357 }else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3358 h->mmco_index= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3359 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3360 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3361
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3362 return 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3363 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3364
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3365 static int init_poc(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3366 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3367 const int max_frame_num= 1<<h->sps.log2_max_frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3368 int field_poc[2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3369
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3370 if(h->nal_unit_type == NAL_IDR_SLICE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3371 h->frame_num_offset= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3372 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3373 if(h->frame_num < h->prev_frame_num)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3374 h->frame_num_offset= h->prev_frame_num_offset + max_frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3375 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3376 h->frame_num_offset= h->prev_frame_num_offset;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3377 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3378
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3379 if(h->sps.poc_type==0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3380 const int max_poc_lsb= 1<<h->sps.log2_max_poc_lsb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3381
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
3382 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
3383 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
3384 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
3385 }
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
3386
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3387 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
3388 h->poc_msb = h->prev_poc_msb + max_poc_lsb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3389 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
3390 h->poc_msb = h->prev_poc_msb - max_poc_lsb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3391 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3392 h->poc_msb = h->prev_poc_msb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3393 //printf("poc: %d %d\n", h->poc_msb, h->poc_lsb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3394 field_poc[0] =
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3395 field_poc[1] = h->poc_msb + h->poc_lsb;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3396 if(s->picture_structure == PICT_FRAME)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3397 field_poc[1] += h->delta_poc_bottom;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3398 }else if(h->sps.poc_type==1){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3399 int abs_frame_num, expected_delta_per_poc_cycle, expectedpoc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3400 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3401
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3402 if(h->sps.poc_cycle_length != 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3403 abs_frame_num = h->frame_num_offset + h->frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3404 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3405 abs_frame_num = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3406
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3407 if(h->nal_ref_idc==0 && abs_frame_num > 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3408 abs_frame_num--;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3409
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3410 expected_delta_per_poc_cycle = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3411 for(i=0; i < h->sps.poc_cycle_length; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3412 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
3413
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3414 if(abs_frame_num > 0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3415 int poc_cycle_cnt = (abs_frame_num - 1) / h->sps.poc_cycle_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3416 int frame_num_in_poc_cycle = (abs_frame_num - 1) % h->sps.poc_cycle_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3417
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3418 expectedpoc = poc_cycle_cnt * expected_delta_per_poc_cycle;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3419 for(i = 0; i <= frame_num_in_poc_cycle; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3420 expectedpoc = expectedpoc + h->sps.offset_for_ref_frame[ i ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3421 } else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3422 expectedpoc = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3423
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3424 if(h->nal_ref_idc == 0)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3425 expectedpoc = expectedpoc + h->sps.offset_for_non_ref_pic;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3426
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3427 field_poc[0] = expectedpoc + h->delta_poc[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3428 field_poc[1] = field_poc[0] + h->sps.offset_for_top_to_bottom_field;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3429
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3430 if(s->picture_structure == PICT_FRAME)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3431 field_poc[1] += h->delta_poc[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3432 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3433 int poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3434 if(h->nal_unit_type == NAL_IDR_SLICE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3435 poc= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3436 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3437 if(h->nal_ref_idc) poc= 2*(h->frame_num_offset + h->frame_num);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3438 else poc= 2*(h->frame_num_offset + h->frame_num) - 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3439 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3440 field_poc[0]= poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3441 field_poc[1]= poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3442 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3443
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3444 if(s->picture_structure != PICT_BOTTOM_FIELD)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3445 s->current_picture_ptr->field_poc[0]= field_poc[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3446 if(s->picture_structure != PICT_TOP_FIELD)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3447 s->current_picture_ptr->field_poc[1]= field_poc[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3448 if(s->picture_structure == PICT_FRAME) // FIXME field pix?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3449 s->current_picture_ptr->poc= FFMIN(field_poc[0], field_poc[1]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3450
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3451 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3452 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3453
5160
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3454
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3455 /**
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3456 * initialize scan tables
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3457 */
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3458 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
3459 MpegEncContext * const s = &h->s;
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3460 int i;
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3461 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
3462 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
3463 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
3464 }else{
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3465 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
3466 #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
3467 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
3468 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
3469 #undef T
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3470 }
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3471 }
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3472 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
3473 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
3474 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
3475 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
3476 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
3477 }else{
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3478 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
3479 #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
3480 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
3481 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
3482 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
3483 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
3484 #undef T
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3485 }
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3486 }
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3487 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
3488 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
3489 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
3490 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
3491 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
3492 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
3493 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
3494 }else{
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3495 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
3496 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
3497 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
3498 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
3499 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
3500 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
3501 }
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3502 }
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3503
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3504 /**
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3505 * Replicates H264 "master" context to thread contexts.
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3506 */
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3507 static void clone_slice(H264Context *dst, H264Context *src)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3508 {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3509 memcpy(dst->block_offset, src->block_offset, sizeof(dst->block_offset));
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3510 dst->s.current_picture_ptr = src->s.current_picture_ptr;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3511 dst->s.current_picture = src->s.current_picture;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3512 dst->s.linesize = src->s.linesize;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3513 dst->s.uvlinesize = src->s.uvlinesize;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3514
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3515 dst->prev_poc_msb = src->prev_poc_msb;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3516 dst->prev_poc_lsb = src->prev_poc_lsb;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3517 dst->prev_frame_num_offset = src->prev_frame_num_offset;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3518 dst->prev_frame_num = src->prev_frame_num;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3519 dst->short_ref_count = src->short_ref_count;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3520
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3521 memcpy(dst->short_ref, src->short_ref, sizeof(dst->short_ref));
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3522 memcpy(dst->long_ref, src->long_ref, sizeof(dst->long_ref));
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3523 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
3524 memcpy(dst->ref_list, src->ref_list, sizeof(dst->ref_list));
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3525 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3526
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3527 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3528 * decodes a slice header.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3529 * 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
3530 *
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3531 * @param h h264context
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3532 * @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
3533 *
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3534 * @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
3535 */
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3536 static int decode_slice_header(H264Context *h, H264Context *h0){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3537 MpegEncContext * const s = &h->s;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3538 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
3539 unsigned int pps_id;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3540 int num_ref_idx_active_override_flag;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3541 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
3542 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
3543 int default_ref_list_done = 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3544
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3545 s->current_picture.reference= h->nal_ref_idc != 0;
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
3546 s->dropable= h->nal_ref_idc == 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3547
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3548 first_mb_in_slice= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3549
4616
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
3550 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
3551 h0->current_slice = 0;
4616
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
3552 s->current_picture_ptr= NULL;
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
3553 }
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
3554
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3555 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
3556 if(slice_type > 9){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3557 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
3558 return -1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3559 }
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3560 if(slice_type > 4){
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3561 slice_type -= 5;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3562 h->slice_type_fixed=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3563 }else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3564 h->slice_type_fixed=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3565
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3566 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
3567 if (slice_type == I_TYPE
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3568 || (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
3569 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
3570 }
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3571 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
3572
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
3573 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
3574
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3575 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
3576 if(pps_id>=MAX_PPS_COUNT){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3577 av_log(h->s.avctx, AV_LOG_ERROR, "pps_id out of range\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3578 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3579 }
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3580 if(!h0->pps_buffers[pps_id]) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3581 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
3582 return -1;
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
3583 }
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3584 h->pps= *h0->pps_buffers[pps_id];
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3585
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3586 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
3587 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
3588 return -1;
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
3589 }
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3590 h->sps = *h0->sps_buffers[h->pps.sps_id];
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3591
4363
9b7662fa4905 remove useless cast that makes code unreadable
gpoirier
parents: 4362
diff changeset
3592 if(h->dequant_coeff_pps != pps_id){
9b7662fa4905 remove useless cast that makes code unreadable
gpoirier
parents: 4362
diff changeset
3593 h->dequant_coeff_pps = pps_id;
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3594 init_dequant_tables(h);
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3595 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3596
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3597 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
3598 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
3599
3178
bd995b8c64fd Alignment fixes, caused problems on SPARC.
diego
parents: 3177
diff changeset
3600 h->b_stride= s->mb_width*4;
bd995b8c64fd Alignment fixes, caused problems on SPARC.
diego
parents: 3177
diff changeset
3601 h->b8_stride= s->mb_width*2;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3602
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
3603 s->width = 16*s->mb_width - 2*(h->sps.crop_left + h->sps.crop_right );
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3604 if(h->sps.frame_mbs_only_flag)
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
3605 s->height= 16*s->mb_height - 2*(h->sps.crop_top + h->sps.crop_bottom);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3606 else
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
3607 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
3608
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3609 if (s->context_initialized
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
3610 && ( s->width != s->avctx->width || s->height != s->avctx->height)) {
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3611 if(h != h0)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3612 return -1; // width / height changed during parallelized decoding
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3613 free_tables(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3614 MPV_common_end(s);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3615 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3616 if (!s->context_initialized) {
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3617 if(h != h0)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3618 return -1; // we cant (re-)initialize context during parallel decoding
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3619 if (MPV_common_init(s) < 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3620 return -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3621
5160
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3622 init_scan_tables(h);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3623 alloc_tables(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3624
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3625 for(i = 1; i < s->avctx->thread_count; i++) {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3626 H264Context *c;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3627 c = h->thread_context[i] = av_malloc(sizeof(H264Context));
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3628 memcpy(c, h, sizeof(MpegEncContext));
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3629 memset(&c->s + 1, 0, sizeof(H264Context) - sizeof(MpegEncContext));
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3630 c->sps = h->sps;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3631 c->pps = h->pps;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3632 init_scan_tables(c);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3633 clone_tables(c, h);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3634 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3635
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3636 for(i = 0; i < s->avctx->thread_count; i++)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3637 if(context_init(h->thread_context[i]) < 0)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3638 return -1;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3639
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3640 s->avctx->width = s->width;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3641 s->avctx->height = s->height;
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
3642 s->avctx->sample_aspect_ratio= h->sps.sar;
2440
cf97353f94c6 div by zero aspect fix
michael
parents: 2422
diff changeset
3643 if(!s->avctx->sample_aspect_ratio.den)
cf97353f94c6 div by zero aspect fix
michael
parents: 2422
diff changeset
3644 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
3645
2648
c3a06b0b00e2 set time_base for variable fps too
michael
parents: 2645
diff changeset
3646 if(h->sps.timing_info_present_flag){
3052
6c3f87300378 interpret H264 VUI timing info correctly
mru
parents: 3036
diff changeset
3647 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
3648 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
3649 s->avctx->time_base.den *= 2;
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3052
diff changeset
3650 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
3651 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
3652 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3653 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3654
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3655 if(h0->current_slice == 0){
2935
b564bb15e63c check MPV_frame_start() return value
michael
parents: 2928
diff changeset
3656 if(frame_start(h) < 0)
b564bb15e63c check MPV_frame_start() return value
michael
parents: 2928
diff changeset
3657 return -1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3658 }
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3659 if(h != h0)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3660 clone_slice(h, h0);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3661
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
3662 s->current_picture_ptr->frame_num= //FIXME frame_num cleanup
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3663 h->frame_num= get_bits(&s->gb, h->sps.log2_max_frame_num);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3664
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3665 h->mb_mbaff = 0;
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3666 h->mb_aff_frame = 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3667 if(h->sps.frame_mbs_only_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3668 s->picture_structure= PICT_FRAME;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3669 }else{
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3670 if(get_bits1(&s->gb)) { //field_pic_flag
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3671 s->picture_structure= PICT_TOP_FIELD + get_bits1(&s->gb); //bottom_field_flag
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3672 av_log(h->s.avctx, AV_LOG_ERROR, "PAFF interlacing is not implemented\n");
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3673 } else {
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3674 s->picture_structure= PICT_FRAME;
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3675 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
3676 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3677 }
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3678 assert(s->mb_num == s->mb_width * s->mb_height);
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3679 if(first_mb_in_slice << h->mb_aff_frame >= s->mb_num ||
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3680 first_mb_in_slice >= s->mb_num){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3681 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
3682 return -1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3683 }
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3684 s->resync_mb_x = s->mb_x = first_mb_in_slice % s->mb_width;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3685 s->resync_mb_y = s->mb_y = (first_mb_in_slice / s->mb_width) << h->mb_aff_frame;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3686 assert(s->mb_y < s->mb_height);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3687
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3688 if(s->picture_structure==PICT_FRAME){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3689 h->curr_pic_num= h->frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3690 h->max_pic_num= 1<< h->sps.log2_max_frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3691 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3692 h->curr_pic_num= 2*h->frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3693 h->max_pic_num= 1<<(h->sps.log2_max_frame_num + 1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3694 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3695
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3696 if(h->nal_unit_type == NAL_IDR_SLICE){
1453
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
3697 get_ue_golomb(&s->gb); /* idr_pic_id */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3698 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3699
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3700 if(h->sps.poc_type==0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3701 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
3702
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3703 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3704 h->delta_poc_bottom= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3705 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3706 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3707
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3708 if(h->sps.poc_type==1 && !h->sps.delta_pic_order_always_zero_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3709 h->delta_poc[0]= get_se_golomb(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3710
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3711 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3712 h->delta_poc[1]= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3713 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3714
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3715 init_poc(h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3716
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3717 if(h->pps.redundant_pic_cnt_present){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3718 h->redundant_pic_count= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3719 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3720
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3721 //set defaults, might be overriden a few line later
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3722 h->ref_count[0]= h->pps.ref_count[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3723 h->ref_count[1]= h->pps.ref_count[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3724
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3725 if(h->slice_type == P_TYPE || h->slice_type == SP_TYPE || h->slice_type == B_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3726 if(h->slice_type == B_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3727 h->direct_spatial_mv_pred= get_bits1(&s->gb);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3728 if(h->sps.mb_aff && h->direct_spatial_mv_pred)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3729 av_log(h->s.avctx, AV_LOG_ERROR, "MBAFF + spatial direct mode is not implemented\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3730 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3731 num_ref_idx_active_override_flag= get_bits1(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3732
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3733 if(num_ref_idx_active_override_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3734 h->ref_count[0]= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3735 if(h->slice_type==B_TYPE)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3736 h->ref_count[1]= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3737
4532
c296efb7575e fix 2nd ref_count check
michael
parents: 4531
diff changeset
3738 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
3739 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
3740 h->ref_count[0]= h->ref_count[1]= 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3741 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3742 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3743 }
4532
c296efb7575e fix 2nd ref_count check
michael
parents: 4531
diff changeset
3744 if(h->slice_type == B_TYPE)
c296efb7575e fix 2nd ref_count check
michael
parents: 4531
diff changeset
3745 h->list_count= 2;
c296efb7575e fix 2nd ref_count check
michael
parents: 4531
diff changeset
3746 else
c296efb7575e fix 2nd ref_count check
michael
parents: 4531
diff changeset
3747 h->list_count= 1;
c296efb7575e fix 2nd ref_count check
michael
parents: 4531
diff changeset
3748 }else
c296efb7575e fix 2nd ref_count check
michael
parents: 4531
diff changeset
3749 h->list_count= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3750
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3751 if(!default_ref_list_done){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3752 fill_default_ref_list(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3753 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3754
2766
0609f405e000 make decoder a little bit more tolerant to missing NAL units
michael
parents: 2763
diff changeset
3755 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
3756 return -1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3757
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3758 if( (h->pps.weighted_pred && (h->slice_type == P_TYPE || h->slice_type == SP_TYPE ))
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3759 || (h->pps.weighted_bipred_idc==1 && h->slice_type==B_TYPE ) )
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3760 pred_weight_table(h);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3761 else if(h->pps.weighted_bipred_idc==2 && h->slice_type==B_TYPE)
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3762 implicit_weight_table(h);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3763 else
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3764 h->use_weight = 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3765
2580
b4f6f89ec2f6 The cvs version 1.103 of h264.c brokes 13 conformance streams, this
michael
parents: 2561
diff changeset
3766 if(s->current_picture.reference)
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3767 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
3768
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3769 if(FRAME_MBAFF)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3770 fill_mbaff_ref_list(h);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3771
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3772 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
3773 tmp = get_ue_golomb(&s->gb);
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3774 if(tmp > 2){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3775 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
3776 return -1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3777 }
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3778 h->cabac_init_idc= tmp;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3779 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3780
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3781 h->last_qscale_diff = 0;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3782 tmp = h->pps.init_qp + get_se_golomb(&s->gb);
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3783 if(tmp>51){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3784 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
3785 return -1;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
3786 }
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3787 s->qscale= tmp;
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
3788 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
3789 h->chroma_qp[1] = get_chroma_qp(h, 1, s->qscale);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3790 //FIXME qscale / qp ... stuff
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3791 if(h->slice_type == SP_TYPE){
1453
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
3792 get_bits1(&s->gb); /* sp_for_switch_flag */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3793 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3794 if(h->slice_type==SP_TYPE || h->slice_type == SI_TYPE){
1453
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
3795 get_se_golomb(&s->gb); /* slice_qs_delta */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3796 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3797
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3798 h->deblocking_filter = 1;
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
3799 h->slice_alpha_c0_offset = 0;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
3800 h->slice_beta_offset = 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3801 if( h->pps.deblocking_filter_parameters_present ) {
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3802 tmp= get_ue_golomb(&s->gb);
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3803 if(tmp > 2){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3804 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
3805 return -1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3806 }
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3807 h->deblocking_filter= tmp;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3808 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
3809 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
3810
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3811 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
3812 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
3813 h->slice_beta_offset = get_se_golomb(&s->gb) << 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3814 }
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
3815 }
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3816
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3817 if(h->deblocking_filter == 1 && h0->max_contexts > 1) {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3818 h0->max_contexts = 1;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3819 if(!h0->single_decode_warning) {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3820 av_log(s->avctx, AV_LOG_INFO, "Cannot parallelize deblocking type 1, decoding such frames in sequential order\n");
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3821 h0->single_decode_warning = 1;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3822 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3823 if(h != h0)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3824 return 1; // deblocking switched inside frame
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3825 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3826
2792
0a8c847ad5e7 skip_idct
michael
parents: 2781
diff changeset
3827 if( s->avctx->skip_loop_filter >= AVDISCARD_ALL
0a8c847ad5e7 skip_idct
michael
parents: 2781
diff changeset
3828 ||(s->avctx->skip_loop_filter >= AVDISCARD_NONKEY && h->slice_type != I_TYPE)
0a8c847ad5e7 skip_idct
michael
parents: 2781
diff changeset
3829 ||(s->avctx->skip_loop_filter >= AVDISCARD_BIDIR && h->slice_type == B_TYPE)
0a8c847ad5e7 skip_idct
michael
parents: 2781
diff changeset
3830 ||(s->avctx->skip_loop_filter >= AVDISCARD_NONREF && h->nal_ref_idc == 0))
0a8c847ad5e7 skip_idct
michael
parents: 2781
diff changeset
3831 h->deblocking_filter= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3832
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3833 #if 0 //FMO
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3834 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
3835 slice_group_change_cycle= get_bits(&s->gb, ?);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3836 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3837
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3838 h0->last_slice_type = slice_type;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3839 h->slice_num = ++h0->current_slice;
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
3840
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3841 h->emu_edge_width= (s->flags&CODEC_FLAG_EMU_EDGE) ? 0 : 16;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3842 h->emu_edge_height= FRAME_MBAFF ? 0 : h->emu_edge_width;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3843
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3844 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
3845 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
3846 h->slice_num,
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3847 (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
3848 first_mb_in_slice,
1264
2fa34e615c76 cleanup
michaelni
parents: 1252
diff changeset
3849 av_get_pict_type_char(h->slice_type),
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3850 pps_id, h->frame_num,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3851 s->current_picture_ptr->field_poc[0], s->current_picture_ptr->field_poc[1],
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3852 h->ref_count[0], h->ref_count[1],
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3853 s->qscale,
2583
61a08e2b9822 display deblocking strength in FF_DEBUG_PICT_INFO
lorenm
parents: 2582
diff changeset
3854 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
3855 h->use_weight,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3856 h->use_weight==1 && h->use_weight_chroma ? "c" : ""
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3857 );
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3858 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3859
3807
6a40092eb9e6 approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents: 3776
diff changeset
3860 if((s->avctx->flags2 & CODEC_FLAG2_FAST) && !s->current_picture.reference){
6a40092eb9e6 approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents: 3776
diff changeset
3861 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
3862 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
3863 }else{
6a40092eb9e6 approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents: 3776
diff changeset
3864 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
3865 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
3866 }
6a40092eb9e6 approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents: 3776
diff changeset
3867
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3868 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3869 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3870
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3871 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3872 *
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3873 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3874 static inline int get_level_prefix(GetBitContext *gb){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3875 unsigned int buf;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3876 int log;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3877
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3878 OPEN_READER(re, gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3879 UPDATE_CACHE(re, gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3880 buf=GET_CACHE(re, gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3881
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3882 log= 32 - av_log2(buf);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3883 #ifdef TRACE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3884 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
3885 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
3886 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3887
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3888 LAST_SKIP_BITS(re, gb, log);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3889 CLOSE_READER(re, gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3890
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3891 return log-1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3892 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3893
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3894 static inline int get_dct8x8_allowed(H264Context *h){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3895 int i;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3896 for(i=0; i<4; i++){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3897 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
3898 || (!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
3899 return 0;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3900 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3901 return 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3902 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3903
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3904 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3905 * decodes a residual block.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3906 * @param n block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3907 * @param scantable scantable
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3908 * @param max_coeff number of coefficients in the block
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3909 * @return <0 if an error occured
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3910 */
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3911 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
3912 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3913 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
3914 int level[16];
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
3915 int zeros_left, coeff_num, coeff_token, total_coeff, i, j, trailing_ones, run_before;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3916
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3917 //FIXME put trailing_onex into the context
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3918
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3919 if(n == CHROMA_DC_BLOCK_INDEX){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3920 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
3921 total_coeff= coeff_token>>2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3922 }else{
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3923 if(n == LUMA_DC_BLOCK_INDEX){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3924 total_coeff= pred_non_zero_count(h, 0);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3925 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
3926 total_coeff= coeff_token>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3927 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3928 total_coeff= pred_non_zero_count(h, n);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3929 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
3930 total_coeff= coeff_token>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3931 h->non_zero_count_cache[ scan8[n] ]= total_coeff;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3932 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3933 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3934
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3935 //FIXME set last_non_zero?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3936
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3937 if(total_coeff==0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3938 return 0;
4391
20944c70a3c0 fix segfault with darkkben.free.fr/corrupted_h264.mp4
michael
parents: 4390
diff changeset
3939 if(total_coeff > (unsigned)max_coeff) {
20944c70a3c0 fix segfault with darkkben.free.fr/corrupted_h264.mp4
michael
parents: 4390
diff changeset
3940 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
3941 return -1;
758ba4a18478 fix crash when decoding a truncated H264 slice
gpoirier
parents: 4269
diff changeset
3942 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3943
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3944 trailing_ones= coeff_token&3;
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
3945 tprintf(h->s.avctx, "trailing:%d, total:%d\n", trailing_ones, total_coeff);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3946 assert(total_coeff<=16);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3947
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3948 for(i=0; i<trailing_ones; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3949 level[i]= 1 - 2*get_bits1(gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3950 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3951
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
3952 if(i<total_coeff) {
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3953 int level_code, mask;
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
3954 int suffix_length = total_coeff > 10 && trailing_ones < 3;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
3955 int prefix= get_level_prefix(gb);
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
3956
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
3957 //first coefficient has suffix_length equal to 0 or 1
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3958 if(prefix<14){ //FIXME try to build a large unified VLC table for all this
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3959 if(suffix_length)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3960 level_code= (prefix<<suffix_length) + get_bits(gb, suffix_length); //part
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3961 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3962 level_code= (prefix<<suffix_length); //part
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3963 }else if(prefix==14){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3964 if(suffix_length)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3965 level_code= (prefix<<suffix_length) + get_bits(gb, suffix_length); //part
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3966 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3967 level_code= prefix + get_bits(gb, 4); //part
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3968 }else if(prefix==15){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3969 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
3970 if(suffix_length==0) level_code+=15; //FIXME doesn't make (much)sense
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3971 }else{
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3972 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
3973 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3974 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3975
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
3976 if(trailing_ones < 3) level_code += 2;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
3977
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
3978 suffix_length = 1;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
3979 if(level_code > 5)
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
3980 suffix_length++;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3981 mask= -(level_code&1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3982 level[i]= (((2+level_code)>>1) ^ mask) - mask;
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
3983 i++;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
3984
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
3985 //remaining coefficients have suffix_length > 0
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
3986 for(;i<total_coeff;i++) {
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
3987 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
3988 prefix = get_level_prefix(gb);
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
3989 if(prefix<15){
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
3990 level_code = (prefix<<suffix_length) + get_bits(gb, suffix_length);
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
3991 }else if(prefix==15){
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
3992 level_code = (prefix<<suffix_length) + get_bits(gb, 12);
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
3993 }else{
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
3994 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
3995 return -1;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
3996 }
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
3997 mask= -(level_code&1);
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
3998 level[i]= (((2+level_code)>>1) ^ mask) - mask;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
3999 if(level_code > suffix_limit[suffix_length])
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4000 suffix_length++;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4001 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4002 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4003
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4004 if(total_coeff == max_coeff)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4005 zeros_left=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4006 else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4007 if(n == CHROMA_DC_BLOCK_INDEX)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4008 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
4009 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4010 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
4011 }
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4012
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4013 coeff_num = zeros_left + total_coeff - 1;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4014 j = scantable[coeff_num];
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4015 if(n > 24){
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4016 block[j] = level[0];
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4017 for(i=1;i<total_coeff;i++) {
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4018 if(zeros_left <= 0)
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4019 run_before = 0;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4020 else if(zeros_left < 7){
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4021 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
4022 }else{
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4023 run_before= get_vlc2(gb, run7_vlc.table, RUN7_VLC_BITS, 2);
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4024 }
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4025 zeros_left -= run_before;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4026 coeff_num -= 1 + run_before;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4027 j= scantable[ coeff_num ];
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4028
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4029 block[j]= level[i];
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4030 }
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4031 }else{
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
4032 block[j] = (level[0] * qmul[j] + 32)>>6;
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4033 for(i=1;i<total_coeff;i++) {
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4034 if(zeros_left <= 0)
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4035 run_before = 0;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4036 else if(zeros_left < 7){
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4037 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
4038 }else{
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4039 run_before= get_vlc2(gb, run7_vlc.table, RUN7_VLC_BITS, 2);
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4040 }
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4041 zeros_left -= run_before;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4042 coeff_num -= 1 + run_before;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4043 j= scantable[ coeff_num ];
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4044
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
4045 block[j]= (level[i] * qmul[j] + 32)>>6;
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4046 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4047 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4048
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4049 if(zeros_left<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
4050 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
4051 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4052 }
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4053
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4054 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4055 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4056
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4057 static void predict_field_decoding_flag(H264Context *h){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4058 MpegEncContext * const s = &h->s;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4059 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4060 int mb_type = (h->slice_table[mb_xy-1] == h->slice_num)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4061 ? s->current_picture.mb_type[mb_xy-1]
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4062 : (h->slice_table[mb_xy-s->mb_stride] == h->slice_num)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4063 ? s->current_picture.mb_type[mb_xy-s->mb_stride]
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4064 : 0;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4065 h->mb_mbaff = h->mb_field_decoding_flag = IS_INTERLACED(mb_type) ? 1 : 0;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4066 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4067
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4068 /**
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4069 * decodes a P_SKIP or B_SKIP macroblock
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4070 */
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4071 static void decode_mb_skip(H264Context *h){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4072 MpegEncContext * const s = &h->s;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4073 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
4074 int mb_type=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4075
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4076 memset(h->non_zero_count[mb_xy], 0, 16);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4077 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
4078
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4079 if(MB_FIELD)
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
4080 mb_type|= MB_TYPE_INTERLACED;
2674
58fb8e1efcae 10l (mb_type uninitalized and then changed and overwritten)
michael
parents: 2673
diff changeset
4081
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4082 if( h->slice_type == B_TYPE )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4083 {
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4084 // 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
4085 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
4086
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
4087 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
4088 pred_direct_motion(h, &mb_type);
3927
f44a3341bfdf simplify write_back_motion for skip mbs
lorenm
parents: 3807
diff changeset
4089 mb_type|= MB_TYPE_SKIP;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4090 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4091 else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4092 {
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4093 int mx, my;
2674
58fb8e1efcae 10l (mb_type uninitalized and then changed and overwritten)
michael
parents: 2673
diff changeset
4094 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
4095
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
4096 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
4097 pred_pskip_motion(h, &mx, &my);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4098 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
4099 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
4100 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4101
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4102 write_back_motion(h, mb_type);
3927
f44a3341bfdf simplify write_back_motion for skip mbs
lorenm
parents: 3807
diff changeset
4103 s->current_picture.mb_type[mb_xy]= mb_type;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4104 s->current_picture.qscale_table[mb_xy]= s->qscale;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4105 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
4106 h->prev_mb_skipped= 1;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4107 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4108
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4109 /**
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4110 * decodes a macroblock
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4111 * @returns 0 if ok, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4112 */
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4113 static int decode_mb_cavlc(H264Context *h){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4114 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
4115 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
4116 int partition_count;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4117 unsigned int mb_type, cbp;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4118 int dct8x8_allowed= h->pps.transform_8x8_mode;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4119
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4120 s->dsp.clear_blocks(h->mb); //FIXME avoid if already clear (move after skip handlong?
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4121
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
4122 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
4123 cbp = 0; /* avoid warning. FIXME: find a solution without slowing
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
4124 down the code */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4125 if(h->slice_type != I_TYPE && h->slice_type != SI_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4126 if(s->mb_skip_run==-1)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4127 s->mb_skip_run= get_ue_golomb(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4128
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4129 if (s->mb_skip_run--) {
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4130 if(FRAME_MBAFF && (s->mb_y&1) == 0){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4131 if(s->mb_skip_run==0)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4132 h->mb_mbaff = h->mb_field_decoding_flag = get_bits1(&s->gb);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4133 else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4134 predict_field_decoding_flag(h);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4135 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4136 decode_mb_skip(h);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4137 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4138 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4139 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4140 if(FRAME_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4141 if( (s->mb_y&1) == 0 )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4142 h->mb_mbaff = h->mb_field_decoding_flag = get_bits1(&s->gb);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4143 }else
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
4144 h->mb_field_decoding_flag= (s->picture_structure!=PICT_FRAME);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4145
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
4146 h->prev_mb_skipped= 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4147
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4148 mb_type= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4149 if(h->slice_type == B_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4150 if(mb_type < 23){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4151 partition_count= b_mb_type_info[mb_type].partition_count;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4152 mb_type= b_mb_type_info[mb_type].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4153 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4154 mb_type -= 23;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4155 goto decode_intra_mb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4156 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4157 }else if(h->slice_type == P_TYPE /*|| h->slice_type == SP_TYPE */){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4158 if(mb_type < 5){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4159 partition_count= p_mb_type_info[mb_type].partition_count;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4160 mb_type= p_mb_type_info[mb_type].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4161 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4162 mb_type -= 5;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4163 goto decode_intra_mb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4164 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4165 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4166 assert(h->slice_type == I_TYPE);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4167 decode_intra_mb:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4168 if(mb_type > 25){
3954
00a12ef7d800 output typo fixes
diego
parents: 3948
diff changeset
4169 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
4170 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4171 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4172 partition_count=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4173 cbp= i_mb_type_info[mb_type].cbp;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4174 h->intra16x16_pred_mode= i_mb_type_info[mb_type].pred_mode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4175 mb_type= i_mb_type_info[mb_type].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4176 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4177
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4178 if(MB_FIELD)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4179 mb_type |= MB_TYPE_INTERLACED;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4180
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4181 h->slice_table[ mb_xy ]= h->slice_num;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4182
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4183 if(IS_INTRA_PCM(mb_type)){
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4184 unsigned int x, y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4185
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5106
diff changeset
4186 // We assume these blocks are very rare so we do not optimize it.
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4187 align_get_bits(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4188
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4189 // The pixels are stored in the same order as levels in h->mb array.
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4190 for(y=0; y<16; y++){
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4191 const int index= 4*(y&3) + 32*((y>>2)&1) + 128*(y>>3);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4192 for(x=0; x<16; x++){
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
4193 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
4194 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
4195 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4196 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4197 for(y=0; y<8; y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4198 const int index= 256 + 4*(y&3) + 32*(y>>2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4199 for(x=0; x<8; x++){
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
4200 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
4201 h->mb[index + (x&3) + 16*(x>>2)]= get_bits(&s->gb, 8);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4202 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4203 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4204 for(y=0; y<8; y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4205 const int index= 256 + 64 + 4*(y&3) + 32*(y>>2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4206 for(x=0; x<8; x++){
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
4207 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
4208 h->mb[index + (x&3) + 16*(x>>2)]= get_bits(&s->gb, 8);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4209 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4210 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4211
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
4212 // In deblocking, the quantizer is 0
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4213 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
4214 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
4215 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
4216 // 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
4217 memset(h->non_zero_count[mb_xy], 16, 16);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4218
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4219 s->current_picture.mb_type[mb_xy]= mb_type;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4220 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4221 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4222
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4223 if(MB_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4224 h->ref_count[0] <<= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4225 h->ref_count[1] <<= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4226 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4227
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
4228 fill_caches(h, mb_type, 0);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4229
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4230 //mb_pred
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4231 if(IS_INTRA(mb_type)){
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4232 int pred_mode;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4233 // init_top_left_availability(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4234 if(IS_INTRA4x4(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4235 int i;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4236 int di = 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4237 if(dct8x8_allowed && get_bits1(&s->gb)){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4238 mb_type |= MB_TYPE_8x8DCT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4239 di = 4;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4240 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4241
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4242 // fill_intra4x4_pred_table(h);
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4243 for(i=0; i<16; i+=di){
3409
584ff6431043 simplify intra prediction mode decoding
michael
parents: 3379
diff changeset
4244 int mode= pred_intra_mode(h, i);
584ff6431043 simplify intra prediction mode decoding
michael
parents: 3379
diff changeset
4245
584ff6431043 simplify intra prediction mode decoding
michael
parents: 3379
diff changeset
4246 if(!get_bits1(&s->gb)){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4247 const int rem_mode= get_bits(&s->gb, 3);
3409
584ff6431043 simplify intra prediction mode decoding
michael
parents: 3379
diff changeset
4248 mode = rem_mode + (rem_mode >= mode);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4249 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4250
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4251 if(di==4)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4252 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
4253 else
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4254 h->intra4x4_pred_mode_cache[ scan8[i] ] = mode;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4255 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4256 write_back_intra_pred_mode(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4257 if( check_intra4x4_pred_mode(h) < 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4258 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4259 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4260 h->intra16x16_pred_mode= check_intra_pred_mode(h, h->intra16x16_pred_mode);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4261 if(h->intra16x16_pred_mode < 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4262 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4263 }
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4264
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4265 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
4266 if(pred_mode < 0)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4267 return -1;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4268 h->chroma_pred_mode= pred_mode;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4269 }else if(partition_count==4){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4270 int i, j, sub_partition_count[4], list, ref[2][4];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4271
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4272 if(h->slice_type == B_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4273 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4274 h->sub_mb_type[i]= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4275 if(h->sub_mb_type[i] >=13){
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4276 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
4277 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4278 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4279 sub_partition_count[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4280 h->sub_mb_type[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4281 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4282 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
4283 || 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
4284 pred_direct_motion(h, &mb_type);
3003
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
4285 h->ref_cache[0][scan8[4]] =
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
4286 h->ref_cache[1][scan8[4]] =
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
4287 h->ref_cache[0][scan8[12]] =
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
4288 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
4289 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4290 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4291 assert(h->slice_type == P_TYPE || h->slice_type == SP_TYPE); //FIXME SP correct ?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4292 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4293 h->sub_mb_type[i]= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4294 if(h->sub_mb_type[i] >=4){
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4295 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
4296 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4297 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4298 sub_partition_count[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4299 h->sub_mb_type[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4300 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4301 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4302
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
4303 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
4304 int ref_count= IS_REF0(mb_type) ? 1 : h->ref_count[list];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4305 for(i=0; i<4; i++){
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4306 if(IS_DIRECT(h->sub_mb_type[i])) continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4307 if(IS_DIR(h->sub_mb_type[i], 0, list)){
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4308 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
4309 if(tmp>=ref_count){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4310 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
4311 return -1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4312 }
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4313 ref[list][i]= tmp;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4314 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4315 //FIXME
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4316 ref[list][i] = -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4317 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4318 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4319 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4320
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4321 if(dct8x8_allowed)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4322 dct8x8_allowed = get_dct8x8_allowed(h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4323
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
4324 for(list=0; list<h->list_count; list++){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4325 for(i=0; i<4; i++){
3003
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
4326 if(IS_DIRECT(h->sub_mb_type[i])) {
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
4327 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
4328 continue;
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
4329 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4330 h->ref_cache[list][ scan8[4*i] ]=h->ref_cache[list][ scan8[4*i]+1 ]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4331 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
4332
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4333 if(IS_DIR(h->sub_mb_type[i], 0, list)){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4334 const int sub_mb_type= h->sub_mb_type[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4335 const int block_width= (sub_mb_type & (MB_TYPE_16x16|MB_TYPE_16x8)) ? 2 : 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4336 for(j=0; j<sub_partition_count[i]; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4337 int mx, my;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4338 const int index= 4*i + block_width*j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4339 int16_t (* mv_cache)[2]= &h->mv_cache[list][ scan8[index] ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4340 pred_motion(h, index, block_width, list, h->ref_cache[list][ scan8[index] ], &mx, &my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4341 mx += get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4342 my += get_se_golomb(&s->gb);
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
4343 tprintf(s->avctx, "final mv:%d %d\n", mx, my);
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
4344
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4345 if(IS_SUB_8X8(sub_mb_type)){
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
4346 mv_cache[ 1 ][0]=
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4347 mv_cache[ 8 ][0]= mv_cache[ 9 ][0]= mx;
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
4348 mv_cache[ 1 ][1]=
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4349 mv_cache[ 8 ][1]= mv_cache[ 9 ][1]= my;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4350 }else if(IS_SUB_8X4(sub_mb_type)){
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
4351 mv_cache[ 1 ][0]= mx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
4352 mv_cache[ 1 ][1]= my;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4353 }else if(IS_SUB_4X8(sub_mb_type)){
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
4354 mv_cache[ 8 ][0]= mx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
4355 mv_cache[ 8 ][1]= my;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4356 }
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
4357 mv_cache[ 0 ][0]= mx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
4358 mv_cache[ 0 ][1]= my;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4359 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4360 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4361 uint32_t *p= (uint32_t *)&h->mv_cache[list][ scan8[4*i] ][0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4362 p[0] = p[1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4363 p[8] = p[9]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4364 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4365 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4366 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4367 }else if(IS_DIRECT(mb_type)){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4368 pred_direct_motion(h, &mb_type);
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4369 dct8x8_allowed &= h->sps.direct_8x8_inference_flag;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4370 }else{
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4371 int list, mx, my, i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4372 //FIXME we should set ref_idx_l? to 0 if we use that later ...
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4373 if(IS_16X16(mb_type)){
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4374 for(list=0; list<h->list_count; list++){
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4375 unsigned int val;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4376 if(IS_DIR(mb_type, 0, list)){
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4377 val= get_te0_golomb(&s->gb, h->ref_count[list]);
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4378 if(val >= h->ref_count[list]){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4379 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
4380 return -1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4381 }
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
4382 }else
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4383 val= LIST_NOT_USED&0xFF;
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4384 fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, val, 1);
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4385 }
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4386 for(list=0; list<h->list_count; list++){
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4387 unsigned int val;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4388 if(IS_DIR(mb_type, 0, list)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4389 pred_motion(h, 0, 4, list, h->ref_cache[list][ scan8[0] ], &mx, &my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4390 mx += get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4391 my += get_se_golomb(&s->gb);
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
4392 tprintf(s->avctx, "final mv:%d %d\n", mx, my);
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
4393
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4394 val= pack16to32(mx,my);
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
4395 }else
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4396 val=0;
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4397 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, val, 4);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4398 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4399 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4400 else if(IS_16X8(mb_type)){
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4401 for(list=0; list<h->list_count; list++){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4402 for(i=0; i<2; i++){
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4403 unsigned int val;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4404 if(IS_DIR(mb_type, i, list)){
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4405 val= get_te0_golomb(&s->gb, h->ref_count[list]);
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4406 if(val >= h->ref_count[list]){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4407 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
4408 return -1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4409 }
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
4410 }else
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4411 val= LIST_NOT_USED&0xFF;
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4412 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, val, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4413 }
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4414 }
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4415 for(list=0; list<h->list_count; list++){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4416 for(i=0; i<2; i++){
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4417 unsigned int val;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4418 if(IS_DIR(mb_type, i, list)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4419 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
4420 mx += get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4421 my += get_se_golomb(&s->gb);
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
4422 tprintf(s->avctx, "final mv:%d %d\n", mx, my);
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
4423
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4424 val= pack16to32(mx,my);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4425 }else
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4426 val=0;
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4427 fill_rectangle(h->mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, val, 4);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4428 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4429 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4430 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4431 assert(IS_8X16(mb_type));
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4432 for(list=0; list<h->list_count; list++){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4433 for(i=0; i<2; i++){
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4434 unsigned int val;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4435 if(IS_DIR(mb_type, i, list)){ //FIXME optimize
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4436 val= get_te0_golomb(&s->gb, h->ref_count[list]);
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4437 if(val >= h->ref_count[list]){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4438 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
4439 return -1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4440 }
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
4441 }else
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4442 val= LIST_NOT_USED&0xFF;
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4443 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, val, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4444 }
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4445 }
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4446 for(list=0; list<h->list_count; list++){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4447 for(i=0; i<2; i++){
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4448 unsigned int val;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4449 if(IS_DIR(mb_type, i, list)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4450 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
4451 mx += get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4452 my += get_se_golomb(&s->gb);
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
4453 tprintf(s->avctx, "final mv:%d %d\n", mx, my);
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
4454
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4455 val= pack16to32(mx,my);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4456 }else
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4457 val=0;
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4458 fill_rectangle(h->mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, val, 4);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4459 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4460 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4461 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4462 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4463
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4464 if(IS_INTER(mb_type))
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4465 write_back_motion(h, mb_type);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4466
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4467 if(!IS_INTRA16x16(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4468 cbp= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4469 if(cbp > 47){
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4470 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
4471 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4472 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4473
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4474 if(IS_INTRA4x4(mb_type))
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4475 cbp= golomb_to_intra4x4_cbp[cbp];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4476 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4477 cbp= golomb_to_inter_cbp[cbp];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4478 }
3651
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
4479 h->cbp = cbp;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4480
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4481 if(dct8x8_allowed && (cbp&15) && !IS_INTRA(mb_type)){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4482 if(get_bits1(&s->gb))
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4483 mb_type |= MB_TYPE_8x8DCT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4484 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4485 s->current_picture.mb_type[mb_xy]= mb_type;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4486
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4487 if(cbp || IS_INTRA16x16(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4488 int i8x8, i4x4, chroma_idx;
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
4489 int dquant;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4490 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
4491 const uint8_t *scan, *scan8x8, *dc_scan;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4492
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4493 // fill_non_zero_count_cache(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4494
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4495 if(IS_INTERLACED(mb_type)){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4496 scan8x8= s->qscale ? h->field_scan8x8_cavlc : h->field_scan8x8_cavlc_q0;
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
4497 scan= s->qscale ? h->field_scan : h->field_scan_q0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4498 dc_scan= luma_dc_field_scan;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4499 }else{
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4500 scan8x8= s->qscale ? h->zigzag_scan8x8_cavlc : h->zigzag_scan8x8_cavlc_q0;
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
4501 scan= s->qscale ? h->zigzag_scan : h->zigzag_scan_q0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4502 dc_scan= luma_dc_zigzag_scan;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4503 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4504
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4505 dquant= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4506
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4507 if( dquant > 25 || dquant < -26 ){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
4508 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
4509 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4510 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4511
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4512 s->qscale += dquant;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4513 if(((unsigned)s->qscale) > 51){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4514 if(s->qscale<0) s->qscale+= 52;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4515 else s->qscale-= 52;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4516 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4517
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
4518 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
4519 h->chroma_qp[1]= get_chroma_qp(h, 1, s->qscale);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4520 if(IS_INTRA16x16(mb_type)){
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
4521 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
4522 return -1; //FIXME continue if partitioned and other return -1 too
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4523 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4524
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4525 assert((cbp&15) == 0 || (cbp&15) == 15);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4526
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4527 if(cbp&15){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4528 for(i8x8=0; i8x8<4; i8x8++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4529 for(i4x4=0; i4x4<4; i4x4++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4530 const int index= i4x4 + 4*i8x8;
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
4531 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
4532 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4533 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4534 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4535 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4536 }else{
1636
d9d98cdcfcde intra16x16 fix
michael
parents: 1598
diff changeset
4537 fill_rectangle(&h->non_zero_count_cache[scan8[0]], 4, 4, 8, 0, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4538 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4539 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4540 for(i8x8=0; i8x8<4; i8x8++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4541 if(cbp & (1<<i8x8)){
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4542 if(IS_8x8DCT(mb_type)){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4543 DCTELEM *buf = &h->mb[64*i8x8];
2757
fa1c8955e291 remove mixed code/declarations
mru
parents: 2755
diff changeset
4544 uint8_t *nnz;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4545 for(i4x4=0; i4x4<4; i4x4++){
3174
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
4546 if( decode_residual(h, gb, buf, i4x4+4*i8x8, scan8x8+16*i4x4,
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
4547 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
4548 return -1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4549 }
2757
fa1c8955e291 remove mixed code/declarations
mru
parents: 2755
diff changeset
4550 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
4551 nnz[0] += nnz[1] + nnz[8] + nnz[9];
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4552 }else{
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4553 for(i4x4=0; i4x4<4; i4x4++){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4554 const int index= i4x4 + 4*i8x8;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4555
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
4556 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
4557 return -1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4558 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4559 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4560 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4561 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4562 uint8_t * const nnz= &h->non_zero_count_cache[ scan8[4*i8x8] ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4563 nnz[0] = nnz[1] = nnz[8] = nnz[9] = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4564 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4565 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4566 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4567
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4568 if(cbp&0x30){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4569 for(chroma_idx=0; chroma_idx<2; chroma_idx++)
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
4570 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
4571 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4572 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4573 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4574
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4575 if(cbp&0x20){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4576 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
4577 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
4578 for(i4x4=0; i4x4<4; i4x4++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4579 const int index= 16 + 4*chroma_idx + i4x4;
5225
099c495618c1 Compute the dequant coefficient table ptr outside the loop,
gpoirier
parents: 5215
diff changeset
4580 if( decode_residual(h, gb, h->mb + 16*index, index, scan + 1, qmul, 15) < 0){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4581 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4582 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4583 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4584 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4585 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4586 uint8_t * const nnz= &h->non_zero_count_cache[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4587 nnz[ scan8[16]+0 ] = nnz[ scan8[16]+1 ] =nnz[ scan8[16]+8 ] =nnz[ scan8[16]+9 ] =
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4588 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
4589 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4590 }else{
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
4591 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
4592 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
4593 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
4594 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
4595 }
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
4596 s->current_picture.qscale_table[mb_xy]= s->qscale;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4597 write_back_non_zero_count(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4598
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4599 if(MB_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4600 h->ref_count[0] >>= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4601 h->ref_count[1] >>= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4602 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4603
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4604 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4605 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4606
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4607 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
4608 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
4609 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
4610 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
4611 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
4612 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
4613
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4614 unsigned int ctx = 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4615
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4616 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
4617 ctx += 1;
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4618 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4619 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
4620 ctx += 1;
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4621 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4622
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
4623 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
4624 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4625
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4626 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
4627 uint8_t *state= &h->cabac_state[ctx_base];
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4628 int mb_type;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4629
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4630 if(intra_slice){
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4631 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
4632 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
4633 const int mbb_xy = h->top_mb_xy;
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4634 int ctx=0;
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4635 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
4636 ctx++;
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4637 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
4638 ctx++;
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
4639 if( get_cabac_noinline( &h->cabac, &state[ctx] ) == 0 )
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4640 return 0; /* I4x4 */
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4641 state += 2;
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4642 }else{
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
4643 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
4644 return 0; /* I4x4 */
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4645 }
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4646
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4647 if( get_cabac_terminate( &h->cabac ) )
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4648 return 25; /* PCM */
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4649
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4650 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
4651 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
4652 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
4653 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
4654 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
4655 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
4656 return mb_type;
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4657 }
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4658
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4659 static int decode_cabac_mb_type( H264Context *h ) {
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4660 MpegEncContext * const s = &h->s;
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4661
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4662 if( h->slice_type == I_TYPE ) {
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4663 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
4664 } 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
4665 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
4666 /* 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
4667 if( get_cabac_noinline( &h->cabac, &h->cabac_state[15] ) == 0 ) {
3138
c12fc3d1c612 minor simplifications in cabac_mb_type
lorenm
parents: 3128
diff changeset
4668 /* 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
4669 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
4670 } else {
3138
c12fc3d1c612 minor simplifications in cabac_mb_type
lorenm
parents: 3128
diff changeset
4671 /* 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
4672 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
4673 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4674 } else {
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4675 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
4676 }
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4677 } 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
4678 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
4679 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
4680 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
4681 int bits;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4682
3138
c12fc3d1c612 minor simplifications in cabac_mb_type
lorenm
parents: 3128
diff changeset
4683 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
4684 ctx++;
3138
c12fc3d1c612 minor simplifications in cabac_mb_type
lorenm
parents: 3128
diff changeset
4685 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
4686 ctx++;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4687
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
4688 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
4689 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
4690
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
4691 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
4692 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
4693 }
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
4694
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
4695 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
4696 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
4697 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
4698 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
4699 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
4700 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
4701 else if( bits == 13 ) {
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4702 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
4703 } 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
4704 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
4705 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
4706 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
4707
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
4708 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
4709 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
4710 } else {
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4711 /* 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
4712 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
4713 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4714 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4715
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4716 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
4717 MpegEncContext * const s = &h->s;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4718 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
4719 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
4720
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4721 if(FRAME_MBAFF){ //FIXME merge with the stuff in fill_caches?
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4722 int mb_xy = mb_x + (mb_y&~1)*s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4723 mba_xy = mb_xy - 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4724 if( (mb_y&1)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4725 && h->slice_table[mba_xy] == h->slice_num
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4726 && MB_FIELD == !!IS_INTERLACED( s->current_picture.mb_type[mba_xy] ) )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4727 mba_xy += s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4728 if( MB_FIELD ){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4729 mbb_xy = mb_xy - s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4730 if( !(mb_y&1)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4731 && h->slice_table[mbb_xy] == h->slice_num
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4732 && IS_INTERLACED( s->current_picture.mb_type[mbb_xy] ) )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4733 mbb_xy -= s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4734 }else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4735 mbb_xy = mb_x + (mb_y-1)*s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4736 }else{
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4737 int mb_xy = mb_x + mb_y*s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4738 mba_xy = mb_xy - 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4739 mbb_xy = mb_xy - s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4740 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4741
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4742 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
4743 ctx++;
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4744 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
4745 ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4746
3138
c12fc3d1c612 minor simplifications in cabac_mb_type
lorenm
parents: 3128
diff changeset
4747 if( h->slice_type == B_TYPE )
c12fc3d1c612 minor simplifications in cabac_mb_type
lorenm
parents: 3128
diff changeset
4748 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
4749 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
4750 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4751
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4752 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
4753 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
4754
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4755 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
4756 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
4757
2928
16d67170715c tidier cabac_intra4x4_pred_mode
lorenm
parents: 2926
diff changeset
4758 mode += 1 * get_cabac( &h->cabac, &h->cabac_state[69] );
16d67170715c tidier cabac_intra4x4_pred_mode
lorenm
parents: 2926
diff changeset
4759 mode += 2 * get_cabac( &h->cabac, &h->cabac_state[69] );
16d67170715c tidier cabac_intra4x4_pred_mode
lorenm
parents: 2926
diff changeset
4760 mode += 4 * get_cabac( &h->cabac, &h->cabac_state[69] );
16d67170715c tidier cabac_intra4x4_pred_mode
lorenm
parents: 2926
diff changeset
4761
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4762 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
4763 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
4764 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4765 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
4766 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4767
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4768 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
4769 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
4770 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
4771
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4772 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
4773
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
4774 /* 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
4775 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
4776 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
4777
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4778 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
4779 ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4780
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
4781 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
4782 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
4783
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
4784 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
4785 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
4786 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
4787 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
4788 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4789 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
4790 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4791
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4792 static const uint8_t block_idx_x[16] = {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4793 0, 1, 0, 1, 2, 3, 2, 3, 0, 1, 0, 1, 2, 3, 2, 3
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4794 };
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4795 static const uint8_t block_idx_y[16] = {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4796 0, 0, 1, 1, 0, 0, 1, 1, 2, 2, 3, 3, 2, 2, 3, 3
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4797 };
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4798 static const uint8_t block_idx_xy[4][4] = {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4799 { 0, 2, 8, 10},
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4800 { 1, 3, 9, 11},
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4801 { 4, 6, 12, 14},
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4802 { 5, 7, 13, 15}
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4803 };
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4804
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4805 static int decode_cabac_mb_cbp_luma( 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
4806 int cbp = 0;
3138
c12fc3d1c612 minor simplifications in cabac_mb_type
lorenm
parents: 3128
diff changeset
4807 int cbp_b = -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
4808 int i8x8;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4809
3138
c12fc3d1c612 minor simplifications in cabac_mb_type
lorenm
parents: 3128
diff changeset
4810 if( h->slice_table[h->top_mb_xy] == h->slice_num ) {
c12fc3d1c612 minor simplifications in cabac_mb_type
lorenm
parents: 3128
diff changeset
4811 cbp_b = h->top_cbp;
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
4812 tprintf(h->s.avctx, "cbp_b = top_cbp = %x\n", cbp_b);
3138
c12fc3d1c612 minor simplifications in cabac_mb_type
lorenm
parents: 3128
diff changeset
4813 }
c12fc3d1c612 minor simplifications in cabac_mb_type
lorenm
parents: 3128
diff changeset
4814
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4815 for( i8x8 = 0; i8x8 < 4; i8x8++ ) {
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4816 int cbp_a = -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
4817 int x, y;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4818 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
4819
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4820 x = block_idx_x[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
4821 y = block_idx_y[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
4822
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4823 if( x > 0 )
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4824 cbp_a = cbp;
3138
c12fc3d1c612 minor simplifications in cabac_mb_type
lorenm
parents: 3128
diff changeset
4825 else if( h->slice_table[h->left_mb_xy[0]] == h->slice_num ) {
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4826 cbp_a = h->left_cbp;
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
4827 tprintf(h->s.avctx, "cbp_a = left_cbp = %x\n", cbp_a);
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4828 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4829
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4830 if( y > 0 )
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4831 cbp_b = 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
4832
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
4833 /* No need to test for skip as we put 0 for skip block */
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
4834 /* No need to test for IPCM as we put 1 for IPCM block */
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4835 if( cbp_a >= 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
4836 int i8x8a = block_idx_xy[(x-1)&0x03][y]/4;
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4837 if( ((cbp_a >> i8x8a)&0x01) == 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
4838 ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4839 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4840
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4841 if( cbp_b >= 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
4842 int i8x8b = block_idx_xy[x][(y-1)&0x03]/4;
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4843 if( ((cbp_b >> i8x8b)&0x01) == 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
4844 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
4845 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4846
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4847 if( get_cabac( &h->cabac, &h->cabac_state[73 + ctx] ) ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4848 cbp |= 1 << i8x8;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4849 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4850 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4851 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
4852 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4853 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
4854 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
4855 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
4856
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
4857 cbp_a = (h->left_cbp>>4)&0x03;
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
4858 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
4859
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4860 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
4861 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
4862 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
4863 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
4864 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
4865
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4866 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
4867 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
4868 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
4869 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
4870 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4871 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
4872 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
4873 int mbn_xy;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4874 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
4875 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
4876
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4877 if( 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
4878 mbn_xy = s->mb_x + s->mb_y*s->mb_stride - 1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4879 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4880 mbn_xy = s->mb_width - 1 + (s->mb_y-1)*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
4881
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4882 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
4883 ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4884
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
4885 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
4886 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
4887 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
4888 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4889 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
4890 val++;
3128
dd3f6be492bd don't arbitrarily limit delta_qp
lorenm
parents: 3126
diff changeset
4891 if(val > 102) //prevent infinite loop
2844
5f20ab245501 prevent assert failures and infinite loops with broken streams
michael
parents: 2834
diff changeset
4892 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
4893 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4894
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4895 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
4896 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
4897 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4898 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
4899 }
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4900 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
4901 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
4902 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
4903 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
4904 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
4905 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
4906 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
4907 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
4908 }
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4909 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
4910 int type;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4911 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
4912 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
4913 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
4914 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
4915 type = 3;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4916 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
4917 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
4918 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
4919 type += 4;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4920 }
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4921 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
4922 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
4923 return type;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4924 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4925
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4926 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
4927 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
4928 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4929
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4930 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
4931 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
4932 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
4933 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
4934 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
4935
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4936 if( h->slice_type == B_TYPE) {
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4937 if( refa > 0 && !h->direct_cache[scan8[n] - 1] )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4938 ctx++;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4939 if( refb > 0 && !h->direct_cache[scan8[n] - 8] )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4940 ctx += 2;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4941 } else {
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4942 if( refa > 0 )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4943 ctx++;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4944 if( refb > 0 )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4945 ctx += 2;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4946 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4947
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4948 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
4949 ref++;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4950 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
4951 ctx = 4;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4952 else
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4953 ctx = 5;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4954 if(ref >= 32 /*h->ref_list[list]*/){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4955 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
4956 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
4957 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4958 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4959 return ref;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4960 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4961
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4962 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
4963 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
4964 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
4965 int ctxbase = (l == 0) ? 40 : 47;
2317
2865f759882a optimzation
michael
parents: 2316
diff changeset
4966 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
4967
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4968 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
4969 ctx = 0;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4970 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
4971 ctx = 2;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4972 else
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4973 ctx = 1;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4974
2317
2865f759882a optimzation
michael
parents: 2316
diff changeset
4975 if(!get_cabac(&h->cabac, &h->cabac_state[ctxbase+ctx]))
2865f759882a optimzation
michael
parents: 2316
diff changeset
4976 return 0;
2865f759882a optimzation
michael
parents: 2316
diff changeset
4977
2865f759882a optimzation
michael
parents: 2316
diff changeset
4978 mvd= 1;
2865f759882a optimzation
michael
parents: 2316
diff changeset
4979 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
4980 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
4981 mvd++;
2317
2865f759882a optimzation
michael
parents: 2316
diff changeset
4982 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
4983 ctx++;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4984 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4985
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4986 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
4987 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
4988 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
4989 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
4990 k++;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4991 if(k>24){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4992 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
4993 return INT_MIN;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4994 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4995 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4996 while( k-- ) {
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4997 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
4998 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
4999 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5000 }
4042
643cdc58bd69 slightly faster decode_cabac_mb_mvd()
michael
parents: 4041
diff changeset
5001 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
5002 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5003
4908
777f250df232 Fix multiple "¡Æinline/static¡Ç is not at beginning of declaration" warnings.
diego
parents: 4896
diff changeset
5004 static inline int get_cabac_cbf_ctx( H264Context *h, int cat, int idx ) {
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5005 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
5006 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
5007
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5008 if( cat == 0 ) {
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5009 nza = h->left_cbp&0x100;
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5010 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
5011 } else if( cat == 1 || cat == 2 ) {
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5012 nza = h->non_zero_count_cache[scan8[idx] - 1];
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5013 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
5014 } else if( cat == 3 ) {
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5015 nza = (h->left_cbp>>(6+idx))&0x01;
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5016 nzb = (h-> top_cbp>>(6+idx))&0x01;
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5017 } else {
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5018 assert(cat == 4);
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5019 nza = h->non_zero_count_cache[scan8[16+idx] - 1];
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5020 nzb = h->non_zero_count_cache[scan8[16+idx] - 8];
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5021 }
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5022
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5023 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
5024 ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5025
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5026 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
5027 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
5028
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5029 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
5030 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5031
5006
28ebdd244a07 Change some leftover __attribute__((unused)) and __attribute__((used)) to
reimar
parents: 4984
diff changeset
5032 static const attribute_used uint8_t last_coeff_flag_offset_8x8[63] = {
4051
19f07b651d79 decode_significance_8x8_x86()
michael
parents: 4042
diff changeset
5033 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
5034 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
5035 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
5036 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
5037 };
19f07b651d79 decode_significance_8x8_x86()
michael
parents: 4042
diff changeset
5038
5528
4c3b1222ff57 Don't check the return value of decode_cabac_residual since it always
conrad
parents: 5508
diff changeset
5039 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
5040 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
5041 static const int significant_coeff_flag_offset[2][6] = {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5042 { 105+0, 105+15, 105+29, 105+44, 105+47, 402 },
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5043 { 277+0, 277+15, 277+29, 277+44, 277+47, 436 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5044 };
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5045 static const int last_coeff_flag_offset[2][6] = {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5046 { 166+0, 166+15, 166+29, 166+44, 166+47, 417 },
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5047 { 338+0, 338+15, 338+29, 338+44, 338+47, 451 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5048 };
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5049 static const int coeff_abs_level_m1_offset[6] = {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5050 227+0, 227+10, 227+20, 227+30, 227+39, 426
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5051 };
4007
33d3d4ab9f59 int->uint8_t for 2 tables
michael
parents: 4001
diff changeset
5052 static const uint8_t significant_coeff_flag_offset_8x8[2][63] = {
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5053 { 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
5054 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
5055 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
5056 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
5057 { 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
5058 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
5059 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
5060 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
5061 };
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5062
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5063 int index[64];
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5064
5262
b2a95ab5d017 bring back h264 build
benoit
parents: 5254
diff changeset
5065 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
5066 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
5067
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5068 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
5069 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
5070
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5071 uint8_t *significant_coeff_ctx_base;
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5072 uint8_t *last_coeff_ctx_base;
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5073 uint8_t *abs_level_m1_ctx_base;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5074
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
5075 #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
5076 #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
5077 #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
5078 #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
5079 #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
5080 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
5081 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
5082 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
5083 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
5084 #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
5085 #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
5086 #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
5087
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
5088
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 /* 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
5090 * 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
5091 * 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
5092 * 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
5093 * 4-> AC Chroma n = 4 * iCbCr + chroma4x4idx
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5094 * 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
5095 */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5096
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5097 /* read coded block flag */
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5098 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
5099 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
5100 if( cat == 1 || cat == 2 )
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5101 h->non_zero_count_cache[scan8[n]] = 0;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5102 else if( cat == 4 )
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5103 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
5104 #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
5105 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
5106 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
5107 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
5108 #endif
5528
4c3b1222ff57 Don't check the return value of decode_cabac_residual since it always
conrad
parents: 5508
diff changeset
5109 return;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5110 }
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5111 }
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5112
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5113 significant_coeff_ctx_base = h->cabac_state
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5114 + significant_coeff_flag_offset[MB_FIELD][cat];
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5115 last_coeff_ctx_base = h->cabac_state
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5116 + last_coeff_flag_offset[MB_FIELD][cat];
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5117 abs_level_m1_ctx_base = h->cabac_state
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5118 + coeff_abs_level_m1_offset[cat];
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5119
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5120 if( cat == 5 ) {
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5121 #define DECODE_SIGNIFICANCE( coefs, sig_off, last_off ) \
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5122 for(last= 0; last < coefs; last++) { \
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5123 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
5124 if( get_cabac( CC, sig_ctx )) { \
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5125 uint8_t *last_ctx = last_coeff_ctx_base + last_off; \
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5126 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
5127 if( get_cabac( CC, last_ctx ) ) { \
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5128 last= max_coeff; \
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5129 break; \
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5130 } \
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5131 } \
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
5132 }\
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
5133 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
5134 index[coeff_count++] = last;\
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5135 }
4009
e5f7797e53c7 10l int vs uint8_t
michael
parents: 4008
diff changeset
5136 const uint8_t *sig_off = significant_coeff_flag_offset_8x8[MB_FIELD];
5547
81226e690378 CONFIG_7REGS -> HAVE_7REGS
ramiro
parents: 5545
diff changeset
5137 #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
5138 coeff_count= decode_significance_8x8_x86(CC, significant_coeff_ctx_base, index, sig_off);
19f07b651d79 decode_significance_8x8_x86()
michael
parents: 4042
diff changeset
5139 } else {
19f07b651d79 decode_significance_8x8_x86()
michael
parents: 4042
diff changeset
5140 coeff_count= decode_significance_x86(CC, max_coeff, significant_coeff_ctx_base, index);
19f07b651d79 decode_significance_8x8_x86()
michael
parents: 4042
diff changeset
5141 #else
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5142 DECODE_SIGNIFICANCE( 63, sig_off[last], last_coeff_flag_offset_8x8[last] );
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5143 } else {
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5144 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
5145 #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
5146 }
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5147 assert(coeff_count > 0);
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5148
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5149 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
5150 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
5151 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
5152 h->non_zero_count_cache[scan8[n]] = coeff_count;
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5153 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
5154 h->cbp_table[mb_xy] |= 0x40 << n;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5155 else if( cat == 4 )
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5156 h->non_zero_count_cache[scan8[16+n]] = coeff_count;
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5157 else {
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5158 assert( cat == 5 );
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
5159 fill_rectangle(&h->non_zero_count_cache[scan8[n]], 2, 2, 8, coeff_count, 1);
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5160 }
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
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
5162 for( coeff_count--; coeff_count >= 0; coeff_count-- ) {
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5163 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
5164 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
5165
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
5166 if( get_cabac( CC, ctx ) == 0 ) {
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5167 if( !qmul ) {
4040
9eaea06c5ba6 optimize sign decoding code in decode_residual()
michael
parents: 4038
diff changeset
5168 block[j] = get_cabac_bypass_sign( CC, -1);
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5169 }else{
4040
9eaea06c5ba6 optimize sign decoding code in decode_residual()
michael
parents: 4038
diff changeset
5170 block[j] = (get_cabac_bypass_sign( CC, -qmul[j]) + 32) >> 6;;
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5171 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5172
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5173 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
5174 } else {
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5175 int coeff_abs = 2;
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5176 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
5177 while( coeff_abs < 15 && get_cabac( CC, ctx ) ) {
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5178 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
5179 }
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5180
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5181 if( coeff_abs >= 15 ) {
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5182 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
5183 while( get_cabac_bypass( CC ) ) {
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5184 j++;
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5185 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5186
4016
29ea06410ce7 simplify escape decoding
michael
parents: 4009
diff changeset
5187 coeff_abs=1;
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5188 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
5189 coeff_abs += coeff_abs + get_cabac_bypass( CC );
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5190 }
4016
29ea06410ce7 simplify escape decoding
michael
parents: 4009
diff changeset
5191 coeff_abs+= 14;
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5192 }
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5193
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5194 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
5195 if( get_cabac_bypass( CC ) ) block[j] = -coeff_abs;
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5196 else block[j] = coeff_abs;
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5197 }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
5198 if( get_cabac_bypass( CC ) ) block[j] = (-coeff_abs * qmul[j] + 32) >> 6;
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
5199 else block[j] = ( coeff_abs * qmul[j] + 32) >> 6;
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5200 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5201
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5202 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
5203 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5204 }
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
5205 #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
5206 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
5207 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
5208 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
5209 #endif
5528
4c3b1222ff57 Don't check the return value of decode_cabac_residual since it always
conrad
parents: 5508
diff changeset
5210
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5211 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5212
4908
777f250df232 Fix multiple "¡Æinline/static¡Ç is not at beginning of declaration" warnings.
diego
parents: 4896
diff changeset
5213 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
5214 {
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5215 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
5216 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
5217 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
5218 h->left_mb_xy[0] = mb_xy - 1;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5219 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
5220 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
5221 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
5222 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
5223 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
5224 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
5225 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
5226 if (bottom
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5227 ? !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
5228 : (!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
5229 ) {
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5230 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
5231 }
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5232 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
5233 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
5234 }
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5235 }
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5236 return;
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5237 }
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5238
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5239 /**
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5240 * 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
5241 * @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
5242 */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5243 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
5244 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
5245 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
5246 int mb_type, partition_count, cbp = 0;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5247 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
5248
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
5249 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
5250
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
5251 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
5252 if( h->slice_type != I_TYPE && h->slice_type != SI_TYPE ) {
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5253 int skip;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5254 /* a skipped mb needs the aff flag from the following mb */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5255 if( FRAME_MBAFF && s->mb_x==0 && (s->mb_y&1)==0 )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5256 predict_field_decoding_flag(h);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5257 if( FRAME_MBAFF && (s->mb_y&1)==1 && h->prev_mb_skipped )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5258 skip = h->next_mb_skipped;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5259 else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5260 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
5261 /* read skip flags */
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5262 if( skip ) {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5263 if( FRAME_MBAFF && (s->mb_y&1)==0 ){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5264 s->current_picture.mb_type[mb_xy] = MB_TYPE_SKIP;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5265 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
5266 if(h->next_mb_skipped)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5267 predict_field_decoding_flag(h);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5268 else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5269 h->mb_mbaff = h->mb_field_decoding_flag = decode_cabac_field_decoding_flag(h);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5270 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5271
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5272 decode_mb_skip(h);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5273
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5274 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
5275 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
5276 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
5277
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5278 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
5279
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5280 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5281 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5282 if(FRAME_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5283 if( (s->mb_y&1) == 0 )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5284 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
5285 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
5286 }else
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5287 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
5288
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
5289 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
5290
3077
385e54795a9e Fix silly typos.
diego
parents: 3071
diff changeset
5291 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
5292 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
5293 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
5294 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
5295 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5296
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5297 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
5298 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
5299 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
5300 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
5301 }else{
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5302 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
5303 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
5304 }
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5305 } 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
5306 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
5307 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
5308 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
5309 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5310 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
5311 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
5312 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5313 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5314 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
5315 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
5316 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
5317 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
5318 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
5319 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
5320 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5321 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
5322 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
5323
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5324 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
5325
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5326 if(IS_INTRA_PCM(mb_type)) {
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5327 const uint8_t *ptr;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5328 unsigned int x, y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5329
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5106
diff changeset
5330 // 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
5331 // 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
5332 // 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
5333 ptr= h->cabac.bytestream;
4344
4aa24216f71a fix 16 CABAC_BIT * 10l bug introduced in r6578
michael
parents: 4283
diff changeset
5334 if(h->cabac.low&0x1) ptr--;
4aa24216f71a fix 16 CABAC_BIT * 10l bug introduced in r6578
michael
parents: 4283
diff changeset
5335 if(CABAC_BITS==16){
4aa24216f71a fix 16 CABAC_BIT * 10l bug introduced in r6578
michael
parents: 4283
diff changeset
5336 if(h->cabac.low&0x1FF) ptr--;
4aa24216f71a fix 16 CABAC_BIT * 10l bug introduced in r6578
michael
parents: 4283
diff changeset
5337 }
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5338
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5339 // 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
5340 for(y=0; y<16; y++){
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5341 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
5342 for(x=0; x<16; x++){
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
5343 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
5344 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
5345 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5346 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5347 for(y=0; y<8; y++){
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5348 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
5349 for(x=0; x<8; x++){
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
5350 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
5351 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
5352 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5353 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5354 for(y=0; y<8; y++){
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5355 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
5356 for(x=0; x<8; x++){
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
5357 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
5358 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
5359 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5360 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5361
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5362 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
5363
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
5364 // All blocks are present
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5365 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
5366 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
5367 // In deblocking, the quantizer is 0
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5368 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
5369 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
5370 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
5371 // All coeffs are present
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5372 memset(h->non_zero_count[mb_xy], 16, 16);
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5373 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
5374 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
5375 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5376
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5377 if(MB_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5378 h->ref_count[0] <<= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5379 h->ref_count[1] <<= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5380 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5381
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
5382 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
5383
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5384 if( IS_INTRA( mb_type ) ) {
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
5385 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
5386 if( IS_INTRA4x4( mb_type ) ) {
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5387 if( dct8x8_allowed && decode_cabac_mb_transform_size( h ) ) {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5388 mb_type |= MB_TYPE_8x8DCT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5389 for( i = 0; i < 16; i+=4 ) {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5390 int pred = pred_intra_mode( h, i );
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5391 int mode = decode_cabac_mb_intra4x4_pred_mode( h, pred );
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5392 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
5393 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5394 } else {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5395 for( i = 0; i < 16; i++ ) {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5396 int pred = pred_intra_mode( h, i );
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5397 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
5398
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5399 //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
5400 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5401 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5402 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
5403 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
5404 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5405 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
5406 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
5407 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5408 h->chroma_pred_mode_table[mb_xy] =
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
5409 pred_mode = decode_cabac_mb_chroma_pre_mode( h );
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
5410
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
5411 pred_mode= check_intra_pred_mode( h, pred_mode );
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
5412 if( pred_mode < 0 ) return -1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
5413 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
5414 } 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
5415 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
5416
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5417 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
5418 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
5419 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
5420 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
5421 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
5422 }
3482
c08b46172204 slightly faster h264 fill_caches()
lorenm
parents: 3455
diff changeset
5423 if( IS_DIRECT(h->sub_mb_type[0] | h->sub_mb_type[1] |
c08b46172204 slightly faster h264 fill_caches()
lorenm
parents: 3455
diff changeset
5424 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
5425 pred_direct_motion(h, &mb_type);
5425
1fdfea5024a7 fix cabac decoding with some Blue-Ray sources
gpoirier
parents: 5380
diff changeset
5426 h->ref_cache[0][scan8[4]] =
1fdfea5024a7 fix cabac decoding with some Blue-Ray sources
gpoirier
parents: 5380
diff changeset
5427 h->ref_cache[1][scan8[4]] =
1fdfea5024a7 fix cabac decoding with some Blue-Ray sources
gpoirier
parents: 5380
diff changeset
5428 h->ref_cache[0][scan8[12]] =
1fdfea5024a7 fix cabac decoding with some Blue-Ray sources
gpoirier
parents: 5380
diff changeset
5429 h->ref_cache[1][scan8[12]] = PART_NOT_AVAILABLE;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5430 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
5431 for( i = 0; i < 4; i++ )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5432 if( IS_DIRECT(h->sub_mb_type[i]) )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5433 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
5434 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5435 }
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5436 } else {
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5437 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
5438 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
5439 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
5440 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
5441 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5442 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5443
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
5444 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
5445 for( i = 0; i < 4; i++ ) {
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5446 if(IS_DIRECT(h->sub_mb_type[i])) continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5447 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
5448 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
5449 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
5450 else
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5451 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
5452 } else {
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5453 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
5454 }
2110
michael
parents: 2099
diff changeset
5455 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
5456 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
5457 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5458 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5459
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5460 if(dct8x8_allowed)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5461 dct8x8_allowed = get_dct8x8_allowed(h);
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5462
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
5463 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
5464 for(i=0; i<4; i++){
5425
1fdfea5024a7 fix cabac decoding with some Blue-Ray sources
gpoirier
parents: 5380
diff changeset
5465 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
5466 if(IS_DIRECT(h->sub_mb_type[i])){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5467 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
5468 continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5469 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5470
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5471 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
5472 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
5473 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
5474 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
5475 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
5476 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
5477 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
5478 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
5479 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
5480 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
5481
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5482 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
5483 my = mpy + decode_cabac_mb_mvd( h, list, index, 1 );
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
5484 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
5485
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5486 if(IS_SUB_8X8(sub_mb_type)){
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5487 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
5488 mv_cache[ 8 ][0]= mv_cache[ 9 ][0]= mx;
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5489 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
5490 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
5491
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5492 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
5493 mvd_cache[ 8 ][0]= mvd_cache[ 9 ][0]= mx - mpx;
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5494 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
5495 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
5496 }else if(IS_SUB_8X4(sub_mb_type)){
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5497 mv_cache[ 1 ][0]= mx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5498 mv_cache[ 1 ][1]= my;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5499
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5500 mvd_cache[ 1 ][0]= mx - mpx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5501 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
5502 }else if(IS_SUB_4X8(sub_mb_type)){
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5503 mv_cache[ 8 ][0]= mx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5504 mv_cache[ 8 ][1]= my;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5505
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5506 mvd_cache[ 8 ][0]= mx - mpx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5507 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
5508 }
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5509 mv_cache[ 0 ][0]= mx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5510 mv_cache[ 0 ][1]= my;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5511
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5512 mvd_cache[ 0 ][0]= mx - mpx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5513 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
5514 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5515 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5516 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
5517 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
5518 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
5519 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
5520 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5521 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5522 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5523 } else if( IS_DIRECT(mb_type) ) {
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5524 pred_direct_motion(h, &mb_type);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5525 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
5526 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
5527 dct8x8_allowed &= h->sps.direct_8x8_inference_flag;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5528 } else {
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5529 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
5530 if(IS_16X16(mb_type)){
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
5531 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
5532 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
5533 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
5534 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
5535 }else
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
5536 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
5537 }
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
5538 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
5539 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
5540 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
5541
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5542 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
5543 my = mpy + decode_cabac_mb_mvd( h, list, 0, 1 );
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
5544 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
5545
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5546 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
5547 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
5548 }else
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
5549 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
5550 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5551 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5552 else if(IS_16X8(mb_type)){
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
5553 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
5554 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
5555 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
5556 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
5557 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
5558 }else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5559 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
5560 }
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
5561 }
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
5562 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
5563 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
5564 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
5565 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
5566 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
5567 my = mpy + decode_cabac_mb_mvd( h, list, 8*i, 1 );
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
5568 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
5569
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5570 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
5571 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
5572 }else{
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5573 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
5574 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
5575 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5576 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5577 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5578 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5579 assert(IS_8X16(mb_type));
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
5580 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
5581 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
5582 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
5583 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
5584 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
5585 }else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5586 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
5587 }
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
5588 }
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
5589 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
5590 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
5591 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
5592 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
5593 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
5594 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
5595
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
5596 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
5597 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
5598 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
5599 }else{
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5600 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
5601 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
5602 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5603 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5604 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5605 }
1908
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
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
5608 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
5609 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
5610 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
5611 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5612
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5613 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
5614 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
5615 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
5616 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5617
3651
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
5618 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
5619
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5620 if( dct8x8_allowed && (cbp&15) && !IS_INTRA( mb_type ) ) {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5621 if( decode_cabac_mb_transform_size( h ) )
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5622 mb_type |= MB_TYPE_8x8DCT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5623 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5624 s->current_picture.mb_type[mb_xy]= mb_type;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5625
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5626 if( cbp || IS_INTRA16x16( mb_type ) ) {
3174
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
5627 const uint8_t *scan, *scan8x8, *dc_scan;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5628 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
5629
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5630 if(IS_INTERLACED(mb_type)){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5631 scan8x8= s->qscale ? h->field_scan8x8 : h->field_scan8x8_q0;
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
5632 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
5633 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
5634 }else{
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5635 scan8x8= s->qscale ? h->zigzag_scan8x8 : h->zigzag_scan8x8_q0;
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
5636 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
5637 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
5638 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5639
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5640 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
5641 if( dqp == INT_MIN ){
a95e55679dfa check return value of decode_cabac_mb_dqp, it is INT_MIN on error.
reimar
parents: 2867
diff changeset
5642 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
5643 return -1;
a95e55679dfa check return value of decode_cabac_mb_dqp, it is INT_MIN on error.
reimar
parents: 2867
diff changeset
5644 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5645 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
5646 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
5647 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
5648 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
5649 }
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
5650 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
5651 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
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 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
5654 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
5655 //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
5656 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
5657
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5658 if( cbp&15 ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5659 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
5660 //av_log( s->avctx, AV_LOG_ERROR, "INTRA16x16 AC:%d\n", i );
5528
4c3b1222ff57 Don't check the return value of decode_cabac_residual since it always
conrad
parents: 5508
diff changeset
5661 decode_cabac_residual(h, h->mb + 16*i, 1, i, scan + 1, h->dequant4_coeff[0][s->qscale], 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
5662 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5663 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5664 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
5665 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5666 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5667 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
5668 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
5669 if( cbp & (1<<i8x8) ) {
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5670 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
5671 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
5672 scan8x8, h->dequant8_coeff[IS_INTRA( mb_type ) ? 0:1][s->qscale], 64);
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5673 } 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
5674 for( i4x4 = 0; i4x4 < 4; i4x4++ ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5675 const int index = 4*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
5676 //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
5677 //START_TIMER
5528
4c3b1222ff57 Don't check the return value of decode_cabac_residual since it always
conrad
parents: 5508
diff changeset
5678 decode_cabac_residual(h, h->mb + 16*index, 2, index, scan, h->dequant4_coeff[IS_INTRA( mb_type ) ? 0:3][s->qscale], 16);
3972
f5f1c9af095d move outcommented START/STOP_TIMER to a hopefully better place for benchmarking ...
michael
parents: 3955
diff changeset
5679 //STOP_TIMER("decode_residual")
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5680 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5681 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5682 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
5683 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
5684 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5685 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5686 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5687
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5688 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
5689 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
5690 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
5691 //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
5692 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
5693 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5694 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5695
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5696 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
5697 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
5698 for( c = 0; c < 2; c++ ) {
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
5699 const uint32_t *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
5700 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
5701 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
5702 //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
5703 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
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 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5706 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5707 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
5708 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
5709 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
5710 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5711 } else {
2315
29b67549d0cc fix CABAC+LOOP missmatch
michael
parents: 2314
diff changeset
5712 uint8_t * const nnz= &h->non_zero_count_cache[0];
29b67549d0cc fix CABAC+LOOP missmatch
michael
parents: 2314
diff changeset
5713 fill_rectangle(&nnz[scan8[0]], 4, 4, 8, 0, 1);
29b67549d0cc fix CABAC+LOOP missmatch
michael
parents: 2314
diff changeset
5714 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
5715 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
5716 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
5717 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5718
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5719 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
5720 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
5721
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5722 if(MB_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5723 h->ref_count[0] >>= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5724 h->ref_count[1] >>= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5725 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5726
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 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
5728 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5729
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5730
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
5731 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
5732 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
5733 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
5734 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
5735 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
5736
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
5737 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
5738 int8_t tc[4];
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
5739 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
5740 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
5741 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
5742 } else {
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
5743 /* 16px edge length, because bS=4 is triggered by being at
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
5744 * 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
5745 for( d = 0; d < 16; d++ ) {
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5746 const int p0 = pix[-1];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5747 const int p1 = pix[-2];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5748 const int p2 = pix[-3];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5749
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5750 const int q0 = pix[0];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5751 const int q1 = pix[1];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5752 const int q2 = pix[2];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5753
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
5754 if( FFABS( p0 - q0 ) < alpha &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
5755 FFABS( p1 - p0 ) < beta &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
5756 FFABS( q1 - q0 ) < beta ) {
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
5757
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
5758 if(FFABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
5759 if( FFABS( p2 - p0 ) < beta)
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5760 {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5761 const int p3 = pix[-4];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5762 /* p0', p1', p2' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5763 pix[-1] = ( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5764 pix[-2] = ( p2 + p1 + p0 + q0 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5765 pix[-3] = ( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5766 } else {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5767 /* p0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5768 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5769 }
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
5770 if( FFABS( q2 - q0 ) < beta)
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5771 {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5772 const int q3 = pix[3];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5773 /* q0', q1', q2' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5774 pix[0] = ( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5775 pix[1] = ( p0 + q0 + q1 + q2 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5776 pix[2] = ( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5777 } else {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5778 /* q0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5779 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5780 }
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5781 }else{
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5782 /* p0', q0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5783 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5784 pix[ 0] = ( 2*q1 + q0 + p1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5785 }
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
5786 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
5787 }
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5788 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
5789 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5790 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5791 }
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
5792 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
5793 int i;
4118
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
5794 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
5795 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
5796 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
5797
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
5798 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
5799 int8_t tc[4];
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
5800 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
5801 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
5802 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
5803 } else {
2707
360024d31dab H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents: 2683
diff changeset
5804 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
5805 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5806 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5807
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
5808 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
5809 int i;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5810 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
5811 int index_a;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5812 int alpha;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5813 int beta;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5814
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5815 int qp_index;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5816 int bS_index = (i >> 1);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5817 if (!MB_FIELD) {
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5818 bS_index &= ~1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5819 bS_index |= (i & 1);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5820 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5821
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5822 if( bS[bS_index] == 0 ) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5823 continue;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5824 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5825
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5826 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
5827 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
5828 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
5829 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
5830
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5831 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
5832 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
5833 const int p0 = pix[-1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5834 const int p1 = pix[-2];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5835 const int p2 = pix[-3];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5836 const int q0 = pix[0];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5837 const int q1 = pix[1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5838 const int q2 = pix[2];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5839
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
5840 if( FFABS( p0 - q0 ) < alpha &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
5841 FFABS( p1 - p0 ) < beta &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
5842 FFABS( q1 - q0 ) < beta ) {
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5843 int tc = tc0;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5844 int i_delta;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5845
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
5846 if( FFABS( p2 - p0 ) < beta ) {
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
5847 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
5848 tc++;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5849 }
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
5850 if( FFABS( q2 - q0 ) < beta ) {
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
5851 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
5852 tc++;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5853 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5854
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
5855 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
5856 pix[-1] = av_clip_uint8( p0 + i_delta ); /* p0' */
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
5857 pix[0] = av_clip_uint8( q0 - i_delta ); /* q0' */
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
5858 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
5859 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5860 }else{
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5861 const int p0 = pix[-1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5862 const int p1 = pix[-2];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5863 const int p2 = pix[-3];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5864
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5865 const int q0 = pix[0];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5866 const int q1 = pix[1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5867 const int q2 = pix[2];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5868
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
5869 if( FFABS( p0 - q0 ) < alpha &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
5870 FFABS( p1 - p0 ) < beta &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
5871 FFABS( q1 - q0 ) < beta ) {
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
5872
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
5873 if(FFABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
5874 if( FFABS( p2 - p0 ) < beta)
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5875 {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5876 const int p3 = pix[-4];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5877 /* p0', p1', p2' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5878 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
5879 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
5880 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
5881 } else {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5882 /* p0' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5883 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
5884 }
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
5885 if( FFABS( q2 - q0 ) < beta)
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5886 {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5887 const int q3 = pix[3];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5888 /* q0', q1', q2' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5889 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
5890 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
5891 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
5892 } else {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5893 /* q0' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5894 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
5895 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5896 }else{
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5897 /* p0', q0' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5898 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
5899 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
5900 }
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
5901 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
5902 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5903 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5904 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5905 }
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
5906 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
5907 int i;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5908 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
5909 int index_a;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5910 int alpha;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5911 int beta;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5912
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5913 int qp_index;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5914 int bS_index = i;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5915
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5916 if( bS[bS_index] == 0 ) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5917 continue;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5918 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5919
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5920 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
5921 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
5922 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
5923 beta = (beta_table+52)[qp[qp_index] + h->slice_beta_offset];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5924
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5925 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
5926 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
5927 const int p0 = pix[-1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5928 const int p1 = pix[-2];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5929 const int q0 = pix[0];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5930 const int q1 = pix[1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5931
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
5932 if( FFABS( p0 - q0 ) < alpha &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
5933 FFABS( p1 - p0 ) < beta &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
5934 FFABS( q1 - q0 ) < beta ) {
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
5935 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
5936
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
5937 pix[-1] = av_clip_uint8( p0 + i_delta ); /* p0' */
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
5938 pix[0] = av_clip_uint8( q0 - i_delta ); /* q0' */
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
5939 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
5940 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5941 }else{
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5942 const int p0 = pix[-1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5943 const int p1 = pix[-2];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5944 const int q0 = pix[0];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5945 const int q1 = pix[1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5946
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
5947 if( FFABS( p0 - q0 ) < alpha &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
5948 FFABS( p1 - p0 ) < beta &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
5949 FFABS( q1 - q0 ) < beta ) {
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5950
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5951 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
5952 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; /* q0' */
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
5953 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
5954 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5955 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5956 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5957 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5958
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
5959 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
5960 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
5961 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
5962 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
5963 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
5964 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
5965
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
5966 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
5967 int8_t tc[4];
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
5968 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
5969 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
5970 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
5971 } else {
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
5972 /* 16px edge length, see filter_mb_edgev */
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
5973 for( d = 0; d < 16; d++ ) {
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5974 const int p0 = pix[-1*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5975 const int p1 = pix[-2*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5976 const int p2 = pix[-3*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5977 const int q0 = pix[0];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5978 const int q1 = pix[1*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5979 const int q2 = pix[2*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5980
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
5981 if( FFABS( p0 - q0 ) < alpha &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
5982 FFABS( p1 - p0 ) < beta &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
5983 FFABS( q1 - q0 ) < beta ) {
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5984
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5985 const int p3 = pix[-4*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5986 const int q3 = pix[ 3*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5987
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
5988 if(FFABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
5989 if( FFABS( p2 - p0 ) < beta) {
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5990 /* p0', p1', p2' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5991 pix[-1*pix_next] = ( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5992 pix[-2*pix_next] = ( p2 + p1 + p0 + q0 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5993 pix[-3*pix_next] = ( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5994 } else {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5995 /* p0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5996 pix[-1*pix_next] = ( 2*p1 + p0 + q1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5997 }
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
5998 if( FFABS( q2 - q0 ) < beta) {
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5999 /* q0', q1', q2' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6000 pix[0*pix_next] = ( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6001 pix[1*pix_next] = ( p0 + q0 + q1 + q2 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6002 pix[2*pix_next] = ( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6003 } else {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6004 /* q0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6005 pix[0*pix_next] = ( 2*q1 + q0 + p1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6006 }
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6007 }else{
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6008 /* p0', q0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6009 pix[-1*pix_next] = ( 2*p1 + p0 + q1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6010 pix[ 0*pix_next] = ( 2*q1 + q0 + p1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6011 }
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
6012 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
6013 }
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6014 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
6015 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6016 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6017 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6018
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6019 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
6020 int i;
4118
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
6021 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
6022 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
6023 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
6024
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6025 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
6026 int8_t tc[4];
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6027 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
6028 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
6029 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
6030 } else {
2707
360024d31dab H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents: 2683
diff changeset
6031 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
6032 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6033 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6034
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6035 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
6036 MpegEncContext * const s = &h->s;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6037 int mb_xy, mb_type;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6038 int qp, qp0, qp1, qpc, qpc0, qpc1, qp_thresh;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6039
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
6040 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
6041
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6042 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
6043 (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
6044 h->slice_table[mb_xy] != h->slice_table[mb_xy - 1]))) {
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6045 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
6046 return;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6047 }
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6048 assert(!FRAME_MBAFF);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6049
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6050 mb_type = s->current_picture.mb_type[mb_xy];
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6051 qp = s->current_picture.qscale_table[mb_xy];
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6052 qp0 = s->current_picture.qscale_table[mb_xy-1];
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6053 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
6054 qpc = get_chroma_qp( h, 0, qp );
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6055 qpc0 = get_chroma_qp( h, 0, qp0 );
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6056 qpc1 = get_chroma_qp( h, 0, qp1 );
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6057 qp0 = (qp + qp0 + 1) >> 1;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6058 qp1 = (qp + qp1 + 1) >> 1;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6059 qpc0 = (qpc + qpc0 + 1) >> 1;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6060 qpc1 = (qpc + qpc1 + 1) >> 1;
3651
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6061 qp_thresh = 15 - h->slice_alpha_c0_offset;
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6062 if(qp <= qp_thresh && qp0 <= qp_thresh && qp1 <= qp_thresh &&
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6063 qpc <= qp_thresh && qpc0 <= qp_thresh && qpc1 <= qp_thresh)
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6064 return;
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6065
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6066 if( IS_INTRA(mb_type) ) {
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6067 int16_t bS4[4] = {4,4,4,4};
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6068 int16_t bS3[4] = {3,3,3,3};
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6069 if( IS_8x8DCT(mb_type) ) {
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6070 filter_mb_edgev( h, &img_y[4*0], linesize, bS4, qp0 );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6071 filter_mb_edgev( h, &img_y[4*2], linesize, bS3, qp );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6072 filter_mb_edgeh( h, &img_y[4*0*linesize], linesize, bS4, qp1 );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6073 filter_mb_edgeh( h, &img_y[4*2*linesize], linesize, bS3, qp );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6074 } else {
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6075 filter_mb_edgev( h, &img_y[4*0], linesize, bS4, qp0 );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6076 filter_mb_edgev( h, &img_y[4*1], linesize, bS3, qp );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6077 filter_mb_edgev( h, &img_y[4*2], linesize, bS3, qp );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6078 filter_mb_edgev( h, &img_y[4*3], linesize, bS3, qp );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6079 filter_mb_edgeh( h, &img_y[4*0*linesize], linesize, bS4, qp1 );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6080 filter_mb_edgeh( h, &img_y[4*1*linesize], linesize, bS3, qp );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6081 filter_mb_edgeh( h, &img_y[4*2*linesize], linesize, bS3, qp );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6082 filter_mb_edgeh( h, &img_y[4*3*linesize], linesize, bS3, qp );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6083 }
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6084 filter_mb_edgecv( h, &img_cb[2*0], uvlinesize, bS4, qpc0 );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6085 filter_mb_edgecv( h, &img_cb[2*2], uvlinesize, bS3, qpc );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6086 filter_mb_edgecv( h, &img_cr[2*0], uvlinesize, bS4, qpc0 );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6087 filter_mb_edgecv( h, &img_cr[2*2], uvlinesize, bS3, qpc );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6088 filter_mb_edgech( h, &img_cb[2*0*uvlinesize], uvlinesize, bS4, qpc1 );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6089 filter_mb_edgech( h, &img_cb[2*2*uvlinesize], uvlinesize, bS3, qpc );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6090 filter_mb_edgech( h, &img_cr[2*0*uvlinesize], uvlinesize, bS4, qpc1 );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6091 filter_mb_edgech( h, &img_cr[2*2*uvlinesize], uvlinesize, bS3, qpc );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6092 return;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6093 } else {
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6094 DECLARE_ALIGNED_8(int16_t, bS[2][4][4]);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6095 uint64_t (*bSv)[4] = (uint64_t(*)[4])bS;
3651
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6096 int edges;
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6097 if( IS_8x8DCT(mb_type) && (h->cbp&7) == 7 ) {
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6098 edges = 4;
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6099 bSv[0][0] = bSv[0][2] = bSv[1][0] = bSv[1][2] = 0x0002000200020002ULL;
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6100 } else {
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6101 int mask_edge1 = (mb_type & (MB_TYPE_16x16 | MB_TYPE_8x16)) ? 3 :
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6102 (mb_type & MB_TYPE_16x8) ? 1 : 0;
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6103 int mask_edge0 = (mb_type & (MB_TYPE_16x16 | MB_TYPE_8x16))
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6104 && (s->current_picture.mb_type[mb_xy-1] & (MB_TYPE_16x16 | MB_TYPE_8x16))
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6105 ? 3 : 0;
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6106 int step = IS_8x8DCT(mb_type) ? 2 : 1;
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6107 edges = (mb_type & MB_TYPE_16x16) && !(h->cbp & 15) ? 1 : 4;
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6108 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
6109 (h->slice_type == B_TYPE), edges, step, mask_edge0, mask_edge1 );
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6110 }
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6111 if( IS_INTRA(s->current_picture.mb_type[mb_xy-1]) )
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6112 bSv[0][0] = 0x0004000400040004ULL;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6113 if( IS_INTRA(s->current_picture.mb_type[h->top_mb_xy]) )
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6114 bSv[1][0] = 0x0004000400040004ULL;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6115
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6116 #define FILTER(hv,dir,edge)\
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6117 if(bSv[dir][edge]) {\
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6118 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
6119 if(!(edge&1)) {\
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6120 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
6121 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
6122 }\
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6123 }
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6124 if( edges == 1 ) {
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6125 FILTER(v,0,0);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6126 FILTER(h,1,0);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6127 } else if( IS_8x8DCT(mb_type) ) {
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6128 FILTER(v,0,0);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6129 FILTER(v,0,2);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6130 FILTER(h,1,0);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6131 FILTER(h,1,2);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6132 } else {
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6133 FILTER(v,0,0);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6134 FILTER(v,0,1);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6135 FILTER(v,0,2);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6136 FILTER(v,0,3);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6137 FILTER(h,1,0);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6138 FILTER(h,1,1);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6139 FILTER(h,1,2);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6140 FILTER(h,1,3);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6141 }
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6142 #undef FILTER
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6143 }
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6144 }
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6145
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6146 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
6147 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
6148 const int mb_xy= mb_x + mb_y*s->mb_stride;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6149 const int mb_type = s->current_picture.mb_type[mb_xy];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6150 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
6151 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
6152 int dir;
2629
202cd69d8d2e fix ref comparison in B-frame deblocker ('unused' and 'unavailable' were treated as different)
lorenm
parents: 2628
diff changeset
6153 /* 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
6154 * 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
6155 * frame numbers, not indices. */
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6156 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
6157 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
6158
3101
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
6159 //for sufficiently low qp, filtering wouldn't do anything
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
6160 //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
6161 if(!FRAME_MBAFF){
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6162 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
6163 int qp = s->current_picture.qscale_table[mb_xy];
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
6164 if(qp <= qp_thresh
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
6165 && (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
6166 && (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
6167 return;
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
6168 }
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
6169 }
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
6170
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6171 if (FRAME_MBAFF
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6172 // left mb is in picture
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6173 && 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
6174 // and current and left pair do not have the same interlaced type
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6175 && (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
6176 // 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
6177 && (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
6178 /* 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
6179 * 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
6180 */
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6181 const int pair_xy = mb_x + (mb_y&~1)*s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6182 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
6183 int16_t bS[8];
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6184 int qp[2];
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6185 int bqp[2];
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6186 int rqp[2];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6187 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
6188 int i;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6189 first_vertical_edge_done = 1;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6190
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6191 if( IS_INTRA(mb_type) )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6192 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
6193 else {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6194 for( i = 0; i < 8; i++ ) {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6195 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
6196
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6197 if( IS_INTRA( s->current_picture.mb_type[mbn_xy] ) )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6198 bS[i] = 4;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6199 else if( h->non_zero_count_cache[12+8*(i>>1)] != 0 ||
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6200 /* FIXME: with 8x8dct + cavlc, should check cbp instead of nnz */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6201 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
6202 bS[i] = 2;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6203 else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6204 bS[i] = 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6205 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6206 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6207
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6208 mb_qp = s->current_picture.qscale_table[mb_xy];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6209 mbn0_qp = s->current_picture.qscale_table[left_mb_xy[0]];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6210 mbn1_qp = s->current_picture.qscale_table[left_mb_xy[1]];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6211 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
6212 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
6213 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
6214 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
6215 get_chroma_qp( h, 1, mbn0_qp ) + 1 ) >> 1;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6216 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
6217 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
6218 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
6219 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
6220 get_chroma_qp( h, 1, mbn1_qp ) + 1 ) >> 1;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6221
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6222 /* Filter edge */
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6223 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
6224 { 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
6225 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
6226 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
6227 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
6228 }
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
6229 /* 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
6230 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
6231 {
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6232 int edge;
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6233 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
6234 const int mbm_type = s->current_picture.mb_type[mbm_xy];
2454
300f1207768d simplify
michael
parents: 2453
diff changeset
6235 int start = h->slice_table[mbm_xy] == 255 ? 1 : 0;
300f1207768d simplify
michael
parents: 2453
diff changeset
6236
3101
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
6237 const int edges = (mb_type & (MB_TYPE_16x16|MB_TYPE_SKIP))
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
6238 == (MB_TYPE_16x16|MB_TYPE_SKIP) ? 1 : 4;
2926
dfdbef4bfdc5 no mixing of code and declarations
mru
parents: 2924
diff changeset
6239 // how often to recheck mv-based bS when iterating between edges
dfdbef4bfdc5 no mixing of code and declarations
mru
parents: 2924
diff changeset
6240 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
6241 (mb_type & (MB_TYPE_8x16 >> dir)) ? 1 : 0;
dfdbef4bfdc5 no mixing of code and declarations
mru
parents: 2924
diff changeset
6242 // how often to recheck mv-based bS when iterating along each edge
dfdbef4bfdc5 no mixing of code and declarations
mru
parents: 2924
diff changeset
6243 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
6244
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6245 if (first_vertical_edge_done) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6246 start = 1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6247 first_vertical_edge_done = 0;
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
2454
300f1207768d simplify
michael
parents: 2453
diff changeset
6250 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
6251 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
6252
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6253 if (FRAME_MBAFF && (dir == 1) && ((mb_y&1) == 0) && start == 0
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6254 && !IS_INTERLACED(mb_type)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6255 && IS_INTERLACED(mbm_type)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6256 ) {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6257 // This is a special case in the norm where the filtering must
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6258 // be done twice (one each of the field) even if we are in a
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6259 // frame macroblock.
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6260 //
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6261 static const int nnz_idx[4] = {4,5,6,3};
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6262 unsigned int tmp_linesize = 2 * linesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6263 unsigned int tmp_uvlinesize = 2 * uvlinesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6264 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
6265 int qp;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6266 int i, j;
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6267 int16_t bS[4];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6268
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6269 for(j=0; j<2; j++, mbn_xy += s->mb_stride){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6270 if( IS_INTRA(mb_type) ||
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6271 IS_INTRA(s->current_picture.mb_type[mbn_xy]) ) {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6272 bS[0] = bS[1] = bS[2] = bS[3] = 3;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6273 } else {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6274 const uint8_t *mbn_nnz = h->non_zero_count[mbn_xy];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6275 for( i = 0; i < 4; i++ ) {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6276 if( h->non_zero_count_cache[scan8[0]+i] != 0 ||
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6277 mbn_nnz[nnz_idx[i]] != 0 )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6278 bS[i] = 2;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6279 else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6280 bS[i] = 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6281 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6282 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6283 // Do not use s->qscale as luma quantizer because it has not the same
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6284 // value in IPCM macroblocks.
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6285 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
6286 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
6287 { 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
6288 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
6289 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
6290 ( 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
6291 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
6292 ( 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
6293 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6294
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6295 start = 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6296 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6297
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
6298 /* Calculate bS */
2924
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6299 for( edge = start; edge < edges; edge++ ) {
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
6300 /* mbn_xy: neighbor macroblock */
2924
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6301 const int mbn_xy = edge > 0 ? mb_xy : mbm_xy;
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6302 const int mbn_type = s->current_picture.mb_type[mbn_xy];
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6303 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
6304 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
6305
2924
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6306 if( (edge&1) && IS_8x8DCT(mb_type) )
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6307 continue;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6308
2924
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6309 if( IS_INTRA(mb_type) ||
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6310 IS_INTRA(mbn_type) ) {
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6311 int value;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6312 if (edge == 0) {
2924
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6313 if ( (!IS_INTERLACED(mb_type) && !IS_INTERLACED(mbm_type))
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6314 || ((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
6315 ) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6316 value = 4;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6317 } else {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6318 value = 3;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6319 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6320 } else {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6321 value = 3;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6322 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6323 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
6324 } else {
2924
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6325 int i, l;
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6326 int mv_done;
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6327
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6328 if( edge & mask_edge ) {
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6329 bS[0] = bS[1] = bS[2] = bS[3] = 0;
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6330 mv_done = 1;
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6331 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6332 else if( FRAME_MBAFF && IS_INTERLACED(mb_type ^ mbn_type)) {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6333 bS[0] = bS[1] = bS[2] = bS[3] = 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6334 mv_done = 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6335 }
2924
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6336 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
6337 int b_idx= 8 + 4 + edge * (dir ? 8:1);
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6338 int bn_idx= b_idx - (dir ? 8:1);
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6339 int v = 0;
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6340 for( l = 0; !v && l < 1 + (h->slice_type == B_TYPE); l++ ) {
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6341 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
6342 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
6343 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
6344 }
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6345 bS[0] = bS[1] = bS[2] = bS[3] = v;
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6346 mv_done = 1;
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6347 }
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6348 else
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6349 mv_done = 0;
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6350
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
6351 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
6352 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
6353 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
6354 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
6355 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
6356
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
6357 if( h->non_zero_count_cache[b_idx] != 0 ||
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
6358 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
6359 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
6360 }
2924
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6361 else if(!mv_done)
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
6362 {
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
6363 bS[i] = 0;
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
6364 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
6365 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
6366 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
6367 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
6368 bS[i] = 1;
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
6369 break;
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
6370 }
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
6371 }
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
6372 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6373 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
6374
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
6375 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
6376 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
6377 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6378
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6379 /* Filter edge */
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
6380 // 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
6381 // value in IPCM macroblocks.
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6382 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
6383 //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
6384 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
6385 { 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
6386 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
6387 filter_mb_edgev( h, &img_y[4*edge], linesize, bS, qp );
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6388 if( (edge&1) == 0 ) {
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6389 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
6390 ( 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
6391 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
6392 ( 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
6393 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6394 } 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
6395 filter_mb_edgeh( h, &img_y[4*edge*linesize], linesize, bS, qp );
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6396 if( (edge&1) == 0 ) {
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6397 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
6398 ( 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
6399 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
6400 ( 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
6401 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6402 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6403 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6404 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6405 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6406
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6407 static int decode_slice(struct AVCodecContext *avctx, H264Context *h){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6408 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6409 const int part_mask= s->partitioned_frame ? (AC_END|AC_ERROR) : 0x7F;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6410
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6411 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
6412
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6413 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
6414 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
6415
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6416 /* realign */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6417 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
6418
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6419 /* 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
6420 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
6421 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
6422 s->gb.buffer + get_bits_count(&s->gb)/8,
2116
48d9f86fb047 overread fix
michael
parents: 2110
diff changeset
6423 ( 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
6424 /* calculate pre-state */
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6425 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
6426 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
6427 if( h->slice_type == I_TYPE )
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
6428 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
6429 else
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
6430 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
6431
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6432 if( pre <= 63 )
3976
27e90123b346 reverse remainder of the failed attempt to optimize *state=c->mps_state[s]
michael
parents: 3972
diff changeset
6433 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
6434 else
3976
27e90123b346 reverse remainder of the failed attempt to optimize *state=c->mps_state[s]
michael
parents: 3972
diff changeset
6435 h->cabac_state[i] = 2 * ( pre - 64 ) + 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6436 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6437
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6438 for(;;){
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
6439 //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
6440 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
6441 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
6442 //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
6443
2163
b25df257eab0 segfault fix
michael
parents: 2116
diff changeset
6444 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
6445
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6446 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
6447 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
6448
2163
b25df257eab0 segfault fix
michael
parents: 2116
diff changeset
6449 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
6450
2844
5f20ab245501 prevent assert failures and infinite loops with broken streams
michael
parents: 2834
diff changeset
6451 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
6452 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
6453 }
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
6454 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
6455
3948
3edbf131ee44 refill cabac variables in 16bit steps, 3% faster get_cabac()
michael
parents: 3947
diff changeset
6456 if( ret < 0 || h->cabac.bytestream > h->cabac.bytestream_end + 2) {
5153
b985439e3e15 fix some printf format specifiers
mru
parents: 5129
diff changeset
6457 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
6458 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
6459 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
6460 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6461
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6462 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
6463 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
6464 ff_draw_horiz_band(s, 16*s->mb_y, 16);
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
6465 ++s->mb_y;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6466 if(FRAME_MBAFF) {
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
6467 ++s->mb_y;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
6468 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6469 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6470
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6471 if( eos || s->mb_y >= s->mb_height ) {
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
6472 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
6473 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
6474 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
6475 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6476 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6477
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6478 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6479 for(;;){
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6480 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
6481
2163
b25df257eab0 segfault fix
michael
parents: 2116
diff changeset
6482 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
6483
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6484 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
6485 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
6486 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
6487
2163
b25df257eab0 segfault fix
michael
parents: 2116
diff changeset
6488 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
6489 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
6490 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6491
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6492 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
6493 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
6494 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
6495
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6496 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
6497 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6498
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6499 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
6500 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
6501 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
6502 ++s->mb_y;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6503 if(FRAME_MBAFF) {
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
6504 ++s->mb_y;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
6505 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
6506 if(s->mb_y >= s->mb_height){
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
6507 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
6508
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6509 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
6510 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
6511
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6512 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
6513 }else{
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6514 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
6515
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6516 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
6517 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6518 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6519 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6520
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6521 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
6522 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
6523 if(get_bits_count(&s->gb) == s->gb.size_in_bits ){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6524 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
6525
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6526 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6527 }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
6528 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
6529
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6530 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6531 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6532 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6533 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6534 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6535
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6536 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6537 for(;s->mb_y < s->mb_height; s->mb_y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6538 for(;s->mb_x < s->mb_width; s->mb_x++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6539 int ret= decode_mb(h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6540
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6541 hl_decode_mb(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6542
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6543 if(ret<0){
3177
8d1b2cc2a75b (f)printf --> av_log conversion
diego
parents: 3174
diff changeset
6544 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
6545 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
6546
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6547 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6548 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6549
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6550 if(++s->mb_x >= s->mb_width){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6551 s->mb_x=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6552 if(++s->mb_y >= s->mb_height){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6553 if(get_bits_count(s->gb) == s->gb.size_in_bits){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6554 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
6555
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6556 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6557 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6558 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
6559
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6560 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6561 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6562 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6563 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6564
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6565 if(get_bits_count(s->?gb) >= s->gb?.size_in_bits){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6566 if(get_bits_count(s->gb) == s->gb.size_in_bits){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6567 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
6568
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6569 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6570 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6571 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
6572
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6573 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6574 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6575 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6576 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6577 s->mb_x=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6578 ff_draw_horiz_band(s, 16*s->mb_y, 16);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6579 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6580 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6581 return -1; //not reached
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6582 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6583
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6584 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
6585 MpegEncContext * const s = &h->s;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6586 uint8_t user_data[16+256];
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6587 int e, build, i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6588
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6589 if(size<16)
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6590 return -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6591
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6592 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
6593 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
6594 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6595
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6596 user_data[i]= 0;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6597 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
6598 if(e==1 && build>=0)
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6599 h->x264_build= build;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6600
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6601 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
6602 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
6603
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6604 for(; i<size; i++)
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6605 skip_bits(&s->gb, 8);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6606
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6607 return 0;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6608 }
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6609
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6610 static int decode_sei(H264Context *h){
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6611 MpegEncContext * const s = &h->s;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6612
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6613 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
6614 int size, type;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6615
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6616 type=0;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6617 do{
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6618 type+= show_bits(&s->gb, 8);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6619 }while(get_bits(&s->gb, 8) == 255);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6620
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6621 size=0;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6622 do{
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6623 size+= show_bits(&s->gb, 8);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6624 }while(get_bits(&s->gb, 8) == 255);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6625
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6626 switch(type){
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6627 case 5:
3318
8dc886b9568a typo me thinks ...
michael
parents: 3316
diff changeset
6628 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
6629 return -1;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6630 break;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6631 default:
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6632 skip_bits(&s->gb, 8*size);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6633 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6634
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6635 //FIXME check bits here
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6636 align_get_bits(&s->gb);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6637 }
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6638
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6639 return 0;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6640 }
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6641
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6642 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
6643 MpegEncContext * const s = &h->s;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6644 int cpb_count, i;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6645 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
6646 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
6647 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
6648 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
6649 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
6650 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
6651 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
6652 }
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6653 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
6654 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
6655 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
6656 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
6657 }
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6658
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6659 static inline int decode_vui_parameters(H264Context *h, SPS *sps){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6660 MpegEncContext * const s = &h->s;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
6661 int aspect_ratio_info_present_flag;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
6662 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
6663 int nal_hrd_parameters_present_flag, vcl_hrd_parameters_present_flag;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6664
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6665 aspect_ratio_info_present_flag= get_bits1(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6666
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6667 if( aspect_ratio_info_present_flag ) {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6668 aspect_ratio_idc= get_bits(&s->gb, 8);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6669 if( aspect_ratio_idc == EXTENDED_SAR ) {
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
6670 sps->sar.num= get_bits(&s->gb, 16);
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
6671 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
6672 }else if(aspect_ratio_idc < 14){
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
6673 sps->sar= pixel_aspect[aspect_ratio_idc];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6674 }else{
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
6675 av_log(h->s.avctx, AV_LOG_ERROR, "illegal aspect ratio\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6676 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6677 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6678 }else{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6679 sps->sar.num=
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
6680 sps->sar.den= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6681 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6682 // 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
6683
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
6684 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
6685 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
6686 }
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
6687
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
6688 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
6689 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
6690 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
6691 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
6692 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
6693 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
6694 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
6695 }
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
6696 }
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
6697
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
6698 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
6699 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
6700 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
6701 }
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
6702
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
6703 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
6704 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
6705 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
6706 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
6707 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
6708 }
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
6709
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6710 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
6711 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
6712 decode_hrd_parameters(h, sps);
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6713 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
6714 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
6715 decode_hrd_parameters(h, sps);
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6716 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
6717 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
6718 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
6719
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6720 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
6721 if(sps->bitstream_restriction_flag){
4389
3afddc65631b check num_reorder_frames for validity
michael
parents: 4388
diff changeset
6722 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
6723 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
6724 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
6725 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
6726 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
6727 get_ue_golomb(&s->gb); /* log2_max_mv_length_vertical */
4389
3afddc65631b check num_reorder_frames for validity
michael
parents: 4388
diff changeset
6728 num_reorder_frames= get_ue_golomb(&s->gb);
3afddc65631b check num_reorder_frames for validity
michael
parents: 4388
diff changeset
6729 get_ue_golomb(&s->gb); /*max_dec_frame_buffering*/
3afddc65631b check num_reorder_frames for validity
michael
parents: 4388
diff changeset
6730
3afddc65631b check num_reorder_frames for validity
michael
parents: 4388
diff changeset
6731 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
6732 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
6733 return -1;
3afddc65631b check num_reorder_frames for validity
michael
parents: 4388
diff changeset
6734 }
3afddc65631b check num_reorder_frames for validity
michael
parents: 4388
diff changeset
6735
3afddc65631b check num_reorder_frames for validity
michael
parents: 4388
diff changeset
6736 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
6737 }
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6738
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6739 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6740 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6741
3004
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
6742 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
6743 const uint8_t *jvt_list, const uint8_t *fallback_list){
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6744 MpegEncContext * const s = &h->s;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6745 int i, last = 8, next = 8;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6746 const uint8_t *scan = size == 16 ? zigzag_scan : zigzag_scan8x8;
3004
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
6747 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
6748 memcpy(factors, fallback_list, size*sizeof(uint8_t));
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6749 else
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6750 for(i=0;i<size;i++){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6751 if(next)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6752 next = (last + get_se_golomb(&s->gb)) & 0xff;
3004
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
6753 if(!i && !next){ /* matrix not written, we use the preset one */
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
6754 memcpy(factors, jvt_list, size*sizeof(uint8_t));
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6755 break;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6756 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6757 last = factors[scan[i]] = next ? next : last;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6758 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6759 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6760
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6761 static void decode_scaling_matrices(H264Context *h, SPS *sps, PPS *pps, int is_sps,
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6762 uint8_t (*scaling_matrix4)[16], uint8_t (*scaling_matrix8)[64]){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6763 MpegEncContext * const s = &h->s;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6764 int fallback_sps = !is_sps && sps->scaling_matrix_present;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6765 const uint8_t *fallback[4] = {
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6766 fallback_sps ? sps->scaling_matrix4[0] : default_scaling4[0],
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6767 fallback_sps ? sps->scaling_matrix4[3] : default_scaling4[1],
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6768 fallback_sps ? sps->scaling_matrix8[0] : default_scaling8[0],
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6769 fallback_sps ? sps->scaling_matrix8[1] : default_scaling8[1]
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6770 };
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6771 if(get_bits1(&s->gb)){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6772 sps->scaling_matrix_present |= is_sps;
3004
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
6773 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
6774 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
6775 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
6776 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
6777 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
6778 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
6779 if(is_sps || pps->transform_8x8_mode){
3004
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
6780 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
6781 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
6782 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6783 } else if(fallback_sps) {
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6784 memcpy(scaling_matrix4, sps->scaling_matrix4, 6*16*sizeof(uint8_t));
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6785 memcpy(scaling_matrix8, sps->scaling_matrix8, 2*64*sizeof(uint8_t));
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6786 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6787 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6788
5079
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
6789 /**
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
6790 * Returns and optionally allocates SPS / PPS structures in the supplied array 'vec'
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
6791 */
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
6792 static void *
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
6793 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
6794 const size_t size, const char *name)
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
6795 {
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
6796 if(id>=max) {
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
6797 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
6798 return NULL;
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
6799 }
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
6800
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
6801 if(!vec[id]) {
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
6802 vec[id] = av_mallocz(size);
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
6803 if(vec[id] == NULL)
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
6804 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
6805 }
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
6806 return vec[id];
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
6807 }
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
6808
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6809 static inline int decode_seq_parameter_set(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6810 MpegEncContext * const s = &h->s;
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6811 int profile_idc, level_idc;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
6812 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
6813 int i;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6814 SPS *sps;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6815
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6816 profile_idc= get_bits(&s->gb, 8);
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6817 get_bits1(&s->gb); //constraint_set0_flag
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6818 get_bits1(&s->gb); //constraint_set1_flag
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6819 get_bits1(&s->gb); //constraint_set2_flag
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
6820 get_bits1(&s->gb); //constraint_set3_flag
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
6821 get_bits(&s->gb, 4); // reserved
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6822 level_idc= get_bits(&s->gb, 8);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6823 sps_id= get_ue_golomb(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6824
5079
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
6825 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
6826 if(sps == NULL)
4362
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
6827 return -1;
5079
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
6828
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6829 sps->profile_idc= profile_idc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6830 sps->level_idc= level_idc;
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
6831
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6832 if(sps->profile_idc >= 100){ //high profile
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6833 if(get_ue_golomb(&s->gb) == 3) //chroma_format_idc
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6834 get_bits1(&s->gb); //residual_color_transform_flag
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6835 get_ue_golomb(&s->gb); //bit_depth_luma_minus8
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6836 get_ue_golomb(&s->gb); //bit_depth_chroma_minus8
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
6837 sps->transform_bypass = get_bits1(&s->gb);
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6838 decode_scaling_matrices(h, sps, NULL, 1, sps->scaling_matrix4, sps->scaling_matrix8);
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6839 }else
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6840 sps->scaling_matrix_present = 0;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6841
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6842 sps->log2_max_frame_num= get_ue_golomb(&s->gb) + 4;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6843 sps->poc_type= get_ue_golomb(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6844
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6845 if(sps->poc_type == 0){ //FIXME #define
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6846 sps->log2_max_poc_lsb= get_ue_golomb(&s->gb) + 4;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6847 } else if(sps->poc_type == 1){//FIXME #define
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6848 sps->delta_pic_order_always_zero_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6849 sps->offset_for_non_ref_pic= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6850 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
6851 tmp= get_ue_golomb(&s->gb);
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
6852
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
6853 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
6854 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
6855 return -1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
6856 }
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
6857 sps->poc_cycle_length= tmp;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6858
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6859 for(i=0; i<sps->poc_cycle_length; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6860 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
6861 }else if(sps->poc_type != 2){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
6862 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
6863 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6864 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6865
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
6866 tmp= get_ue_golomb(&s->gb);
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
6867 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
6868 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
6869 }
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
6870 sps->ref_frame_count= tmp;
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6871 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
6872 mb_width= get_ue_golomb(&s->gb) + 1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
6873 mb_height= get_ue_golomb(&s->gb) + 1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
6874 if(mb_width >= INT_MAX/16 || mb_height >= INT_MAX/16 ||
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
6875 avcodec_check_dimensions(NULL, 16*mb_width, 16*mb_height)){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
6876 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
6877 return -1;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
6878 }
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
6879 sps->mb_width = mb_width;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
6880 sps->mb_height= mb_height;
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2417
diff changeset
6881
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6882 sps->frame_mbs_only_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6883 if(!sps->frame_mbs_only_flag)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6884 sps->mb_aff= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6885 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6886 sps->mb_aff= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6887
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6888 sps->direct_8x8_inference_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6889
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6890 #ifndef ALLOW_INTERLACE
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6891 if(sps->mb_aff)
3954
00a12ef7d800 output typo fixes
diego
parents: 3948
diff changeset
6892 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
6893 #endif
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6894 if(!sps->direct_8x8_inference_flag && sps->mb_aff)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6895 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
6896
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6897 sps->crop= get_bits1(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6898 if(sps->crop){
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6899 sps->crop_left = get_ue_golomb(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6900 sps->crop_right = get_ue_golomb(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6901 sps->crop_top = get_ue_golomb(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6902 sps->crop_bottom= get_ue_golomb(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6903 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
6904 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
6905 }
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6906 }else{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6907 sps->crop_left =
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6908 sps->crop_right =
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6909 sps->crop_top =
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6910 sps->crop_bottom= 0;
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6911 }
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6912
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6913 sps->vui_parameters_present_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6914 if( sps->vui_parameters_present_flag )
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6915 decode_vui_parameters(h, sps);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6916
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6917 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
6918 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
6919 sps_id, sps->profile_idc, sps->level_idc,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6920 sps->poc_type,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6921 sps->ref_frame_count,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6922 sps->mb_width, sps->mb_height,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6923 sps->frame_mbs_only_flag ? "FRM" : (sps->mb_aff ? "MB-AFF" : "PIC-AFF"),
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6924 sps->direct_8x8_inference_flag ? "8B8" : "",
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6925 sps->crop_left, sps->crop_right,
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6926 sps->crop_top, sps->crop_bottom,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6927 sps->vui_parameters_present_flag ? "VUI" : ""
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6928 );
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6929 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6930 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6931 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6932
5226
65bffcc5571a Precompute a chroma_qp table with index offset for each pps,
gpoirier
parents: 5225
diff changeset
6933 static void
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6934 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
6935 {
65bffcc5571a Precompute a chroma_qp table with index offset for each pps,
gpoirier
parents: 5225
diff changeset
6936 int i;
65bffcc5571a Precompute a chroma_qp table with index offset for each pps,
gpoirier
parents: 5225
diff changeset
6937 for(i = 0; i < 255; i++)
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6938 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
6939 }
65bffcc5571a Precompute a chroma_qp table with index offset for each pps,
gpoirier
parents: 5225
diff changeset
6940
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6941 static inline int decode_picture_parameter_set(H264Context *h, int bit_length){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6942 MpegEncContext * const s = &h->s;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
6943 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
6944 PPS *pps;
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
6945
5079
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
6946 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
6947 if(pps == NULL)
4362
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
6948 return -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6949
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
6950 tmp= get_ue_golomb(&s->gb);
5079
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
6951 if(tmp>=MAX_SPS_COUNT || h->sps_buffers[tmp] == NULL){
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
6952 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
6953 return -1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
6954 }
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
6955 pps->sps_id= tmp;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
6956
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6957 pps->cabac= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6958 pps->pic_order_present= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6959 pps->slice_group_count= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6960 if(pps->slice_group_count > 1 ){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6961 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
6962 av_log(h->s.avctx, AV_LOG_ERROR, "FMO not supported\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6963 switch(pps->mb_slice_group_map_type){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6964 case 0:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6965 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6966 | for( i = 0; i <= num_slice_groups_minus1; i++ ) | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6967 | run_length[ i ] |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6968 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6969 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6970 case 2:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6971 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6972 | for( i = 0; i < num_slice_groups_minus1; i++ ) | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6973 |{ | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6974 | top_left_mb[ i ] |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6975 | bottom_right_mb[ i ] |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6976 | } | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6977 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6978 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6979 case 3:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6980 case 4:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6981 case 5:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6982 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6983 | slice_group_change_direction_flag |1 |u(1) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6984 | slice_group_change_rate_minus1 |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6985 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6986 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6987 case 6:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6988 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6989 | slice_group_id_cnt_minus1 |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6990 | for( i = 0; i <= slice_group_id_cnt_minus1; i++ | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6991 |) | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6992 | slice_group_id[ i ] |1 |u(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6993 #endif
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1187
diff changeset
6994 break;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6995 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6996 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6997 pps->ref_count[0]= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6998 pps->ref_count[1]= get_ue_golomb(&s->gb) + 1;
4531
8a5a3dd25390 fix ref_count check
michael
parents: 4530
diff changeset
6999 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
7000 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
7001 pps->ref_count[0]= pps->ref_count[1]= 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7002 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7003 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7004
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7005 pps->weighted_pred= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7006 pps->weighted_bipred_idc= get_bits(&s->gb, 2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7007 pps->init_qp= get_se_golomb(&s->gb) + 26;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7008 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
7009 pps->chroma_qp_index_offset[0]= get_se_golomb(&s->gb);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7010 pps->deblocking_filter_parameters_present= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7011 pps->constrained_intra_pred= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7012 pps->redundant_pic_cnt_present = get_bits1(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7013
3291
454de57e45cf reinit quant matrices if pps is overwritten by another of the same pps_id.
lorenm
parents: 3285
diff changeset
7014 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
7015 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
7016 memset(pps->scaling_matrix4, 16, 6*16*sizeof(uint8_t));
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7017 memset(pps->scaling_matrix8, 16, 2*64*sizeof(uint8_t));
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7018
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7019 if(get_bits_count(&s->gb) < bit_length){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7020 pps->transform_8x8_mode= get_bits1(&s->gb);
5079
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7021 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
7022 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
7023 } else {
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
7024 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
7025 }
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
7026
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
7027 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
7028 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
7029 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
7030 h->pps.chroma_qp_diff= 1;
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
7031 } else
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
7032 memcpy(pps->chroma_qp_table[1], pps->chroma_qp_table[0], 256);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7033
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7034 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
7035 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
7036 pps_id, pps->sps_id,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7037 pps->cabac ? "CABAC" : "CAVLC",
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7038 pps->slice_group_count,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7039 pps->ref_count[0], pps->ref_count[1],
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7040 pps->weighted_pred ? "weighted" : "",
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
7041 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
7042 pps->deblocking_filter_parameters_present ? "LPAR" : "",
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7043 pps->constrained_intra_pred ? "CONSTR" : "",
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7044 pps->redundant_pic_cnt_present ? "REDU" : "",
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7045 pps->transform_8x8_mode ? "8x8DCT" : ""
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7046 );
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7047 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7048
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7049 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7050 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7051
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7052 /**
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7053 * Call decode_slice() for each context.
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7054 *
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7055 * @param h h264 master context
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7056 * @param context_count number of contexts to execute
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7057 */
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7058 static void execute_decode_slices(H264Context *h, int context_count){
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7059 MpegEncContext * const s = &h->s;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7060 AVCodecContext * const avctx= s->avctx;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7061 H264Context *hx;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7062 int i;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7063
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7064 if(context_count == 1) {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7065 decode_slice(avctx, h);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7066 } else {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7067 for(i = 1; i < context_count; i++) {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7068 hx = h->thread_context[i];
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7069 hx->s.error_resilience = avctx->error_resilience;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7070 hx->s.error_count = 0;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7071 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7072
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7073 avctx->execute(avctx, (void *)decode_slice,
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7074 (void **)h->thread_context, NULL, context_count);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7075
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7076 /* pull back stuff from slices to master context */
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7077 hx = h->thread_context[context_count - 1];
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7078 s->mb_x = hx->s.mb_x;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7079 s->mb_y = hx->s.mb_y;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7080 for(i = 1; i < context_count; i++)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7081 h->s.error_count += h->thread_context[i]->s.error_count;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7082 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7083 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7084
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7085
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7086 static int decode_nal_units(H264Context *h, uint8_t *buf, int buf_size){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7087 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7088 AVCodecContext * const avctx= s->avctx;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7089 int buf_index=0;
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7090 H264Context *hx; ///< thread context
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7091 int context_count = 0;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7092
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7093 h->max_contexts = avctx->thread_count;
1322
f78341ab5fba some warning fixes
al3x
parents: 1319
diff changeset
7094 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7095 int i;
2867
7c7edddaa835 dont be so picky with .mp4 ... fixes Mr&MrsSmith.mp4
michael
parents: 2861
diff changeset
7096 for(i=0; i<50; i++){
7c7edddaa835 dont be so picky with .mp4 ... fixes Mr&MrsSmith.mp4
michael
parents: 2861
diff changeset
7097 av_log(NULL, AV_LOG_ERROR,"%02X ", buf[i]);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7098 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7099 #endif
4616
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7100 if(!(s->flags2 & CODEC_FLAG2_CHUNKS)){
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7101 h->current_slice = 0;
4616
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7102 s->current_picture_ptr= NULL;
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7103 }
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7104
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7105 for(;;){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7106 int consumed;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7107 int dst_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7108 int bit_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7109 uint8_t *ptr;
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7110 int i, nalsize = 0;
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7111 int err;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7112
5170
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7113 if(h->is_avc) {
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7114 if(buf_index >= buf_size) break;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7115 nalsize = 0;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7116 for(i = 0; i < h->nal_length_size; i++)
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7117 nalsize = (nalsize << 8) | buf[buf_index++];
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7118 if(nalsize <= 1 || (nalsize+buf_index > buf_size)){
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7119 if(nalsize == 1){
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7120 buf_index++;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7121 continue;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7122 }else{
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7123 av_log(h->s.avctx, AV_LOG_ERROR, "AVC: nal size %d\n", nalsize);
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7124 break;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7125 }
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7126 }
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7127 } else {
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7128 // start code prefix search
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7129 for(; buf_index + 3 < buf_size; buf_index++){
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7130 // This should always succeed in the first iteration.
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7131 if(buf[buf_index] == 0 && buf[buf_index+1] == 0 && buf[buf_index+2] == 1)
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7132 break;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7133 }
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7134
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7135 if(buf_index+3 >= buf_size) break;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7136
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7137 buf_index+=3;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7138 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7139
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7140 hx = h->thread_context[context_count];
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7141
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7142 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
7143 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
7144 return -1;
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
7145 }
4829
e3161603a048 Remove a NAL unit's trailing zero bytes even when dst_length is 1.
diego
parents: 4828
diff changeset
7146 while(ptr[dst_length - 1] == 0 && dst_length > 0)
3341
bd7a496e44c9 h264: accept rbsp_trailing longer than 1 byte
lorenm
parents: 3318
diff changeset
7147 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
7148 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
7149
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7150 if(s->avctx->debug&FF_DEBUG_STARTCODE){
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7151 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
7152 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7153
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7154 if (h->is_avc && (nalsize != consumed))
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7155 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
7156
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7157 buf_index += consumed;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7158
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5106
diff changeset
7159 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
7160 ||(avctx->skip_frame >= AVDISCARD_NONREF && h->nal_ref_idc == 0))
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7161 continue;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7162
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7163 again:
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7164 err = 0;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7165 switch(hx->nal_unit_type){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7166 case NAL_IDR_SLICE:
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7167 if (h->nal_unit_type != NAL_IDR_SLICE) {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7168 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
7169 return -1;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7170 }
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
7171 idr(h); //FIXME ensure we don't loose some frames if there is reordering
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7172 case NAL_SLICE:
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7173 init_get_bits(&hx->s.gb, ptr, bit_length);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7174 hx->intra_gb_ptr=
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7175 hx->inter_gb_ptr= &hx->s.gb;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7176 hx->s.data_partitioning = 0;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7177
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7178 if((err = decode_slice_header(hx, h)))
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7179 break;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7180
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7181 s->current_picture_ptr->key_frame= (hx->nal_unit_type == NAL_IDR_SLICE);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7182 if(hx->redundant_pic_count==0 && hx->s.hurry_up < 5
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7183 && (avctx->skip_frame < AVDISCARD_NONREF || hx->nal_ref_idc)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7184 && (avctx->skip_frame < AVDISCARD_BIDIR || hx->slice_type!=B_TYPE)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7185 && (avctx->skip_frame < AVDISCARD_NONKEY || hx->slice_type==I_TYPE)
2793
ae85da6c5c2f more fine grained skip_frame
michael
parents: 2792
diff changeset
7186 && avctx->skip_frame < AVDISCARD_ALL)
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7187 context_count++;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7188 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7189 case NAL_DPA:
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7190 init_get_bits(&hx->s.gb, ptr, bit_length);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7191 hx->intra_gb_ptr=
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7192 hx->inter_gb_ptr= NULL;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7193 hx->s.data_partitioning = 1;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7194
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7195 err = decode_slice_header(hx, h);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7196 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7197 case NAL_DPB:
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7198 init_get_bits(&hx->intra_gb, ptr, bit_length);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7199 hx->intra_gb_ptr= &hx->intra_gb;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7200 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7201 case NAL_DPC:
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7202 init_get_bits(&hx->inter_gb, ptr, bit_length);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7203 hx->inter_gb_ptr= &hx->inter_gb;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7204
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7205 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
7206 && s->context_initialized
2793
ae85da6c5c2f more fine grained skip_frame
michael
parents: 2792
diff changeset
7207 && s->hurry_up < 5
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7208 && (avctx->skip_frame < AVDISCARD_NONREF || hx->nal_ref_idc)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7209 && (avctx->skip_frame < AVDISCARD_BIDIR || hx->slice_type!=B_TYPE)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7210 && (avctx->skip_frame < AVDISCARD_NONKEY || hx->slice_type==I_TYPE)
2793
ae85da6c5c2f more fine grained skip_frame
michael
parents: 2792
diff changeset
7211 && avctx->skip_frame < AVDISCARD_ALL)
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7212 context_count++;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7213 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7214 case NAL_SEI:
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7215 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
7216 decode_sei(h);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7217 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7218 case NAL_SPS:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7219 init_get_bits(&s->gb, ptr, bit_length);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7220 decode_seq_parameter_set(h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7221
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7222 if(s->flags& CODEC_FLAG_LOW_DELAY)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7223 s->low_delay=1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7224
2538
34b0996cc10d 10l (fix reordering when B-frames are not present)
lorenm
parents: 2537
diff changeset
7225 if(avctx->has_b_frames < 2)
34b0996cc10d 10l (fix reordering when B-frames are not present)
lorenm
parents: 2537
diff changeset
7226 avctx->has_b_frames= !s->low_delay;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7227 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7228 case NAL_PPS:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7229 init_get_bits(&s->gb, ptr, bit_length);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7230
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7231 decode_picture_parameter_set(h, bit_length);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7232
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7233 break;
2960
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
7234 case NAL_AUD:
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
7235 case NAL_END_SEQUENCE:
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
7236 case NAL_END_STREAM:
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
7237 case NAL_FILLER_DATA:
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
7238 case NAL_SPS_EXT:
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
7239 case NAL_AUXILIARY_SLICE:
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7240 break;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2971
diff changeset
7241 default:
5631
550e37ec2204 Silence warnings about NAL_SVC_NON_IDR in H.264.
diego
parents: 5629
diff changeset
7242 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
7243 }
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7244
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7245 if(context_count == h->max_contexts) {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7246 execute_decode_slices(h, context_count);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7247 context_count = 0;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7248 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7249
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7250 if (err < 0)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7251 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
7252 else if(err == 1) {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7253 /* Slice could not be decoded in parallel mode, copy down
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7254 * NAL unit stuff to context 0 and restart. Note that
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7255 * rbsp_buffer is not transfered, but since we no longer
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7256 * run in parallel mode this should not be an issue. */
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7257 h->nal_unit_type = hx->nal_unit_type;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7258 h->nal_ref_idc = hx->nal_ref_idc;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7259 hx = h;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7260 goto again;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7261 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7262 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7263 if(context_count)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7264 execute_decode_slices(h, context_count);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7265 return buf_index;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7266 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7267
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7268 /**
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
7269 * returns the number of bytes consumed for building the current frame
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7270 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7271 static int get_consumed_bytes(MpegEncContext *s, int pos, int buf_size){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7272 if(s->flags&CODEC_FLAG_TRUNCATED){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7273 pos -= s->parse_context.last_index;
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
7274 if(pos<0) pos=0; // FIXME remove (unneeded?)
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7275
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7276 return pos;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7277 }else{
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5106
diff changeset
7278 if(pos==0) pos=1; //avoid infinite loops (i doubt that is needed but ...)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7279 if(pos+10>buf_size) pos=buf_size; // oops ;)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7280
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7281 return pos;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7282 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7283 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7284
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7285 static int decode_frame(AVCodecContext *avctx,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7286 void *data, int *data_size,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7287 uint8_t *buf, int buf_size)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7288 {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7289 H264Context *h = avctx->priv_data;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7290 MpegEncContext *s = &h->s;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7291 AVFrame *pict = data;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7292 int buf_index;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7293
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7294 s->flags= avctx->flags;
1754
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1706
diff changeset
7295 s->flags2= avctx->flags2;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7296
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7297 /* no supplementary picture */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7298 if (buf_size == 0) {
4556
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7299 Picture *out;
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7300 int i, out_idx;
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7301
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7302 //FIXME factorize this with the output code below
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7303 out = h->delayed_pic[0];
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7304 out_idx = 0;
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7305 for(i=1; h->delayed_pic[i] && !h->delayed_pic[i]->key_frame; i++)
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7306 if(h->delayed_pic[i]->poc < out->poc){
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7307 out = h->delayed_pic[i];
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7308 out_idx = i;
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7309 }
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7310
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7311 for(i=out_idx; h->delayed_pic[i]; i++)
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7312 h->delayed_pic[i] = h->delayed_pic[i+1];
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7313
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7314 if(out){
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7315 *data_size = sizeof(AVFrame);
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7316 *pict= *(AVFrame*)out;
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7317 }
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7318
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7319 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7320 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7321
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7322 if(s->flags&CODEC_FLAG_TRUNCATED){
4975
9a6a0818e93f split h264.c to move parser in its own file
aurel
parents: 4931
diff changeset
7323 int next= ff_h264_find_frame_end(h, buf, buf_size);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7324
4931
0d1cc37d9430 make some parser parameters const to avoid casting const to non-const
aurel
parents: 4908
diff changeset
7325 if( ff_combine_frame(&s->parse_context, next, (const uint8_t **)&buf, &buf_size) < 0 )
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7326 return buf_size;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7327 //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
7328 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7329
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7330 if(h->is_avc && !h->got_avcC) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7331 int i, cnt, nalsize;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7332 unsigned char *p = avctx->extradata;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7333 if(avctx->extradata_size < 7) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7334 av_log(avctx, AV_LOG_ERROR, "avcC too short\n");
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7335 return -1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7336 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7337 if(*p != 1) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7338 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
7339 return -1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7340 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7341 /* 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
7342 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
7343 h->nal_length_size = 2;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7344 // Decode sps from avcC
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7345 cnt = *(p+5) & 0x1f; // Number of sps
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7346 p += 6;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7347 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
7348 nalsize = AV_RB16(p) + 2;
2867
7c7edddaa835 dont be so picky with .mp4 ... fixes Mr&MrsSmith.mp4
michael
parents: 2861
diff changeset
7349 if(decode_nal_units(h, p, nalsize) < 0) {
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7350 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
7351 return -1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7352 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7353 p += nalsize;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7354 }
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7355 // Decode pps from avcC
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7356 cnt = *(p++); // Number of pps
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7357 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
7358 nalsize = AV_RB16(p) + 2;
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7359 if(decode_nal_units(h, p, nalsize) != nalsize) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7360 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
7361 return -1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7362 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7363 p += nalsize;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7364 }
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7365 // 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
7366 h->nal_length_size = ((*(((char*)(avctx->extradata))+4))&0x03)+1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7367 // Do not reparse avcC
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7368 h->got_avcC = 1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7369 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7370
4507
b80c704183e9 always decode extradata when of non-avc stream (like RTSP)
gpoirier
parents: 4391
diff changeset
7371 if(avctx->frame_number==0 && !h->is_avc && s->avctx->extradata_size){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7372 if(decode_nal_units(h, s->avctx->extradata, s->avctx->extradata_size) < 0)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7373 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7374 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7375
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7376 buf_index=decode_nal_units(h, buf, buf_size);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7377 if(buf_index < 0)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7378 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7379
4620
f23c20cf7579 check for no frame and prevent segfault
michael
parents: 4616
diff changeset
7380 if(!(s->flags2 & CODEC_FLAG2_CHUNKS) && !s->current_picture_ptr){
5629
7e5ebda833e9 Remove error raising when explicitely skipping frame
benoit
parents: 5547
diff changeset
7381 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
7382 av_log(avctx, AV_LOG_ERROR, "no frame!\n");
f23c20cf7579 check for no frame and prevent segfault
michael
parents: 4616
diff changeset
7383 return -1;
f23c20cf7579 check for no frame and prevent segfault
michael
parents: 4616
diff changeset
7384 }
f23c20cf7579 check for no frame and prevent segfault
michael
parents: 4616
diff changeset
7385
4616
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7386 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
7387 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
7388 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
7389 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
7390 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
7391
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7392 s->mb_y= 0;
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7393
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7394 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
7395 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
7396
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7397 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
7398 h->prev_frame_num= h->frame_num;
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7399 if(s->current_picture_ptr->reference){
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7400 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
7401 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
7402 }
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7403 if(s->current_picture_ptr->reference)
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7404 execute_ref_pic_marking(h, h->mmco, h->mmco_index);
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7405
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7406 ff_er_frame_end(s);
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7407
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7408 MPV_frame_end(s);
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7409
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7410 //FIXME do something with unavailable reference frames
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7411
2561
eb72c01df6ed 10l (compile fix)
lorenm
parents: 2560
diff changeset
7412 #if 0 //decode order
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7413 *data_size = sizeof(AVFrame);
2561
eb72c01df6ed 10l (compile fix)
lorenm
parents: 2560
diff changeset
7414 #else
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
7415 /* Sort B-frames into display order */
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7416
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7417 if(h->sps.bitstream_restriction_flag
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7418 && s->avctx->has_b_frames < h->sps.num_reorder_frames){
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7419 s->avctx->has_b_frames = h->sps.num_reorder_frames;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7420 s->low_delay = 0;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7421 }
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
7422
3298
9637da0a9c1b cosmetics (initalize variables where they are used)
michael
parents: 3297
diff changeset
7423 pics = 0;
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
7424 while(h->delayed_pic[pics]) pics++;
4388
3451831c6962 adding assert to protect delayed_pic
michael
parents: 4365
diff changeset
7425
3451831c6962 adding assert to protect delayed_pic
michael
parents: 4365
diff changeset
7426 assert(pics+1 < sizeof(h->delayed_pic) / sizeof(h->delayed_pic[0]));
3451831c6962 adding assert to protect delayed_pic
michael
parents: 4365
diff changeset
7427
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
7428 h->delayed_pic[pics++] = cur;
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7429 if(cur->reference == 0)
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7430 cur->reference = 1;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7431
3298
9637da0a9c1b cosmetics (initalize variables where they are used)
michael
parents: 3297
diff changeset
7432 cross_idr = 0;
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7433 for(i=0; h->delayed_pic[i]; i++)
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
7434 if(h->delayed_pic[i]->key_frame || h->delayed_pic[i]->poc==0)
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7435 cross_idr = 1;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7436
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
7437 out = h->delayed_pic[0];
3298
9637da0a9c1b cosmetics (initalize variables where they are used)
michael
parents: 3297
diff changeset
7438 out_idx = 0;
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7439 for(i=1; h->delayed_pic[i] && !h->delayed_pic[i]->key_frame; i++)
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7440 if(h->delayed_pic[i]->poc < out->poc){
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
7441 out = h->delayed_pic[i];
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
7442 out_idx = i;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
7443 }
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7444
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7445 out_of_order = !cross_idr && prev && out->poc < prev->poc;
3125
16f9d33c027d fix some crashes when missing frames
lorenm
parents: 3105
diff changeset
7446 if(h->sps.bitstream_restriction_flag && s->avctx->has_b_frames >= h->sps.num_reorder_frames)
16f9d33c027d fix some crashes when missing frames
lorenm
parents: 3105
diff changeset
7447 { }
16f9d33c027d fix some crashes when missing frames
lorenm
parents: 3105
diff changeset
7448 else if(prev && pics <= s->avctx->has_b_frames)
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7449 out = prev;
2923
7fa9106be552 fix a crash on dropped frames
lorenm
parents: 2920
diff changeset
7450 else if((out_of_order && pics-1 == s->avctx->has_b_frames && pics < 15)
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7451 || (s->low_delay &&
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7452 ((!cross_idr && prev && out->poc > prev->poc + 2)
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7453 || cur->pict_type == B_TYPE)))
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7454 {
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7455 s->low_delay = 0;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7456 s->avctx->has_b_frames++;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7457 out = prev;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7458 }
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7459 else if(out_of_order)
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7460 out = prev;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7461
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7462 if(out_of_order || pics > s->avctx->has_b_frames){
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
7463 for(i=out_idx; h->delayed_pic[i]; i++)
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
7464 h->delayed_pic[i] = h->delayed_pic[i+1];
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
7465 }
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
7466
3297
9ae9653d706c decoders should (IMHO) not duplicate frames, the application can do this if it wants
michael
parents: 3291
diff changeset
7467 if(prev == out)
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7468 *data_size = 0;
2561
eb72c01df6ed 10l (compile fix)
lorenm
parents: 2560
diff changeset
7469 else
eb72c01df6ed 10l (compile fix)
lorenm
parents: 2560
diff changeset
7470 *data_size = sizeof(AVFrame);
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7471 if(prev && prev != out && prev->reference == 1)
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7472 prev->reference = 0;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7473 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
7474 #endif
2409
26778a857b5b Sort B-frames into display order.
lorenm
parents: 2404
diff changeset
7475
2937
e63bbb945ebd fix a crash on seeking to an invalid frame
lorenm
parents: 2935
diff changeset
7476 if(out)
e63bbb945ebd fix a crash on seeking to an invalid frame
lorenm
parents: 2935
diff changeset
7477 *pict= *(AVFrame*)out;
e63bbb945ebd fix a crash on seeking to an invalid frame
lorenm
parents: 2935
diff changeset
7478 else
e63bbb945ebd fix a crash on seeking to an invalid frame
lorenm
parents: 2935
diff changeset
7479 av_log(avctx, AV_LOG_DEBUG, "no picture\n");
e63bbb945ebd fix a crash on seeking to an invalid frame
lorenm
parents: 2935
diff changeset
7480 }
e63bbb945ebd fix a crash on seeking to an invalid frame
lorenm
parents: 2935
diff changeset
7481
e63bbb945ebd fix a crash on seeking to an invalid frame
lorenm
parents: 2935
diff changeset
7482 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
7483 ff_print_debug_info(s, pict);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7484 //printf("out %d\n", (int)pict->data[0]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7485 #if 0 //?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7486
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7487 /* Return the Picture timestamp as the frame number */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7488 /* we substract 1 because it is added on utils.c */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7489 avctx->frame_number = s->picture_number - 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7490 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7491 return get_consumed_bytes(s, buf_index, buf_size);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7492 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7493 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7494 static inline void fill_mb_avail(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7495 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
7496 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7497
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7498 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
7499 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
7500 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
7501 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
7502 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7503 h->mb_avail[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7504 h->mb_avail[1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7505 h->mb_avail[2]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7506 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7507 h->mb_avail[3]= s->mb_x && h->slice_table[mb_xy - 1] == h->slice_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7508 h->mb_avail[4]= 1; //FIXME move out
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7509 h->mb_avail[5]= 0; //FIXME move out
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7510 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7511 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7512
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7513 #if 0 //selftest
5380
389366aa3458 Fix the self tests which are contained in some codecs and are using random().
takis
parents: 5338
diff changeset
7514 #undef random
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7515 #define COUNT 8000
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7516 #define SIZE (COUNT*40)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7517 int main(){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7518 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7519 uint8_t temp[SIZE];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7520 PutBitContext pb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7521 GetBitContext gb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7522 // int int_temp[10000];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7523 DSPContext dsp;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7524 AVCodecContext avctx;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7525
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7526 dsputil_init(&dsp, &avctx);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7527
1522
79dddc5cd990 removed the obsolete and unused parameters of init_put_bits
alex
parents: 1453
diff changeset
7528 init_put_bits(&pb, temp, SIZE);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7529 printf("testing unsigned exp golomb\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7530 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7531 START_TIMER
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7532 set_ue_golomb(&pb, i);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7533 STOP_TIMER("set_ue_golomb");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7534 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7535 flush_put_bits(&pb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7536
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7537 init_get_bits(&gb, temp, 8*SIZE);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7538 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7539 int j, s;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7540
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7541 s= show_bits(&gb, 24);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7542
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7543 START_TIMER
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7544 j= get_ue_golomb(&gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7545 if(j != i){
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5106
diff changeset
7546 printf("mismatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7547 // return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7548 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7549 STOP_TIMER("get_ue_golomb");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7550 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7551
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7552
1524
alex
parents: 1522
diff changeset
7553 init_put_bits(&pb, temp, SIZE);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7554 printf("testing signed exp golomb\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7555 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7556 START_TIMER
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7557 set_se_golomb(&pb, i - COUNT/2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7558 STOP_TIMER("set_se_golomb");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7559 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7560 flush_put_bits(&pb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7561
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7562 init_get_bits(&gb, temp, 8*SIZE);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7563 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7564 int j, s;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7565
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7566 s= show_bits(&gb, 24);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7567
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7568 START_TIMER
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7569 j= get_se_golomb(&gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7570 if(j != i - COUNT/2){
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5106
diff changeset
7571 printf("mismatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7572 // return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7573 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7574 STOP_TIMER("get_se_golomb");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7575 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7576
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7577 printf("testing 4x4 (I)DCT\n");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7578
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7579 DCTELEM block[16];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7580 uint8_t src[16], ref[16];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7581 uint64_t error= 0, max_error=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7582
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7583 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7584 int j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7585 // printf("%d %d %d\n", r1, r2, (r2-r1)*16);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7586 for(j=0; j<16; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7587 ref[j]= random()%255;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7588 src[j]= random()%255;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7589 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7590
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7591 h264_diff_dct_c(block, src, ref, 4);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7592
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7593 //normalize
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7594 for(j=0; j<16; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7595 // printf("%d ", block[j]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7596 block[j]= block[j]*4;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7597 if(j&1) block[j]= (block[j]*4 + 2)/5;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7598 if(j&4) block[j]= (block[j]*4 + 2)/5;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7599 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7600 // printf("\n");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7601
2272
cd43603c46f9 move h264 idct to its own file and call via function pointer in DspContext
michael
parents: 2255
diff changeset
7602 s->dsp.h264_idct_add(ref, block, 4);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7603 /* for(j=0; j<16; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7604 printf("%d ", ref[j]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7605 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7606 printf("\n");*/
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7607
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7608 for(j=0; j<16; j++){
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
7609 int diff= FFABS(src[j] - ref[j]);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7610
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7611 error+= diff*diff;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7612 max_error= FFMAX(max_error, diff);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7613 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7614 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7615 printf("error=%f max_error=%d\n", ((float)error)/COUNT/16, (int)max_error );
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7616 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7617 printf("testing quantizer\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7618 for(qp=0; qp<52; qp++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7619 for(i=0; i<16; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7620 src1_block[i]= src2_block[i]= random()%255;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7621
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7622 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7623 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7624 printf("Testing NAL layer\n");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7625
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7626 uint8_t bitstream[COUNT];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7627 uint8_t nal[COUNT*2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7628 H264Context h;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7629 memset(&h, 0, sizeof(H264Context));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7630
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7631 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7632 int zeros= i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7633 int nal_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7634 int consumed;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7635 int out_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7636 uint8_t *out;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7637 int j;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7638
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7639 for(j=0; j<COUNT; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7640 bitstream[j]= (random() % 255) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7641 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7642
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7643 for(j=0; j<zeros; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7644 int pos= random() % COUNT;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7645 while(bitstream[pos] == 0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7646 pos++;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7647 pos %= COUNT;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7648 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7649 bitstream[pos]=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7650 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7651
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7652 START_TIMER
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7653
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7654 nal_length= encode_nal(&h, nal, bitstream, COUNT, COUNT*2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7655 if(nal_length<0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7656 printf("encoding failed\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7657 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7658 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7659
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7660 out= decode_nal(&h, nal, &out_length, &consumed, nal_length);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7661
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7662 STOP_TIMER("NAL")
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7663
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7664 if(out_length != COUNT){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7665 printf("incorrect length %d %d\n", out_length, COUNT);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7666 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7667 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7668
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7669 if(consumed != nal_length){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7670 printf("incorrect consumed length %d %d\n", nal_length, consumed);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7671 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7672 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7673
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7674 if(memcmp(bitstream, out, COUNT)){
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5106
diff changeset
7675 printf("mismatch\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7676 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7677 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7678 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7679
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7680 printf("Testing RBSP\n");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7681
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7682
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7683 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7684 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7685 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7686
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7687
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7688 static int decode_end(AVCodecContext *avctx)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7689 {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7690 H264Context *h = avctx->priv_data;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7691 MpegEncContext *s = &h->s;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7692
5174
2e038003cdfb Do not reuse the rbsp de-escape buffer if both
benoit
parents: 5172
diff changeset
7693 av_freep(&h->rbsp_buffer[0]);
2e038003cdfb Do not reuse the rbsp de-escape buffer if both
benoit
parents: 5172
diff changeset
7694 av_freep(&h->rbsp_buffer[1]);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7695 free_tables(h); //FIXME cleanup init stuff perhaps
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7696 MPV_common_end(s);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7697
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7698 // memset(h, 0, sizeof(H264Context));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7699
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7700 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7701 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7702
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7703
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7704 AVCodec h264_decoder = {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7705 "h264",
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7706 CODEC_TYPE_VIDEO,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7707 CODEC_ID_H264,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7708 sizeof(H264Context),
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7709 decode_init,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7710 NULL,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7711 decode_end,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7712 decode_frame,
2453
f67b63ed036d avoid buf_size == 0 checks in every decoder
michael
parents: 2449
diff changeset
7713 /*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
7714 .flush= flush_dpb,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7715 };
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7716
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
7717 #include "svq3.c"