annotate h264.c @ 10854:f6fc6ace95e3 libavcodec

Split h264 loop filter off h264.c. No meassureable speed difference on pentium dual & cathedral sample.
author michael
date Tue, 12 Jan 2010 06:01:55 +0000
parents 86d7ab878805
children b20434143fd5
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 /**
8718
e9d9d946f213 Use full internal pathname in doxygen @file directives.
diego
parents: 8688
diff changeset
23 * @file libavcodec/h264.c
1168
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
9012
15a3df8c01fd More approved hunks for VAAPI & our new and cleaner hwaccel API.
michael
parents: 9004
diff changeset
28 #include "internal.h"
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
29 #include "dsputil.h"
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
30 #include "avcodec.h"
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
31 #include "mpegvideo.h"
4975
9a6a0818e93f split h264.c to move parser in its own file
aurel
parents: 4931
diff changeset
32 #include "h264.h"
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
33 #include "h264data.h"
4975
9a6a0818e93f split h264.c to move parser in its own file
aurel
parents: 4931
diff changeset
34 #include "h264_parser.h"
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
35 #include "golomb.h"
8627
d6bab465b82c moves mid_pred() into mathops.h (with arch specific code split by directory)
aurel
parents: 8610
diff changeset
36 #include "mathops.h"
6020
c531defb03ee Make fill_rectangle() available for other decoders
kostya
parents: 6019
diff changeset
37 #include "rectangle.h"
8522
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
38 #include "vdpau_internal.h"
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
39
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
40 #include "cabac.h"
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8565
diff changeset
41 #if ARCH_X86
8430
7768bdfd4f7b Rename libavcodec/i386/ --> libavcodec/x86/.
diego
parents: 8424
diff changeset
42 #include "x86/h264_i386.h"
6604
e226f34ca284 Redo r12838, this time using svn copy to create h264_i386.h from cabac.h.
heydowns
parents: 6603
diff changeset
43 #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
44
3284
a224d9752912 don't force asserts in release builds. 2% faster h264.
lorenm
parents: 3219
diff changeset
45 //#undef NDEBUG
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
46 #include <assert.h>
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
47
5723
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
48 /**
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
49 * Value of Picture.reference when Picture is not a reference picture, but
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
50 * is held for delayed output.
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
51 */
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
52 #define DELAYED_PIC_REF 4
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
53
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
54 static VLC coeff_token_vlc[4];
7481
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
55 static VLC_TYPE coeff_token_vlc_tables[520+332+280+256][2];
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
56 static const int coeff_token_vlc_tables_size[4]={520,332,280,256};
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
57
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
58 static VLC chroma_dc_coeff_token_vlc;
7481
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
59 static VLC_TYPE chroma_dc_coeff_token_vlc_table[256][2];
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
60 static const int chroma_dc_coeff_token_vlc_table_size = 256;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
61
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
62 static VLC total_zeros_vlc[15];
7481
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
63 static VLC_TYPE total_zeros_vlc_tables[15][512][2];
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
64 static const int total_zeros_vlc_tables_size = 512;
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
65
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
66 static VLC chroma_dc_total_zeros_vlc[3];
7481
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
67 static VLC_TYPE chroma_dc_total_zeros_vlc_tables[3][8][2];
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
68 static const int chroma_dc_total_zeros_vlc_tables_size = 8;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
69
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
70 static VLC run_vlc[6];
7481
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
71 static VLC_TYPE run_vlc_tables[6][8][2];
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
72 static const int run_vlc_tables_size = 8;
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
73
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
74 static VLC run7_vlc;
7481
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
75 static VLC_TYPE run7_vlc_table[96][2];
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
76 static const int run7_vlc_table_size = 96;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
77
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
78 static void svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
79 static void svq3_add_idct_c(uint8_t *dst, DCTELEM *block, int stride, int qp, int dc);
7394
4ac8769cbb01 Make remove_long() call unreference_pic() internally.
michael
parents: 7393
diff changeset
80 static Picture * remove_long(H264Context *h, int i, int ref_mask);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
81
7993
2dfff0e25b47 Mark ff_div6 and ff_rem6 static in h264.c. Patch by Diego Petten
lu_zero
parents: 7974
diff changeset
82 static const uint8_t rem6[52]={
4277
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
83 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
84 };
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
85
7993
2dfff0e25b47 Mark ff_div6 and ff_rem6 static in h264.c. Patch by Diego Petten
lu_zero
parents: 7974
diff changeset
86 static const uint8_t div6[52]={
4277
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
87 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
88 };
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
89
8797
530309ea02d8 H264: Change left_block_options to uint8_t from int, saving a little space.
astrange
parents: 8783
diff changeset
90 static const uint8_t left_block_options[4][8]={
7423
2eb0e5a2efad left_block intialisation optimisation.
michael
parents: 7421
diff changeset
91 {0,1,2,3,7,10,8,11},
2eb0e5a2efad left_block intialisation optimisation.
michael
parents: 7421
diff changeset
92 {2,2,3,3,8,11,8,11},
2eb0e5a2efad left_block intialisation optimisation.
michael
parents: 7421
diff changeset
93 {0,0,1,1,7,10,7,10},
2eb0e5a2efad left_block intialisation optimisation.
michael
parents: 7421
diff changeset
94 {0,2,0,2,7,10,7,10}
2eb0e5a2efad left_block intialisation optimisation.
michael
parents: 7421
diff changeset
95 };
4277
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
96
8443
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
97 #define LEVEL_TAB_BITS 8
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
98 static int8_t cavlc_level_tab[7][1<<LEVEL_TAB_BITS][2];
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
99
3028
1fadd4c26175 tweak inlines.
lorenm
parents: 3005
diff changeset
100 static void fill_caches(H264Context *h, int mb_type, int for_deblock){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
101 MpegEncContext * const s = &h->s;
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
102 const int mb_xy= h->mb_xy;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
103 int topleft_xy, top_xy, topright_xy, left_xy[2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
104 int topleft_type, top_type, topright_type, left_type[2];
8797
530309ea02d8 H264: Change left_block_options to uint8_t from int, saving a little space.
astrange
parents: 8783
diff changeset
105 const uint8_t * left_block;
6310
f0457c910be3 fix mbaff diagonal neighbor mv
lorenm
parents: 6309
diff changeset
106 int topleft_partition= -1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
107 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
108
6014
33b0514769b2 Fix non_zero_count_cache for deblocking in field pictures.
heydowns
parents: 5987
diff changeset
109 top_xy = mb_xy - (s->mb_stride << FIELD_PICTURE);
33b0514769b2 Fix non_zero_count_cache for deblocking in field pictures.
heydowns
parents: 5987
diff changeset
110
3482
c08b46172204 slightly faster h264 fill_caches()
lorenm
parents: 3455
diff changeset
111 //FIXME deblocking could skip the intra and nnz parts.
6014
33b0514769b2 Fix non_zero_count_cache for deblocking in field pictures.
heydowns
parents: 5987
diff changeset
112 if(for_deblock && (h->slice_num == 1 || h->slice_table[mb_xy] == h->slice_table[top_xy]) && !FRAME_MBAFF)
2623
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
113 return;
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
114
6488
ecbe9565dcae typo fixes
diego
parents: 6481
diff changeset
115 /* Wow, what a mess, why didn't they simplify the interlacing & intra
ecbe9565dcae typo fixes
diego
parents: 6481
diff changeset
116 * stuff, I can't imagine that these complex rules are worth it. */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
117
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
118 topleft_xy = top_xy - 1;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
119 topright_xy= top_xy + 1;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
120 left_xy[1] = left_xy[0] = mb_xy-1;
7423
2eb0e5a2efad left_block intialisation optimisation.
michael
parents: 7421
diff changeset
121 left_block = left_block_options[0];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
122 if(FRAME_MBAFF){
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
123 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
124 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
125 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
126 const int topright_pair_xy = top_pair_xy + 1;
8433
79bf8321e6fa Negate a few variables, this simplifies the code and makes it 5 cycles faster
michael
parents: 8432
diff changeset
127 const int topleft_mb_field_flag = IS_INTERLACED(s->current_picture.mb_type[topleft_pair_xy]);
79bf8321e6fa Negate a few variables, this simplifies the code and makes it 5 cycles faster
michael
parents: 8432
diff changeset
128 const int top_mb_field_flag = IS_INTERLACED(s->current_picture.mb_type[top_pair_xy]);
79bf8321e6fa Negate a few variables, this simplifies the code and makes it 5 cycles faster
michael
parents: 8432
diff changeset
129 const int topright_mb_field_flag = IS_INTERLACED(s->current_picture.mb_type[topright_pair_xy]);
79bf8321e6fa Negate a few variables, this simplifies the code and makes it 5 cycles faster
michael
parents: 8432
diff changeset
130 const int left_mb_field_flag = IS_INTERLACED(s->current_picture.mb_type[pair_xy-1]);
79bf8321e6fa Negate a few variables, this simplifies the code and makes it 5 cycles faster
michael
parents: 8432
diff changeset
131 const int curr_mb_field_flag = IS_INTERLACED(mb_type);
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
132 const int bottom = (s->mb_y & 1);
8433
79bf8321e6fa Negate a few variables, this simplifies the code and makes it 5 cycles faster
michael
parents: 8432
diff changeset
133 tprintf(s->avctx, "fill_caches: curr_mb_field_flag:%d, left_mb_field_flag:%d, topleft_mb_field_flag:%d, top_mb_field_flag:%d, topright_mb_field_flag:%d\n", curr_mb_field_flag, left_mb_field_flag, topleft_mb_field_flag, top_mb_field_flag, topright_mb_field_flag);
79bf8321e6fa Negate a few variables, this simplifies the code and makes it 5 cycles faster
michael
parents: 8432
diff changeset
134
79bf8321e6fa Negate a few variables, this simplifies the code and makes it 5 cycles faster
michael
parents: 8432
diff changeset
135 if (curr_mb_field_flag && (bottom || top_mb_field_flag)){
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
136 top_xy -= s->mb_stride;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
137 }
8433
79bf8321e6fa Negate a few variables, this simplifies the code and makes it 5 cycles faster
michael
parents: 8432
diff changeset
138 if (curr_mb_field_flag && (bottom || topleft_mb_field_flag)){
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
139 topleft_xy -= s->mb_stride;
8433
79bf8321e6fa Negate a few variables, this simplifies the code and makes it 5 cycles faster
michael
parents: 8432
diff changeset
140 } else if(bottom && !curr_mb_field_flag && left_mb_field_flag) {
6310
f0457c910be3 fix mbaff diagonal neighbor mv
lorenm
parents: 6309
diff changeset
141 topleft_xy += s->mb_stride;
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
142 // take top left mv from the middle of the mb, as opposed to all other modes which use the bottom right partition
6310
f0457c910be3 fix mbaff diagonal neighbor mv
lorenm
parents: 6309
diff changeset
143 topleft_partition = 0;
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
144 }
8433
79bf8321e6fa Negate a few variables, this simplifies the code and makes it 5 cycles faster
michael
parents: 8432
diff changeset
145 if (curr_mb_field_flag && (bottom || topright_mb_field_flag)){
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
146 topright_xy -= s->mb_stride;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
147 }
8433
79bf8321e6fa Negate a few variables, this simplifies the code and makes it 5 cycles faster
michael
parents: 8432
diff changeset
148 if (left_mb_field_flag != curr_mb_field_flag) {
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
149 left_xy[1] = left_xy[0] = pair_xy - 1;
8433
79bf8321e6fa Negate a few variables, this simplifies the code and makes it 5 cycles faster
michael
parents: 8432
diff changeset
150 if (curr_mb_field_flag) {
79bf8321e6fa Negate a few variables, this simplifies the code and makes it 5 cycles faster
michael
parents: 8432
diff changeset
151 left_xy[1] += s->mb_stride;
79bf8321e6fa Negate a few variables, this simplifies the code and makes it 5 cycles faster
michael
parents: 8432
diff changeset
152 left_block = left_block_options[3];
79bf8321e6fa Negate a few variables, this simplifies the code and makes it 5 cycles faster
michael
parents: 8432
diff changeset
153 } else {
8434
1e19ee0298a9 Simplify if/else, no speed change
michael
parents: 8433
diff changeset
154 left_block= left_block_options[2 - bottom];
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
155 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
156 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
157 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
158
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
159 h->top_mb_xy = top_xy;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
160 h->left_mb_xy[0] = left_xy[0];
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
161 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
162 if(for_deblock){
3482
c08b46172204 slightly faster h264 fill_caches()
lorenm
parents: 3455
diff changeset
163 topleft_type = 0;
c08b46172204 slightly faster h264 fill_caches()
lorenm
parents: 3455
diff changeset
164 topright_type = 0;
8079
2d3c7cd7d143 Replace literally hardcoded max slice number by named constant.
michael
parents: 8042
diff changeset
165 top_type = h->slice_table[top_xy ] < 0xFFFF ? s->current_picture.mb_type[top_xy] : 0;
2d3c7cd7d143 Replace literally hardcoded max slice number by named constant.
michael
parents: 8042
diff changeset
166 left_type[0] = h->slice_table[left_xy[0] ] < 0xFFFF ? s->current_picture.mb_type[left_xy[0]] : 0;
2d3c7cd7d143 Replace literally hardcoded max slice number by named constant.
michael
parents: 8042
diff changeset
167 left_type[1] = h->slice_table[left_xy[1] ] < 0xFFFF ? s->current_picture.mb_type[left_xy[1]] : 0;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
168
7527
ebdac291453a Remove a few more lines of unneeded code in fill_caches() for MBAFF.
michael
parents: 7526
diff changeset
169 if(MB_MBAFF && !IS_INTRA(mb_type)){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
170 int list;
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
171 for(list=0; list<h->list_count; list++){
7527
ebdac291453a Remove a few more lines of unneeded code in fill_caches() for MBAFF.
michael
parents: 7526
diff changeset
172 //These values where changed for ease of performing MC, we need to change them back
ebdac291453a Remove a few more lines of unneeded code in fill_caches() for MBAFF.
michael
parents: 7526
diff changeset
173 //FIXME maybe we can make MC and loop filter use the same values or prevent
ebdac291453a Remove a few more lines of unneeded code in fill_caches() for MBAFF.
michael
parents: 7526
diff changeset
174 //the MC code from changing ref_cache and rather use a temporary array.
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
175 if(USES_LIST(mb_type,list)){
3776
1843a85123b7 fix some signedness warnings
mru
parents: 3651
diff changeset
176 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
177 *(uint32_t*)&h->ref_cache[list][scan8[ 0]] =
7528
553ec99ac3b0 Mask bits of reference indexes properly to avoid negative numbers entangling
michael
parents: 7527
diff changeset
178 *(uint32_t*)&h->ref_cache[list][scan8[ 2]] = (pack16to32(ref[0],ref[1])&0x00FF00FF)*0x0101;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
179 ref += h->b8_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
180 *(uint32_t*)&h->ref_cache[list][scan8[ 8]] =
7528
553ec99ac3b0 Mask bits of reference indexes properly to avoid negative numbers entangling
michael
parents: 7527
diff changeset
181 *(uint32_t*)&h->ref_cache[list][scan8[10]] = (pack16to32(ref[0],ref[1])&0x00FF00FF)*0x0101;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
182 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
183 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
184 }
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
185 }else{
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
186 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
187 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
188 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
189 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
190 left_type[1] = h->slice_table[left_xy[1] ] == h->slice_num ? s->current_picture.mb_type[left_xy[1]] : 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
191
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
192 if(IS_INTRA(mb_type)){
7533
e61de3e409eb Simplify constrained_intra_pred code in fill_caches().
michael
parents: 7532
diff changeset
193 int type_mask= h->pps.constrained_intra_pred ? IS_INTRA(-1) : -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
194 h->topleft_samples_available=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
195 h->top_samples_available=
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
196 h->left_samples_available= 0xFFFF;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
197 h->topright_samples_available= 0xEEEA;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
198
7533
e61de3e409eb Simplify constrained_intra_pred code in fill_caches().
michael
parents: 7532
diff changeset
199 if(!(top_type & type_mask)){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
200 h->topleft_samples_available= 0xB3FF;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
201 h->top_samples_available= 0x33FF;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
202 h->topright_samples_available= 0x26EA;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
203 }
7532
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
204 if(IS_INTERLACED(mb_type) != IS_INTERLACED(left_type[0])){
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
205 if(IS_INTERLACED(mb_type)){
7533
e61de3e409eb Simplify constrained_intra_pred code in fill_caches().
michael
parents: 7532
diff changeset
206 if(!(left_type[0] & type_mask)){
7532
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
207 h->topleft_samples_available&= 0xDFFF;
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
208 h->left_samples_available&= 0x5FFF;
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
209 }
7533
e61de3e409eb Simplify constrained_intra_pred code in fill_caches().
michael
parents: 7532
diff changeset
210 if(!(left_type[1] & type_mask)){
7532
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
211 h->topleft_samples_available&= 0xFF5F;
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
212 h->left_samples_available&= 0xFF5F;
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
213 }
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
214 }else{
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
215 int left_typei = h->slice_table[left_xy[0] + s->mb_stride ] == h->slice_num
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
216 ? s->current_picture.mb_type[left_xy[0] + s->mb_stride] : 0;
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
217 assert(left_xy[0] == left_xy[1]);
7533
e61de3e409eb Simplify constrained_intra_pred code in fill_caches().
michael
parents: 7532
diff changeset
218 if(!((left_typei & type_mask) && (left_type[0] & type_mask))){
7532
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
219 h->topleft_samples_available&= 0xDF5F;
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
220 h->left_samples_available&= 0x5F5F;
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
221 }
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
222 }
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
223 }else{
7533
e61de3e409eb Simplify constrained_intra_pred code in fill_caches().
michael
parents: 7532
diff changeset
224 if(!(left_type[0] & type_mask)){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
225 h->topleft_samples_available&= 0xDF5F;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
226 h->left_samples_available&= 0x5F5F;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
227 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
228 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
229
7533
e61de3e409eb Simplify constrained_intra_pred code in fill_caches().
michael
parents: 7532
diff changeset
230 if(!(topleft_type & type_mask))
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
231 h->topleft_samples_available&= 0x7FFF;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
232
7533
e61de3e409eb Simplify constrained_intra_pred code in fill_caches().
michael
parents: 7532
diff changeset
233 if(!(topright_type & type_mask))
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
234 h->topright_samples_available&= 0xFBFF;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
235
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
236 if(IS_INTRA4x4(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
237 if(IS_INTRA4x4(top_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
238 h->intra4x4_pred_mode_cache[4+8*0]= h->intra4x4_pred_mode[top_xy][4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
239 h->intra4x4_pred_mode_cache[5+8*0]= h->intra4x4_pred_mode[top_xy][5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
240 h->intra4x4_pred_mode_cache[6+8*0]= h->intra4x4_pred_mode[top_xy][6];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
241 h->intra4x4_pred_mode_cache[7+8*0]= h->intra4x4_pred_mode[top_xy][3];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
242 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
243 int pred;
7533
e61de3e409eb Simplify constrained_intra_pred code in fill_caches().
michael
parents: 7532
diff changeset
244 if(!(top_type & type_mask))
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
245 pred= -1;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
246 else{
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
247 pred= 2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
248 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
249 h->intra4x4_pred_mode_cache[4+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
250 h->intra4x4_pred_mode_cache[5+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
251 h->intra4x4_pred_mode_cache[6+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
252 h->intra4x4_pred_mode_cache[7+8*0]= pred;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
253 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
254 for(i=0; i<2; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
255 if(IS_INTRA4x4(left_type[i])){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
256 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
257 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
258 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
259 int pred;
7533
e61de3e409eb Simplify constrained_intra_pred code in fill_caches().
michael
parents: 7532
diff changeset
260 if(!(left_type[i] & type_mask))
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
261 pred= -1;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
262 else{
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
263 pred= 2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
264 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
265 h->intra4x4_pred_mode_cache[3+8*1 + 2*8*i]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
266 h->intra4x4_pred_mode_cache[3+8*2 + 2*8*i]= pred;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
267 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
268 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
269 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
270 }
7534
4891fe700813 The deblock filter does not need all the intra availability stuff so do
michael
parents: 7533
diff changeset
271 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
272
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
273
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
274 /*
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
275 0 . T T. T T T T
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
276 1 L . .L . . . .
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
277 2 L . .L . . . .
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
278 3 . T TL . . . .
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
279 4 L . .L . . . .
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
280 5 L . .. . . . .
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
281 */
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
282 //FIXME constraint_intra_pred & partitioning & nnz (let us hope this is just a typo in the spec)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
283 if(top_type){
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
284 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
285 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
286 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
287 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
288
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
289 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
290 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
291
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
292 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
293 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
294
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
295 }else{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
296 h->non_zero_count_cache[4+8*0]=
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
297 h->non_zero_count_cache[5+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
298 h->non_zero_count_cache[6+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
299 h->non_zero_count_cache[7+8*0]=
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
300
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
301 h->non_zero_count_cache[1+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
302 h->non_zero_count_cache[2+8*0]=
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
303
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
304 h->non_zero_count_cache[1+8*3]=
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
305 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
306
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
307 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
308
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
309 for (i=0; i<2; i++) {
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
310 if(left_type[i]){
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
311 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
312 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
313 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
314 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
315 }else{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
316 h->non_zero_count_cache[3+8*1 + 2*8*i]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
317 h->non_zero_count_cache[3+8*2 + 2*8*i]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
318 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
319 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 (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
320 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
321 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
322
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
323 if( h->pps.cabac ) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
324 // top_cbp
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
325 if(top_type) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
326 h->top_cbp = h->cbp_table[top_xy];
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
327 } else if(IS_INTRA(mb_type)) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
328 h->top_cbp = 0x1C0;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
329 } else {
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
330 h->top_cbp = 0;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
331 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
332 // left_cbp
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
333 if (left_type[0]) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
334 h->left_cbp = h->cbp_table[left_xy[0]] & 0x1f0;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
335 } else if(IS_INTRA(mb_type)) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
336 h->left_cbp = 0x1C0;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
337 } else {
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
338 h->left_cbp = 0;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
339 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
340 if (left_type[0]) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
341 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 (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
342 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
343 if (left_type[1]) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
344 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
345 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
346 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
347
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
348 #if 1
2623
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
349 if(IS_INTER(mb_type) || IS_DIRECT(mb_type)){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
350 int list;
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
351 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
352 if(!USES_LIST(mb_type, list) && !IS_DIRECT(mb_type) && !h->deblocking_filter){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
353 /*if(!h->mv_cache_clean[list]){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
354 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
355 memset(h->ref_cache[list], PART_NOT_AVAILABLE, 8*5*sizeof(int8_t));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
356 h->mv_cache_clean[list]= 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
357 }*/
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
358 continue;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
359 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
360 h->mv_cache_clean[list]= 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
361
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
362 if(USES_LIST(top_type, list)){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
363 const int b_xy= h->mb2b_xy[top_xy] + 3*h->b_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
364 const int b8_xy= h->mb2b8_xy[top_xy] + h->b8_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
365 *(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
366 *(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
367 *(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
368 *(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
369 h->ref_cache[list][scan8[0] + 0 - 1*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
370 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
371 h->ref_cache[list][scan8[0] + 2 - 1*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
372 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
373 }else{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
374 *(uint32_t*)h->mv_cache [list][scan8[0] + 0 - 1*8]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
375 *(uint32_t*)h->mv_cache [list][scan8[0] + 1 - 1*8]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
376 *(uint32_t*)h->mv_cache [list][scan8[0] + 2 - 1*8]=
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
377 *(uint32_t*)h->mv_cache [list][scan8[0] + 3 - 1*8]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
378 *(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
379 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
380
4546
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
381 for(i=0; i<2; i++){
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
382 int cache_idx = scan8[0] - 1 + i*2*8;
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
383 if(USES_LIST(left_type[i], list)){
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
384 const int b_xy= h->mb2b_xy[left_xy[i]] + 3;
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
385 const int b8_xy= h->mb2b8_xy[left_xy[i]] + 1;
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
386 *(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
387 *(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
388 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
389 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
390 }else{
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
391 *(uint32_t*)h->mv_cache [list][cache_idx ]=
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
392 *(uint32_t*)h->mv_cache [list][cache_idx+8]= 0;
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
393 h->ref_cache[list][cache_idx ]=
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
394 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
395 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
396 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
397
7525
2f159f961f3a Do not execute the part of fill_caches() for the loopfilter that overwrites
michael
parents: 7524
diff changeset
398 if(for_deblock || ((IS_DIRECT(mb_type) && !h->direct_spatial_mv_pred) && !FRAME_MBAFF))
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
399 continue;
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
400
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
401 if(USES_LIST(topleft_type, list)){
6310
f0457c910be3 fix mbaff diagonal neighbor mv
lorenm
parents: 6309
diff changeset
402 const int b_xy = h->mb2b_xy[topleft_xy] + 3 + h->b_stride + (topleft_partition & 2*h->b_stride);
f0457c910be3 fix mbaff diagonal neighbor mv
lorenm
parents: 6309
diff changeset
403 const int b8_xy= h->mb2b8_xy[topleft_xy] + 1 + (topleft_partition & h->b8_stride);
2623
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
404 *(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
405 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
406 }else{
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
407 *(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
408 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
409 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
410
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
411 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
412 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
413 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
414 *(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
415 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
416 }else{
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
417 *(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
418 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
419 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
420
3519
5ef29058581e 10l in r5768 (broke mbaff)
lorenm
parents: 3482
diff changeset
421 if((IS_SKIP(mb_type) || IS_DIRECT(mb_type)) && !FRAME_MBAFF)
3482
c08b46172204 slightly faster h264 fill_caches()
lorenm
parents: 3455
diff changeset
422 continue;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
423
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
424 h->ref_cache[list][scan8[5 ]+1] =
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
425 h->ref_cache[list][scan8[7 ]+1] =
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
426 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
427 h->ref_cache[list][scan8[4 ]] =
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
428 h->ref_cache[list][scan8[12]] = PART_NOT_AVAILABLE;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
429 *(uint32_t*)h->mv_cache [list][scan8[5 ]+1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
430 *(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
431 *(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
432 *(uint32_t*)h->mv_cache [list][scan8[4 ]]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
433 *(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
434
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
435 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
436 /* XXX beurk, Load mvd */
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
437 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
438 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
439 *(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
440 *(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
441 *(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
442 *(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
443 }else{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
444 *(uint32_t*)h->mvd_cache [list][scan8[0] + 0 - 1*8]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
445 *(uint32_t*)h->mvd_cache [list][scan8[0] + 1 - 1*8]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
446 *(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
447 *(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
448 }
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
449 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
450 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
451 *(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
452 *(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
453 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
454 *(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
455 *(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
456 }
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
457 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
458 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
459 *(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
460 *(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
461 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
462 *(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
463 *(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
464 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
465 *(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
466 *(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
467 *(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
468 *(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
469 *(uint32_t*)h->mvd_cache [list][scan8[12]]= 0;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
470
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
471 if(h->slice_type_nos == FF_B_TYPE){
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
472 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
473
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
474 if(IS_DIRECT(top_type)){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
475 *(uint32_t*)&h->direct_cache[scan8[0] - 1*8]= 0x01010101;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
476 }else if(IS_8X8(top_type)){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
477 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
478 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
479 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
480 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
481 *(uint32_t*)&h->direct_cache[scan8[0] - 1*8]= 0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
482 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
483
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
484 if(IS_DIRECT(left_type[0]))
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
485 h->direct_cache[scan8[0] - 1 + 0*8]= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
486 else if(IS_8X8(left_type[0]))
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
487 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
488 else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
489 h->direct_cache[scan8[0] - 1 + 0*8]= 0;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
490
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
491 if(IS_DIRECT(left_type[1]))
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
492 h->direct_cache[scan8[0] - 1 + 2*8]= 1;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
493 else if(IS_8X8(left_type[1]))
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
494 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
495 else
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
496 h->direct_cache[scan8[0] - 1 + 2*8]= 0;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
497 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
498 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
499
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
500 if(FRAME_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
501 #define MAP_MVS\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
502 MAP_F2F(scan8[0] - 1 - 1*8, topleft_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
503 MAP_F2F(scan8[0] + 0 - 1*8, top_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
504 MAP_F2F(scan8[0] + 1 - 1*8, top_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
505 MAP_F2F(scan8[0] + 2 - 1*8, top_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
506 MAP_F2F(scan8[0] + 3 - 1*8, top_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
507 MAP_F2F(scan8[0] + 4 - 1*8, topright_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
508 MAP_F2F(scan8[0] - 1 + 0*8, left_type[0])\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
509 MAP_F2F(scan8[0] - 1 + 1*8, left_type[0])\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
510 MAP_F2F(scan8[0] - 1 + 2*8, left_type[1])\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
511 MAP_F2F(scan8[0] - 1 + 3*8, left_type[1])
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
512 if(MB_FIELD){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
513 #define MAP_F2F(idx, mb_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
514 if(!IS_INTERLACED(mb_type) && h->ref_cache[list][idx] >= 0){\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
515 h->ref_cache[list][idx] <<= 1;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
516 h->mv_cache[list][idx][1] /= 2;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
517 h->mvd_cache[list][idx][1] /= 2;\
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
518 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
519 MAP_MVS
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
520 #undef MAP_F2F
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
521 }else{
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
522 #define MAP_F2F(idx, mb_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
523 if(IS_INTERLACED(mb_type) && h->ref_cache[list][idx] >= 0){\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
524 h->ref_cache[list][idx] >>= 1;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
525 h->mv_cache[list][idx][1] <<= 1;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
526 h->mvd_cache[list][idx][1] <<= 1;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
527 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
528 MAP_MVS
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
529 #undef MAP_F2F
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
530 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
531 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
532 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
533 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
534 #endif
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
535
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
536 h->neighbor_transform_size= !!IS_8x8DCT(top_type) + !!IS_8x8DCT(left_type[0]);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
537 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
538
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
539 void ff_h264_write_back_intra_pred_mode(H264Context *h){
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
540 const int mb_xy= h->mb_xy;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
541
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
542 h->intra4x4_pred_mode[mb_xy][0]= h->intra4x4_pred_mode_cache[7+8*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
543 h->intra4x4_pred_mode[mb_xy][1]= h->intra4x4_pred_mode_cache[7+8*2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
544 h->intra4x4_pred_mode[mb_xy][2]= h->intra4x4_pred_mode_cache[7+8*3];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
545 h->intra4x4_pred_mode[mb_xy][3]= h->intra4x4_pred_mode_cache[7+8*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
546 h->intra4x4_pred_mode[mb_xy][4]= h->intra4x4_pred_mode_cache[4+8*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
547 h->intra4x4_pred_mode[mb_xy][5]= h->intra4x4_pred_mode_cache[5+8*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
548 h->intra4x4_pred_mode[mb_xy][6]= h->intra4x4_pred_mode_cache[6+8*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
549 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
550
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
551 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
552 * 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
553 */
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
554 int ff_h264_check_intra_pred_mode(H264Context *h, int mode){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
555 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
556 static const int8_t top [7]= {LEFT_DC_PRED8x8, 1,-1,-1};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
557 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
558
4529
a8082e1ed672 simplify
michael
parents: 4507
diff changeset
559 if(mode > 6U) {
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
560 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
561 return -1;
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
562 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
563
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
564 if(!(h->top_samples_available&0x8000)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
565 mode= top[ mode ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
566 if(mode<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
567 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
568 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
569 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
570 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
571
7532
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
572 if((h->left_samples_available&0x8080) != 0x8080){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
573 mode= left[ mode ];
7532
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
574 if(h->left_samples_available&0x8080){ //mad cow disease mode, aka MBAFF + constrained_intra_pred
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
575 mode= ALZHEIMER_DC_L0T_PRED8x8 + (!(h->left_samples_available&0x8000)) + 2*(mode == DC_128_PRED8x8);
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
576 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
577 if(mode<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
578 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
579 return -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
580 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
581 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
582
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
583 return mode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
584 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
585
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
586 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
587 * gets the predicted intra4x4 prediction mode.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
588 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
589 static inline int pred_intra_mode(H264Context *h, int n){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
590 const int index8= scan8[n];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
591 const int left= h->intra4x4_pred_mode_cache[index8 - 1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
592 const int top = h->intra4x4_pred_mode_cache[index8 - 8];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
593 const int min= FFMIN(left, top);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
594
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
595 tprintf(h->s.avctx, "mode:%d %d min:%d\n", left ,top, min);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
596
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
597 if(min<0) return DC_PRED;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
598 else return min;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
599 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
600
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
601 static inline void write_back_non_zero_count(H264Context *h){
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
602 const int mb_xy= h->mb_xy;
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
603
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
604 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
605 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
606 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
607 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
608 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
609 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
610 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
611
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
612 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
613 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
614 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
615
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
616 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
617 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
618 h->non_zero_count[mb_xy][10]=h->non_zero_count_cache[2+8*4];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
619 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
620
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
621 /**
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
622 * gets the predicted number of non-zero coefficients.
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
623 * @param n block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
624 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
625 static inline int pred_non_zero_count(H264Context *h, int n){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
626 const int index8= scan8[n];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
627 const int left= h->non_zero_count_cache[index8 - 1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
628 const int top = h->non_zero_count_cache[index8 - 8];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
629 int i= left + top;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
630
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
631 if(i<64) i= (i+1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
632
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
633 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
634
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
635 return i&31;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
636 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
637
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
638 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
639 * gets the directionally predicted 16x8 MV.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
640 * @param n the block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
641 * @param mx the x component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
642 * @param my the y component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
643 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
644 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
645 if(n==0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
646 const int top_ref= h->ref_cache[list][ scan8[0] - 8 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
647 const int16_t * const B= h->mv_cache[list][ scan8[0] - 8 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
648
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
649 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
650
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
651 if(top_ref == ref){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
652 *mx= B[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
653 *my= B[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
654 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
655 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
656 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
657 const int left_ref= h->ref_cache[list][ scan8[8] - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
658 const int16_t * const A= h->mv_cache[list][ scan8[8] - 1 ];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
659
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
660 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
661
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
662 if(left_ref == ref){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
663 *mx= A[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
664 *my= A[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
665 return;
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 //RARE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
670 pred_motion(h, n, 4, list, ref, mx, my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
671 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
672
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
673 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
674 * gets the directionally predicted 8x16 MV.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
675 * @param n the block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
676 * @param mx the x component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
677 * @param my the y component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
678 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
679 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
680 if(n==0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
681 const int left_ref= h->ref_cache[list][ scan8[0] - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
682 const int16_t * const A= h->mv_cache[list][ scan8[0] - 1 ];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
683
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
684 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
685
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
686 if(left_ref == ref){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
687 *mx= A[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
688 *my= A[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
689 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
690 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
691 }else{
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
692 const int16_t * C;
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
693 int diagonal_ref;
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
694
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
695 diagonal_ref= fetch_diagonal_mv(h, &C, scan8[4], list, 2);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
696
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
697 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
698
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
699 if(diagonal_ref == ref){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
700 *mx= C[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
701 *my= C[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
702 return;
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
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
706 //RARE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
707 pred_motion(h, n, 2, list, ref, mx, my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
708 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
709
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
710 static inline void pred_pskip_motion(H264Context * const h, int * const mx, int * const my){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
711 const int top_ref = h->ref_cache[0][ scan8[0] - 8 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
712 const int left_ref= h->ref_cache[0][ scan8[0] - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
713
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
714 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
715
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
716 if(top_ref == PART_NOT_AVAILABLE || left_ref == PART_NOT_AVAILABLE
8454
bc5f446ed4a8 Optimize pred_pskip_motion()
michael
parents: 8453
diff changeset
717 || !( top_ref | *(uint32_t*)h->mv_cache[0][ scan8[0] - 8 ])
bc5f446ed4a8 Optimize pred_pskip_motion()
michael
parents: 8453
diff changeset
718 || !(left_ref | *(uint32_t*)h->mv_cache[0][ scan8[0] - 1 ])){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
719
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
720 *mx = *my = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
721 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
722 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
723
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
724 pred_motion(h, 0, 4, 0, 0, mx, my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
725
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
726 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
727 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
728
7898
a33287a39a55 Make MBAFF temporal direct mode closer to the spec.
michael
parents: 7897
diff changeset
729 static int get_scale_factor(H264Context * const h, int poc, int poc1, int i){
a33287a39a55 Make MBAFF temporal direct mode closer to the spec.
michael
parents: 7897
diff changeset
730 int poc0 = h->ref_list[0][i].poc;
a33287a39a55 Make MBAFF temporal direct mode closer to the spec.
michael
parents: 7897
diff changeset
731 int td = av_clip(poc1 - poc0, -128, 127);
a33287a39a55 Make MBAFF temporal direct mode closer to the spec.
michael
parents: 7897
diff changeset
732 if(td == 0 || h->ref_list[0][i].long_ref){
a33287a39a55 Make MBAFF temporal direct mode closer to the spec.
michael
parents: 7897
diff changeset
733 return 256;
a33287a39a55 Make MBAFF temporal direct mode closer to the spec.
michael
parents: 7897
diff changeset
734 }else{
a33287a39a55 Make MBAFF temporal direct mode closer to the spec.
michael
parents: 7897
diff changeset
735 int tb = av_clip(poc - poc0, -128, 127);
a33287a39a55 Make MBAFF temporal direct mode closer to the spec.
michael
parents: 7897
diff changeset
736 int tx = (16384 + (FFABS(td) >> 1)) / td;
a33287a39a55 Make MBAFF temporal direct mode closer to the spec.
michael
parents: 7897
diff changeset
737 return av_clip((tb*tx + 32) >> 6, -1024, 1023);
a33287a39a55 Make MBAFF temporal direct mode closer to the spec.
michael
parents: 7897
diff changeset
738 }
a33287a39a55 Make MBAFF temporal direct mode closer to the spec.
michael
parents: 7897
diff changeset
739 }
a33287a39a55 Make MBAFF temporal direct mode closer to the spec.
michael
parents: 7897
diff changeset
740
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
741 static inline void direct_dist_scale_factor(H264Context * const h){
7462
5cbf11f56c02 Picture.ref_count/ref_poc have to be stored per field (actually also per
michael
parents: 7450
diff changeset
742 MpegEncContext * const s = &h->s;
5cbf11f56c02 Picture.ref_count/ref_poc have to be stored per field (actually also per
michael
parents: 7450
diff changeset
743 const int poc = h->s.current_picture_ptr->field_poc[ s->picture_structure == PICT_BOTTOM_FIELD ];
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
744 const int poc1 = h->ref_list[1][0].poc;
7898
a33287a39a55 Make MBAFF temporal direct mode closer to the spec.
michael
parents: 7897
diff changeset
745 int i, field;
a33287a39a55 Make MBAFF temporal direct mode closer to the spec.
michael
parents: 7897
diff changeset
746 for(field=0; field<2; field++){
a33287a39a55 Make MBAFF temporal direct mode closer to the spec.
michael
parents: 7897
diff changeset
747 const int poc = h->s.current_picture_ptr->field_poc[field];
a33287a39a55 Make MBAFF temporal direct mode closer to the spec.
michael
parents: 7897
diff changeset
748 const int poc1 = h->ref_list[1][0].field_poc[field];
a33287a39a55 Make MBAFF temporal direct mode closer to the spec.
michael
parents: 7897
diff changeset
749 for(i=0; i < 2*h->ref_count[0]; i++)
a33287a39a55 Make MBAFF temporal direct mode closer to the spec.
michael
parents: 7897
diff changeset
750 h->dist_scale_factor_field[field][i^field] = get_scale_factor(h, poc, poc1, i+16);
a33287a39a55 Make MBAFF temporal direct mode closer to the spec.
michael
parents: 7897
diff changeset
751 }
a33287a39a55 Make MBAFF temporal direct mode closer to the spec.
michael
parents: 7897
diff changeset
752
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
753 for(i=0; i<h->ref_count[0]; i++){
7898
a33287a39a55 Make MBAFF temporal direct mode closer to the spec.
michael
parents: 7897
diff changeset
754 h->dist_scale_factor[i] = get_scale_factor(h, poc, poc1, i);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
755 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
756 }
7906
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
757
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
758 static void fill_colmap(H264Context *h, int map[2][16+32], int list, int field, int colfield, int mbafi){
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
759 MpegEncContext * const s = &h->s;
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
760 Picture * const ref1 = &h->ref_list[1][0];
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
761 int j, old_ref, rfield;
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
762 int start= mbafi ? 16 : 0;
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
763 int end = mbafi ? 16+2*h->ref_count[list] : h->ref_count[list];
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
764 int interl= mbafi || s->picture_structure != PICT_FRAME;
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
765
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
766 /* bogus; fills in for missing frames */
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
767 memset(map[list], 0, sizeof(map[list]));
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
768
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
769 for(rfield=0; rfield<2; rfield++){
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
770 for(old_ref=0; old_ref<ref1->ref_count[colfield][list]; old_ref++){
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
771 int poc = ref1->ref_poc[colfield][list][old_ref];
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
772
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
773 if (!interl)
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
774 poc |= 3;
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
775 else if( interl && (poc&3) == 3) //FIXME store all MBAFF references so this isnt needed
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
776 poc= (poc&~3) + rfield + 1;
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
777
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
778 for(j=start; j<end; j++){
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
779 if(4*h->ref_list[list][j].frame_num + (h->ref_list[list][j].reference&3) == poc){
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
780 int cur_ref= mbafi ? (j-16)^field : j;
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
781 map[list][2*old_ref + (rfield^field) + 16] = cur_ref;
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
782 if(rfield == field)
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
783 map[list][old_ref] = cur_ref;
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
784 break;
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
785 }
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
786 }
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
787 }
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
788 }
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
789 }
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
790
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
791 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
792 MpegEncContext * const s = &h->s;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
793 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
794 Picture * const cur = s->current_picture_ptr;
7928
7d897cb94a31 Remove unused variable.
diego
parents: 7926
diff changeset
795 int list, j, field;
7906
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
796 int sidx= (s->picture_structure&1)^1;
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
797 int ref1sidx= (ref1->reference&1)^1;
7907
8eb69709a934 A few empty lines for readability.
michael
parents: 7906
diff changeset
798
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
799 for(list=0; list<2; list++){
7462
5cbf11f56c02 Picture.ref_count/ref_poc have to be stored per field (actually also per
michael
parents: 7450
diff changeset
800 cur->ref_count[sidx][list] = h->ref_count[list];
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
801 for(j=0; j<h->ref_count[list]; j++)
7487
13937730e79d Use frame_num and reference instead of poc for matching frames for direct
michael
parents: 7486
diff changeset
802 cur->ref_poc[sidx][list][j] = 4*h->ref_list[list][j].frame_num + (h->ref_list[list][j].reference&3);
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
803 }
7907
8eb69709a934 A few empty lines for readability.
michael
parents: 7906
diff changeset
804
7482
ecf3c774f5e1 Fill ref_count/ref_poc for both fields of frames.
michael
parents: 7481
diff changeset
805 if(s->picture_structure == PICT_FRAME){
7906
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
806 memcpy(cur->ref_count[1], cur->ref_count[0], sizeof(cur->ref_count[0]));
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
807 memcpy(cur->ref_poc [1], cur->ref_poc [0], sizeof(cur->ref_poc [0]));
7482
ecf3c774f5e1 Fill ref_count/ref_poc for both fields of frames.
michael
parents: 7481
diff changeset
808 }
7907
8eb69709a934 A few empty lines for readability.
michael
parents: 7906
diff changeset
809
7902
8b8be8f2b647 Fix ref_shift so that it is correct for more/all? MBAFF/PAFF mixes.
michael
parents: 7901
diff changeset
810 cur->mbaff= FRAME_MBAFF;
7907
8eb69709a934 A few empty lines for readability.
michael
parents: 7906
diff changeset
811
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6429
diff changeset
812 if(cur->pict_type != FF_B_TYPE || h->direct_spatial_mv_pred)
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
813 return;
7907
8eb69709a934 A few empty lines for readability.
michael
parents: 7906
diff changeset
814
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
815 for(list=0; list<2; list++){
7906
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
816 fill_colmap(h, h->map_col_to_list0, list, sidx, ref1sidx, 0);
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
817 for(field=0; field<2; field++)
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
818 fill_colmap(h, h->map_col_to_list0_field[field], list, field, field, 1);
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
819 }
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
820 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
821
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
822 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
823 MpegEncContext * const s = &h->s;
7493
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
824 int b8_stride = h->b8_stride;
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
825 int b4_stride = h->b_stride;
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
826 int mb_xy = h->mb_xy;
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
827 int mb_type_col[2];
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
828 const int16_t (*l1mv0)[2], (*l1mv1)[2];
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
829 const int8_t *l1ref0, *l1ref1;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
830 const int is_b8x8 = IS_8X8(*mb_type);
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
831 unsigned int sub_mb_type;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
832 int i8, i4;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
833
9416
d863de897b41 Assert that the first list1 entry is a reference frame.
michael
parents: 9415
diff changeset
834 assert(h->ref_list[1][0].reference&3);
d863de897b41 Assert that the first list1 entry is a reference frame.
michael
parents: 9415
diff changeset
835
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
836 #define MB_TYPE_16x16_OR_INTRA (MB_TYPE_16x16|MB_TYPE_INTRA4x4|MB_TYPE_INTRA16x16|MB_TYPE_INTRA_PCM)
7493
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
837
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
838 if(IS_INTERLACED(h->ref_list[1][0].mb_type[mb_xy])){ // AFL/AFR/FR/FL -> AFL/FL
7900
37f62a3dc645 Correct comment in the direct mode code.
michael
parents: 7899
diff changeset
839 if(!IS_INTERLACED(*mb_type)){ // AFR/FR -> AFL/FL
7901
michael
parents: 7900
diff changeset
840 int cur_poc = s->current_picture_ptr->poc;
michael
parents: 7900
diff changeset
841 int *col_poc = h->ref_list[1]->field_poc;
michael
parents: 7900
diff changeset
842 int col_parity = FFABS(col_poc[0] - cur_poc) >= FFABS(col_poc[1] - cur_poc);
michael
parents: 7900
diff changeset
843 mb_xy= s->mb_x + ((s->mb_y&~1) + col_parity)*s->mb_stride;
michael
parents: 7900
diff changeset
844 b8_stride = 0;
7918
84b37de61d98 Field -> MBAFF direct mode can use data from fields that are not
michael
parents: 7907
diff changeset
845 }else if(!(s->picture_structure & h->ref_list[1][0].reference) && !h->ref_list[1][0].mbaff){// FL -> FL & differ parity
7493
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
846 int fieldoff= 2*(h->ref_list[1][0].reference)-3;
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
847 mb_xy += s->mb_stride*fieldoff;
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
848 }
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
849 goto single_col;
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
850 }else{ // AFL/AFR/FR/FL -> AFR/FR
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
851 if(IS_INTERLACED(*mb_type)){ // AFL /FL -> AFR/FR
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
852 mb_xy= s->mb_x + (s->mb_y&~1)*s->mb_stride;
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
853 mb_type_col[0] = h->ref_list[1][0].mb_type[mb_xy];
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
854 mb_type_col[1] = h->ref_list[1][0].mb_type[mb_xy + s->mb_stride];
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
855 b8_stride *= 3;
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
856 b4_stride *= 6;
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
857 //FIXME IS_8X8(mb_type_col[0]) && !h->sps.direct_8x8_inference_flag
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
858 if( (mb_type_col[0] & MB_TYPE_16x16_OR_INTRA)
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
859 && (mb_type_col[1] & MB_TYPE_16x16_OR_INTRA)
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
860 && !is_b8x8){
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
861 sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
862 *mb_type |= MB_TYPE_16x8 |MB_TYPE_L0L1|MB_TYPE_DIRECT2; /* B_16x8 */
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
863 }else{
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
864 sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
865 *mb_type |= MB_TYPE_8x8|MB_TYPE_L0L1;
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
866 }
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
867 }else{ // AFR/FR -> AFR/FR
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
868 single_col:
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
869 mb_type_col[0] =
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
870 mb_type_col[1] = h->ref_list[1][0].mb_type[mb_xy];
7494
michael
parents: 7493
diff changeset
871 if(IS_8X8(mb_type_col[0]) && !h->sps.direct_8x8_inference_flag){
michael
parents: 7493
diff changeset
872 /* FIXME save sub mb types from previous frames (or derive from MVs)
michael
parents: 7493
diff changeset
873 * so we know exactly what block size to use */
michael
parents: 7493
diff changeset
874 sub_mb_type = MB_TYPE_8x8|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_4x4 */
michael
parents: 7493
diff changeset
875 *mb_type |= MB_TYPE_8x8|MB_TYPE_L0L1;
michael
parents: 7493
diff changeset
876 }else if(!is_b8x8 && (mb_type_col[0] & MB_TYPE_16x16_OR_INTRA)){
michael
parents: 7493
diff changeset
877 sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */
michael
parents: 7493
diff changeset
878 *mb_type |= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_16x16 */
michael
parents: 7493
diff changeset
879 }else{
michael
parents: 7493
diff changeset
880 sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */
michael
parents: 7493
diff changeset
881 *mb_type |= MB_TYPE_8x8|MB_TYPE_L0L1;
michael
parents: 7493
diff changeset
882 }
7493
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
883 }
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
884 }
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
885
7497
michael
parents: 7496
diff changeset
886 l1mv0 = &h->ref_list[1][0].motion_val[0][h->mb2b_xy [mb_xy]];
michael
parents: 7496
diff changeset
887 l1mv1 = &h->ref_list[1][0].motion_val[1][h->mb2b_xy [mb_xy]];
michael
parents: 7496
diff changeset
888 l1ref0 = &h->ref_list[1][0].ref_index [0][h->mb2b8_xy[mb_xy]];
michael
parents: 7496
diff changeset
889 l1ref1 = &h->ref_list[1][0].ref_index [1][h->mb2b8_xy[mb_xy]];
7496
f96c14041e48 Simplify l1mv/l1ref calculation.
michael
parents: 7495
diff changeset
890 if(!b8_stride){
f96c14041e48 Simplify l1mv/l1ref calculation.
michael
parents: 7495
diff changeset
891 if(s->mb_y&1){
f96c14041e48 Simplify l1mv/l1ref calculation.
michael
parents: 7495
diff changeset
892 l1ref0 += h->b8_stride;
f96c14041e48 Simplify l1mv/l1ref calculation.
michael
parents: 7495
diff changeset
893 l1ref1 += h->b8_stride;
f96c14041e48 Simplify l1mv/l1ref calculation.
michael
parents: 7495
diff changeset
894 l1mv0 += 2*b4_stride;
f96c14041e48 Simplify l1mv/l1ref calculation.
michael
parents: 7495
diff changeset
895 l1mv1 += 2*b4_stride;
f96c14041e48 Simplify l1mv/l1ref calculation.
michael
parents: 7495
diff changeset
896 }
7493
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
897 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
898
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
899 if(h->direct_spatial_mv_pred){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
900 int ref[2];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
901 int mv[2][2];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
902 int list;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
903
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
904 /* FIXME interlacing + spatial direct uses wrong colocated block positions */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
905
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
906 /* ref = min(neighbors) */
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
907 for(list=0; list<2; list++){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
908 int refa = h->ref_cache[list][scan8[0] - 1];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
909 int refb = h->ref_cache[list][scan8[0] - 8];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
910 int refc = h->ref_cache[list][scan8[0] - 8 + 4];
7445
a202753ce99d Use #define instead of a constant. Patch by Paul Kendall.
darkshikari
parents: 7444
diff changeset
911 if(refc == PART_NOT_AVAILABLE)
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
912 refc = h->ref_cache[list][scan8[0] - 8 - 1];
7336
aaf3e396f094 Simplify spatial direct ref selection with FFMIN3()
michael
parents: 7332
diff changeset
913 ref[list] = FFMIN3((unsigned)refa, (unsigned)refb, (unsigned)refc);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
914 if(ref[list] < 0)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
915 ref[list] = -1;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
916 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
917
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
918 if(ref[0] < 0 && ref[1] < 0){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
919 ref[0] = ref[1] = 0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
920 mv[0][0] = mv[0][1] =
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
921 mv[1][0] = mv[1][1] = 0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
922 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
923 for(list=0; list<2; list++){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
924 if(ref[list] >= 0)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
925 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
926 else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
927 mv[list][0] = mv[list][1] = 0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
928 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
929 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
930
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
931 if(ref[1] < 0){
6309
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
932 if(!is_b8x8)
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
933 *mb_type &= ~MB_TYPE_L1;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
934 sub_mb_type &= ~MB_TYPE_L1;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
935 }else if(ref[0] < 0){
6309
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
936 if(!is_b8x8)
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
937 *mb_type &= ~MB_TYPE_L0;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
938 sub_mb_type &= ~MB_TYPE_L0;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
939 }
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
940
7493
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
941 if(IS_INTERLACED(*mb_type) != IS_INTERLACED(mb_type_col[0])){
6309
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
942 for(i8=0; i8<4; i8++){
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
943 int x8 = i8&1;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
944 int y8 = i8>>1;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
945 int xy8 = x8+y8*b8_stride;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
946 int xy4 = 3*x8+y8*b4_stride;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
947 int a=0, b=0;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
948
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
949 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8]))
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
950 continue;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
951 h->sub_mb_type[i8] = sub_mb_type;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
952
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
953 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, (uint8_t)ref[0], 1);
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
954 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, (uint8_t)ref[1], 1);
7493
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
955 if(!IS_INTRA(mb_type_col[y8])
6309
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
956 && ( (l1ref0[xy8] == 0 && FFABS(l1mv0[xy4][0]) <= 1 && FFABS(l1mv0[xy4][1]) <= 1)
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
957 || (l1ref0[xy8] < 0 && l1ref1[xy8] == 0 && FFABS(l1mv1[xy4][0]) <= 1 && FFABS(l1mv1[xy4][1]) <= 1))){
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
958 if(ref[0] > 0)
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
959 a= pack16to32(mv[0][0],mv[0][1]);
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
960 if(ref[1] > 0)
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
961 b= pack16to32(mv[1][0],mv[1][1]);
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
962 }else{
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
963 a= pack16to32(mv[0][0],mv[0][1]);
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
964 b= pack16to32(mv[1][0],mv[1][1]);
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
965 }
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
966 fill_rectangle(&h->mv_cache[0][scan8[i8*4]], 2, 2, 8, a, 4);
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
967 fill_rectangle(&h->mv_cache[1][scan8[i8*4]], 2, 2, 8, b, 4);
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
968 }
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
969 }else if(IS_16X16(*mb_type)){
4540
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
970 int a=0, b=0;
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
971
3001
b52d8ee430f6 fix some potential arithmetic overflows in pred_direct_motion() and
lorenm
parents: 2979
diff changeset
972 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
973 fill_rectangle(&h->ref_cache[1][scan8[0]], 4, 4, 8, (uint8_t)ref[1], 1);
7493
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
974 if(!IS_INTRA(mb_type_col[0])
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
975 && ( (l1ref0[0] == 0 && FFABS(l1mv0[0][0]) <= 1 && FFABS(l1mv0[0][1]) <= 1)
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
976 || (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
977 && (h->x264_build>33 || !h->x264_build)))){
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
978 if(ref[0] > 0)
4540
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
979 a= pack16to32(mv[0][0],mv[0][1]);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
980 if(ref[1] > 0)
4540
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
981 b= pack16to32(mv[1][0],mv[1][1]);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
982 }else{
4540
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
983 a= pack16to32(mv[0][0],mv[0][1]);
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
984 b= pack16to32(mv[1][0],mv[1][1]);
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
985 }
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
986 fill_rectangle(&h->mv_cache[0][scan8[0]], 4, 4, 8, a, 4);
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
987 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
988 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
989 for(i8=0; i8<4; i8++){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
990 const int x8 = i8&1;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
991 const int y8 = i8>>1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
992
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
993 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8]))
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
994 continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
995 h->sub_mb_type[i8] = sub_mb_type;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
996
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
997 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
998 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
999 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
1000 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
1001
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1002 /* col_zero_flag */
7498
e7006afcb1c6 Use local variabes for *stride, where local variables exist.
michael
parents: 7497
diff changeset
1003 if(!IS_INTRA(mb_type_col[0]) && ( l1ref0[x8 + y8*b8_stride] == 0
e7006afcb1c6 Use local variabes for *stride, where local variables exist.
michael
parents: 7497
diff changeset
1004 || (l1ref0[x8 + y8*b8_stride] < 0 && l1ref1[x8 + y8*b8_stride] == 0
2834
fd5d7c732c6b kill a bunch of compiler warnings
mru
parents: 2815
diff changeset
1005 && (h->x264_build>33 || !h->x264_build)))){
7498
e7006afcb1c6 Use local variabes for *stride, where local variables exist.
michael
parents: 7497
diff changeset
1006 const int16_t (*l1mv)[2]= l1ref0[x8 + y8*b8_stride] == 0 ? l1mv0 : l1mv1;
3002
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1007 if(IS_SUB_8X8(sub_mb_type)){
7498
e7006afcb1c6 Use local variabes for *stride, where local variables exist.
michael
parents: 7497
diff changeset
1008 const int16_t *mv_col = l1mv[x8*3 + y8*3*b4_stride];
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
1009 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
1010 if(ref[0] == 0)
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1011 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
1012 if(ref[1] == 0)
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1013 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
1014 }
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1015 }else
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1016 for(i4=0; i4<4; i4++){
7498
e7006afcb1c6 Use local variabes for *stride, where local variables exist.
michael
parents: 7497
diff changeset
1017 const int16_t *mv_col = l1mv[x8*2 + (i4&1) + (y8*2 + (i4>>1))*b4_stride];
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
1018 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
1019 if(ref[0] == 0)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1020 *(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
1021 if(ref[1] == 0)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1022 *(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
1023 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1024 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1025 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1026 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1027 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1028 }else{ /* direct temporal mv pred */
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1029 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
1030 const int *dist_scale_factor = h->dist_scale_factor;
7906
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
1031 int ref_offset= 0;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1032
7494
michael
parents: 7493
diff changeset
1033 if(FRAME_MBAFF && IS_INTERLACED(*mb_type)){
7898
a33287a39a55 Make MBAFF temporal direct mode closer to the spec.
michael
parents: 7897
diff changeset
1034 map_col_to_list0[0] = h->map_col_to_list0_field[s->mb_y&1][0];
a33287a39a55 Make MBAFF temporal direct mode closer to the spec.
michael
parents: 7897
diff changeset
1035 map_col_to_list0[1] = h->map_col_to_list0_field[s->mb_y&1][1];
a33287a39a55 Make MBAFF temporal direct mode closer to the spec.
michael
parents: 7897
diff changeset
1036 dist_scale_factor =h->dist_scale_factor_field[s->mb_y&1];
7902
8b8be8f2b647 Fix ref_shift so that it is correct for more/all? MBAFF/PAFF mixes.
michael
parents: 7901
diff changeset
1037 }
8b8be8f2b647 Fix ref_shift so that it is correct for more/all? MBAFF/PAFF mixes.
michael
parents: 7901
diff changeset
1038 if(h->ref_list[1][0].mbaff && IS_INTERLACED(mb_type_col[0]))
7906
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
1039 ref_offset += 16;
7902
8b8be8f2b647 Fix ref_shift so that it is correct for more/all? MBAFF/PAFF mixes.
michael
parents: 7901
diff changeset
1040
7494
michael
parents: 7493
diff changeset
1041 if(IS_INTERLACED(*mb_type) != IS_INTERLACED(mb_type_col[0])){
michael
parents: 7493
diff changeset
1042 /* FIXME assumes direct_8x8_inference == 1 */
7495
2090d67bbf16 simplify y_shift/ref_shift code
michael
parents: 7494
diff changeset
1043 int y_shift = 2*!IS_INTERLACED(*mb_type);
7494
michael
parents: 7493
diff changeset
1044
michael
parents: 7493
diff changeset
1045 for(i8=0; i8<4; i8++){
michael
parents: 7493
diff changeset
1046 const int x8 = i8&1;
michael
parents: 7493
diff changeset
1047 const int y8 = i8>>1;
michael
parents: 7493
diff changeset
1048 int ref0, scale;
michael
parents: 7493
diff changeset
1049 const int16_t (*l1mv)[2]= l1mv0;
michael
parents: 7493
diff changeset
1050
michael
parents: 7493
diff changeset
1051 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8]))
michael
parents: 7493
diff changeset
1052 continue;
michael
parents: 7493
diff changeset
1053 h->sub_mb_type[i8] = sub_mb_type;
michael
parents: 7493
diff changeset
1054
michael
parents: 7493
diff changeset
1055 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, 0, 1);
michael
parents: 7493
diff changeset
1056 if(IS_INTRA(mb_type_col[y8])){
michael
parents: 7493
diff changeset
1057 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, 0, 1);
michael
parents: 7493
diff changeset
1058 fill_rectangle(&h-> mv_cache[0][scan8[i8*4]], 2, 2, 8, 0, 4);
michael
parents: 7493
diff changeset
1059 fill_rectangle(&h-> mv_cache[1][scan8[i8*4]], 2, 2, 8, 0, 4);
michael
parents: 7493
diff changeset
1060 continue;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1061 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1062
7494
michael
parents: 7493
diff changeset
1063 ref0 = l1ref0[x8 + y8*b8_stride];
michael
parents: 7493
diff changeset
1064 if(ref0 >= 0)
7906
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
1065 ref0 = map_col_to_list0[0][ref0 + ref_offset];
7494
michael
parents: 7493
diff changeset
1066 else{
7906
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
1067 ref0 = map_col_to_list0[1][l1ref1[x8 + y8*b8_stride] + ref_offset];
7494
michael
parents: 7493
diff changeset
1068 l1mv= l1mv1;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1069 }
7494
michael
parents: 7493
diff changeset
1070 scale = dist_scale_factor[ref0];
michael
parents: 7493
diff changeset
1071 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, ref0, 1);
michael
parents: 7493
diff changeset
1072
michael
parents: 7493
diff changeset
1073 {
michael
parents: 7493
diff changeset
1074 const int16_t *mv_col = l1mv[x8*3 + y8*b4_stride];
michael
parents: 7493
diff changeset
1075 int my_col = (mv_col[1]<<y_shift)/2;
michael
parents: 7493
diff changeset
1076 int mx = (scale * mv_col[0] + 128) >> 8;
michael
parents: 7493
diff changeset
1077 int my = (scale * my_col + 128) >> 8;
michael
parents: 7493
diff changeset
1078 fill_rectangle(&h->mv_cache[0][scan8[i8*4]], 2, 2, 8, pack16to32(mx,my), 4);
michael
parents: 7493
diff changeset
1079 fill_rectangle(&h->mv_cache[1][scan8[i8*4]], 2, 2, 8, pack16to32(mx-mv_col[0],my-my_col), 4);
michael
parents: 7493
diff changeset
1080 }
michael
parents: 7493
diff changeset
1081 }
michael
parents: 7493
diff changeset
1082 return;
michael
parents: 7493
diff changeset
1083 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1084
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1085 /* one-to-one mv scaling */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1086
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1087 if(IS_16X16(*mb_type)){
4541
1c8bc533da57 factorize more calls to fill_rectangle()
michael
parents: 4540
diff changeset
1088 int ref, mv0, mv1;
1c8bc533da57 factorize more calls to fill_rectangle()
michael
parents: 4540
diff changeset
1089
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1090 fill_rectangle(&h->ref_cache[1][scan8[0]], 4, 4, 8, 0, 1);
7493
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
1091 if(IS_INTRA(mb_type_col[0])){
4541
1c8bc533da57 factorize more calls to fill_rectangle()
michael
parents: 4540
diff changeset
1092 ref=mv0=mv1=0;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1093 }else{
7906
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
1094 const int ref0 = l1ref0[0] >= 0 ? map_col_to_list0[0][l1ref0[0] + ref_offset]
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
1095 : map_col_to_list0[1][l1ref1[0] + ref_offset];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1096 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
1097 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
1098 int mv_l0[2];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1099 mv_l0[0] = (scale * mv_col[0] + 128) >> 8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1100 mv_l0[1] = (scale * mv_col[1] + 128) >> 8;
4541
1c8bc533da57 factorize more calls to fill_rectangle()
michael
parents: 4540
diff changeset
1101 ref= ref0;
1c8bc533da57 factorize more calls to fill_rectangle()
michael
parents: 4540
diff changeset
1102 mv0= pack16to32(mv_l0[0],mv_l0[1]);
1c8bc533da57 factorize more calls to fill_rectangle()
michael
parents: 4540
diff changeset
1103 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
1104 }
1c8bc533da57 factorize more calls to fill_rectangle()
michael
parents: 4540
diff changeset
1105 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
1106 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
1107 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
1108 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1109 for(i8=0; i8<4; i8++){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1110 const int x8 = i8&1;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1111 const int y8 = i8>>1;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1112 int ref0, scale;
2834
fd5d7c732c6b kill a bunch of compiler warnings
mru
parents: 2815
diff changeset
1113 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
1114
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1115 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8]))
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1116 continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1117 h->sub_mb_type[i8] = sub_mb_type;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1118 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, 0, 1);
7493
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
1119 if(IS_INTRA(mb_type_col[0])){
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1120 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
1121 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
1122 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
1123 continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1124 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1125
7906
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
1126 ref0 = l1ref0[x8 + y8*b8_stride] + ref_offset;
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1127 if(ref0 >= 0)
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1128 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
1129 else{
7906
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
1130 ref0 = map_col_to_list0[1][l1ref1[x8 + y8*b8_stride] + ref_offset];
2809
75400dfbe117 fixing colocated mv if colocated block is L1 predicted for the temporal direct case
michael
parents: 2808
diff changeset
1131 l1mv= l1mv1;
75400dfbe117 fixing colocated mv if colocated block is L1 predicted for the temporal direct case
michael
parents: 2808
diff changeset
1132 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1133 scale = dist_scale_factor[ref0];
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->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
1136 if(IS_SUB_8X8(sub_mb_type)){
7498
e7006afcb1c6 Use local variabes for *stride, where local variables exist.
michael
parents: 7497
diff changeset
1137 const int16_t *mv_col = l1mv[x8*3 + y8*3*b4_stride];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1138 int mx = (scale * mv_col[0] + 128) >> 8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1139 int my = (scale * mv_col[1] + 128) >> 8;
3002
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1140 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
1141 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
1142 }else
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1143 for(i4=0; i4<4; i4++){
7498
e7006afcb1c6 Use local variabes for *stride, where local variables exist.
michael
parents: 7497
diff changeset
1144 const int16_t *mv_col = l1mv[x8*2 + (i4&1) + (y8*2 + (i4>>1))*b4_stride];
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1145 int16_t *mv_l0 = h->mv_cache[0][scan8[i8*4+i4]];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1146 mv_l0[0] = (scale * mv_col[0] + 128) >> 8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1147 mv_l0[1] = (scale * mv_col[1] + 128) >> 8;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1148 *(uint32_t*)h->mv_cache[1][scan8[i8*4+i4]] =
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1149 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
1150 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1151 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1152 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1153 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1154 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1155
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1156 static inline void write_back_motion(H264Context *h, int mb_type){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1157 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1158 const int b_xy = 4*s->mb_x + 4*s->mb_y*h->b_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1159 const int b8_xy= 2*s->mb_x + 2*s->mb_y*h->b8_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1160 int list;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1161
3219
cf233efbcece 10l in 1.199 (write_back_motion with B-pyramid + spatial)
lorenm
parents: 3215
diff changeset
1162 if(!USES_LIST(mb_type, 0))
cf233efbcece 10l in 1.199 (write_back_motion with B-pyramid + spatial)
lorenm
parents: 3215
diff changeset
1163 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
1164
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
1165 for(list=0; list<h->list_count; list++){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1166 int y;
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
1167 if(!USES_LIST(mb_type, list))
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1168 continue;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1169
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1170 for(y=0; y<4; y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1171 *(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
1172 *(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
1173 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
1174 if( h->pps.cabac ) {
3927
f44a3341bfdf simplify write_back_motion for skip mbs
lorenm
parents: 3807
diff changeset
1175 if(IS_SKIP(mb_type))
f44a3341bfdf simplify write_back_motion for skip mbs
lorenm
parents: 3807
diff changeset
1176 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
1177 else
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
1178 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
1179 *(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
1180 *(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
1181 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
1182 }
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
1183
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
1184 {
3776
1843a85123b7 fix some signedness warnings
mru
parents: 3651
diff changeset
1185 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
1186 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
1187 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
1188 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
1189 ref_index[1+1*h->b8_stride]= h->ref_cache[list][scan8[12]];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1190 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1191 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1192
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
1193 if(h->slice_type_nos == FF_B_TYPE && h->pps.cabac){
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1194 if(IS_8X8(mb_type)){
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
1195 uint8_t *direct_table = &h->direct_table[b8_xy];
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
1196 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
1197 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
1198 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
1199 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1200 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1201 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1202
8996
e65778184ded Make the following H264 functions available to the parser:
cehoyos
parents: 8991
diff changeset
1203 const uint8_t *ff_h264_decode_nal(H264Context *h, const uint8_t *src, int *dst_length, int *consumed, int length){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1204 int i, si, di;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1205 uint8_t *dst;
5174
2e038003cdfb Do not reuse the rbsp de-escape buffer if both
benoit
parents: 5172
diff changeset
1206 int bufidx;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1207
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2971
diff changeset
1208 // src[0]&0x80; //forbidden bit
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1209 h->nal_ref_idc= src[0]>>5;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1210 h->nal_unit_type= src[0]&0x1F;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1211
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1212 src++; length--;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1213 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1214 for(i=0; i<length; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1215 printf("%2X ", src[i]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1216 #endif
8440
649ce1b30344 Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents: 8438
diff changeset
1217
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8565
diff changeset
1218 #if HAVE_FAST_UNALIGNED
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8565
diff changeset
1219 # if HAVE_FAST_64BIT
8440
649ce1b30344 Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents: 8438
diff changeset
1220 # define RS 7
649ce1b30344 Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents: 8438
diff changeset
1221 for(i=0; i+1<length; i+=9){
8987
bf9d9a79a737 Silence two warnings:
cehoyos
parents: 8972
diff changeset
1222 if(!((~*(const uint64_t*)(src+i) & (*(const uint64_t*)(src+i) - 0x0100010001000101ULL)) & 0x8000800080008080ULL))
8440
649ce1b30344 Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents: 8438
diff changeset
1223 # else
649ce1b30344 Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents: 8438
diff changeset
1224 # define RS 3
649ce1b30344 Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents: 8438
diff changeset
1225 for(i=0; i+1<length; i+=5){
8987
bf9d9a79a737 Silence two warnings:
cehoyos
parents: 8972
diff changeset
1226 if(!((~*(const uint32_t*)(src+i) & (*(const uint32_t*)(src+i) - 0x01000101U)) & 0x80008080U))
8440
649ce1b30344 Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents: 8438
diff changeset
1227 # endif
649ce1b30344 Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents: 8438
diff changeset
1228 continue;
649ce1b30344 Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents: 8438
diff changeset
1229 if(i>0 && !src[i]) i--;
649ce1b30344 Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents: 8438
diff changeset
1230 while(src[i]) i++;
649ce1b30344 Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents: 8438
diff changeset
1231 #else
649ce1b30344 Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents: 8438
diff changeset
1232 # define RS 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1233 for(i=0; i+1<length; i+=2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1234 if(src[i]) continue;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1235 if(i>0 && src[i-1]==0) i--;
8440
649ce1b30344 Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents: 8438
diff changeset
1236 #endif
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1237 if(i+2<length && src[i+1]==0 && src[i+2]<=3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1238 if(src[i+2]!=3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1239 /* startcode, so we must be past the end */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1240 length=i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1241 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1242 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1243 }
8441
f97c423dcb7f 100l, I broke H.264 again, forgot one hunk.
michael
parents: 8440
diff changeset
1244 i-= RS;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1245 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1246
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1247 if(i>=length-1){ //no escaped 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1248 *dst_length= length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1249 *consumed= length+1; //+1 for the header
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1250 return src;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1251 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1252
5174
2e038003cdfb Do not reuse the rbsp de-escape buffer if both
benoit
parents: 5172
diff changeset
1253 bufidx = h->nal_unit_type == NAL_DPC ? 1 : 0; // use second escape buffer for inter data
9415
141badec76fc Add a av_fast_malloc function and replace several uses of av_fast_realloc,
reimar
parents: 9386
diff changeset
1254 av_fast_malloc(&h->rbsp_buffer[bufidx], &h->rbsp_buffer_size[bufidx], length+FF_INPUT_BUFFER_PADDING_SIZE);
5174
2e038003cdfb Do not reuse the rbsp de-escape buffer if both
benoit
parents: 5172
diff changeset
1255 dst= h->rbsp_buffer[bufidx];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1256
4362
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
1257 if (dst == NULL){
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
1258 return NULL;
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
1259 }
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
1260
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
1261 //printf("decoding esc\n");
8446
489c8d652fff Optimize esc removal code.
michael
parents: 8444
diff changeset
1262 memcpy(dst, src, i);
489c8d652fff Optimize esc removal code.
michael
parents: 8444
diff changeset
1263 si=di=i;
489c8d652fff Optimize esc removal code.
michael
parents: 8444
diff changeset
1264 while(si+2<length){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1265 //remove escapes (very rare 1:2^22)
8446
489c8d652fff Optimize esc removal code.
michael
parents: 8444
diff changeset
1266 if(src[si+2]>3){
489c8d652fff Optimize esc removal code.
michael
parents: 8444
diff changeset
1267 dst[di++]= src[si++];
489c8d652fff Optimize esc removal code.
michael
parents: 8444
diff changeset
1268 dst[di++]= src[si++];
489c8d652fff Optimize esc removal code.
michael
parents: 8444
diff changeset
1269 }else if(src[si]==0 && src[si+1]==0){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1270 if(src[si+2]==3){ //escape
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1271 dst[di++]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1272 dst[di++]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1273 si+=3;
1957
54411768fa38 h264 nal decoding fix by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1956
diff changeset
1274 continue;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1275 }else //next start code
8446
489c8d652fff Optimize esc removal code.
michael
parents: 8444
diff changeset
1276 goto nsc;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1277 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1278
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1279 dst[di++]= src[si++];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1280 }
8446
489c8d652fff Optimize esc removal code.
michael
parents: 8444
diff changeset
1281 while(si<length)
489c8d652fff Optimize esc removal code.
michael
parents: 8444
diff changeset
1282 dst[di++]= src[si++];
489c8d652fff Optimize esc removal code.
michael
parents: 8444
diff changeset
1283 nsc:
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1284
8396
11b1f7762830 Clear FF_INPUT_BUFFER_PADDING_SIZE bytes at the end of NALs in rbsp_buffer.
astrange
parents: 8395
diff changeset
1285 memset(dst+di, 0, FF_INPUT_BUFFER_PADDING_SIZE);
11b1f7762830 Clear FF_INPUT_BUFFER_PADDING_SIZE bytes at the end of NALs in rbsp_buffer.
astrange
parents: 8395
diff changeset
1286
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1287 *dst_length= di;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1288 *consumed= si + 1;//+1 for the header
5129
0244bba24b43 misc typo fixes
diego
parents: 5127
diff changeset
1289 //FIXME store exact number of bits in the getbitcontext (it is needed for decoding)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1290 return dst;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1291 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1292
8996
e65778184ded Make the following H264 functions available to the parser:
cehoyos
parents: 8991
diff changeset
1293 int ff_h264_decode_rbsp_trailing(H264Context *h, const uint8_t *src){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1294 int v= *src;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1295 int r;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1296
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
1297 tprintf(h->s.avctx, "rbsp trailing %X\n", v);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1298
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1299 for(r=1; r<9; r++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1300 if(v&1) return r;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1301 v>>=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1302 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1303 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1304 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1305
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1306 /**
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
1307 * IDCT transforms the 16 dc values and dequantizes them.
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1308 * @param qp quantization parameter
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1309 */
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1310 static void h264_luma_dc_dequant_idct_c(DCTELEM *block, int qp, int qmul){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1311 #define stride 16
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1312 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1313 int temp[16]; //FIXME check if this is a good idea
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1314 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1315 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1316
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1317 //memset(block, 64, 2*256);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1318 //return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1319 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1320 const int offset= y_offset[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1321 const int z0= block[offset+stride*0] + block[offset+stride*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1322 const int z1= block[offset+stride*0] - block[offset+stride*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1323 const int z2= block[offset+stride*1] - block[offset+stride*5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1324 const int z3= block[offset+stride*1] + block[offset+stride*5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1325
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1326 temp[4*i+0]= z0+z3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1327 temp[4*i+1]= z1+z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1328 temp[4*i+2]= z1-z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1329 temp[4*i+3]= z0-z3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1330 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1331
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1332 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1333 const int offset= x_offset[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1334 const int z0= temp[4*0+i] + temp[4*2+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1335 const int z1= temp[4*0+i] - temp[4*2+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1336 const int z2= temp[4*1+i] - temp[4*3+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1337 const int z3= temp[4*1+i] + temp[4*3+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1338
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
1339 block[stride*0 +offset]= ((((z0 + z3)*qmul + 128 ) >> 8)); //FIXME think about merging this into decode_residual
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1340 block[stride*2 +offset]= ((((z1 + z2)*qmul + 128 ) >> 8));
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1341 block[stride*8 +offset]= ((((z1 - z2)*qmul + 128 ) >> 8));
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1342 block[stride*10+offset]= ((((z0 - z3)*qmul + 128 ) >> 8));
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1343 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1344 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1345
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1346 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1347 /**
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
1348 * DCT transforms the 16 dc values.
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1349 * @param qp quantization parameter ??? FIXME
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1350 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1351 static void h264_luma_dc_dct_c(DCTELEM *block/*, int qp*/){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1352 // const int qmul= dequant_coeff[qp][0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1353 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1354 int temp[16]; //FIXME check if this is a good idea
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1355 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1356 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1357
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1358 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1359 const int offset= y_offset[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1360 const int z0= block[offset+stride*0] + block[offset+stride*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1361 const int z1= block[offset+stride*0] - block[offset+stride*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1362 const int z2= block[offset+stride*1] - block[offset+stride*5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1363 const int z3= block[offset+stride*1] + block[offset+stride*5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1364
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1365 temp[4*i+0]= z0+z3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1366 temp[4*i+1]= z1+z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1367 temp[4*i+2]= z1-z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1368 temp[4*i+3]= z0-z3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1369 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1370
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1371 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1372 const int offset= x_offset[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1373 const int z0= temp[4*0+i] + temp[4*2+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1374 const int z1= temp[4*0+i] - temp[4*2+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1375 const int z2= temp[4*1+i] - temp[4*3+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1376 const int z3= temp[4*1+i] + temp[4*3+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1377
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1378 block[stride*0 +offset]= (z0 + z3)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1379 block[stride*2 +offset]= (z1 + z2)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1380 block[stride*8 +offset]= (z1 - z2)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1381 block[stride*10+offset]= (z0 - z3)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1382 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1383 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1384 #endif
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1385
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1386 #undef xStride
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1387 #undef stride
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1388
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1389 static void chroma_dc_dequant_idct_c(DCTELEM *block, int qp, int qmul){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1390 const int stride= 16*2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1391 const int xStride= 16;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1392 int a,b,c,d,e;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1393
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1394 a= block[stride*0 + xStride*0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1395 b= block[stride*0 + xStride*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1396 c= block[stride*1 + xStride*0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1397 d= block[stride*1 + xStride*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1398
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1399 e= a-b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1400 a= a+b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1401 b= c-d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1402 c= c+d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1403
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1404 block[stride*0 + xStride*0]= ((a+c)*qmul) >> 7;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1405 block[stride*0 + xStride*1]= ((e+b)*qmul) >> 7;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1406 block[stride*1 + xStride*0]= ((a-c)*qmul) >> 7;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1407 block[stride*1 + xStride*1]= ((e-b)*qmul) >> 7;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1408 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1409
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1410 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1411 static void chroma_dc_dct_c(DCTELEM *block){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1412 const int stride= 16*2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1413 const int xStride= 16;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1414 int a,b,c,d,e;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1415
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1416 a= block[stride*0 + xStride*0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1417 b= block[stride*0 + xStride*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1418 c= block[stride*1 + xStride*0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1419 d= block[stride*1 + xStride*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1420
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1421 e= a-b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1422 a= a+b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1423 b= c-d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1424 c= c+d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1425
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1426 block[stride*0 + xStride*0]= (a+c);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1427 block[stride*0 + xStride*1]= (e+b);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1428 block[stride*1 + xStride*0]= (a-c);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1429 block[stride*1 + xStride*1]= (e-b);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1430 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1431 #endif
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1432
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1433 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
1434 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1435 int src_x_offset, int src_y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1436 qpel_mc_func *qpix_op, h264_chroma_mc_func chroma_op){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1437 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1438 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
1439 int my= h->mv_cache[list][ scan8[n] ][1] + src_y_offset*8;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1440 const int luma_xy= (mx&3) + ((my&3)<<2);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1441 uint8_t * src_y = pic->data[0] + (mx>>2) + (my>>2)*h->mb_linesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1442 uint8_t * src_cb, * src_cr;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1443 int extra_width= h->emu_edge_width;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1444 int extra_height= h->emu_edge_height;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1445 int emu=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1446 const int full_mx= mx>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1447 const int full_my= my>>2;
2861
3b920e274b26 fix emulated edge motion compensation when resolution%16!=0
lorenm
parents: 2846
diff changeset
1448 const int pic_width = 16*s->mb_width;
5815
fb293531e983 Simplify tests for field macroblocks
andoma
parents: 5812
diff changeset
1449 const int pic_height = 16*s->mb_height >> MB_FIELD;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1450
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1451 if(mx&7) extra_width -= 3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1452 if(my&7) extra_height -= 3;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1453
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1454 if( full_mx < 0-extra_width
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1455 || full_my < 0-extra_height
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1456 || full_mx + 16/*FIXME*/ > pic_width + extra_width
2861
3b920e274b26 fix emulated edge motion compensation when resolution%16!=0
lorenm
parents: 2846
diff changeset
1457 || full_my + 16/*FIXME*/ > pic_height + extra_height){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1458 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
1459 src_y= s->edge_emu_buffer + 2 + 2*h->mb_linesize;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1460 emu=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1461 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1462
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1463 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
1464 if(!square){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1465 qpix_op[luma_xy](dest_y + delta, src_y + delta, h->mb_linesize);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1466 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1467
8596
68e959302527 replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents: 8590
diff changeset
1468 if(CONFIG_GRAY && s->flags&CODEC_FLAG_GRAY) return;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1469
5815
fb293531e983 Simplify tests for field macroblocks
andoma
parents: 5812
diff changeset
1470 if(MB_FIELD){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1471 // chroma offset when predicting from a field of opposite parity
5825
18859ffa5705 Fix chroma mv offsets for PAFF in a way that is compatible with MBAFF by
cehoyos
parents: 5822
diff changeset
1472 my += 2 * ((s->mb_y & 1) - (pic->reference - 1));
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1473 emu |= (my>>3) < 0 || (my>>3) + 8 >= (pic_height>>1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1474 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1475 src_cb= pic->data[1] + (mx>>3) + (my>>3)*h->mb_uvlinesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1476 src_cr= pic->data[2] + (mx>>3) + (my>>3)*h->mb_uvlinesize;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1477
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1478 if(emu){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1479 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
1480 src_cb= s->edge_emu_buffer;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1481 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1482 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
1483
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1484 if(emu){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1485 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
1486 src_cr= s->edge_emu_buffer;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1487 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1488 chroma_op(dest_cr, src_cr, h->mb_uvlinesize, chroma_height, mx&7, my&7);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1489 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1490
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1491 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
1492 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1493 int x_offset, int y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1494 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1495 qpel_mc_func *qpix_avg, h264_chroma_mc_func chroma_avg,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1496 int list0, int list1){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1497 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1498 qpel_mc_func *qpix_op= qpix_put;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1499 h264_chroma_mc_func chroma_op= chroma_put;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1500
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1501 dest_y += 2*x_offset + 2*y_offset*h-> mb_linesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1502 dest_cb += x_offset + y_offset*h->mb_uvlinesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1503 dest_cr += x_offset + y_offset*h->mb_uvlinesize;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1504 x_offset += 8*s->mb_x;
5815
fb293531e983 Simplify tests for field macroblocks
andoma
parents: 5812
diff changeset
1505 y_offset += 8*(s->mb_y >> MB_FIELD);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1506
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1507 if(list0){
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1508 Picture *ref= &h->ref_list[0][ h->ref_cache[0][ scan8[n] ] ];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1509 mc_dir_part(h, ref, n, square, chroma_height, delta, 0,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1510 dest_y, dest_cb, dest_cr, x_offset, y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1511 qpix_op, chroma_op);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1512
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1513 qpix_op= qpix_avg;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1514 chroma_op= chroma_avg;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1515 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1516
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1517 if(list1){
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1518 Picture *ref= &h->ref_list[1][ h->ref_cache[1][ scan8[n] ] ];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1519 mc_dir_part(h, ref, n, square, chroma_height, delta, 1,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1520 dest_y, dest_cb, dest_cr, x_offset, y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1521 qpix_op, chroma_op);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1522 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1523 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1524
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1525 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
1526 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1527 int x_offset, int y_offset,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1528 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1529 h264_weight_func luma_weight_op, h264_weight_func chroma_weight_op,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1530 h264_biweight_func luma_weight_avg, h264_biweight_func chroma_weight_avg,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1531 int list0, int list1){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1532 MpegEncContext * const s = &h->s;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1533
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1534 dest_y += 2*x_offset + 2*y_offset*h-> mb_linesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1535 dest_cb += x_offset + y_offset*h->mb_uvlinesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1536 dest_cr += x_offset + y_offset*h->mb_uvlinesize;
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1537 x_offset += 8*s->mb_x;
5815
fb293531e983 Simplify tests for field macroblocks
andoma
parents: 5812
diff changeset
1538 y_offset += 8*(s->mb_y >> MB_FIELD);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1539
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1540 if(list0 && list1){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1541 /* don't optimize for luma-only case, since B-frames usually
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1542 * use implicit weights => chroma too. */
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1543 uint8_t *tmp_cb = s->obmc_scratchpad;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1544 uint8_t *tmp_cr = s->obmc_scratchpad + 8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1545 uint8_t *tmp_y = s->obmc_scratchpad + 8*h->mb_uvlinesize;
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1546 int refn0 = h->ref_cache[0][ scan8[n] ];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1547 int refn1 = h->ref_cache[1][ scan8[n] ];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1548
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1549 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
1550 dest_y, dest_cb, dest_cr,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1551 x_offset, y_offset, qpix_put, chroma_put);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1552 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
1553 tmp_y, tmp_cb, tmp_cr,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1554 x_offset, y_offset, qpix_put, chroma_put);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1555
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1556 if(h->use_weight == 2){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1557 int weight0 = h->implicit_weight[refn0][refn1];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1558 int weight1 = 64 - weight0;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1559 luma_weight_avg( dest_y, tmp_y, h-> mb_linesize, 5, weight0, weight1, 0);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1560 chroma_weight_avg(dest_cb, tmp_cb, h->mb_uvlinesize, 5, weight0, weight1, 0);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1561 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
1562 }else{
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1563 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
1564 h->luma_weight[0][refn0], h->luma_weight[1][refn1],
3029
7a92269a3ccd tweak h264_biweight
lorenm
parents: 3028
diff changeset
1565 h->luma_offset[0][refn0] + h->luma_offset[1][refn1]);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1566 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
1567 h->chroma_weight[0][refn0][0], h->chroma_weight[1][refn1][0],
3029
7a92269a3ccd tweak h264_biweight
lorenm
parents: 3028
diff changeset
1568 h->chroma_offset[0][refn0][0] + h->chroma_offset[1][refn1][0]);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1569 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
1570 h->chroma_weight[0][refn0][1], h->chroma_weight[1][refn1][1],
3029
7a92269a3ccd tweak h264_biweight
lorenm
parents: 3028
diff changeset
1571 h->chroma_offset[0][refn0][1] + h->chroma_offset[1][refn1][1]);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1572 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1573 }else{
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1574 int list = list1 ? 1 : 0;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1575 int refn = h->ref_cache[list][ scan8[n] ];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1576 Picture *ref= &h->ref_list[list][refn];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1577 mc_dir_part(h, ref, n, square, chroma_height, delta, list,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1578 dest_y, dest_cb, dest_cr, x_offset, y_offset,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1579 qpix_put, chroma_put);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1580
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1581 luma_weight_op(dest_y, h->mb_linesize, h->luma_log2_weight_denom,
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1582 h->luma_weight[list][refn], h->luma_offset[list][refn]);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1583 if(h->use_weight_chroma){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1584 chroma_weight_op(dest_cb, h->mb_uvlinesize, h->chroma_log2_weight_denom,
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1585 h->chroma_weight[list][refn][0], h->chroma_offset[list][refn][0]);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1586 chroma_weight_op(dest_cr, h->mb_uvlinesize, h->chroma_log2_weight_denom,
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1587 h->chroma_weight[list][refn][1], h->chroma_offset[list][refn][1]);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1588 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1589 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1590 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1591
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1592 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
1593 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1594 int x_offset, int y_offset,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1595 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1596 qpel_mc_func *qpix_avg, h264_chroma_mc_func chroma_avg,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1597 h264_weight_func *weight_op, h264_biweight_func *weight_avg,
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1598 int list0, int list1){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1599 if((h->use_weight==2 && list0 && list1
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1600 && (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
1601 || h->use_weight==1)
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1602 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
1603 x_offset, y_offset, qpix_put, chroma_put,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1604 weight_op[0], weight_op[3], weight_avg[0], weight_avg[3], list0, list1);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1605 else
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1606 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
1607 x_offset, y_offset, qpix_put, chroma_put, qpix_avg, chroma_avg, list0, list1);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1608 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1609
3215
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1610 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
1611 /* fetch pixels for estimated mv 4 macroblocks ahead
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1612 * optimized for 64byte cache lines */
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1613 MpegEncContext * const s = &h->s;
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1614 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
1615 if(refn >= 0){
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1616 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
1617 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
1618 uint8_t **src= h->ref_list[list][refn].data;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1619 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
1620 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
1621 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
1622 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
1623 }
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1624 }
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1625
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1626 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
1627 qpel_mc_func (*qpix_put)[16], h264_chroma_mc_func (*chroma_put),
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1628 qpel_mc_func (*qpix_avg)[16], h264_chroma_mc_func (*chroma_avg),
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1629 h264_weight_func *weight_op, h264_biweight_func *weight_avg){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1630 MpegEncContext * const s = &h->s;
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
1631 const int mb_xy= h->mb_xy;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1632 const int mb_type= s->current_picture.mb_type[mb_xy];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1633
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1634 assert(IS_INTER(mb_type));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1635
3215
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1636 prefetch_motion(h, 0);
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1637
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1638 if(IS_16X16(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1639 mc_part(h, 0, 1, 8, 0, dest_y, dest_cb, dest_cr, 0, 0,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1640 qpix_put[0], chroma_put[0], qpix_avg[0], chroma_avg[0],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1641 &weight_op[0], &weight_avg[0],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1642 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1643 }else if(IS_16X8(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1644 mc_part(h, 0, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 0,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1645 qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1646 &weight_op[1], &weight_avg[1],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1647 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1648 mc_part(h, 8, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 4,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1649 qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1650 &weight_op[1], &weight_avg[1],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1651 IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1652 }else if(IS_8X16(mb_type)){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1653 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
1654 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1655 &weight_op[2], &weight_avg[2],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1656 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1));
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1657 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
1658 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1659 &weight_op[2], &weight_avg[2],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1660 IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1661 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1662 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1663
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1664 assert(IS_8X8(mb_type));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1665
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1666 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1667 const int sub_mb_type= h->sub_mb_type[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1668 const int n= 4*i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1669 int x_offset= (i&1)<<2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1670 int y_offset= (i&2)<<1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1671
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1672 if(IS_SUB_8X8(sub_mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1673 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
1674 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1675 &weight_op[3], &weight_avg[3],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1676 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1677 }else if(IS_SUB_8X4(sub_mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1678 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
1679 qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1680 &weight_op[4], &weight_avg[4],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1681 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1682 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
1683 qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1684 &weight_op[4], &weight_avg[4],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1685 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1686 }else if(IS_SUB_4X8(sub_mb_type)){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1687 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
1688 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1689 &weight_op[5], &weight_avg[5],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1690 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
1691 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
1692 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1693 &weight_op[5], &weight_avg[5],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1694 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1695 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1696 int j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1697 assert(IS_SUB_4X4(sub_mb_type));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1698 for(j=0; j<4; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1699 int sub_x_offset= x_offset + 2*(j&1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1700 int sub_y_offset= y_offset + (j&2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1701 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
1702 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1703 &weight_op[6], &weight_avg[6],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1704 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1705 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1706 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1707 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1708 }
3215
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1709
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1710 prefetch_motion(h, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1711 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1712
8443
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1713 static av_cold void init_cavlc_level_tab(void){
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1714 int suffix_length, mask;
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1715 unsigned int i;
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1716
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1717 for(suffix_length=0; suffix_length<7; suffix_length++){
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1718 for(i=0; i<(1<<LEVEL_TAB_BITS); i++){
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1719 int prefix= LEVEL_TAB_BITS - av_log2(2*i);
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1720 int level_code= (prefix<<suffix_length) + (i>>(LEVEL_TAB_BITS-prefix-1-suffix_length)) - (1<<suffix_length);
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1721
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1722 mask= -(level_code&1);
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1723 level_code= (((2+level_code)>>1) ^ mask) - mask;
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1724 if(prefix + 1 + suffix_length <= LEVEL_TAB_BITS){
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1725 cavlc_level_tab[suffix_length][i][0]= level_code;
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1726 cavlc_level_tab[suffix_length][i][1]= prefix + 1 + suffix_length;
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1727 }else if(prefix + 1 <= LEVEL_TAB_BITS){
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1728 cavlc_level_tab[suffix_length][i][0]= prefix+100;
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1729 cavlc_level_tab[suffix_length][i][1]= prefix + 1;
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1730 }else{
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1731 cavlc_level_tab[suffix_length][i][0]= LEVEL_TAB_BITS+100;
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1732 cavlc_level_tab[suffix_length][i][1]= LEVEL_TAB_BITS;
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1733 }
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1734 }
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1735 }
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1736 }
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1737
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6490
diff changeset
1738 static av_cold void decode_init_vlc(void){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1739 static int done = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1740
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1741 if (!done) {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1742 int i;
7481
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1743 int offset;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1744 done = 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1745
7481
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1746 chroma_dc_coeff_token_vlc.table = chroma_dc_coeff_token_vlc_table;
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1747 chroma_dc_coeff_token_vlc.table_allocated = chroma_dc_coeff_token_vlc_table_size;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1748 init_vlc(&chroma_dc_coeff_token_vlc, CHROMA_DC_COEFF_TOKEN_VLC_BITS, 4*5,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1749 &chroma_dc_coeff_token_len [0], 1, 1,
7481
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1750 &chroma_dc_coeff_token_bits[0], 1, 1,
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1751 INIT_VLC_USE_NEW_STATIC);
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1752
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1753 offset = 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1754 for(i=0; i<4; i++){
7481
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1755 coeff_token_vlc[i].table = coeff_token_vlc_tables+offset;
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1756 coeff_token_vlc[i].table_allocated = coeff_token_vlc_tables_size[i];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1757 init_vlc(&coeff_token_vlc[i], COEFF_TOKEN_VLC_BITS, 4*17,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1758 &coeff_token_len [i][0], 1, 1,
7481
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1759 &coeff_token_bits[i][0], 1, 1,
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1760 INIT_VLC_USE_NEW_STATIC);
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1761 offset += coeff_token_vlc_tables_size[i];
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1762 }
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1763 /*
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1764 * This is a one time safety check to make sure that
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1765 * the packed static coeff_token_vlc table sizes
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1766 * were initialized correctly.
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1767 */
8042
e70975d5ff80 uses FF_ARRAY_ELEMS() where appropriate
aurel
parents: 7993
diff changeset
1768 assert(offset == FF_ARRAY_ELEMS(coeff_token_vlc_tables));
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1769
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1770 for(i=0; i<3; i++){
7481
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1771 chroma_dc_total_zeros_vlc[i].table = chroma_dc_total_zeros_vlc_tables[i];
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1772 chroma_dc_total_zeros_vlc[i].table_allocated = chroma_dc_total_zeros_vlc_tables_size;
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1773 init_vlc(&chroma_dc_total_zeros_vlc[i],
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1774 CHROMA_DC_TOTAL_ZEROS_VLC_BITS, 4,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1775 &chroma_dc_total_zeros_len [i][0], 1, 1,
7481
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1776 &chroma_dc_total_zeros_bits[i][0], 1, 1,
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1777 INIT_VLC_USE_NEW_STATIC);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1778 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1779 for(i=0; i<15; i++){
7481
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1780 total_zeros_vlc[i].table = total_zeros_vlc_tables[i];
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1781 total_zeros_vlc[i].table_allocated = total_zeros_vlc_tables_size;
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1782 init_vlc(&total_zeros_vlc[i],
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1783 TOTAL_ZEROS_VLC_BITS, 16,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1784 &total_zeros_len [i][0], 1, 1,
7481
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1785 &total_zeros_bits[i][0], 1, 1,
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1786 INIT_VLC_USE_NEW_STATIC);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1787 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1788
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1789 for(i=0; i<6; i++){
7481
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1790 run_vlc[i].table = run_vlc_tables[i];
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1791 run_vlc[i].table_allocated = run_vlc_tables_size;
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1792 init_vlc(&run_vlc[i],
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1793 RUN_VLC_BITS, 7,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1794 &run_len [i][0], 1, 1,
7481
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1795 &run_bits[i][0], 1, 1,
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1796 INIT_VLC_USE_NEW_STATIC);
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1797 }
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1798 run7_vlc.table = run7_vlc_table,
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1799 run7_vlc.table_allocated = run7_vlc_table_size;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1800 init_vlc(&run7_vlc, RUN7_VLC_BITS, 16,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1801 &run_len [6][0], 1, 1,
7481
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1802 &run_bits[6][0], 1, 1,
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1803 INIT_VLC_USE_NEW_STATIC);
8443
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1804
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1805 init_cavlc_level_tab();
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1806 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1807 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1808
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1809 static void free_tables(H264Context *h){
5079
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
1810 int i;
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1811 H264Context *hx;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1812 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
1813 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
1814 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
1815 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
1816 av_freep(&h->mvd_table[1]);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1817 av_freep(&h->direct_table);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1818 av_freep(&h->non_zero_count);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1819 av_freep(&h->slice_table_base);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1820 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
1821
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1822 av_freep(&h->mb2b_xy);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1823 av_freep(&h->mb2b8_xy);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1824
9386
a673af90ed8f Loop up to MAX_THREADS instead of h->s.avctx->thread_count to free the thread
reimar
parents: 9384
diff changeset
1825 for(i = 0; i < MAX_THREADS; i++) {
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1826 hx = h->thread_context[i];
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1827 if(!hx) continue;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1828 av_freep(&hx->top_borders[1]);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1829 av_freep(&hx->top_borders[0]);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1830 av_freep(&hx->s.obmc_scratchpad);
9862
db929fcaeb9a H.264: Fix memory leaks with multithreading.
astrange
parents: 9831
diff changeset
1831 av_freep(&hx->rbsp_buffer[1]);
db929fcaeb9a H.264: Fix memory leaks with multithreading.
astrange
parents: 9831
diff changeset
1832 av_freep(&hx->rbsp_buffer[0]);
10528
6fe84da648e2 Reset rbsp buffer size when freeing its data buffer.
benoit
parents: 10514
diff changeset
1833 hx->rbsp_buffer_size[0] = 0;
6fe84da648e2 Reset rbsp buffer size when freeing its data buffer.
benoit
parents: 10514
diff changeset
1834 hx->rbsp_buffer_size[1] = 0;
9862
db929fcaeb9a H.264: Fix memory leaks with multithreading.
astrange
parents: 9831
diff changeset
1835 if (i) av_freep(&h->thread_context[i]);
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1836 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1837 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1838
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1839 static void init_dequant8_coeff_table(H264Context *h){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1840 int i,q,x;
3174
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
1841 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
1842 h->dequant8_coeff[0] = h->dequant8_buffer[0];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1843 h->dequant8_coeff[1] = h->dequant8_buffer[1];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1844
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1845 for(i=0; i<2; i++ ){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1846 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
1847 h->dequant8_coeff[1] = h->dequant8_buffer[0];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1848 break;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1849 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1850
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1851 for(q=0; q<52; q++){
7993
2dfff0e25b47 Mark ff_div6 and ff_rem6 static in h264.c. Patch by Diego Petten
lu_zero
parents: 7974
diff changeset
1852 int shift = div6[q];
2dfff0e25b47 Mark ff_div6 and ff_rem6 static in h264.c. Patch by Diego Petten
lu_zero
parents: 7974
diff changeset
1853 int idx = rem6[q];
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1854 for(x=0; x<64; x++)
3174
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
1855 h->dequant8_coeff[i][q][transpose ? (x>>3)|((x&7)<<3) : x] =
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
1856 ((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
1857 h->pps.scaling_matrix8[i][x]) << shift;
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1858 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1859 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1860 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1861
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1862 static void init_dequant4_coeff_table(H264Context *h){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1863 int i,j,q,x;
3005
6f6f307cffac fix asymmetric CQMs with pre-transposed DCT.
lorenm
parents: 3004
diff changeset
1864 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
1865 for(i=0; i<6; i++ ){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1866 h->dequant4_coeff[i] = h->dequant4_buffer[i];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1867 for(j=0; j<i; j++){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1868 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
1869 h->dequant4_coeff[i] = h->dequant4_buffer[j];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1870 break;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1871 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1872 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1873 if(j<i)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1874 continue;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1875
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1876 for(q=0; q<52; q++){
7993
2dfff0e25b47 Mark ff_div6 and ff_rem6 static in h264.c. Patch by Diego Petten
lu_zero
parents: 7974
diff changeset
1877 int shift = div6[q] + 2;
2dfff0e25b47 Mark ff_div6 and ff_rem6 static in h264.c. Patch by Diego Petten
lu_zero
parents: 7974
diff changeset
1878 int idx = rem6[q];
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1879 for(x=0; x<16; x++)
3005
6f6f307cffac fix asymmetric CQMs with pre-transposed DCT.
lorenm
parents: 3004
diff changeset
1880 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
1881 ((uint32_t)dequant4_coeff_init[idx][(x&1) + ((x>>2)&1)] *
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1882 h->pps.scaling_matrix4[i][x]) << shift;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1883 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1884 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1885 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1886
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1887 static void init_dequant_tables(H264Context *h){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1888 int i,x;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1889 init_dequant4_coeff_table(h);
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1890 if(h->pps.transform_8x8_mode)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1891 init_dequant8_coeff_table(h);
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1892 if(h->sps.transform_bypass){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1893 for(i=0; i<6; i++)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1894 for(x=0; x<16; x++)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1895 h->dequant4_coeff[i][0][x] = 1<<6;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1896 if(h->pps.transform_8x8_mode)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1897 for(i=0; i<2; i++)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1898 for(x=0; x<64; x++)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1899 h->dequant8_coeff[i][0][x] = 1<<6;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1900 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1901 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1902
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1903
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
1904 int ff_h264_alloc_tables(H264Context *h){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1905 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
1906 const int big_mb_num= s->mb_stride * (s->mb_height+1);
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1907 int x,y;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1908
10137
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9985
diff changeset
1909 FF_ALLOCZ_OR_GOTO(h->s.avctx, h->intra4x4_pred_mode, big_mb_num * 8 * sizeof(uint8_t), fail)
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9985
diff changeset
1910
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9985
diff changeset
1911 FF_ALLOCZ_OR_GOTO(h->s.avctx, h->non_zero_count , big_mb_num * 16 * sizeof(uint8_t), fail)
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9985
diff changeset
1912 FF_ALLOCZ_OR_GOTO(h->s.avctx, h->slice_table_base , (big_mb_num+s->mb_stride) * sizeof(*h->slice_table_base), fail)
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9985
diff changeset
1913 FF_ALLOCZ_OR_GOTO(h->s.avctx, h->cbp_table, big_mb_num * sizeof(uint16_t), fail)
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9985
diff changeset
1914
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9985
diff changeset
1915 FF_ALLOCZ_OR_GOTO(h->s.avctx, h->chroma_pred_mode_table, big_mb_num * sizeof(uint8_t), fail)
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9985
diff changeset
1916 FF_ALLOCZ_OR_GOTO(h->s.avctx, h->mvd_table[0], 32*big_mb_num * sizeof(uint16_t), fail);
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9985
diff changeset
1917 FF_ALLOCZ_OR_GOTO(h->s.avctx, h->mvd_table[1], 32*big_mb_num * sizeof(uint16_t), fail);
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9985
diff changeset
1918 FF_ALLOCZ_OR_GOTO(h->s.avctx, h->direct_table, 32*big_mb_num * sizeof(uint8_t) , fail);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1919
8079
2d3c7cd7d143 Replace literally hardcoded max slice number by named constant.
michael
parents: 8042
diff changeset
1920 memset(h->slice_table_base, -1, (big_mb_num+s->mb_stride) * sizeof(*h->slice_table_base));
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1921 h->slice_table= h->slice_table_base + s->mb_stride*2 + 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1922
10137
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9985
diff changeset
1923 FF_ALLOCZ_OR_GOTO(h->s.avctx, h->mb2b_xy , big_mb_num * sizeof(uint32_t), fail);
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9985
diff changeset
1924 FF_ALLOCZ_OR_GOTO(h->s.avctx, h->mb2b8_xy , big_mb_num * sizeof(uint32_t), fail);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1925 for(y=0; y<s->mb_height; y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1926 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
1927 const int mb_xy= x + y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1928 const int b_xy = 4*x + 4*y*h->b_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1929 const int b8_xy= 2*x + 2*y*h->b8_stride;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1930
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1931 h->mb2b_xy [mb_xy]= b_xy;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1932 h->mb2b8_xy[mb_xy]= b8_xy;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1933 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1934 }
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1935
2417
991f39305057 10l (obmc_scratchpad not always initialize)
lorenm
parents: 2416
diff changeset
1936 s->obmc_scratchpad = NULL;
991f39305057 10l (obmc_scratchpad not always initialize)
lorenm
parents: 2416
diff changeset
1937
2920
1443b4d3f4ab 10l: cqm weren't initialized in svq3.
lorenm
parents: 2919
diff changeset
1938 if(!h->dequant4_coeff[0])
1443b4d3f4ab 10l: cqm weren't initialized in svq3.
lorenm
parents: 2919
diff changeset
1939 init_dequant_tables(h);
1443b4d3f4ab 10l: cqm weren't initialized in svq3.
lorenm
parents: 2919
diff changeset
1940
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1941 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1942 fail:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1943 free_tables(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1944 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1945 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1946
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1947 /**
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1948 * Mimic alloc_tables(), but for every context thread.
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1949 */
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1950 static void clone_tables(H264Context *dst, H264Context *src){
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1951 dst->intra4x4_pred_mode = src->intra4x4_pred_mode;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1952 dst->non_zero_count = src->non_zero_count;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1953 dst->slice_table = src->slice_table;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1954 dst->cbp_table = src->cbp_table;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1955 dst->mb2b_xy = src->mb2b_xy;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1956 dst->mb2b8_xy = src->mb2b8_xy;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1957 dst->chroma_pred_mode_table = src->chroma_pred_mode_table;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1958 dst->mvd_table[0] = src->mvd_table[0];
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1959 dst->mvd_table[1] = src->mvd_table[1];
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1960 dst->direct_table = src->direct_table;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1961
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1962 dst->s.obmc_scratchpad = NULL;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1963 ff_h264_pred_init(&dst->hpc, src->s.codec_id);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1964 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1965
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1966 /**
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1967 * Init context
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1968 * Allocate buffers which are not shared amongst multiple threads.
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1969 */
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1970 static int context_init(H264Context *h){
10137
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9985
diff changeset
1971 FF_ALLOCZ_OR_GOTO(h->s.avctx, h->top_borders[0], h->s.mb_width * (16+8+8) * sizeof(uint8_t), fail)
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9985
diff changeset
1972 FF_ALLOCZ_OR_GOTO(h->s.avctx, h->top_borders[1], h->s.mb_width * (16+8+8) * sizeof(uint8_t), fail)
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1973
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1974 return 0;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1975 fail:
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1976 return -1; // free_tables will clean up for us
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1977 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1978
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6490
diff changeset
1979 static av_cold void common_init(H264Context *h){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1980 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1981
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1982 s->width = s->avctx->width;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1983 s->height = s->avctx->height;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1984 s->codec_id= s->avctx->codec->id;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1985
5638
4a26dc4ca11d Move H.264 intra prediction functions into their own context
kostya
parents: 5631
diff changeset
1986 ff_h264_pred_init(&h->hpc, s->codec_id);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1987
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1988 h->dequant_coeff_pps= -1;
1698
420cac032278 svq3 fix
michael
parents: 1636
diff changeset
1989 s->unrestricted_mv=1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1990 s->decode=1; //FIXME
2920
1443b4d3f4ab 10l: cqm weren't initialized in svq3.
lorenm
parents: 2919
diff changeset
1991
8402
0199857f9000 Fix decoding with the plain C idcts of
michael
parents: 8399
diff changeset
1992 dsputil_init(&s->dsp, s->avctx); // needed so that idct permutation is known early
0199857f9000 Fix decoding with the plain C idcts of
michael
parents: 8399
diff changeset
1993
2920
1443b4d3f4ab 10l: cqm weren't initialized in svq3.
lorenm
parents: 2919
diff changeset
1994 memset(h->pps.scaling_matrix4, 16, 6*16*sizeof(uint8_t));
1443b4d3f4ab 10l: cqm weren't initialized in svq3.
lorenm
parents: 2919
diff changeset
1995 memset(h->pps.scaling_matrix8, 16, 2*64*sizeof(uint8_t));
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1996 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1997
9069
8a74ab19d224 Correctly reset SEI variables.
cehoyos
parents: 9066
diff changeset
1998 /**
8a74ab19d224 Correctly reset SEI variables.
cehoyos
parents: 9066
diff changeset
1999 * Reset SEI values at the beginning of the frame.
8a74ab19d224 Correctly reset SEI variables.
cehoyos
parents: 9066
diff changeset
2000 *
8a74ab19d224 Correctly reset SEI variables.
cehoyos
parents: 9066
diff changeset
2001 * @param h H.264 context.
8a74ab19d224 Correctly reset SEI variables.
cehoyos
parents: 9066
diff changeset
2002 */
8a74ab19d224 Correctly reset SEI variables.
cehoyos
parents: 9066
diff changeset
2003 static void reset_sei(H264Context *h) {
8a74ab19d224 Correctly reset SEI variables.
cehoyos
parents: 9066
diff changeset
2004 h->sei_recovery_frame_cnt = -1;
8a74ab19d224 Correctly reset SEI variables.
cehoyos
parents: 9066
diff changeset
2005 h->sei_dpb_output_delay = 0;
8a74ab19d224 Correctly reset SEI variables.
cehoyos
parents: 9066
diff changeset
2006 h->sei_cpb_removal_delay = -1;
8a74ab19d224 Correctly reset SEI variables.
cehoyos
parents: 9066
diff changeset
2007 h->sei_buffering_period_present = 0;
8a74ab19d224 Correctly reset SEI variables.
cehoyos
parents: 9066
diff changeset
2008 }
8a74ab19d224 Correctly reset SEI variables.
cehoyos
parents: 9066
diff changeset
2009
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
2010 av_cold int ff_h264_decode_init(AVCodecContext *avctx){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2011 H264Context *h= avctx->priv_data;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2012 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2013
1892
5ac49e7a1b8f init cleanup
michael
parents: 1786
diff changeset
2014 MPV_decode_defaults(s);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2015
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2016 s->avctx = avctx;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2017 common_init(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2018
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2019 s->out_format = FMT_H264;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2020 s->workaround_bugs= avctx->workaround_bugs;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2021
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2022 // set defaults
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2023 // 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
2024 s->quarter_sample = 1;
9075
6366106bd493 Do not set low_delay if has_b_frames has been set before init()
michael
parents: 9073
diff changeset
2025 if(!avctx->has_b_frames)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2026 s->low_delay= 1;
7289
1595c063d68d SVQ3 uses the JPEG variant of YUV 4:2:0.
michael
parents: 7283
diff changeset
2027
9626
bd3e11b60ccd Add a chroma_sample_location field to define positioning of chroma samples
conrad
parents: 9449
diff changeset
2028 avctx->chroma_sample_location = AVCHROMA_LOC_LEFT;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2029
4164
171e768324cd Remove the H264Context parameter from decode_init_vlc() as it is not being used.
takis
parents: 4118
diff changeset
2030 decode_init_vlc();
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2031
2547
c5781912ad8a improved detection of "AVC1" style H.264 patch by (Mns Rullgrd <mru inprovide com>)
michael
parents: 2538
diff changeset
2032 if(avctx->extradata_size > 0 && avctx->extradata &&
c5781912ad8a improved detection of "AVC1" style H.264 patch by (Mns Rullgrd <mru inprovide com>)
michael
parents: 2538
diff changeset
2033 *(char *)avctx->extradata == 1){
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2034 h->is_avc = 1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2035 h->got_avcC = 0;
2547
c5781912ad8a improved detection of "AVC1" style H.264 patch by (Mns Rullgrd <mru inprovide com>)
michael
parents: 2538
diff changeset
2036 } else {
c5781912ad8a improved detection of "AVC1" style H.264 patch by (Mns Rullgrd <mru inprovide com>)
michael
parents: 2538
diff changeset
2037 h->is_avc = 0;
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2038 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2039
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2040 h->thread_context[0] = h;
7424
69766900be2d Initialize outputed_poc to INT_MIN at decoder initialization.
heydowns
parents: 7423
diff changeset
2041 h->outputed_poc = INT_MIN;
7789
5c532e05faea Fix artifacts of MPEG4-720I-DN-SV8K.trp caused by lack of IDR pictures and
michael
parents: 7772
diff changeset
2042 h->prev_poc_msb= 1<<16;
9069
8a74ab19d224 Correctly reset SEI variables.
cehoyos
parents: 9066
diff changeset
2043 reset_sei(h);
9073
d1238ea3db6f Adjust time_base exactly when changing ticks_per_frame to 2 this is safer
michael
parents: 9069
diff changeset
2044 if(avctx->codec_id == CODEC_ID_H264){
d1238ea3db6f Adjust time_base exactly when changing ticks_per_frame to 2 this is safer
michael
parents: 9069
diff changeset
2045 if(avctx->ticks_per_frame == 1){
d1238ea3db6f Adjust time_base exactly when changing ticks_per_frame to 2 this is safer
michael
parents: 9069
diff changeset
2046 s->avctx->time_base.den *=2;
d1238ea3db6f Adjust time_base exactly when changing ticks_per_frame to 2 this is safer
michael
parents: 9069
diff changeset
2047 }
9065
3dbe483ce6c4 Fix SVQ3 regression since ticks_per_frame=2.
michael
parents: 9059
diff changeset
2048 avctx->ticks_per_frame = 2;
9073
d1238ea3db6f Adjust time_base exactly when changing ticks_per_frame to 2 this is safer
michael
parents: 9069
diff changeset
2049 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2050 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2051 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2052
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
2053 int ff_h264_frame_start(H264Context *h){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2054 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2055 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2056
2935
b564bb15e63c check MPV_frame_start() return value
michael
parents: 2928
diff changeset
2057 if(MPV_frame_start(s, s->avctx) < 0)
b564bb15e63c check MPV_frame_start() return value
michael
parents: 2928
diff changeset
2058 return -1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2059 ff_er_frame_start(s);
5773
e3d7a78e2df3 Fix Picture.key_frame setting to be compatible with frame and field contexts. Part of PAFF implementation.
andoma
parents: 5772
diff changeset
2060 /*
e3d7a78e2df3 Fix Picture.key_frame setting to be compatible with frame and field contexts. Part of PAFF implementation.
andoma
parents: 5772
diff changeset
2061 * MPV_frame_start uses pict_type to derive key_frame.
e3d7a78e2df3 Fix Picture.key_frame setting to be compatible with frame and field contexts. Part of PAFF implementation.
andoma
parents: 5772
diff changeset
2062 * This is incorrect for H.264; IDR markings must be used.
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
2063 * Zero here; IDR markings per slice in frame or fields are ORed in later.
5773
e3d7a78e2df3 Fix Picture.key_frame setting to be compatible with frame and field contexts. Part of PAFF implementation.
andoma
parents: 5772
diff changeset
2064 * See decode_nal_units().
e3d7a78e2df3 Fix Picture.key_frame setting to be compatible with frame and field contexts. Part of PAFF implementation.
andoma
parents: 5772
diff changeset
2065 */
e3d7a78e2df3 Fix Picture.key_frame setting to be compatible with frame and field contexts. Part of PAFF implementation.
andoma
parents: 5772
diff changeset
2066 s->current_picture_ptr->key_frame= 0;
9885
f86df3ebfef7 Improve wording: s/reseted/reset
cehoyos
parents: 9883
diff changeset
2067 s->current_picture_ptr->mmco_reset= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2068
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2069 assert(s->linesize && s->uvlinesize);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2070
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2071 for(i=0; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2072 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
2073 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
2074 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2075 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2076 h->block_offset[16+i]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2077 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
2078 h->block_offset[24+16+i]=
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2079 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
2080 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2081
2416
06b7d678b582 10l: scratchpad could be allocated before its size was known.
lorenm
parents: 2415
diff changeset
2082 /* 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
2083 * FIXME: redo bipred weight to not require extra buffer? */
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2084 for(i = 0; i < s->avctx->thread_count; i++)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2085 if(!h->thread_context[i]->s.obmc_scratchpad)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2086 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
2087
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2088 /* some macroblocks will be accessed before they're available */
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2089 if(FRAME_MBAFF || s->avctx->thread_count > 1)
8079
2d3c7cd7d143 Replace literally hardcoded max slice number by named constant.
michael
parents: 8042
diff changeset
2090 memset(h->slice_table, -1, (s->mb_height*s->mb_stride-1) * sizeof(*h->slice_table));
2416
06b7d678b582 10l: scratchpad could be allocated before its size was known.
lorenm
parents: 2415
diff changeset
2091
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2092 // s->decode= (s->flags&CODEC_FLAG_PSNR) || !s->encoding || s->current_picture.reference /*|| h->contains_intra*/ || 1;
7318
cd231f79c52b Try to fix my latest 100l fate SVQ3 breakage.
michael
parents: 7317
diff changeset
2093
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
2094 // We mark the current picture as non-reference after allocating it, so
7318
cd231f79c52b Try to fix my latest 100l fate SVQ3 breakage.
michael
parents: 7317
diff changeset
2095 // that if we break out due to an error it can be released automatically
cd231f79c52b Try to fix my latest 100l fate SVQ3 breakage.
michael
parents: 7317
diff changeset
2096 // in the next MPV_frame_start().
cd231f79c52b Try to fix my latest 100l fate SVQ3 breakage.
michael
parents: 7317
diff changeset
2097 // SVQ3 as well as most other codecs have only last/next/current and thus
cd231f79c52b Try to fix my latest 100l fate SVQ3 breakage.
michael
parents: 7317
diff changeset
2098 // get released even with set reference, besides SVQ3 and others do not
cd231f79c52b Try to fix my latest 100l fate SVQ3 breakage.
michael
parents: 7317
diff changeset
2099 // mark frames as reference later "naturally".
cd231f79c52b Try to fix my latest 100l fate SVQ3 breakage.
michael
parents: 7317
diff changeset
2100 if(s->codec_id != CODEC_ID_SVQ3)
cd231f79c52b Try to fix my latest 100l fate SVQ3 breakage.
michael
parents: 7317
diff changeset
2101 s->current_picture_ptr->reference= 0;
7382
f9e70983fc35 Set field_poc (it was half uninitialized before) and use it
michael
parents: 7381
diff changeset
2102
f9e70983fc35 Set field_poc (it was half uninitialized before) and use it
michael
parents: 7381
diff changeset
2103 s->current_picture_ptr->field_poc[0]=
f9e70983fc35 Set field_poc (it was half uninitialized before) and use it
michael
parents: 7381
diff changeset
2104 s->current_picture_ptr->field_poc[1]= INT_MAX;
7386
00b1f0ecb386 Assert that long_ref has been cleared for released pics.
michael
parents: 7385
diff changeset
2105 assert(s->current_picture_ptr->long_ref==0);
7382
f9e70983fc35 Set field_poc (it was half uninitialized before) and use it
michael
parents: 7381
diff changeset
2106
2935
b564bb15e63c check MPV_frame_start() return value
michael
parents: 2928
diff changeset
2107 return 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2108 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2109
5106
ddb5abe164f3 h264: use 'simple' in border backup / xchg
benoit
parents: 5093
diff changeset
2110 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
2111 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
2112 int i;
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2113 int step = 1;
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2114 int offset = 1;
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2115 int uvoffset= 1;
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2116 int top_idx = 1;
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2117 int skiplast= 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2118
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2119 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
2120 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
2121 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
2122
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2123 if(!simple && FRAME_MBAFF){
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2124 if(s->mb_y&1){
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2125 offset = MB_MBAFF ? 1 : 17;
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2126 uvoffset= MB_MBAFF ? 1 : 9;
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2127 if(!MB_MBAFF){
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2128 *(uint64_t*)(h->top_borders[0][s->mb_x]+ 0)= *(uint64_t*)(src_y + 15*linesize);
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2129 *(uint64_t*)(h->top_borders[0][s->mb_x]+ 8)= *(uint64_t*)(src_y +8+15*linesize);
8596
68e959302527 replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents: 8590
diff changeset
2130 if(simple || !CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2131 *(uint64_t*)(h->top_borders[0][s->mb_x]+16)= *(uint64_t*)(src_cb+7*uvlinesize);
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2132 *(uint64_t*)(h->top_borders[0][s->mb_x]+24)= *(uint64_t*)(src_cr+7*uvlinesize);
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2133 }
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2134 }
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2135 }else{
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2136 if(!MB_MBAFF){
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2137 h->left_border[0]= h->top_borders[0][s->mb_x][15];
8596
68e959302527 replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents: 8590
diff changeset
2138 if(simple || !CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2139 h->left_border[34 ]= h->top_borders[0][s->mb_x][16+7 ];
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2140 h->left_border[34+18]= h->top_borders[0][s->mb_x][16+8+7];
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2141 }
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2142 skiplast= 1;
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2143 }
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2144 offset =
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2145 uvoffset=
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2146 top_idx = MB_MBAFF ? 0 : 1;
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2147 }
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2148 step= MB_MBAFF ? 2 : 1;
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2149 }
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2150
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
2151 // 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
2152 // and the line above the bottom macroblock
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2153 h->left_border[offset]= h->top_borders[top_idx][s->mb_x][15];
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2154 for(i=1; i<17 - skiplast; i++){
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2155 h->left_border[offset+i*step]= src_y[15+i* linesize];
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2156 }
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2157
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2158 *(uint64_t*)(h->top_borders[top_idx][s->mb_x]+0)= *(uint64_t*)(src_y + 16*linesize);
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2159 *(uint64_t*)(h->top_borders[top_idx][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
2160
8596
68e959302527 replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents: 8590
diff changeset
2161 if(simple || !CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2162 h->left_border[uvoffset+34 ]= h->top_borders[top_idx][s->mb_x][16+7];
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2163 h->left_border[uvoffset+34+18]= h->top_borders[top_idx][s->mb_x][24+7];
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2164 for(i=1; i<9 - skiplast; i++){
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2165 h->left_border[uvoffset+34 +i*step]= src_cb[7+i*uvlinesize];
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2166 h->left_border[uvoffset+34+18+i*step]= src_cr[7+i*uvlinesize];
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2167 }
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2168 *(uint64_t*)(h->top_borders[top_idx][s->mb_x]+16)= *(uint64_t*)(src_cb+8*uvlinesize);
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2169 *(uint64_t*)(h->top_borders[top_idx][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
2170 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2171 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2172
5106
ddb5abe164f3 h264: use 'simple' in border backup / xchg
benoit
parents: 5093
diff changeset
2173 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
2174 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
2175 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
2176 uint64_t temp64;
5177
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2177 int deblock_left;
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2178 int deblock_top;
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2179 int mb_xy;
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2180 int step = 1;
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2181 int offset = 1;
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2182 int uvoffset= 1;
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2183 int top_idx = 1;
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2184
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2185 if(!simple && FRAME_MBAFF){
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2186 if(s->mb_y&1){
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2187 offset = MB_MBAFF ? 1 : 17;
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2188 uvoffset= MB_MBAFF ? 1 : 9;
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2189 }else{
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2190 offset =
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2191 uvoffset=
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2192 top_idx = MB_MBAFF ? 0 : 1;
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2193 }
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2194 step= MB_MBAFF ? 2 : 1;
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2195 }
5177
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2196
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2197 if(h->deblocking_filter == 2) {
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
2198 mb_xy = h->mb_xy;
5177
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2199 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
2200 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
2201 } else {
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2202 deblock_left = (s->mb_x > 0);
7926
224dea3d9ac8 Avoid out of picture accesses when CODEC_FLAG_EMU_EDGE is set.
michael
parents: 7923
diff changeset
2203 deblock_top = (s->mb_y > !!MB_FIELD);
5177
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2204 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2205
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2206 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
2207 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
2208 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
2209
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2210 #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
2211 t= a;\
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2212 if(xchg)\
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2213 a= b;\
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2214 b= t;
2200
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2215
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2216 if(deblock_left){
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2217 for(i = !deblock_top; i<16; i++){
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2218 XCHG(h->left_border[offset+i*step], src_y [i* linesize], temp8, xchg);
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2219 }
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2220 XCHG(h->left_border[offset+i*step], src_y [i* linesize], temp8, 1);
2200
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2221 }
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2222
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2223 if(deblock_top){
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2224 XCHG(*(uint64_t*)(h->top_borders[top_idx][s->mb_x]+0), *(uint64_t*)(src_y +1), temp64, xchg);
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2225 XCHG(*(uint64_t*)(h->top_borders[top_idx][s->mb_x]+8), *(uint64_t*)(src_y +9), temp64, 1);
2803
26970df644f1 Add missing +1 in bounds check.
reimar
parents: 2793
diff changeset
2226 if(s->mb_x+1 < s->mb_width){
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2227 XCHG(*(uint64_t*)(h->top_borders[top_idx][s->mb_x+1]), *(uint64_t*)(src_y +17), temp64, 1);
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2228 }
2200
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2229 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2230
8596
68e959302527 replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents: 8590
diff changeset
2231 if(simple || !CONFIG_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
2232 if(deblock_left){
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2233 for(i = !deblock_top; i<8; i++){
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2234 XCHG(h->left_border[uvoffset+34 +i*step], src_cb[i*uvlinesize], temp8, xchg);
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2235 XCHG(h->left_border[uvoffset+34+18+i*step], src_cr[i*uvlinesize], temp8, xchg);
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2236 }
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2237 XCHG(h->left_border[uvoffset+34 +i*step], src_cb[i*uvlinesize], temp8, 1);
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2238 XCHG(h->left_border[uvoffset+34+18+i*step], src_cr[i*uvlinesize], temp8, 1);
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2239 }
2200
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2240 if(deblock_top){
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2241 XCHG(*(uint64_t*)(h->top_borders[top_idx][s->mb_x]+16), *(uint64_t*)(src_cb+1), temp64, 1);
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2242 XCHG(*(uint64_t*)(h->top_borders[top_idx][s->mb_x]+24), *(uint64_t*)(src_cr+1), temp64, 1);
2200
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2243 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2244 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2245 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2246
4908
777f250df232 Fix multiple "inline/static is not at beginning of declaration" warnings.
diego
parents: 4896
diff changeset
2247 static av_always_inline void hl_decode_mb_internal(H264Context *h, int simple){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2248 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2249 const int mb_x= s->mb_x;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2250 const int mb_y= s->mb_y;
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
2251 const int mb_xy= h->mb_xy;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2252 const int mb_type= s->current_picture.mb_type[mb_xy];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2253 uint8_t *dest_y, *dest_cb, *dest_cr;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2254 int linesize, uvlinesize /*dct_offset*/;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2255 int i;
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2256 int *block_offset = &h->block_offset[0];
8352
82790b28b6e0 Support the new lossless mode.
michael
parents: 8330
diff changeset
2257 const int transform_bypass = !simple && (s->qscale == 0 && h->sps.transform_bypass);
8543
2cc3cf7b09b1 Disable SVQ3 checks if SVQ3 support is not compiled in.
diego
parents: 8525
diff changeset
2258 /* is_h264 should always be true if SVQ3 is disabled. */
8596
68e959302527 replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents: 8590
diff changeset
2259 const int is_h264 = !CONFIG_SVQ3_DECODER || simple || s->codec_id == CODEC_ID_H264;
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
2260 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
2261 void (*idct_dc_add)(uint8_t *dst, DCTELEM *block, int stride);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2262
8355
179f8e1327ce Factorize 3 multiplications out, code becomes 3 cpu cycles faster.
michael
parents: 8354
diff changeset
2263 dest_y = s->current_picture.data[0] + (mb_x + mb_y * s->linesize ) * 16;
179f8e1327ce Factorize 3 multiplications out, code becomes 3 cpu cycles faster.
michael
parents: 8354
diff changeset
2264 dest_cb = s->current_picture.data[1] + (mb_x + mb_y * s->uvlinesize) * 8;
179f8e1327ce Factorize 3 multiplications out, code becomes 3 cpu cycles faster.
michael
parents: 8354
diff changeset
2265 dest_cr = s->current_picture.data[2] + (mb_x + mb_y * s->uvlinesize) * 8;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2266
4000
eeab02251056 more prefetches, 2% faster h264
lorenm
parents: 3993
diff changeset
2267 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
2268 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
2269
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2270 if (!simple && MB_FIELD) {
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2271 linesize = h->mb_linesize = s->linesize * 2;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2272 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
2273 block_offset = &h->block_offset[24];
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
2274 if(mb_y&1){ //FIXME move out of this function?
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2275 dest_y -= s->linesize*15;
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2276 dest_cb-= s->uvlinesize*7;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2277 dest_cr-= s->uvlinesize*7;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2278 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2279 if(FRAME_MBAFF) {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2280 int list;
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
2281 for(list=0; list<h->list_count; list++){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2282 if(!USES_LIST(mb_type, list))
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2283 continue;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2284 if(IS_16X16(mb_type)){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2285 int8_t *ref = &h->ref_cache[list][scan8[0]];
6203
c9433472cb95 Fix the following warnings:
andoma
parents: 6193
diff changeset
2286 fill_rectangle(ref, 4, 4, 8, (16+*ref)^(s->mb_y&1), 1);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2287 }else{
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2288 for(i=0; i<16; i+=4){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2289 int ref = h->ref_cache[list][scan8[i]];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2290 if(ref >= 0)
6203
c9433472cb95 Fix the following warnings:
andoma
parents: 6193
diff changeset
2291 fill_rectangle(&h->ref_cache[list][scan8[i]], 2, 2, 8, (16+ref)^(s->mb_y&1), 1);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2292 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2293 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2294 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2295 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2296 } else {
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2297 linesize = h->mb_linesize = s->linesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2298 uvlinesize = h->mb_uvlinesize = s->uvlinesize;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2299 // dct_offset = s->linesize * 16;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2300 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2301
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2302 if (!simple && IS_INTRA_PCM(mb_type)) {
7450
30d38a880fde Simplify intra PCM MB handling.
michael
parents: 7445
diff changeset
2303 for (i=0; i<16; i++) {
30d38a880fde Simplify intra PCM MB handling.
michael
parents: 7445
diff changeset
2304 memcpy(dest_y + i* linesize, h->mb + i*8, 16);
30d38a880fde Simplify intra PCM MB handling.
michael
parents: 7445
diff changeset
2305 }
30d38a880fde Simplify intra PCM MB handling.
michael
parents: 7445
diff changeset
2306 for (i=0; i<8; i++) {
30d38a880fde Simplify intra PCM MB handling.
michael
parents: 7445
diff changeset
2307 memcpy(dest_cb+ i*uvlinesize, h->mb + 128 + i*4, 8);
30d38a880fde Simplify intra PCM MB handling.
michael
parents: 7445
diff changeset
2308 memcpy(dest_cr+ i*uvlinesize, h->mb + 160 + i*4, 8);
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2309 }
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2310 } else {
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2311 if(IS_INTRA(mb_type)){
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2312 if(h->deblocking_filter)
5106
ddb5abe164f3 h264: use 'simple' in border backup / xchg
benoit
parents: 5093
diff changeset
2313 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
2314
8596
68e959302527 replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents: 8590
diff changeset
2315 if(simple || !CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
5638
4a26dc4ca11d Move H.264 intra prediction functions into their own context
kostya
parents: 5631
diff changeset
2316 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
2317 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
2318 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2319
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2320 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
2321 if(simple || !s->encoding){
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2322 if(IS_8x8DCT(mb_type)){
8379
be5e0a75b457 Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents: 8378
diff changeset
2323 if(transform_bypass){
be5e0a75b457 Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents: 8378
diff changeset
2324 idct_dc_add =
be5e0a75b457 Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents: 8378
diff changeset
2325 idct_add = s->dsp.add_pixels8;
8382
fe7d1c920aeb Remove useless IS_8x8DCT check i forgot, spotted by dark shikari.
michael
parents: 8379
diff changeset
2326 }else{
8379
be5e0a75b457 Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents: 8378
diff changeset
2327 idct_dc_add = s->dsp.h264_idct8_dc_add;
be5e0a75b457 Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents: 8378
diff changeset
2328 idct_add = s->dsp.h264_idct8_add;
be5e0a75b457 Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents: 8378
diff changeset
2329 }
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2330 for(i=0; i<16; i+=4){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2331 uint8_t * const ptr= dest_y + block_offset[i];
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2332 const int dir= h->intra4x4_pred_mode_cache[ scan8[i] ];
8352
82790b28b6e0 Support the new lossless mode.
michael
parents: 8330
diff changeset
2333 if(transform_bypass && h->sps.profile_idc==244 && dir<=1){
82790b28b6e0 Support the new lossless mode.
michael
parents: 8330
diff changeset
2334 h->hpc.pred8x8l_add[dir](ptr, h->mb + i*16, linesize);
82790b28b6e0 Support the new lossless mode.
michael
parents: 8330
diff changeset
2335 }else{
8357
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
2336 const int nnz = h->non_zero_count_cache[ scan8[i] ];
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
2337 h->hpc.pred8x8l[ dir ](ptr, (h->topleft_samples_available<<i)&0x8000,
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
2338 (h->topright_samples_available<<i)&0x4000, linesize);
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
2339 if(nnz){
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
2340 if(nnz == 1 && h->mb[i*16])
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
2341 idct_dc_add(ptr, h->mb + i*16, linesize);
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
2342 else
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
2343 idct_add (ptr, h->mb + i*16, linesize);
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
2344 }
8352
82790b28b6e0 Support the new lossless mode.
michael
parents: 8330
diff changeset
2345 }
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2346 }
8379
be5e0a75b457 Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents: 8378
diff changeset
2347 }else{
be5e0a75b457 Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents: 8378
diff changeset
2348 if(transform_bypass){
be5e0a75b457 Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents: 8378
diff changeset
2349 idct_dc_add =
be5e0a75b457 Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents: 8378
diff changeset
2350 idct_add = s->dsp.add_pixels4;
be5e0a75b457 Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents: 8378
diff changeset
2351 }else{
be5e0a75b457 Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents: 8378
diff changeset
2352 idct_dc_add = s->dsp.h264_idct_dc_add;
be5e0a75b457 Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents: 8378
diff changeset
2353 idct_add = s->dsp.h264_idct_add;
be5e0a75b457 Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents: 8378
diff changeset
2354 }
8389
michael
parents: 8388
diff changeset
2355 for(i=0; i<16; i++){
michael
parents: 8388
diff changeset
2356 uint8_t * const ptr= dest_y + block_offset[i];
michael
parents: 8388
diff changeset
2357 const int dir= h->intra4x4_pred_mode_cache[ scan8[i] ];
michael
parents: 8388
diff changeset
2358
michael
parents: 8388
diff changeset
2359 if(transform_bypass && h->sps.profile_idc==244 && dir<=1){
michael
parents: 8388
diff changeset
2360 h->hpc.pred4x4_add[dir](ptr, h->mb + i*16, linesize);
michael
parents: 8388
diff changeset
2361 }else{
michael
parents: 8388
diff changeset
2362 uint8_t *topright;
michael
parents: 8388
diff changeset
2363 int nnz, tr;
michael
parents: 8388
diff changeset
2364 if(dir == DIAG_DOWN_LEFT_PRED || dir == VERT_LEFT_PRED){
michael
parents: 8388
diff changeset
2365 const int topright_avail= (h->topright_samples_available<<i)&0x8000;
michael
parents: 8388
diff changeset
2366 assert(mb_y || linesize <= block_offset[i]);
michael
parents: 8388
diff changeset
2367 if(!topright_avail){
michael
parents: 8388
diff changeset
2368 tr= ptr[3 - linesize]*0x01010101;
michael
parents: 8388
diff changeset
2369 topright= (uint8_t*) &tr;
michael
parents: 8388
diff changeset
2370 }else
michael
parents: 8388
diff changeset
2371 topright= ptr + 4 - linesize;
8357
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
2372 }else
8389
michael
parents: 8388
diff changeset
2373 topright= NULL;
michael
parents: 8388
diff changeset
2374
michael
parents: 8388
diff changeset
2375 h->hpc.pred4x4[ dir ](ptr, topright, linesize);
michael
parents: 8388
diff changeset
2376 nnz = h->non_zero_count_cache[ scan8[i] ];
michael
parents: 8388
diff changeset
2377 if(nnz){
michael
parents: 8388
diff changeset
2378 if(is_h264){
michael
parents: 8388
diff changeset
2379 if(nnz == 1 && h->mb[i*16])
michael
parents: 8388
diff changeset
2380 idct_dc_add(ptr, h->mb + i*16, linesize);
michael
parents: 8388
diff changeset
2381 else
michael
parents: 8388
diff changeset
2382 idct_add (ptr, h->mb + i*16, linesize);
michael
parents: 8388
diff changeset
2383 }else
michael
parents: 8388
diff changeset
2384 svq3_add_idct_c(ptr, h->mb + i*16, linesize, s->qscale, 0);
michael
parents: 8388
diff changeset
2385 }
8357
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
2386 }
8352
82790b28b6e0 Support the new lossless mode.
michael
parents: 8330
diff changeset
2387 }
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2388 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2389 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2390 }else{
5638
4a26dc4ca11d Move H.264 intra prediction functions into their own context
kostya
parents: 5631
diff changeset
2391 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
2392 if(is_h264){
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
2393 if(!transform_bypass)
5727
0591d5928fe8 Remove redundant test.
takis
parents: 5723
diff changeset
2394 h264_luma_dc_dequant_idct_c(h->mb, s->qscale, h->dequant4_coeff[0][s->qscale][0]);
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
2395 }else
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2396 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
2397 }
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2398 if(h->deblocking_filter)
5106
ddb5abe164f3 h264: use 'simple' in border backup / xchg
benoit
parents: 5093
diff changeset
2399 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
2400 }else if(is_h264){
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2401 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
2402 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
2403 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
2404 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
2405 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2406
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2407
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2408 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
2409 if(is_h264){
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2410 if(IS_INTRA16x16(mb_type)){
8376
e1b242224970 Use the new idct functions (except chroma as it was slower in benchmarks)
michael
parents: 8374
diff changeset
2411 if(transform_bypass){
e1b242224970 Use the new idct functions (except chroma as it was slower in benchmarks)
michael
parents: 8374
diff changeset
2412 if(h->sps.profile_idc==244 && (h->intra16x16_pred_mode==VERT_PRED8x8 || h->intra16x16_pred_mode==HOR_PRED8x8)){
8377
michael
parents: 8376
diff changeset
2413 h->hpc.pred16x16_add[h->intra16x16_pred_mode](dest_y, block_offset, h->mb, linesize);
michael
parents: 8376
diff changeset
2414 }else{
michael
parents: 8376
diff changeset
2415 for(i=0; i<16; i++){
michael
parents: 8376
diff changeset
2416 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16])
8379
be5e0a75b457 Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents: 8378
diff changeset
2417 s->dsp.add_pixels4(dest_y + block_offset[i], h->mb + i*16, linesize);
8377
michael
parents: 8376
diff changeset
2418 }
8357
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
2419 }
8376
e1b242224970 Use the new idct functions (except chroma as it was slower in benchmarks)
michael
parents: 8374
diff changeset
2420 }else{
e1b242224970 Use the new idct functions (except chroma as it was slower in benchmarks)
michael
parents: 8374
diff changeset
2421 s->dsp.h264_idct_add16intra(dest_y, block_offset, h->mb, linesize, h->non_zero_count_cache);
8352
82790b28b6e0 Support the new lossless mode.
michael
parents: 8330
diff changeset
2422 }
8374
9000fd7c166e Skip non intra luma code when there is no coded luma.
michael
parents: 8372
diff changeset
2423 }else if(h->cbp&15){
8376
e1b242224970 Use the new idct functions (except chroma as it was slower in benchmarks)
michael
parents: 8374
diff changeset
2424 if(transform_bypass){
8377
michael
parents: 8376
diff changeset
2425 const int di = IS_8x8DCT(mb_type) ? 4 : 1;
8379
be5e0a75b457 Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents: 8378
diff changeset
2426 idct_add= IS_8x8DCT(mb_type) ? s->dsp.add_pixels8 : s->dsp.add_pixels4;
8377
michael
parents: 8376
diff changeset
2427 for(i=0; i<16; i+=di){
8378
9c6512be76b4 Remove redundant nnz variable.
michael
parents: 8377
diff changeset
2428 if(h->non_zero_count_cache[ scan8[i] ]){
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2429 idct_add(dest_y + block_offset[i], h->mb + i*16, linesize);
8377
michael
parents: 8376
diff changeset
2430 }
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2431 }
8376
e1b242224970 Use the new idct functions (except chroma as it was slower in benchmarks)
michael
parents: 8374
diff changeset
2432 }else{
e1b242224970 Use the new idct functions (except chroma as it was slower in benchmarks)
michael
parents: 8374
diff changeset
2433 if(IS_8x8DCT(mb_type)){
e1b242224970 Use the new idct functions (except chroma as it was slower in benchmarks)
michael
parents: 8374
diff changeset
2434 s->dsp.h264_idct8_add4(dest_y, block_offset, h->mb, linesize, h->non_zero_count_cache);
e1b242224970 Use the new idct functions (except chroma as it was slower in benchmarks)
michael
parents: 8374
diff changeset
2435 }else{
e1b242224970 Use the new idct functions (except chroma as it was slower in benchmarks)
michael
parents: 8374
diff changeset
2436 s->dsp.h264_idct_add16(dest_y, block_offset, h->mb, linesize, h->non_zero_count_cache);
e1b242224970 Use the new idct functions (except chroma as it was slower in benchmarks)
michael
parents: 8374
diff changeset
2437 }
e1b242224970 Use the new idct functions (except chroma as it was slower in benchmarks)
michael
parents: 8374
diff changeset
2438 }
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2439 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2440 }else{
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2441 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
2442 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
2443 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
2444 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
2445 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2446 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2447 }
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2448 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2449
8596
68e959302527 replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents: 8590
diff changeset
2450 if((simple || !CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY)) && (h->cbp&0x30)){
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2451 uint8_t *dest[2] = {dest_cb, dest_cr};
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2452 if(transform_bypass){
8388
9eb29759df54 Reorder ifs in chroma hl_decode_mb to avoid a duplicate transform_bypass
michael
parents: 8387
diff changeset
2453 if(IS_INTRA(mb_type) && h->sps.profile_idc==244 && (h->chroma_pred_mode==VERT_PRED8x8 || h->chroma_pred_mode==HOR_PRED8x8)){
9eb29759df54 Reorder ifs in chroma hl_decode_mb to avoid a duplicate transform_bypass
michael
parents: 8387
diff changeset
2454 h->hpc.pred8x8_add[h->chroma_pred_mode](dest[0], block_offset + 16, h->mb + 16*16, uvlinesize);
9eb29759df54 Reorder ifs in chroma hl_decode_mb to avoid a duplicate transform_bypass
michael
parents: 8387
diff changeset
2455 h->hpc.pred8x8_add[h->chroma_pred_mode](dest[1], block_offset + 20, h->mb + 20*16, uvlinesize);
9eb29759df54 Reorder ifs in chroma hl_decode_mb to avoid a duplicate transform_bypass
michael
parents: 8387
diff changeset
2456 }else{
8390
31f8d52753e4 Move idct_(dc)add closer to where it is needed.
michael
parents: 8389
diff changeset
2457 idct_add = s->dsp.add_pixels4;
8388
9eb29759df54 Reorder ifs in chroma hl_decode_mb to avoid a duplicate transform_bypass
michael
parents: 8387
diff changeset
2458 for(i=16; i<16+8; i++){
9eb29759df54 Reorder ifs in chroma hl_decode_mb to avoid a duplicate transform_bypass
michael
parents: 8387
diff changeset
2459 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16])
9eb29759df54 Reorder ifs in chroma hl_decode_mb to avoid a duplicate transform_bypass
michael
parents: 8387
diff changeset
2460 idct_add (dest[(i&4)>>2] + block_offset[i], h->mb + i*16, uvlinesize);
9eb29759df54 Reorder ifs in chroma hl_decode_mb to avoid a duplicate transform_bypass
michael
parents: 8387
diff changeset
2461 }
9eb29759df54 Reorder ifs in chroma hl_decode_mb to avoid a duplicate transform_bypass
michael
parents: 8387
diff changeset
2462 }
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2463 }else{
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
2464 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
2465 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]);
8389
michael
parents: 8388
diff changeset
2466 if(is_h264){
8390
31f8d52753e4 Move idct_(dc)add closer to where it is needed.
michael
parents: 8389
diff changeset
2467 idct_add = s->dsp.h264_idct_add;
31f8d52753e4 Move idct_(dc)add closer to where it is needed.
michael
parents: 8389
diff changeset
2468 idct_dc_add = s->dsp.h264_idct_dc_add;
8357
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
2469 for(i=16; i<16+8; i++){
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
2470 if(h->non_zero_count_cache[ scan8[i] ])
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
2471 idct_add (dest[(i&4)>>2] + block_offset[i], h->mb + i*16, uvlinesize);
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
2472 else if(h->mb[i*16])
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
2473 idct_dc_add(dest[(i&4)>>2] + block_offset[i], h->mb + i*16, uvlinesize);
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
2474 }
8389
michael
parents: 8388
diff changeset
2475 }else{
michael
parents: 8388
diff changeset
2476 for(i=16; i<16+8; i++){
michael
parents: 8388
diff changeset
2477 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){
michael
parents: 8388
diff changeset
2478 uint8_t * const ptr= dest[(i&4)>>2] + block_offset[i];
michael
parents: 8388
diff changeset
2479 svq3_add_idct_c(ptr, h->mb + i*16, uvlinesize, chroma_qp[s->qscale + 12] - 12, 2);
michael
parents: 8388
diff changeset
2480 }
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2481 }
1250
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
2482 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2483 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2484 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2485 }
8415
938824a1f42f Only execute clear_blocks() when needed.
michael
parents: 8411
diff changeset
2486 if(h->cbp || IS_INTRA(mb_type))
938824a1f42f Only execute clear_blocks() when needed.
michael
parents: 8411
diff changeset
2487 s->dsp.clear_blocks(h->mb);
938824a1f42f Only execute clear_blocks() when needed.
michael
parents: 8411
diff changeset
2488
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2489 if(h->deblocking_filter) {
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2490 backup_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, simple);
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2491 fill_caches(h, mb_type, 1); //FIXME don't fill stuff which isn't used by filter_mb
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2492 h->chroma_qp[0] = get_chroma_qp(h, 0, s->current_picture.qscale_table[mb_xy]);
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2493 h->chroma_qp[1] = get_chroma_qp(h, 1, s->current_picture.qscale_table[mb_xy]);
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2494 if (!simple && FRAME_MBAFF) {
10854
f6fc6ace95e3 Split h264 loop filter off h264.c.
michael
parents: 10852
diff changeset
2495 ff_h264_filter_mb (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
2496 } else {
10854
f6fc6ace95e3 Split h264 loop filter off h264.c.
michael
parents: 10852
diff changeset
2497 ff_h264_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
2498 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2499 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2500 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2501
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2502 /**
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2503 * 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
2504 */
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2505 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
2506 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
2507 }
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2508
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2509 /**
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2510 * 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
2511 */
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2512 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
2513 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
2514 }
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2515
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
2516 void ff_h264_hl_decode_mb(H264Context *h){
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2517 MpegEncContext * const s = &h->s;
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
2518 const int mb_xy= h->mb_xy;
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2519 const int mb_type= s->current_picture.mb_type[mb_xy];
8596
68e959302527 replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents: 8590
diff changeset
2520 int is_complex = CONFIG_SMALL || h->is_complex || IS_INTRA_PCM(mb_type) || s->qscale == 0;
68e959302527 replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents: 8590
diff changeset
2521
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2522 if (is_complex)
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2523 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
2524 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
2525 }
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2526
5825
18859ffa5705 Fix chroma mv offsets for PAFF in a way that is compatible with MBAFF by
cehoyos
parents: 5822
diff changeset
2527 static void pic_as_field(Picture *pic, const int parity){
5778
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2528 int i;
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2529 for (i = 0; i < 4; ++i) {
5825
18859ffa5705 Fix chroma mv offsets for PAFF in a way that is compatible with MBAFF by
cehoyos
parents: 5822
diff changeset
2530 if (parity == PICT_BOTTOM_FIELD)
5778
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2531 pic->data[i] += pic->linesize[i];
5825
18859ffa5705 Fix chroma mv offsets for PAFF in a way that is compatible with MBAFF by
cehoyos
parents: 5822
diff changeset
2532 pic->reference = parity;
5778
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2533 pic->linesize[i] *= 2;
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2534 }
7462
5cbf11f56c02 Picture.ref_count/ref_poc have to be stored per field (actually also per
michael
parents: 7450
diff changeset
2535 pic->poc= pic->field_poc[parity == PICT_BOTTOM_FIELD];
5778
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2536 }
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2537
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2538 static int split_field_copy(Picture *dest, Picture *src,
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2539 int parity, int id_add){
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2540 int match = !!(src->reference & parity);
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2541
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2542 if (match) {
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2543 *dest = *src;
7398
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2544 if(parity != PICT_FRAME){
7399
michael
parents: 7398
diff changeset
2545 pic_as_field(dest, parity);
michael
parents: 7398
diff changeset
2546 dest->pic_id *= 2;
michael
parents: 7398
diff changeset
2547 dest->pic_id += id_add;
7398
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2548 }
5778
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2549 }
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2550
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2551 return match;
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2552 }
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2553
7398
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2554 static int build_def_list(Picture *def, Picture **in, int len, int is_long, int sel){
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2555 int i[2]={0};
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2556 int index=0;
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2557
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2558 while(i[0]<len || i[1]<len){
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2559 while(i[0]<len && !(in[ i[0] ] && (in[ i[0] ]->reference & sel)))
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2560 i[0]++;
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2561 while(i[1]<len && !(in[ i[1] ] && (in[ i[1] ]->reference & (sel^3))))
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2562 i[1]++;
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2563 if(i[0] < len){
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2564 in[ i[0] ]->pic_id= is_long ? i[0] : in[ i[0] ]->frame_num;
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2565 split_field_copy(&def[index++], in[ i[0]++ ], sel , 1);
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2566 }
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2567 if(i[1] < len){
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2568 in[ i[1] ]->pic_id= is_long ? i[1] : in[ i[1] ]->frame_num;
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2569 split_field_copy(&def[index++], in[ i[1]++ ], sel^3, 0);
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2570 }
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2571 }
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2572
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2573 return index;
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2574 }
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2575
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2576 static int add_sorted(Picture **sorted, Picture **src, int len, int limit, int dir){
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2577 int i, best_poc;
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2578 int out_i= 0;
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2579
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2580 for(;;){
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2581 best_poc= dir ? INT_MIN : INT_MAX;
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2582
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2583 for(i=0; i<len; i++){
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2584 const int poc= src[i]->poc;
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2585 if(((poc > limit) ^ dir) && ((poc < best_poc) ^ dir)){
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2586 best_poc= poc;
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2587 sorted[out_i]= src[i];
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2588 }
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2589 }
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2590 if(best_poc == (dir ? INT_MIN : INT_MAX))
5778
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2591 break;
7398
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2592 limit= sorted[out_i++]->poc - dir;
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2593 }
5778
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2594 return out_i;
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2595 }
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2596
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2597 /**
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2598 * fills the default_ref_list.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2599 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2600 static int fill_default_ref_list(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2601 MpegEncContext * const s = &h->s;
7398
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2602 int i, len;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2603
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
2604 if(h->slice_type_nos==FF_B_TYPE){
7398
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2605 Picture *sorted[32];
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2606 int cur_poc, list;
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2607 int lens[2];
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2608
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2609 if(FIELD_PICTURE)
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2610 cur_poc= s->current_picture_ptr->field_poc[ s->picture_structure == PICT_BOTTOM_FIELD ];
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2611 else
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2612 cur_poc= s->current_picture_ptr->poc;
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2613
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2614 for(list= 0; list<2; list++){
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2615 len= add_sorted(sorted , h->short_ref, h->short_ref_count, cur_poc, 1^list);
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2616 len+=add_sorted(sorted+len, h->short_ref, h->short_ref_count, cur_poc, 0^list);
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2617 assert(len<=32);
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2618 len= build_def_list(h->default_ref_list[list] , sorted , len, 0, s->picture_structure);
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2619 len+=build_def_list(h->default_ref_list[list]+len, h->long_ref, 16 , 1, s->picture_structure);
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2620 assert(len<=32);
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2621
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2622 if(len < h->ref_count[list])
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2623 memset(&h->default_ref_list[list][len], 0, sizeof(Picture)*(h->ref_count[list] - len));
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2624 lens[list]= len;
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2625 }
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2626
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2627 if(lens[0] == lens[1] && lens[1] > 1){
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2628 for(i=0; h->default_ref_list[0][i].data[0] == h->default_ref_list[1][i].data[0] && i<lens[0]; i++);
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2629 if(i == lens[0])
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2630 FFSWAP(Picture, h->default_ref_list[1][0], h->default_ref_list[1][1]);
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2631 }
5779
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2632 }else{
7398
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2633 len = build_def_list(h->default_ref_list[0] , h->short_ref, h->short_ref_count, 0, s->picture_structure);
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2634 len+= build_def_list(h->default_ref_list[0]+len, h-> long_ref, 16 , 1, s->picture_structure);
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2635 assert(len <= 32);
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2636 if(len < h->ref_count[0])
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2637 memset(&h->default_ref_list[0][len], 0, sizeof(Picture)*(h->ref_count[0] - len));
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2638 }
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
2639 #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
2640 for (i=0; i<h->ref_count[0]; i++) {
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
2641 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
2642 }
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
2643 if(h->slice_type_nos==FF_B_TYPE){
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
2644 for (i=0; i<h->ref_count[1]; i++) {
6311
985f4195bb69 "swap first two elements of L1 if L0 and L1 are identical" applies after splitting the lists into fields
lorenm
parents: 6310
diff changeset
2645 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[1][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
2646 }
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
2647 }
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
2648 #endif
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2649 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2650 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2651
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
2652 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
2653 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
2654
5780
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2655 /**
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2656 * Extract structure information about the picture described by pic_num in
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2657 * the current decoding context (frame or field). Note that pic_num is
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2658 * picture number without wrapping (so, 0<=pic_num<max_pic_num).
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2659 * @param pic_num picture number for which to extract structure information
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2660 * @param structure one of PICT_XXX describing structure of picture
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2661 * with pic_num
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2662 * @return frame number (short term) or long term index of picture
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2663 * described by pic_num
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2664 */
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2665 static int pic_num_extract(H264Context *h, int pic_num, int *structure){
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2666 MpegEncContext * const s = &h->s;
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2667
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2668 *structure = s->picture_structure;
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2669 if(FIELD_PICTURE){
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2670 if (!(pic_num & 1))
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2671 /* opposite field */
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2672 *structure ^= PICT_FRAME;
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2673 pic_num >>= 1;
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2674 }
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2675
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2676 return pic_num;
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2677 }
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2678
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2679 static int decode_ref_pic_list_reordering(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2680 MpegEncContext * const s = &h->s;
5780
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2681 int list, index, pic_structure;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2682
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
2683 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
2684 print_long_term(h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2685
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
2686 for(list=0; list<h->list_count; list++){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2687 memcpy(h->ref_list[list], h->default_ref_list[list], sizeof(Picture)*h->ref_count[list]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2688
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2689 if(get_bits1(&s->gb)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2690 int pred= h->curr_pic_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2691
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2692 for(index=0; ; index++){
8451
384600e3fe5b Use get_ue_golomb_31() where possible, almost all are just in headers
michael
parents: 8448
diff changeset
2693 unsigned int reordering_of_pic_nums_idc= get_ue_golomb_31(&s->gb);
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
2694 unsigned int pic_id;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2695 int i;
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
2696 Picture *ref = NULL;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2697
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2698 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
2699 break;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2700
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2701 if(index >= h->ref_count[list]){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
2702 av_log(h->s.avctx, AV_LOG_ERROR, "reference count overflow\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2703 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2704 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2705
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2706 if(reordering_of_pic_nums_idc<3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2707 if(reordering_of_pic_nums_idc<2){
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
2708 const unsigned int abs_diff_pic_num= get_ue_golomb(&s->gb) + 1;
5780
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2709 int frame_num;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2710
5805
12b1717f80a3 fix incorrect check for abs_diff_pic_num overflow
andoma
parents: 5803
diff changeset
2711 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
2712 av_log(h->s.avctx, AV_LOG_ERROR, "abs_diff_pic_num overflow\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2713 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2714 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2715
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2716 if(reordering_of_pic_nums_idc == 0) pred-= abs_diff_pic_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2717 else pred+= abs_diff_pic_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2718 pred &= h->max_pic_num - 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2719
5780
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2720 frame_num = pic_num_extract(h, pred, &pic_structure);
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2721
2683
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
2722 for(i= h->short_ref_count-1; i>=0; i--){
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
2723 ref = h->short_ref[i];
5780
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2724 assert(ref->reference);
2683
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
2725 assert(!ref->long_ref);
7402
3c04b2988f19 Remove mysterious ref->data[0] check.
michael
parents: 7401
diff changeset
2726 if(
7405
dfe1d1d104eb Revert r14404
michael
parents: 7404
diff changeset
2727 ref->frame_num == frame_num &&
dfe1d1d104eb Revert r14404
michael
parents: 7404
diff changeset
2728 (ref->reference & pic_structure)
7402
3c04b2988f19 Remove mysterious ref->data[0] check.
michael
parents: 7401
diff changeset
2729 )
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2730 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2731 }
2683
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
2732 if(i>=0)
5780
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2733 ref->pic_id= pred;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2734 }else{
5780
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2735 int long_idx;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2736 pic_id= get_ue_golomb(&s->gb); //long_term_pic_idx
5780
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2737
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2738 long_idx= pic_num_extract(h, pic_id, &pic_structure);
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2739
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2740 if(long_idx>31){
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
2741 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
2742 return -1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
2743 }
5780
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2744 ref = h->long_ref[long_idx];
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2745 assert(!(ref && !ref->reference));
7405
dfe1d1d104eb Revert r14404
michael
parents: 7404
diff changeset
2746 if(ref && (ref->reference & pic_structure)){
4362
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
2747 ref->pic_id= pic_id;
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
2748 assert(ref->long_ref);
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
2749 i=0;
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
2750 }else{
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
2751 i=-1;
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
2752 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2753 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2754
2485
2844b8cf4e11 H.264 multiplce instance in reference list patch by (Loic <lll+ffmpeg m4x org )
michael
parents: 2484
diff changeset
2755 if (i < 0) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
2756 av_log(h->s.avctx, AV_LOG_ERROR, "reference picture missing during reorder\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2757 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
2758 } else {
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
2759 for(i=index; i+1<h->ref_count[list]; i++){
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
2760 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
2761 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
2762 }
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
2763 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
2764 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
2765 }
2683
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
2766 h->ref_list[list][index]= *ref;
5780
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2767 if (FIELD_PICTURE){
5825
18859ffa5705 Fix chroma mv offsets for PAFF in a way that is compatible with MBAFF by
cehoyos
parents: 5822
diff changeset
2768 pic_as_field(&h->ref_list[list][index], pic_structure);
5780
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2769 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2770 }
2284
6d26e105f68f h.264 ref list reordering bugfix patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2272
diff changeset
2771 }else{
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
2772 av_log(h->s.avctx, AV_LOG_ERROR, "illegal reordering_of_pic_nums_idc\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2773 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2774 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2775 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2776 }
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
2777 }
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
2778 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
2779 for(index= 0; index < h->ref_count[list]; index++){
7403
aff96834b8cd Print an error if a reference picture is missing.
michael
parents: 7402
diff changeset
2780 if(!h->ref_list[list][index].data[0]){
aff96834b8cd Print an error if a reference picture is missing.
michael
parents: 7402
diff changeset
2781 av_log(h->s.avctx, AV_LOG_ERROR, "Missing reference picture\n");
9418
95f37e7d10cd Get rid of the non sensical idea of using the current picture for missing
michael
parents: 9417
diff changeset
2782 if(h->default_ref_list[list][0].data[0])
95f37e7d10cd Get rid of the non sensical idea of using the current picture for missing
michael
parents: 9417
diff changeset
2783 h->ref_list[list][index]= h->default_ref_list[list][0];
95f37e7d10cd Get rid of the non sensical idea of using the current picture for missing
michael
parents: 9417
diff changeset
2784 else
95f37e7d10cd Get rid of the non sensical idea of using the current picture for missing
michael
parents: 9417
diff changeset
2785 return -1;
7403
aff96834b8cd Print an error if a reference picture is missing.
michael
parents: 7402
diff changeset
2786 }
2680
1a6192e0b1f9 fill missing reference pictures with something to avoid assertion failure
michael
parents: 2675
diff changeset
2787 }
1a6192e0b1f9 fill missing reference pictures with something to avoid assertion failure
michael
parents: 2675
diff changeset
2788 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2789
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2790 return 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2791 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2792
3379
69901769c811 fill_mbaff_ref_list is missing a return statement, its return value
mru
parents: 3341
diff changeset
2793 static void fill_mbaff_ref_list(H264Context *h){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2794 int list, i, j;
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
2795 for(list=0; list<2; list++){ //FIXME try list_count
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2796 for(i=0; i<h->ref_count[list]; i++){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2797 Picture *frame = &h->ref_list[list][i];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2798 Picture *field = &h->ref_list[list][16+2*i];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2799 field[0] = *frame;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2800 for(j=0; j<3; j++)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2801 field[0].linesize[j] <<= 1;
5825
18859ffa5705 Fix chroma mv offsets for PAFF in a way that is compatible with MBAFF by
cehoyos
parents: 5822
diff changeset
2802 field[0].reference = PICT_TOP_FIELD;
7896
3557386b7a97 Set poc for field references in MBAFF.
michael
parents: 7894
diff changeset
2803 field[0].poc= field[0].field_poc[0];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2804 field[1] = field[0];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2805 for(j=0; j<3; j++)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2806 field[1].data[j] += frame->linesize[j];
5825
18859ffa5705 Fix chroma mv offsets for PAFF in a way that is compatible with MBAFF by
cehoyos
parents: 5822
diff changeset
2807 field[1].reference = PICT_BOTTOM_FIELD;
7896
3557386b7a97 Set poc for field references in MBAFF.
michael
parents: 7894
diff changeset
2808 field[1].poc= field[1].field_poc[1];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2809
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2810 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
2811 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
2812 for(j=0; j<2; j++){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2813 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
2814 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
2815 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2816 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2817 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2818 for(j=0; j<h->ref_count[1]; j++){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2819 for(i=0; i<h->ref_count[0]; i++)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2820 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
2821 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
2822 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
2823 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2824 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2825
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2826 static int pred_weight_table(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2827 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2828 int list, i;
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2829 int luma_def, chroma_def;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2830
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2831 h->use_weight= 0;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2832 h->use_weight_chroma= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2833 h->luma_log2_weight_denom= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2834 h->chroma_log2_weight_denom= get_ue_golomb(&s->gb);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2835 luma_def = 1<<h->luma_log2_weight_denom;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2836 chroma_def = 1<<h->chroma_log2_weight_denom;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2837
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2838 for(list=0; list<2; list++){
8735
5d7ebbb7e91b Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents: 8727
diff changeset
2839 h->luma_weight_flag[list] = 0;
5d7ebbb7e91b Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents: 8727
diff changeset
2840 h->chroma_weight_flag[list] = 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2841 for(i=0; i<h->ref_count[list]; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2842 int luma_weight_flag, chroma_weight_flag;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2843
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2844 luma_weight_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2845 if(luma_weight_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2846 h->luma_weight[list][i]= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2847 h->luma_offset[list][i]= get_se_golomb(&s->gb);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2848 if( h->luma_weight[list][i] != luma_def
8735
5d7ebbb7e91b Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents: 8727
diff changeset
2849 || h->luma_offset[list][i] != 0) {
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2850 h->use_weight= 1;
8735
5d7ebbb7e91b Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents: 8727
diff changeset
2851 h->luma_weight_flag[list]= 1;
5d7ebbb7e91b Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents: 8727
diff changeset
2852 }
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2853 }else{
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2854 h->luma_weight[list][i]= luma_def;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2855 h->luma_offset[list][i]= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2856 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2857
7407
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
2858 if(CHROMA){
7408
michael
parents: 7407
diff changeset
2859 chroma_weight_flag= get_bits1(&s->gb);
michael
parents: 7407
diff changeset
2860 if(chroma_weight_flag){
michael
parents: 7407
diff changeset
2861 int j;
michael
parents: 7407
diff changeset
2862 for(j=0; j<2; j++){
michael
parents: 7407
diff changeset
2863 h->chroma_weight[list][i][j]= get_se_golomb(&s->gb);
michael
parents: 7407
diff changeset
2864 h->chroma_offset[list][i][j]= get_se_golomb(&s->gb);
michael
parents: 7407
diff changeset
2865 if( h->chroma_weight[list][i][j] != chroma_def
8735
5d7ebbb7e91b Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents: 8727
diff changeset
2866 || h->chroma_offset[list][i][j] != 0) {
7408
michael
parents: 7407
diff changeset
2867 h->use_weight_chroma= 1;
8735
5d7ebbb7e91b Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents: 8727
diff changeset
2868 h->chroma_weight_flag[list]= 1;
5d7ebbb7e91b Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents: 8727
diff changeset
2869 }
7408
michael
parents: 7407
diff changeset
2870 }
michael
parents: 7407
diff changeset
2871 }else{
michael
parents: 7407
diff changeset
2872 int j;
michael
parents: 7407
diff changeset
2873 for(j=0; j<2; j++){
michael
parents: 7407
diff changeset
2874 h->chroma_weight[list][i][j]= chroma_def;
michael
parents: 7407
diff changeset
2875 h->chroma_offset[list][i][j]= 0;
michael
parents: 7407
diff changeset
2876 }
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2877 }
7407
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
2878 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2879 }
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
2880 if(h->slice_type_nos != FF_B_TYPE) break;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2881 }
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2882 h->use_weight= h->use_weight || h->use_weight_chroma;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2883 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2884 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2885
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2886 static void implicit_weight_table(H264Context *h){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2887 MpegEncContext * const s = &h->s;
8735
5d7ebbb7e91b Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents: 8727
diff changeset
2888 int ref0, ref1, i;
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2889 int cur_poc = s->current_picture_ptr->poc;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2890
8956
de631175196e Move initialization of {luma,chroma}_weight_flag[] up,
benoit
parents: 8955
diff changeset
2891 for (i = 0; i < 2; i++) {
de631175196e Move initialization of {luma,chroma}_weight_flag[] up,
benoit
parents: 8955
diff changeset
2892 h->luma_weight_flag[i] = 0;
de631175196e Move initialization of {luma,chroma}_weight_flag[] up,
benoit
parents: 8955
diff changeset
2893 h->chroma_weight_flag[i] = 0;
de631175196e Move initialization of {luma,chroma}_weight_flag[] up,
benoit
parents: 8955
diff changeset
2894 }
de631175196e Move initialization of {luma,chroma}_weight_flag[] up,
benoit
parents: 8955
diff changeset
2895
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2896 if( h->ref_count[0] == 1 && h->ref_count[1] == 1
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2897 && 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
2898 h->use_weight= 0;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2899 h->use_weight_chroma= 0;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2900 return;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2901 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2902
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2903 h->use_weight= 2;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2904 h->use_weight_chroma= 2;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2905 h->luma_log2_weight_denom= 5;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2906 h->chroma_log2_weight_denom= 5;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2907
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2908 for(ref0=0; ref0 < h->ref_count[0]; ref0++){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2909 int poc0 = h->ref_list[0][ref0].poc;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2910 for(ref1=0; ref1 < h->ref_count[1]; ref1++){
2519
b34f2cac6a71 10l in implicit_weight_table
lorenm
parents: 2509
diff changeset
2911 int poc1 = h->ref_list[1][ref1].poc;
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
2912 int td = av_clip(poc1 - poc0, -128, 127);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2913 if(td){
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
2914 int tb = av_clip(cur_poc - poc0, -128, 127);
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
2915 int tx = (16384 + (FFABS(td) >> 1)) / td;
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
2916 int dist_scale_factor = av_clip((tb*tx + 32) >> 6, -1024, 1023) >> 2;
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2917 if(dist_scale_factor < -64 || dist_scale_factor > 128)
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2918 h->implicit_weight[ref0][ref1] = 32;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2919 else
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2920 h->implicit_weight[ref0][ref1] = 64 - dist_scale_factor;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2921 }else
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2922 h->implicit_weight[ref0][ref1] = 32;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2923 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2924 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2925 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2926
5768
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
2927 /**
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
2928 * Mark a picture as no longer needed for reference. The refmask
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
2929 * argument allows unreferencing of individual fields or the whole frame.
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
2930 * If the picture becomes entirely unreferenced, but is being held for
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
2931 * display purposes, it is marked as such.
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
2932 * @param refmask mask of fields to unreference; the mask is bitwise
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
2933 * anded with the reference marking of pic
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
2934 * @return non-zero if pic becomes entirely unreferenced (except possibly
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
2935 * for display purposes) zero if one of the fields remains in
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
2936 * reference
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
2937 */
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
2938 static inline int unreference_pic(H264Context *h, Picture *pic, int refmask){
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
2939 int i;
5768
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
2940 if (pic->reference &= refmask) {
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
2941 return 0;
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
2942 } else {
7313
michael
parents: 7312
diff changeset
2943 for(i = 0; h->delayed_pic[i]; i++)
michael
parents: 7312
diff changeset
2944 if(pic == h->delayed_pic[i]){
michael
parents: 7312
diff changeset
2945 pic->reference=DELAYED_PIC_REF;
michael
parents: 7312
diff changeset
2946 break;
michael
parents: 7312
diff changeset
2947 }
5768
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
2948 return 1;
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
2949 }
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
2950 }
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
2951
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2952 /**
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
2953 * instantaneous decoder refresh.
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2954 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2955 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
2956 int i;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2957
2484
a3188eb4266c correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents: 2471
diff changeset
2958 for(i=0; i<16; i++){
7394
4ac8769cbb01 Make remove_long() call unreference_pic() internally.
michael
parents: 7393
diff changeset
2959 remove_long(h, i, 0);
7385
617eababb511 Clear long_ref when a frame is no longer a long_ref.
michael
parents: 7384
diff changeset
2960 }
617eababb511 Clear long_ref when a frame is no longer a long_ref.
michael
parents: 7384
diff changeset
2961 assert(h->long_ref_count==0);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2962
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2963 for(i=0; i<h->short_ref_count; i++){
5768
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
2964 unreference_pic(h, h->short_ref[i], 0);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2965 h->short_ref[i]= NULL;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2966 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2967 h->short_ref_count=0;
7362
443fdc440854 Reset prev_frame_num for idr frames as required by the spec.
michael
parents: 7361
diff changeset
2968 h->prev_frame_num= 0;
7379
d3bd73e0f9a9 init_poc() vs. idr() cleanup
michael
parents: 7378
diff changeset
2969 h->prev_frame_num_offset= 0;
d3bd73e0f9a9 init_poc() vs. idr() cleanup
michael
parents: 7378
diff changeset
2970 h->prev_poc_msb=
d3bd73e0f9a9 init_poc() vs. idr() cleanup
michael
parents: 7378
diff changeset
2971 h->prev_poc_lsb= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2972 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2973
2640
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
2974 /* forget old pics after a seek */
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
2975 static void flush_dpb(AVCodecContext *avctx){
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
2976 H264Context *h= avctx->priv_data;
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
2977 int i;
7283
39e81fdd8d23 Move the size of the H264Context delayed_pic array into a #define.
astrange
parents: 7277
diff changeset
2978 for(i=0; i<MAX_DELAYED_PIC_COUNT; i++) {
3144
84406a59134c fix a memory leak on seeking.
lorenm
parents: 3138
diff changeset
2979 if(h->delayed_pic[i])
84406a59134c fix a memory leak on seeking.
lorenm
parents: 3138
diff changeset
2980 h->delayed_pic[i]->reference= 0;
2640
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
2981 h->delayed_pic[i]= NULL;
3144
84406a59134c fix a memory leak on seeking.
lorenm
parents: 3138
diff changeset
2982 }
7310
033d10927d45 Remove delayed_output_pic, I do not understand what this variable was good for.
michael
parents: 7309
diff changeset
2983 h->outputed_poc= INT_MIN;
9831
febe1855b64a Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents: 9790
diff changeset
2984 h->prev_interlaced_frame = 1;
2640
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
2985 idr(h);
2751
3247049dfc7a fix segfault if flush is called before the first frame
mru
parents: 2748
diff changeset
2986 if(h->s.current_picture_ptr)
3247049dfc7a fix segfault if flush is called before the first frame
mru
parents: 2748
diff changeset
2987 h->s.current_picture_ptr->reference= 0;
5798
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
2988 h->s.first_field= 0;
9069
8a74ab19d224 Correctly reset SEI variables.
cehoyos
parents: 9066
diff changeset
2989 reset_sei(h);
5926
77403dc808cd Call mpegvideo flush routine on h264 flush. Needed in particular
heydowns
parents: 5904
diff changeset
2990 ff_mpeg_flush(avctx);
2640
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
2991 }
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
2992
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2993 /**
5770
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
2994 * Find a Picture in the short term reference list by frame number.
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
2995 * @param frame_num frame number to search for
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
2996 * @param idx the index into h->short_ref where returned picture is found
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
2997 * undefined if no picture found.
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
2998 * @return pointer to the found picture, or NULL if no pic with the provided
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
2999 * frame number is found
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3000 */
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3001 static Picture * find_short(H264Context *h, int frame_num, int *idx){
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3002 MpegEncContext * const s = &h->s;
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3003 int i;
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3004
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3005 for(i=0; i<h->short_ref_count; i++){
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3006 Picture *pic= h->short_ref[i];
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3007 if(s->avctx->debug&FF_DEBUG_MMCO)
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3008 av_log(h->s.avctx, AV_LOG_DEBUG, "%d %d %p\n", i, pic->frame_num, pic);
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3009 if(pic->frame_num == frame_num) {
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3010 *idx = i;
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3011 return pic;
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3012 }
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3013 }
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3014 return NULL;
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3015 }
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3016
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3017 /**
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3018 * Remove a picture from the short term reference list by its index in
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3019 * that list. This does no checking on the provided index; it is assumed
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3020 * to be valid. Other list entries are shifted down.
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3021 * @param i index into h->short_ref of picture to remove.
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3022 */
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3023 static void remove_short_at_index(H264Context *h, int i){
7277
2bd9df0236e8 H264: fix index range assert() in remove_short_at_index()
mru
parents: 7237
diff changeset
3024 assert(i >= 0 && i < h->short_ref_count);
5770
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3025 h->short_ref[i]= NULL;
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3026 if (--h->short_ref_count)
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3027 memmove(&h->short_ref[i], &h->short_ref[i+1], (h->short_ref_count - i)*sizeof(Picture*));
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3028 }
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3029
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3030 /**
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3031 *
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
3032 * @return the removed picture or NULL if an error occurs
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3033 */
7396
9f765ea6d6df Make remove_short() match remove_long() in that it calls unreference_pic().
michael
parents: 7395
diff changeset
3034 static Picture * remove_short(H264Context *h, int frame_num, int ref_mask){
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
3035 MpegEncContext * const s = &h->s;
5770
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3036 Picture *pic;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3037 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3038
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
3039 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
3040 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
3041
5770
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3042 pic = find_short(h, frame_num, &i);
7396
9f765ea6d6df Make remove_short() match remove_long() in that it calls unreference_pic().
michael
parents: 7395
diff changeset
3043 if (pic){
9f765ea6d6df Make remove_short() match remove_long() in that it calls unreference_pic().
michael
parents: 7395
diff changeset
3044 if(unreference_pic(h, pic, ref_mask))
5770
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3045 remove_short_at_index(h, i);
7396
9f765ea6d6df Make remove_short() match remove_long() in that it calls unreference_pic().
michael
parents: 7395
diff changeset
3046 }
5770
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3047
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3048 return pic;
1168
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 /**
5774
e71de81878c4 Reorganize long reference management to minimize code duplication in upcoming PAFF implementation.
andoma
parents: 5773
diff changeset
3052 * Remove a picture from the long term reference list by its index in
7393
309c59802769 Merge oddly duplicated remove_long/remove_long_at_index() function.
michael
parents: 7392
diff changeset
3053 * that list.
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
3054 * @return the removed picture or NULL if an error occurs
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3055 */
7394
4ac8769cbb01 Make remove_long() call unreference_pic() internally.
michael
parents: 7393
diff changeset
3056 static Picture * remove_long(H264Context *h, int i, int ref_mask){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3057 Picture *pic;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3058
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3059 pic= h->long_ref[i];
7393
309c59802769 Merge oddly duplicated remove_long/remove_long_at_index() function.
michael
parents: 7392
diff changeset
3060 if (pic){
7394
4ac8769cbb01 Make remove_long() call unreference_pic() internally.
michael
parents: 7393
diff changeset
3061 if(unreference_pic(h, pic, ref_mask)){
4ac8769cbb01 Make remove_long() call unreference_pic() internally.
michael
parents: 7393
diff changeset
3062 assert(h->long_ref[i]->long_ref == 1);
4ac8769cbb01 Make remove_long() call unreference_pic() internally.
michael
parents: 7393
diff changeset
3063 h->long_ref[i]->long_ref= 0;
4ac8769cbb01 Make remove_long() call unreference_pic() internally.
michael
parents: 7393
diff changeset
3064 h->long_ref[i]= NULL;
4ac8769cbb01 Make remove_long() call unreference_pic() internally.
michael
parents: 7393
diff changeset
3065 h->long_ref_count--;
4ac8769cbb01 Make remove_long() call unreference_pic() internally.
michael
parents: 7393
diff changeset
3066 }
7393
309c59802769 Merge oddly duplicated remove_long/remove_long_at_index() function.
michael
parents: 7392
diff changeset
3067 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3068
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3069 return pic;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3070 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3071
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3072 /**
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
3073 * 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
3074 */
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
3075 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
3076 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
3077 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
3078 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
3079 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
3080 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
3081 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
3082 }
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
3083 }
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
3084 }
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
3085
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
3086 /**
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
3087 * 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
3088 */
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
3089 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
3090 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
3091 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
3092 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
3093 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
3094 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
3095 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
3096 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
3097 }
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
3098 }
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
3099 }
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
3100 }
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
3101
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
3102 /**
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3103 * Executes the reference picture marking (memory management control operations).
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3104 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3105 static int execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3106 MpegEncContext * const s = &h->s;
9144
53123c63f82a Mark variables "j" and "structure" in execute_ref_pic_marking() as av_uninit
diego
parents: 9128
diff changeset
3107 int i, av_uninit(j);
5785
74fa2587b8de Cosmetic renaming variable so that it makes more sense for forthcoming PAFF mmco patches.
andoma
parents: 5784
diff changeset
3108 int current_ref_assigned=0;
9021
ccde7fbba09e Mark two variables with av_uninit to avoid false positive gcc warnings.
diego
parents: 9012
diff changeset
3109 Picture *av_uninit(pic);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3110
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3111 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
3112 av_log(h->s.avctx, AV_LOG_DEBUG, "no mmco here\n");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3113
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3114 for(i=0; i<mmco_count; i++){
9144
53123c63f82a Mark variables "j" and "structure" in execute_ref_pic_marking() as av_uninit
diego
parents: 9128
diff changeset
3115 int av_uninit(structure), av_uninit(frame_num);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3116 if(s->avctx->debug&FF_DEBUG_MMCO)
5756
db5a041fd77c Rename MMCO stuff to prepare for h264/PAFF implementation.
andoma
parents: 5727
diff changeset
3117 av_log(h->s.avctx, AV_LOG_DEBUG, "mmco:%d %d %d\n", h->mmco[i].opcode, h->mmco[i].short_pic_num, h->mmco[i].long_arg);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3118
7395
08e81ea44a38 Removing yet another weird field pic special case,
michael
parents: 7394
diff changeset
3119 if( mmco[i].opcode == MMCO_SHORT2UNUSED
08e81ea44a38 Removing yet another weird field pic special case,
michael
parents: 7394
diff changeset
3120 || mmco[i].opcode == MMCO_SHORT2LONG){
08e81ea44a38 Removing yet another weird field pic special case,
michael
parents: 7394
diff changeset
3121 frame_num = pic_num_extract(h, mmco[i].short_pic_num, &structure);
08e81ea44a38 Removing yet another weird field pic special case,
michael
parents: 7394
diff changeset
3122 pic = find_short(h, frame_num, &j);
08e81ea44a38 Removing yet another weird field pic special case,
michael
parents: 7394
diff changeset
3123 if(!pic){
7397
535664ced6f0 Do not scare the user with error messages when everything is ok.
michael
parents: 7396
diff changeset
3124 if(mmco[i].opcode != MMCO_SHORT2LONG || !h->long_ref[mmco[i].long_arg]
535664ced6f0 Do not scare the user with error messages when everything is ok.
michael
parents: 7396
diff changeset
3125 || h->long_ref[mmco[i].long_arg]->frame_num != frame_num)
7395
08e81ea44a38 Removing yet another weird field pic special case,
michael
parents: 7394
diff changeset
3126 av_log(h->s.avctx, AV_LOG_ERROR, "mmco: unref short failure\n");
08e81ea44a38 Removing yet another weird field pic special case,
michael
parents: 7394
diff changeset
3127 continue;
08e81ea44a38 Removing yet another weird field pic special case,
michael
parents: 7394
diff changeset
3128 }
08e81ea44a38 Removing yet another weird field pic special case,
michael
parents: 7394
diff changeset
3129 }
08e81ea44a38 Removing yet another weird field pic special case,
michael
parents: 7394
diff changeset
3130
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3131 switch(mmco[i].opcode){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3132 case MMCO_SHORT2UNUSED:
5786
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3133 if(s->avctx->debug&FF_DEBUG_MMCO)
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3134 av_log(h->s.avctx, AV_LOG_DEBUG, "mmco: unref short %d count %d\n", h->mmco[i].short_pic_num, h->short_ref_count);
7396
9f765ea6d6df Make remove_short() match remove_long() in that it calls unreference_pic().
michael
parents: 7395
diff changeset
3135 remove_short(h, frame_num, structure ^ PICT_FRAME);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3136 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3137 case MMCO_SHORT2LONG:
7395
08e81ea44a38 Removing yet another weird field pic special case,
michael
parents: 7394
diff changeset
3138 if (h->long_ref[mmco[i].long_arg] != pic)
08e81ea44a38 Removing yet another weird field pic special case,
michael
parents: 7394
diff changeset
3139 remove_long(h, mmco[i].long_arg, 0);
5786
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3140
7396
9f765ea6d6df Make remove_short() match remove_long() in that it calls unreference_pic().
michael
parents: 7395
diff changeset
3141 remove_short_at_index(h, j);
9f765ea6d6df Make remove_short() match remove_long() in that it calls unreference_pic().
michael
parents: 7395
diff changeset
3142 h->long_ref[ mmco[i].long_arg ]= pic;
5787
b92c03847d60 Re-indent after PAFF MMCO implementation patch.
cehoyos
parents: 5786
diff changeset
3143 if (h->long_ref[ mmco[i].long_arg ]){
b92c03847d60 Re-indent after PAFF MMCO implementation patch.
cehoyos
parents: 5786
diff changeset
3144 h->long_ref[ mmco[i].long_arg ]->long_ref=1;
b92c03847d60 Re-indent after PAFF MMCO implementation patch.
cehoyos
parents: 5786
diff changeset
3145 h->long_ref_count++;
b92c03847d60 Re-indent after PAFF MMCO implementation patch.
cehoyos
parents: 5786
diff changeset
3146 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3147 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3148 case MMCO_LONG2UNUSED:
5786
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3149 j = pic_num_extract(h, mmco[i].long_arg, &structure);
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3150 pic = h->long_ref[j];
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3151 if (pic) {
7394
4ac8769cbb01 Make remove_long() call unreference_pic() internally.
michael
parents: 7393
diff changeset
3152 remove_long(h, j, structure ^ PICT_FRAME);
5786
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3153 } else if(s->avctx->debug&FF_DEBUG_MMCO)
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3154 av_log(h->s.avctx, AV_LOG_DEBUG, "mmco: unref long failure\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3155 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3156 case MMCO_LONG:
7383
c4e5f2158b20 Simplify strange obfuscated code in MMCO_LONG handling.
michael
parents: 7382
diff changeset
3157 // Comment below left from previous code as it is an interresting note.
5786
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3158 /* First field in pair is in short term list or
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3159 * at a different long term index.
7420
30e8c4bf08a4 Fix reference to spec to be more specific and correct.
heydowns
parents: 7417
diff changeset
3160 * This is not allowed; see 7.4.3.3, notes 2 and 3.
5786
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3161 * Report the problem and keep the pair where it is,
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3162 * and mark this field valid.
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3163 */
7383
c4e5f2158b20 Simplify strange obfuscated code in MMCO_LONG handling.
michael
parents: 7382
diff changeset
3164
c4e5f2158b20 Simplify strange obfuscated code in MMCO_LONG handling.
michael
parents: 7382
diff changeset
3165 if (h->long_ref[mmco[i].long_arg] != s->current_picture_ptr) {
7394
4ac8769cbb01 Make remove_long() call unreference_pic() internally.
michael
parents: 7393
diff changeset
3166 remove_long(h, mmco[i].long_arg, 0);
5787
b92c03847d60 Re-indent after PAFF MMCO implementation patch.
cehoyos
parents: 5786
diff changeset
3167
b92c03847d60 Re-indent after PAFF MMCO implementation patch.
cehoyos
parents: 5786
diff changeset
3168 h->long_ref[ mmco[i].long_arg ]= s->current_picture_ptr;
b92c03847d60 Re-indent after PAFF MMCO implementation patch.
cehoyos
parents: 5786
diff changeset
3169 h->long_ref[ mmco[i].long_arg ]->long_ref=1;
b92c03847d60 Re-indent after PAFF MMCO implementation patch.
cehoyos
parents: 5786
diff changeset
3170 h->long_ref_count++;
5786
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3171 }
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3172
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3173 s->current_picture_ptr->reference |= s->picture_structure;
5785
74fa2587b8de Cosmetic renaming variable so that it makes more sense for forthcoming PAFF mmco patches.
andoma
parents: 5784
diff changeset
3174 current_ref_assigned=1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3175 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3176 case MMCO_SET_MAX_LONG:
5756
db5a041fd77c Rename MMCO stuff to prepare for h264/PAFF implementation.
andoma
parents: 5727
diff changeset
3177 assert(mmco[i].long_arg <= 16);
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3178 // just remove the long term which index is greater than new max
5756
db5a041fd77c Rename MMCO stuff to prepare for h264/PAFF implementation.
andoma
parents: 5727
diff changeset
3179 for(j = mmco[i].long_arg; j<16; j++){
7394
4ac8769cbb01 Make remove_long() call unreference_pic() internally.
michael
parents: 7393
diff changeset
3180 remove_long(h, j, 0);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3181 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3182 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3183 case MMCO_RESET:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3184 while(h->short_ref_count){
7396
9f765ea6d6df Make remove_short() match remove_long() in that it calls unreference_pic().
michael
parents: 7395
diff changeset
3185 remove_short(h, h->short_ref[0]->frame_num, 0);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3186 }
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
3187 for(j = 0; j < 16; j++) {
7394
4ac8769cbb01 Make remove_long() call unreference_pic() internally.
michael
parents: 7393
diff changeset
3188 remove_long(h, j, 0);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3189 }
7350
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3190 s->current_picture_ptr->poc=
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3191 s->current_picture_ptr->field_poc[0]=
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3192 s->current_picture_ptr->field_poc[1]=
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3193 h->poc_lsb=
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3194 h->poc_msb=
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3195 h->frame_num=
7349
ee0fa5935e1a Reset frame_num for MMCO 5.
michael
parents: 7348
diff changeset
3196 s->current_picture_ptr->frame_num= 0;
9885
f86df3ebfef7 Improve wording: s/reseted/reset
cehoyos
parents: 9883
diff changeset
3197 s->current_picture_ptr->mmco_reset=1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3198 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3199 default: assert(0);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3200 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3201 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3202
7389
8ef2e8f077ff Remove another of these obfuscated special cases for field pictures
michael
parents: 7388
diff changeset
3203 if (!current_ref_assigned) {
5786
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3204 /* Second field of complementary field pair; the first field of
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3205 * which is already referenced. If short referenced, it
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3206 * should be first entry in short_ref. If not, it must exist
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3207 * in long_ref; trying to put it on the short list here is an
7421
74534206d329 And.... Fix another spec reference to be more specific and correct.
heydowns
parents: 7420
diff changeset
3208 * error in the encoded bit stream (ref: 7.4.3.3, NOTE 2 and 3).
5786
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3209 */
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3210 if (h->short_ref_count && h->short_ref[0] == s->current_picture_ptr) {
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3211 /* Just mark the second field valid */
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3212 s->current_picture_ptr->reference = PICT_FRAME;
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3213 } else if (s->current_picture_ptr->long_ref) {
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3214 av_log(h->s.avctx, AV_LOG_ERROR, "illegal short term reference "
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3215 "assignment for second field "
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3216 "in complementary field pair "
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3217 "(first field is long term)\n");
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3218 } else {
7396
9f765ea6d6df Make remove_short() match remove_long() in that it calls unreference_pic().
michael
parents: 7395
diff changeset
3219 pic= remove_short(h, s->current_picture_ptr->frame_num, 0);
7391
michael
parents: 7390
diff changeset
3220 if(pic){
michael
parents: 7390
diff changeset
3221 av_log(h->s.avctx, AV_LOG_ERROR, "illegal short term buffer state detected\n");
michael
parents: 7390
diff changeset
3222 }
michael
parents: 7390
diff changeset
3223
michael
parents: 7390
diff changeset
3224 if(h->short_ref_count)
michael
parents: 7390
diff changeset
3225 memmove(&h->short_ref[1], &h->short_ref[0], h->short_ref_count*sizeof(Picture*));
michael
parents: 7390
diff changeset
3226
michael
parents: 7390
diff changeset
3227 h->short_ref[0]= s->current_picture_ptr;
michael
parents: 7390
diff changeset
3228 h->short_ref_count++;
michael
parents: 7390
diff changeset
3229 s->current_picture_ptr->reference |= s->picture_structure;
michael
parents: 7390
diff changeset
3230 }
7390
7abedf6425d8 10000l, forgotton }
michael
parents: 7389
diff changeset
3231 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3232
6019
42de24a34fd2 Fix brain-dead parts of r11216, specifically:
heydowns
parents: 6018
diff changeset
3233 if (h->long_ref_count + h->short_ref_count > h->sps.ref_frame_count){
6018
9d1654835629 Ensure that our total reference frame count does not exceed the SPS
heydowns
parents: 6017
diff changeset
3234
9d1654835629 Ensure that our total reference frame count does not exceed the SPS
heydowns
parents: 6017
diff changeset
3235 /* We have too many reference frames, probably due to corrupted
9d1654835629 Ensure that our total reference frame count does not exceed the SPS
heydowns
parents: 6017
diff changeset
3236 * stream. Need to discard one frame. Prevents overrun of the
9d1654835629 Ensure that our total reference frame count does not exceed the SPS
heydowns
parents: 6017
diff changeset
3237 * short_ref and long_ref buffers.
9d1654835629 Ensure that our total reference frame count does not exceed the SPS
heydowns
parents: 6017
diff changeset
3238 */
9d1654835629 Ensure that our total reference frame count does not exceed the SPS
heydowns
parents: 6017
diff changeset
3239 av_log(h->s.avctx, AV_LOG_ERROR,
9d1654835629 Ensure that our total reference frame count does not exceed the SPS
heydowns
parents: 6017
diff changeset
3240 "number of reference frames exceeds max (probably "
9d1654835629 Ensure that our total reference frame count does not exceed the SPS
heydowns
parents: 6017
diff changeset
3241 "corrupt input), discarding one\n");
9d1654835629 Ensure that our total reference frame count does not exceed the SPS
heydowns
parents: 6017
diff changeset
3242
7350
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3243 if (h->long_ref_count && !h->short_ref_count) {
6018
9d1654835629 Ensure that our total reference frame count does not exceed the SPS
heydowns
parents: 6017
diff changeset
3244 for (i = 0; i < 16; ++i)
9d1654835629 Ensure that our total reference frame count does not exceed the SPS
heydowns
parents: 6017
diff changeset
3245 if (h->long_ref[i])
9d1654835629 Ensure that our total reference frame count does not exceed the SPS
heydowns
parents: 6017
diff changeset
3246 break;
9d1654835629 Ensure that our total reference frame count does not exceed the SPS
heydowns
parents: 6017
diff changeset
3247
9d1654835629 Ensure that our total reference frame count does not exceed the SPS
heydowns
parents: 6017
diff changeset
3248 assert(i < 16);
7394
4ac8769cbb01 Make remove_long() call unreference_pic() internally.
michael
parents: 7393
diff changeset
3249 remove_long(h, i, 0);
6018
9d1654835629 Ensure that our total reference frame count does not exceed the SPS
heydowns
parents: 6017
diff changeset
3250 } else {
6019
42de24a34fd2 Fix brain-dead parts of r11216, specifically:
heydowns
parents: 6018
diff changeset
3251 pic = h->short_ref[h->short_ref_count - 1];
7396
9f765ea6d6df Make remove_short() match remove_long() in that it calls unreference_pic().
michael
parents: 7395
diff changeset
3252 remove_short(h, pic->frame_num, 0);
7394
4ac8769cbb01 Make remove_long() call unreference_pic() internally.
michael
parents: 7393
diff changeset
3253 }
6018
9d1654835629 Ensure that our total reference frame count does not exceed the SPS
heydowns
parents: 6017
diff changeset
3254 }
9d1654835629 Ensure that our total reference frame count does not exceed the SPS
heydowns
parents: 6017
diff changeset
3255
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
3256 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
3257 print_long_term(h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3258 return 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3259 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3260
5172
60a4f209838b Decouple bit context from h264 context in decode_ref_pic_marking()
gpoirier
parents: 5170
diff changeset
3261 static int decode_ref_pic_marking(H264Context *h, GetBitContext *gb){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3262 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3263 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3264
7384
8b9a02536781 Make sure mmco index is 0 (instead of uninitialized) in all error returns.
michael
parents: 7383
diff changeset
3265 h->mmco_index= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3266 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
3267 s->broken_link= get_bits1(gb) -1;
7388
d2d876733e9e Simplify mmco setup code used in IDR pictures.
michael
parents: 7387
diff changeset
3268 if(get_bits1(gb)){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3269 h->mmco[0].opcode= MMCO_LONG;
7388
d2d876733e9e Simplify mmco setup code used in IDR pictures.
michael
parents: 7387
diff changeset
3270 h->mmco[0].long_arg= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3271 h->mmco_index= 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3272 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3273 }else{
5172
60a4f209838b Decouple bit context from h264 context in decode_ref_pic_marking()
gpoirier
parents: 5170
diff changeset
3274 if(get_bits1(gb)){ // adaptive_ref_pic_marking_mode_flag
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3275 for(i= 0; i<MAX_MMCO_COUNT; i++) {
8451
384600e3fe5b Use get_ue_golomb_31() where possible, almost all are just in headers
michael
parents: 8448
diff changeset
3276 MMCOOpcode opcode= get_ue_golomb_31(gb);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3277
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3278 h->mmco[i].opcode= opcode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3279 if(opcode==MMCO_SHORT2UNUSED || opcode==MMCO_SHORT2LONG){
5784
af2dab646def Augment mmcodecoding process to work properly with fields. Part of PAFF implementation.
andoma
parents: 5783
diff changeset
3280 h->mmco[i].short_pic_num= (h->curr_pic_num - get_ue_golomb(gb) - 1) & (h->max_pic_num - 1);
5756
db5a041fd77c Rename MMCO stuff to prepare for h264/PAFF implementation.
andoma
parents: 5727
diff changeset
3281 /* if(h->mmco[i].short_pic_num >= h->short_ref_count || h->short_ref[ h->mmco[i].short_pic_num ] == NULL){
2846
40765c51a7a9 Compilation fixes part 1 patch by (Arvind R. and Burkhard Plaum, plaum, ipf uni-stuttgart de)
michael
parents: 2844
diff changeset
3282 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
3283 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3284 }*/
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3285 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3286 if(opcode==MMCO_SHORT2LONG || opcode==MMCO_LONG2UNUSED || opcode==MMCO_LONG || opcode==MMCO_SET_MAX_LONG){
8451
384600e3fe5b Use get_ue_golomb_31() where possible, almost all are just in headers
michael
parents: 8448
diff changeset
3287 unsigned int long_arg= get_ue_golomb_31(gb);
5784
af2dab646def Augment mmcodecoding process to work properly with fields. Part of PAFF implementation.
andoma
parents: 5783
diff changeset
3288 if(long_arg >= 32 || (long_arg >= 16 && !(opcode == MMCO_LONG2UNUSED && FIELD_PICTURE))){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3289 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
3290 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3291 }
5771
5290a3850c03 Rename variable to make sense in both field and frame contexts (support of PAFF implementation).
andoma
parents: 5770
diff changeset
3292 h->mmco[i].long_arg= long_arg;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3293 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3294
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3295 if(opcode > (unsigned)MMCO_LONG){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3296 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
3297 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3298 }
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
3299 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
3300 break;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3301 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3302 h->mmco_index= i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3303 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3304 assert(h->long_ref_count + h->short_ref_count <= h->sps.ref_frame_count);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3305
5987
bc6d765d1d53 Verify long_ref_count!=0. Fix issue 281.
takis
parents: 5984
diff changeset
3306 if(h->short_ref_count && h->long_ref_count + h->short_ref_count == h->sps.ref_frame_count &&
5784
af2dab646def Augment mmcodecoding process to work properly with fields. Part of PAFF implementation.
andoma
parents: 5783
diff changeset
3307 !(FIELD_PICTURE && !s->first_field && s->current_picture_ptr->reference)) {
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3308 h->mmco[0].opcode= MMCO_SHORT2UNUSED;
5756
db5a041fd77c Rename MMCO stuff to prepare for h264/PAFF implementation.
andoma
parents: 5727
diff changeset
3309 h->mmco[0].short_pic_num= h->short_ref[ h->short_ref_count - 1 ]->frame_num;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3310 h->mmco_index= 1;
5784
af2dab646def Augment mmcodecoding process to work properly with fields. Part of PAFF implementation.
andoma
parents: 5783
diff changeset
3311 if (FIELD_PICTURE) {
af2dab646def Augment mmcodecoding process to work properly with fields. Part of PAFF implementation.
andoma
parents: 5783
diff changeset
3312 h->mmco[0].short_pic_num *= 2;
af2dab646def Augment mmcodecoding process to work properly with fields. Part of PAFF implementation.
andoma
parents: 5783
diff changeset
3313 h->mmco[1].opcode= MMCO_SHORT2UNUSED;
af2dab646def Augment mmcodecoding process to work properly with fields. Part of PAFF implementation.
andoma
parents: 5783
diff changeset
3314 h->mmco[1].short_pic_num= h->mmco[0].short_pic_num + 1;
af2dab646def Augment mmcodecoding process to work properly with fields. Part of PAFF implementation.
andoma
parents: 5783
diff changeset
3315 h->mmco_index= 2;
af2dab646def Augment mmcodecoding process to work properly with fields. Part of PAFF implementation.
andoma
parents: 5783
diff changeset
3316 }
7387
dee39446a364 Remove redundant h->mmco_index= 0.
michael
parents: 7386
diff changeset
3317 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3318 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3319 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3320
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3321 return 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3322 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3323
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3324 static int init_poc(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3325 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3326 const int max_frame_num= 1<<h->sps.log2_max_frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3327 int field_poc[2];
7382
f9e70983fc35 Set field_poc (it was half uninitialized before) and use it
michael
parents: 7381
diff changeset
3328 Picture *cur = s->current_picture_ptr;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3329
7381
16a60b2f7a7d Minor simplification of code in init_poc().
michael
parents: 7380
diff changeset
3330 h->frame_num_offset= h->prev_frame_num_offset;
7380
9faeb82ba80b cosmetics (indent and 2 empty lines)
michael
parents: 7379
diff changeset
3331 if(h->frame_num < h->prev_frame_num)
7381
16a60b2f7a7d Minor simplification of code in init_poc().
michael
parents: 7380
diff changeset
3332 h->frame_num_offset += max_frame_num;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3333
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3334 if(h->sps.poc_type==0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3335 const int max_poc_lsb= 1<<h->sps.log2_max_poc_lsb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3336
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3337 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
3338 h->poc_msb = h->prev_poc_msb + max_poc_lsb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3339 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
3340 h->poc_msb = h->prev_poc_msb - max_poc_lsb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3341 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3342 h->poc_msb = h->prev_poc_msb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3343 //printf("poc: %d %d\n", h->poc_msb, h->poc_lsb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3344 field_poc[0] =
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3345 field_poc[1] = h->poc_msb + h->poc_lsb;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3346 if(s->picture_structure == PICT_FRAME)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3347 field_poc[1] += h->delta_poc_bottom;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3348 }else if(h->sps.poc_type==1){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3349 int abs_frame_num, expected_delta_per_poc_cycle, expectedpoc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3350 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3351
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3352 if(h->sps.poc_cycle_length != 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3353 abs_frame_num = h->frame_num_offset + h->frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3354 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3355 abs_frame_num = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3356
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3357 if(h->nal_ref_idc==0 && abs_frame_num > 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3358 abs_frame_num--;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3359
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3360 expected_delta_per_poc_cycle = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3361 for(i=0; i < h->sps.poc_cycle_length; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3362 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
3363
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3364 if(abs_frame_num > 0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3365 int poc_cycle_cnt = (abs_frame_num - 1) / h->sps.poc_cycle_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3366 int frame_num_in_poc_cycle = (abs_frame_num - 1) % h->sps.poc_cycle_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3367
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3368 expectedpoc = poc_cycle_cnt * expected_delta_per_poc_cycle;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3369 for(i = 0; i <= frame_num_in_poc_cycle; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3370 expectedpoc = expectedpoc + h->sps.offset_for_ref_frame[ i ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3371 } else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3372 expectedpoc = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3373
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3374 if(h->nal_ref_idc == 0)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3375 expectedpoc = expectedpoc + h->sps.offset_for_non_ref_pic;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3376
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3377 field_poc[0] = expectedpoc + h->delta_poc[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3378 field_poc[1] = field_poc[0] + h->sps.offset_for_top_to_bottom_field;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3379
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3380 if(s->picture_structure == PICT_FRAME)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3381 field_poc[1] += h->delta_poc[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3382 }else{
7381
16a60b2f7a7d Minor simplification of code in init_poc().
michael
parents: 7380
diff changeset
3383 int poc= 2*(h->frame_num_offset + h->frame_num);
16a60b2f7a7d Minor simplification of code in init_poc().
michael
parents: 7380
diff changeset
3384
16a60b2f7a7d Minor simplification of code in init_poc().
michael
parents: 7380
diff changeset
3385 if(!h->nal_ref_idc)
16a60b2f7a7d Minor simplification of code in init_poc().
michael
parents: 7380
diff changeset
3386 poc--;
7380
9faeb82ba80b cosmetics (indent and 2 empty lines)
michael
parents: 7379
diff changeset
3387
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3388 field_poc[0]= poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3389 field_poc[1]= poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3390 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3391
7382
f9e70983fc35 Set field_poc (it was half uninitialized before) and use it
michael
parents: 7381
diff changeset
3392 if(s->picture_structure != PICT_BOTTOM_FIELD)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3393 s->current_picture_ptr->field_poc[0]= field_poc[0];
7382
f9e70983fc35 Set field_poc (it was half uninitialized before) and use it
michael
parents: 7381
diff changeset
3394 if(s->picture_structure != PICT_TOP_FIELD)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3395 s->current_picture_ptr->field_poc[1]= field_poc[1];
7382
f9e70983fc35 Set field_poc (it was half uninitialized before) and use it
michael
parents: 7381
diff changeset
3396 cur->poc= FFMIN(cur->field_poc[0], cur->field_poc[1]);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3397
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3398 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3399 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3400
5160
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3401
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3402 /**
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3403 * initialize scan tables
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3404 */
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3405 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
3406 MpegEncContext * const s = &h->s;
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3407 int i;
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3408 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
3409 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
3410 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
3411 }else{
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3412 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
3413 #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
3414 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
3415 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
3416 #undef T
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3417 }
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3418 }
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3419 if(s->dsp.h264_idct8_add == ff_h264_idct8_add_c){
8646
8b52ac19a91c remove zigzag_scan8x8, it is the same as ff_zigzag_direct
stefang
parents: 8627
diff changeset
3420 memcpy(h->zigzag_scan8x8, ff_zigzag_direct, 64*sizeof(uint8_t));
5160
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3421 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
3422 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
3423 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
3424 }else{
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3425 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
3426 #define T(x) (x>>3) | ((x&7)<<3)
8646
8b52ac19a91c remove zigzag_scan8x8, it is the same as ff_zigzag_direct
stefang
parents: 8627
diff changeset
3427 h->zigzag_scan8x8[i] = T(ff_zigzag_direct[i]);
5160
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3428 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
3429 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
3430 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
3431 #undef T
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3432 }
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3433 }
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3434 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
3435 h->zigzag_scan_q0 = zigzag_scan;
8646
8b52ac19a91c remove zigzag_scan8x8, it is the same as ff_zigzag_direct
stefang
parents: 8627
diff changeset
3436 h->zigzag_scan8x8_q0 = ff_zigzag_direct;
5160
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3437 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
3438 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
3439 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
3440 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
3441 }else{
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3442 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
3443 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
3444 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
3445 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
3446 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
3447 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
3448 }
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3449 }
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3450
9417
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3451 static void field_end(H264Context *h){
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3452 MpegEncContext * const s = &h->s;
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3453 AVCodecContext * const avctx= s->avctx;
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3454 s->mb_y= 0;
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3455
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3456 s->current_picture_ptr->qscale_type= FF_QSCALE_TYPE_H264;
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3457 s->current_picture_ptr->pict_type= s->pict_type;
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3458
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3459 if (CONFIG_H264_VDPAU_DECODER && s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3460 ff_vdpau_h264_set_reference_frames(s);
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3461
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3462 if(!s->dropable) {
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3463 execute_ref_pic_marking(h, h->mmco, h->mmco_index);
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3464 h->prev_poc_msb= h->poc_msb;
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3465 h->prev_poc_lsb= h->poc_lsb;
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3466 }
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3467 h->prev_frame_num_offset= h->frame_num_offset;
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3468 h->prev_frame_num= h->frame_num;
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3469
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3470 if (avctx->hwaccel) {
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3471 if (avctx->hwaccel->end_frame(avctx) < 0)
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3472 av_log(avctx, AV_LOG_ERROR, "hardware accelerator failed to decode picture\n");
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3473 }
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3474
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3475 if (CONFIG_H264_VDPAU_DECODER && s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3476 ff_vdpau_h264_picture_complete(s);
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3477
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3478 /*
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3479 * FIXME: Error handling code does not seem to support interlaced
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3480 * when slices span multiple rows
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3481 * The ff_er_add_slice calls don't work right for bottom
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3482 * fields; they cause massive erroneous error concealing
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3483 * Error marking covers both fields (top and bottom).
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3484 * This causes a mismatched s->error_count
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3485 * and a bad error table. Further, the error count goes to
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3486 * INT_MAX when called for bottom field, because mb_y is
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3487 * past end by one (callers fault) and resync_mb_y != 0
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3488 * causes problems for the first MB line, too.
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3489 */
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3490 if (!FIELD_PICTURE)
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3491 ff_er_frame_end(s);
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3492
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3493 MPV_frame_end(s);
9419
f2f83796f07b Fix 2 access units in a packet mp4s.
michael
parents: 9418
diff changeset
3494
f2f83796f07b Fix 2 access units in a packet mp4s.
michael
parents: 9418
diff changeset
3495 h->current_slice=0;
9417
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3496 }
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
3497
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3498 /**
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3499 * Replicates H264 "master" context to thread contexts.
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3500 */
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3501 static void clone_slice(H264Context *dst, H264Context *src)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3502 {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3503 memcpy(dst->block_offset, src->block_offset, sizeof(dst->block_offset));
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3504 dst->s.current_picture_ptr = src->s.current_picture_ptr;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3505 dst->s.current_picture = src->s.current_picture;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3506 dst->s.linesize = src->s.linesize;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3507 dst->s.uvlinesize = src->s.uvlinesize;
5798
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3508 dst->s.first_field = src->s.first_field;
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3509
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3510 dst->prev_poc_msb = src->prev_poc_msb;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3511 dst->prev_poc_lsb = src->prev_poc_lsb;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3512 dst->prev_frame_num_offset = src->prev_frame_num_offset;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3513 dst->prev_frame_num = src->prev_frame_num;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3514 dst->short_ref_count = src->short_ref_count;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3515
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3516 memcpy(dst->short_ref, src->short_ref, sizeof(dst->short_ref));
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3517 memcpy(dst->long_ref, src->long_ref, sizeof(dst->long_ref));
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3518 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
3519 memcpy(dst->ref_list, src->ref_list, sizeof(dst->ref_list));
5685
070a376d496b fix image corruption when with multi-threaded decoding.
gpoirier
parents: 5647
diff changeset
3520
070a376d496b fix image corruption when with multi-threaded decoding.
gpoirier
parents: 5647
diff changeset
3521 memcpy(dst->dequant4_coeff, src->dequant4_coeff, sizeof(src->dequant4_coeff));
070a376d496b fix image corruption when with multi-threaded decoding.
gpoirier
parents: 5647
diff changeset
3522 memcpy(dst->dequant8_coeff, src->dequant8_coeff, sizeof(src->dequant8_coeff));
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3523 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3524
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3525 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3526 * decodes a slice header.
6918
c1b722b79649 cosmetics: spelling typo fixes
diego
parents: 6903
diff changeset
3527 * This will also call MPV_common_init() and frame_start() as needed.
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3528 *
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3529 * @param h h264context
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3530 * @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
3531 *
6524
01647ac078a7 typo: occured --> occurred
diego
parents: 6517
diff changeset
3532 * @return 0 if okay, <0 if an error occurred, 1 if decoding must not be multithreaded
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3533 */
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3534 static int decode_slice_header(H264Context *h, H264Context *h0){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3535 MpegEncContext * const s = &h->s;
5798
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3536 MpegEncContext * const s0 = &h0->s;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3537 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
3538 unsigned int pps_id;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3539 int num_ref_idx_active_override_flag;
7332
b1003e468c3d Fix used references indexes in the loop filter.
michael
parents: 7327
diff changeset
3540 unsigned int slice_type, tmp, i, j;
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3541 int default_ref_list_done = 0;
5798
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3542 int last_pic_structure;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3543
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
3544 s->dropable= h->nal_ref_idc == 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3545
5984
ba13cc3e38bb Initialize function pointers used by error resilience code before any
heydowns
parents: 5963
diff changeset
3546 if((s->avctx->flags2 & CODEC_FLAG2_FAST) && !h->nal_ref_idc){
ba13cc3e38bb Initialize function pointers used by error resilience code before any
heydowns
parents: 5963
diff changeset
3547 s->me.qpel_put= s->dsp.put_2tap_qpel_pixels_tab;
ba13cc3e38bb Initialize function pointers used by error resilience code before any
heydowns
parents: 5963
diff changeset
3548 s->me.qpel_avg= s->dsp.avg_2tap_qpel_pixels_tab;
ba13cc3e38bb Initialize function pointers used by error resilience code before any
heydowns
parents: 5963
diff changeset
3549 }else{
ba13cc3e38bb Initialize function pointers used by error resilience code before any
heydowns
parents: 5963
diff changeset
3550 s->me.qpel_put= s->dsp.put_h264_qpel_pixels_tab;
ba13cc3e38bb Initialize function pointers used by error resilience code before any
heydowns
parents: 5963
diff changeset
3551 s->me.qpel_avg= s->dsp.avg_h264_qpel_pixels_tab;
ba13cc3e38bb Initialize function pointers used by error resilience code before any
heydowns
parents: 5963
diff changeset
3552 }
ba13cc3e38bb Initialize function pointers used by error resilience code before any
heydowns
parents: 5963
diff changeset
3553
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3554 first_mb_in_slice= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3555
9419
f2f83796f07b Fix 2 access units in a packet mp4s.
michael
parents: 9418
diff changeset
3556 if(first_mb_in_slice == 0){ //FIXME better field boundary detection
f2f83796f07b Fix 2 access units in a packet mp4s.
michael
parents: 9418
diff changeset
3557 if(h0->current_slice && FIELD_PICTURE){
f2f83796f07b Fix 2 access units in a packet mp4s.
michael
parents: 9418
diff changeset
3558 field_end(h);
f2f83796f07b Fix 2 access units in a packet mp4s.
michael
parents: 9418
diff changeset
3559 }
f2f83796f07b Fix 2 access units in a packet mp4s.
michael
parents: 9418
diff changeset
3560
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3561 h0->current_slice = 0;
5798
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3562 if (!s0->first_field)
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
3563 s->current_picture_ptr= NULL;
4616
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
3564 }
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
3565
8451
384600e3fe5b Use get_ue_golomb_31() where possible, almost all are just in headers
michael
parents: 8448
diff changeset
3566 slice_type= get_ue_golomb_31(&s->gb);
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3567 if(slice_type > 9){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3568 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
3569 return -1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3570 }
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3571 if(slice_type > 4){
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3572 slice_type -= 5;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3573 h->slice_type_fixed=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3574 }else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3575 h->slice_type_fixed=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3576
8206
5f399949a6a6 Use golomb_to_pict_type instead of its duplicate, slice_type_map.
diego
parents: 8140
diff changeset
3577 slice_type= golomb_to_pict_type[ slice_type ];
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6429
diff changeset
3578 if (slice_type == FF_I_TYPE
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3579 || (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
3580 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
3581 }
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3582 h->slice_type= slice_type;
7338
b088035801d5 Simplify slice type checks.
michael
parents: 7337
diff changeset
3583 h->slice_type_nos= slice_type & 3;
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3584
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
3585 s->pict_type= h->slice_type; // to make a few old functions happy, it's wrong though
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6429
diff changeset
3586 if (s->pict_type == FF_B_TYPE && s0->last_picture_ptr == NULL) {
6016
5455f4e43948 Make h264 decoder conform to requirements of mpegvideo's MPV_frame_start.
heydowns
parents: 6014
diff changeset
3587 av_log(h->s.avctx, AV_LOG_ERROR,
5455f4e43948 Make h264 decoder conform to requirements of mpegvideo's MPV_frame_start.
heydowns
parents: 6014
diff changeset
3588 "B picture before any references, skipping\n");
5455f4e43948 Make h264 decoder conform to requirements of mpegvideo's MPV_frame_start.
heydowns
parents: 6014
diff changeset
3589 return -1;
5455f4e43948 Make h264 decoder conform to requirements of mpegvideo's MPV_frame_start.
heydowns
parents: 6014
diff changeset
3590 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3591
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3592 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
3593 if(pps_id>=MAX_PPS_COUNT){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3594 av_log(h->s.avctx, AV_LOG_ERROR, "pps_id out of range\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3595 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3596 }
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3597 if(!h0->pps_buffers[pps_id]) {
9112
79818b0595c0 When a H.264 stream references a PPS or SPS id which doesn't exist, instead of
takis
parents: 9108
diff changeset
3598 av_log(h->s.avctx, AV_LOG_ERROR, "non-existing PPS %u referenced\n", pps_id);
1174
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
3599 return -1;
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
3600 }
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3601 h->pps= *h0->pps_buffers[pps_id];
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3602
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3603 if(!h0->sps_buffers[h->pps.sps_id]) {
9112
79818b0595c0 When a H.264 stream references a PPS or SPS id which doesn't exist, instead of
takis
parents: 9108
diff changeset
3604 av_log(h->s.avctx, AV_LOG_ERROR, "non-existing SPS %u referenced\n", h->pps.sps_id);
1174
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
3605 return -1;
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
3606 }
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3607 h->sps = *h0->sps_buffers[h->pps.sps_id];
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3608
5685
070a376d496b fix image corruption when with multi-threaded decoding.
gpoirier
parents: 5647
diff changeset
3609 if(h == h0 && h->dequant_coeff_pps != pps_id){
4363
9b7662fa4905 remove useless cast that makes code unreadable
gpoirier
parents: 4362
diff changeset
3610 h->dequant_coeff_pps = pps_id;
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3611 init_dequant_tables(h);
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3612 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3613
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3614 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
3615 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
3616
3178
bd995b8c64fd Alignment fixes, caused problems on SPARC.
diego
parents: 3177
diff changeset
3617 h->b_stride= s->mb_width*4;
bd995b8c64fd Alignment fixes, caused problems on SPARC.
diego
parents: 3177
diff changeset
3618 h->b8_stride= s->mb_width*2;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3619
6581
e6d8c5bbeeac Avoid crash with idiotic cropping. Fixes crash with CVFC1_Sony_C.jsv
michael
parents: 6524
diff changeset
3620 s->width = 16*s->mb_width - 2*FFMIN(h->sps.crop_right, 7);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3621 if(h->sps.frame_mbs_only_flag)
6581
e6d8c5bbeeac Avoid crash with idiotic cropping. Fixes crash with CVFC1_Sony_C.jsv
michael
parents: 6524
diff changeset
3622 s->height= 16*s->mb_height - 2*FFMIN(h->sps.crop_bottom, 7);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3623 else
6581
e6d8c5bbeeac Avoid crash with idiotic cropping. Fixes crash with CVFC1_Sony_C.jsv
michael
parents: 6524
diff changeset
3624 s->height= 16*s->mb_height - 4*FFMIN(h->sps.crop_bottom, 3);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3625
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3626 if (s->context_initialized
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
3627 && ( s->width != s->avctx->width || s->height != s->avctx->height)) {
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3628 if(h != h0)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3629 return -1; // width / height changed during parallelized decoding
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3630 free_tables(h);
8231
0df3402e6b41 Fix segfault due to deallocated entries in delayed_pic after size change.
michael
parents: 8216
diff changeset
3631 flush_dpb(s->avctx);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3632 MPV_common_end(s);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3633 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3634 if (!s->context_initialized) {
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3635 if(h != h0)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3636 return -1; // we cant (re-)initialize context during parallel decoding
10565
26dc0444fa93 Call ff_find_hwaccel() after calling avcodec_set_dimensions().
cehoyos
parents: 10560
diff changeset
3637
26dc0444fa93 Call ff_find_hwaccel() after calling avcodec_set_dimensions().
cehoyos
parents: 10560
diff changeset
3638 avcodec_set_dimensions(s->avctx, s->width, s->height);
26dc0444fa93 Call ff_find_hwaccel() after calling avcodec_set_dimensions().
cehoyos
parents: 10560
diff changeset
3639 s->avctx->sample_aspect_ratio= h->sps.sar;
26dc0444fa93 Call ff_find_hwaccel() after calling avcodec_set_dimensions().
cehoyos
parents: 10560
diff changeset
3640 if(!s->avctx->sample_aspect_ratio.den)
26dc0444fa93 Call ff_find_hwaccel() after calling avcodec_set_dimensions().
cehoyos
parents: 10560
diff changeset
3641 s->avctx->sample_aspect_ratio.den = 1;
26dc0444fa93 Call ff_find_hwaccel() after calling avcodec_set_dimensions().
cehoyos
parents: 10560
diff changeset
3642
10837
e5905bfa625d Export fullrange flag and color information for h.264
conrad
parents: 10829
diff changeset
3643 if(h->sps.video_signal_type_present_flag){
e5905bfa625d Export fullrange flag and color information for h.264
conrad
parents: 10829
diff changeset
3644 s->avctx->color_range = h->sps.full_range ? AVCOL_RANGE_JPEG : AVCOL_RANGE_MPEG;
e5905bfa625d Export fullrange flag and color information for h.264
conrad
parents: 10829
diff changeset
3645 if(h->sps.colour_description_present_flag){
e5905bfa625d Export fullrange flag and color information for h.264
conrad
parents: 10829
diff changeset
3646 s->avctx->color_primaries = h->sps.color_primaries;
e5905bfa625d Export fullrange flag and color information for h.264
conrad
parents: 10829
diff changeset
3647 s->avctx->color_trc = h->sps.color_trc;
e5905bfa625d Export fullrange flag and color information for h.264
conrad
parents: 10829
diff changeset
3648 s->avctx->colorspace = h->sps.colorspace;
e5905bfa625d Export fullrange flag and color information for h.264
conrad
parents: 10829
diff changeset
3649 }
e5905bfa625d Export fullrange flag and color information for h.264
conrad
parents: 10829
diff changeset
3650 }
e5905bfa625d Export fullrange flag and color information for h.264
conrad
parents: 10829
diff changeset
3651
10565
26dc0444fa93 Call ff_find_hwaccel() after calling avcodec_set_dimensions().
cehoyos
parents: 10560
diff changeset
3652 if(h->sps.timing_info_present_flag){
26dc0444fa93 Call ff_find_hwaccel() after calling avcodec_set_dimensions().
cehoyos
parents: 10560
diff changeset
3653 s->avctx->time_base= (AVRational){h->sps.num_units_in_tick, h->sps.time_scale};
26dc0444fa93 Call ff_find_hwaccel() after calling avcodec_set_dimensions().
cehoyos
parents: 10560
diff changeset
3654 if(h->x264_build > 0 && h->x264_build < 44)
26dc0444fa93 Call ff_find_hwaccel() after calling avcodec_set_dimensions().
cehoyos
parents: 10560
diff changeset
3655 s->avctx->time_base.den *= 2;
26dc0444fa93 Call ff_find_hwaccel() after calling avcodec_set_dimensions().
cehoyos
parents: 10560
diff changeset
3656 av_reduce(&s->avctx->time_base.num, &s->avctx->time_base.den,
26dc0444fa93 Call ff_find_hwaccel() after calling avcodec_set_dimensions().
cehoyos
parents: 10560
diff changeset
3657 s->avctx->time_base.num, s->avctx->time_base.den, 1<<30);
26dc0444fa93 Call ff_find_hwaccel() after calling avcodec_set_dimensions().
cehoyos
parents: 10560
diff changeset
3658 }
26dc0444fa93 Call ff_find_hwaccel() after calling avcodec_set_dimensions().
cehoyos
parents: 10560
diff changeset
3659 s->avctx->pix_fmt = s->avctx->get_format(s->avctx, s->avctx->codec->pix_fmts);
26dc0444fa93 Call ff_find_hwaccel() after calling avcodec_set_dimensions().
cehoyos
parents: 10560
diff changeset
3660 s->avctx->hwaccel = ff_find_hwaccel(s->avctx->codec->id, s->avctx->pix_fmt);
26dc0444fa93 Call ff_find_hwaccel() after calling avcodec_set_dimensions().
cehoyos
parents: 10560
diff changeset
3661
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3662 if (MPV_common_init(s) < 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3663 return -1;
5798
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3664 s->first_field = 0;
9831
febe1855b64a Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents: 9790
diff changeset
3665 h->prev_interlaced_frame = 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3666
5160
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3667 init_scan_tables(h);
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
3668 ff_h264_alloc_tables(h);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3669
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3670 for(i = 1; i < s->avctx->thread_count; i++) {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3671 H264Context *c;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3672 c = h->thread_context[i] = av_malloc(sizeof(H264Context));
6193
52ccab2531bd Fix memory leak in h264 decoder. allocated_edge_emu_buffer was being allocated
heydowns
parents: 6190
diff changeset
3673 memcpy(c, h->s.thread_context[i], sizeof(MpegEncContext));
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3674 memset(&c->s + 1, 0, sizeof(H264Context) - sizeof(MpegEncContext));
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3675 c->sps = h->sps;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3676 c->pps = h->pps;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3677 init_scan_tables(c);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3678 clone_tables(c, h);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3679 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3680
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3681 for(i = 0; i < s->avctx->thread_count; i++)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3682 if(context_init(h->thread_context[i]) < 0)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3683 return -1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3684 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3685
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3686 h->frame_num= get_bits(&s->gb, h->sps.log2_max_frame_num);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3687
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3688 h->mb_mbaff = 0;
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3689 h->mb_aff_frame = 0;
5798
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3690 last_pic_structure = s0->picture_structure;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3691 if(h->sps.frame_mbs_only_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3692 s->picture_structure= PICT_FRAME;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3693 }else{
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3694 if(get_bits1(&s->gb)) { //field_pic_flag
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3695 s->picture_structure= PICT_TOP_FIELD + get_bits1(&s->gb); //bottom_field_flag
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3696 } else {
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3697 s->picture_structure= PICT_FRAME;
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3698 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
3699 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3700 }
7468
38e9f32f8d43 mb_field_decoding_flag was not initialized
michael
parents: 7462
diff changeset
3701 h->mb_field_decoding_flag= s->picture_structure != PICT_FRAME;
5723
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
3702
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
3703 if(h0->current_slice == 0){
7350
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3704 while(h->frame_num != h->prev_frame_num &&
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3705 h->frame_num != (h->prev_frame_num+1)%(1<<h->sps.log2_max_frame_num)){
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3706 av_log(NULL, AV_LOG_DEBUG, "Frame num gap %d %d\n", h->frame_num, h->prev_frame_num);
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
3707 if (ff_h264_frame_start(h) < 0)
9004
aae80543bc6e Check return value of frame_start(), this avoids a crash if AVCodecContext::get_buffer failed.
reimar
parents: 8996
diff changeset
3708 return -1;
7350
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3709 h->prev_frame_num++;
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3710 h->prev_frame_num %= 1<<h->sps.log2_max_frame_num;
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3711 s->current_picture_ptr->frame_num= h->prev_frame_num;
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3712 execute_ref_pic_marking(h, NULL, 0);
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3713 }
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3714
5798
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3715 /* See if we have a decoded first field looking for a pair... */
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3716 if (s0->first_field) {
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3717 assert(s0->current_picture_ptr);
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3718 assert(s0->current_picture_ptr->data[0]);
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3719 assert(s0->current_picture_ptr->reference != DELAYED_PIC_REF);
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3720
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3721 /* figure out if we have a complementary field pair */
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3722 if (!FIELD_PICTURE || s->picture_structure == last_pic_structure) {
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3723 /*
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3724 * Previous field is unmatched. Don't display it, but let it
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3725 * remain for reference if marked as such.
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3726 */
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3727 s0->current_picture_ptr = NULL;
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3728 s0->first_field = FIELD_PICTURE;
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3729
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3730 } else {
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3731 if (h->nal_ref_idc &&
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3732 s0->current_picture_ptr->reference &&
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3733 s0->current_picture_ptr->frame_num != h->frame_num) {
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3734 /*
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3735 * This and previous field were reference, but had
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3736 * different frame_nums. Consider this field first in
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3737 * pair. Throw away previous field except for reference
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3738 * purposes.
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3739 */
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3740 s0->first_field = 1;
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3741 s0->current_picture_ptr = NULL;
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3742
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3743 } else {
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3744 /* Second field in complementary pair */
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3745 s0->first_field = 0;
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3746 }
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3747 }
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3748
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3749 } else {
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3750 /* Frame or first field in a potentially complementary pair */
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3751 assert(!s0->current_picture_ptr);
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3752 s0->first_field = FIELD_PICTURE;
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3753 }
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3754
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
3755 if((!FIELD_PICTURE || s0->first_field) && ff_h264_frame_start(h) < 0) {
5798
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3756 s0->first_field = 0;
5723
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
3757 return -1;
5798
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3758 }
5723
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
3759 }
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
3760 if(h != h0)
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
3761 clone_slice(h, h0);
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
3762
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
3763 s->current_picture_ptr->frame_num= h->frame_num; //FIXME frame_num cleanup
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
3764
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3765 assert(s->mb_num == s->mb_width * s->mb_height);
5781
0b3aa6f4c313 Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents: 5780
diff changeset
3766 if(first_mb_in_slice << FIELD_OR_MBAFF_PICTURE >= s->mb_num ||
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3767 first_mb_in_slice >= s->mb_num){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3768 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
3769 return -1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3770 }
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3771 s->resync_mb_x = s->mb_x = first_mb_in_slice % s->mb_width;
5781
0b3aa6f4c313 Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents: 5780
diff changeset
3772 s->resync_mb_y = s->mb_y = (first_mb_in_slice / s->mb_width) << FIELD_OR_MBAFF_PICTURE;
0b3aa6f4c313 Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents: 5780
diff changeset
3773 if (s->picture_structure == PICT_BOTTOM_FIELD)
0b3aa6f4c313 Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents: 5780
diff changeset
3774 s->resync_mb_y = s->mb_y = s->mb_y + 1;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3775 assert(s->mb_y < s->mb_height);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3776
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3777 if(s->picture_structure==PICT_FRAME){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3778 h->curr_pic_num= h->frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3779 h->max_pic_num= 1<< h->sps.log2_max_frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3780 }else{
5772
65b71bd21a4d Fix h->curr_pic_num for field pictures. Necessary for proper PAFF support.
andoma
parents: 5771
diff changeset
3781 h->curr_pic_num= 2*h->frame_num + 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3782 h->max_pic_num= 1<<(h->sps.log2_max_frame_num + 1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3783 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3784
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3785 if(h->nal_unit_type == NAL_IDR_SLICE){
1453
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
3786 get_ue_golomb(&s->gb); /* idr_pic_id */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3787 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3788
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3789 if(h->sps.poc_type==0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3790 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
3791
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3792 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3793 h->delta_poc_bottom= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3794 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3795 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3796
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3797 if(h->sps.poc_type==1 && !h->sps.delta_pic_order_always_zero_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3798 h->delta_poc[0]= get_se_golomb(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3799
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3800 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3801 h->delta_poc[1]= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3802 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3803
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3804 init_poc(h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3805
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3806 if(h->pps.redundant_pic_cnt_present){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3807 h->redundant_pic_count= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3808 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3809
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
3810 //set defaults, might be overridden a few lines later
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3811 h->ref_count[0]= h->pps.ref_count[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3812 h->ref_count[1]= h->pps.ref_count[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3813
7338
b088035801d5 Simplify slice type checks.
michael
parents: 7337
diff changeset
3814 if(h->slice_type_nos != FF_I_TYPE){
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
3815 if(h->slice_type_nos == FF_B_TYPE){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3816 h->direct_spatial_mv_pred= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3817 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3818 num_ref_idx_active_override_flag= get_bits1(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3819
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3820 if(num_ref_idx_active_override_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3821 h->ref_count[0]= get_ue_golomb(&s->gb) + 1;
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
3822 if(h->slice_type_nos==FF_B_TYPE)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3823 h->ref_count[1]= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3824
4532
c296efb7575e fix 2nd ref_count check
michael
parents: 4531
diff changeset
3825 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
3826 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
3827 h->ref_count[0]= h->ref_count[1]= 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3828 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3829 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3830 }
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
3831 if(h->slice_type_nos == FF_B_TYPE)
4532
c296efb7575e fix 2nd ref_count check
michael
parents: 4531
diff changeset
3832 h->list_count= 2;
c296efb7575e fix 2nd ref_count check
michael
parents: 4531
diff changeset
3833 else
c296efb7575e fix 2nd ref_count check
michael
parents: 4531
diff changeset
3834 h->list_count= 1;
c296efb7575e fix 2nd ref_count check
michael
parents: 4531
diff changeset
3835 }else
c296efb7575e fix 2nd ref_count check
michael
parents: 4531
diff changeset
3836 h->list_count= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3837
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3838 if(!default_ref_list_done){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3839 fill_default_ref_list(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3840 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3841
7417
5b281979b60e Simple refactoring to resolve a FIXME. Patch by Paul Kendall.
darkshikari
parents: 7408
diff changeset
3842 if(h->slice_type_nos!=FF_I_TYPE && decode_ref_pic_list_reordering(h) < 0)
2766
0609f405e000 make decoder a little bit more tolerant to missing NAL units
michael
parents: 2763
diff changeset
3843 return -1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3844
7921
44570b9b3aa1 Initialize next/last_picture* as the generic code does not always
michael
parents: 7920
diff changeset
3845 if(h->slice_type_nos!=FF_I_TYPE){
44570b9b3aa1 Initialize next/last_picture* as the generic code does not always
michael
parents: 7920
diff changeset
3846 s->last_picture_ptr= &h->ref_list[0][0];
7974
2b20ad98e424 Rename copy_picture to ff_copy_picture.
cehoyos
parents: 7928
diff changeset
3847 ff_copy_picture(&s->last_picture, s->last_picture_ptr);
7921
44570b9b3aa1 Initialize next/last_picture* as the generic code does not always
michael
parents: 7920
diff changeset
3848 }
44570b9b3aa1 Initialize next/last_picture* as the generic code does not always
michael
parents: 7920
diff changeset
3849 if(h->slice_type_nos==FF_B_TYPE){
44570b9b3aa1 Initialize next/last_picture* as the generic code does not always
michael
parents: 7920
diff changeset
3850 s->next_picture_ptr= &h->ref_list[1][0];
7974
2b20ad98e424 Rename copy_picture to ff_copy_picture.
cehoyos
parents: 7928
diff changeset
3851 ff_copy_picture(&s->next_picture, s->next_picture_ptr);
7921
44570b9b3aa1 Initialize next/last_picture* as the generic code does not always
michael
parents: 7920
diff changeset
3852 }
44570b9b3aa1 Initialize next/last_picture* as the generic code does not always
michael
parents: 7920
diff changeset
3853
7339
7d5cc12d8fe2 Remove superfluous ().
michael
parents: 7338
diff changeset
3854 if( (h->pps.weighted_pred && h->slice_type_nos == FF_P_TYPE )
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
3855 || (h->pps.weighted_bipred_idc==1 && h->slice_type_nos== FF_B_TYPE ) )
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3856 pred_weight_table(h);
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
3857 else if(h->pps.weighted_bipred_idc==2 && h->slice_type_nos== FF_B_TYPE)
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3858 implicit_weight_table(h);
8735
5d7ebbb7e91b Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents: 8727
diff changeset
3859 else {
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3860 h->use_weight = 0;
8735
5d7ebbb7e91b Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents: 8727
diff changeset
3861 for (i = 0; i < 2; i++) {
5d7ebbb7e91b Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents: 8727
diff changeset
3862 h->luma_weight_flag[i] = 0;
5d7ebbb7e91b Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents: 8727
diff changeset
3863 h->chroma_weight_flag[i] = 0;
5d7ebbb7e91b Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents: 8727
diff changeset
3864 }
5d7ebbb7e91b Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents: 8727
diff changeset
3865 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3866
5723
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
3867 if(h->nal_ref_idc)
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3868 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
3869
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3870 if(FRAME_MBAFF)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3871 fill_mbaff_ref_list(h);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3872
7897
004f3c69fe7b Move direct_dist_scale_factor() and direct_ref_list_init() after fill_mbaff_ref_list()
michael
parents: 7896
diff changeset
3873 if(h->slice_type_nos==FF_B_TYPE && !h->direct_spatial_mv_pred)
004f3c69fe7b Move direct_dist_scale_factor() and direct_ref_list_init() after fill_mbaff_ref_list()
michael
parents: 7896
diff changeset
3874 direct_dist_scale_factor(h);
004f3c69fe7b Move direct_dist_scale_factor() and direct_ref_list_init() after fill_mbaff_ref_list()
michael
parents: 7896
diff changeset
3875 direct_ref_list_init(h);
004f3c69fe7b Move direct_dist_scale_factor() and direct_ref_list_init() after fill_mbaff_ref_list()
michael
parents: 7896
diff changeset
3876
7338
b088035801d5 Simplify slice type checks.
michael
parents: 7337
diff changeset
3877 if( h->slice_type_nos != FF_I_TYPE && h->pps.cabac ){
8451
384600e3fe5b Use get_ue_golomb_31() where possible, almost all are just in headers
michael
parents: 8448
diff changeset
3878 tmp = get_ue_golomb_31(&s->gb);
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3879 if(tmp > 2){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3880 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
3881 return -1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3882 }
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3883 h->cabac_init_idc= tmp;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3884 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3885
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3886 h->last_qscale_diff = 0;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3887 tmp = h->pps.init_qp + get_se_golomb(&s->gb);
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3888 if(tmp>51){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3889 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
3890 return -1;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
3891 }
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3892 s->qscale= tmp;
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
3893 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
3894 h->chroma_qp[1] = get_chroma_qp(h, 1, s->qscale);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3895 //FIXME qscale / qp ... stuff
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6429
diff changeset
3896 if(h->slice_type == FF_SP_TYPE){
1453
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
3897 get_bits1(&s->gb); /* sp_for_switch_flag */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3898 }
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6429
diff changeset
3899 if(h->slice_type==FF_SP_TYPE || h->slice_type == FF_SI_TYPE){
1453
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
3900 get_se_golomb(&s->gb); /* slice_qs_delta */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3901 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3902
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3903 h->deblocking_filter = 1;
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
3904 h->slice_alpha_c0_offset = 0;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
3905 h->slice_beta_offset = 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3906 if( h->pps.deblocking_filter_parameters_present ) {
8451
384600e3fe5b Use get_ue_golomb_31() where possible, almost all are just in headers
michael
parents: 8448
diff changeset
3907 tmp= get_ue_golomb_31(&s->gb);
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3908 if(tmp > 2){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3909 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
3910 return -1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3911 }
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3912 h->deblocking_filter= tmp;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3913 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
3914 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
3915
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3916 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
3917 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
3918 h->slice_beta_offset = get_se_golomb(&s->gb) << 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3919 }
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
3920 }
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3921
5698
9a26cb6747a9 Apply skip_loop_filter before checking if we can parallelize with the selected
reimar
parents: 5694
diff changeset
3922 if( s->avctx->skip_loop_filter >= AVDISCARD_ALL
7340
ef40221c1452 SI/SP slice support. (not bitexact)
michael
parents: 7339
diff changeset
3923 ||(s->avctx->skip_loop_filter >= AVDISCARD_NONKEY && h->slice_type_nos != FF_I_TYPE)
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
3924 ||(s->avctx->skip_loop_filter >= AVDISCARD_BIDIR && h->slice_type_nos == FF_B_TYPE)
5698
9a26cb6747a9 Apply skip_loop_filter before checking if we can parallelize with the selected
reimar
parents: 5694
diff changeset
3925 ||(s->avctx->skip_loop_filter >= AVDISCARD_NONREF && h->nal_ref_idc == 0))
9a26cb6747a9 Apply skip_loop_filter before checking if we can parallelize with the selected
reimar
parents: 5694
diff changeset
3926 h->deblocking_filter= 0;
9a26cb6747a9 Apply skip_loop_filter before checking if we can parallelize with the selected
reimar
parents: 5694
diff changeset
3927
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3928 if(h->deblocking_filter == 1 && h0->max_contexts > 1) {
5646
adc9ec0f7385 Let H.264 decoder skip deblocking across slices
benoit
parents: 5643
diff changeset
3929 if(s->avctx->flags2 & CODEC_FLAG2_FAST) {
adc9ec0f7385 Let H.264 decoder skip deblocking across slices
benoit
parents: 5643
diff changeset
3930 /* Cheat slightly for speed:
6029
fc51a6ffa64f cosmetics: comment typo fixes
diego
parents: 6020
diff changeset
3931 Do not bother to deblock across slices. */
5646
adc9ec0f7385 Let H.264 decoder skip deblocking across slices
benoit
parents: 5643
diff changeset
3932 h->deblocking_filter = 2;
adc9ec0f7385 Let H.264 decoder skip deblocking across slices
benoit
parents: 5643
diff changeset
3933 } else {
5647
7c139ea9065e Indentation
benoit
parents: 5646
diff changeset
3934 h0->max_contexts = 1;
7c139ea9065e Indentation
benoit
parents: 5646
diff changeset
3935 if(!h0->single_decode_warning) {
7c139ea9065e Indentation
benoit
parents: 5646
diff changeset
3936 av_log(s->avctx, AV_LOG_INFO, "Cannot parallelize deblocking type 1, decoding such frames in sequential order\n");
7c139ea9065e Indentation
benoit
parents: 5646
diff changeset
3937 h0->single_decode_warning = 1;
7c139ea9065e Indentation
benoit
parents: 5646
diff changeset
3938 }
7c139ea9065e Indentation
benoit
parents: 5646
diff changeset
3939 if(h != h0)
7c139ea9065e Indentation
benoit
parents: 5646
diff changeset
3940 return 1; // deblocking switched inside frame
5646
adc9ec0f7385 Let H.264 decoder skip deblocking across slices
benoit
parents: 5643
diff changeset
3941 }
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3942 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3943
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3944 #if 0 //FMO
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3945 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
3946 slice_group_change_cycle= get_bits(&s->gb, ?);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3947 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3948
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3949 h0->last_slice_type = slice_type;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3950 h->slice_num = ++h0->current_slice;
8079
2d3c7cd7d143 Replace literally hardcoded max slice number by named constant.
michael
parents: 8042
diff changeset
3951 if(h->slice_num >= MAX_SLICES){
2d3c7cd7d143 Replace literally hardcoded max slice number by named constant.
michael
parents: 8042
diff changeset
3952 av_log(s->avctx, AV_LOG_ERROR, "Too many slices, increase MAX_SLICES and recompile\n");
2d3c7cd7d143 Replace literally hardcoded max slice number by named constant.
michael
parents: 8042
diff changeset
3953 }
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
3954
7343
9a4cb430d8ff Loop filtering with multiple slice types fix.
michael
parents: 7341
diff changeset
3955 for(j=0; j<2; j++){
8079
2d3c7cd7d143 Replace literally hardcoded max slice number by named constant.
michael
parents: 8042
diff changeset
3956 int *ref2frm= h->ref2frm[h->slice_num&(MAX_SLICES-1)][j];
7343
9a4cb430d8ff Loop filtering with multiple slice types fix.
michael
parents: 7341
diff changeset
3957 ref2frm[0]=
9a4cb430d8ff Loop filtering with multiple slice types fix.
michael
parents: 7341
diff changeset
3958 ref2frm[1]= -1;
7526
3749f13a0d02 Use the correct reference tables for interlaced MBAFF MBs in the loop filter.
michael
parents: 7525
diff changeset
3959 for(i=0; i<16; i++)
7343
9a4cb430d8ff Loop filtering with multiple slice types fix.
michael
parents: 7341
diff changeset
3960 ref2frm[i+2]= 4*h->ref_list[j][i].frame_num
9a4cb430d8ff Loop filtering with multiple slice types fix.
michael
parents: 7341
diff changeset
3961 +(h->ref_list[j][i].reference&3);
7526
3749f13a0d02 Use the correct reference tables for interlaced MBAFF MBs in the loop filter.
michael
parents: 7525
diff changeset
3962 ref2frm[18+0]=
3749f13a0d02 Use the correct reference tables for interlaced MBAFF MBs in the loop filter.
michael
parents: 7525
diff changeset
3963 ref2frm[18+1]= -1;
3749f13a0d02 Use the correct reference tables for interlaced MBAFF MBs in the loop filter.
michael
parents: 7525
diff changeset
3964 for(i=16; i<48; i++)
3749f13a0d02 Use the correct reference tables for interlaced MBAFF MBs in the loop filter.
michael
parents: 7525
diff changeset
3965 ref2frm[i+4]= 4*h->ref_list[j][i].frame_num
3749f13a0d02 Use the correct reference tables for interlaced MBAFF MBs in the loop filter.
michael
parents: 7525
diff changeset
3966 +(h->ref_list[j][i].reference&3);
7343
9a4cb430d8ff Loop filtering with multiple slice types fix.
michael
parents: 7341
diff changeset
3967 }
9a4cb430d8ff Loop filtering with multiple slice types fix.
michael
parents: 7341
diff changeset
3968
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3969 h->emu_edge_width= (s->flags&CODEC_FLAG_EMU_EDGE) ? 0 : 16;
5783
4b5dc5ad7410 Edge emulation for fields. Part of PAFF implementation
andoma
parents: 5782
diff changeset
3970 h->emu_edge_height= (FRAME_MBAFF || FIELD_PICTURE) ? 0 : h->emu_edge_width;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3971
8456
30f2b80242b2 export refs
michael
parents: 8454
diff changeset
3972 s->avctx->refs= h->sps.ref_frame_count;
30f2b80242b2 export refs
michael
parents: 8454
diff changeset
3973
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3974 if(s->avctx->debug&FF_DEBUG_PICT_INFO){
7920
b731ef917a01 Print which slices are IDR not just the slice type.
michael
parents: 7919
diff changeset
3975 av_log(h->s.avctx, AV_LOG_DEBUG, "slice:%d %s mb:%d %c%s%s pps:%u frame:%d poc:%d/%d ref:%d/%d qp:%d loop:%d:%d:%d weight:%d%s %s\n",
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3976 h->slice_num,
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3977 (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
3978 first_mb_in_slice,
7920
b731ef917a01 Print which slices are IDR not just the slice type.
michael
parents: 7919
diff changeset
3979 av_get_pict_type_char(h->slice_type), h->slice_type_fixed ? " fix" : "", h->nal_unit_type == NAL_IDR_SLICE ? " IDR" : "",
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3980 pps_id, h->frame_num,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3981 s->current_picture_ptr->field_poc[0], s->current_picture_ptr->field_poc[1],
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3982 h->ref_count[0], h->ref_count[1],
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3983 s->qscale,
2583
61a08e2b9822 display deblocking strength in FF_DEBUG_PICT_INFO
lorenm
parents: 2582
diff changeset
3984 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
3985 h->use_weight,
6890
5ddf098691d3 print direct_spatial_mv_pred
michael
parents: 6785
diff changeset
3986 h->use_weight==1 && h->use_weight_chroma ? "c" : "",
5ddf098691d3 print direct_spatial_mv_pred
michael
parents: 6785
diff changeset
3987 h->slice_type == FF_B_TYPE ? (h->direct_spatial_mv_pred ? "SPAT" : "TEMP") : ""
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3988 );
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3989 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3990
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3991 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3992 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3993
10829
46a247e54d6e Export get_slice_type() as ff_h264_get_slice_type().
ramiro
parents: 10826
diff changeset
3994 int ff_h264_get_slice_type(H264Context *h)
46a247e54d6e Export get_slice_type() as ff_h264_get_slice_type().
ramiro
parents: 10826
diff changeset
3995 {
46a247e54d6e Export get_slice_type() as ff_h264_get_slice_type().
ramiro
parents: 10826
diff changeset
3996 switch (h->slice_type) {
46a247e54d6e Export get_slice_type() as ff_h264_get_slice_type().
ramiro
parents: 10826
diff changeset
3997 case FF_P_TYPE: return 0;
46a247e54d6e Export get_slice_type() as ff_h264_get_slice_type().
ramiro
parents: 10826
diff changeset
3998 case FF_B_TYPE: return 1;
46a247e54d6e Export get_slice_type() as ff_h264_get_slice_type().
ramiro
parents: 10826
diff changeset
3999 case FF_I_TYPE: return 2;
46a247e54d6e Export get_slice_type() as ff_h264_get_slice_type().
ramiro
parents: 10826
diff changeset
4000 case FF_SP_TYPE: return 3;
46a247e54d6e Export get_slice_type() as ff_h264_get_slice_type().
ramiro
parents: 10826
diff changeset
4001 case FF_SI_TYPE: return 4;
46a247e54d6e Export get_slice_type() as ff_h264_get_slice_type().
ramiro
parents: 10826
diff changeset
4002 default: return -1;
46a247e54d6e Export get_slice_type() as ff_h264_get_slice_type().
ramiro
parents: 10826
diff changeset
4003 }
46a247e54d6e Export get_slice_type() as ff_h264_get_slice_type().
ramiro
parents: 10826
diff changeset
4004 }
46a247e54d6e Export get_slice_type() as ff_h264_get_slice_type().
ramiro
parents: 10826
diff changeset
4005
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4006 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4007 *
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4008 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4009 static inline int get_level_prefix(GetBitContext *gb){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4010 unsigned int buf;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4011 int log;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4012
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4013 OPEN_READER(re, gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4014 UPDATE_CACHE(re, gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4015 buf=GET_CACHE(re, gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4016
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4017 log= 32 - av_log2(buf);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4018 #ifdef TRACE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4019 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
4020 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
4021 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4022
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4023 LAST_SKIP_BITS(re, gb, log);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4024 CLOSE_READER(re, gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4025
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4026 return log-1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4027 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4028
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4029 static inline int get_dct8x8_allowed(H264Context *h){
8411
b749b637ecfa Optimize get_dct8x8_allowed().
michael
parents: 8405
diff changeset
4030 if(h->sps.direct_8x8_inference_flag)
b749b637ecfa Optimize get_dct8x8_allowed().
michael
parents: 8405
diff changeset
4031 return !(*(uint64_t*)h->sub_mb_type & ((MB_TYPE_16x8|MB_TYPE_8x16|MB_TYPE_8x8 )*0x0001000100010001ULL));
b749b637ecfa Optimize get_dct8x8_allowed().
michael
parents: 8405
diff changeset
4032 else
b749b637ecfa Optimize get_dct8x8_allowed().
michael
parents: 8405
diff changeset
4033 return !(*(uint64_t*)h->sub_mb_type & ((MB_TYPE_16x8|MB_TYPE_8x16|MB_TYPE_8x8|MB_TYPE_DIRECT2)*0x0001000100010001ULL));
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4034 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4035
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4036 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4037 * decodes a residual block.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4038 * @param n block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4039 * @param scantable scantable
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4040 * @param max_coeff number of coefficients in the block
6524
01647ac078a7 typo: occured --> occurred
diego
parents: 6517
diff changeset
4041 * @return <0 if an error occurred
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4042 */
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
4043 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
4044 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4045 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
4046 int level[16];
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4047 int zeros_left, coeff_num, coeff_token, total_coeff, i, j, trailing_ones, run_before;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4048
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4049 //FIXME put trailing_onex into the context
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4050
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4051 if(n == CHROMA_DC_BLOCK_INDEX){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4052 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
4053 total_coeff= coeff_token>>2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4054 }else{
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4055 if(n == LUMA_DC_BLOCK_INDEX){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4056 total_coeff= pred_non_zero_count(h, 0);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4057 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
4058 total_coeff= coeff_token>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4059 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4060 total_coeff= pred_non_zero_count(h, n);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4061 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
4062 total_coeff= coeff_token>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4063 h->non_zero_count_cache[ scan8[n] ]= total_coeff;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4064 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4065 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4066
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4067 //FIXME set last_non_zero?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4068
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4069 if(total_coeff==0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4070 return 0;
4391
20944c70a3c0 fix segfault with darkkben.free.fr/corrupted_h264.mp4
michael
parents: 4390
diff changeset
4071 if(total_coeff > (unsigned)max_coeff) {
20944c70a3c0 fix segfault with darkkben.free.fr/corrupted_h264.mp4
michael
parents: 4390
diff changeset
4072 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
4073 return -1;
758ba4a18478 fix crash when decoding a truncated H264 slice
gpoirier
parents: 4269
diff changeset
4074 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4075
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4076 trailing_ones= coeff_token&3;
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
4077 tprintf(h->s.avctx, "trailing:%d, total:%d\n", trailing_ones, total_coeff);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4078 assert(total_coeff<=16);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4079
8386
102b197185d1 Faster CAVLC decoding of trailing_ones. Based on a patch by dark shikari.
michael
parents: 8385
diff changeset
4080 i = show_bits(gb, 3);
102b197185d1 Faster CAVLC decoding of trailing_ones. Based on a patch by dark shikari.
michael
parents: 8385
diff changeset
4081 skip_bits(gb, trailing_ones);
102b197185d1 Faster CAVLC decoding of trailing_ones. Based on a patch by dark shikari.
michael
parents: 8385
diff changeset
4082 level[0] = 1-((i&4)>>1);
102b197185d1 Faster CAVLC decoding of trailing_ones. Based on a patch by dark shikari.
michael
parents: 8385
diff changeset
4083 level[1] = 1-((i&2) );
102b197185d1 Faster CAVLC decoding of trailing_ones. Based on a patch by dark shikari.
michael
parents: 8385
diff changeset
4084 level[2] = 1-((i&1)<<1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4085
8385
af35581ac2ca Replace i by trailing_ones, part of a patch by dark shikari.
michael
parents: 8384
diff changeset
4086 if(trailing_ones<total_coeff) {
8447
42198817a5ba Use the new VLC table for the first non trailing coeff too.
michael
parents: 8446
diff changeset
4087 int mask, prefix;
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4088 int suffix_length = total_coeff > 10 && trailing_ones < 3;
8447
42198817a5ba Use the new VLC table for the first non trailing coeff too.
michael
parents: 8446
diff changeset
4089 int bitsi= show_bits(gb, LEVEL_TAB_BITS);
42198817a5ba Use the new VLC table for the first non trailing coeff too.
michael
parents: 8446
diff changeset
4090 int level_code= cavlc_level_tab[suffix_length][bitsi][0];
42198817a5ba Use the new VLC table for the first non trailing coeff too.
michael
parents: 8446
diff changeset
4091
42198817a5ba Use the new VLC table for the first non trailing coeff too.
michael
parents: 8446
diff changeset
4092 skip_bits(gb, cavlc_level_tab[suffix_length][bitsi][1]);
42198817a5ba Use the new VLC table for the first non trailing coeff too.
michael
parents: 8446
diff changeset
4093 if(level_code >= 100){
42198817a5ba Use the new VLC table for the first non trailing coeff too.
michael
parents: 8446
diff changeset
4094 prefix= level_code - 100;
42198817a5ba Use the new VLC table for the first non trailing coeff too.
michael
parents: 8446
diff changeset
4095 if(prefix == LEVEL_TAB_BITS)
42198817a5ba Use the new VLC table for the first non trailing coeff too.
michael
parents: 8446
diff changeset
4096 prefix += get_level_prefix(gb);
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4097
8448
michael
parents: 8447
diff changeset
4098 //first coefficient has suffix_length equal to 0 or 1
michael
parents: 8447
diff changeset
4099 if(prefix<14){ //FIXME try to build a large unified VLC table for all this
michael
parents: 8447
diff changeset
4100 if(suffix_length)
9108
fdc0db1e0087 H.264: Simplify decode_residual()
alexc
parents: 9075
diff changeset
4101 level_code= (prefix<<1) + get_bits1(gb); //part
8448
michael
parents: 8447
diff changeset
4102 else
9108
fdc0db1e0087 H.264: Simplify decode_residual()
alexc
parents: 9075
diff changeset
4103 level_code= prefix; //part
8448
michael
parents: 8447
diff changeset
4104 }else if(prefix==14){
michael
parents: 8447
diff changeset
4105 if(suffix_length)
9108
fdc0db1e0087 H.264: Simplify decode_residual()
alexc
parents: 9075
diff changeset
4106 level_code= (prefix<<1) + get_bits1(gb); //part
8448
michael
parents: 8447
diff changeset
4107 else
michael
parents: 8447
diff changeset
4108 level_code= prefix + get_bits(gb, 4); //part
michael
parents: 8447
diff changeset
4109 }else{
9108
fdc0db1e0087 H.264: Simplify decode_residual()
alexc
parents: 9075
diff changeset
4110 level_code= 30 + get_bits(gb, prefix-3); //part
8448
michael
parents: 8447
diff changeset
4111 if(prefix>=16)
michael
parents: 8447
diff changeset
4112 level_code += (1<<(prefix-3))-4096;
michael
parents: 8447
diff changeset
4113 }
michael
parents: 8447
diff changeset
4114
michael
parents: 8447
diff changeset
4115 if(trailing_ones < 3) level_code += 2;
michael
parents: 8447
diff changeset
4116
michael
parents: 8447
diff changeset
4117 suffix_length = 2;
michael
parents: 8447
diff changeset
4118 mask= -(level_code&1);
michael
parents: 8447
diff changeset
4119 level[trailing_ones]= (((2+level_code)>>1) ^ mask) - mask;
8447
42198817a5ba Use the new VLC table for the first non trailing coeff too.
michael
parents: 8446
diff changeset
4120 }else{
42198817a5ba Use the new VLC table for the first non trailing coeff too.
michael
parents: 8446
diff changeset
4121 if(trailing_ones < 3) level_code += (level_code>>31)|1;
42198817a5ba Use the new VLC table for the first non trailing coeff too.
michael
parents: 8446
diff changeset
4122
42198817a5ba Use the new VLC table for the first non trailing coeff too.
michael
parents: 8446
diff changeset
4123 suffix_length = 1;
42198817a5ba Use the new VLC table for the first non trailing coeff too.
michael
parents: 8446
diff changeset
4124 if(level_code + 3U > 6U)
42198817a5ba Use the new VLC table for the first non trailing coeff too.
michael
parents: 8446
diff changeset
4125 suffix_length++;
42198817a5ba Use the new VLC table for the first non trailing coeff too.
michael
parents: 8446
diff changeset
4126 level[trailing_ones]= level_code;
42198817a5ba Use the new VLC table for the first non trailing coeff too.
michael
parents: 8446
diff changeset
4127 }
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4128
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4129 //remaining coefficients have suffix_length > 0
8385
af35581ac2ca Replace i by trailing_ones, part of a patch by dark shikari.
michael
parents: 8384
diff changeset
4130 for(i=trailing_ones+1;i<total_coeff;i++) {
8443
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
4131 static const unsigned int suffix_limit[7] = {0,3,6,12,24,48,INT_MAX };
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
4132 int bitsi= show_bits(gb, LEVEL_TAB_BITS);
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
4133 level_code= cavlc_level_tab[suffix_length][bitsi][0];
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
4134
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
4135 skip_bits(gb, cavlc_level_tab[suffix_length][bitsi][1]);
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
4136 if(level_code >= 100){
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
4137 prefix= level_code - 100;
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
4138 if(prefix == LEVEL_TAB_BITS){
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
4139 prefix += get_level_prefix(gb);
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
4140 }
8444
michael
parents: 8443
diff changeset
4141 if(prefix<15){
michael
parents: 8443
diff changeset
4142 level_code = (prefix<<suffix_length) + get_bits(gb, suffix_length);
michael
parents: 8443
diff changeset
4143 }else{
michael
parents: 8443
diff changeset
4144 level_code = (15<<suffix_length) + get_bits(gb, prefix-3);
michael
parents: 8443
diff changeset
4145 if(prefix>=16)
michael
parents: 8443
diff changeset
4146 level_code += (1<<(prefix-3))-4096;
michael
parents: 8443
diff changeset
4147 }
michael
parents: 8443
diff changeset
4148 mask= -(level_code&1);
8443
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
4149 level_code= (((2+level_code)>>1) ^ mask) - mask;
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
4150 }
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
4151 level[i]= level_code;
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
4152
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
4153 if(suffix_limit[suffix_length] + level_code > 2U*suffix_limit[suffix_length])
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4154 suffix_length++;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4155 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4156 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4157
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4158 if(total_coeff == max_coeff)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4159 zeros_left=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4160 else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4161 if(n == CHROMA_DC_BLOCK_INDEX)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4162 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
4163 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4164 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
4165 }
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4166
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4167 coeff_num = zeros_left + total_coeff - 1;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4168 j = scantable[coeff_num];
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4169 if(n > 24){
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4170 block[j] = level[0];
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4171 for(i=1;i<total_coeff;i++) {
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4172 if(zeros_left <= 0)
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4173 run_before = 0;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4174 else if(zeros_left < 7){
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4175 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
4176 }else{
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4177 run_before= get_vlc2(gb, run7_vlc.table, RUN7_VLC_BITS, 2);
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4178 }
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4179 zeros_left -= run_before;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4180 coeff_num -= 1 + run_before;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4181 j= scantable[ coeff_num ];
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4182
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4183 block[j]= level[i];
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4184 }
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4185 }else{
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
4186 block[j] = (level[0] * qmul[j] + 32)>>6;
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4187 for(i=1;i<total_coeff;i++) {
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4188 if(zeros_left <= 0)
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4189 run_before = 0;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4190 else if(zeros_left < 7){
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4191 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
4192 }else{
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4193 run_before= get_vlc2(gb, run7_vlc.table, RUN7_VLC_BITS, 2);
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4194 }
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4195 zeros_left -= run_before;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4196 coeff_num -= 1 + run_before;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4197 j= scantable[ coeff_num ];
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4198
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
4199 block[j]= (level[i] * qmul[j] + 32)>>6;
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4200 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4201 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4202
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4203 if(zeros_left<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
4204 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
4205 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4206 }
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4207
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4208 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4209 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4210
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4211 static void predict_field_decoding_flag(H264Context *h){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4212 MpegEncContext * const s = &h->s;
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
4213 const int mb_xy= h->mb_xy;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4214 int mb_type = (h->slice_table[mb_xy-1] == h->slice_num)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4215 ? s->current_picture.mb_type[mb_xy-1]
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4216 : (h->slice_table[mb_xy-s->mb_stride] == h->slice_num)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4217 ? s->current_picture.mb_type[mb_xy-s->mb_stride]
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4218 : 0;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4219 h->mb_mbaff = h->mb_field_decoding_flag = IS_INTERLACED(mb_type) ? 1 : 0;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4220 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4221
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4222 /**
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4223 * decodes a P_SKIP or B_SKIP macroblock
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4224 */
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4225 static void decode_mb_skip(H264Context *h){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4226 MpegEncContext * const s = &h->s;
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
4227 const int mb_xy= h->mb_xy;
2674
58fb8e1efcae 10l (mb_type uninitalized and then changed and overwritten)
michael
parents: 2673
diff changeset
4228 int mb_type=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4229
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4230 memset(h->non_zero_count[mb_xy], 0, 16);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4231 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
4232
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4233 if(MB_FIELD)
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
4234 mb_type|= MB_TYPE_INTERLACED;
2674
58fb8e1efcae 10l (mb_type uninitalized and then changed and overwritten)
michael
parents: 2673
diff changeset
4235
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
4236 if( h->slice_type_nos == FF_B_TYPE )
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4237 {
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4238 // just for fill_caches. pred_direct_motion will set the real mb_type
7493
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
4239 mb_type|= 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
4240
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
4241 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
4242 pred_direct_motion(h, &mb_type);
3927
f44a3341bfdf simplify write_back_motion for skip mbs
lorenm
parents: 3807
diff changeset
4243 mb_type|= MB_TYPE_SKIP;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4244 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4245 else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4246 {
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4247 int mx, my;
2674
58fb8e1efcae 10l (mb_type uninitalized and then changed and overwritten)
michael
parents: 2673
diff changeset
4248 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
4249
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
4250 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
4251 pred_pskip_motion(h, &mx, &my);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4252 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
4253 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
4254 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4255
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4256 write_back_motion(h, mb_type);
3927
f44a3341bfdf simplify write_back_motion for skip mbs
lorenm
parents: 3807
diff changeset
4257 s->current_picture.mb_type[mb_xy]= mb_type;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4258 s->current_picture.qscale_table[mb_xy]= s->qscale;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4259 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
4260 h->prev_mb_skipped= 1;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4261 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4262
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4263 /**
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4264 * decodes a macroblock
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
4265 * @returns 0 if OK, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4266 */
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4267 static int decode_mb_cavlc(H264Context *h){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4268 MpegEncContext * const s = &h->s;
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
4269 int mb_xy;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4270 int partition_count;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4271 unsigned int mb_type, cbp;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4272 int dct8x8_allowed= h->pps.transform_8x8_mode;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4273
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
4274 mb_xy = h->mb_xy = s->mb_x + s->mb_y*s->mb_stride;
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
4275
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
4276 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
4277 cbp = 0; /* avoid warning. FIXME: find a solution without slowing
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
4278 down the code */
7338
b088035801d5 Simplify slice type checks.
michael
parents: 7337
diff changeset
4279 if(h->slice_type_nos != FF_I_TYPE){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4280 if(s->mb_skip_run==-1)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4281 s->mb_skip_run= get_ue_golomb(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4282
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4283 if (s->mb_skip_run--) {
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4284 if(FRAME_MBAFF && (s->mb_y&1) == 0){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4285 if(s->mb_skip_run==0)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4286 h->mb_mbaff = h->mb_field_decoding_flag = get_bits1(&s->gb);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4287 else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4288 predict_field_decoding_flag(h);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4289 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4290 decode_mb_skip(h);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4291 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4292 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4293 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4294 if(FRAME_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4295 if( (s->mb_y&1) == 0 )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4296 h->mb_mbaff = h->mb_field_decoding_flag = get_bits1(&s->gb);
7469
856df346b536 Remove useless mb_field_decoding_flag setting code that was at the wrong spot.
michael
parents: 7468
diff changeset
4297 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4298
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
4299 h->prev_mb_skipped= 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4300
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4301 mb_type= get_ue_golomb(&s->gb);
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
4302 if(h->slice_type_nos == FF_B_TYPE){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4303 if(mb_type < 23){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4304 partition_count= b_mb_type_info[mb_type].partition_count;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4305 mb_type= b_mb_type_info[mb_type].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4306 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4307 mb_type -= 23;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4308 goto decode_intra_mb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4309 }
7340
ef40221c1452 SI/SP slice support. (not bitexact)
michael
parents: 7339
diff changeset
4310 }else if(h->slice_type_nos == FF_P_TYPE){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4311 if(mb_type < 5){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4312 partition_count= p_mb_type_info[mb_type].partition_count;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4313 mb_type= p_mb_type_info[mb_type].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4314 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4315 mb_type -= 5;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4316 goto decode_intra_mb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4317 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4318 }else{
7340
ef40221c1452 SI/SP slice support. (not bitexact)
michael
parents: 7339
diff changeset
4319 assert(h->slice_type_nos == FF_I_TYPE);
ef40221c1452 SI/SP slice support. (not bitexact)
michael
parents: 7339
diff changeset
4320 if(h->slice_type == FF_SI_TYPE && mb_type)
ef40221c1452 SI/SP slice support. (not bitexact)
michael
parents: 7339
diff changeset
4321 mb_type--;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4322 decode_intra_mb:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4323 if(mb_type > 25){
3954
00a12ef7d800 output typo fixes
diego
parents: 3948
diff changeset
4324 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
4325 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4326 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4327 partition_count=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4328 cbp= i_mb_type_info[mb_type].cbp;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4329 h->intra16x16_pred_mode= i_mb_type_info[mb_type].pred_mode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4330 mb_type= i_mb_type_info[mb_type].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4331 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4332
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4333 if(MB_FIELD)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4334 mb_type |= MB_TYPE_INTERLACED;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4335
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4336 h->slice_table[ mb_xy ]= h->slice_num;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4337
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4338 if(IS_INTRA_PCM(mb_type)){
7450
30d38a880fde Simplify intra PCM MB handling.
michael
parents: 7445
diff changeset
4339 unsigned int x;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4340
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5106
diff changeset
4341 // We assume these blocks are very rare so we do not optimize it.
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4342 align_get_bits(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4343
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4344 // The pixels are stored in the same order as levels in h->mb array.
7450
30d38a880fde Simplify intra PCM MB handling.
michael
parents: 7445
diff changeset
4345 for(x=0; x < (CHROMA ? 384 : 256); x++){
30d38a880fde Simplify intra PCM MB handling.
michael
parents: 7445
diff changeset
4346 ((uint8_t*)h->mb)[x]= get_bits(&s->gb, 8);
7407
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
4347 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4348
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
4349 // In deblocking, the quantizer is 0
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4350 s->current_picture.qscale_table[mb_xy]= 0;
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
4351 // 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
4352 memset(h->non_zero_count[mb_xy], 16, 16);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4353
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4354 s->current_picture.mb_type[mb_xy]= mb_type;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4355 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4356 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4357
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4358 if(MB_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4359 h->ref_count[0] <<= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4360 h->ref_count[1] <<= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4361 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4362
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
4363 fill_caches(h, mb_type, 0);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4364
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4365 //mb_pred
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4366 if(IS_INTRA(mb_type)){
7408
michael
parents: 7407
diff changeset
4367 int pred_mode;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4368 // init_top_left_availability(h);
7408
michael
parents: 7407
diff changeset
4369 if(IS_INTRA4x4(mb_type)){
michael
parents: 7407
diff changeset
4370 int i;
michael
parents: 7407
diff changeset
4371 int di = 1;
michael
parents: 7407
diff changeset
4372 if(dct8x8_allowed && get_bits1(&s->gb)){
michael
parents: 7407
diff changeset
4373 mb_type |= MB_TYPE_8x8DCT;
michael
parents: 7407
diff changeset
4374 di = 4;
michael
parents: 7407
diff changeset
4375 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4376
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4377 // fill_intra4x4_pred_table(h);
7408
michael
parents: 7407
diff changeset
4378 for(i=0; i<16; i+=di){
michael
parents: 7407
diff changeset
4379 int mode= pred_intra_mode(h, i);
michael
parents: 7407
diff changeset
4380
michael
parents: 7407
diff changeset
4381 if(!get_bits1(&s->gb)){
michael
parents: 7407
diff changeset
4382 const int rem_mode= get_bits(&s->gb, 3);
michael
parents: 7407
diff changeset
4383 mode = rem_mode + (rem_mode >= mode);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4384 }
7408
michael
parents: 7407
diff changeset
4385
michael
parents: 7407
diff changeset
4386 if(di==4)
michael
parents: 7407
diff changeset
4387 fill_rectangle( &h->intra4x4_pred_mode_cache[ scan8[i] ], 2, 2, 8, mode, 1 );
michael
parents: 7407
diff changeset
4388 else
michael
parents: 7407
diff changeset
4389 h->intra4x4_pred_mode_cache[ scan8[i] ] = mode;
michael
parents: 7407
diff changeset
4390 }
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
4391 ff_h264_write_back_intra_pred_mode(h);
7408
michael
parents: 7407
diff changeset
4392 if( check_intra4x4_pred_mode(h) < 0)
michael
parents: 7407
diff changeset
4393 return -1;
michael
parents: 7407
diff changeset
4394 }else{
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
4395 h->intra16x16_pred_mode= ff_h264_check_intra_pred_mode(h, h->intra16x16_pred_mode);
7408
michael
parents: 7407
diff changeset
4396 if(h->intra16x16_pred_mode < 0)
michael
parents: 7407
diff changeset
4397 return -1;
michael
parents: 7407
diff changeset
4398 }
michael
parents: 7407
diff changeset
4399 if(CHROMA){
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
4400 pred_mode= ff_h264_check_intra_pred_mode(h, get_ue_golomb_31(&s->gb));
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4401 if(pred_mode < 0)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4402 return -1;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4403 h->chroma_pred_mode= pred_mode;
7408
michael
parents: 7407
diff changeset
4404 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4405 }else if(partition_count==4){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4406 int i, j, sub_partition_count[4], list, ref[2][4];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4407
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
4408 if(h->slice_type_nos == FF_B_TYPE){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4409 for(i=0; i<4; i++){
8451
384600e3fe5b Use get_ue_golomb_31() where possible, almost all are just in headers
michael
parents: 8448
diff changeset
4410 h->sub_mb_type[i]= get_ue_golomb_31(&s->gb);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4411 if(h->sub_mb_type[i] >=13){
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4412 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
4413 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4414 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4415 sub_partition_count[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4416 h->sub_mb_type[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4417 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4418 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
4419 || 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
4420 pred_direct_motion(h, &mb_type);
3003
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
4421 h->ref_cache[0][scan8[4]] =
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
4422 h->ref_cache[1][scan8[4]] =
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
4423 h->ref_cache[0][scan8[12]] =
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
4424 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
4425 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4426 }else{
7338
b088035801d5 Simplify slice type checks.
michael
parents: 7337
diff changeset
4427 assert(h->slice_type_nos == FF_P_TYPE); //FIXME SP correct ?
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4428 for(i=0; i<4; i++){
8451
384600e3fe5b Use get_ue_golomb_31() where possible, almost all are just in headers
michael
parents: 8448
diff changeset
4429 h->sub_mb_type[i]= get_ue_golomb_31(&s->gb);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4430 if(h->sub_mb_type[i] >=4){
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4431 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
4432 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4433 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4434 sub_partition_count[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4435 h->sub_mb_type[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4436 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4437 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4438
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
4439 for(list=0; list<h->list_count; list++){
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4440 int ref_count= IS_REF0(mb_type) ? 1 : h->ref_count[list];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4441 for(i=0; i<4; i++){
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4442 if(IS_DIRECT(h->sub_mb_type[i])) continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4443 if(IS_DIR(h->sub_mb_type[i], 0, list)){
8452
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4444 unsigned int tmp;
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4445 if(ref_count == 1){
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4446 tmp= 0;
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4447 }else if(ref_count == 2){
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4448 tmp= get_bits1(&s->gb)^1;
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4449 }else{
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4450 tmp= get_ue_golomb_31(&s->gb);
8453
michael
parents: 8452
diff changeset
4451 if(tmp>=ref_count){
michael
parents: 8452
diff changeset
4452 av_log(h->s.avctx, AV_LOG_ERROR, "ref %u overflow\n", tmp);
michael
parents: 8452
diff changeset
4453 return -1;
michael
parents: 8452
diff changeset
4454 }
8452
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4455 }
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4456 ref[list][i]= tmp;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4457 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4458 //FIXME
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4459 ref[list][i] = -1;
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
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4464 if(dct8x8_allowed)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4465 dct8x8_allowed = get_dct8x8_allowed(h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4466
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
4467 for(list=0; list<h->list_count; list++){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4468 for(i=0; i<4; i++){
3003
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
4469 if(IS_DIRECT(h->sub_mb_type[i])) {
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
4470 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
4471 continue;
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
4472 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4473 h->ref_cache[list][ scan8[4*i] ]=h->ref_cache[list][ scan8[4*i]+1 ]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4474 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
4475
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4476 if(IS_DIR(h->sub_mb_type[i], 0, list)){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4477 const int sub_mb_type= h->sub_mb_type[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4478 const int block_width= (sub_mb_type & (MB_TYPE_16x16|MB_TYPE_16x8)) ? 2 : 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4479 for(j=0; j<sub_partition_count[i]; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4480 int mx, my;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4481 const int index= 4*i + block_width*j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4482 int16_t (* mv_cache)[2]= &h->mv_cache[list][ scan8[index] ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4483 pred_motion(h, index, block_width, list, h->ref_cache[list][ scan8[index] ], &mx, &my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4484 mx += get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4485 my += get_se_golomb(&s->gb);
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
4486 tprintf(s->avctx, "final mv:%d %d\n", mx, my);
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
4487
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4488 if(IS_SUB_8X8(sub_mb_type)){
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
4489 mv_cache[ 1 ][0]=
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4490 mv_cache[ 8 ][0]= mv_cache[ 9 ][0]= mx;
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
4491 mv_cache[ 1 ][1]=
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4492 mv_cache[ 8 ][1]= mv_cache[ 9 ][1]= my;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4493 }else if(IS_SUB_8X4(sub_mb_type)){
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
4494 mv_cache[ 1 ][0]= mx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
4495 mv_cache[ 1 ][1]= my;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4496 }else if(IS_SUB_4X8(sub_mb_type)){
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
4497 mv_cache[ 8 ][0]= mx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
4498 mv_cache[ 8 ][1]= my;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4499 }
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
4500 mv_cache[ 0 ][0]= mx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
4501 mv_cache[ 0 ][1]= my;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4502 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4503 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4504 uint32_t *p= (uint32_t *)&h->mv_cache[list][ scan8[4*i] ][0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4505 p[0] = p[1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4506 p[8] = p[9]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4507 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4508 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4509 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4510 }else if(IS_DIRECT(mb_type)){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4511 pred_direct_motion(h, &mb_type);
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4512 dct8x8_allowed &= h->sps.direct_8x8_inference_flag;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4513 }else{
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4514 int list, mx, my, i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4515 //FIXME we should set ref_idx_l? to 0 if we use that later ...
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4516 if(IS_16X16(mb_type)){
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4517 for(list=0; list<h->list_count; list++){
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4518 unsigned int val;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4519 if(IS_DIR(mb_type, 0, list)){
8452
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4520 if(h->ref_count[list]==1){
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4521 val= 0;
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4522 }else if(h->ref_count[list]==2){
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4523 val= get_bits1(&s->gb)^1;
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4524 }else{
8453
michael
parents: 8452
diff changeset
4525 val= get_ue_golomb_31(&s->gb);
michael
parents: 8452
diff changeset
4526 if(val >= h->ref_count[list]){
michael
parents: 8452
diff changeset
4527 av_log(h->s.avctx, AV_LOG_ERROR, "ref %u overflow\n", val);
michael
parents: 8452
diff changeset
4528 return -1;
michael
parents: 8452
diff changeset
4529 }
8452
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4530 }
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
4531 }else
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4532 val= LIST_NOT_USED&0xFF;
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4533 fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, val, 1);
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4534 }
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4535 for(list=0; list<h->list_count; list++){
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4536 unsigned int val;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4537 if(IS_DIR(mb_type, 0, list)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4538 pred_motion(h, 0, 4, list, h->ref_cache[list][ scan8[0] ], &mx, &my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4539 mx += get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4540 my += get_se_golomb(&s->gb);
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
4541 tprintf(s->avctx, "final mv:%d %d\n", mx, my);
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
4542
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4543 val= pack16to32(mx,my);
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
4544 }else
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4545 val=0;
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4546 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, val, 4);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4547 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4548 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4549 else if(IS_16X8(mb_type)){
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4550 for(list=0; list<h->list_count; list++){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4551 for(i=0; i<2; i++){
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4552 unsigned int val;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4553 if(IS_DIR(mb_type, i, list)){
8452
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4554 if(h->ref_count[list] == 1){
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4555 val= 0;
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4556 }else if(h->ref_count[list] == 2){
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4557 val= get_bits1(&s->gb)^1;
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4558 }else{
8453
michael
parents: 8452
diff changeset
4559 val= get_ue_golomb_31(&s->gb);
michael
parents: 8452
diff changeset
4560 if(val >= h->ref_count[list]){
michael
parents: 8452
diff changeset
4561 av_log(h->s.avctx, AV_LOG_ERROR, "ref %u overflow\n", val);
michael
parents: 8452
diff changeset
4562 return -1;
michael
parents: 8452
diff changeset
4563 }
8452
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4564 }
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
4565 }else
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4566 val= LIST_NOT_USED&0xFF;
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4567 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, val, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4568 }
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4569 }
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4570 for(list=0; list<h->list_count; list++){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4571 for(i=0; i<2; i++){
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4572 unsigned int val;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4573 if(IS_DIR(mb_type, i, list)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4574 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
4575 mx += get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4576 my += get_se_golomb(&s->gb);
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
4577 tprintf(s->avctx, "final mv:%d %d\n", mx, my);
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
4578
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4579 val= pack16to32(mx,my);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4580 }else
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4581 val=0;
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4582 fill_rectangle(h->mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, val, 4);
1168
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 assert(IS_8X16(mb_type));
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4587 for(list=0; list<h->list_count; list++){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4588 for(i=0; i<2; i++){
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4589 unsigned int val;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4590 if(IS_DIR(mb_type, i, list)){ //FIXME optimize
8452
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4591 if(h->ref_count[list]==1){
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4592 val= 0;
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4593 }else if(h->ref_count[list]==2){
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4594 val= get_bits1(&s->gb)^1;
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4595 }else{
8453
michael
parents: 8452
diff changeset
4596 val= get_ue_golomb_31(&s->gb);
michael
parents: 8452
diff changeset
4597 if(val >= h->ref_count[list]){
michael
parents: 8452
diff changeset
4598 av_log(h->s.avctx, AV_LOG_ERROR, "ref %u overflow\n", val);
michael
parents: 8452
diff changeset
4599 return -1;
michael
parents: 8452
diff changeset
4600 }
8452
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4601 }
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
4602 }else
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4603 val= LIST_NOT_USED&0xFF;
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4604 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, val, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4605 }
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4606 }
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4607 for(list=0; list<h->list_count; list++){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4608 for(i=0; i<2; i++){
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4609 unsigned int val;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4610 if(IS_DIR(mb_type, i, list)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4611 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
4612 mx += get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4613 my += get_se_golomb(&s->gb);
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
4614 tprintf(s->avctx, "final mv:%d %d\n", mx, my);
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
4615
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4616 val= pack16to32(mx,my);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4617 }else
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4618 val=0;
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4619 fill_rectangle(h->mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, val, 4);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4620 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4621 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4622 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4623 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4624
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4625 if(IS_INTER(mb_type))
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4626 write_back_motion(h, mb_type);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4627
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4628 if(!IS_INTRA16x16(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4629 cbp= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4630 if(cbp > 47){
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4631 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
4632 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4633 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4634
7407
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
4635 if(CHROMA){
7408
michael
parents: 7407
diff changeset
4636 if(IS_INTRA4x4(mb_type)) cbp= golomb_to_intra4x4_cbp[cbp];
michael
parents: 7407
diff changeset
4637 else cbp= golomb_to_inter_cbp [cbp];
7407
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
4638 }else{
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
4639 if(IS_INTRA4x4(mb_type)) cbp= golomb_to_intra4x4_cbp_gray[cbp];
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
4640 else cbp= golomb_to_inter_cbp_gray[cbp];
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
4641 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4642 }
3651
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
4643 h->cbp = cbp;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4644
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4645 if(dct8x8_allowed && (cbp&15) && !IS_INTRA(mb_type)){
7378
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
4646 if(get_bits1(&s->gb)){
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4647 mb_type |= MB_TYPE_8x8DCT;
7378
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
4648 h->cbp_table[mb_xy]= cbp;
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
4649 }
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4650 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4651 s->current_picture.mb_type[mb_xy]= mb_type;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4652
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4653 if(cbp || IS_INTRA16x16(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4654 int i8x8, i4x4, chroma_idx;
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
4655 int dquant;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4656 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
4657 const uint8_t *scan, *scan8x8, *dc_scan;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4658
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4659 // fill_non_zero_count_cache(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4660
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4661 if(IS_INTERLACED(mb_type)){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4662 scan8x8= s->qscale ? h->field_scan8x8_cavlc : h->field_scan8x8_cavlc_q0;
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
4663 scan= s->qscale ? h->field_scan : h->field_scan_q0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4664 dc_scan= luma_dc_field_scan;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4665 }else{
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4666 scan8x8= s->qscale ? h->zigzag_scan8x8_cavlc : h->zigzag_scan8x8_cavlc_q0;
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
4667 scan= s->qscale ? h->zigzag_scan : h->zigzag_scan_q0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4668 dc_scan= luma_dc_zigzag_scan;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4669 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4670
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4671 dquant= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4672
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4673 if( dquant > 25 || dquant < -26 ){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
4674 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
4675 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4676 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4677
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4678 s->qscale += dquant;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4679 if(((unsigned)s->qscale) > 51){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4680 if(s->qscale<0) s->qscale+= 52;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4681 else s->qscale-= 52;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4682 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4683
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
4684 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
4685 h->chroma_qp[1]= get_chroma_qp(h, 1, s->qscale);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4686 if(IS_INTRA16x16(mb_type)){
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
4687 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
4688 return -1; //FIXME continue if partitioned and other return -1 too
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4689 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4690
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4691 assert((cbp&15) == 0 || (cbp&15) == 15);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4692
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4693 if(cbp&15){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4694 for(i8x8=0; i8x8<4; i8x8++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4695 for(i4x4=0; i4x4<4; i4x4++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4696 const int index= i4x4 + 4*i8x8;
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
4697 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
4698 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4699 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4700 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4701 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4702 }else{
1636
d9d98cdcfcde intra16x16 fix
michael
parents: 1598
diff changeset
4703 fill_rectangle(&h->non_zero_count_cache[scan8[0]], 4, 4, 8, 0, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4704 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4705 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4706 for(i8x8=0; i8x8<4; i8x8++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4707 if(cbp & (1<<i8x8)){
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4708 if(IS_8x8DCT(mb_type)){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4709 DCTELEM *buf = &h->mb[64*i8x8];
2757
fa1c8955e291 remove mixed code/declarations
mru
parents: 2755
diff changeset
4710 uint8_t *nnz;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4711 for(i4x4=0; i4x4<4; i4x4++){
3174
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
4712 if( decode_residual(h, gb, buf, i4x4+4*i8x8, scan8x8+16*i4x4,
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
4713 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
4714 return -1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4715 }
2757
fa1c8955e291 remove mixed code/declarations
mru
parents: 2755
diff changeset
4716 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
4717 nnz[0] += nnz[1] + nnz[8] + nnz[9];
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4718 }else{
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4719 for(i4x4=0; i4x4<4; i4x4++){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4720 const int index= i4x4 + 4*i8x8;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4721
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
4722 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
4723 return -1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4724 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4725 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4726 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4727 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4728 uint8_t * const nnz= &h->non_zero_count_cache[ scan8[4*i8x8] ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4729 nnz[0] = nnz[1] = nnz[8] = nnz[9] = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4730 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4731 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4732 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4733
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4734 if(cbp&0x30){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4735 for(chroma_idx=0; chroma_idx<2; chroma_idx++)
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
4736 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
4737 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4738 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4739 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4740
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4741 if(cbp&0x20){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4742 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
4743 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
4744 for(i4x4=0; i4x4<4; i4x4++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4745 const int index= 16 + 4*chroma_idx + i4x4;
5225
099c495618c1 Compute the dequant coefficient table ptr outside the loop,
gpoirier
parents: 5215
diff changeset
4746 if( decode_residual(h, gb, h->mb + 16*index, index, scan + 1, qmul, 15) < 0){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4747 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4748 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4749 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4750 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4751 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4752 uint8_t * const nnz= &h->non_zero_count_cache[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4753 nnz[ scan8[16]+0 ] = nnz[ scan8[16]+1 ] =nnz[ scan8[16]+8 ] =nnz[ scan8[16]+9 ] =
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4754 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
4755 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4756 }else{
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
4757 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
4758 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
4759 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
4760 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
4761 }
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
4762 s->current_picture.qscale_table[mb_xy]= s->qscale;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4763 write_back_non_zero_count(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4764
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4765 if(MB_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4766 h->ref_count[0] >>= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4767 h->ref_count[1] >>= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4768 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4769
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4770 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4771 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4772
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4773 static int decode_cabac_field_decoding_flag(H264Context *h) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4774 MpegEncContext * const s = &h->s;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4775 const int mb_x = s->mb_x;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4776 const int mb_y = s->mb_y & ~1;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4777 const int mba_xy = mb_x - 1 + mb_y *s->mb_stride;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4778 const int mbb_xy = mb_x + (mb_y-2)*s->mb_stride;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4779
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4780 unsigned int ctx = 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4781
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4782 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 (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4783 ctx += 1;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4784 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4785 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 (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4786 ctx += 1;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4787 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4788
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
4789 return get_cabac_noinline( &h->cabac, &h->cabac_state[70 + ctx] );
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4790 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4791
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4792 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
4793 uint8_t *state= &h->cabac_state[ctx_base];
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4794 int mb_type;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4795
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4796 if(intra_slice){
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4797 MpegEncContext * const s = &h->s;
2597
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
4798 const int mba_xy = h->left_mb_xy[0];
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
4799 const int mbb_xy = h->top_mb_xy;
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4800 int ctx=0;
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4801 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
4802 ctx++;
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4803 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
4804 ctx++;
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
4805 if( get_cabac_noinline( &h->cabac, &state[ctx] ) == 0 )
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4806 return 0; /* I4x4 */
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4807 state += 2;
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4808 }else{
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
4809 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
4810 return 0; /* I4x4 */
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4811 }
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4812
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4813 if( get_cabac_terminate( &h->cabac ) )
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4814 return 25; /* PCM */
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4815
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4816 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
4817 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
4818 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
4819 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
4820 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
4821 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
4822 return mb_type;
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4823 }
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4824
8436
59171c70bc9f inline decode_cabac_mb_type for I & P frames, 9 cycles faster on pentium dual.
michael
parents: 8435
diff changeset
4825 static int decode_cabac_mb_type_b( H264Context *h ) {
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4826 MpegEncContext * const s = &h->s;
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4827
2597
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
4828 const int mba_xy = h->left_mb_xy[0];
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
4829 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
4830 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
4831 int bits;
8383
4be7fab48777 Remove unreachable else clause, found by dark shikari.
michael
parents: 8382
diff changeset
4832 assert(h->slice_type_nos == FF_B_TYPE);
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4833
3138
c12fc3d1c612 minor simplifications in cabac_mb_type
lorenm
parents: 3128
diff changeset
4834 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
4835 ctx++;
3138
c12fc3d1c612 minor simplifications in cabac_mb_type
lorenm
parents: 3128
diff changeset
4836 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
4837 ctx++;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4838
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
4839 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
4840 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
4841
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
4842 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
4843 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
4844 }
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
4845
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
4846 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
4847 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
4848 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
4849 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
4850 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
4851 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
4852 else if( bits == 13 ) {
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4853 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
4854 } 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
4855 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
4856 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
4857 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
4858
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
4859 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
4860 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
4861 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4862
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4863 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
4864 MpegEncContext * const s = &h->s;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4865 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
4866 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
4867
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4868 if(FRAME_MBAFF){ //FIXME merge with the stuff in fill_caches?
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4869 int mb_xy = mb_x + (mb_y&~1)*s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4870 mba_xy = mb_xy - 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4871 if( (mb_y&1)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4872 && h->slice_table[mba_xy] == h->slice_num
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4873 && MB_FIELD == !!IS_INTERLACED( s->current_picture.mb_type[mba_xy] ) )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4874 mba_xy += s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4875 if( MB_FIELD ){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4876 mbb_xy = mb_xy - s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4877 if( !(mb_y&1)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4878 && h->slice_table[mbb_xy] == h->slice_num
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4879 && IS_INTERLACED( s->current_picture.mb_type[mbb_xy] ) )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4880 mbb_xy -= s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4881 }else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4882 mbb_xy = mb_x + (mb_y-1)*s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4883 }else{
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
4884 int mb_xy = h->mb_xy;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4885 mba_xy = mb_xy - 1;
5781
0b3aa6f4c313 Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents: 5780
diff changeset
4886 mbb_xy = mb_xy - (s->mb_stride << FIELD_PICTURE);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4887 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4888
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4889 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
4890 ctx++;
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4891 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
4892 ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4893
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
4894 if( h->slice_type_nos == FF_B_TYPE )
3138
c12fc3d1c612 minor simplifications in cabac_mb_type
lorenm
parents: 3128
diff changeset
4895 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
4896 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
4897 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4898
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4899 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
4900 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
4901
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4902 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
4903 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
4904
2928
16d67170715c tidier cabac_intra4x4_pred_mode
lorenm
parents: 2926
diff changeset
4905 mode += 1 * get_cabac( &h->cabac, &h->cabac_state[69] );
16d67170715c tidier cabac_intra4x4_pred_mode
lorenm
parents: 2926
diff changeset
4906 mode += 2 * get_cabac( &h->cabac, &h->cabac_state[69] );
16d67170715c tidier cabac_intra4x4_pred_mode
lorenm
parents: 2926
diff changeset
4907 mode += 4 * get_cabac( &h->cabac, &h->cabac_state[69] );
16d67170715c tidier cabac_intra4x4_pred_mode
lorenm
parents: 2926
diff changeset
4908
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4909 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
4910 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
4911 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4912 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
4913 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4914
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4915 static int decode_cabac_mb_chroma_pre_mode( H264Context *h) {
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4916 const int mba_xy = h->left_mb_xy[0];
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4917 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
4918
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4919 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
4920
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
4921 /* 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
4922 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
4923 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
4924
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4925 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
4926 ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4927
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
4928 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
4929 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
4930
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
4931 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
4932 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
4933 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
4934 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
4935 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4936 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
4937 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4938
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4939 static int decode_cabac_mb_cbp_luma( H264Context *h) {
5694
7c2ce28a0314 Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.
diego
parents: 5685
diff changeset
4940 int cbp_b, cbp_a, ctx, cbp = 0;
7c2ce28a0314 Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.
diego
parents: 5685
diff changeset
4941
7c2ce28a0314 Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.
diego
parents: 5685
diff changeset
4942 cbp_a = h->slice_table[h->left_mb_xy[0]] == h->slice_num ? h->left_cbp : -1;
7c2ce28a0314 Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.
diego
parents: 5685
diff changeset
4943 cbp_b = h->slice_table[h->top_mb_xy] == h->slice_num ? h->top_cbp : -1;
7c2ce28a0314 Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.
diego
parents: 5685
diff changeset
4944
7c2ce28a0314 Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.
diego
parents: 5685
diff changeset
4945 ctx = !(cbp_a & 0x02) + 2 * !(cbp_b & 0x04);
7c2ce28a0314 Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.
diego
parents: 5685
diff changeset
4946 cbp |= get_cabac_noinline(&h->cabac, &h->cabac_state[73 + ctx]);
7c2ce28a0314 Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.
diego
parents: 5685
diff changeset
4947 ctx = !(cbp & 0x01) + 2 * !(cbp_b & 0x08);
7c2ce28a0314 Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.
diego
parents: 5685
diff changeset
4948 cbp |= get_cabac_noinline(&h->cabac, &h->cabac_state[73 + ctx]) << 1;
7c2ce28a0314 Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.
diego
parents: 5685
diff changeset
4949 ctx = !(cbp_a & 0x08) + 2 * !(cbp & 0x01);
7c2ce28a0314 Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.
diego
parents: 5685
diff changeset
4950 cbp |= get_cabac_noinline(&h->cabac, &h->cabac_state[73 + ctx]) << 2;
7c2ce28a0314 Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.
diego
parents: 5685
diff changeset
4951 ctx = !(cbp & 0x04) + 2 * !(cbp & 0x02);
7c2ce28a0314 Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.
diego
parents: 5685
diff changeset
4952 cbp |= get_cabac_noinline(&h->cabac, &h->cabac_state[73 + ctx]) << 3;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4953 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
4954 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4955 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
4956 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
4957 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
4958
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
4959 cbp_a = (h->left_cbp>>4)&0x03;
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
4960 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
4961
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4962 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
4963 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
4964 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
4965 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
4966 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
4967
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4968 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
4969 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
4970 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
4971 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
4972 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4973 static int decode_cabac_mb_dqp( H264Context *h) {
8397
81c6cec28a62 Simplify ctx calculation in decode_cabac_mb_dqp()
michael
parents: 8396
diff changeset
4974 int ctx= 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
4975 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
4976
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
4977 while( get_cabac_noinline( &h->cabac, &h->cabac_state[60 + ctx] ) ) {
8398
5ffdec2cd80c Simplify ctx update in decode_cabac_mb_dqp().
michael
parents: 8397
diff changeset
4978 ctx= 2+(ctx>>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
4979 val++;
3128
dd3f6be492bd don't arbitrarily limit delta_qp
lorenm
parents: 3126
diff changeset
4980 if(val > 102) //prevent infinite loop
2844
5f20ab245501 prevent assert failures and infinite loops with broken streams
michael
parents: 2834
diff changeset
4981 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
4982 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4983
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4984 if( val&0x01 )
8399
3019af3f98fa Replace /2 by >>1 in decode_cabac_mb_dqp()
michael
parents: 8398
diff changeset
4985 return (val + 1)>>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
4986 else
8399
3019af3f98fa Replace /2 by >>1 in decode_cabac_mb_dqp()
michael
parents: 8398
diff changeset
4987 return -((val + 1)>>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
4988 }
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4989 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
4990 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
4991 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
4992 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
4993 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
4994 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
4995 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
4996 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
4997 }
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4998 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
4999 int type;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5000 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
5001 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
5002 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
5003 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
5004 type = 3;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5005 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
5006 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
5007 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
5008 type += 4;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5009 }
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5010 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
5011 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
5012 return type;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5013 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5014
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5015 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
5016 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
5017 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5018
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5019 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
5020 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
5021 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
5022 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
5023 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
5024
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
5025 if( h->slice_type_nos == FF_B_TYPE) {
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5026 if( refa > 0 && !h->direct_cache[scan8[n] - 1] )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5027 ctx++;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5028 if( refb > 0 && !h->direct_cache[scan8[n] - 8] )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5029 ctx += 2;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5030 } else {
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5031 if( refa > 0 )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5032 ctx++;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5033 if( refb > 0 )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5034 ctx += 2;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5035 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5036
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5037 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
5038 ref++;
8438
89f7279e1eaa Simplify decode_cabac_mb_ref() a little bit, 2 cpu cycles faster on
michael
parents: 8437
diff changeset
5039 ctx = (ctx>>2)+4;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
5040 if(ref >= 32 /*h->ref_list[list]*/){
8391
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5041 return -1;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
5042 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5043 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5044 return ref;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5045 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5046
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5047 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
5048 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
5049 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
5050 int ctxbase = (l == 0) ? 40 : 47;
8393
64a0415da32f Optimize ctx calculation in decode_cabac_mb_mvd(), code by dark shikari.
michael
parents: 8392
diff changeset
5051 int mvd;
64a0415da32f Optimize ctx calculation in decode_cabac_mb_mvd(), code by dark shikari.
michael
parents: 8392
diff changeset
5052 int ctx = (amvd>2) + (amvd>32);
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5053
2317
2865f759882a optimzation
michael
parents: 2316
diff changeset
5054 if(!get_cabac(&h->cabac, &h->cabac_state[ctxbase+ctx]))
2865f759882a optimzation
michael
parents: 2316
diff changeset
5055 return 0;
2865f759882a optimzation
michael
parents: 2316
diff changeset
5056
2865f759882a optimzation
michael
parents: 2316
diff changeset
5057 mvd= 1;
2865f759882a optimzation
michael
parents: 2316
diff changeset
5058 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
5059 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
5060 mvd++;
2317
2865f759882a optimzation
michael
parents: 2316
diff changeset
5061 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
5062 ctx++;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5063 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5064
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5065 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
5066 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
5067 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
5068 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
5069 k++;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
5070 if(k>24){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
5071 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
5072 return INT_MIN;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
5073 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5074 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5075 while( k-- ) {
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5076 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
5077 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
5078 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5079 }
4042
643cdc58bd69 slightly faster decode_cabac_mb_mvd()
michael
parents: 4041
diff changeset
5080 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
5081 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5082
7180
4acdafd254bf Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents: 7179
diff changeset
5083 static av_always_inline int get_cabac_cbf_ctx( H264Context *h, int cat, int idx, int is_dc ) {
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5084 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
5085 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
5086
7180
4acdafd254bf Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents: 7179
diff changeset
5087 if( is_dc ) {
7181
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5088 if( cat == 0 ) {
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5089 nza = h->left_cbp&0x100;
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5090 nzb = h-> top_cbp&0x100;
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5091 } else {
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5092 nza = (h->left_cbp>>(6+idx))&0x01;
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5093 nzb = (h-> top_cbp>>(6+idx))&0x01;
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5094 }
7180
4acdafd254bf Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents: 7179
diff changeset
5095 } else {
8394
a9132c1bd56a Simplify chroma AC in CABAC residual decoding.
darkshikari
parents: 8393
diff changeset
5096 assert(cat == 1 || cat == 2 || cat == 4);
a9132c1bd56a Simplify chroma AC in CABAC residual decoding.
darkshikari
parents: 8393
diff changeset
5097 nza = h->non_zero_count_cache[scan8[idx] - 1];
a9132c1bd56a Simplify chroma AC in CABAC residual decoding.
darkshikari
parents: 8393
diff changeset
5098 nzb = h->non_zero_count_cache[scan8[idx] - 8];
7180
4acdafd254bf Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents: 7179
diff changeset
5099 }
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5100
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5101 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
5102 ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5103
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5104 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
5105 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
5106
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5107 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
5108 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5109
6753
73de16350531 One const per declaration is enough.
cehoyos
parents: 6749
diff changeset
5110 DECLARE_ASM_CONST(1, uint8_t, last_coeff_flag_offset_8x8[63]) = {
4051
19f07b651d79 decode_significance_8x8_x86()
michael
parents: 4042
diff changeset
5111 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
5112 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
5113 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
5114 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
5115 };
19f07b651d79 decode_significance_8x8_x86()
michael
parents: 4042
diff changeset
5116
7180
4acdafd254bf Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents: 7179
diff changeset
5117 static av_always_inline void decode_cabac_residual_internal( H264Context *h, DCTELEM *block, int cat, int n, const uint8_t *scantable, const uint32_t *qmul, int max_coeff, int is_dc ) {
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5118 static const int significant_coeff_flag_offset[2][6] = {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5119 { 105+0, 105+15, 105+29, 105+44, 105+47, 402 },
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5120 { 277+0, 277+15, 277+29, 277+44, 277+47, 436 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5121 };
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5122 static const int last_coeff_flag_offset[2][6] = {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5123 { 166+0, 166+15, 166+29, 166+44, 166+47, 417 },
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5124 { 338+0, 338+15, 338+29, 338+44, 338+47, 451 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5125 };
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5126 static const int coeff_abs_level_m1_offset[6] = {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5127 227+0, 227+10, 227+20, 227+30, 227+39, 426
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5128 };
4007
33d3d4ab9f59 int->uint8_t for 2 tables
michael
parents: 4001
diff changeset
5129 static const uint8_t significant_coeff_flag_offset_8x8[2][63] = {
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5130 { 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
5131 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
5132 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
5133 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
5134 { 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
5135 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
5136 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
5137 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
5138 };
6749
b1778cf7f3b1 Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents: 6717
diff changeset
5139 /* node ctx: 0..3: abslevel1 (with abslevelgt1 == 0).
b1778cf7f3b1 Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents: 6717
diff changeset
5140 * 4..7: abslevelgt1 + 3 (and abslevel1 doesn't matter).
b1778cf7f3b1 Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents: 6717
diff changeset
5141 * map node ctx => cabac ctx for level=1 */
b1778cf7f3b1 Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents: 6717
diff changeset
5142 static const uint8_t coeff_abs_level1_ctx[8] = { 1, 2, 3, 4, 0, 0, 0, 0 };
b1778cf7f3b1 Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents: 6717
diff changeset
5143 /* map node ctx => cabac ctx for level>1 */
b1778cf7f3b1 Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents: 6717
diff changeset
5144 static const uint8_t coeff_abs_levelgt1_ctx[8] = { 5, 5, 5, 5, 6, 7, 8, 9 };
b1778cf7f3b1 Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents: 6717
diff changeset
5145 static const uint8_t coeff_abs_level_transition[2][8] = {
b1778cf7f3b1 Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents: 6717
diff changeset
5146 /* update node ctx after decoding a level=1 */
b1778cf7f3b1 Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents: 6717
diff changeset
5147 { 1, 2, 3, 3, 4, 5, 6, 7 },
b1778cf7f3b1 Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents: 6717
diff changeset
5148 /* update node ctx after decoding a level>1 */
b1778cf7f3b1 Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents: 6717
diff changeset
5149 { 4, 4, 4, 4, 5, 6, 7, 7 }
b1778cf7f3b1 Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents: 6717
diff changeset
5150 };
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5151
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5152 int index[64];
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5153
5262
b2a95ab5d017 bring back h264 build
benoit
parents: 5254
diff changeset
5154 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
5155 int coeff_count = 0;
6749
b1778cf7f3b1 Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents: 6717
diff changeset
5156 int node_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
5157
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5158 uint8_t *significant_coeff_ctx_base;
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5159 uint8_t *last_coeff_ctx_base;
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5160 uint8_t *abs_level_m1_ctx_base;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5161
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8565
diff changeset
5162 #if !ARCH_X86
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
5163 #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
5164 #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
5165 #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
5166 #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
5167 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
5168 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
5169 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
5170 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
5171 #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
5172 #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
5173 #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
5174
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
5175
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5176 /* 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
5177 * 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
5178 * 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
5179 * 3-> DC Chroma n = iCbCr
8394
a9132c1bd56a Simplify chroma AC in CABAC residual decoding.
darkshikari
parents: 8393
diff changeset
5180 * 4-> AC Chroma n = 16 + 4 * iCbCr + chroma4x4idx
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5181 * 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
5182 */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5183
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5184 /* read coded block flag */
7180
4acdafd254bf Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents: 7179
diff changeset
5185 if( is_dc || cat != 5 ) {
4acdafd254bf Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents: 7179
diff changeset
5186 if( get_cabac( CC, &h->cabac_state[85 + get_cabac_cbf_ctx( h, cat, n, is_dc ) ] ) == 0 ) {
8394
a9132c1bd56a Simplify chroma AC in CABAC residual decoding.
darkshikari
parents: 8393
diff changeset
5187 if( !is_dc )
a9132c1bd56a Simplify chroma AC in CABAC residual decoding.
darkshikari
parents: 8393
diff changeset
5188 h->non_zero_count_cache[scan8[n]] = 0;
7180
4acdafd254bf Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents: 7179
diff changeset
5189
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
5190 #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
5191 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
5192 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
5193 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
5194 #endif
5528
4c3b1222ff57 Don't check the return value of decode_cabac_residual since it always
conrad
parents: 5508
diff changeset
5195 return;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5196 }
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5197 }
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5198
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5199 significant_coeff_ctx_base = h->cabac_state
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5200 + significant_coeff_flag_offset[MB_FIELD][cat];
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5201 last_coeff_ctx_base = h->cabac_state
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5202 + last_coeff_flag_offset[MB_FIELD][cat];
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5203 abs_level_m1_ctx_base = h->cabac_state
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5204 + coeff_abs_level_m1_offset[cat];
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5205
7180
4acdafd254bf Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents: 7179
diff changeset
5206 if( !is_dc && cat == 5 ) {
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5207 #define DECODE_SIGNIFICANCE( coefs, sig_off, last_off ) \
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5208 for(last= 0; last < coefs; last++) { \
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5209 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
5210 if( get_cabac( CC, sig_ctx )) { \
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5211 uint8_t *last_ctx = last_coeff_ctx_base + last_off; \
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5212 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
5213 if( get_cabac( CC, last_ctx ) ) { \
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5214 last= max_coeff; \
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5215 break; \
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5216 } \
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5217 } \
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
5218 }\
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
5219 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
5220 index[coeff_count++] = last;\
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5221 }
4009
e5f7797e53c7 10l int vs uint8_t
michael
parents: 4008
diff changeset
5222 const uint8_t *sig_off = significant_coeff_flag_offset_8x8[MB_FIELD];
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8565
diff changeset
5223 #if ARCH_X86 && HAVE_7REGS && HAVE_EBX_AVAILABLE && !defined(BROKEN_RELOCATIONS)
4051
19f07b651d79 decode_significance_8x8_x86()
michael
parents: 4042
diff changeset
5224 coeff_count= decode_significance_8x8_x86(CC, significant_coeff_ctx_base, index, sig_off);
19f07b651d79 decode_significance_8x8_x86()
michael
parents: 4042
diff changeset
5225 } else {
19f07b651d79 decode_significance_8x8_x86()
michael
parents: 4042
diff changeset
5226 coeff_count= decode_significance_x86(CC, max_coeff, significant_coeff_ctx_base, index);
19f07b651d79 decode_significance_8x8_x86()
michael
parents: 4042
diff changeset
5227 #else
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5228 DECODE_SIGNIFICANCE( 63, sig_off[last], last_coeff_flag_offset_8x8[last] );
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5229 } else {
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5230 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
5231 #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
5232 }
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5233 assert(coeff_count > 0);
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5234
7180
4acdafd254bf Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents: 7179
diff changeset
5235 if( is_dc ) {
7181
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5236 if( cat == 0 )
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5237 h->cbp_table[h->mb_xy] |= 0x100;
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5238 else
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5239 h->cbp_table[h->mb_xy] |= 0x40 << n;
7180
4acdafd254bf Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents: 7179
diff changeset
5240 } else {
7183
db32d2544050 Reorder the if/else for residual cats to match gcc's branch prediction.
astrange
parents: 7182
diff changeset
5241 if( cat == 5 )
db32d2544050 Reorder the if/else for residual cats to match gcc's branch prediction.
astrange
parents: 7182
diff changeset
5242 fill_rectangle(&h->non_zero_count_cache[scan8[n]], 2, 2, 8, coeff_count, 1);
7181
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5243 else {
8394
a9132c1bd56a Simplify chroma AC in CABAC residual decoding.
darkshikari
parents: 8393
diff changeset
5244 assert( cat == 1 || cat == 2 || cat == 4 );
7183
db32d2544050 Reorder the if/else for residual cats to match gcc's branch prediction.
astrange
parents: 7182
diff changeset
5245 h->non_zero_count_cache[scan8[n]] = coeff_count;
7181
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5246 }
7180
4acdafd254bf Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents: 7179
diff changeset
5247 }
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
7444
a9da32d66fec Small h264 decoding speed optimization: while->do/while
darkshikari
parents: 7424
diff changeset
5249 do {
6749
b1778cf7f3b1 Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents: 6717
diff changeset
5250 uint8_t *ctx = coeff_abs_level1_ctx[node_ctx] + abs_level_m1_ctx_base;
b1778cf7f3b1 Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents: 6717
diff changeset
5251
7444
a9da32d66fec Small h264 decoding speed optimization: while->do/while
darkshikari
parents: 7424
diff changeset
5252 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
5253
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
5254 if( get_cabac( CC, ctx ) == 0 ) {
6749
b1778cf7f3b1 Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents: 6717
diff changeset
5255 node_ctx = coeff_abs_level_transition[0][node_ctx];
7180
4acdafd254bf Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents: 7179
diff changeset
5256 if( is_dc ) {
4040
9eaea06c5ba6 optimize sign decoding code in decode_residual()
michael
parents: 4038
diff changeset
5257 block[j] = get_cabac_bypass_sign( CC, -1);
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5258 }else{
6377
michael
parents: 6311
diff changeset
5259 block[j] = (get_cabac_bypass_sign( CC, -qmul[j]) + 32) >> 6;
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5260 }
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 } else {
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5262 int coeff_abs = 2;
6749
b1778cf7f3b1 Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents: 6717
diff changeset
5263 ctx = coeff_abs_levelgt1_ctx[node_ctx] + abs_level_m1_ctx_base;
b1778cf7f3b1 Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents: 6717
diff changeset
5264 node_ctx = coeff_abs_level_transition[1][node_ctx];
b1778cf7f3b1 Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents: 6717
diff changeset
5265
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
5266 while( coeff_abs < 15 && get_cabac( CC, ctx ) ) {
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5267 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
5268 }
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5269
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5270 if( coeff_abs >= 15 ) {
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5271 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
5272 while( get_cabac_bypass( CC ) ) {
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5273 j++;
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5274 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5275
4016
29ea06410ce7 simplify escape decoding
michael
parents: 4009
diff changeset
5276 coeff_abs=1;
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5277 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
5278 coeff_abs += coeff_abs + get_cabac_bypass( CC );
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5279 }
4016
29ea06410ce7 simplify escape decoding
michael
parents: 4009
diff changeset
5280 coeff_abs+= 14;
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5281 }
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5282
7180
4acdafd254bf Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents: 7179
diff changeset
5283 if( is_dc ) {
7184
9a8278d65858 Use get_cabac_bypass_sign instead of an if/else.
astrange
parents: 7183
diff changeset
5284 block[j] = get_cabac_bypass_sign( CC, -coeff_abs );
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5285 }else{
7184
9a8278d65858 Use get_cabac_bypass_sign instead of an if/else.
astrange
parents: 7183
diff changeset
5286 block[j] = (get_cabac_bypass_sign( CC, -coeff_abs ) * qmul[j] + 32) >> 6;
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5287 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5288 }
7444
a9da32d66fec Small h264 decoding speed optimization: while->do/while
darkshikari
parents: 7424
diff changeset
5289 } while( coeff_count );
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
5290 #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
5291 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
5292 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
5293 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
5294 #endif
5528
4c3b1222ff57 Don't check the return value of decode_cabac_residual since it always
conrad
parents: 5508
diff changeset
5295
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5296 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5297
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8565
diff changeset
5298 #if !CONFIG_SMALL
7180
4acdafd254bf Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents: 7179
diff changeset
5299 static void decode_cabac_residual_dc( H264Context *h, DCTELEM *block, int cat, int n, const uint8_t *scantable, const uint32_t *qmul, int max_coeff ) {
4acdafd254bf Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents: 7179
diff changeset
5300 decode_cabac_residual_internal(h, block, cat, n, scantable, qmul, max_coeff, 1);
4acdafd254bf Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents: 7179
diff changeset
5301 }
4acdafd254bf Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents: 7179
diff changeset
5302
4acdafd254bf Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents: 7179
diff changeset
5303 static void decode_cabac_residual_nondc( H264Context *h, DCTELEM *block, int cat, int n, const uint8_t *scantable, const uint32_t *qmul, int max_coeff ) {
4acdafd254bf Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents: 7179
diff changeset
5304 decode_cabac_residual_internal(h, block, cat, n, scantable, qmul, max_coeff, 0);
4acdafd254bf Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents: 7179
diff changeset
5305 }
4acdafd254bf Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents: 7179
diff changeset
5306 #endif
4acdafd254bf Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents: 7179
diff changeset
5307
4acdafd254bf Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents: 7179
diff changeset
5308 static void decode_cabac_residual( H264Context *h, DCTELEM *block, int cat, int n, const uint8_t *scantable, const uint32_t *qmul, int max_coeff ) {
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8565
diff changeset
5309 #if CONFIG_SMALL
7180
4acdafd254bf Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents: 7179
diff changeset
5310 decode_cabac_residual_internal(h, block, cat, n, scantable, qmul, max_coeff, cat == 0 || cat == 3);
4acdafd254bf Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents: 7179
diff changeset
5311 #else
4acdafd254bf Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents: 7179
diff changeset
5312 if( cat == 0 || cat == 3 ) decode_cabac_residual_dc(h, block, cat, n, scantable, qmul, max_coeff);
4acdafd254bf Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents: 7179
diff changeset
5313 else decode_cabac_residual_nondc(h, block, cat, n, scantable, qmul, max_coeff);
4acdafd254bf Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents: 7179
diff changeset
5314 #endif
4acdafd254bf Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents: 7179
diff changeset
5315 }
4acdafd254bf Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents: 7179
diff changeset
5316
4908
777f250df232 Fix multiple "inline/static is not at beginning of declaration" warnings.
diego
parents: 4896
diff changeset
5317 static inline void compute_mb_neighbors(H264Context *h)
2597
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5318 {
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5319 MpegEncContext * const s = &h->s;
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
5320 const int mb_xy = h->mb_xy;
2597
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5321 h->top_mb_xy = mb_xy - s->mb_stride;
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5322 h->left_mb_xy[0] = mb_xy - 1;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5323 if(FRAME_MBAFF){
2597
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5324 const int pair_xy = s->mb_x + (s->mb_y & ~1)*s->mb_stride;
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5325 const int top_pair_xy = pair_xy - s->mb_stride;
8435
adab508880c6 Negate 2 more variables, 1 cpu cycle faster on pentium dual.
michael
parents: 8434
diff changeset
5326 const int top_mb_field_flag = IS_INTERLACED(s->current_picture.mb_type[top_pair_xy]);
adab508880c6 Negate 2 more variables, 1 cpu cycle faster on pentium dual.
michael
parents: 8434
diff changeset
5327 const int left_mb_field_flag = IS_INTERLACED(s->current_picture.mb_type[pair_xy-1]);
adab508880c6 Negate 2 more variables, 1 cpu cycle faster on pentium dual.
michael
parents: 8434
diff changeset
5328 const int curr_mb_field_flag = MB_FIELD;
2597
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5329 const int bottom = (s->mb_y & 1);
8431
405a44077331 Simplify if(), 3 cpu cycles faster in pentium dual.
michael
parents: 8430
diff changeset
5330
8435
adab508880c6 Negate 2 more variables, 1 cpu cycle faster on pentium dual.
michael
parents: 8434
diff changeset
5331 if (curr_mb_field_flag && (bottom || top_mb_field_flag)){
2597
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5332 h->top_mb_xy -= s->mb_stride;
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5333 }
8435
adab508880c6 Negate 2 more variables, 1 cpu cycle faster on pentium dual.
michael
parents: 8434
diff changeset
5334 if (!left_mb_field_flag == curr_mb_field_flag) {
2597
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5335 h->left_mb_xy[0] = pair_xy - 1;
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5336 }
5781
0b3aa6f4c313 Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents: 5780
diff changeset
5337 } else if (FIELD_PICTURE) {
0b3aa6f4c313 Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents: 5780
diff changeset
5338 h->top_mb_xy -= s->mb_stride;
2597
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5339 }
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5340 return;
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5341 }
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5342
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5343 /**
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5344 * decodes a macroblock
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
5345 * @returns 0 if OK, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5346 */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5347 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
5348 MpegEncContext * const s = &h->s;
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
5349 int 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
5350 int mb_type, partition_count, cbp = 0;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5351 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
5352
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
5353 mb_xy = h->mb_xy = s->mb_x + s->mb_y*s->mb_stride;
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
5354
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
5355 tprintf(s->avctx, "pic:%d mb:%d/%d\n", h->frame_num, s->mb_x, s->mb_y);
7338
b088035801d5 Simplify slice type checks.
michael
parents: 7337
diff changeset
5356 if( h->slice_type_nos != FF_I_TYPE ) {
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5357 int skip;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5358 /* a skipped mb needs the aff flag from the following mb */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5359 if( FRAME_MBAFF && s->mb_x==0 && (s->mb_y&1)==0 )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5360 predict_field_decoding_flag(h);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5361 if( FRAME_MBAFF && (s->mb_y&1)==1 && h->prev_mb_skipped )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5362 skip = h->next_mb_skipped;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5363 else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5364 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
5365 /* read skip flags */
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5366 if( skip ) {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5367 if( FRAME_MBAFF && (s->mb_y&1)==0 ){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5368 s->current_picture.mb_type[mb_xy] = MB_TYPE_SKIP;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5369 h->next_mb_skipped = decode_cabac_mb_skip( h, s->mb_x, s->mb_y+1 );
8416
7f93fb360055 Remove useless code.
michael
parents: 8415
diff changeset
5370 if(!h->next_mb_skipped)
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5371 h->mb_mbaff = h->mb_field_decoding_flag = decode_cabac_field_decoding_flag(h);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5372 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5373
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5374 decode_mb_skip(h);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5375
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5376 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
5377 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
5378 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
5379
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5380 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
5381
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5382 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5383 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5384 if(FRAME_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5385 if( (s->mb_y&1) == 0 )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5386 h->mb_mbaff =
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5387 h->mb_field_decoding_flag = decode_cabac_field_decoding_flag(h);
7469
856df346b536 Remove useless mb_field_decoding_flag setting code that was at the wrong spot.
michael
parents: 7468
diff changeset
5388 }
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5389
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
5390 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
5391
3077
385e54795a9e Fix silly typos.
diego
parents: 3071
diff changeset
5392 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
5393
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
5394 if( h->slice_type_nos == FF_B_TYPE ) {
8436
59171c70bc9f inline decode_cabac_mb_type for I & P frames, 9 cycles faster on pentium dual.
michael
parents: 8435
diff changeset
5395 mb_type = decode_cabac_mb_type_b( h );
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5396 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
5397 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
5398 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
5399 }else{
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5400 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
5401 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
5402 }
7340
ef40221c1452 SI/SP slice support. (not bitexact)
michael
parents: 7339
diff changeset
5403 } else if( h->slice_type_nos == FF_P_TYPE ) {
8436
59171c70bc9f inline decode_cabac_mb_type for I & P frames, 9 cycles faster on pentium dual.
michael
parents: 8435
diff changeset
5404 if( get_cabac_noinline( &h->cabac, &h->cabac_state[14] ) == 0 ) {
59171c70bc9f inline decode_cabac_mb_type for I & P frames, 9 cycles faster on pentium dual.
michael
parents: 8435
diff changeset
5405 /* P-type */
59171c70bc9f inline decode_cabac_mb_type for I & P frames, 9 cycles faster on pentium dual.
michael
parents: 8435
diff changeset
5406 if( get_cabac_noinline( &h->cabac, &h->cabac_state[15] ) == 0 ) {
59171c70bc9f inline decode_cabac_mb_type for I & P frames, 9 cycles faster on pentium dual.
michael
parents: 8435
diff changeset
5407 /* P_L0_D16x16, P_8x8 */
59171c70bc9f inline decode_cabac_mb_type for I & P frames, 9 cycles faster on pentium dual.
michael
parents: 8435
diff changeset
5408 mb_type= 3 * get_cabac_noinline( &h->cabac, &h->cabac_state[16] );
59171c70bc9f inline decode_cabac_mb_type for I & P frames, 9 cycles faster on pentium dual.
michael
parents: 8435
diff changeset
5409 } else {
59171c70bc9f inline decode_cabac_mb_type for I & P frames, 9 cycles faster on pentium dual.
michael
parents: 8435
diff changeset
5410 /* P_L0_D8x16, P_L0_D16x8 */
59171c70bc9f inline decode_cabac_mb_type for I & P frames, 9 cycles faster on pentium dual.
michael
parents: 8435
diff changeset
5411 mb_type= 2 - get_cabac_noinline( &h->cabac, &h->cabac_state[17] );
59171c70bc9f inline decode_cabac_mb_type for I & P frames, 9 cycles faster on pentium dual.
michael
parents: 8435
diff changeset
5412 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5413 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
5414 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
5415 } else {
8436
59171c70bc9f inline decode_cabac_mb_type for I & P frames, 9 cycles faster on pentium dual.
michael
parents: 8435
diff changeset
5416 mb_type= decode_cabac_intra_mb_type(h, 17, 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
5417 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
5418 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5419 } else {
8436
59171c70bc9f inline decode_cabac_mb_type for I & P frames, 9 cycles faster on pentium dual.
michael
parents: 8435
diff changeset
5420 mb_type= decode_cabac_intra_mb_type(h, 3, 1);
7340
ef40221c1452 SI/SP slice support. (not bitexact)
michael
parents: 7339
diff changeset
5421 if(h->slice_type == FF_SI_TYPE && mb_type)
ef40221c1452 SI/SP slice support. (not bitexact)
michael
parents: 7339
diff changeset
5422 mb_type--;
ef40221c1452 SI/SP slice support. (not bitexact)
michael
parents: 7339
diff changeset
5423 assert(h->slice_type_nos == FF_I_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
5424 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
5425 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
5426 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
5427 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
5428 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
5429 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5430 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
5431 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
5432
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5433 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
5434
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5435 if(IS_INTRA_PCM(mb_type)) {
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5436 const uint8_t *ptr;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5437
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5106
diff changeset
5438 // 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
5439 // 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
5440 // 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
5441 ptr= h->cabac.bytestream;
4344
4aa24216f71a fix 16 CABAC_BIT * 10l bug introduced in r6578
michael
parents: 4283
diff changeset
5442 if(h->cabac.low&0x1) ptr--;
4aa24216f71a fix 16 CABAC_BIT * 10l bug introduced in r6578
michael
parents: 4283
diff changeset
5443 if(CABAC_BITS==16){
4aa24216f71a fix 16 CABAC_BIT * 10l bug introduced in r6578
michael
parents: 4283
diff changeset
5444 if(h->cabac.low&0x1FF) ptr--;
4aa24216f71a fix 16 CABAC_BIT * 10l bug introduced in r6578
michael
parents: 4283
diff changeset
5445 }
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5446
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5447 // The pixels are stored in the same order as levels in h->mb array.
7450
30d38a880fde Simplify intra PCM MB handling.
michael
parents: 7445
diff changeset
5448 memcpy(h->mb, ptr, 256); ptr+=256;
7407
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
5449 if(CHROMA){
7450
30d38a880fde Simplify intra PCM MB handling.
michael
parents: 7445
diff changeset
5450 memcpy(h->mb+128, ptr, 128); ptr+=128;
7407
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
5451 }
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5452
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5453 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
5454
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
5455 // All blocks are present
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5456 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
5457 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
5458 // In deblocking, the quantizer is 0
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5459 s->current_picture.qscale_table[mb_xy]= 0;
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
5460 // All coeffs are present
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5461 memset(h->non_zero_count[mb_xy], 16, 16);
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5462 s->current_picture.mb_type[mb_xy]= mb_type;
7237
9a5cdba22eeb H264: Fix decoding with CABAC/delta_qp/PCM macroblocks.
astrange
parents: 7225
diff changeset
5463 h->last_qscale_diff = 0;
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5464 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
5465 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5466
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5467 if(MB_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5468 h->ref_count[0] <<= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5469 h->ref_count[1] <<= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5470 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5471
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
5472 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
5473
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5474 if( IS_INTRA( mb_type ) ) {
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
5475 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
5476 if( IS_INTRA4x4( mb_type ) ) {
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5477 if( dct8x8_allowed && decode_cabac_mb_transform_size( h ) ) {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5478 mb_type |= MB_TYPE_8x8DCT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5479 for( i = 0; i < 16; i+=4 ) {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5480 int pred = pred_intra_mode( h, i );
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5481 int mode = decode_cabac_mb_intra4x4_pred_mode( h, pred );
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5482 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
5483 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5484 } else {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5485 for( i = 0; i < 16; i++ ) {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5486 int pred = pred_intra_mode( h, i );
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5487 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
5488
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5489 //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
5490 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5491 }
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
5492 ff_h264_write_back_intra_pred_mode(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
5493 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
5494 } else {
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
5495 h->intra16x16_pred_mode= ff_h264_check_intra_pred_mode( h, h->intra16x16_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
5496 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
5497 }
7407
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
5498 if(CHROMA){
7408
michael
parents: 7407
diff changeset
5499 h->chroma_pred_mode_table[mb_xy] =
michael
parents: 7407
diff changeset
5500 pred_mode = decode_cabac_mb_chroma_pre_mode( h );
michael
parents: 7407
diff changeset
5501
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
5502 pred_mode= ff_h264_check_intra_pred_mode( h, pred_mode );
7408
michael
parents: 7407
diff changeset
5503 if( pred_mode < 0 ) return -1;
michael
parents: 7407
diff changeset
5504 h->chroma_pred_mode= pred_mode;
7407
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
5505 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5506 } 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
5507 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
5508
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
5509 if( h->slice_type_nos == FF_B_TYPE ) {
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5510 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
5511 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
5512 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
5513 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
5514 }
3482
c08b46172204 slightly faster h264 fill_caches()
lorenm
parents: 3455
diff changeset
5515 if( IS_DIRECT(h->sub_mb_type[0] | h->sub_mb_type[1] |
c08b46172204 slightly faster h264 fill_caches()
lorenm
parents: 3455
diff changeset
5516 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
5517 pred_direct_motion(h, &mb_type);
5425
1fdfea5024a7 fix cabac decoding with some Blue-Ray sources
gpoirier
parents: 5380
diff changeset
5518 h->ref_cache[0][scan8[4]] =
1fdfea5024a7 fix cabac decoding with some Blue-Ray sources
gpoirier
parents: 5380
diff changeset
5519 h->ref_cache[1][scan8[4]] =
1fdfea5024a7 fix cabac decoding with some Blue-Ray sources
gpoirier
parents: 5380
diff changeset
5520 h->ref_cache[0][scan8[12]] =
1fdfea5024a7 fix cabac decoding with some Blue-Ray sources
gpoirier
parents: 5380
diff changeset
5521 h->ref_cache[1][scan8[12]] = PART_NOT_AVAILABLE;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5522 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
5523 for( i = 0; i < 4; i++ )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5524 if( IS_DIRECT(h->sub_mb_type[i]) )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5525 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
5526 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5527 }
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5528 } else {
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5529 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
5530 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
5531 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
5532 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
5533 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5534 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5535
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
5536 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
5537 for( i = 0; i < 4; i++ ) {
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5538 if(IS_DIRECT(h->sub_mb_type[i])) continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5539 if(IS_DIR(h->sub_mb_type[i], 0, list)){
8391
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5540 if( h->ref_count[list] > 1 ){
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5541 ref[list][i] = decode_cabac_mb_ref( h, list, 4*i );
8391
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5542 if(ref[list][i] >= (unsigned)h->ref_count[list]){
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5543 av_log(s->avctx, AV_LOG_ERROR, "Reference %d >= %d\n", ref[list][i], h->ref_count[list]);
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5544 return -1;
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5545 }
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5546 }else
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5547 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
5548 } else {
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5549 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
5550 }
2110
michael
parents: 2099
diff changeset
5551 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
5552 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
5553 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5554 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5555
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5556 if(dct8x8_allowed)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5557 dct8x8_allowed = get_dct8x8_allowed(h);
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5558
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
5559 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
5560 for(i=0; i<4; i++){
5425
1fdfea5024a7 fix cabac decoding with some Blue-Ray sources
gpoirier
parents: 5380
diff changeset
5561 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
5562 if(IS_DIRECT(h->sub_mb_type[i])){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5563 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
5564 continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5565 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5566
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5567 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
5568 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
5569 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
5570 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
5571 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
5572 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
5573 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
5574 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
5575 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
5576 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
5577
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5578 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
5579 my = mpy + decode_cabac_mb_mvd( h, list, index, 1 );
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
5580 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
5581
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_SUB_8X8(sub_mb_type)){
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5583 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
5584 mv_cache[ 8 ][0]= mv_cache[ 9 ][0]= mx;
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5585 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
5586 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
5587
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5588 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
5589 mvd_cache[ 8 ][0]= mvd_cache[ 9 ][0]= mx - mpx;
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5590 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
5591 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
5592 }else if(IS_SUB_8X4(sub_mb_type)){
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5593 mv_cache[ 1 ][0]= mx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5594 mv_cache[ 1 ][1]= my;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5595
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5596 mvd_cache[ 1 ][0]= mx - mpx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5597 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
5598 }else if(IS_SUB_4X8(sub_mb_type)){
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5599 mv_cache[ 8 ][0]= mx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5600 mv_cache[ 8 ][1]= my;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5601
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5602 mvd_cache[ 8 ][0]= mx - mpx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5603 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
5604 }
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5605 mv_cache[ 0 ][0]= mx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5606 mv_cache[ 0 ][1]= my;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5607
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5608 mvd_cache[ 0 ][0]= mx - mpx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5609 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
5610 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5611 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5612 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
5613 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
5614 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
5615 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
5616 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5617 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5618 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5619 } else if( IS_DIRECT(mb_type) ) {
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5620 pred_direct_motion(h, &mb_type);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5621 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
5622 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
5623 dct8x8_allowed &= h->sps.direct_8x8_inference_flag;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5624 } else {
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5625 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
5626 if(IS_16X16(mb_type)){
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
5627 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
5628 if(IS_DIR(mb_type, 0, list)){
8391
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5629 int ref;
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5630 if(h->ref_count[list] > 1){
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5631 ref= decode_cabac_mb_ref(h, list, 0);
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5632 if(ref >= (unsigned)h->ref_count[list]){
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5633 av_log(s->avctx, AV_LOG_ERROR, "Reference %d >= %d\n", ref, h->ref_count[list]);
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5634 return -1;
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5635 }
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5636 }else
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5637 ref=0;
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5638 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
5639 }else
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
5640 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
5641 }
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
5642 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
5643 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
5644 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
5645
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5646 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
5647 my = mpy + decode_cabac_mb_mvd( h, list, 0, 1 );
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
5648 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
5649
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5650 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
5651 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
5652 }else
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
5653 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
5654 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5655 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5656 else if(IS_16X8(mb_type)){
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
5657 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
5658 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
5659 if(IS_DIR(mb_type, i, list)){
8391
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5660 int ref;
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5661 if(h->ref_count[list] > 1){
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5662 ref= decode_cabac_mb_ref( h, list, 8*i );
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5663 if(ref >= (unsigned)h->ref_count[list]){
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5664 av_log(s->avctx, AV_LOG_ERROR, "Reference %d >= %d\n", ref, h->ref_count[list]);
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5665 return -1;
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5666 }
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5667 }else
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5668 ref=0;
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5669 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
5670 }else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5671 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
5672 }
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
5673 }
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
5674 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
5675 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
5676 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
5677 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
5678 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
5679 my = mpy + decode_cabac_mb_mvd( h, list, 8*i, 1 );
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
5680 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
5681
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5682 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
5683 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
5684 }else{
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5685 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
5686 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
5687 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5688 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5689 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5690 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5691 assert(IS_8X16(mb_type));
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
5692 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
5693 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
5694 if(IS_DIR(mb_type, i, list)){ //FIXME optimize
8391
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5695 int ref;
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5696 if(h->ref_count[list] > 1){
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5697 ref= decode_cabac_mb_ref( h, list, 4*i );
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5698 if(ref >= (unsigned)h->ref_count[list]){
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5699 av_log(s->avctx, AV_LOG_ERROR, "Reference %d >= %d\n", ref, h->ref_count[list]);
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5700 return -1;
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5701 }
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5702 }else
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5703 ref=0;
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5704 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
5705 }else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5706 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
5707 }
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
5708 }
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
5709 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
5710 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
5711 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
5712 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
5713 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
5714 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
5715
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
5716 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
5717 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
5718 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
5719 }else{
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5720 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
5721 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
5722 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5723 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5724 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5725 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5726 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5727
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
5728 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
5729 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
5730 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
5731 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5732
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5733 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
5734 cbp = decode_cabac_mb_cbp_luma( h );
7407
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
5735 if(CHROMA)
7408
michael
parents: 7407
diff changeset
5736 cbp |= decode_cabac_mb_cbp_chroma( h ) << 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
5737 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5738
3651
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
5739 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
5740
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5741 if( dct8x8_allowed && (cbp&15) && !IS_INTRA( mb_type ) ) {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5742 if( decode_cabac_mb_transform_size( h ) )
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5743 mb_type |= MB_TYPE_8x8DCT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5744 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5745 s->current_picture.mb_type[mb_xy]= mb_type;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5746
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5747 if( cbp || IS_INTRA16x16( mb_type ) ) {
3174
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
5748 const uint8_t *scan, *scan8x8, *dc_scan;
5705
c08c9340c7ca factor out dequant table lookup outside loops, gives a 1-2% speed-up
gpoirier
parents: 5698
diff changeset
5749 const uint32_t *qmul;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5750 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
5751
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5752 if(IS_INTERLACED(mb_type)){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5753 scan8x8= s->qscale ? h->field_scan8x8 : h->field_scan8x8_q0;
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
5754 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
5755 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
5756 }else{
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5757 scan8x8= s->qscale ? h->zigzag_scan8x8 : h->zigzag_scan8x8_q0;
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
5758 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
5759 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
5760 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5761
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5762 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
5763 if( dqp == INT_MIN ){
a95e55679dfa check return value of decode_cabac_mb_dqp, it is INT_MIN on error.
reimar
parents: 2867
diff changeset
5764 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
5765 return -1;
a95e55679dfa check return value of decode_cabac_mb_dqp, it is INT_MIN on error.
reimar
parents: 2867
diff changeset
5766 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5767 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
5768 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
5769 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
5770 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
5771 }
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
5772 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
5773 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
5774
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5775 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
5776 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
5777 //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
5778 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
5779
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5780 if( cbp&15 ) {
5705
c08c9340c7ca factor out dequant table lookup outside loops, gives a 1-2% speed-up
gpoirier
parents: 5698
diff changeset
5781 qmul = h->dequant4_coeff[0][s->qscale];
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5782 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
5783 //av_log( s->avctx, AV_LOG_ERROR, "INTRA16x16 AC:%d\n", i );
5705
c08c9340c7ca factor out dequant table lookup outside loops, gives a 1-2% speed-up
gpoirier
parents: 5698
diff changeset
5784 decode_cabac_residual(h, h->mb + 16*i, 1, i, scan + 1, qmul, 15);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5785 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5786 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5787 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
5788 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5789 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5790 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
5791 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
5792 if( cbp & (1<<i8x8) ) {
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5793 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
5794 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
5795 scan8x8, h->dequant8_coeff[IS_INTRA( mb_type ) ? 0:1][s->qscale], 64);
5705
c08c9340c7ca factor out dequant table lookup outside loops, gives a 1-2% speed-up
gpoirier
parents: 5698
diff changeset
5796 } else {
5713
f45228f65e06 reindent
andoma
parents: 5705
diff changeset
5797 qmul = h->dequant4_coeff[IS_INTRA( mb_type ) ? 0:3][s->qscale];
f45228f65e06 reindent
andoma
parents: 5705
diff changeset
5798 for( i4x4 = 0; i4x4 < 4; i4x4++ ) {
f45228f65e06 reindent
andoma
parents: 5705
diff changeset
5799 const int index = 4*i8x8 + i4x4;
f45228f65e06 reindent
andoma
parents: 5705
diff changeset
5800 //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
5801 //START_TIMER
5713
f45228f65e06 reindent
andoma
parents: 5705
diff changeset
5802 decode_cabac_residual(h, h->mb + 16*index, 2, index, scan, qmul, 16);
3972
f5f1c9af095d move outcommented START/STOP_TIMER to a hopefully better place for benchmarking ...
michael
parents: 3955
diff changeset
5803 //STOP_TIMER("decode_residual")
5713
f45228f65e06 reindent
andoma
parents: 5705
diff changeset
5804 }
5705
c08c9340c7ca factor out dequant table lookup outside loops, gives a 1-2% speed-up
gpoirier
parents: 5698
diff changeset
5805 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5806 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5807 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
5808 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
5809 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5810 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5811 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5812
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5813 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
5814 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
5815 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
5816 //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
5817 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
5818 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5819 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5820
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5821 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
5822 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
5823 for( c = 0; c < 2; c++ ) {
5705
c08c9340c7ca factor out dequant table lookup outside loops, gives a 1-2% speed-up
gpoirier
parents: 5698
diff changeset
5824 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
5825 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
5826 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
5827 //av_log( s->avctx, AV_LOG_ERROR, "INTRA C%d-AC %d\n",c, index - 16 );
8394
a9132c1bd56a Simplify chroma AC in CABAC residual decoding.
darkshikari
parents: 8393
diff changeset
5828 decode_cabac_residual(h, h->mb + 16*index, 4, index, 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
5829 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5830 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5831 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5832 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
5833 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
5834 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
5835 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5836 } else {
2315
29b67549d0cc fix CABAC+LOOP missmatch
michael
parents: 2314
diff changeset
5837 uint8_t * const nnz= &h->non_zero_count_cache[0];
29b67549d0cc fix CABAC+LOOP missmatch
michael
parents: 2314
diff changeset
5838 fill_rectangle(&nnz[scan8[0]], 4, 4, 8, 0, 1);
29b67549d0cc fix CABAC+LOOP missmatch
michael
parents: 2314
diff changeset
5839 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
5840 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
5841 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
5842 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5843
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5844 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
5845 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
5846
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5847 if(MB_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5848 h->ref_count[0] >>= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5849 h->ref_count[1] >>= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5850 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5851
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5852 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
5853 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5854
8129
a9734fe0811e Making it easier to send arbitrary structures as work orders to MT workers
romansh
parents: 8107
diff changeset
5855 static int decode_slice(struct AVCodecContext *avctx, void *arg){
a9734fe0811e Making it easier to send arbitrary structures as work orders to MT workers
romansh
parents: 8107
diff changeset
5856 H264Context *h = *(void**)arg;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5857 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5858 const int part_mask= s->partitioned_frame ? (AC_END|AC_ERROR) : 0x7F;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5859
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5860 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
5861
8353
add1a0d65370 Do not recalculate constant part of is_complex for every MB.
michael
parents: 8352
diff changeset
5862 h->is_complex = FRAME_MBAFF || s->picture_structure != PICT_FRAME || s->codec_id != CODEC_ID_H264 ||
8742
ecabe55b66bb Remove CONFIG_H264_ENCODER references
mru
parents: 8735
diff changeset
5863 (CONFIG_GRAY && (s->flags&CODEC_FLAG_GRAY));
8353
add1a0d65370 Do not recalculate constant part of is_complex for every MB.
michael
parents: 8352
diff changeset
5864
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5865 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
5866 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
5867
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5868 /* realign */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5869 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
5870
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5871 /* 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
5872 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
5873 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
5874 s->gb.buffer + get_bits_count(&s->gb)/8,
10535
95f3daa991a2 Use get_bits_left() instead of size_in_bits - get_bits_count().
rbultje
parents: 10528
diff changeset
5875 (get_bits_left(&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
5876 /* calculate pre-state */
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5877 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
5878 int pre;
7340
ef40221c1452 SI/SP slice support. (not bitexact)
michael
parents: 7339
diff changeset
5879 if( h->slice_type_nos == FF_I_TYPE )
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
5880 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
5881 else
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
5882 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
5883
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5884 if( pre <= 63 )
3976
27e90123b346 reverse remainder of the failed attempt to optimize *state=c->mps_state[s]
michael
parents: 3972
diff changeset
5885 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
5886 else
3976
27e90123b346 reverse remainder of the failed attempt to optimize *state=c->mps_state[s]
michael
parents: 3972
diff changeset
5887 h->cabac_state[i] = 2 * ( pre - 64 ) + 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5888 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5889
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5890 for(;;){
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5891 //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
5892 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
5893 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
5894 //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
5895
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
5896 if(ret>=0) ff_h264_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
5897
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5898 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
5899 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
5900
8416
7f93fb360055 Remove useless code.
michael
parents: 8415
diff changeset
5901 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
5902
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
5903 if(ret>=0) ff_h264_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
5904 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
5905 }
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
5906 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
5907
3948
3edbf131ee44 refill cabac variables in 16bit steps, 3% faster get_cabac()
michael
parents: 3947
diff changeset
5908 if( ret < 0 || h->cabac.bytestream > h->cabac.bytestream_end + 2) {
5153
b985439e3e15 fix some printf format specifiers
mru
parents: 5129
diff changeset
5909 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
5910 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
5911 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
5912 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5913
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5914 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
5915 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
5916 ff_draw_horiz_band(s, 16*s->mb_y, 16);
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
5917 ++s->mb_y;
5781
0b3aa6f4c313 Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents: 5780
diff changeset
5918 if(FIELD_OR_MBAFF_PICTURE) {
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
5919 ++s->mb_y;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
5920 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5921 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5922
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5923 if( eos || s->mb_y >= s->mb_height ) {
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
5924 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
5925 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
5926 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
5927 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5928 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5929
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5930 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5931 for(;;){
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5932 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
5933
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
5934 if(ret>=0) ff_h264_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
5935
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5936 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
5937 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
5938 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
5939
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
5940 if(ret>=0) ff_h264_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
5941 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
5942 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5943
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5944 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
5945 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
5946 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
5947
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5948 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
5949 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5950
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5951 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
5952 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
5953 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
5954 ++s->mb_y;
5781
0b3aa6f4c313 Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents: 5780
diff changeset
5955 if(FIELD_OR_MBAFF_PICTURE) {
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
5956 ++s->mb_y;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
5957 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
5958 if(s->mb_y >= s->mb_height){
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
5959 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
5960
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5961 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
5962 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
5963
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5964 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
5965 }else{
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5966 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
5967
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5968 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
5969 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5970 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5971 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5972
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5973 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
5974 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
5975 if(get_bits_count(&s->gb) == s->gb.size_in_bits ){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5976 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
5977
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5978 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5979 }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
5980 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
5981
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5982 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5983 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5984 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5985 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5986 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5987
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5988 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5989 for(;s->mb_y < s->mb_height; s->mb_y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5990 for(;s->mb_x < s->mb_width; s->mb_x++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5991 int ret= decode_mb(h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5992
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
5993 ff_h264_hl_decode_mb(h);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5994
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5995 if(ret<0){
3177
8d1b2cc2a75b (f)printf --> av_log conversion
diego
parents: 3174
diff changeset
5996 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
5997 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
5998
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5999 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6000 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6001
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6002 if(++s->mb_x >= s->mb_width){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6003 s->mb_x=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6004 if(++s->mb_y >= s->mb_height){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6005 if(get_bits_count(s->gb) == s->gb.size_in_bits){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6006 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
6007
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6008 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6009 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6010 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
6011
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6012 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6013 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6014 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6015 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6016
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6017 if(get_bits_count(s->?gb) >= s->gb?.size_in_bits){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6018 if(get_bits_count(s->gb) == s->gb.size_in_bits){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6019 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
6020
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6021 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6022 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6023 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
6024
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6025 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6026 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6027 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6028 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6029 s->mb_x=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6030 ff_draw_horiz_band(s, 16*s->mb_y, 16);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6031 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6032 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6033 return -1; //not reached
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6034 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6035
8107
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6036 static int decode_picture_timing(H264Context *h){
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6037 MpegEncContext * const s = &h->s;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6038 if(h->sps.nal_hrd_parameters_present_flag || h->sps.vcl_hrd_parameters_present_flag){
8967
f0abc5f9e726 Parse cbp_removal_delay in SEI picture structure.
cehoyos
parents: 8966
diff changeset
6039 h->sei_cpb_removal_delay = get_bits(&s->gb, h->sps.cpb_removal_delay_length);
8966
328b7d545d0b Parse dpb_output_delay in SEI picture structure.
cehoyos
parents: 8965
diff changeset
6040 h->sei_dpb_output_delay = get_bits(&s->gb, h->sps.dpb_output_delay_length);
8107
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6041 }
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6042 if(h->sps.pic_struct_present_flag){
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6043 unsigned int i, num_clock_ts;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6044 h->sei_pic_struct = get_bits(&s->gb, 4);
9128
793cf8c68c4f Add support for ct_type to correctly detect interlaced flag
schreter
parents: 9125
diff changeset
6045 h->sei_ct_type = 0;
8107
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6046
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6047 if (h->sei_pic_struct > SEI_PIC_STRUCT_FRAME_TRIPLING)
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6048 return -1;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6049
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6050 num_clock_ts = sei_num_clock_ts_table[h->sei_pic_struct];
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6051
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6052 for (i = 0 ; i < num_clock_ts ; i++){
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6053 if(get_bits(&s->gb, 1)){ /* clock_timestamp_flag */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6054 unsigned int full_timestamp_flag;
9128
793cf8c68c4f Add support for ct_type to correctly detect interlaced flag
schreter
parents: 9125
diff changeset
6055 h->sei_ct_type |= 1<<get_bits(&s->gb, 2);
8107
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6056 skip_bits(&s->gb, 1); /* nuit_field_based_flag */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6057 skip_bits(&s->gb, 5); /* counting_type */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6058 full_timestamp_flag = get_bits(&s->gb, 1);
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6059 skip_bits(&s->gb, 1); /* discontinuity_flag */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6060 skip_bits(&s->gb, 1); /* cnt_dropped_flag */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6061 skip_bits(&s->gb, 8); /* n_frames */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6062 if(full_timestamp_flag){
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6063 skip_bits(&s->gb, 6); /* seconds_value 0..59 */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6064 skip_bits(&s->gb, 6); /* minutes_value 0..59 */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6065 skip_bits(&s->gb, 5); /* hours_value 0..23 */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6066 }else{
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6067 if(get_bits(&s->gb, 1)){ /* seconds_flag */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6068 skip_bits(&s->gb, 6); /* seconds_value range 0..59 */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6069 if(get_bits(&s->gb, 1)){ /* minutes_flag */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6070 skip_bits(&s->gb, 6); /* minutes_value 0..59 */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6071 if(get_bits(&s->gb, 1)) /* hours_flag */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6072 skip_bits(&s->gb, 5); /* hours_value 0..23 */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6073 }
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6074 }
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6075 }
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6076 if(h->sps.time_offset_length > 0)
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6077 skip_bits(&s->gb, h->sps.time_offset_length); /* time_offset */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6078 }
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6079 }
9789
391014285c25 Print ct_type and pic_struct.
michael
parents: 9733
diff changeset
6080
391014285c25 Print ct_type and pic_struct.
michael
parents: 9733
diff changeset
6081 if(s->avctx->debug & FF_DEBUG_PICT_INFO)
391014285c25 Print ct_type and pic_struct.
michael
parents: 9733
diff changeset
6082 av_log(s->avctx, AV_LOG_DEBUG, "ct_type:%X pic_struct:%d\n", h->sei_ct_type, h->sei_pic_struct);
8107
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6083 }
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6084 return 0;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6085 }
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6086
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6087 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
6088 MpegEncContext * const s = &h->s;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6089 uint8_t user_data[16+256];
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6090 int e, build, i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6091
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6092 if(size<16)
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6093 return -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6094
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6095 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
6096 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
6097 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6098
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6099 user_data[i]= 0;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6100 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
6101 if(e==1 && build>=0)
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6102 h->x264_build= build;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6103
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6104 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
6105 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
6106
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6107 for(; i<size; i++)
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6108 skip_bits(&s->gb, 8);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6109
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6110 return 0;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6111 }
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6112
8783
e91ea98d868a Add SEI recovery point frame counter to H264Context and use it when
cehoyos
parents: 8762
diff changeset
6113 static int decode_recovery_point(H264Context *h){
e91ea98d868a Add SEI recovery point frame counter to H264Context and use it when
cehoyos
parents: 8762
diff changeset
6114 MpegEncContext * const s = &h->s;
e91ea98d868a Add SEI recovery point frame counter to H264Context and use it when
cehoyos
parents: 8762
diff changeset
6115
e91ea98d868a Add SEI recovery point frame counter to H264Context and use it when
cehoyos
parents: 8762
diff changeset
6116 h->sei_recovery_frame_cnt = get_ue_golomb(&s->gb);
e91ea98d868a Add SEI recovery point frame counter to H264Context and use it when
cehoyos
parents: 8762
diff changeset
6117 skip_bits(&s->gb, 4); /* 1b exact_match_flag, 1b broken_link_flag, 2b changing_slice_group_idc */
e91ea98d868a Add SEI recovery point frame counter to H264Context and use it when
cehoyos
parents: 8762
diff changeset
6118
e91ea98d868a Add SEI recovery point frame counter to H264Context and use it when
cehoyos
parents: 8762
diff changeset
6119 return 0;
e91ea98d868a Add SEI recovery point frame counter to H264Context and use it when
cehoyos
parents: 8762
diff changeset
6120 }
e91ea98d868a Add SEI recovery point frame counter to H264Context and use it when
cehoyos
parents: 8762
diff changeset
6121
8972
eaf39f9b25df Parse buffering period (H.264, D.1.1).
cehoyos
parents: 8970
diff changeset
6122 static int decode_buffering_period(H264Context *h){
eaf39f9b25df Parse buffering period (H.264, D.1.1).
cehoyos
parents: 8970
diff changeset
6123 MpegEncContext * const s = &h->s;
eaf39f9b25df Parse buffering period (H.264, D.1.1).
cehoyos
parents: 8970
diff changeset
6124 unsigned int sps_id;
eaf39f9b25df Parse buffering period (H.264, D.1.1).
cehoyos
parents: 8970
diff changeset
6125 int sched_sel_idx;
eaf39f9b25df Parse buffering period (H.264, D.1.1).
cehoyos
parents: 8970
diff changeset
6126 SPS *sps;
eaf39f9b25df Parse buffering period (H.264, D.1.1).
cehoyos
parents: 8970
diff changeset
6127
eaf39f9b25df Parse buffering period (H.264, D.1.1).
cehoyos
parents: 8970
diff changeset
6128 sps_id = get_ue_golomb_31(&s->gb);
eaf39f9b25df Parse buffering period (H.264, D.1.1).
cehoyos
parents: 8970
diff changeset
6129 if(sps_id > 31 || !h->sps_buffers[sps_id]) {
eaf39f9b25df Parse buffering period (H.264, D.1.1).
cehoyos
parents: 8970
diff changeset
6130 av_log(h->s.avctx, AV_LOG_ERROR, "non-existing SPS %d referenced in buffering period\n", sps_id);
eaf39f9b25df Parse buffering period (H.264, D.1.1).
cehoyos
parents: 8970
diff changeset
6131 return -1;
eaf39f9b25df Parse buffering period (H.264, D.1.1).
cehoyos
parents: 8970
diff changeset
6132 }
eaf39f9b25df Parse buffering period (H.264, D.1.1).
cehoyos
parents: 8970
diff changeset
6133 sps = h->sps_buffers[sps_id];
eaf39f9b25df Parse buffering period (H.264, D.1.1).
cehoyos
parents: 8970
diff changeset
6134
eaf39f9b25df Parse buffering period (H.264, D.1.1).
cehoyos
parents: 8970
diff changeset
6135 // NOTE: This is really so duplicated in the standard... See H.264, D.1.1
eaf39f9b25df Parse buffering period (H.264, D.1.1).
cehoyos
parents: 8970
diff changeset
6136 if (sps->nal_hrd_parameters_present_flag) {
eaf39f9b25df Parse buffering period (H.264, D.1.1).
cehoyos
parents: 8970
diff changeset
6137 for (sched_sel_idx = 0; sched_sel_idx < sps->cpb_cnt; sched_sel_idx++) {
eaf39f9b25df Parse buffering period (H.264, D.1.1).
cehoyos
parents: 8970
diff changeset
6138 h->initial_cpb_removal_delay[sched_sel_idx] = get_bits(&s->gb, sps->initial_cpb_removal_delay_length);
eaf39f9b25df Parse buffering period (H.264, D.1.1).
cehoyos
parents: 8970
diff changeset
6139 skip_bits(&s->gb, sps->initial_cpb_removal_delay_length); // initial_cpb_removal_delay_offset
eaf39f9b25df Parse buffering period (H.264, D.1.1).
cehoyos
parents: 8970
diff changeset
6140 }
eaf39f9b25df Parse buffering period (H.264, D.1.1).
cehoyos
parents: 8970
diff changeset
6141 }
eaf39f9b25df Parse buffering period (H.264, D.1.1).
cehoyos
parents: 8970
diff changeset
6142 if (sps->vcl_hrd_parameters_present_flag) {
eaf39f9b25df Parse buffering period (H.264, D.1.1).
cehoyos
parents: 8970
diff changeset
6143 for (sched_sel_idx = 0; sched_sel_idx < sps->cpb_cnt; sched_sel_idx++) {
eaf39f9b25df Parse buffering period (H.264, D.1.1).
cehoyos
parents: 8970
diff changeset
6144 h->initial_cpb_removal_delay[sched_sel_idx] = get_bits(&s->gb, sps->initial_cpb_removal_delay_length);
eaf39f9b25df Parse buffering period (H.264, D.1.1).
cehoyos
parents: 8970
diff changeset
6145 skip_bits(&s->gb, sps->initial_cpb_removal_delay_length); // initial_cpb_removal_delay_offset
eaf39f9b25df Parse buffering period (H.264, D.1.1).
cehoyos
parents: 8970
diff changeset
6146 }
eaf39f9b25df Parse buffering period (H.264, D.1.1).
cehoyos
parents: 8970
diff changeset
6147 }
eaf39f9b25df Parse buffering period (H.264, D.1.1).
cehoyos
parents: 8970
diff changeset
6148
eaf39f9b25df Parse buffering period (H.264, D.1.1).
cehoyos
parents: 8970
diff changeset
6149 h->sei_buffering_period_present = 1;
eaf39f9b25df Parse buffering period (H.264, D.1.1).
cehoyos
parents: 8970
diff changeset
6150 return 0;
eaf39f9b25df Parse buffering period (H.264, D.1.1).
cehoyos
parents: 8970
diff changeset
6151 }
eaf39f9b25df Parse buffering period (H.264, D.1.1).
cehoyos
parents: 8970
diff changeset
6152
8996
e65778184ded Make the following H264 functions available to the parser:
cehoyos
parents: 8991
diff changeset
6153 int ff_h264_decode_sei(H264Context *h){
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6154 MpegEncContext * const s = &h->s;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6155
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6156 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
6157 int size, type;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6158
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6159 type=0;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6160 do{
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6161 type+= show_bits(&s->gb, 8);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6162 }while(get_bits(&s->gb, 8) == 255);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6163
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6164 size=0;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6165 do{
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6166 size+= show_bits(&s->gb, 8);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6167 }while(get_bits(&s->gb, 8) == 255);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6168
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6169 switch(type){
8762
4f1567ce75c4 Replace hard-coded SEI type constants with symbolic names
superdump
parents: 8742
diff changeset
6170 case SEI_TYPE_PIC_TIMING: // Picture timing SEI
8107
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6171 if(decode_picture_timing(h) < 0)
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6172 return -1;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6173 break;
8762
4f1567ce75c4 Replace hard-coded SEI type constants with symbolic names
superdump
parents: 8742
diff changeset
6174 case SEI_TYPE_USER_DATA_UNREGISTERED:
3318
8dc886b9568a typo me thinks ...
michael
parents: 3316
diff changeset
6175 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
6176 return -1;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6177 break;
8783
e91ea98d868a Add SEI recovery point frame counter to H264Context and use it when
cehoyos
parents: 8762
diff changeset
6178 case SEI_TYPE_RECOVERY_POINT:
e91ea98d868a Add SEI recovery point frame counter to H264Context and use it when
cehoyos
parents: 8762
diff changeset
6179 if(decode_recovery_point(h) < 0)
e91ea98d868a Add SEI recovery point frame counter to H264Context and use it when
cehoyos
parents: 8762
diff changeset
6180 return -1;
e91ea98d868a Add SEI recovery point frame counter to H264Context and use it when
cehoyos
parents: 8762
diff changeset
6181 break;
8972
eaf39f9b25df Parse buffering period (H.264, D.1.1).
cehoyos
parents: 8970
diff changeset
6182 case SEI_BUFFERING_PERIOD:
eaf39f9b25df Parse buffering period (H.264, D.1.1).
cehoyos
parents: 8970
diff changeset
6183 if(decode_buffering_period(h) < 0)
eaf39f9b25df Parse buffering period (H.264, D.1.1).
cehoyos
parents: 8970
diff changeset
6184 return -1;
eaf39f9b25df Parse buffering period (H.264, D.1.1).
cehoyos
parents: 8970
diff changeset
6185 break;
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6186 default:
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6187 skip_bits(&s->gb, 8*size);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6188 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6189
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6190 //FIXME check bits here
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6191 align_get_bits(&s->gb);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6192 }
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6193
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6194 return 0;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6195 }
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6196
8263
2e8368ea591a Check that cpb_count is within the allowed range.
michael
parents: 8235
diff changeset
6197 static inline int decode_hrd_parameters(H264Context *h, SPS *sps){
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6198 MpegEncContext * const s = &h->s;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6199 int cpb_count, i;
8451
384600e3fe5b Use get_ue_golomb_31() where possible, almost all are just in headers
michael
parents: 8448
diff changeset
6200 cpb_count = get_ue_golomb_31(&s->gb) + 1;
8263
2e8368ea591a Check that cpb_count is within the allowed range.
michael
parents: 8235
diff changeset
6201
2e8368ea591a Check that cpb_count is within the allowed range.
michael
parents: 8235
diff changeset
6202 if(cpb_count > 32U){
2e8368ea591a Check that cpb_count is within the allowed range.
michael
parents: 8235
diff changeset
6203 av_log(h->s.avctx, AV_LOG_ERROR, "cpb_count %d invalid\n", cpb_count);
2e8368ea591a Check that cpb_count is within the allowed range.
michael
parents: 8235
diff changeset
6204 return -1;
2e8368ea591a Check that cpb_count is within the allowed range.
michael
parents: 8235
diff changeset
6205 }
2e8368ea591a Check that cpb_count is within the allowed range.
michael
parents: 8235
diff changeset
6206
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6207 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
6208 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
6209 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
6210 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
6211 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
6212 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
6213 }
8965
a5dce344904a Parse initial_cpb_removal_delay_length.
cehoyos
parents: 8956
diff changeset
6214 sps->initial_cpb_removal_delay_length = get_bits(&s->gb, 5) + 1;
8107
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6215 sps->cpb_removal_delay_length = get_bits(&s->gb, 5) + 1;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6216 sps->dpb_output_delay_length = get_bits(&s->gb, 5) + 1;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6217 sps->time_offset_length = get_bits(&s->gb, 5);
8970
9757b2f87d83 Store CPB count in the context.
cehoyos
parents: 8967
diff changeset
6218 sps->cpb_cnt = cpb_count;
8263
2e8368ea591a Check that cpb_count is within the allowed range.
michael
parents: 8235
diff changeset
6219 return 0;
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6220 }
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6221
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6222 static inline int decode_vui_parameters(H264Context *h, SPS *sps){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6223 MpegEncContext * const s = &h->s;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
6224 int aspect_ratio_info_present_flag;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
6225 unsigned int aspect_ratio_idc;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6226
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6227 aspect_ratio_info_present_flag= get_bits1(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6228
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6229 if( aspect_ratio_info_present_flag ) {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6230 aspect_ratio_idc= get_bits(&s->gb, 8);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6231 if( aspect_ratio_idc == EXTENDED_SAR ) {
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
6232 sps->sar.num= get_bits(&s->gb, 16);
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
6233 sps->sar.den= get_bits(&s->gb, 16);
8042
e70975d5ff80 uses FF_ARRAY_ELEMS() where appropriate
aurel
parents: 7993
diff changeset
6234 }else if(aspect_ratio_idc < FF_ARRAY_ELEMS(pixel_aspect)){
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
6235 sps->sar= pixel_aspect[aspect_ratio_idc];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6236 }else{
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
6237 av_log(h->s.avctx, AV_LOG_ERROR, "illegal aspect ratio\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6238 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6239 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6240 }else{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6241 sps->sar.num=
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
6242 sps->sar.den= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6243 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6244 // 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 (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6245
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6246 if(get_bits1(&s->gb)){ /* overscan_info_present_flag */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6247 get_bits1(&s->gb); /* overscan_appropriate_flag */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6248 }
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6249
10837
e5905bfa625d Export fullrange flag and color information for h.264
conrad
parents: 10829
diff changeset
6250 sps->video_signal_type_present_flag = get_bits1(&s->gb);
e5905bfa625d Export fullrange flag and color information for h.264
conrad
parents: 10829
diff changeset
6251 if(sps->video_signal_type_present_flag){
2174
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6252 get_bits(&s->gb, 3); /* video_format */
10837
e5905bfa625d Export fullrange flag and color information for h.264
conrad
parents: 10829
diff changeset
6253 sps->full_range = get_bits1(&s->gb); /* video_full_range_flag */
e5905bfa625d Export fullrange flag and color information for h.264
conrad
parents: 10829
diff changeset
6254
e5905bfa625d Export fullrange flag and color information for h.264
conrad
parents: 10829
diff changeset
6255 sps->colour_description_present_flag = get_bits1(&s->gb);
e5905bfa625d Export fullrange flag and color information for h.264
conrad
parents: 10829
diff changeset
6256 if(sps->colour_description_present_flag){
e5905bfa625d Export fullrange flag and color information for h.264
conrad
parents: 10829
diff changeset
6257 sps->color_primaries = get_bits(&s->gb, 8); /* colour_primaries */
e5905bfa625d Export fullrange flag and color information for h.264
conrad
parents: 10829
diff changeset
6258 sps->color_trc = get_bits(&s->gb, 8); /* transfer_characteristics */
e5905bfa625d Export fullrange flag and color information for h.264
conrad
parents: 10829
diff changeset
6259 sps->colorspace = get_bits(&s->gb, 8); /* matrix_coefficients */
e5905bfa625d Export fullrange flag and color information for h.264
conrad
parents: 10829
diff changeset
6260 if (sps->color_primaries >= AVCOL_PRI_NB)
e5905bfa625d Export fullrange flag and color information for h.264
conrad
parents: 10829
diff changeset
6261 sps->color_primaries = AVCOL_PRI_UNSPECIFIED;
e5905bfa625d Export fullrange flag and color information for h.264
conrad
parents: 10829
diff changeset
6262 if (sps->color_trc >= AVCOL_TRC_NB)
e5905bfa625d Export fullrange flag and color information for h.264
conrad
parents: 10829
diff changeset
6263 sps->color_trc = AVCOL_TRC_UNSPECIFIED;
e5905bfa625d Export fullrange flag and color information for h.264
conrad
parents: 10829
diff changeset
6264 if (sps->colorspace >= AVCOL_SPC_NB)
e5905bfa625d Export fullrange flag and color information for h.264
conrad
parents: 10829
diff changeset
6265 sps->colorspace = AVCOL_SPC_UNSPECIFIED;
2174
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6266 }
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6267 }
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6268
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6269 if(get_bits1(&s->gb)){ /* chroma_location_info_present_flag */
9626
bd3e11b60ccd Add a chroma_sample_location field to define positioning of chroma samples
conrad
parents: 9449
diff changeset
6270 s->avctx->chroma_sample_location = get_ue_golomb(&s->gb)+1; /* chroma_sample_location_type_top_field */
2174
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6271 get_ue_golomb(&s->gb); /* chroma_sample_location_type_bottom_field */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6272 }
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6273
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6274 sps->timing_info_present_flag = get_bits1(&s->gb);
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6275 if(sps->timing_info_present_flag){
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6276 sps->num_units_in_tick = get_bits_long(&s->gb, 32);
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6277 sps->time_scale = get_bits_long(&s->gb, 32);
10234
c2fc56bdee95 Check num_units_in_tick/time_scale to be valid and within the range we support.
michael
parents: 10137
diff changeset
6278 if(sps->num_units_in_tick-1 > 0x7FFFFFFEU || sps->time_scale-1 > 0x7FFFFFFEU){
10235
14353a40db5e Cosmetics: Fix typo.
cehoyos
parents: 10234
diff changeset
6279 av_log(h->s.avctx, AV_LOG_ERROR, "time_scale/num_units_in_tick invalid or unsupported (%d/%d)\n", sps->time_scale, sps->num_units_in_tick);
10234
c2fc56bdee95 Check num_units_in_tick/time_scale to be valid and within the range we support.
michael
parents: 10137
diff changeset
6280 return -1;
c2fc56bdee95 Check num_units_in_tick/time_scale to be valid and within the range we support.
michael
parents: 10137
diff changeset
6281 }
2174
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6282 sps->fixed_frame_rate_flag = get_bits1(&s->gb);
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6283 }
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6284
8107
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6285 sps->nal_hrd_parameters_present_flag = get_bits1(&s->gb);
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6286 if(sps->nal_hrd_parameters_present_flag)
8263
2e8368ea591a Check that cpb_count is within the allowed range.
michael
parents: 8235
diff changeset
6287 if(decode_hrd_parameters(h, sps) < 0)
2e8368ea591a Check that cpb_count is within the allowed range.
michael
parents: 8235
diff changeset
6288 return -1;
8107
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6289 sps->vcl_hrd_parameters_present_flag = get_bits1(&s->gb);
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6290 if(sps->vcl_hrd_parameters_present_flag)
8263
2e8368ea591a Check that cpb_count is within the allowed range.
michael
parents: 8235
diff changeset
6291 if(decode_hrd_parameters(h, sps) < 0)
2e8368ea591a Check that cpb_count is within the allowed range.
michael
parents: 8235
diff changeset
6292 return -1;
8107
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6293 if(sps->nal_hrd_parameters_present_flag || sps->vcl_hrd_parameters_present_flag)
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6294 get_bits1(&s->gb); /* low_delay_hrd_flag */
8107
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6295 sps->pic_struct_present_flag = get_bits1(&s->gb);
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6296
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6297 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
6298 if(sps->bitstream_restriction_flag){
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6299 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
6300 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
6301 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
6302 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
6303 get_ue_golomb(&s->gb); /* log2_max_mv_length_vertical */
8235
61b5b99f3b77 Get rid of now unneeded pps/sps correctness code as pps/sps will not
michael
parents: 8234
diff changeset
6304 sps->num_reorder_frames= get_ue_golomb(&s->gb);
4389
3afddc65631b check num_reorder_frames for validity
michael
parents: 4388
diff changeset
6305 get_ue_golomb(&s->gb); /*max_dec_frame_buffering*/
3afddc65631b check num_reorder_frames for validity
michael
parents: 4388
diff changeset
6306
8235
61b5b99f3b77 Get rid of now unneeded pps/sps correctness code as pps/sps will not
michael
parents: 8234
diff changeset
6307 if(sps->num_reorder_frames > 16U /*max_dec_frame_buffering || max_dec_frame_buffering > 16*/){
61b5b99f3b77 Get rid of now unneeded pps/sps correctness code as pps/sps will not
michael
parents: 8234
diff changeset
6308 av_log(h->s.avctx, AV_LOG_ERROR, "illegal num_reorder_frames %d\n", sps->num_reorder_frames);
4389
3afddc65631b check num_reorder_frames for validity
michael
parents: 4388
diff changeset
6309 return -1;
3afddc65631b check num_reorder_frames for validity
michael
parents: 4388
diff changeset
6310 }
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6311 }
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6312
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6313 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6314 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6315
3004
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
6316 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
6317 const uint8_t *jvt_list, const uint8_t *fallback_list){
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6318 MpegEncContext * const s = &h->s;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6319 int i, last = 8, next = 8;
8646
8b52ac19a91c remove zigzag_scan8x8, it is the same as ff_zigzag_direct
stefang
parents: 8627
diff changeset
6320 const uint8_t *scan = size == 16 ? zigzag_scan : ff_zigzag_direct;
3004
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
6321 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
6322 memcpy(factors, fallback_list, size*sizeof(uint8_t));
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6323 else
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6324 for(i=0;i<size;i++){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6325 if(next)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6326 next = (last + get_se_golomb(&s->gb)) & 0xff;
3004
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
6327 if(!i && !next){ /* matrix not written, we use the preset one */
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
6328 memcpy(factors, jvt_list, size*sizeof(uint8_t));
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6329 break;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6330 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6331 last = factors[scan[i]] = next ? next : last;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6332 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6333 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6334
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6335 static void decode_scaling_matrices(H264Context *h, SPS *sps, PPS *pps, int is_sps,
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6336 uint8_t (*scaling_matrix4)[16], uint8_t (*scaling_matrix8)[64]){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6337 MpegEncContext * const s = &h->s;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6338 int fallback_sps = !is_sps && sps->scaling_matrix_present;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6339 const uint8_t *fallback[4] = {
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6340 fallback_sps ? sps->scaling_matrix4[0] : default_scaling4[0],
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6341 fallback_sps ? sps->scaling_matrix4[3] : default_scaling4[1],
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6342 fallback_sps ? sps->scaling_matrix8[0] : default_scaling8[0],
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6343 fallback_sps ? sps->scaling_matrix8[1] : default_scaling8[1]
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6344 };
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6345 if(get_bits1(&s->gb)){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6346 sps->scaling_matrix_present |= is_sps;
3004
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
6347 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
6348 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
6349 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
6350 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
6351 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
6352 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
6353 if(is_sps || pps->transform_8x8_mode){
3004
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
6354 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
6355 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
6356 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6357 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6358 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6359
8996
e65778184ded Make the following H264 functions available to the parser:
cehoyos
parents: 8991
diff changeset
6360 int ff_h264_decode_seq_parameter_set(H264Context *h){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6361 MpegEncContext * const s = &h->s;
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6362 int profile_idc, level_idc;
8235
61b5b99f3b77 Get rid of now unneeded pps/sps correctness code as pps/sps will not
michael
parents: 8234
diff changeset
6363 unsigned int sps_id;
4362
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
6364 int i;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6365 SPS *sps;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6366
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6367 profile_idc= get_bits(&s->gb, 8);
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6368 get_bits1(&s->gb); //constraint_set0_flag
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6369 get_bits1(&s->gb); //constraint_set1_flag
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6370 get_bits1(&s->gb); //constraint_set2_flag
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
6371 get_bits1(&s->gb); //constraint_set3_flag
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
6372 get_bits(&s->gb, 4); // reserved
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6373 level_idc= get_bits(&s->gb, 8);
8451
384600e3fe5b Use get_ue_golomb_31() where possible, almost all are just in headers
michael
parents: 8448
diff changeset
6374 sps_id= get_ue_golomb_31(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6375
8234
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
6376 if(sps_id >= MAX_SPS_COUNT) {
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
6377 av_log(h->s.avctx, AV_LOG_ERROR, "sps_id (%d) out of range\n", sps_id);
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
6378 return -1;
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
6379 }
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
6380 sps= av_mallocz(sizeof(SPS));
5079
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
6381 if(sps == NULL)
4362
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
6382 return -1;
5079
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
6383
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6384 sps->profile_idc= profile_idc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6385 sps->level_idc= level_idc;
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
6386
7892
59e42f624d4d Make pps/sps scaling_matrix initialization closer to the spec.
michael
parents: 7888
diff changeset
6387 memset(sps->scaling_matrix4, 16, sizeof(sps->scaling_matrix4));
59e42f624d4d Make pps/sps scaling_matrix initialization closer to the spec.
michael
parents: 7888
diff changeset
6388 memset(sps->scaling_matrix8, 16, sizeof(sps->scaling_matrix8));
59e42f624d4d Make pps/sps scaling_matrix initialization closer to the spec.
michael
parents: 7888
diff changeset
6389 sps->scaling_matrix_present = 0;
59e42f624d4d Make pps/sps scaling_matrix initialization closer to the spec.
michael
parents: 7888
diff changeset
6390
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6391 if(sps->profile_idc >= 100){ //high profile
8451
384600e3fe5b Use get_ue_golomb_31() where possible, almost all are just in headers
michael
parents: 8448
diff changeset
6392 sps->chroma_format_idc= get_ue_golomb_31(&s->gb);
7407
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
6393 if(sps->chroma_format_idc == 3)
8735
5d7ebbb7e91b Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents: 8727
diff changeset
6394 sps->residual_color_transform_flag = get_bits1(&s->gb);
5d7ebbb7e91b Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents: 8727
diff changeset
6395 sps->bit_depth_luma = get_ue_golomb(&s->gb) + 8;
5d7ebbb7e91b Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents: 8727
diff changeset
6396 sps->bit_depth_chroma = get_ue_golomb(&s->gb) + 8;
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
6397 sps->transform_bypass = get_bits1(&s->gb);
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6398 decode_scaling_matrices(h, sps, NULL, 1, sps->scaling_matrix4, sps->scaling_matrix8);
7407
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
6399 }else{
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
6400 sps->chroma_format_idc= 1;
10826
59c35482189e Always initialize bit_depth_luma and bit_depth_chroma in the H264
jai_menon
parents: 10811
diff changeset
6401 sps->bit_depth_luma = 8;
59c35482189e Always initialize bit_depth_luma and bit_depth_chroma in the H264
jai_menon
parents: 10811
diff changeset
6402 sps->bit_depth_chroma = 8;
7407
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
6403 }
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6404
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6405 sps->log2_max_frame_num= get_ue_golomb(&s->gb) + 4;
8451
384600e3fe5b Use get_ue_golomb_31() where possible, almost all are just in headers
michael
parents: 8448
diff changeset
6406 sps->poc_type= get_ue_golomb_31(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6407
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6408 if(sps->poc_type == 0){ //FIXME #define
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6409 sps->log2_max_poc_lsb= get_ue_golomb(&s->gb) + 4;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6410 } else if(sps->poc_type == 1){//FIXME #define
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6411 sps->delta_pic_order_always_zero_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6412 sps->offset_for_non_ref_pic= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6413 sps->offset_for_top_to_bottom_field= get_se_golomb(&s->gb);
8235
61b5b99f3b77 Get rid of now unneeded pps/sps correctness code as pps/sps will not
michael
parents: 8234
diff changeset
6414 sps->poc_cycle_length = get_ue_golomb(&s->gb);
61b5b99f3b77 Get rid of now unneeded pps/sps correctness code as pps/sps will not
michael
parents: 8234
diff changeset
6415
61b5b99f3b77 Get rid of now unneeded pps/sps correctness code as pps/sps will not
michael
parents: 8234
diff changeset
6416 if((unsigned)sps->poc_cycle_length >= FF_ARRAY_ELEMS(sps->offset_for_ref_frame)){
61b5b99f3b77 Get rid of now unneeded pps/sps correctness code as pps/sps will not
michael
parents: 8234
diff changeset
6417 av_log(h->s.avctx, AV_LOG_ERROR, "poc_cycle_length overflow %u\n", sps->poc_cycle_length);
8234
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
6418 goto fail;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
6419 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6420
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6421 for(i=0; i<sps->poc_cycle_length; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6422 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
6423 }else if(sps->poc_type != 2){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
6424 av_log(h->s.avctx, AV_LOG_ERROR, "illegal POC type %d\n", sps->poc_type);
8234
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
6425 goto fail;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6426 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6427
8451
384600e3fe5b Use get_ue_golomb_31() where possible, almost all are just in headers
michael
parents: 8448
diff changeset
6428 sps->ref_frame_count= get_ue_golomb_31(&s->gb);
8235
61b5b99f3b77 Get rid of now unneeded pps/sps correctness code as pps/sps will not
michael
parents: 8234
diff changeset
6429 if(sps->ref_frame_count > MAX_PICTURE_COUNT-2 || sps->ref_frame_count >= 32U){
2254
0dfe4e32b19c H.264 max reference pictures fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2227
diff changeset
6430 av_log(h->s.avctx, AV_LOG_ERROR, "too many reference frames\n");
8234
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
6431 goto fail;
2254
0dfe4e32b19c H.264 max reference pictures fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2227
diff changeset
6432 }
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6433 sps->gaps_in_frame_num_allowed_flag= get_bits1(&s->gb);
8235
61b5b99f3b77 Get rid of now unneeded pps/sps correctness code as pps/sps will not
michael
parents: 8234
diff changeset
6434 sps->mb_width = get_ue_golomb(&s->gb) + 1;
61b5b99f3b77 Get rid of now unneeded pps/sps correctness code as pps/sps will not
michael
parents: 8234
diff changeset
6435 sps->mb_height= get_ue_golomb(&s->gb) + 1;
61b5b99f3b77 Get rid of now unneeded pps/sps correctness code as pps/sps will not
michael
parents: 8234
diff changeset
6436 if((unsigned)sps->mb_width >= INT_MAX/16 || (unsigned)sps->mb_height >= INT_MAX/16 ||
61b5b99f3b77 Get rid of now unneeded pps/sps correctness code as pps/sps will not
michael
parents: 8234
diff changeset
6437 avcodec_check_dimensions(NULL, 16*sps->mb_width, 16*sps->mb_height)){
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
6438 av_log(h->s.avctx, AV_LOG_ERROR, "mb_width/height overflow\n");
8234
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
6439 goto fail;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
6440 }
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2417
diff changeset
6441
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6442 sps->frame_mbs_only_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6443 if(!sps->frame_mbs_only_flag)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6444 sps->mb_aff= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6445 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6446 sps->mb_aff= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6447
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6448 sps->direct_8x8_inference_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6449
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6450 #ifndef ALLOW_INTERLACE
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6451 if(sps->mb_aff)
3954
00a12ef7d800 output typo fixes
diego
parents: 3948
diff changeset
6452 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
6453 #endif
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6454 sps->crop= get_bits1(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6455 if(sps->crop){
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6456 sps->crop_left = get_ue_golomb(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6457 sps->crop_right = get_ue_golomb(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6458 sps->crop_top = get_ue_golomb(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6459 sps->crop_bottom= get_ue_golomb(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6460 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
6461 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
6462 }
7844
d35a71a3db5f Fix incorrect printing of brainfart cropping error in some cases in progressive mode.
darkshikari
parents: 7831
diff changeset
6463 if(sps->crop_right >= 8 || sps->crop_bottom >= (8>> !sps->frame_mbs_only_flag)){
6581
e6d8c5bbeeac Avoid crash with idiotic cropping. Fixes crash with CVFC1_Sony_C.jsv
michael
parents: 6524
diff changeset
6464 av_log(h->s.avctx, AV_LOG_ERROR, "brainfart cropping not supported, this could look slightly wrong ...\n");
e6d8c5bbeeac Avoid crash with idiotic cropping. Fixes crash with CVFC1_Sony_C.jsv
michael
parents: 6524
diff changeset
6465 }
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6466 }else{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6467 sps->crop_left =
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6468 sps->crop_right =
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6469 sps->crop_top =
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6470 sps->crop_bottom= 0;
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6471 }
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6472
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6473 sps->vui_parameters_present_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6474 if( sps->vui_parameters_present_flag )
9911
14edbbff0f25 H.264: Check the return value of decode_vui_parameters()
astrange
parents: 9910
diff changeset
6475 if (decode_vui_parameters(h, sps) < 0)
14edbbff0f25 H.264: Check the return value of decode_vui_parameters()
astrange
parents: 9910
diff changeset
6476 goto fail;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6477
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6478 if(s->avctx->debug&FF_DEBUG_PICT_INFO){
9163
bc064231dc43 Print timing_info on -debug 1.
michael
parents: 9144
diff changeset
6479 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 %s %d/%d\n",
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6480 sps_id, sps->profile_idc, sps->level_idc,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6481 sps->poc_type,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6482 sps->ref_frame_count,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6483 sps->mb_width, sps->mb_height,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6484 sps->frame_mbs_only_flag ? "FRM" : (sps->mb_aff ? "MB-AFF" : "PIC-AFF"),
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6485 sps->direct_8x8_inference_flag ? "8B8" : "",
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6486 sps->crop_left, sps->crop_right,
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6487 sps->crop_top, sps->crop_bottom,
7407
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
6488 sps->vui_parameters_present_flag ? "VUI" : "",
9163
bc064231dc43 Print timing_info on -debug 1.
michael
parents: 9144
diff changeset
6489 ((const char*[]){"Gray","420","422","444"})[sps->chroma_format_idc],
bc064231dc43 Print timing_info on -debug 1.
michael
parents: 9144
diff changeset
6490 sps->timing_info_present_flag ? sps->num_units_in_tick : 0,
bc064231dc43 Print timing_info on -debug 1.
michael
parents: 9144
diff changeset
6491 sps->timing_info_present_flag ? sps->time_scale : 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6492 );
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6493 }
8688
5cf9f2f663b0 cosmetics: Add empty line for consistent formatting.
diego
parents: 8646
diff changeset
6494
8234
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
6495 av_free(h->sps_buffers[sps_id]);
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
6496 h->sps_buffers[sps_id]= sps;
8991
ca768cb2bfb6 Use last decoded SPS as current SPS in order to parse picture timing SEI
cehoyos
parents: 8987
diff changeset
6497 h->sps = *sps;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6498 return 0;
8234
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
6499 fail:
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
6500 av_free(sps);
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
6501 return -1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6502 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6503
5226
65bffcc5571a Precompute a chroma_qp table with index offset for each pps,
gpoirier
parents: 5225
diff changeset
6504 static void
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6505 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
6506 {
65bffcc5571a Precompute a chroma_qp table with index offset for each pps,
gpoirier
parents: 5225
diff changeset
6507 int i;
7347
612a78c3b128 qscale has a range of 0..51 we thus do not need a 256 entry table and neither need
michael
parents: 7346
diff changeset
6508 for(i = 0; i < 52; i++)
612a78c3b128 qscale has a range of 0..51 we thus do not need a 256 entry table and neither need
michael
parents: 7346
diff changeset
6509 pps->chroma_qp_table[t][i] = 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
6510 }
65bffcc5571a Precompute a chroma_qp table with index offset for each pps,
gpoirier
parents: 5225
diff changeset
6511
8996
e65778184ded Make the following H264 functions available to the parser:
cehoyos
parents: 8991
diff changeset
6512 int ff_h264_decode_picture_parameter_set(H264Context *h, int bit_length){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6513 MpegEncContext * const s = &h->s;
8235
61b5b99f3b77 Get rid of now unneeded pps/sps correctness code as pps/sps will not
michael
parents: 8234
diff changeset
6514 unsigned int 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
6515 PPS *pps;
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
6516
8234
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
6517 if(pps_id >= MAX_PPS_COUNT) {
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
6518 av_log(h->s.avctx, AV_LOG_ERROR, "pps_id (%d) out of range\n", pps_id);
4362
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
6519 return -1;
8234
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
6520 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6521
8234
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
6522 pps= av_mallocz(sizeof(PPS));
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
6523 if(pps == NULL)
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
6524 return -1;
8451
384600e3fe5b Use get_ue_golomb_31() where possible, almost all are just in headers
michael
parents: 8448
diff changeset
6525 pps->sps_id= get_ue_golomb_31(&s->gb);
8235
61b5b99f3b77 Get rid of now unneeded pps/sps correctness code as pps/sps will not
michael
parents: 8234
diff changeset
6526 if((unsigned)pps->sps_id>=MAX_SPS_COUNT || h->sps_buffers[pps->sps_id] == NULL){
61b5b99f3b77 Get rid of now unneeded pps/sps correctness code as pps/sps will not
michael
parents: 8234
diff changeset
6527 av_log(h->s.avctx, AV_LOG_ERROR, "sps_id out of range\n");
61b5b99f3b77 Get rid of now unneeded pps/sps correctness code as pps/sps will not
michael
parents: 8234
diff changeset
6528 goto fail;
61b5b99f3b77 Get rid of now unneeded pps/sps correctness code as pps/sps will not
michael
parents: 8234
diff changeset
6529 }
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
6530
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6531 pps->cabac= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6532 pps->pic_order_present= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6533 pps->slice_group_count= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6534 if(pps->slice_group_count > 1 ){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6535 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
6536 av_log(h->s.avctx, AV_LOG_ERROR, "FMO not supported\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6537 switch(pps->mb_slice_group_map_type){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6538 case 0:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6539 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6540 | for( i = 0; i <= num_slice_groups_minus1; i++ ) | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6541 | run_length[ i ] |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6542 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6543 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6544 case 2:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6545 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6546 | for( i = 0; i < num_slice_groups_minus1; i++ ) | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6547 |{ | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6548 | top_left_mb[ i ] |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6549 | bottom_right_mb[ i ] |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6550 | } | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6551 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6552 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6553 case 3:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6554 case 4:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6555 case 5:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6556 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6557 | slice_group_change_direction_flag |1 |u(1) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6558 | slice_group_change_rate_minus1 |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6559 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6560 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6561 case 6:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6562 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6563 | slice_group_id_cnt_minus1 |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6564 | for( i = 0; i <= slice_group_id_cnt_minus1; i++ | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6565 |) | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6566 | slice_group_id[ i ] |1 |u(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6567 #endif
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1187
diff changeset
6568 break;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6569 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6570 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6571 pps->ref_count[0]= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6572 pps->ref_count[1]= get_ue_golomb(&s->gb) + 1;
4531
8a5a3dd25390 fix ref_count check
michael
parents: 4530
diff changeset
6573 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
6574 av_log(h->s.avctx, AV_LOG_ERROR, "reference overflow (pps)\n");
8234
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
6575 goto fail;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6576 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6577
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6578 pps->weighted_pred= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6579 pps->weighted_bipred_idc= get_bits(&s->gb, 2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6580 pps->init_qp= get_se_golomb(&s->gb) + 26;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6581 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
6582 pps->chroma_qp_index_offset[0]= get_se_golomb(&s->gb);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6583 pps->deblocking_filter_parameters_present= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6584 pps->constrained_intra_pred= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6585 pps->redundant_pic_cnt_present = get_bits1(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6586
3291
454de57e45cf reinit quant matrices if pps is overwritten by another of the same pps_id.
lorenm
parents: 3285
diff changeset
6587 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
6588 h->dequant_coeff_pps= -1; //contents of sps/pps can change even if id doesn't, so reinit
7892
59e42f624d4d Make pps/sps scaling_matrix initialization closer to the spec.
michael
parents: 7888
diff changeset
6589 memcpy(pps->scaling_matrix4, h->sps_buffers[pps->sps_id]->scaling_matrix4, sizeof(pps->scaling_matrix4));
59e42f624d4d Make pps/sps scaling_matrix initialization closer to the spec.
michael
parents: 7888
diff changeset
6590 memcpy(pps->scaling_matrix8, h->sps_buffers[pps->sps_id]->scaling_matrix8, sizeof(pps->scaling_matrix8));
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6591
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6592 if(get_bits_count(&s->gb) < bit_length){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6593 pps->transform_8x8_mode= get_bits1(&s->gb);
5079
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
6594 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
6595 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
6596 } else {
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6597 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
6598 }
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6599
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6600 build_qp_table(pps, 0, pps->chroma_qp_index_offset[0]);
7345
a36996f67748 Deobfusate chroma_qp_table[1] init code.
michael
parents: 7344
diff changeset
6601 build_qp_table(pps, 1, pps->chroma_qp_index_offset[1]);
a36996f67748 Deobfusate chroma_qp_table[1] init code.
michael
parents: 7344
diff changeset
6602 if(pps->chroma_qp_index_offset[0] != pps->chroma_qp_index_offset[1])
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6603 h->pps.chroma_qp_diff= 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6604
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6605 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
6606 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
6607 pps_id, pps->sps_id,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6608 pps->cabac ? "CABAC" : "CAVLC",
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6609 pps->slice_group_count,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6610 pps->ref_count[0], pps->ref_count[1],
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6611 pps->weighted_pred ? "weighted" : "",
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6612 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
6613 pps->deblocking_filter_parameters_present ? "LPAR" : "",
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6614 pps->constrained_intra_pred ? "CONSTR" : "",
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6615 pps->redundant_pic_cnt_present ? "REDU" : "",
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6616 pps->transform_8x8_mode ? "8x8DCT" : ""
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6617 );
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6618 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6619
8234
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
6620 av_free(h->pps_buffers[pps_id]);
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
6621 h->pps_buffers[pps_id]= pps;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6622 return 0;
8234
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
6623 fail:
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
6624 av_free(pps);
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
6625 return -1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6626 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6627
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6628 /**
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6629 * Call decode_slice() for each context.
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6630 *
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6631 * @param h h264 master context
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6632 * @param context_count number of contexts to execute
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6633 */
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6634 static void execute_decode_slices(H264Context *h, int context_count){
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6635 MpegEncContext * const s = &h->s;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6636 AVCodecContext * const avctx= s->avctx;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6637 H264Context *hx;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6638 int i;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6639
9012
15a3df8c01fd More approved hunks for VAAPI & our new and cleaner hwaccel API.
michael
parents: 9004
diff changeset
6640 if (s->avctx->hwaccel)
15a3df8c01fd More approved hunks for VAAPI & our new and cleaner hwaccel API.
michael
parents: 9004
diff changeset
6641 return;
8610
2ca51be7dad8 Remove CODEC_ID_H264_VDPAU.
cehoyos
parents: 8596
diff changeset
6642 if(s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)
8522
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
6643 return;
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6644 if(context_count == 1) {
8140
54d7d6a63f3c Fix H.264 decoding.
cehoyos
parents: 8129
diff changeset
6645 decode_slice(avctx, &h);
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6646 } else {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6647 for(i = 1; i < context_count; i++) {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6648 hx = h->thread_context[i];
7831
8195c970d077 Rename error_resilience to error_recognition.
michael
parents: 7789
diff changeset
6649 hx->s.error_recognition = avctx->error_recognition;
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6650 hx->s.error_count = 0;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6651 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6652
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6653 avctx->execute(avctx, (void *)decode_slice,
10368
59ec306245a4 Remove casts that are useless since the argument is void *.
reimar
parents: 10235
diff changeset
6654 h->thread_context, NULL, context_count, sizeof(void*));
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6655
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6656 /* pull back stuff from slices to master context */
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6657 hx = h->thread_context[context_count - 1];
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6658 s->mb_x = hx->s.mb_x;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6659 s->mb_y = hx->s.mb_y;
5798
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
6660 s->dropable = hx->s.dropable;
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
6661 s->picture_structure = hx->s.picture_structure;
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6662 for(i = 1; i < context_count; i++)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6663 h->s.error_count += h->thread_context[i]->s.error_count;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6664 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6665 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6666
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6667
6216
michael
parents: 6213
diff changeset
6668 static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6669 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6670 AVCodecContext * const avctx= s->avctx;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6671 int buf_index=0;
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6672 H264Context *hx; ///< thread context
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6673 int context_count = 0;
9449
0bc68f915e8e Support broken avc nal encapsulation.
michael
parents: 9419
diff changeset
6674 int next_avc= h->is_avc ? 0 : buf_size;
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6675
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6676 h->max_contexts = avctx->thread_count;
1322
f78341ab5fba some warning fixes
al3x
parents: 1319
diff changeset
6677 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6678 int i;
2867
7c7edddaa835 dont be so picky with .mp4 ... fixes Mr&MrsSmith.mp4
michael
parents: 2861
diff changeset
6679 for(i=0; i<50; i++){
7c7edddaa835 dont be so picky with .mp4 ... fixes Mr&MrsSmith.mp4
michael
parents: 2861
diff changeset
6680 av_log(NULL, AV_LOG_ERROR,"%02X ", buf[i]);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6681 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6682 #endif
4616
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
6683 if(!(s->flags2 & CODEC_FLAG2_CHUNKS)){
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6684 h->current_slice = 0;
5798
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
6685 if (!s->first_field)
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
6686 s->current_picture_ptr= NULL;
9069
8a74ab19d224 Correctly reset SEI variables.
cehoyos
parents: 9066
diff changeset
6687 reset_sei(h);
4616
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
6688 }
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
6689
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6690 for(;;){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6691 int consumed;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6692 int dst_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6693 int bit_length;
6216
michael
parents: 6213
diff changeset
6694 const uint8_t *ptr;
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6695 int i, nalsize = 0;
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6696 int err;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6697
9449
0bc68f915e8e Support broken avc nal encapsulation.
michael
parents: 9419
diff changeset
6698 if(buf_index >= next_avc) {
5170
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
6699 if(buf_index >= buf_size) break;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
6700 nalsize = 0;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
6701 for(i = 0; i < h->nal_length_size; i++)
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
6702 nalsize = (nalsize << 8) | buf[buf_index++];
9898
003d7f830e2a Fix nalsize check to avoid an integer overflow that made the check
reimar
parents: 9885
diff changeset
6703 if(nalsize <= 1 || nalsize > buf_size - buf_index){
5170
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
6704 if(nalsize == 1){
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
6705 buf_index++;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
6706 continue;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
6707 }else{
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
6708 av_log(h->s.avctx, AV_LOG_ERROR, "AVC: nal size %d\n", nalsize);
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
6709 break;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
6710 }
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
6711 }
9449
0bc68f915e8e Support broken avc nal encapsulation.
michael
parents: 9419
diff changeset
6712 next_avc= buf_index + nalsize;
5170
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
6713 } else {
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
6714 // start code prefix search
10663
dc61c373810e End startcode prefix search at the end of a AVC unit.
michael
parents: 10656
diff changeset
6715 for(; buf_index + 3 < next_avc; buf_index++){
5170
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
6716 // This should always succeed in the first iteration.
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
6717 if(buf[buf_index] == 0 && buf[buf_index+1] == 0 && buf[buf_index+2] == 1)
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
6718 break;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
6719 }
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
6720
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
6721 if(buf_index+3 >= buf_size) break;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
6722
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
6723 buf_index+=3;
10663
dc61c373810e End startcode prefix search at the end of a AVC unit.
michael
parents: 10656
diff changeset
6724 if(buf_index >= next_avc) continue;
5170
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
6725 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6726
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6727 hx = h->thread_context[context_count];
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6728
9449
0bc68f915e8e Support broken avc nal encapsulation.
michael
parents: 9419
diff changeset
6729 ptr= ff_h264_decode_nal(hx, buf + buf_index, &dst_length, &consumed, next_avc - buf_index);
4828
58f1856608f6 scenario: A properly coded frame is followed by an end of sequence NAL unit,
diego
parents: 4795
diff changeset
6730 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
6731 return -1;
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
6732 }
4829
e3161603a048 Remove a NAL unit's trailing zero bytes even when dst_length is 1.
diego
parents: 4828
diff changeset
6733 while(ptr[dst_length - 1] == 0 && dst_length > 0)
3341
bd7a496e44c9 h264: accept rbsp_trailing longer than 1 byte
lorenm
parents: 3318
diff changeset
6734 dst_length--;
8996
e65778184ded Make the following H264 functions available to the parser:
cehoyos
parents: 8991
diff changeset
6735 bit_length= !dst_length ? 0 : (8*dst_length - ff_h264_decode_rbsp_trailing(h, ptr + dst_length - 1));
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6736
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6737 if(s->avctx->debug&FF_DEBUG_STARTCODE){
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6738 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
6739 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6740
9449
0bc68f915e8e Support broken avc nal encapsulation.
michael
parents: 9419
diff changeset
6741 if (h->is_avc && (nalsize != consumed) && nalsize){
10656
34911596ffed Reduce warnings about too few consumed bytes to debug level.
michael
parents: 10565
diff changeset
6742 av_log(h->s.avctx, AV_LOG_DEBUG, "AVC: Consumed only %d bytes instead of %d\n", consumed, nalsize);
6490
bb799e3bc64b If consumed does not match nalsize, favor nalsize.
michael
parents: 6488
diff changeset
6743 }
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6744
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6745 buf_index += consumed;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6746
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5106
diff changeset
6747 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
6748 ||(avctx->skip_frame >= AVDISCARD_NONREF && h->nal_ref_idc == 0))
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6749 continue;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6750
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6751 again:
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6752 err = 0;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6753 switch(hx->nal_unit_type){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6754 case NAL_IDR_SLICE:
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6755 if (h->nal_unit_type != NAL_IDR_SLICE) {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6756 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
6757 return -1;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6758 }
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
6759 idr(h); //FIXME ensure we don't loose some frames if there is reordering
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6760 case NAL_SLICE:
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6761 init_get_bits(&hx->s.gb, ptr, bit_length);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6762 hx->intra_gb_ptr=
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6763 hx->inter_gb_ptr= &hx->s.gb;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6764 hx->s.data_partitioning = 0;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6765
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6766 if((err = decode_slice_header(hx, h)))
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6767 break;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6768
9066
77cbbce1be94 Add hardware acceleration hooks to H.264.
benoit
parents: 9065
diff changeset
6769 if (s->avctx->hwaccel && h->current_slice == 1) {
77cbbce1be94 Add hardware acceleration hooks to H.264.
benoit
parents: 9065
diff changeset
6770 if (s->avctx->hwaccel->start_frame(s->avctx, NULL, 0) < 0)
77cbbce1be94 Add hardware acceleration hooks to H.264.
benoit
parents: 9065
diff changeset
6771 return -1;
77cbbce1be94 Add hardware acceleration hooks to H.264.
benoit
parents: 9065
diff changeset
6772 }
77cbbce1be94 Add hardware acceleration hooks to H.264.
benoit
parents: 9065
diff changeset
6773
8783
e91ea98d868a Add SEI recovery point frame counter to H264Context and use it when
cehoyos
parents: 8762
diff changeset
6774 s->current_picture_ptr->key_frame |=
e91ea98d868a Add SEI recovery point frame counter to H264Context and use it when
cehoyos
parents: 8762
diff changeset
6775 (hx->nal_unit_type == NAL_IDR_SLICE) ||
e91ea98d868a Add SEI recovery point frame counter to H264Context and use it when
cehoyos
parents: 8762
diff changeset
6776 (h->sei_recovery_frame_cnt >= 0);
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6777 if(hx->redundant_pic_count==0 && hx->s.hurry_up < 5
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6778 && (avctx->skip_frame < AVDISCARD_NONREF || hx->nal_ref_idc)
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
6779 && (avctx->skip_frame < AVDISCARD_BIDIR || hx->slice_type_nos!=FF_B_TYPE)
7340
ef40221c1452 SI/SP slice support. (not bitexact)
michael
parents: 7339
diff changeset
6780 && (avctx->skip_frame < AVDISCARD_NONKEY || hx->slice_type_nos==FF_I_TYPE)
8522
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
6781 && avctx->skip_frame < AVDISCARD_ALL){
9045
5fb849bddf4a Add hwaccel->decode_slice() call for avhwaccel by Gwenole Beauchesne.
michael
parents: 9035
diff changeset
6782 if(avctx->hwaccel) {
5fb849bddf4a Add hwaccel->decode_slice() call for avhwaccel by Gwenole Beauchesne.
michael
parents: 9035
diff changeset
6783 if (avctx->hwaccel->decode_slice(avctx, &buf[buf_index - consumed], consumed) < 0)
5fb849bddf4a Add hwaccel->decode_slice() call for avhwaccel by Gwenole Beauchesne.
michael
parents: 9035
diff changeset
6784 return -1;
5fb849bddf4a Add hwaccel->decode_slice() call for avhwaccel by Gwenole Beauchesne.
michael
parents: 9035
diff changeset
6785 }else
8610
2ca51be7dad8 Remove CODEC_ID_H264_VDPAU.
cehoyos
parents: 8596
diff changeset
6786 if(CONFIG_H264_VDPAU_DECODER && s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU){
8522
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
6787 static const uint8_t start_code[] = {0x00, 0x00, 0x01};
8563
b59279494d84 Cosmetics: Rename ff_vdpau_h264_add_data_chunk as ff_vdpau_add_data_chunk.
cehoyos
parents: 8562
diff changeset
6788 ff_vdpau_add_data_chunk(s, start_code, sizeof(start_code));
b59279494d84 Cosmetics: Rename ff_vdpau_h264_add_data_chunk as ff_vdpau_add_data_chunk.
cehoyos
parents: 8562
diff changeset
6789 ff_vdpau_add_data_chunk(s, &buf[buf_index - consumed], consumed );
8522
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
6790 }else
8524
e2d97d1449d4 Cosmetics: Fix indentation.
cehoyos
parents: 8522
diff changeset
6791 context_count++;
8522
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
6792 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6793 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6794 case NAL_DPA:
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6795 init_get_bits(&hx->s.gb, ptr, bit_length);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6796 hx->intra_gb_ptr=
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6797 hx->inter_gb_ptr= NULL;
9910
d07aee233d03 H.264: Don't set data_partitioning for invalid NAL_DPA.
astrange
parents: 9898
diff changeset
6798
d07aee233d03 H.264: Don't set data_partitioning for invalid NAL_DPA.
astrange
parents: 9898
diff changeset
6799 if ((err = decode_slice_header(hx, h)) < 0)
d07aee233d03 H.264: Don't set data_partitioning for invalid NAL_DPA.
astrange
parents: 9898
diff changeset
6800 break;
d07aee233d03 H.264: Don't set data_partitioning for invalid NAL_DPA.
astrange
parents: 9898
diff changeset
6801
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6802 hx->s.data_partitioning = 1;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6803
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6804 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6805 case NAL_DPB:
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6806 init_get_bits(&hx->intra_gb, ptr, bit_length);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6807 hx->intra_gb_ptr= &hx->intra_gb;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6808 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6809 case NAL_DPC:
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6810 init_get_bits(&hx->inter_gb, ptr, bit_length);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6811 hx->inter_gb_ptr= &hx->inter_gb;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6812
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6813 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
6814 && s->context_initialized
2793
ae85da6c5c2f more fine grained skip_frame
michael
parents: 2792
diff changeset
6815 && s->hurry_up < 5
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6816 && (avctx->skip_frame < AVDISCARD_NONREF || hx->nal_ref_idc)
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
6817 && (avctx->skip_frame < AVDISCARD_BIDIR || hx->slice_type_nos!=FF_B_TYPE)
7340
ef40221c1452 SI/SP slice support. (not bitexact)
michael
parents: 7339
diff changeset
6818 && (avctx->skip_frame < AVDISCARD_NONKEY || hx->slice_type_nos==FF_I_TYPE)
2793
ae85da6c5c2f more fine grained skip_frame
michael
parents: 2792
diff changeset
6819 && avctx->skip_frame < AVDISCARD_ALL)
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6820 context_count++;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6821 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6822 case NAL_SEI:
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6823 init_get_bits(&s->gb, ptr, bit_length);
8996
e65778184ded Make the following H264 functions available to the parser:
cehoyos
parents: 8991
diff changeset
6824 ff_h264_decode_sei(h);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6825 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6826 case NAL_SPS:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6827 init_get_bits(&s->gb, ptr, bit_length);
8996
e65778184ded Make the following H264 functions available to the parser:
cehoyos
parents: 8991
diff changeset
6828 ff_h264_decode_seq_parameter_set(h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6829
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6830 if(s->flags& CODEC_FLAG_LOW_DELAY)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6831 s->low_delay=1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6832
2538
34b0996cc10d 10l (fix reordering when B-frames are not present)
lorenm
parents: 2537
diff changeset
6833 if(avctx->has_b_frames < 2)
34b0996cc10d 10l (fix reordering when B-frames are not present)
lorenm
parents: 2537
diff changeset
6834 avctx->has_b_frames= !s->low_delay;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6835 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6836 case NAL_PPS:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6837 init_get_bits(&s->gb, ptr, bit_length);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6838
8996
e65778184ded Make the following H264 functions available to the parser:
cehoyos
parents: 8991
diff changeset
6839 ff_h264_decode_picture_parameter_set(h, bit_length);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6840
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6841 break;
2960
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
6842 case NAL_AUD:
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
6843 case NAL_END_SEQUENCE:
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
6844 case NAL_END_STREAM:
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
6845 case NAL_FILLER_DATA:
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
6846 case NAL_SPS_EXT:
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
6847 case NAL_AUXILIARY_SLICE:
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6848 break;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2971
diff changeset
6849 default:
10811
4b790cd2c245 Log unknown NAL code from correct context
andoma
parents: 10663
diff changeset
6850 av_log(avctx, AV_LOG_DEBUG, "Unknown NAL code: %d (%d bits)\n", hx->nal_unit_type, bit_length);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6851 }
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6852
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6853 if(context_count == h->max_contexts) {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6854 execute_decode_slices(h, context_count);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6855 context_count = 0;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6856 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6857
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6858 if (err < 0)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6859 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
6860 else if(err == 1) {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6861 /* Slice could not be decoded in parallel mode, copy down
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6862 * NAL unit stuff to context 0 and restart. Note that
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
6863 * rbsp_buffer is not transferred, but since we no longer
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6864 * run in parallel mode this should not be an issue. */
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6865 h->nal_unit_type = hx->nal_unit_type;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6866 h->nal_ref_idc = hx->nal_ref_idc;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6867 hx = h;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6868 goto again;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6869 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6870 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6871 if(context_count)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6872 execute_decode_slices(h, context_count);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6873 return buf_index;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6874 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6875
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6876 /**
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
6877 * returns the number of bytes consumed for building the current frame
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6878 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6879 static int get_consumed_bytes(MpegEncContext *s, int pos, int buf_size){
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5106
diff changeset
6880 if(pos==0) pos=1; //avoid infinite loops (i doubt that is needed but ...)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6881 if(pos+10>buf_size) pos=buf_size; // oops ;)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6882
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6883 return pos;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6884 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6885
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6886 static int decode_frame(AVCodecContext *avctx,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6887 void *data, int *data_size,
9355
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9163
diff changeset
6888 AVPacket *avpkt)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6889 {
9355
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9163
diff changeset
6890 const uint8_t *buf = avpkt->data;
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9163
diff changeset
6891 int buf_size = avpkt->size;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6892 H264Context *h = avctx->priv_data;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6893 MpegEncContext *s = &h->s;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6894 AVFrame *pict = data;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6895 int buf_index;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6896
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6897 s->flags= avctx->flags;
1754
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1706
diff changeset
6898 s->flags2= avctx->flags2;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6899
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
6900 /* end of stream, output what is still in the buffers */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6901 if (buf_size == 0) {
4556
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
6902 Picture *out;
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
6903 int i, out_idx;
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
6904
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
6905 //FIXME factorize this with the output code below
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
6906 out = h->delayed_pic[0];
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
6907 out_idx = 0;
9885
f86df3ebfef7 Improve wording: s/reseted/reset
cehoyos
parents: 9883
diff changeset
6908 for(i=1; h->delayed_pic[i] && !h->delayed_pic[i]->key_frame && !h->delayed_pic[i]->mmco_reset; i++)
4556
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
6909 if(h->delayed_pic[i]->poc < out->poc){
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
6910 out = h->delayed_pic[i];
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
6911 out_idx = i;
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
6912 }
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
6913
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
6914 for(i=out_idx; h->delayed_pic[i]; i++)
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
6915 h->delayed_pic[i] = h->delayed_pic[i+1];
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
6916
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
6917 if(out){
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
6918 *data_size = sizeof(AVFrame);
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
6919 *pict= *(AVFrame*)out;
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
6920 }
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
6921
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6922 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6923 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6924
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6925 if(h->is_avc && !h->got_avcC) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6926 int i, cnt, nalsize;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6927 unsigned char *p = avctx->extradata;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6928 if(avctx->extradata_size < 7) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6929 av_log(avctx, AV_LOG_ERROR, "avcC too short\n");
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6930 return -1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6931 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6932 if(*p != 1) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6933 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
6934 return -1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6935 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6936 /* 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
6937 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
6938 h->nal_length_size = 2;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6939 // Decode sps from avcC
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6940 cnt = *(p+5) & 0x1f; // Number of sps
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6941 p += 6;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6942 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
6943 nalsize = AV_RB16(p) + 2;
2867
7c7edddaa835 dont be so picky with .mp4 ... fixes Mr&MrsSmith.mp4
michael
parents: 2861
diff changeset
6944 if(decode_nal_units(h, p, nalsize) < 0) {
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6945 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
6946 return -1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6947 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6948 p += nalsize;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6949 }
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6950 // Decode pps from avcC
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6951 cnt = *(p++); // Number of pps
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6952 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
6953 nalsize = AV_RB16(p) + 2;
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6954 if(decode_nal_units(h, p, nalsize) != nalsize) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6955 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
6956 return -1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6957 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6958 p += nalsize;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6959 }
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6960 // 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
6961 h->nal_length_size = ((*(((char*)(avctx->extradata))+4))&0x03)+1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6962 // Do not reparse avcC
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6963 h->got_avcC = 1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6964 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6965
7888
d0489fa75c41 Ensure that extradata is not parsed twice.
michael
parents: 7844
diff changeset
6966 if(!h->got_avcC && !h->is_avc && s->avctx->extradata_size){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6967 if(decode_nal_units(h, s->avctx->extradata, s->avctx->extradata_size) < 0)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6968 return -1;
7888
d0489fa75c41 Ensure that extradata is not parsed twice.
michael
parents: 7844
diff changeset
6969 h->got_avcC = 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6970 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6971
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6972 buf_index=decode_nal_units(h, buf, buf_size);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6973 if(buf_index < 0)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6974 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6975
4620
f23c20cf7579 check for no frame and prevent segfault
michael
parents: 4616
diff changeset
6976 if(!(s->flags2 & CODEC_FLAG2_CHUNKS) && !s->current_picture_ptr){
5629
7e5ebda833e9 Remove error raising when explicitely skipping frame
benoit
parents: 5547
diff changeset
6977 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
6978 av_log(avctx, AV_LOG_ERROR, "no frame!\n");
f23c20cf7579 check for no frame and prevent segfault
michael
parents: 4616
diff changeset
6979 return -1;
f23c20cf7579 check for no frame and prevent segfault
michael
parents: 4616
diff changeset
6980 }
f23c20cf7579 check for no frame and prevent segfault
michael
parents: 4616
diff changeset
6981
4616
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
6982 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
6983 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
6984 Picture *cur = s->current_picture_ptr;
10511
bfea93e47391 Try to fix has_b_frame calculation for open gop files.
michael
parents: 10368
diff changeset
6985 int i, pics, out_of_order, out_idx;
4616
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
6986
9417
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
6987 field_end(h);
4616
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
6988
7382
f9e70983fc35 Set field_poc (it was half uninitialized before) and use it
michael
parents: 7381
diff changeset
6989 if (cur->field_poc[0]==INT_MAX || cur->field_poc[1]==INT_MAX) {
5798
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
6990 /* Wait for second field. */
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
6991 *data_size = 0;
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
6992
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
6993 } else {
9831
febe1855b64a Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents: 9790
diff changeset
6994 cur->interlaced_frame = 0;
8107
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6995 cur->repeat_pict = 0;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6996
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6997 /* Signal interlacing information externally. */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6998 /* Prioritize picture timing SEI information over used decoding process if it exists. */
9128
793cf8c68c4f Add support for ct_type to correctly detect interlaced flag
schreter
parents: 9125
diff changeset
6999
8107
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7000 if(h->sps.pic_struct_present_flag){
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7001 switch (h->sei_pic_struct)
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7002 {
9831
febe1855b64a Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents: 9790
diff changeset
7003 case SEI_PIC_STRUCT_FRAME:
febe1855b64a Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents: 9790
diff changeset
7004 break;
febe1855b64a Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents: 9790
diff changeset
7005 case SEI_PIC_STRUCT_TOP_FIELD:
febe1855b64a Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents: 9790
diff changeset
7006 case SEI_PIC_STRUCT_BOTTOM_FIELD:
febe1855b64a Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents: 9790
diff changeset
7007 cur->interlaced_frame = 1;
febe1855b64a Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents: 9790
diff changeset
7008 break;
febe1855b64a Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents: 9790
diff changeset
7009 case SEI_PIC_STRUCT_TOP_BOTTOM:
febe1855b64a Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents: 9790
diff changeset
7010 case SEI_PIC_STRUCT_BOTTOM_TOP:
febe1855b64a Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents: 9790
diff changeset
7011 if (FIELD_OR_MBAFF_PICTURE)
febe1855b64a Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents: 9790
diff changeset
7012 cur->interlaced_frame = 1;
febe1855b64a Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents: 9790
diff changeset
7013 else
febe1855b64a Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents: 9790
diff changeset
7014 // try to flag soft telecine progressive
febe1855b64a Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents: 9790
diff changeset
7015 cur->interlaced_frame = h->prev_interlaced_frame;
febe1855b64a Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents: 9790
diff changeset
7016 break;
8107
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7017 case SEI_PIC_STRUCT_TOP_BOTTOM_TOP:
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7018 case SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM:
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7019 // Signal the possibility of telecined film externally (pic_struct 5,6)
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7020 // From these hints, let the applications decide if they apply deinterlacing.
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7021 cur->repeat_pict = 1;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7022 break;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7023 case SEI_PIC_STRUCT_FRAME_DOUBLING:
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7024 // Force progressive here, as doubling interlaced frame is a bad idea.
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7025 cur->repeat_pict = 2;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7026 break;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7027 case SEI_PIC_STRUCT_FRAME_TRIPLING:
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7028 cur->repeat_pict = 4;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7029 break;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7030 }
9831
febe1855b64a Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents: 9790
diff changeset
7031
febe1855b64a Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents: 9790
diff changeset
7032 if ((h->sei_ct_type & 3) && h->sei_pic_struct <= SEI_PIC_STRUCT_BOTTOM_TOP)
febe1855b64a Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents: 9790
diff changeset
7033 cur->interlaced_frame = (h->sei_ct_type & (1<<1)) != 0;
8107
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7034 }else{
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7035 /* Derive interlacing flag from used decoding process. */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7036 cur->interlaced_frame = FIELD_OR_MBAFF_PICTURE;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7037 }
9831
febe1855b64a Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents: 9790
diff changeset
7038 h->prev_interlaced_frame = cur->interlaced_frame;
8107
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7039
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7040 if (cur->field_poc[0] != cur->field_poc[1]){
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7041 /* Derive top_field_first from field pocs. */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7042 cur->top_field_first = cur->field_poc[0] < cur->field_poc[1];
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7043 }else{
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7044 if(cur->interlaced_frame || h->sps.pic_struct_present_flag){
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7045 /* Use picture timing SEI information. Even if it is a information of a past frame, better than nothing. */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7046 if(h->sei_pic_struct == SEI_PIC_STRUCT_TOP_BOTTOM
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7047 || h->sei_pic_struct == SEI_PIC_STRUCT_TOP_BOTTOM_TOP)
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7048 cur->top_field_first = 1;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7049 else
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7050 cur->top_field_first = 0;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7051 }else{
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7052 /* Most likely progressive */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7053 cur->top_field_first = 0;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7054 }
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7055 }
5876
731ee5ad6bde Correct assignment of interlaced_frame; was being set on output frames,
heydowns
parents: 5825
diff changeset
7056
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7057 //FIXME do something with unavailable reference frames
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7058
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7059 /* Sort B-frames into display order */
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7060
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7061 if(h->sps.bitstream_restriction_flag
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7062 && s->avctx->has_b_frames < h->sps.num_reorder_frames){
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7063 s->avctx->has_b_frames = h->sps.num_reorder_frames;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7064 s->low_delay = 0;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7065 }
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7066
7325
af725308adf4 Take the brain amputated spec literally if the user asks for it (-strict 1).
michael
parents: 7320
diff changeset
7067 if( s->avctx->strict_std_compliance >= FF_COMPLIANCE_STRICT
af725308adf4 Take the brain amputated spec literally if the user asks for it (-strict 1).
michael
parents: 7320
diff changeset
7068 && !h->sps.bitstream_restriction_flag){
af725308adf4 Take the brain amputated spec literally if the user asks for it (-strict 1).
michael
parents: 7320
diff changeset
7069 s->avctx->has_b_frames= MAX_DELAYED_PIC_COUNT;
af725308adf4 Take the brain amputated spec literally if the user asks for it (-strict 1).
michael
parents: 7320
diff changeset
7070 s->low_delay= 0;
af725308adf4 Take the brain amputated spec literally if the user asks for it (-strict 1).
michael
parents: 7320
diff changeset
7071 }
af725308adf4 Take the brain amputated spec literally if the user asks for it (-strict 1).
michael
parents: 7320
diff changeset
7072
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7073 pics = 0;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7074 while(h->delayed_pic[pics]) pics++;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7075
7283
39e81fdd8d23 Move the size of the H264Context delayed_pic array into a #define.
astrange
parents: 7277
diff changeset
7076 assert(pics <= MAX_DELAYED_PIC_COUNT);
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7077
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7078 h->delayed_pic[pics++] = cur;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7079 if(cur->reference == 0)
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7080 cur->reference = DELAYED_PIC_REF;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7081
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7082 out = h->delayed_pic[0];
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7083 out_idx = 0;
9885
f86df3ebfef7 Improve wording: s/reseted/reset
cehoyos
parents: 9883
diff changeset
7084 for(i=1; h->delayed_pic[i] && !h->delayed_pic[i]->key_frame && !h->delayed_pic[i]->mmco_reset; i++)
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7085 if(h->delayed_pic[i]->poc < out->poc){
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7086 out = h->delayed_pic[i];
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7087 out_idx = i;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7088 }
10511
bfea93e47391 Try to fix has_b_frame calculation for open gop files.
michael
parents: 10368
diff changeset
7089 if(s->avctx->has_b_frames == 0 && (h->delayed_pic[0]->key_frame || h->delayed_pic[0]->mmco_reset))
bfea93e47391 Try to fix has_b_frame calculation for open gop files.
michael
parents: 10368
diff changeset
7090 h->outputed_poc= INT_MIN;
bfea93e47391 Try to fix has_b_frame calculation for open gop files.
michael
parents: 10368
diff changeset
7091 out_of_order = out->poc < h->outputed_poc;
7310
033d10927d45 Remove delayed_output_pic, I do not understand what this variable was good for.
michael
parents: 7309
diff changeset
7092
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7093 if(h->sps.bitstream_restriction_flag && s->avctx->has_b_frames >= h->sps.num_reorder_frames)
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7094 { }
7320
927ac918cddb Make the automatic has_b_frames increasing code increase it up to the
michael
parents: 7318
diff changeset
7095 else if((out_of_order && pics-1 == s->avctx->has_b_frames && s->avctx->has_b_frames < MAX_DELAYED_PIC_COUNT)
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7096 || (s->low_delay &&
10511
bfea93e47391 Try to fix has_b_frame calculation for open gop files.
michael
parents: 10368
diff changeset
7097 ((h->outputed_poc != INT_MIN && out->poc > h->outputed_poc + 2)
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6429
diff changeset
7098 || cur->pict_type == FF_B_TYPE)))
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7099 {
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7100 s->low_delay = 0;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7101 s->avctx->has_b_frames++;
7312
f9eaaadcd611 simplify
michael
parents: 7310
diff changeset
7102 }
f9eaaadcd611 simplify
michael
parents: 7310
diff changeset
7103
7316
cf1b80029862 Simplify picture output code.
michael
parents: 7315
diff changeset
7104 if(out_of_order || pics > s->avctx->has_b_frames){
7314
def12c3c7742 Do not forget marking disposed delayed pics as unused.
michael
parents: 7313
diff changeset
7105 out->reference &= ~DELAYED_PIC_REF;
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7106 for(i=out_idx; h->delayed_pic[i]; i++)
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7107 h->delayed_pic[i] = h->delayed_pic[i+1];
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7108 }
7316
cf1b80029862 Simplify picture output code.
michael
parents: 7315
diff changeset
7109 if(!out_of_order && pics > s->avctx->has_b_frames){
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7110 *data_size = sizeof(AVFrame);
7310
033d10927d45 Remove delayed_output_pic, I do not understand what this variable was good for.
michael
parents: 7309
diff changeset
7111
10511
bfea93e47391 Try to fix has_b_frame calculation for open gop files.
michael
parents: 10368
diff changeset
7112 if(out_idx==0 && h->delayed_pic[0] && (h->delayed_pic[0]->key_frame || h->delayed_pic[0]->mmco_reset)) {
bfea93e47391 Try to fix has_b_frame calculation for open gop files.
michael
parents: 10368
diff changeset
7113 h->outputed_poc = INT_MIN;
bfea93e47391 Try to fix has_b_frame calculation for open gop files.
michael
parents: 10368
diff changeset
7114 } else
10514
michael
parents: 10513
diff changeset
7115 h->outputed_poc = out->poc;
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7116 *pict= *(AVFrame*)out;
7316
cf1b80029862 Simplify picture output code.
michael
parents: 7315
diff changeset
7117 }else{
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7118 av_log(avctx, AV_LOG_DEBUG, "no picture\n");
7316
cf1b80029862 Simplify picture output code.
michael
parents: 7315
diff changeset
7119 }
5798
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
7120 }
2937
e63bbb945ebd fix a crash on seeking to an invalid frame
lorenm
parents: 2935
diff changeset
7121 }
e63bbb945ebd fix a crash on seeking to an invalid frame
lorenm
parents: 2935
diff changeset
7122
e63bbb945ebd fix a crash on seeking to an invalid frame
lorenm
parents: 2935
diff changeset
7123 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
7124 ff_print_debug_info(s, pict);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7125 //printf("out %d\n", (int)pict->data[0]);
9733
67f917b48068 remove unused hack which set AVCodecContext frame_number to pic timestamp
bcoudurier
parents: 9698
diff changeset
7126
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7127 return get_consumed_bytes(s, buf_index, buf_size);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7128 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7129 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7130 static inline void fill_mb_avail(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7131 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
7132 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7133
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7134 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
7135 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
7136 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
7137 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
7138 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7139 h->mb_avail[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7140 h->mb_avail[1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7141 h->mb_avail[2]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7142 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7143 h->mb_avail[3]= s->mb_x && h->slice_table[mb_xy - 1] == h->slice_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7144 h->mb_avail[4]= 1; //FIXME move out
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7145 h->mb_avail[5]= 0; //FIXME move out
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7146 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7147 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7148
6164
ecaf5226e9b0 Consistently use TEST as the preprocessor condition to enable test code.
diego
parents: 6046
diff changeset
7149 #ifdef TEST
6172
13aa4cac4dde Add #undef printf and disable non-functional code to make test program compile.
diego
parents: 6164
diff changeset
7150 #undef printf
5380
389366aa3458 Fix the self tests which are contained in some codecs and are using random().
takis
parents: 5338
diff changeset
7151 #undef random
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7152 #define COUNT 8000
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7153 #define SIZE (COUNT*40)
5934
bd5f4dc81fbe main() --> main(void)
diego
parents: 5926
diff changeset
7154 int main(void){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7155 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7156 uint8_t temp[SIZE];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7157 PutBitContext pb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7158 GetBitContext gb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7159 // int int_temp[10000];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7160 DSPContext dsp;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7161 AVCodecContext avctx;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7162
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7163 dsputil_init(&dsp, &avctx);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7164
1522
79dddc5cd990 removed the obsolete and unused parameters of init_put_bits
alex
parents: 1453
diff changeset
7165 init_put_bits(&pb, temp, SIZE);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7166 printf("testing unsigned exp golomb\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7167 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7168 START_TIMER
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7169 set_ue_golomb(&pb, i);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7170 STOP_TIMER("set_ue_golomb");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7171 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7172 flush_put_bits(&pb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7173
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7174 init_get_bits(&gb, temp, 8*SIZE);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7175 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7176 int j, s;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7177
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7178 s= show_bits(&gb, 24);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7179
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7180 START_TIMER
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7181 j= get_ue_golomb(&gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7182 if(j != i){
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5106
diff changeset
7183 printf("mismatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7184 // return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7185 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7186 STOP_TIMER("get_ue_golomb");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7187 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7188
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7189
1524
alex
parents: 1522
diff changeset
7190 init_put_bits(&pb, temp, SIZE);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7191 printf("testing signed exp golomb\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7192 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7193 START_TIMER
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7194 set_se_golomb(&pb, i - COUNT/2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7195 STOP_TIMER("set_se_golomb");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7196 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7197 flush_put_bits(&pb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7198
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7199 init_get_bits(&gb, temp, 8*SIZE);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7200 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7201 int j, s;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7202
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7203 s= show_bits(&gb, 24);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7204
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7205 START_TIMER
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7206 j= get_se_golomb(&gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7207 if(j != i - COUNT/2){
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5106
diff changeset
7208 printf("mismatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7209 // return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7210 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7211 STOP_TIMER("get_se_golomb");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7212 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7213
6172
13aa4cac4dde Add #undef printf and disable non-functional code to make test program compile.
diego
parents: 6164
diff changeset
7214 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7215 printf("testing 4x4 (I)DCT\n");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7216
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7217 DCTELEM block[16];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7218 uint8_t src[16], ref[16];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7219 uint64_t error= 0, max_error=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7220
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7221 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7222 int j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7223 // printf("%d %d %d\n", r1, r2, (r2-r1)*16);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7224 for(j=0; j<16; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7225 ref[j]= random()%255;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7226 src[j]= random()%255;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7227 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7228
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7229 h264_diff_dct_c(block, src, ref, 4);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7230
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7231 //normalize
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7232 for(j=0; j<16; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7233 // printf("%d ", block[j]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7234 block[j]= block[j]*4;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7235 if(j&1) block[j]= (block[j]*4 + 2)/5;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7236 if(j&4) block[j]= (block[j]*4 + 2)/5;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7237 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7238 // printf("\n");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7239
2272
cd43603c46f9 move h264 idct to its own file and call via function pointer in DspContext
michael
parents: 2255
diff changeset
7240 s->dsp.h264_idct_add(ref, block, 4);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7241 /* for(j=0; j<16; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7242 printf("%d ", ref[j]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7243 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7244 printf("\n");*/
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7245
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7246 for(j=0; j<16; j++){
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
7247 int diff= FFABS(src[j] - ref[j]);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7248
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7249 error+= diff*diff;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7250 max_error= FFMAX(max_error, diff);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7251 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7252 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7253 printf("error=%f max_error=%d\n", ((float)error)/COUNT/16, (int)max_error );
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7254 printf("testing quantizer\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7255 for(qp=0; qp<52; qp++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7256 for(i=0; i<16; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7257 src1_block[i]= src2_block[i]= random()%255;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7258
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7259 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7260 printf("Testing NAL layer\n");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7261
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7262 uint8_t bitstream[COUNT];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7263 uint8_t nal[COUNT*2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7264 H264Context h;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7265 memset(&h, 0, sizeof(H264Context));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7266
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7267 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7268 int zeros= i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7269 int nal_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7270 int consumed;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7271 int out_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7272 uint8_t *out;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7273 int j;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7274
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7275 for(j=0; j<COUNT; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7276 bitstream[j]= (random() % 255) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7277 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7278
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7279 for(j=0; j<zeros; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7280 int pos= random() % COUNT;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7281 while(bitstream[pos] == 0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7282 pos++;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7283 pos %= COUNT;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7284 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7285 bitstream[pos]=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7286 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7287
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7288 START_TIMER
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7289
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7290 nal_length= encode_nal(&h, nal, bitstream, COUNT, COUNT*2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7291 if(nal_length<0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7292 printf("encoding failed\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7293 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7294 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7295
8996
e65778184ded Make the following H264 functions available to the parser:
cehoyos
parents: 8991
diff changeset
7296 out= ff_h264_decode_nal(&h, nal, &out_length, &consumed, nal_length);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7297
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7298 STOP_TIMER("NAL")
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7299
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7300 if(out_length != COUNT){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7301 printf("incorrect length %d %d\n", out_length, COUNT);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7302 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7303 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7304
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7305 if(consumed != nal_length){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7306 printf("incorrect consumed length %d %d\n", nal_length, consumed);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7307 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7308 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7309
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7310 if(memcmp(bitstream, out, COUNT)){
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5106
diff changeset
7311 printf("mismatch\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7312 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7313 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7314 }
6172
13aa4cac4dde Add #undef printf and disable non-functional code to make test program compile.
diego
parents: 6164
diff changeset
7315 #endif
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7316
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7317 printf("Testing RBSP\n");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7318
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7319
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7320 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7321 }
6164
ecaf5226e9b0 Consistently use TEST as the preprocessor condition to enable test code.
diego
parents: 6046
diff changeset
7322 #endif /* TEST */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7323
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7324
9384
828d15d322ed Add forgotten void return type to ff_h264_free_context
reimar
parents: 9380
diff changeset
7325 av_cold void ff_h264_free_context(H264Context *h)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7326 {
7923
2c15748c530a Do not free sps & pps on width/height changes.
michael
parents: 7921
diff changeset
7327 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7328
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7329 free_tables(h); //FIXME cleanup init stuff perhaps
7923
2c15748c530a Do not free sps & pps on width/height changes.
michael
parents: 7921
diff changeset
7330
2c15748c530a Do not free sps & pps on width/height changes.
michael
parents: 7921
diff changeset
7331 for(i = 0; i < MAX_SPS_COUNT; i++)
2c15748c530a Do not free sps & pps on width/height changes.
michael
parents: 7921
diff changeset
7332 av_freep(h->sps_buffers + i);
2c15748c530a Do not free sps & pps on width/height changes.
michael
parents: 7921
diff changeset
7333
2c15748c530a Do not free sps & pps on width/height changes.
michael
parents: 7921
diff changeset
7334 for(i = 0; i < MAX_PPS_COUNT; i++)
2c15748c530a Do not free sps & pps on width/height changes.
michael
parents: 7921
diff changeset
7335 av_freep(h->pps_buffers + i);
9380
54e650136c87 Add a ff_h264_free_context function and call it from the H.264 parser.
reimar
parents: 9355
diff changeset
7336 }
54e650136c87 Add a ff_h264_free_context function and call it from the H.264 parser.
reimar
parents: 9355
diff changeset
7337
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
7338 av_cold int ff_h264_decode_end(AVCodecContext *avctx)
9380
54e650136c87 Add a ff_h264_free_context function and call it from the H.264 parser.
reimar
parents: 9355
diff changeset
7339 {
54e650136c87 Add a ff_h264_free_context function and call it from the H.264 parser.
reimar
parents: 9355
diff changeset
7340 H264Context *h = avctx->priv_data;
54e650136c87 Add a ff_h264_free_context function and call it from the H.264 parser.
reimar
parents: 9355
diff changeset
7341 MpegEncContext *s = &h->s;
54e650136c87 Add a ff_h264_free_context function and call it from the H.264 parser.
reimar
parents: 9355
diff changeset
7342
54e650136c87 Add a ff_h264_free_context function and call it from the H.264 parser.
reimar
parents: 9355
diff changeset
7343 ff_h264_free_context(h);
7923
2c15748c530a Do not free sps & pps on width/height changes.
michael
parents: 7921
diff changeset
7344
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7345 MPV_common_end(s);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7346
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7347 // memset(h, 0, sizeof(H264Context));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7348
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7349 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7350 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7351
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7352
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7353 AVCodec h264_decoder = {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7354 "h264",
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7355 CODEC_TYPE_VIDEO,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7356 CODEC_ID_H264,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7357 sizeof(H264Context),
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
7358 ff_h264_decode_init,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7359 NULL,
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
7360 ff_h264_decode_end,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7361 decode_frame,
7359
1980cae356ad Remove truncated support, use an AVParser if you used that, it is the same.
michael
parents: 7358
diff changeset
7362 /*CODEC_CAP_DRAW_HORIZ_BAND |*/ CODEC_CAP_DR1 | CODEC_CAP_DELAY,
2640
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
7363 .flush= flush_dpb,
7040
e943e1409077 Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents: 6933
diff changeset
7364 .long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"),
9066
77cbbce1be94 Add hardware acceleration hooks to H.264.
benoit
parents: 9065
diff changeset
7365 .pix_fmts= ff_hwaccel_pixfmt_list_420,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7366 };
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7367
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8565
diff changeset
7368 #if CONFIG_H264_VDPAU_DECODER
8522
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
7369 AVCodec h264_vdpau_decoder = {
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
7370 "h264_vdpau",
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
7371 CODEC_TYPE_VIDEO,
8610
2ca51be7dad8 Remove CODEC_ID_H264_VDPAU.
cehoyos
parents: 8596
diff changeset
7372 CODEC_ID_H264,
8522
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
7373 sizeof(H264Context),
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
7374 ff_h264_decode_init,
8522
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
7375 NULL,
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
7376 ff_h264_decode_end,
8522
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
7377 decode_frame,
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
7378 CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_HWACCEL_VDPAU,
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
7379 .flush= flush_dpb,
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
7380 .long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10 (VDPAU acceleration)"),
10512
6ec7b5450ca7 Add .pix_fmts to H264 VDPAU decoder declaration and remove obsolete test
cehoyos
parents: 10511
diff changeset
7381 .pix_fmts = (const enum PixelFormat[]){PIX_FMT_VDPAU_H264, PIX_FMT_NONE},
8522
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
7382 };
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
7383 #endif