annotate h264.c @ 8526:4c851747ee74 libavcodec

spelling/grammar and whitespace cosmetics
author diego
date Mon, 05 Jan 2009 11:49:15 +0000
parents 53f8d9be29ee
children 2cc3cf7b09b1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1 /*
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2 * H.26L/H.264/AVC/JVT/14496-10/... encoder/decoder
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3 * Copyright (c) 2003 Michael Niedermayer <michaelni@gmx.at>
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3927
diff changeset
5 * This file is part of FFmpeg.
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3927
diff changeset
6 *
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3927
diff changeset
7 * FFmpeg is free software; you can redistribute it and/or
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
9 * License as published by the Free Software Foundation; either
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3927
diff changeset
10 * version 2.1 of the License, or (at your option) any later version.
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
11 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3927
diff changeset
12 * FFmpeg is distributed in the hope that it will be useful,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
15 * Lesser General Public License for more details.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
16 *
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
17 * You should have received a copy of the GNU Lesser General Public
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3927
diff changeset
18 * License along with FFmpeg; if not, write to the Free Software
3036
0b546eab515d Update licensing information: The FSF changed postal address.
diego
parents: 3029
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
20 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
21
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
22 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
23 * @file h264.c
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
24 * H.264 / AVC / MPEG4 part10 codec.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
25 * @author Michael Niedermayer <michaelni@gmx.at>
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
26 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
27
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
28 #include "dsputil.h"
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
29 #include "avcodec.h"
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
30 #include "mpegvideo.h"
4975
9a6a0818e93f split h264.c to move parser in its own file
aurel
parents: 4931
diff changeset
31 #include "h264.h"
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
32 #include "h264data.h"
4975
9a6a0818e93f split h264.c to move parser in its own file
aurel
parents: 4931
diff changeset
33 #include "h264_parser.h"
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
34 #include "golomb.h"
6020
c531defb03ee Make fill_rectangle() available for other decoders
kostya
parents: 6019
diff changeset
35 #include "rectangle.h"
8522
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
36 #include "vdpau_internal.h"
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
37
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
38 #include "cabac.h"
6604
e226f34ca284 Redo r12838, this time using svn copy to create h264_i386.h from cabac.h.
heydowns
parents: 6603
diff changeset
39 #ifdef ARCH_X86
8430
7768bdfd4f7b Rename libavcodec/i386/ --> libavcodec/x86/.
diego
parents: 8424
diff changeset
40 #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
41 #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
42
3284
a224d9752912 don't force asserts in release builds. 2% faster h264.
lorenm
parents: 3219
diff changeset
43 //#undef NDEBUG
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
44 #include <assert.h>
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
45
5723
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
46 /**
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
47 * 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
48 * 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
49 */
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
50 #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
51
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
52 static VLC coeff_token_vlc[4];
7481
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
53 static VLC_TYPE coeff_token_vlc_tables[520+332+280+256][2];
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
54 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
55
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
56 static VLC chroma_dc_coeff_token_vlc;
7481
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
57 static VLC_TYPE chroma_dc_coeff_token_vlc_table[256][2];
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
58 static const int chroma_dc_coeff_token_vlc_table_size = 256;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
59
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
60 static VLC total_zeros_vlc[15];
7481
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
61 static VLC_TYPE total_zeros_vlc_tables[15][512][2];
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
62 static const int total_zeros_vlc_tables_size = 512;
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
63
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
64 static VLC chroma_dc_total_zeros_vlc[3];
7481
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
65 static VLC_TYPE chroma_dc_total_zeros_vlc_tables[3][8][2];
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
66 static const int chroma_dc_total_zeros_vlc_tables_size = 8;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
67
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
68 static VLC run_vlc[6];
7481
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
69 static VLC_TYPE run_vlc_tables[6][8][2];
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
70 static const int run_vlc_tables_size = 8;
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
71
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
72 static VLC run7_vlc;
7481
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
73 static VLC_TYPE run7_vlc_table[96][2];
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
74 static const int run7_vlc_table_size = 96;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
75
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
76 static void svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
77 static void svq3_add_idct_c(uint8_t *dst, DCTELEM *block, int stride, int qp, int dc);
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
78 static void filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr, unsigned int linesize, unsigned int uvlinesize);
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
79 static void filter_mb_fast( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr, unsigned int linesize, unsigned int uvlinesize);
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
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4277
diff changeset
82 static av_always_inline uint32_t pack16to32(int a, int b){
1269
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
83 #ifdef WORDS_BIGENDIAN
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
84 return (b&0xFFFF) + (a<<16);
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
85 #else
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
86 return (a&0xFFFF) + (b<<16);
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
87 #endif
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
88 }
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
89
7993
2dfff0e25b47 Mark ff_div6 and ff_rem6 static in h264.c. Patch by Diego Petten
lu_zero
parents: 7974
diff changeset
90 static const uint8_t rem6[52]={
4277
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
91 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
92 };
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
93
7993
2dfff0e25b47 Mark ff_div6 and ff_rem6 static in h264.c. Patch by Diego Petten
lu_zero
parents: 7974
diff changeset
94 static const uint8_t div6[52]={
4277
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
95 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
96 };
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
97
7423
2eb0e5a2efad left_block intialisation optimisation.
michael
parents: 7421
diff changeset
98 static const int left_block_options[4][8]={
2eb0e5a2efad left_block intialisation optimisation.
michael
parents: 7421
diff changeset
99 {0,1,2,3,7,10,8,11},
2eb0e5a2efad left_block intialisation optimisation.
michael
parents: 7421
diff changeset
100 {2,2,3,3,8,11,8,11},
2eb0e5a2efad left_block intialisation optimisation.
michael
parents: 7421
diff changeset
101 {0,0,1,1,7,10,7,10},
2eb0e5a2efad left_block intialisation optimisation.
michael
parents: 7421
diff changeset
102 {0,2,0,2,7,10,7,10}
2eb0e5a2efad left_block intialisation optimisation.
michael
parents: 7421
diff changeset
103 };
4277
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
104
8443
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
105 #define LEVEL_TAB_BITS 8
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
106 static int8_t cavlc_level_tab[7][1<<LEVEL_TAB_BITS][2];
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
107
3028
1fadd4c26175 tweak inlines.
lorenm
parents: 3005
diff changeset
108 static void fill_caches(H264Context *h, int mb_type, int for_deblock){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
109 MpegEncContext * const s = &h->s;
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
110 const int mb_xy= h->mb_xy;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
111 int topleft_xy, top_xy, topright_xy, left_xy[2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
112 int topleft_type, top_type, topright_type, left_type[2];
8320
0de488aa4fb0 Add a few const qualifiers in appropriate places.
diego
parents: 8263
diff changeset
113 const int * left_block;
6310
f0457c910be3 fix mbaff diagonal neighbor mv
lorenm
parents: 6309
diff changeset
114 int topleft_partition= -1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
115 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
116
6014
33b0514769b2 Fix non_zero_count_cache for deblocking in field pictures.
heydowns
parents: 5987
diff changeset
117 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
118
3482
c08b46172204 slightly faster h264 fill_caches()
lorenm
parents: 3455
diff changeset
119 //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
120 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
121 return;
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
122
6488
ecbe9565dcae typo fixes
diego
parents: 6481
diff changeset
123 /* Wow, what a mess, why didn't they simplify the interlacing & intra
ecbe9565dcae typo fixes
diego
parents: 6481
diff changeset
124 * stuff, I can't imagine that these complex rules are worth it. */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
125
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
126 topleft_xy = top_xy - 1;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
127 topright_xy= top_xy + 1;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
128 left_xy[1] = left_xy[0] = mb_xy-1;
7423
2eb0e5a2efad left_block intialisation optimisation.
michael
parents: 7421
diff changeset
129 left_block = left_block_options[0];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
130 if(FRAME_MBAFF){
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
131 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
132 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
133 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
134 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
135 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
136 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
137 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
138 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
139 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
140 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
141 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
142
79bf8321e6fa Negate a few variables, this simplifies the code and makes it 5 cycles faster
michael
parents: 8432
diff changeset
143 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
144 top_xy -= s->mb_stride;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
145 }
8433
79bf8321e6fa Negate a few variables, this simplifies the code and makes it 5 cycles faster
michael
parents: 8432
diff changeset
146 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
147 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
148 } else if(bottom && !curr_mb_field_flag && left_mb_field_flag) {
6310
f0457c910be3 fix mbaff diagonal neighbor mv
lorenm
parents: 6309
diff changeset
149 topleft_xy += s->mb_stride;
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
150 // 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
151 topleft_partition = 0;
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
152 }
8433
79bf8321e6fa Negate a few variables, this simplifies the code and makes it 5 cycles faster
michael
parents: 8432
diff changeset
153 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
154 topright_xy -= s->mb_stride;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
155 }
8433
79bf8321e6fa Negate a few variables, this simplifies the code and makes it 5 cycles faster
michael
parents: 8432
diff changeset
156 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
157 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
158 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
159 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
160 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
161 } else {
8434
1e19ee0298a9 Simplify if/else, no speed change
michael
parents: 8433
diff changeset
162 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
163 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
164 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
165 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
166
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
167 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
168 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
169 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
170 if(for_deblock){
3482
c08b46172204 slightly faster h264 fill_caches()
lorenm
parents: 3455
diff changeset
171 topleft_type = 0;
c08b46172204 slightly faster h264 fill_caches()
lorenm
parents: 3455
diff changeset
172 topright_type = 0;
8079
2d3c7cd7d143 Replace literally hardcoded max slice number by named constant.
michael
parents: 8042
diff changeset
173 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
174 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
175 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
176
7527
ebdac291453a Remove a few more lines of unneeded code in fill_caches() for MBAFF.
michael
parents: 7526
diff changeset
177 if(MB_MBAFF && !IS_INTRA(mb_type)){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
178 int list;
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
179 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
180 //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
181 //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
182 //the MC code from changing ref_cache and rather use a temporary array.
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
183 if(USES_LIST(mb_type,list)){
3776
1843a85123b7 fix some signedness warnings
mru
parents: 3651
diff changeset
184 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
185 *(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
186 *(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
187 ref += h->b8_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
188 *(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
189 *(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
190 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
191 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
192 }
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
193 }else{
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
194 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
195 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
196 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
197 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
198 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
199
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
200 if(IS_INTRA(mb_type)){
7533
e61de3e409eb Simplify constrained_intra_pred code in fill_caches().
michael
parents: 7532
diff changeset
201 int type_mask= h->pps.constrained_intra_pred ? IS_INTRA(-1) : -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
202 h->topleft_samples_available=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
203 h->top_samples_available=
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
204 h->left_samples_available= 0xFFFF;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
205 h->topright_samples_available= 0xEEEA;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
206
7533
e61de3e409eb Simplify constrained_intra_pred code in fill_caches().
michael
parents: 7532
diff changeset
207 if(!(top_type & type_mask)){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
208 h->topleft_samples_available= 0xB3FF;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
209 h->top_samples_available= 0x33FF;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
210 h->topright_samples_available= 0x26EA;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
211 }
7532
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
212 if(IS_INTERLACED(mb_type) != IS_INTERLACED(left_type[0])){
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
213 if(IS_INTERLACED(mb_type)){
7533
e61de3e409eb Simplify constrained_intra_pred code in fill_caches().
michael
parents: 7532
diff changeset
214 if(!(left_type[0] & type_mask)){
7532
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
215 h->topleft_samples_available&= 0xDFFF;
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
216 h->left_samples_available&= 0x5FFF;
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
217 }
7533
e61de3e409eb Simplify constrained_intra_pred code in fill_caches().
michael
parents: 7532
diff changeset
218 if(!(left_type[1] & type_mask)){
7532
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
219 h->topleft_samples_available&= 0xFF5F;
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
220 h->left_samples_available&= 0xFF5F;
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
221 }
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
222 }else{
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
223 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
224 ? s->current_picture.mb_type[left_xy[0] + s->mb_stride] : 0;
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
225 assert(left_xy[0] == left_xy[1]);
7533
e61de3e409eb Simplify constrained_intra_pred code in fill_caches().
michael
parents: 7532
diff changeset
226 if(!((left_typei & type_mask) && (left_type[0] & type_mask))){
7532
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
227 h->topleft_samples_available&= 0xDF5F;
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
228 h->left_samples_available&= 0x5F5F;
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
229 }
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
230 }
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
231 }else{
7533
e61de3e409eb Simplify constrained_intra_pred code in fill_caches().
michael
parents: 7532
diff changeset
232 if(!(left_type[0] & type_mask)){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
233 h->topleft_samples_available&= 0xDF5F;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
234 h->left_samples_available&= 0x5F5F;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
235 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
236 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
237
7533
e61de3e409eb Simplify constrained_intra_pred code in fill_caches().
michael
parents: 7532
diff changeset
238 if(!(topleft_type & type_mask))
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
239 h->topleft_samples_available&= 0x7FFF;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
240
7533
e61de3e409eb Simplify constrained_intra_pred code in fill_caches().
michael
parents: 7532
diff changeset
241 if(!(topright_type & type_mask))
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
242 h->topright_samples_available&= 0xFBFF;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
243
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
244 if(IS_INTRA4x4(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
245 if(IS_INTRA4x4(top_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
246 h->intra4x4_pred_mode_cache[4+8*0]= h->intra4x4_pred_mode[top_xy][4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
247 h->intra4x4_pred_mode_cache[5+8*0]= h->intra4x4_pred_mode[top_xy][5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
248 h->intra4x4_pred_mode_cache[6+8*0]= h->intra4x4_pred_mode[top_xy][6];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
249 h->intra4x4_pred_mode_cache[7+8*0]= h->intra4x4_pred_mode[top_xy][3];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
250 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
251 int pred;
7533
e61de3e409eb Simplify constrained_intra_pred code in fill_caches().
michael
parents: 7532
diff changeset
252 if(!(top_type & type_mask))
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
253 pred= -1;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
254 else{
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
255 pred= 2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
256 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
257 h->intra4x4_pred_mode_cache[4+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
258 h->intra4x4_pred_mode_cache[5+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
259 h->intra4x4_pred_mode_cache[6+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
260 h->intra4x4_pred_mode_cache[7+8*0]= pred;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
261 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
262 for(i=0; i<2; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
263 if(IS_INTRA4x4(left_type[i])){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
264 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
265 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
266 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
267 int pred;
7533
e61de3e409eb Simplify constrained_intra_pred code in fill_caches().
michael
parents: 7532
diff changeset
268 if(!(left_type[i] & type_mask))
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
269 pred= -1;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
270 else{
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
271 pred= 2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
272 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
273 h->intra4x4_pred_mode_cache[3+8*1 + 2*8*i]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
274 h->intra4x4_pred_mode_cache[3+8*2 + 2*8*i]= pred;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
275 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
276 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
277 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
278 }
7534
4891fe700813 The deblock filter does not need all the intra availability stuff so do
michael
parents: 7533
diff changeset
279 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
280
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
281
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
282 /*
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
283 0 . T T. T T T T
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
284 1 L . .L . . . .
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
285 2 L . .L . . . .
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
286 3 . T TL . . . .
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
287 4 L . .L . . . .
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
288 5 L . .. . . . .
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
289 */
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
290 //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
291 if(top_type){
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[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
293 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
294 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
295 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
296
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
297 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
298 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
299
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
300 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
301 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
302
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
303 }else{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
304 h->non_zero_count_cache[4+8*0]=
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
305 h->non_zero_count_cache[5+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
306 h->non_zero_count_cache[6+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
307 h->non_zero_count_cache[7+8*0]=
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
308
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
309 h->non_zero_count_cache[1+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
310 h->non_zero_count_cache[2+8*0]=
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
311
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
312 h->non_zero_count_cache[1+8*3]=
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
313 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
314
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
315 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
316
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
317 for (i=0; i<2; i++) {
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
318 if(left_type[i]){
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
319 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
320 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
321 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
322 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
323 }else{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
324 h->non_zero_count_cache[3+8*1 + 2*8*i]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
325 h->non_zero_count_cache[3+8*2 + 2*8*i]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
326 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
327 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
328 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
329 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
330
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
331 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
332 // top_cbp
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
333 if(top_type) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
334 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
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->top_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->top_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 // left_cbp
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
341 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
342 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
343 } 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
344 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
345 } else {
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
346 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
347 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
348 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
349 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
350 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
351 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
352 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
353 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
354 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
355
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
356 #if 1
2623
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
357 if(IS_INTER(mb_type) || IS_DIRECT(mb_type)){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
358 int list;
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
359 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
360 if(!USES_LIST(mb_type, list) && !IS_DIRECT(mb_type) && !h->deblocking_filter){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
361 /*if(!h->mv_cache_clean[list]){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
362 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
363 memset(h->ref_cache[list], PART_NOT_AVAILABLE, 8*5*sizeof(int8_t));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
364 h->mv_cache_clean[list]= 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
365 }*/
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
366 continue;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
367 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
368 h->mv_cache_clean[list]= 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
369
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
370 if(USES_LIST(top_type, list)){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
371 const int b_xy= h->mb2b_xy[top_xy] + 3*h->b_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
372 const int b8_xy= h->mb2b8_xy[top_xy] + h->b8_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
373 *(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
374 *(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
375 *(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
376 *(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
377 h->ref_cache[list][scan8[0] + 0 - 1*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
378 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
379 h->ref_cache[list][scan8[0] + 2 - 1*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
380 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
381 }else{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
382 *(uint32_t*)h->mv_cache [list][scan8[0] + 0 - 1*8]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
383 *(uint32_t*)h->mv_cache [list][scan8[0] + 1 - 1*8]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
384 *(uint32_t*)h->mv_cache [list][scan8[0] + 2 - 1*8]=
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
385 *(uint32_t*)h->mv_cache [list][scan8[0] + 3 - 1*8]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
386 *(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
387 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
388
4546
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
389 for(i=0; i<2; i++){
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
390 int cache_idx = scan8[0] - 1 + i*2*8;
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
391 if(USES_LIST(left_type[i], list)){
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
392 const int b_xy= h->mb2b_xy[left_xy[i]] + 3;
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
393 const int b8_xy= h->mb2b8_xy[left_xy[i]] + 1;
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
394 *(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
395 *(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
396 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
397 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
398 }else{
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
399 *(uint32_t*)h->mv_cache [list][cache_idx ]=
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
400 *(uint32_t*)h->mv_cache [list][cache_idx+8]= 0;
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
401 h->ref_cache[list][cache_idx ]=
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
402 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
403 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
404 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
405
7525
2f159f961f3a Do not execute the part of fill_caches() for the loopfilter that overwrites
michael
parents: 7524
diff changeset
406 if(for_deblock || ((IS_DIRECT(mb_type) && !h->direct_spatial_mv_pred) && !FRAME_MBAFF))
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
407 continue;
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
408
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
409 if(USES_LIST(topleft_type, list)){
6310
f0457c910be3 fix mbaff diagonal neighbor mv
lorenm
parents: 6309
diff changeset
410 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
411 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
412 *(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
413 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
414 }else{
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
415 *(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
416 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
417 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
418
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
419 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
420 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
421 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
422 *(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
423 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
424 }else{
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
425 *(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
426 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
427 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
428
3519
5ef29058581e 10l in r5768 (broke mbaff)
lorenm
parents: 3482
diff changeset
429 if((IS_SKIP(mb_type) || IS_DIRECT(mb_type)) && !FRAME_MBAFF)
3482
c08b46172204 slightly faster h264 fill_caches()
lorenm
parents: 3455
diff changeset
430 continue;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
431
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
432 h->ref_cache[list][scan8[5 ]+1] =
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
433 h->ref_cache[list][scan8[7 ]+1] =
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
434 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
435 h->ref_cache[list][scan8[4 ]] =
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
436 h->ref_cache[list][scan8[12]] = PART_NOT_AVAILABLE;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
437 *(uint32_t*)h->mv_cache [list][scan8[5 ]+1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
438 *(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
439 *(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
440 *(uint32_t*)h->mv_cache [list][scan8[4 ]]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
441 *(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
442
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
443 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
444 /* XXX beurk, Load mvd */
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
445 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
446 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
447 *(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
448 *(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
449 *(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
450 *(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
451 }else{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
452 *(uint32_t*)h->mvd_cache [list][scan8[0] + 0 - 1*8]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
453 *(uint32_t*)h->mvd_cache [list][scan8[0] + 1 - 1*8]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
454 *(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
455 *(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
456 }
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
457 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
458 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
459 *(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
460 *(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
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 + 0*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 + 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
464 }
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
465 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
466 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
467 *(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
468 *(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
469 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
470 *(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
471 *(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
472 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
473 *(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
474 *(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
475 *(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
476 *(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
477 *(uint32_t*)h->mvd_cache [list][scan8[12]]= 0;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
478
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
479 if(h->slice_type_nos == FF_B_TYPE){
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
480 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
481
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
482 if(IS_DIRECT(top_type)){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
483 *(uint32_t*)&h->direct_cache[scan8[0] - 1*8]= 0x01010101;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
484 }else if(IS_8X8(top_type)){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
485 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
486 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
487 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
488 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
489 *(uint32_t*)&h->direct_cache[scan8[0] - 1*8]= 0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
490 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
491
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
492 if(IS_DIRECT(left_type[0]))
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
493 h->direct_cache[scan8[0] - 1 + 0*8]= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
494 else if(IS_8X8(left_type[0]))
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
495 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
496 else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
497 h->direct_cache[scan8[0] - 1 + 0*8]= 0;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
498
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
499 if(IS_DIRECT(left_type[1]))
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
500 h->direct_cache[scan8[0] - 1 + 2*8]= 1;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
501 else if(IS_8X8(left_type[1]))
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
502 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
503 else
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
504 h->direct_cache[scan8[0] - 1 + 2*8]= 0;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
505 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
506 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
507
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
508 if(FRAME_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
509 #define MAP_MVS\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
510 MAP_F2F(scan8[0] - 1 - 1*8, topleft_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
511 MAP_F2F(scan8[0] + 0 - 1*8, top_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
512 MAP_F2F(scan8[0] + 1 - 1*8, top_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
513 MAP_F2F(scan8[0] + 2 - 1*8, top_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
514 MAP_F2F(scan8[0] + 3 - 1*8, top_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
515 MAP_F2F(scan8[0] + 4 - 1*8, topright_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
516 MAP_F2F(scan8[0] - 1 + 0*8, left_type[0])\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
517 MAP_F2F(scan8[0] - 1 + 1*8, left_type[0])\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
518 MAP_F2F(scan8[0] - 1 + 2*8, left_type[1])\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
519 MAP_F2F(scan8[0] - 1 + 3*8, left_type[1])
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
520 if(MB_FIELD){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
521 #define MAP_F2F(idx, mb_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
522 if(!IS_INTERLACED(mb_type) && h->ref_cache[list][idx] >= 0){\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
523 h->ref_cache[list][idx] <<= 1;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
524 h->mv_cache[list][idx][1] /= 2;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
525 h->mvd_cache[list][idx][1] /= 2;\
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
526 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
527 MAP_MVS
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
528 #undef MAP_F2F
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
529 }else{
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
530 #define MAP_F2F(idx, mb_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
531 if(IS_INTERLACED(mb_type) && h->ref_cache[list][idx] >= 0){\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
532 h->ref_cache[list][idx] >>= 1;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
533 h->mv_cache[list][idx][1] <<= 1;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
534 h->mvd_cache[list][idx][1] <<= 1;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
535 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
536 MAP_MVS
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
537 #undef MAP_F2F
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
538 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
539 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
540 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
541 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
542 #endif
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
543
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
544 h->neighbor_transform_size= !!IS_8x8DCT(top_type) + !!IS_8x8DCT(left_type[0]);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
545 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
546
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
547 static inline void 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
548 const int mb_xy= h->mb_xy;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
549
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
550 h->intra4x4_pred_mode[mb_xy][0]= h->intra4x4_pred_mode_cache[7+8*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
551 h->intra4x4_pred_mode[mb_xy][1]= h->intra4x4_pred_mode_cache[7+8*2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
552 h->intra4x4_pred_mode[mb_xy][2]= h->intra4x4_pred_mode_cache[7+8*3];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
553 h->intra4x4_pred_mode[mb_xy][3]= h->intra4x4_pred_mode_cache[7+8*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
554 h->intra4x4_pred_mode[mb_xy][4]= h->intra4x4_pred_mode_cache[4+8*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
555 h->intra4x4_pred_mode[mb_xy][5]= h->intra4x4_pred_mode_cache[5+8*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
556 h->intra4x4_pred_mode[mb_xy][6]= h->intra4x4_pred_mode_cache[6+8*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
557 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
558
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
559 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
560 * 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
561 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
562 static inline int check_intra4x4_pred_mode(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
563 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
564 static const int8_t top [12]= {-1, 0,LEFT_DC_PRED,-1,-1,-1,-1,-1, 0};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
565 static const int8_t left[12]= { 0,-1, TOP_DC_PRED, 0,-1,-1,-1, 0,-1,DC_128_PRED};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
566 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
567
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
568 if(!(h->top_samples_available&0x8000)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
569 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
570 int status= top[ h->intra4x4_pred_mode_cache[scan8[0] + i] ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
571 if(status<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
572 av_log(h->s.avctx, AV_LOG_ERROR, "top block unavailable for requested intra4x4 mode %d at %d %d\n", status, s->mb_x, s->mb_y);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
573 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
574 } else if(status){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
575 h->intra4x4_pred_mode_cache[scan8[0] + i]= status;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
576 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
577 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
578 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
579
7532
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
580 if((h->left_samples_available&0x8888)!=0x8888){
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
581 static const int mask[4]={0x8000,0x2000,0x80,0x20};
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
582 for(i=0; i<4; i++){
7532
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
583 if(!(h->left_samples_available&mask[i])){
8437
michael
parents: 8436
diff changeset
584 int status= left[ h->intra4x4_pred_mode_cache[scan8[0] + 8*i] ];
michael
parents: 8436
diff changeset
585 if(status<0){
michael
parents: 8436
diff changeset
586 av_log(h->s.avctx, AV_LOG_ERROR, "left block unavailable for requested intra4x4 mode %d at %d %d\n", status, s->mb_x, s->mb_y);
michael
parents: 8436
diff changeset
587 return -1;
michael
parents: 8436
diff changeset
588 } else if(status){
michael
parents: 8436
diff changeset
589 h->intra4x4_pred_mode_cache[scan8[0] + 8*i]= status;
michael
parents: 8436
diff changeset
590 }
7532
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
591 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
592 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
593 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
594
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
595 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
596 } //FIXME cleanup like next
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
597
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
598 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
599 * 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
600 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
601 static inline int check_intra_pred_mode(H264Context *h, int mode){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
602 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
603 static const int8_t top [7]= {LEFT_DC_PRED8x8, 1,-1,-1};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
604 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
605
4529
a8082e1ed672 simplify
michael
parents: 4507
diff changeset
606 if(mode > 6U) {
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
607 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
608 return -1;
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
609 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
610
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
611 if(!(h->top_samples_available&0x8000)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
612 mode= top[ mode ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
613 if(mode<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
614 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
615 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
616 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
617 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
618
7532
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
619 if((h->left_samples_available&0x8080) != 0x8080){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
620 mode= left[ mode ];
7532
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
621 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
622 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
623 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
624 if(mode<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
625 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
626 return -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
627 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
628 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
629
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
630 return mode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
631 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
632
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
633 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
634 * gets the predicted intra4x4 prediction mode.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
635 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
636 static inline int pred_intra_mode(H264Context *h, int n){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
637 const int index8= scan8[n];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
638 const int left= h->intra4x4_pred_mode_cache[index8 - 1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
639 const int top = h->intra4x4_pred_mode_cache[index8 - 8];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
640 const int min= FFMIN(left, top);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
641
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
642 tprintf(h->s.avctx, "mode:%d %d min:%d\n", left ,top, min);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
643
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
644 if(min<0) return DC_PRED;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
645 else return min;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
646 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
647
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
648 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
649 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
650
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
651 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
652 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
653 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
654 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
655 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
656 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
657 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
658
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
659 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
660 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
661 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
662
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
663 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
664 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
665 h->non_zero_count[mb_xy][10]=h->non_zero_count_cache[2+8*4];
1168
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 /**
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
669 * gets the predicted number of non-zero coefficients.
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
670 * @param n block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
671 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
672 static inline int pred_non_zero_count(H264Context *h, int n){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
673 const int index8= scan8[n];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
674 const int left= h->non_zero_count_cache[index8 - 1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
675 const int top = h->non_zero_count_cache[index8 - 8];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
676 int i= left + top;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
677
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
678 if(i<64) i= (i+1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
679
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
680 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
681
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
682 return i&31;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
683 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
684
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
685 static inline int fetch_diagonal_mv(H264Context *h, const int16_t **C, int i, int list, int part_width){
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
686 const int topright_ref= h->ref_cache[list][ i - 8 + part_width ];
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
687 MpegEncContext *s = &h->s;
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
688
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
689 /* there is no consistent mapping of mvs to neighboring locations that will
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
690 * make mbaff happy, so we can't move all this logic to fill_caches */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
691 if(FRAME_MBAFF){
3776
1843a85123b7 fix some signedness warnings
mru
parents: 3651
diff changeset
692 const uint32_t *mb_types = s->current_picture_ptr->mb_type;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
693 const int16_t *mv;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
694 *(uint32_t*)h->mv_cache[list][scan8[0]-2] = 0;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
695 *C = h->mv_cache[list][scan8[0]-2];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
696
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
697 if(!MB_FIELD
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
698 && (s->mb_y&1) && i < scan8[0]+8 && topright_ref != PART_NOT_AVAILABLE){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
699 int topright_xy = s->mb_x + (s->mb_y-1)*s->mb_stride + (i == scan8[0]+3);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
700 if(IS_INTERLACED(mb_types[topright_xy])){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
701 #define SET_DIAG_MV(MV_OP, REF_OP, X4, Y4)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
702 const int x4 = X4, y4 = Y4;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
703 const int mb_type = mb_types[(x4>>2)+(y4>>2)*s->mb_stride];\
6310
f0457c910be3 fix mbaff diagonal neighbor mv
lorenm
parents: 6309
diff changeset
704 if(!USES_LIST(mb_type,list))\
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
705 return LIST_NOT_USED;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
706 mv = s->current_picture_ptr->motion_val[list][x4 + y4*h->b_stride];\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
707 h->mv_cache[list][scan8[0]-2][0] = mv[0];\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
708 h->mv_cache[list][scan8[0]-2][1] = mv[1] MV_OP;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
709 return s->current_picture_ptr->ref_index[list][(x4>>1) + (y4>>1)*h->b8_stride] REF_OP;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
710
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
711 SET_DIAG_MV(*2, >>1, s->mb_x*4+(i&7)-4+part_width, s->mb_y*4-1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
712 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
713 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
714 if(topright_ref == PART_NOT_AVAILABLE
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
715 && ((s->mb_y&1) || i >= scan8[0]+8) && (i&7)==4
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
716 && h->ref_cache[list][scan8[0]-1] != PART_NOT_AVAILABLE){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
717 if(!MB_FIELD
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
718 && IS_INTERLACED(mb_types[h->left_mb_xy[0]])){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
719 SET_DIAG_MV(*2, >>1, s->mb_x*4-1, (s->mb_y|1)*4+(s->mb_y&1)*2+(i>>4)-1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
720 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
721 if(MB_FIELD
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
722 && !IS_INTERLACED(mb_types[h->left_mb_xy[0]])
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
723 && i >= scan8[0]+8){
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
724 // left shift will turn LIST_NOT_USED into PART_NOT_AVAILABLE, but that's OK.
6310
f0457c910be3 fix mbaff diagonal neighbor mv
lorenm
parents: 6309
diff changeset
725 SET_DIAG_MV(/2, <<1, s->mb_x*4-1, (s->mb_y&~1)*4 - 1 + ((i-scan8[0])>>3)*2);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
726 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
727 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
728 #undef SET_DIAG_MV
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
729 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
730
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
731 if(topright_ref != PART_NOT_AVAILABLE){
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
732 *C= h->mv_cache[list][ i - 8 + part_width ];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
733 return topright_ref;
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
734 }else{
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
735 tprintf(s->avctx, "topright MV not available\n");
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
736
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
737 *C= h->mv_cache[list][ i - 8 - 1 ];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
738 return h->ref_cache[list][ i - 8 - 1 ];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
739 }
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
740 }
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
741
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
742 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
743 * gets the predicted MV.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
744 * @param n the block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
745 * @param part_width the width of the partition (4, 8,16) -> (1, 2, 4)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
746 * @param mx the x component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
747 * @param my the y component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
748 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
749 static inline void pred_motion(H264Context * const h, int n, int part_width, int list, int ref, int * const mx, int * const my){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
750 const int index8= scan8[n];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
751 const int top_ref= h->ref_cache[list][ index8 - 8 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
752 const int left_ref= h->ref_cache[list][ index8 - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
753 const int16_t * const A= h->mv_cache[list][ index8 - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
754 const int16_t * const B= h->mv_cache[list][ index8 - 8 ];
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
755 const int16_t * C;
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
756 int diagonal_ref, match_count;
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
757
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
758 assert(part_width==1 || part_width==2 || part_width==4);
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
759
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
760 /* mv_cache
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
761 B . . A T T T T
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
762 U . . L . . , .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
763 U . . L . . . .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
764 U . . L . . , .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
765 . . . L . . . .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
766 */
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
767
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
768 diagonal_ref= fetch_diagonal_mv(h, &C, index8, list, part_width);
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
769 match_count= (diagonal_ref==ref) + (top_ref==ref) + (left_ref==ref);
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
770 tprintf(h->s.avctx, "pred_motion match_count=%d\n", match_count);
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
771 if(match_count > 1){ //most common
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
772 *mx= mid_pred(A[0], B[0], C[0]);
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
773 *my= mid_pred(A[1], B[1], C[1]);
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
774 }else if(match_count==1){
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
775 if(left_ref==ref){
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
776 *mx= A[0];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
777 *my= A[1];
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
778 }else if(top_ref==ref){
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
779 *mx= B[0];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
780 *my= B[1];
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
781 }else{
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
782 *mx= C[0];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
783 *my= C[1];
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
784 }
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
785 }else{
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
786 if(top_ref == PART_NOT_AVAILABLE && diagonal_ref == PART_NOT_AVAILABLE && left_ref != PART_NOT_AVAILABLE){
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
787 *mx= A[0];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
788 *my= A[1];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
789 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
790 *mx= mid_pred(A[0], B[0], C[0]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
791 *my= mid_pred(A[1], B[1], C[1]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
792 }
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
793 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
794
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
795 tprintf(h->s.avctx, "pred_motion (%2d %2d %2d) (%2d %2d %2d) (%2d %2d %2d) -> (%2d %2d %2d) at %2d %2d %d list %d\n", top_ref, B[0], B[1], diagonal_ref, C[0], C[1], left_ref, A[0], A[1], ref, *mx, *my, h->s.mb_x, h->s.mb_y, n, list);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
796 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
797
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
798 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
799 * gets the directionally predicted 16x8 MV.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
800 * @param n the block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
801 * @param mx the x component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
802 * @param my the y component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
803 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
804 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
805 if(n==0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
806 const int top_ref= h->ref_cache[list][ scan8[0] - 8 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
807 const int16_t * const B= h->mv_cache[list][ scan8[0] - 8 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
808
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
809 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
810
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
811 if(top_ref == ref){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
812 *mx= B[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
813 *my= B[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
814 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
815 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
816 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
817 const int left_ref= h->ref_cache[list][ scan8[8] - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
818 const int16_t * const A= h->mv_cache[list][ scan8[8] - 1 ];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
819
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
820 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
821
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
822 if(left_ref == ref){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
823 *mx= A[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
824 *my= A[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
825 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
826 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
827 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
828
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
829 //RARE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
830 pred_motion(h, n, 4, list, ref, mx, my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
831 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
832
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
833 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
834 * gets the directionally predicted 8x16 MV.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
835 * @param n the block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
836 * @param mx the x component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
837 * @param my the y component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
838 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
839 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
840 if(n==0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
841 const int left_ref= h->ref_cache[list][ scan8[0] - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
842 const int16_t * const A= h->mv_cache[list][ scan8[0] - 1 ];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
843
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
844 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
845
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
846 if(left_ref == ref){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
847 *mx= A[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
848 *my= A[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
849 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
850 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
851 }else{
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
852 const int16_t * C;
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
853 int diagonal_ref;
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
854
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
855 diagonal_ref= fetch_diagonal_mv(h, &C, scan8[4], list, 2);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
856
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
857 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
858
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
859 if(diagonal_ref == ref){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
860 *mx= C[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
861 *my= C[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
862 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
863 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
864 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
865
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
866 //RARE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
867 pred_motion(h, n, 2, list, ref, mx, my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
868 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
869
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
870 static inline void pred_pskip_motion(H264Context * const h, int * const mx, int * const my){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
871 const int top_ref = h->ref_cache[0][ scan8[0] - 8 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
872 const int left_ref= h->ref_cache[0][ scan8[0] - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
873
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
874 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
875
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
876 if(top_ref == PART_NOT_AVAILABLE || left_ref == PART_NOT_AVAILABLE
8454
bc5f446ed4a8 Optimize pred_pskip_motion()
michael
parents: 8453
diff changeset
877 || !( top_ref | *(uint32_t*)h->mv_cache[0][ scan8[0] - 8 ])
bc5f446ed4a8 Optimize pred_pskip_motion()
michael
parents: 8453
diff changeset
878 || !(left_ref | *(uint32_t*)h->mv_cache[0][ scan8[0] - 1 ])){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
879
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
880 *mx = *my = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
881 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
882 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
883
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
884 pred_motion(h, 0, 4, 0, 0, mx, my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
885
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
886 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
887 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
888
7898
a33287a39a55 Make MBAFF temporal direct mode closer to the spec.
michael
parents: 7897
diff changeset
889 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
890 int poc0 = h->ref_list[0][i].poc;
a33287a39a55 Make MBAFF temporal direct mode closer to the spec.
michael
parents: 7897
diff changeset
891 int td = av_clip(poc1 - poc0, -128, 127);
a33287a39a55 Make MBAFF temporal direct mode closer to the spec.
michael
parents: 7897
diff changeset
892 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
893 return 256;
a33287a39a55 Make MBAFF temporal direct mode closer to the spec.
michael
parents: 7897
diff changeset
894 }else{
a33287a39a55 Make MBAFF temporal direct mode closer to the spec.
michael
parents: 7897
diff changeset
895 int tb = av_clip(poc - poc0, -128, 127);
a33287a39a55 Make MBAFF temporal direct mode closer to the spec.
michael
parents: 7897
diff changeset
896 int tx = (16384 + (FFABS(td) >> 1)) / td;
a33287a39a55 Make MBAFF temporal direct mode closer to the spec.
michael
parents: 7897
diff changeset
897 return av_clip((tb*tx + 32) >> 6, -1024, 1023);
a33287a39a55 Make MBAFF temporal direct mode closer to the spec.
michael
parents: 7897
diff changeset
898 }
a33287a39a55 Make MBAFF temporal direct mode closer to the spec.
michael
parents: 7897
diff changeset
899 }
a33287a39a55 Make MBAFF temporal direct mode closer to the spec.
michael
parents: 7897
diff changeset
900
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
901 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
902 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
903 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
904 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
905 int i, field;
a33287a39a55 Make MBAFF temporal direct mode closer to the spec.
michael
parents: 7897
diff changeset
906 for(field=0; field<2; field++){
a33287a39a55 Make MBAFF temporal direct mode closer to the spec.
michael
parents: 7897
diff changeset
907 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
908 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
909 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
910 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
911 }
a33287a39a55 Make MBAFF temporal direct mode closer to the spec.
michael
parents: 7897
diff changeset
912
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
913 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
914 h->dist_scale_factor[i] = get_scale_factor(h, poc, poc1, i);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
915 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
916 }
7906
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
917
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
918 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
919 MpegEncContext * const s = &h->s;
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
920 Picture * const ref1 = &h->ref_list[1][0];
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
921 int j, old_ref, rfield;
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
922 int start= mbafi ? 16 : 0;
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
923 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
924 int interl= mbafi || s->picture_structure != PICT_FRAME;
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
925
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
926 /* bogus; fills in for missing frames */
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
927 memset(map[list], 0, sizeof(map[list]));
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
928
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
929 for(rfield=0; rfield<2; rfield++){
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
930 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
931 int poc = ref1->ref_poc[colfield][list][old_ref];
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
932
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
933 if (!interl)
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
934 poc |= 3;
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
935 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
936 poc= (poc&~3) + rfield + 1;
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
937
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
938 for(j=start; j<end; j++){
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
939 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
940 int cur_ref= mbafi ? (j-16)^field : j;
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
941 map[list][2*old_ref + (rfield^field) + 16] = cur_ref;
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
942 if(rfield == field)
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
943 map[list][old_ref] = cur_ref;
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
944 break;
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
945 }
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
946 }
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
947 }
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
948 }
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
949 }
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
950
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
951 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
952 MpegEncContext * const s = &h->s;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
953 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
954 Picture * const cur = s->current_picture_ptr;
7928
7d897cb94a31 Remove unused variable.
diego
parents: 7926
diff changeset
955 int list, j, field;
7906
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
956 int sidx= (s->picture_structure&1)^1;
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
957 int ref1sidx= (ref1->reference&1)^1;
7907
8eb69709a934 A few empty lines for readability.
michael
parents: 7906
diff changeset
958
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
959 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
960 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
961 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
962 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
963 }
7907
8eb69709a934 A few empty lines for readability.
michael
parents: 7906
diff changeset
964
7482
ecf3c774f5e1 Fill ref_count/ref_poc for both fields of frames.
michael
parents: 7481
diff changeset
965 if(s->picture_structure == PICT_FRAME){
7906
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
966 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
967 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
968 }
7907
8eb69709a934 A few empty lines for readability.
michael
parents: 7906
diff changeset
969
7902
8b8be8f2b647 Fix ref_shift so that it is correct for more/all? MBAFF/PAFF mixes.
michael
parents: 7901
diff changeset
970 cur->mbaff= FRAME_MBAFF;
7907
8eb69709a934 A few empty lines for readability.
michael
parents: 7906
diff changeset
971
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6429
diff changeset
972 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
973 return;
7907
8eb69709a934 A few empty lines for readability.
michael
parents: 7906
diff changeset
974
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
975 for(list=0; list<2; list++){
7906
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
976 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
977 for(field=0; field<2; field++)
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
978 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
979 }
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
980 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
981
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
982 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
983 MpegEncContext * const s = &h->s;
7493
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
984 int b8_stride = h->b8_stride;
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
985 int b4_stride = h->b_stride;
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
986 int mb_xy = h->mb_xy;
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
987 int mb_type_col[2];
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
988 const int16_t (*l1mv0)[2], (*l1mv1)[2];
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
989 const int8_t *l1ref0, *l1ref1;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
990 const int is_b8x8 = IS_8X8(*mb_type);
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
991 unsigned int sub_mb_type;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
992 int i8, i4;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
993
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
994 #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
995
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
996 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
997 if(!IS_INTERLACED(*mb_type)){ // AFR/FR -> AFL/FL
7901
michael
parents: 7900
diff changeset
998 int cur_poc = s->current_picture_ptr->poc;
michael
parents: 7900
diff changeset
999 int *col_poc = h->ref_list[1]->field_poc;
michael
parents: 7900
diff changeset
1000 int col_parity = FFABS(col_poc[0] - cur_poc) >= FFABS(col_poc[1] - cur_poc);
michael
parents: 7900
diff changeset
1001 mb_xy= s->mb_x + ((s->mb_y&~1) + col_parity)*s->mb_stride;
michael
parents: 7900
diff changeset
1002 b8_stride = 0;
7918
84b37de61d98 Field -> MBAFF direct mode can use data from fields that are not
michael
parents: 7907
diff changeset
1003 }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
1004 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
1005 mb_xy += s->mb_stride*fieldoff;
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
1006 }
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
1007 goto single_col;
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
1008 }else{ // AFL/AFR/FR/FL -> AFR/FR
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
1009 if(IS_INTERLACED(*mb_type)){ // AFL /FL -> AFR/FR
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
1010 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
1011 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
1012 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
1013 b8_stride *= 3;
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
1014 b4_stride *= 6;
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
1015 //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
1016 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
1017 && (mb_type_col[1] & MB_TYPE_16x16_OR_INTRA)
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
1018 && !is_b8x8){
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
1019 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
1020 *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
1021 }else{
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
1022 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
1023 *mb_type |= MB_TYPE_8x8|MB_TYPE_L0L1;
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
1024 }
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
1025 }else{ // AFR/FR -> AFR/FR
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
1026 single_col:
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
1027 mb_type_col[0] =
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
1028 mb_type_col[1] = h->ref_list[1][0].mb_type[mb_xy];
7494
michael
parents: 7493
diff changeset
1029 if(IS_8X8(mb_type_col[0]) && !h->sps.direct_8x8_inference_flag){
michael
parents: 7493
diff changeset
1030 /* FIXME save sub mb types from previous frames (or derive from MVs)
michael
parents: 7493
diff changeset
1031 * so we know exactly what block size to use */
michael
parents: 7493
diff changeset
1032 sub_mb_type = MB_TYPE_8x8|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_4x4 */
michael
parents: 7493
diff changeset
1033 *mb_type |= MB_TYPE_8x8|MB_TYPE_L0L1;
michael
parents: 7493
diff changeset
1034 }else if(!is_b8x8 && (mb_type_col[0] & MB_TYPE_16x16_OR_INTRA)){
michael
parents: 7493
diff changeset
1035 sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */
michael
parents: 7493
diff changeset
1036 *mb_type |= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_16x16 */
michael
parents: 7493
diff changeset
1037 }else{
michael
parents: 7493
diff changeset
1038 sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */
michael
parents: 7493
diff changeset
1039 *mb_type |= MB_TYPE_8x8|MB_TYPE_L0L1;
michael
parents: 7493
diff changeset
1040 }
7493
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
1041 }
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
1042 }
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
1043
7497
michael
parents: 7496
diff changeset
1044 l1mv0 = &h->ref_list[1][0].motion_val[0][h->mb2b_xy [mb_xy]];
michael
parents: 7496
diff changeset
1045 l1mv1 = &h->ref_list[1][0].motion_val[1][h->mb2b_xy [mb_xy]];
michael
parents: 7496
diff changeset
1046 l1ref0 = &h->ref_list[1][0].ref_index [0][h->mb2b8_xy[mb_xy]];
michael
parents: 7496
diff changeset
1047 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
1048 if(!b8_stride){
f96c14041e48 Simplify l1mv/l1ref calculation.
michael
parents: 7495
diff changeset
1049 if(s->mb_y&1){
f96c14041e48 Simplify l1mv/l1ref calculation.
michael
parents: 7495
diff changeset
1050 l1ref0 += h->b8_stride;
f96c14041e48 Simplify l1mv/l1ref calculation.
michael
parents: 7495
diff changeset
1051 l1ref1 += h->b8_stride;
f96c14041e48 Simplify l1mv/l1ref calculation.
michael
parents: 7495
diff changeset
1052 l1mv0 += 2*b4_stride;
f96c14041e48 Simplify l1mv/l1ref calculation.
michael
parents: 7495
diff changeset
1053 l1mv1 += 2*b4_stride;
f96c14041e48 Simplify l1mv/l1ref calculation.
michael
parents: 7495
diff changeset
1054 }
7493
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
1055 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1056
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1057 if(h->direct_spatial_mv_pred){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1058 int ref[2];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1059 int mv[2][2];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1060 int list;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1061
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1062 /* FIXME interlacing + spatial direct uses wrong colocated block positions */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1063
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1064 /* ref = min(neighbors) */
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1065 for(list=0; list<2; list++){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1066 int refa = h->ref_cache[list][scan8[0] - 1];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1067 int refb = h->ref_cache[list][scan8[0] - 8];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1068 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
1069 if(refc == PART_NOT_AVAILABLE)
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1070 refc = h->ref_cache[list][scan8[0] - 8 - 1];
7336
aaf3e396f094 Simplify spatial direct ref selection with FFMIN3()
michael
parents: 7332
diff changeset
1071 ref[list] = FFMIN3((unsigned)refa, (unsigned)refb, (unsigned)refc);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1072 if(ref[list] < 0)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1073 ref[list] = -1;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1074 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1075
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1076 if(ref[0] < 0 && ref[1] < 0){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1077 ref[0] = ref[1] = 0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1078 mv[0][0] = mv[0][1] =
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1079 mv[1][0] = mv[1][1] = 0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1080 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1081 for(list=0; list<2; list++){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1082 if(ref[list] >= 0)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1083 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
1084 else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1085 mv[list][0] = mv[list][1] = 0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1086 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1087 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1088
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1089 if(ref[1] < 0){
6309
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1090 if(!is_b8x8)
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1091 *mb_type &= ~MB_TYPE_L1;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1092 sub_mb_type &= ~MB_TYPE_L1;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1093 }else if(ref[0] < 0){
6309
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1094 if(!is_b8x8)
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1095 *mb_type &= ~MB_TYPE_L0;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1096 sub_mb_type &= ~MB_TYPE_L0;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1097 }
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1098
7493
e5b93d01b472 Factorize some code between temporal and spatial direct mode.
michael
parents: 7488
diff changeset
1099 if(IS_INTERLACED(*mb_type) != IS_INTERLACED(mb_type_col[0])){
6309
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1100 for(i8=0; i8<4; i8++){
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1101 int x8 = i8&1;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1102 int y8 = i8>>1;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1103 int xy8 = x8+y8*b8_stride;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1104 int xy4 = 3*x8+y8*b4_stride;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1105 int a=0, b=0;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1106
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1107 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8]))
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1108 continue;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1109 h->sub_mb_type[i8] = sub_mb_type;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1110
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1111 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
1112 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
1113 if(!IS_INTRA(mb_type_col[y8])
6309
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1114 && ( (l1ref0[xy8] == 0 && FFABS(l1mv0[xy4][0]) <= 1 && FFABS(l1mv0[xy4][1]) <= 1)
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1115 || (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
1116 if(ref[0] > 0)
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1117 a= pack16to32(mv[0][0],mv[0][1]);
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1118 if(ref[1] > 0)
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1119 b= pack16to32(mv[1][0],mv[1][1]);
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1120 }else{
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1121 a= pack16to32(mv[0][0],mv[0][1]);
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1122 b= pack16to32(mv[1][0],mv[1][1]);
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1123 }
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1124 fill_rectangle(&h->mv_cache[0][scan8[i8*4]], 2, 2, 8, a, 4);
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1125 fill_rectangle(&h->mv_cache[1][scan8[i8*4]], 2, 2, 8, b, 4);
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1126 }
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1127 }else if(IS_16X16(*mb_type)){
4540
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
1128 int a=0, b=0;
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
1129
3001
b52d8ee430f6 fix some potential arithmetic overflows in pred_direct_motion() and
lorenm
parents: 2979
diff changeset
1130 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
1131 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
1132 if(!IS_INTRA(mb_type_col[0])
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
1133 && ( (l1ref0[0] == 0 && FFABS(l1mv0[0][0]) <= 1 && FFABS(l1mv0[0][1]) <= 1)
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
1134 || (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
1135 && (h->x264_build>33 || !h->x264_build)))){
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1136 if(ref[0] > 0)
4540
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
1137 a= pack16to32(mv[0][0],mv[0][1]);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1138 if(ref[1] > 0)
4540
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
1139 b= pack16to32(mv[1][0],mv[1][1]);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1140 }else{
4540
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
1141 a= pack16to32(mv[0][0],mv[0][1]);
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
1142 b= pack16to32(mv[1][0],mv[1][1]);
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
1143 }
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
1144 fill_rectangle(&h->mv_cache[0][scan8[0]], 4, 4, 8, a, 4);
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
1145 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
1146 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1147 for(i8=0; i8<4; i8++){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1148 const int x8 = i8&1;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1149 const int y8 = i8>>1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1150
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1151 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8]))
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1152 continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1153 h->sub_mb_type[i8] = sub_mb_type;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1154
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1155 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
1156 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
1157 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
1158 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
1159
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1160 /* col_zero_flag */
7498
e7006afcb1c6 Use local variabes for *stride, where local variables exist.
michael
parents: 7497
diff changeset
1161 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
1162 || (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
1163 && (h->x264_build>33 || !h->x264_build)))){
7498
e7006afcb1c6 Use local variabes for *stride, where local variables exist.
michael
parents: 7497
diff changeset
1164 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
1165 if(IS_SUB_8X8(sub_mb_type)){
7498
e7006afcb1c6 Use local variabes for *stride, where local variables exist.
michael
parents: 7497
diff changeset
1166 const int16_t *mv_col = l1mv[x8*3 + y8*3*b4_stride];
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
1167 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
1168 if(ref[0] == 0)
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1169 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
1170 if(ref[1] == 0)
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1171 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
1172 }
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1173 }else
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1174 for(i4=0; i4<4; i4++){
7498
e7006afcb1c6 Use local variabes for *stride, where local variables exist.
michael
parents: 7497
diff changeset
1175 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
1176 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
1177 if(ref[0] == 0)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1178 *(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
1179 if(ref[1] == 0)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1180 *(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
1181 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1182 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1183 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1184 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1185 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1186 }else{ /* direct temporal mv pred */
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1187 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
1188 const int *dist_scale_factor = h->dist_scale_factor;
7906
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
1189 int ref_offset= 0;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1190
7494
michael
parents: 7493
diff changeset
1191 if(FRAME_MBAFF && IS_INTERLACED(*mb_type)){
7898
a33287a39a55 Make MBAFF temporal direct mode closer to the spec.
michael
parents: 7897
diff changeset
1192 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
1193 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
1194 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
1195 }
8b8be8f2b647 Fix ref_shift so that it is correct for more/all? MBAFF/PAFF mixes.
michael
parents: 7901
diff changeset
1196 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
1197 ref_offset += 16;
7902
8b8be8f2b647 Fix ref_shift so that it is correct for more/all? MBAFF/PAFF mixes.
michael
parents: 7901
diff changeset
1198
7494
michael
parents: 7493
diff changeset
1199 if(IS_INTERLACED(*mb_type) != IS_INTERLACED(mb_type_col[0])){
michael
parents: 7493
diff changeset
1200 /* FIXME assumes direct_8x8_inference == 1 */
7495
2090d67bbf16 simplify y_shift/ref_shift code
michael
parents: 7494
diff changeset
1201 int y_shift = 2*!IS_INTERLACED(*mb_type);
7494
michael
parents: 7493
diff changeset
1202
michael
parents: 7493
diff changeset
1203 for(i8=0; i8<4; i8++){
michael
parents: 7493
diff changeset
1204 const int x8 = i8&1;
michael
parents: 7493
diff changeset
1205 const int y8 = i8>>1;
michael
parents: 7493
diff changeset
1206 int ref0, scale;
michael
parents: 7493
diff changeset
1207 const int16_t (*l1mv)[2]= l1mv0;
michael
parents: 7493
diff changeset
1208
michael
parents: 7493
diff changeset
1209 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8]))
michael
parents: 7493
diff changeset
1210 continue;
michael
parents: 7493
diff changeset
1211 h->sub_mb_type[i8] = sub_mb_type;
michael
parents: 7493
diff changeset
1212
michael
parents: 7493
diff changeset
1213 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, 0, 1);
michael
parents: 7493
diff changeset
1214 if(IS_INTRA(mb_type_col[y8])){
michael
parents: 7493
diff changeset
1215 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, 0, 1);
michael
parents: 7493
diff changeset
1216 fill_rectangle(&h-> mv_cache[0][scan8[i8*4]], 2, 2, 8, 0, 4);
michael
parents: 7493
diff changeset
1217 fill_rectangle(&h-> mv_cache[1][scan8[i8*4]], 2, 2, 8, 0, 4);
michael
parents: 7493
diff changeset
1218 continue;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1219 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1220
7494
michael
parents: 7493
diff changeset
1221 ref0 = l1ref0[x8 + y8*b8_stride];
michael
parents: 7493
diff changeset
1222 if(ref0 >= 0)
7906
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
1223 ref0 = map_col_to_list0[0][ref0 + ref_offset];
7494
michael
parents: 7493
diff changeset
1224 else{
7906
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
1225 ref0 = map_col_to_list0[1][l1ref1[x8 + y8*b8_stride] + ref_offset];
7494
michael
parents: 7493
diff changeset
1226 l1mv= l1mv1;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1227 }
7494
michael
parents: 7493
diff changeset
1228 scale = dist_scale_factor[ref0];
michael
parents: 7493
diff changeset
1229 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, ref0, 1);
michael
parents: 7493
diff changeset
1230
michael
parents: 7493
diff changeset
1231 {
michael
parents: 7493
diff changeset
1232 const int16_t *mv_col = l1mv[x8*3 + y8*b4_stride];
michael
parents: 7493
diff changeset
1233 int my_col = (mv_col[1]<<y_shift)/2;
michael
parents: 7493
diff changeset
1234 int mx = (scale * mv_col[0] + 128) >> 8;
michael
parents: 7493
diff changeset
1235 int my = (scale * my_col + 128) >> 8;
michael
parents: 7493
diff changeset
1236 fill_rectangle(&h->mv_cache[0][scan8[i8*4]], 2, 2, 8, pack16to32(mx,my), 4);
michael
parents: 7493
diff changeset
1237 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
1238 }
michael
parents: 7493
diff changeset
1239 }
michael
parents: 7493
diff changeset
1240 return;
michael
parents: 7493
diff changeset
1241 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1242
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1243 /* one-to-one mv scaling */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1244
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1245 if(IS_16X16(*mb_type)){
4541
1c8bc533da57 factorize more calls to fill_rectangle()
michael
parents: 4540
diff changeset
1246 int ref, mv0, mv1;
1c8bc533da57 factorize more calls to fill_rectangle()
michael
parents: 4540
diff changeset
1247
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1248 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
1249 if(IS_INTRA(mb_type_col[0])){
4541
1c8bc533da57 factorize more calls to fill_rectangle()
michael
parents: 4540
diff changeset
1250 ref=mv0=mv1=0;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1251 }else{
7906
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
1252 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
1253 : map_col_to_list0[1][l1ref1[0] + ref_offset];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1254 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
1255 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
1256 int mv_l0[2];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1257 mv_l0[0] = (scale * mv_col[0] + 128) >> 8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1258 mv_l0[1] = (scale * mv_col[1] + 128) >> 8;
4541
1c8bc533da57 factorize more calls to fill_rectangle()
michael
parents: 4540
diff changeset
1259 ref= ref0;
1c8bc533da57 factorize more calls to fill_rectangle()
michael
parents: 4540
diff changeset
1260 mv0= pack16to32(mv_l0[0],mv_l0[1]);
1c8bc533da57 factorize more calls to fill_rectangle()
michael
parents: 4540
diff changeset
1261 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
1262 }
1c8bc533da57 factorize more calls to fill_rectangle()
michael
parents: 4540
diff changeset
1263 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
1264 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
1265 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
1266 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1267 for(i8=0; i8<4; i8++){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1268 const int x8 = i8&1;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1269 const int y8 = i8>>1;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1270 int ref0, scale;
2834
fd5d7c732c6b kill a bunch of compiler warnings
mru
parents: 2815
diff changeset
1271 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
1272
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1273 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8]))
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1274 continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1275 h->sub_mb_type[i8] = sub_mb_type;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1276 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
1277 if(IS_INTRA(mb_type_col[0])){
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1278 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
1279 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
1280 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
1281 continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1282 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1283
7906
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
1284 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
1285 if(ref0 >= 0)
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1286 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
1287 else{
7906
5be944626072 Another try to fix temporal direct mode references.
michael
parents: 7902
diff changeset
1288 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
1289 l1mv= l1mv1;
75400dfbe117 fixing colocated mv if colocated block is L1 predicted for the temporal direct case
michael
parents: 2808
diff changeset
1290 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1291 scale = dist_scale_factor[ref0];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1292
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1293 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
1294 if(IS_SUB_8X8(sub_mb_type)){
7498
e7006afcb1c6 Use local variabes for *stride, where local variables exist.
michael
parents: 7497
diff changeset
1295 const int16_t *mv_col = l1mv[x8*3 + y8*3*b4_stride];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1296 int mx = (scale * mv_col[0] + 128) >> 8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1297 int my = (scale * mv_col[1] + 128) >> 8;
3002
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1298 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
1299 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
1300 }else
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1301 for(i4=0; i4<4; i4++){
7498
e7006afcb1c6 Use local variabes for *stride, where local variables exist.
michael
parents: 7497
diff changeset
1302 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
1303 int16_t *mv_l0 = h->mv_cache[0][scan8[i8*4+i4]];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1304 mv_l0[0] = (scale * mv_col[0] + 128) >> 8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1305 mv_l0[1] = (scale * mv_col[1] + 128) >> 8;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1306 *(uint32_t*)h->mv_cache[1][scan8[i8*4+i4]] =
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1307 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
1308 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1309 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1310 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1311 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1312 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1313
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1314 static inline void write_back_motion(H264Context *h, int mb_type){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1315 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1316 const int b_xy = 4*s->mb_x + 4*s->mb_y*h->b_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1317 const int b8_xy= 2*s->mb_x + 2*s->mb_y*h->b8_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1318 int list;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1319
3219
cf233efbcece 10l in 1.199 (write_back_motion with B-pyramid + spatial)
lorenm
parents: 3215
diff changeset
1320 if(!USES_LIST(mb_type, 0))
cf233efbcece 10l in 1.199 (write_back_motion with B-pyramid + spatial)
lorenm
parents: 3215
diff changeset
1321 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
1322
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
1323 for(list=0; list<h->list_count; list++){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1324 int y;
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
1325 if(!USES_LIST(mb_type, list))
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1326 continue;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1327
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1328 for(y=0; y<4; y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1329 *(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
1330 *(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
1331 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
1332 if( h->pps.cabac ) {
3927
f44a3341bfdf simplify write_back_motion for skip mbs
lorenm
parents: 3807
diff changeset
1333 if(IS_SKIP(mb_type))
f44a3341bfdf simplify write_back_motion for skip mbs
lorenm
parents: 3807
diff changeset
1334 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
1335 else
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
1336 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
1337 *(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
1338 *(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
1339 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
1340 }
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
1341
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
1342 {
3776
1843a85123b7 fix some signedness warnings
mru
parents: 3651
diff changeset
1343 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
1344 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
1345 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
1346 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
1347 ref_index[1+1*h->b8_stride]= h->ref_cache[list][scan8[12]];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1348 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1349 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1350
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
1351 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
1352 if(IS_8X8(mb_type)){
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
1353 uint8_t *direct_table = &h->direct_table[b8_xy];
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
1354 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
1355 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
1356 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
1357 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1358 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1359 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1360
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1361 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1362 * Decodes a network abstraction layer unit.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1363 * @param consumed is the number of bytes used as input
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1364 * @param length is the length of the array
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
1365 * @param dst_length is the number of decoded bytes FIXME here or a decode rbsp tailing?
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1366 * @returns decoded bytes, might be src+1 if no escapes
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1367 */
6216
michael
parents: 6213
diff changeset
1368 static const uint8_t *decode_nal(H264Context *h, const uint8_t *src, int *dst_length, int *consumed, int length){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1369 int i, si, di;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1370 uint8_t *dst;
5174
2e038003cdfb Do not reuse the rbsp de-escape buffer if both
benoit
parents: 5172
diff changeset
1371 int bufidx;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1372
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2971
diff changeset
1373 // src[0]&0x80; //forbidden bit
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1374 h->nal_ref_idc= src[0]>>5;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1375 h->nal_unit_type= src[0]&0x1F;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1376
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1377 src++; length--;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1378 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1379 for(i=0; i<length; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1380 printf("%2X ", src[i]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1381 #endif
8440
649ce1b30344 Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents: 8438
diff changeset
1382
649ce1b30344 Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents: 8438
diff changeset
1383 #ifdef HAVE_FAST_UNALIGNED
649ce1b30344 Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents: 8438
diff changeset
1384 # ifdef HAVE_FAST_64BIT
649ce1b30344 Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents: 8438
diff changeset
1385 # define RS 7
649ce1b30344 Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents: 8438
diff changeset
1386 for(i=0; i+1<length; i+=9){
649ce1b30344 Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents: 8438
diff changeset
1387 if(!((~*(uint64_t*)(src+i) & (*(uint64_t*)(src+i) - 0x0100010001000101ULL)) & 0x8000800080008080ULL))
649ce1b30344 Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents: 8438
diff changeset
1388 # else
649ce1b30344 Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents: 8438
diff changeset
1389 # define RS 3
649ce1b30344 Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents: 8438
diff changeset
1390 for(i=0; i+1<length; i+=5){
649ce1b30344 Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents: 8438
diff changeset
1391 if(!((~*(uint32_t*)(src+i) & (*(uint32_t*)(src+i) - 0x01000101U)) & 0x80008080U))
649ce1b30344 Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents: 8438
diff changeset
1392 # endif
649ce1b30344 Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents: 8438
diff changeset
1393 continue;
649ce1b30344 Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents: 8438
diff changeset
1394 if(i>0 && !src[i]) i--;
649ce1b30344 Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents: 8438
diff changeset
1395 while(src[i]) i++;
649ce1b30344 Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents: 8438
diff changeset
1396 #else
649ce1b30344 Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents: 8438
diff changeset
1397 # define RS 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1398 for(i=0; i+1<length; i+=2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1399 if(src[i]) continue;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1400 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
1401 #endif
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1402 if(i+2<length && src[i+1]==0 && src[i+2]<=3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1403 if(src[i+2]!=3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1404 /* startcode, so we must be past the end */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1405 length=i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1406 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1407 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1408 }
8441
f97c423dcb7f 100l, I broke H.264 again, forgot one hunk.
michael
parents: 8440
diff changeset
1409 i-= RS;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1410 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1411
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1412 if(i>=length-1){ //no escaped 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1413 *dst_length= length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1414 *consumed= length+1; //+1 for the header
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1415 return src;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1416 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1417
5174
2e038003cdfb Do not reuse the rbsp de-escape buffer if both
benoit
parents: 5172
diff changeset
1418 bufidx = h->nal_unit_type == NAL_DPC ? 1 : 0; // use second escape buffer for inter data
8396
11b1f7762830 Clear FF_INPUT_BUFFER_PADDING_SIZE bytes at the end of NALs in rbsp_buffer.
astrange
parents: 8395
diff changeset
1419 h->rbsp_buffer[bufidx]= av_fast_realloc(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
1420 dst= h->rbsp_buffer[bufidx];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1421
4362
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
1422 if (dst == NULL){
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
1423 return NULL;
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
1424 }
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
1425
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
1426 //printf("decoding esc\n");
8446
489c8d652fff Optimize esc removal code.
michael
parents: 8444
diff changeset
1427 memcpy(dst, src, i);
489c8d652fff Optimize esc removal code.
michael
parents: 8444
diff changeset
1428 si=di=i;
489c8d652fff Optimize esc removal code.
michael
parents: 8444
diff changeset
1429 while(si+2<length){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1430 //remove escapes (very rare 1:2^22)
8446
489c8d652fff Optimize esc removal code.
michael
parents: 8444
diff changeset
1431 if(src[si+2]>3){
489c8d652fff Optimize esc removal code.
michael
parents: 8444
diff changeset
1432 dst[di++]= src[si++];
489c8d652fff Optimize esc removal code.
michael
parents: 8444
diff changeset
1433 dst[di++]= src[si++];
489c8d652fff Optimize esc removal code.
michael
parents: 8444
diff changeset
1434 }else if(src[si]==0 && src[si+1]==0){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1435 if(src[si+2]==3){ //escape
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1436 dst[di++]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1437 dst[di++]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1438 si+=3;
1957
54411768fa38 h264 nal decoding fix by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1956
diff changeset
1439 continue;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1440 }else //next start code
8446
489c8d652fff Optimize esc removal code.
michael
parents: 8444
diff changeset
1441 goto nsc;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1442 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1443
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1444 dst[di++]= src[si++];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1445 }
8446
489c8d652fff Optimize esc removal code.
michael
parents: 8444
diff changeset
1446 while(si<length)
489c8d652fff Optimize esc removal code.
michael
parents: 8444
diff changeset
1447 dst[di++]= src[si++];
489c8d652fff Optimize esc removal code.
michael
parents: 8444
diff changeset
1448 nsc:
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1449
8396
11b1f7762830 Clear FF_INPUT_BUFFER_PADDING_SIZE bytes at the end of NALs in rbsp_buffer.
astrange
parents: 8395
diff changeset
1450 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
1451
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1452 *dst_length= di;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1453 *consumed= si + 1;//+1 for the header
5129
0244bba24b43 misc typo fixes
diego
parents: 5127
diff changeset
1454 //FIXME store exact number of bits in the getbitcontext (it is needed for decoding)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1455 return dst;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1456 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1457
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1458 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1459 * identifies the exact end of the bitstream
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1460 * @return the length of the trailing, or 0 if damaged
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1461 */
6216
michael
parents: 6213
diff changeset
1462 static int decode_rbsp_trailing(H264Context *h, const uint8_t *src){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1463 int v= *src;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1464 int r;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1465
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
1466 tprintf(h->s.avctx, "rbsp trailing %X\n", v);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1467
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1468 for(r=1; r<9; r++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1469 if(v&1) return r;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1470 v>>=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1471 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1472 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1473 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1474
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1475 /**
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
1476 * IDCT transforms the 16 dc values and dequantizes them.
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1477 * @param qp quantization parameter
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1478 */
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1479 static void h264_luma_dc_dequant_idct_c(DCTELEM *block, int qp, int qmul){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1480 #define stride 16
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1481 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1482 int temp[16]; //FIXME check if this is a good idea
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1483 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1484 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1485
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1486 //memset(block, 64, 2*256);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1487 //return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1488 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1489 const int offset= y_offset[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1490 const int z0= block[offset+stride*0] + block[offset+stride*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1491 const int z1= block[offset+stride*0] - block[offset+stride*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1492 const int z2= block[offset+stride*1] - block[offset+stride*5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1493 const int z3= block[offset+stride*1] + block[offset+stride*5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1494
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1495 temp[4*i+0]= z0+z3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1496 temp[4*i+1]= z1+z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1497 temp[4*i+2]= z1-z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1498 temp[4*i+3]= z0-z3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1499 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1500
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1501 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1502 const int offset= x_offset[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1503 const int z0= temp[4*0+i] + temp[4*2+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1504 const int z1= temp[4*0+i] - temp[4*2+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1505 const int z2= temp[4*1+i] - temp[4*3+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1506 const int z3= temp[4*1+i] + temp[4*3+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1507
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
1508 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
1509 block[stride*2 +offset]= ((((z1 + z2)*qmul + 128 ) >> 8));
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1510 block[stride*8 +offset]= ((((z1 - z2)*qmul + 128 ) >> 8));
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1511 block[stride*10+offset]= ((((z0 - z3)*qmul + 128 ) >> 8));
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1512 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1513 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1514
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1515 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1516 /**
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
1517 * DCT transforms the 16 dc values.
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1518 * @param qp quantization parameter ??? FIXME
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1519 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1520 static void h264_luma_dc_dct_c(DCTELEM *block/*, int qp*/){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1521 // const int qmul= dequant_coeff[qp][0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1522 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1523 int temp[16]; //FIXME check if this is a good idea
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1524 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1525 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1526
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1527 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1528 const int offset= y_offset[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1529 const int z0= block[offset+stride*0] + block[offset+stride*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1530 const int z1= block[offset+stride*0] - block[offset+stride*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1531 const int z2= block[offset+stride*1] - block[offset+stride*5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1532 const int z3= block[offset+stride*1] + block[offset+stride*5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1533
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1534 temp[4*i+0]= z0+z3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1535 temp[4*i+1]= z1+z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1536 temp[4*i+2]= z1-z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1537 temp[4*i+3]= z0-z3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1538 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1539
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1540 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1541 const int offset= x_offset[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1542 const int z0= temp[4*0+i] + temp[4*2+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1543 const int z1= temp[4*0+i] - temp[4*2+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1544 const int z2= temp[4*1+i] - temp[4*3+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1545 const int z3= temp[4*1+i] + temp[4*3+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1546
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1547 block[stride*0 +offset]= (z0 + z3)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1548 block[stride*2 +offset]= (z1 + z2)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1549 block[stride*8 +offset]= (z1 - z2)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1550 block[stride*10+offset]= (z0 - z3)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1551 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1552 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1553 #endif
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1554
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1555 #undef xStride
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1556 #undef stride
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1557
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1558 static void chroma_dc_dequant_idct_c(DCTELEM *block, int qp, int qmul){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1559 const int stride= 16*2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1560 const int xStride= 16;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1561 int a,b,c,d,e;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1562
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1563 a= block[stride*0 + xStride*0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1564 b= block[stride*0 + xStride*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1565 c= block[stride*1 + xStride*0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1566 d= block[stride*1 + xStride*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1567
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1568 e= a-b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1569 a= a+b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1570 b= c-d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1571 c= c+d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1572
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1573 block[stride*0 + xStride*0]= ((a+c)*qmul) >> 7;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1574 block[stride*0 + xStride*1]= ((e+b)*qmul) >> 7;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1575 block[stride*1 + xStride*0]= ((a-c)*qmul) >> 7;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1576 block[stride*1 + xStride*1]= ((e-b)*qmul) >> 7;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1577 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1578
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1579 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1580 static void chroma_dc_dct_c(DCTELEM *block){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1581 const int stride= 16*2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1582 const int xStride= 16;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1583 int a,b,c,d,e;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1584
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1585 a= block[stride*0 + xStride*0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1586 b= block[stride*0 + xStride*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1587 c= block[stride*1 + xStride*0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1588 d= block[stride*1 + xStride*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1589
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1590 e= a-b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1591 a= a+b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1592 b= c-d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1593 c= c+d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1594
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1595 block[stride*0 + xStride*0]= (a+c);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1596 block[stride*0 + xStride*1]= (e+b);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1597 block[stride*1 + xStride*0]= (a-c);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1598 block[stride*1 + xStride*1]= (e-b);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1599 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1600 #endif
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1601
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1602 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1603 * gets the chroma qp.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1604 */
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
1605 static inline int get_chroma_qp(H264Context *h, int t, int qscale){
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
1606 return h->pps.chroma_qp_table[t][qscale];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1607 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1608
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1609 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
1610 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1611 int src_x_offset, int src_y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1612 qpel_mc_func *qpix_op, h264_chroma_mc_func chroma_op){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1613 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1614 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
1615 int my= h->mv_cache[list][ scan8[n] ][1] + src_y_offset*8;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1616 const int luma_xy= (mx&3) + ((my&3)<<2);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1617 uint8_t * src_y = pic->data[0] + (mx>>2) + (my>>2)*h->mb_linesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1618 uint8_t * src_cb, * src_cr;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1619 int extra_width= h->emu_edge_width;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1620 int extra_height= h->emu_edge_height;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1621 int emu=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1622 const int full_mx= mx>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1623 const int full_my= my>>2;
2861
3b920e274b26 fix emulated edge motion compensation when resolution%16!=0
lorenm
parents: 2846
diff changeset
1624 const int pic_width = 16*s->mb_width;
5815
fb293531e983 Simplify tests for field macroblocks
andoma
parents: 5812
diff changeset
1625 const int pic_height = 16*s->mb_height >> MB_FIELD;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1626
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1627 if(mx&7) extra_width -= 3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1628 if(my&7) extra_height -= 3;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1629
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1630 if( full_mx < 0-extra_width
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1631 || full_my < 0-extra_height
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1632 || full_mx + 16/*FIXME*/ > pic_width + extra_width
2861
3b920e274b26 fix emulated edge motion compensation when resolution%16!=0
lorenm
parents: 2846
diff changeset
1633 || full_my + 16/*FIXME*/ > pic_height + extra_height){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1634 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
1635 src_y= s->edge_emu_buffer + 2 + 2*h->mb_linesize;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1636 emu=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1637 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1638
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1639 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
1640 if(!square){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1641 qpix_op[luma_xy](dest_y + delta, src_y + delta, h->mb_linesize);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1642 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1643
5434
4f2e3ef72b32 use ENABLE_GRAY
michael
parents: 5425
diff changeset
1644 if(ENABLE_GRAY && s->flags&CODEC_FLAG_GRAY) return;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1645
5815
fb293531e983 Simplify tests for field macroblocks
andoma
parents: 5812
diff changeset
1646 if(MB_FIELD){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1647 // 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
1648 my += 2 * ((s->mb_y & 1) - (pic->reference - 1));
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1649 emu |= (my>>3) < 0 || (my>>3) + 8 >= (pic_height>>1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1650 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1651 src_cb= pic->data[1] + (mx>>3) + (my>>3)*h->mb_uvlinesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1652 src_cr= pic->data[2] + (mx>>3) + (my>>3)*h->mb_uvlinesize;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1653
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1654 if(emu){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1655 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
1656 src_cb= s->edge_emu_buffer;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1657 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1658 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
1659
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1660 if(emu){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1661 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
1662 src_cr= s->edge_emu_buffer;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1663 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1664 chroma_op(dest_cr, src_cr, h->mb_uvlinesize, chroma_height, mx&7, my&7);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1665 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1666
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1667 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
1668 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1669 int x_offset, int y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1670 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1671 qpel_mc_func *qpix_avg, h264_chroma_mc_func chroma_avg,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1672 int list0, int list1){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1673 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1674 qpel_mc_func *qpix_op= qpix_put;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1675 h264_chroma_mc_func chroma_op= chroma_put;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1676
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1677 dest_y += 2*x_offset + 2*y_offset*h-> mb_linesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1678 dest_cb += x_offset + y_offset*h->mb_uvlinesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1679 dest_cr += x_offset + y_offset*h->mb_uvlinesize;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1680 x_offset += 8*s->mb_x;
5815
fb293531e983 Simplify tests for field macroblocks
andoma
parents: 5812
diff changeset
1681 y_offset += 8*(s->mb_y >> MB_FIELD);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1682
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1683 if(list0){
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1684 Picture *ref= &h->ref_list[0][ h->ref_cache[0][ scan8[n] ] ];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1685 mc_dir_part(h, ref, n, square, chroma_height, delta, 0,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1686 dest_y, dest_cb, dest_cr, x_offset, y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1687 qpix_op, chroma_op);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1688
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1689 qpix_op= qpix_avg;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1690 chroma_op= chroma_avg;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1691 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1692
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1693 if(list1){
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1694 Picture *ref= &h->ref_list[1][ h->ref_cache[1][ scan8[n] ] ];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1695 mc_dir_part(h, ref, n, square, chroma_height, delta, 1,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1696 dest_y, dest_cb, dest_cr, x_offset, y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1697 qpix_op, chroma_op);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1698 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1699 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1700
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1701 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
1702 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1703 int x_offset, int y_offset,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1704 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1705 h264_weight_func luma_weight_op, h264_weight_func chroma_weight_op,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1706 h264_biweight_func luma_weight_avg, h264_biweight_func chroma_weight_avg,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1707 int list0, int list1){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1708 MpegEncContext * const s = &h->s;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1709
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1710 dest_y += 2*x_offset + 2*y_offset*h-> mb_linesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1711 dest_cb += x_offset + y_offset*h->mb_uvlinesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1712 dest_cr += x_offset + y_offset*h->mb_uvlinesize;
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1713 x_offset += 8*s->mb_x;
5815
fb293531e983 Simplify tests for field macroblocks
andoma
parents: 5812
diff changeset
1714 y_offset += 8*(s->mb_y >> MB_FIELD);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1715
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1716 if(list0 && list1){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1717 /* don't optimize for luma-only case, since B-frames usually
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1718 * use implicit weights => chroma too. */
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1719 uint8_t *tmp_cb = s->obmc_scratchpad;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1720 uint8_t *tmp_cr = s->obmc_scratchpad + 8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1721 uint8_t *tmp_y = s->obmc_scratchpad + 8*h->mb_uvlinesize;
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1722 int refn0 = h->ref_cache[0][ scan8[n] ];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1723 int refn1 = h->ref_cache[1][ scan8[n] ];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1724
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1725 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
1726 dest_y, dest_cb, dest_cr,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1727 x_offset, y_offset, qpix_put, chroma_put);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1728 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
1729 tmp_y, tmp_cb, tmp_cr,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1730 x_offset, y_offset, qpix_put, chroma_put);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1731
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1732 if(h->use_weight == 2){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1733 int weight0 = h->implicit_weight[refn0][refn1];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1734 int weight1 = 64 - weight0;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1735 luma_weight_avg( dest_y, tmp_y, h-> mb_linesize, 5, weight0, weight1, 0);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1736 chroma_weight_avg(dest_cb, tmp_cb, h->mb_uvlinesize, 5, weight0, weight1, 0);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1737 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
1738 }else{
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1739 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
1740 h->luma_weight[0][refn0], h->luma_weight[1][refn1],
3029
7a92269a3ccd tweak h264_biweight
lorenm
parents: 3028
diff changeset
1741 h->luma_offset[0][refn0] + h->luma_offset[1][refn1]);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1742 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
1743 h->chroma_weight[0][refn0][0], h->chroma_weight[1][refn1][0],
3029
7a92269a3ccd tweak h264_biweight
lorenm
parents: 3028
diff changeset
1744 h->chroma_offset[0][refn0][0] + h->chroma_offset[1][refn1][0]);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1745 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
1746 h->chroma_weight[0][refn0][1], h->chroma_weight[1][refn1][1],
3029
7a92269a3ccd tweak h264_biweight
lorenm
parents: 3028
diff changeset
1747 h->chroma_offset[0][refn0][1] + h->chroma_offset[1][refn1][1]);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1748 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1749 }else{
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1750 int list = list1 ? 1 : 0;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1751 int refn = h->ref_cache[list][ scan8[n] ];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1752 Picture *ref= &h->ref_list[list][refn];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1753 mc_dir_part(h, ref, n, square, chroma_height, delta, list,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1754 dest_y, dest_cb, dest_cr, x_offset, y_offset,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1755 qpix_put, chroma_put);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1756
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1757 luma_weight_op(dest_y, h->mb_linesize, h->luma_log2_weight_denom,
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1758 h->luma_weight[list][refn], h->luma_offset[list][refn]);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1759 if(h->use_weight_chroma){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1760 chroma_weight_op(dest_cb, h->mb_uvlinesize, h->chroma_log2_weight_denom,
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1761 h->chroma_weight[list][refn][0], h->chroma_offset[list][refn][0]);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1762 chroma_weight_op(dest_cr, h->mb_uvlinesize, h->chroma_log2_weight_denom,
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1763 h->chroma_weight[list][refn][1], h->chroma_offset[list][refn][1]);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1764 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1765 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1766 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1767
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1768 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
1769 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1770 int x_offset, int y_offset,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1771 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1772 qpel_mc_func *qpix_avg, h264_chroma_mc_func chroma_avg,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1773 h264_weight_func *weight_op, h264_biweight_func *weight_avg,
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1774 int list0, int list1){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1775 if((h->use_weight==2 && list0 && list1
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1776 && (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
1777 || h->use_weight==1)
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1778 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
1779 x_offset, y_offset, qpix_put, chroma_put,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1780 weight_op[0], weight_op[3], weight_avg[0], weight_avg[3], list0, list1);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1781 else
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1782 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
1783 x_offset, y_offset, qpix_put, chroma_put, qpix_avg, chroma_avg, list0, list1);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1784 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1785
3215
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1786 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
1787 /* fetch pixels for estimated mv 4 macroblocks ahead
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1788 * optimized for 64byte cache lines */
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1789 MpegEncContext * const s = &h->s;
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1790 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
1791 if(refn >= 0){
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1792 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
1793 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
1794 uint8_t **src= h->ref_list[list][refn].data;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1795 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
1796 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
1797 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
1798 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
1799 }
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1800 }
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1801
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1802 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
1803 qpel_mc_func (*qpix_put)[16], h264_chroma_mc_func (*chroma_put),
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1804 qpel_mc_func (*qpix_avg)[16], h264_chroma_mc_func (*chroma_avg),
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1805 h264_weight_func *weight_op, h264_biweight_func *weight_avg){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1806 MpegEncContext * const s = &h->s;
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
1807 const int mb_xy= h->mb_xy;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1808 const int mb_type= s->current_picture.mb_type[mb_xy];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1809
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1810 assert(IS_INTER(mb_type));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1811
3215
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1812 prefetch_motion(h, 0);
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1813
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1814 if(IS_16X16(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1815 mc_part(h, 0, 1, 8, 0, dest_y, dest_cb, dest_cr, 0, 0,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1816 qpix_put[0], chroma_put[0], qpix_avg[0], chroma_avg[0],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1817 &weight_op[0], &weight_avg[0],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1818 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1819 }else if(IS_16X8(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1820 mc_part(h, 0, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 0,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1821 qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1822 &weight_op[1], &weight_avg[1],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1823 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1824 mc_part(h, 8, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 4,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1825 qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1826 &weight_op[1], &weight_avg[1],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1827 IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1828 }else if(IS_8X16(mb_type)){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1829 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
1830 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1831 &weight_op[2], &weight_avg[2],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1832 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1));
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1833 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
1834 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1835 &weight_op[2], &weight_avg[2],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1836 IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1837 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1838 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1839
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1840 assert(IS_8X8(mb_type));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1841
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1842 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1843 const int sub_mb_type= h->sub_mb_type[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1844 const int n= 4*i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1845 int x_offset= (i&1)<<2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1846 int y_offset= (i&2)<<1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1847
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1848 if(IS_SUB_8X8(sub_mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1849 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
1850 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1851 &weight_op[3], &weight_avg[3],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1852 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1853 }else if(IS_SUB_8X4(sub_mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1854 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
1855 qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1856 &weight_op[4], &weight_avg[4],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1857 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1858 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
1859 qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1860 &weight_op[4], &weight_avg[4],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1861 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1862 }else if(IS_SUB_4X8(sub_mb_type)){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1863 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
1864 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1865 &weight_op[5], &weight_avg[5],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1866 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
1867 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
1868 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1869 &weight_op[5], &weight_avg[5],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1870 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1871 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1872 int j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1873 assert(IS_SUB_4X4(sub_mb_type));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1874 for(j=0; j<4; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1875 int sub_x_offset= x_offset + 2*(j&1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1876 int sub_y_offset= y_offset + (j&2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1877 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
1878 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1879 &weight_op[6], &weight_avg[6],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1880 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1881 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1882 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1883 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1884 }
3215
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1885
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1886 prefetch_motion(h, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1887 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1888
8443
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1889 static av_cold void init_cavlc_level_tab(void){
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1890 int suffix_length, mask;
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1891 unsigned int i;
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1892
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1893 for(suffix_length=0; suffix_length<7; suffix_length++){
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1894 for(i=0; i<(1<<LEVEL_TAB_BITS); i++){
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1895 int prefix= LEVEL_TAB_BITS - av_log2(2*i);
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1896 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
1897
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1898 mask= -(level_code&1);
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1899 level_code= (((2+level_code)>>1) ^ mask) - mask;
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1900 if(prefix + 1 + suffix_length <= LEVEL_TAB_BITS){
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1901 cavlc_level_tab[suffix_length][i][0]= level_code;
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1902 cavlc_level_tab[suffix_length][i][1]= prefix + 1 + suffix_length;
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1903 }else if(prefix + 1 <= LEVEL_TAB_BITS){
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1904 cavlc_level_tab[suffix_length][i][0]= prefix+100;
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1905 cavlc_level_tab[suffix_length][i][1]= prefix + 1;
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1906 }else{
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1907 cavlc_level_tab[suffix_length][i][0]= LEVEL_TAB_BITS+100;
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1908 cavlc_level_tab[suffix_length][i][1]= LEVEL_TAB_BITS;
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1909 }
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1910 }
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1911 }
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1912 }
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1913
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6490
diff changeset
1914 static av_cold void decode_init_vlc(void){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1915 static int done = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1916
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1917 if (!done) {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1918 int i;
7481
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1919 int offset;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1920 done = 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1921
7481
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1922 chroma_dc_coeff_token_vlc.table = chroma_dc_coeff_token_vlc_table;
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1923 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
1924 init_vlc(&chroma_dc_coeff_token_vlc, CHROMA_DC_COEFF_TOKEN_VLC_BITS, 4*5,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1925 &chroma_dc_coeff_token_len [0], 1, 1,
7481
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1926 &chroma_dc_coeff_token_bits[0], 1, 1,
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1927 INIT_VLC_USE_NEW_STATIC);
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1928
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1929 offset = 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1930 for(i=0; i<4; i++){
7481
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1931 coeff_token_vlc[i].table = coeff_token_vlc_tables+offset;
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1932 coeff_token_vlc[i].table_allocated = coeff_token_vlc_tables_size[i];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1933 init_vlc(&coeff_token_vlc[i], COEFF_TOKEN_VLC_BITS, 4*17,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1934 &coeff_token_len [i][0], 1, 1,
7481
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1935 &coeff_token_bits[i][0], 1, 1,
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1936 INIT_VLC_USE_NEW_STATIC);
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1937 offset += coeff_token_vlc_tables_size[i];
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1938 }
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1939 /*
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1940 * This is a one time safety check to make sure that
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1941 * the packed static coeff_token_vlc table sizes
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1942 * were initialized correctly.
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1943 */
8042
e70975d5ff80 uses FF_ARRAY_ELEMS() where appropriate
aurel
parents: 7993
diff changeset
1944 assert(offset == FF_ARRAY_ELEMS(coeff_token_vlc_tables));
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1945
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1946 for(i=0; i<3; i++){
7481
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1947 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
1948 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
1949 init_vlc(&chroma_dc_total_zeros_vlc[i],
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1950 CHROMA_DC_TOTAL_ZEROS_VLC_BITS, 4,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1951 &chroma_dc_total_zeros_len [i][0], 1, 1,
7481
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1952 &chroma_dc_total_zeros_bits[i][0], 1, 1,
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1953 INIT_VLC_USE_NEW_STATIC);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1954 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1955 for(i=0; i<15; i++){
7481
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1956 total_zeros_vlc[i].table = total_zeros_vlc_tables[i];
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1957 total_zeros_vlc[i].table_allocated = total_zeros_vlc_tables_size;
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1958 init_vlc(&total_zeros_vlc[i],
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1959 TOTAL_ZEROS_VLC_BITS, 16,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1960 &total_zeros_len [i][0], 1, 1,
7481
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1961 &total_zeros_bits[i][0], 1, 1,
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1962 INIT_VLC_USE_NEW_STATIC);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1963 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1964
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1965 for(i=0; i<6; i++){
7481
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1966 run_vlc[i].table = run_vlc_tables[i];
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1967 run_vlc[i].table_allocated = run_vlc_tables_size;
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1968 init_vlc(&run_vlc[i],
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1969 RUN_VLC_BITS, 7,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1970 &run_len [i][0], 1, 1,
7481
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1971 &run_bits[i][0], 1, 1,
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1972 INIT_VLC_USE_NEW_STATIC);
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1973 }
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1974 run7_vlc.table = run7_vlc_table,
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1975 run7_vlc.table_allocated = run7_vlc_table_size;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1976 init_vlc(&run7_vlc, RUN7_VLC_BITS, 16,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1977 &run_len [6][0], 1, 1,
7481
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1978 &run_bits[6][0], 1, 1,
ca205cc57734 Fix static leaks in h264.c.
cehoyos
parents: 7480
diff changeset
1979 INIT_VLC_USE_NEW_STATIC);
8443
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1980
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
1981 init_cavlc_level_tab();
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1982 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1983 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1984
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1985 static void free_tables(H264Context *h){
5079
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
1986 int i;
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1987 H264Context *hx;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1988 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
1989 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
1990 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
1991 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
1992 av_freep(&h->mvd_table[1]);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1993 av_freep(&h->direct_table);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1994 av_freep(&h->non_zero_count);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1995 av_freep(&h->slice_table_base);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1996 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
1997
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1998 av_freep(&h->mb2b_xy);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1999 av_freep(&h->mb2b8_xy);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2000
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2001 for(i = 0; i < h->s.avctx->thread_count; i++) {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2002 hx = h->thread_context[i];
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2003 if(!hx) continue;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2004 av_freep(&hx->top_borders[1]);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2005 av_freep(&hx->top_borders[0]);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2006 av_freep(&hx->s.obmc_scratchpad);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2007 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2008 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2009
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2010 static void init_dequant8_coeff_table(H264Context *h){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2011 int i,q,x;
3174
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
2012 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
2013 h->dequant8_coeff[0] = h->dequant8_buffer[0];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2014 h->dequant8_coeff[1] = h->dequant8_buffer[1];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2015
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2016 for(i=0; i<2; i++ ){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2017 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
2018 h->dequant8_coeff[1] = h->dequant8_buffer[0];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2019 break;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2020 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2021
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2022 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
2023 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
2024 int idx = rem6[q];
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2025 for(x=0; x<64; x++)
3174
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
2026 h->dequant8_coeff[i][q][transpose ? (x>>3)|((x&7)<<3) : x] =
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
2027 ((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
2028 h->pps.scaling_matrix8[i][x]) << shift;
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2029 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2030 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2031 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2032
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2033 static void init_dequant4_coeff_table(H264Context *h){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2034 int i,j,q,x;
3005
6f6f307cffac fix asymmetric CQMs with pre-transposed DCT.
lorenm
parents: 3004
diff changeset
2035 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
2036 for(i=0; i<6; i++ ){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2037 h->dequant4_coeff[i] = h->dequant4_buffer[i];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2038 for(j=0; j<i; j++){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2039 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
2040 h->dequant4_coeff[i] = h->dequant4_buffer[j];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2041 break;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2042 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2043 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2044 if(j<i)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2045 continue;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2046
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2047 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
2048 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
2049 int idx = rem6[q];
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2050 for(x=0; x<16; x++)
3005
6f6f307cffac fix asymmetric CQMs with pre-transposed DCT.
lorenm
parents: 3004
diff changeset
2051 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
2052 ((uint32_t)dequant4_coeff_init[idx][(x&1) + ((x>>2)&1)] *
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2053 h->pps.scaling_matrix4[i][x]) << shift;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2054 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2055 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2056 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2057
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2058 static void init_dequant_tables(H264Context *h){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2059 int i,x;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2060 init_dequant4_coeff_table(h);
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2061 if(h->pps.transform_8x8_mode)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2062 init_dequant8_coeff_table(h);
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2063 if(h->sps.transform_bypass){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2064 for(i=0; i<6; i++)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2065 for(x=0; x<16; x++)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2066 h->dequant4_coeff[i][0][x] = 1<<6;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2067 if(h->pps.transform_8x8_mode)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2068 for(i=0; i<2; i++)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2069 for(x=0; x<64; x++)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2070 h->dequant8_coeff[i][0][x] = 1<<6;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2071 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2072 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2073
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2074
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2075 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2076 * allocates tables.
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
2077 * needs width/height
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2078 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2079 static int alloc_tables(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2080 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
2081 const int big_mb_num= s->mb_stride * (s->mb_height+1);
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2082 int x,y;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2083
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2084 CHECKED_ALLOCZ(h->intra4x4_pred_mode, big_mb_num * 8 * sizeof(uint8_t))
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2085
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2086 CHECKED_ALLOCZ(h->non_zero_count , big_mb_num * 16 * sizeof(uint8_t))
8079
2d3c7cd7d143 Replace literally hardcoded max slice number by named constant.
michael
parents: 8042
diff changeset
2087 CHECKED_ALLOCZ(h->slice_table_base , (big_mb_num+s->mb_stride) * sizeof(*h->slice_table_base))
2336
9cd834fc7325 segfault fix
michael
parents: 2317
diff changeset
2088 CHECKED_ALLOCZ(h->cbp_table, big_mb_num * sizeof(uint16_t))
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2089
6213
b26ccd688817 Indention, it seems i have forgotton to commit this.
michael
parents: 6203
diff changeset
2090 CHECKED_ALLOCZ(h->chroma_pred_mode_table, big_mb_num * sizeof(uint8_t))
b26ccd688817 Indention, it seems i have forgotton to commit this.
michael
parents: 6203
diff changeset
2091 CHECKED_ALLOCZ(h->mvd_table[0], 32*big_mb_num * sizeof(uint16_t));
b26ccd688817 Indention, it seems i have forgotton to commit this.
michael
parents: 6203
diff changeset
2092 CHECKED_ALLOCZ(h->mvd_table[1], 32*big_mb_num * sizeof(uint16_t));
b26ccd688817 Indention, it seems i have forgotton to commit this.
michael
parents: 6203
diff changeset
2093 CHECKED_ALLOCZ(h->direct_table, 32*big_mb_num * sizeof(uint8_t));
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2094
8079
2d3c7cd7d143 Replace literally hardcoded max slice number by named constant.
michael
parents: 8042
diff changeset
2095 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
2096 h->slice_table= h->slice_table_base + s->mb_stride*2 + 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2097
2641
c337f851d0f9 fix storage of motion vectors for frames with more than 4096 macroblocks.
lorenm
parents: 2640
diff changeset
2098 CHECKED_ALLOCZ(h->mb2b_xy , big_mb_num * sizeof(uint32_t));
c337f851d0f9 fix storage of motion vectors for frames with more than 4096 macroblocks.
lorenm
parents: 2640
diff changeset
2099 CHECKED_ALLOCZ(h->mb2b8_xy , big_mb_num * sizeof(uint32_t));
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2100 for(y=0; y<s->mb_height; y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2101 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
2102 const int mb_xy= x + y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2103 const int b_xy = 4*x + 4*y*h->b_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2104 const int b8_xy= 2*x + 2*y*h->b8_stride;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2105
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2106 h->mb2b_xy [mb_xy]= b_xy;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2107 h->mb2b8_xy[mb_xy]= b8_xy;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2108 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2109 }
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2110
2417
991f39305057 10l (obmc_scratchpad not always initialize)
lorenm
parents: 2416
diff changeset
2111 s->obmc_scratchpad = NULL;
991f39305057 10l (obmc_scratchpad not always initialize)
lorenm
parents: 2416
diff changeset
2112
2920
1443b4d3f4ab 10l: cqm weren't initialized in svq3.
lorenm
parents: 2919
diff changeset
2113 if(!h->dequant4_coeff[0])
1443b4d3f4ab 10l: cqm weren't initialized in svq3.
lorenm
parents: 2919
diff changeset
2114 init_dequant_tables(h);
1443b4d3f4ab 10l: cqm weren't initialized in svq3.
lorenm
parents: 2919
diff changeset
2115
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2116 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2117 fail:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2118 free_tables(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2119 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2120 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2121
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2122 /**
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2123 * Mimic alloc_tables(), but for every context thread.
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2124 */
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2125 static void clone_tables(H264Context *dst, H264Context *src){
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2126 dst->intra4x4_pred_mode = src->intra4x4_pred_mode;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2127 dst->non_zero_count = src->non_zero_count;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2128 dst->slice_table = src->slice_table;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2129 dst->cbp_table = src->cbp_table;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2130 dst->mb2b_xy = src->mb2b_xy;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2131 dst->mb2b8_xy = src->mb2b8_xy;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2132 dst->chroma_pred_mode_table = src->chroma_pred_mode_table;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2133 dst->mvd_table[0] = src->mvd_table[0];
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2134 dst->mvd_table[1] = src->mvd_table[1];
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2135 dst->direct_table = src->direct_table;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2136
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2137 dst->s.obmc_scratchpad = NULL;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2138 ff_h264_pred_init(&dst->hpc, src->s.codec_id);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2139 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2140
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2141 /**
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2142 * Init context
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2143 * Allocate buffers which are not shared amongst multiple threads.
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2144 */
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2145 static int context_init(H264Context *h){
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2146 CHECKED_ALLOCZ(h->top_borders[0], h->s.mb_width * (16+8+8) * sizeof(uint8_t))
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2147 CHECKED_ALLOCZ(h->top_borders[1], h->s.mb_width * (16+8+8) * sizeof(uint8_t))
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2148
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2149 return 0;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2150 fail:
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2151 return -1; // free_tables will clean up for us
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2152 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2153
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6490
diff changeset
2154 static av_cold void common_init(H264Context *h){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2155 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2156
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2157 s->width = s->avctx->width;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2158 s->height = s->avctx->height;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2159 s->codec_id= s->avctx->codec->id;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2160
5638
4a26dc4ca11d Move H.264 intra prediction functions into their own context
kostya
parents: 5631
diff changeset
2161 ff_h264_pred_init(&h->hpc, s->codec_id);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2162
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2163 h->dequant_coeff_pps= -1;
1698
420cac032278 svq3 fix
michael
parents: 1636
diff changeset
2164 s->unrestricted_mv=1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2165 s->decode=1; //FIXME
2920
1443b4d3f4ab 10l: cqm weren't initialized in svq3.
lorenm
parents: 2919
diff changeset
2166
8402
0199857f9000 Fix decoding with the plain C idcts of
michael
parents: 8399
diff changeset
2167 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
2168
2920
1443b4d3f4ab 10l: cqm weren't initialized in svq3.
lorenm
parents: 2919
diff changeset
2169 memset(h->pps.scaling_matrix4, 16, 6*16*sizeof(uint8_t));
1443b4d3f4ab 10l: cqm weren't initialized in svq3.
lorenm
parents: 2919
diff changeset
2170 memset(h->pps.scaling_matrix8, 16, 2*64*sizeof(uint8_t));
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2171 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2172
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6490
diff changeset
2173 static av_cold int decode_init(AVCodecContext *avctx){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2174 H264Context *h= avctx->priv_data;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2175 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2176
1892
5ac49e7a1b8f init cleanup
michael
parents: 1786
diff changeset
2177 MPV_decode_defaults(s);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2178
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2179 s->avctx = avctx;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2180 common_init(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2181
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2182 s->out_format = FMT_H264;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2183 s->workaround_bugs= avctx->workaround_bugs;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2184
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2185 // set defaults
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2186 // 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
2187 s->quarter_sample = 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2188 s->low_delay= 1;
7289
1595c063d68d SVQ3 uses the JPEG variant of YUV 4:2:0.
michael
parents: 7283
diff changeset
2189
1595c063d68d SVQ3 uses the JPEG variant of YUV 4:2:0.
michael
parents: 7283
diff changeset
2190 if(avctx->codec_id == CODEC_ID_SVQ3)
1595c063d68d SVQ3 uses the JPEG variant of YUV 4:2:0.
michael
parents: 7283
diff changeset
2191 avctx->pix_fmt= PIX_FMT_YUVJ420P;
8522
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
2192 else if(avctx->codec_id == CODEC_ID_H264_VDPAU)
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
2193 avctx->pix_fmt= PIX_FMT_VDPAU_H264;
7289
1595c063d68d SVQ3 uses the JPEG variant of YUV 4:2:0.
michael
parents: 7283
diff changeset
2194 else
7290
michael
parents: 7289
diff changeset
2195 avctx->pix_fmt= PIX_FMT_YUV420P;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2196
4164
171e768324cd Remove the H264Context parameter from decode_init_vlc() as it is not being used.
takis
parents: 4118
diff changeset
2197 decode_init_vlc();
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2198
2547
c5781912ad8a improved detection of "AVC1" style H.264 patch by (Mns Rullgrd <mru inprovide com>)
michael
parents: 2538
diff changeset
2199 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
2200 *(char *)avctx->extradata == 1){
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2201 h->is_avc = 1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2202 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
2203 } else {
c5781912ad8a improved detection of "AVC1" style H.264 patch by (Mns Rullgrd <mru inprovide com>)
michael
parents: 2538
diff changeset
2204 h->is_avc = 0;
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2205 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2206
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2207 h->thread_context[0] = h;
7424
69766900be2d Initialize outputed_poc to INT_MIN at decoder initialization.
heydowns
parents: 7423
diff changeset
2208 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
2209 h->prev_poc_msb= 1<<16;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2210 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2211 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2212
2935
b564bb15e63c check MPV_frame_start() return value
michael
parents: 2928
diff changeset
2213 static int frame_start(H264Context *h){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2214 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2215 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2216
2935
b564bb15e63c check MPV_frame_start() return value
michael
parents: 2928
diff changeset
2217 if(MPV_frame_start(s, s->avctx) < 0)
b564bb15e63c check MPV_frame_start() return value
michael
parents: 2928
diff changeset
2218 return -1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2219 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
2220 /*
e3d7a78e2df3 Fix Picture.key_frame setting to be compatible with frame and field contexts. Part of PAFF implementation.
andoma
parents: 5772
diff changeset
2221 * 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
2222 * This is incorrect for H.264; IDR markings must be used.
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
2223 * 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
2224 * 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
2225 */
e3d7a78e2df3 Fix Picture.key_frame setting to be compatible with frame and field contexts. Part of PAFF implementation.
andoma
parents: 5772
diff changeset
2226 s->current_picture_ptr->key_frame= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2227
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2228 assert(s->linesize && s->uvlinesize);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2229
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2230 for(i=0; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2231 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
2232 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
2233 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2234 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2235 h->block_offset[16+i]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2236 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
2237 h->block_offset[24+16+i]=
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2238 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
2239 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2240
2416
06b7d678b582 10l: scratchpad could be allocated before its size was known.
lorenm
parents: 2415
diff changeset
2241 /* 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
2242 * FIXME: redo bipred weight to not require extra buffer? */
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2243 for(i = 0; i < s->avctx->thread_count; i++)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2244 if(!h->thread_context[i]->s.obmc_scratchpad)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2245 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
2246
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2247 /* some macroblocks will be accessed before they're available */
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2248 if(FRAME_MBAFF || s->avctx->thread_count > 1)
8079
2d3c7cd7d143 Replace literally hardcoded max slice number by named constant.
michael
parents: 8042
diff changeset
2249 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
2250
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2251 // 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
2252
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
2253 // 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
2254 // 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
2255 // in the next MPV_frame_start().
cd231f79c52b Try to fix my latest 100l fate SVQ3 breakage.
michael
parents: 7317
diff changeset
2256 // 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
2257 // 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
2258 // mark frames as reference later "naturally".
cd231f79c52b Try to fix my latest 100l fate SVQ3 breakage.
michael
parents: 7317
diff changeset
2259 if(s->codec_id != CODEC_ID_SVQ3)
cd231f79c52b Try to fix my latest 100l fate SVQ3 breakage.
michael
parents: 7317
diff changeset
2260 s->current_picture_ptr->reference= 0;
7382
f9e70983fc35 Set field_poc (it was half uninitialized before) and use it
michael
parents: 7381
diff changeset
2261
f9e70983fc35 Set field_poc (it was half uninitialized before) and use it
michael
parents: 7381
diff changeset
2262 s->current_picture_ptr->field_poc[0]=
f9e70983fc35 Set field_poc (it was half uninitialized before) and use it
michael
parents: 7381
diff changeset
2263 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
2264 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
2265
2935
b564bb15e63c check MPV_frame_start() return value
michael
parents: 2928
diff changeset
2266 return 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2267 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2268
5106
ddb5abe164f3 h264: use 'simple' in border backup / xchg
benoit
parents: 5093
diff changeset
2269 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
2270 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
2271 int i;
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2272 int step = 1;
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2273 int offset = 1;
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2274 int uvoffset= 1;
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2275 int top_idx = 1;
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2276 int skiplast= 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2277
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2278 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
2279 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
2280 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
2281
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2282 if(!simple && FRAME_MBAFF){
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2283 if(s->mb_y&1){
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2284 offset = MB_MBAFF ? 1 : 17;
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2285 uvoffset= MB_MBAFF ? 1 : 9;
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2286 if(!MB_MBAFF){
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2287 *(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
2288 *(uint64_t*)(h->top_borders[0][s->mb_x]+ 8)= *(uint64_t*)(src_y +8+15*linesize);
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2289 if(simple || !ENABLE_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2290 *(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
2291 *(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
2292 }
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2293 }
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2294 }else{
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2295 if(!MB_MBAFF){
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2296 h->left_border[0]= h->top_borders[0][s->mb_x][15];
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2297 if(simple || !ENABLE_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2298 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
2299 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
2300 }
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2301 skiplast= 1;
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2302 }
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2303 offset =
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2304 uvoffset=
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2305 top_idx = MB_MBAFF ? 0 : 1;
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2306 }
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2307 step= MB_MBAFF ? 2 : 1;
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2308 }
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2309
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
2310 // 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
2311 // and the line above the bottom macroblock
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2312 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
2313 for(i=1; i<17 - skiplast; i++){
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2314 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
2315 }
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2316
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2317 *(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
2318 *(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
2319
5434
4f2e3ef72b32 use ENABLE_GRAY
michael
parents: 5425
diff changeset
2320 if(simple || !ENABLE_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2321 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
2322 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
2323 for(i=1; i<9 - skiplast; i++){
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2324 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
2325 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
2326 }
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2327 *(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
2328 *(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
2329 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2330 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2331
5106
ddb5abe164f3 h264: use 'simple' in border backup / xchg
benoit
parents: 5093
diff changeset
2332 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
2333 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
2334 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
2335 uint64_t temp64;
5177
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2336 int deblock_left;
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2337 int deblock_top;
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2338 int mb_xy;
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2339 int step = 1;
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2340 int offset = 1;
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2341 int uvoffset= 1;
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2342 int top_idx = 1;
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2343
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2344 if(!simple && FRAME_MBAFF){
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2345 if(s->mb_y&1){
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2346 offset = MB_MBAFF ? 1 : 17;
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2347 uvoffset= MB_MBAFF ? 1 : 9;
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2348 }else{
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2349 offset =
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2350 uvoffset=
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2351 top_idx = MB_MBAFF ? 0 : 1;
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2352 }
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2353 step= MB_MBAFF ? 2 : 1;
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2354 }
5177
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2355
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2356 if(h->deblocking_filter == 2) {
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
2357 mb_xy = h->mb_xy;
5177
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2358 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
2359 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
2360 } else {
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2361 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
2362 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
2363 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2364
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2365 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
2366 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
2367 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
2368
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2369 #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
2370 t= a;\
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2371 if(xchg)\
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2372 a= b;\
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2373 b= t;
2200
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2374
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2375 if(deblock_left){
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2376 for(i = !deblock_top; i<16; i++){
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2377 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
2378 }
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2379 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
2380 }
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2381
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2382 if(deblock_top){
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2383 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
2384 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
2385 if(s->mb_x+1 < s->mb_width){
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2386 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
2387 }
2200
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2388 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2389
5434
4f2e3ef72b32 use ENABLE_GRAY
michael
parents: 5425
diff changeset
2390 if(simple || !ENABLE_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
2200
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2391 if(deblock_left){
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2392 for(i = !deblock_top; i<8; i++){
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2393 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
2394 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
2395 }
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2396 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
2397 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
2398 }
2200
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2399 if(deblock_top){
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2400 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
2401 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
2402 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2403 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2404 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2405
4908
777f250df232 Fix multiple "inline/static is not at beginning of declaration" warnings.
diego
parents: 4896
diff changeset
2406 static av_always_inline void hl_decode_mb_internal(H264Context *h, int simple){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2407 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2408 const int mb_x= s->mb_x;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2409 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
2410 const int mb_xy= h->mb_xy;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2411 const int mb_type= s->current_picture.mb_type[mb_xy];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2412 uint8_t *dest_y, *dest_cb, *dest_cr;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2413 int linesize, uvlinesize /*dct_offset*/;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2414 int i;
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2415 int *block_offset = &h->block_offset[0];
8352
82790b28b6e0 Support the new lossless mode.
michael
parents: 8330
diff changeset
2416 const int transform_bypass = !simple && (s->qscale == 0 && h->sps.transform_bypass);
82790b28b6e0 Support the new lossless mode.
michael
parents: 8330
diff changeset
2417 const int is_h264 = simple || s->codec_id == CODEC_ID_H264;
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
2418 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
2419 void (*idct_dc_add)(uint8_t *dst, DCTELEM *block, int stride);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2420
8355
179f8e1327ce Factorize 3 multiplications out, code becomes 3 cpu cycles faster.
michael
parents: 8354
diff changeset
2421 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
2422 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
2423 dest_cr = s->current_picture.data[2] + (mb_x + mb_y * s->uvlinesize) * 8;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2424
4000
eeab02251056 more prefetches, 2% faster h264
lorenm
parents: 3993
diff changeset
2425 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
2426 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
2427
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2428 if (!simple && MB_FIELD) {
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2429 linesize = h->mb_linesize = s->linesize * 2;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2430 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
2431 block_offset = &h->block_offset[24];
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
2432 if(mb_y&1){ //FIXME move out of this function?
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2433 dest_y -= s->linesize*15;
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2434 dest_cb-= s->uvlinesize*7;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2435 dest_cr-= s->uvlinesize*7;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2436 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2437 if(FRAME_MBAFF) {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2438 int list;
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
2439 for(list=0; list<h->list_count; list++){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2440 if(!USES_LIST(mb_type, list))
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2441 continue;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2442 if(IS_16X16(mb_type)){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2443 int8_t *ref = &h->ref_cache[list][scan8[0]];
6203
c9433472cb95 Fix the following warnings:
andoma
parents: 6193
diff changeset
2444 fill_rectangle(ref, 4, 4, 8, (16+*ref)^(s->mb_y&1), 1);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2445 }else{
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2446 for(i=0; i<16; i+=4){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2447 int ref = h->ref_cache[list][scan8[i]];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2448 if(ref >= 0)
6203
c9433472cb95 Fix the following warnings:
andoma
parents: 6193
diff changeset
2449 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
2450 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2451 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2452 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2453 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2454 } else {
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2455 linesize = h->mb_linesize = s->linesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2456 uvlinesize = h->mb_uvlinesize = s->uvlinesize;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2457 // dct_offset = s->linesize * 16;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2458 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2459
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2460 if (!simple && IS_INTRA_PCM(mb_type)) {
7450
30d38a880fde Simplify intra PCM MB handling.
michael
parents: 7445
diff changeset
2461 for (i=0; i<16; i++) {
30d38a880fde Simplify intra PCM MB handling.
michael
parents: 7445
diff changeset
2462 memcpy(dest_y + i* linesize, h->mb + i*8, 16);
30d38a880fde Simplify intra PCM MB handling.
michael
parents: 7445
diff changeset
2463 }
30d38a880fde Simplify intra PCM MB handling.
michael
parents: 7445
diff changeset
2464 for (i=0; i<8; i++) {
30d38a880fde Simplify intra PCM MB handling.
michael
parents: 7445
diff changeset
2465 memcpy(dest_cb+ i*uvlinesize, h->mb + 128 + i*4, 8);
30d38a880fde Simplify intra PCM MB handling.
michael
parents: 7445
diff changeset
2466 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
2467 }
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2468 } else {
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2469 if(IS_INTRA(mb_type)){
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2470 if(h->deblocking_filter)
5106
ddb5abe164f3 h264: use 'simple' in border backup / xchg
benoit
parents: 5093
diff changeset
2471 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
2472
5434
4f2e3ef72b32 use ENABLE_GRAY
michael
parents: 5425
diff changeset
2473 if(simple || !ENABLE_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
5638
4a26dc4ca11d Move H.264 intra prediction functions into their own context
kostya
parents: 5631
diff changeset
2474 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
2475 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
2476 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2477
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2478 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
2479 if(simple || !s->encoding){
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2480 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
2481 if(transform_bypass){
be5e0a75b457 Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents: 8378
diff changeset
2482 idct_dc_add =
be5e0a75b457 Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents: 8378
diff changeset
2483 idct_add = s->dsp.add_pixels8;
8382
fe7d1c920aeb Remove useless IS_8x8DCT check i forgot, spotted by dark shikari.
michael
parents: 8379
diff changeset
2484 }else{
8379
be5e0a75b457 Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents: 8378
diff changeset
2485 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
2486 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
2487 }
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2488 for(i=0; i<16; i+=4){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2489 uint8_t * const ptr= dest_y + block_offset[i];
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2490 const int dir= h->intra4x4_pred_mode_cache[ scan8[i] ];
8352
82790b28b6e0 Support the new lossless mode.
michael
parents: 8330
diff changeset
2491 if(transform_bypass && h->sps.profile_idc==244 && dir<=1){
82790b28b6e0 Support the new lossless mode.
michael
parents: 8330
diff changeset
2492 h->hpc.pred8x8l_add[dir](ptr, h->mb + i*16, linesize);
82790b28b6e0 Support the new lossless mode.
michael
parents: 8330
diff changeset
2493 }else{
8357
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
2494 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
2495 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
2496 (h->topright_samples_available<<i)&0x4000, linesize);
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
2497 if(nnz){
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
2498 if(nnz == 1 && h->mb[i*16])
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
2499 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
2500 else
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
2501 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
2502 }
8352
82790b28b6e0 Support the new lossless mode.
michael
parents: 8330
diff changeset
2503 }
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2504 }
8379
be5e0a75b457 Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents: 8378
diff changeset
2505 }else{
be5e0a75b457 Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents: 8378
diff changeset
2506 if(transform_bypass){
be5e0a75b457 Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents: 8378
diff changeset
2507 idct_dc_add =
be5e0a75b457 Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents: 8378
diff changeset
2508 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
2509 }else{
be5e0a75b457 Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents: 8378
diff changeset
2510 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
2511 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
2512 }
8389
michael
parents: 8388
diff changeset
2513 for(i=0; i<16; i++){
michael
parents: 8388
diff changeset
2514 uint8_t * const ptr= dest_y + block_offset[i];
michael
parents: 8388
diff changeset
2515 const int dir= h->intra4x4_pred_mode_cache[ scan8[i] ];
michael
parents: 8388
diff changeset
2516
michael
parents: 8388
diff changeset
2517 if(transform_bypass && h->sps.profile_idc==244 && dir<=1){
michael
parents: 8388
diff changeset
2518 h->hpc.pred4x4_add[dir](ptr, h->mb + i*16, linesize);
michael
parents: 8388
diff changeset
2519 }else{
michael
parents: 8388
diff changeset
2520 uint8_t *topright;
michael
parents: 8388
diff changeset
2521 int nnz, tr;
michael
parents: 8388
diff changeset
2522 if(dir == DIAG_DOWN_LEFT_PRED || dir == VERT_LEFT_PRED){
michael
parents: 8388
diff changeset
2523 const int topright_avail= (h->topright_samples_available<<i)&0x8000;
michael
parents: 8388
diff changeset
2524 assert(mb_y || linesize <= block_offset[i]);
michael
parents: 8388
diff changeset
2525 if(!topright_avail){
michael
parents: 8388
diff changeset
2526 tr= ptr[3 - linesize]*0x01010101;
michael
parents: 8388
diff changeset
2527 topright= (uint8_t*) &tr;
michael
parents: 8388
diff changeset
2528 }else
michael
parents: 8388
diff changeset
2529 topright= ptr + 4 - linesize;
8357
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
2530 }else
8389
michael
parents: 8388
diff changeset
2531 topright= NULL;
michael
parents: 8388
diff changeset
2532
michael
parents: 8388
diff changeset
2533 h->hpc.pred4x4[ dir ](ptr, topright, linesize);
michael
parents: 8388
diff changeset
2534 nnz = h->non_zero_count_cache[ scan8[i] ];
michael
parents: 8388
diff changeset
2535 if(nnz){
michael
parents: 8388
diff changeset
2536 if(is_h264){
michael
parents: 8388
diff changeset
2537 if(nnz == 1 && h->mb[i*16])
michael
parents: 8388
diff changeset
2538 idct_dc_add(ptr, h->mb + i*16, linesize);
michael
parents: 8388
diff changeset
2539 else
michael
parents: 8388
diff changeset
2540 idct_add (ptr, h->mb + i*16, linesize);
michael
parents: 8388
diff changeset
2541 }else
michael
parents: 8388
diff changeset
2542 svq3_add_idct_c(ptr, h->mb + i*16, linesize, s->qscale, 0);
michael
parents: 8388
diff changeset
2543 }
8357
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
2544 }
8352
82790b28b6e0 Support the new lossless mode.
michael
parents: 8330
diff changeset
2545 }
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2546 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2547 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2548 }else{
5638
4a26dc4ca11d Move H.264 intra prediction functions into their own context
kostya
parents: 5631
diff changeset
2549 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
2550 if(is_h264){
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
2551 if(!transform_bypass)
5727
0591d5928fe8 Remove redundant test.
takis
parents: 5723
diff changeset
2552 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
2553 }else
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2554 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
2555 }
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2556 if(h->deblocking_filter)
5106
ddb5abe164f3 h264: use 'simple' in border backup / xchg
benoit
parents: 5093
diff changeset
2557 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
2558 }else if(is_h264){
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2559 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
2560 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
2561 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
2562 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
2563 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2564
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2565
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2566 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
2567 if(is_h264){
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2568 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
2569 if(transform_bypass){
e1b242224970 Use the new idct functions (except chroma as it was slower in benchmarks)
michael
parents: 8374
diff changeset
2570 if(h->sps.profile_idc==244 && (h->intra16x16_pred_mode==VERT_PRED8x8 || h->intra16x16_pred_mode==HOR_PRED8x8)){
8377
michael
parents: 8376
diff changeset
2571 h->hpc.pred16x16_add[h->intra16x16_pred_mode](dest_y, block_offset, h->mb, linesize);
michael
parents: 8376
diff changeset
2572 }else{
michael
parents: 8376
diff changeset
2573 for(i=0; i<16; i++){
michael
parents: 8376
diff changeset
2574 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
2575 s->dsp.add_pixels4(dest_y + block_offset[i], h->mb + i*16, linesize);
8377
michael
parents: 8376
diff changeset
2576 }
8357
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
2577 }
8376
e1b242224970 Use the new idct functions (except chroma as it was slower in benchmarks)
michael
parents: 8374
diff changeset
2578 }else{
e1b242224970 Use the new idct functions (except chroma as it was slower in benchmarks)
michael
parents: 8374
diff changeset
2579 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
2580 }
8374
9000fd7c166e Skip non intra luma code when there is no coded luma.
michael
parents: 8372
diff changeset
2581 }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
2582 if(transform_bypass){
8377
michael
parents: 8376
diff changeset
2583 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
2584 idct_add= IS_8x8DCT(mb_type) ? s->dsp.add_pixels8 : s->dsp.add_pixels4;
8377
michael
parents: 8376
diff changeset
2585 for(i=0; i<16; i+=di){
8378
9c6512be76b4 Remove redundant nnz variable.
michael
parents: 8377
diff changeset
2586 if(h->non_zero_count_cache[ scan8[i] ]){
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2587 idct_add(dest_y + block_offset[i], h->mb + i*16, linesize);
8377
michael
parents: 8376
diff changeset
2588 }
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2589 }
8376
e1b242224970 Use the new idct functions (except chroma as it was slower in benchmarks)
michael
parents: 8374
diff changeset
2590 }else{
e1b242224970 Use the new idct functions (except chroma as it was slower in benchmarks)
michael
parents: 8374
diff changeset
2591 if(IS_8x8DCT(mb_type)){
e1b242224970 Use the new idct functions (except chroma as it was slower in benchmarks)
michael
parents: 8374
diff changeset
2592 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
2593 }else{
e1b242224970 Use the new idct functions (except chroma as it was slower in benchmarks)
michael
parents: 8374
diff changeset
2594 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
2595 }
e1b242224970 Use the new idct functions (except chroma as it was slower in benchmarks)
michael
parents: 8374
diff changeset
2596 }
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2597 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2598 }else{
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2599 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
2600 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
2601 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
2602 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
2603 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2604 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2605 }
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2606 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2607
8372
5917f39590e3 Skip chroma handling when there is no coded chroma.
michael
parents: 8363
diff changeset
2608 if((simple || !ENABLE_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
2609 uint8_t *dest[2] = {dest_cb, dest_cr};
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2610 if(transform_bypass){
8388
9eb29759df54 Reorder ifs in chroma hl_decode_mb to avoid a duplicate transform_bypass
michael
parents: 8387
diff changeset
2611 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
2612 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
2613 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
2614 }else{
8390
31f8d52753e4 Move idct_(dc)add closer to where it is needed.
michael
parents: 8389
diff changeset
2615 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
2616 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
2617 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
2618 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
2619 }
9eb29759df54 Reorder ifs in chroma hl_decode_mb to avoid a duplicate transform_bypass
michael
parents: 8387
diff changeset
2620 }
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2621 }else{
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
2622 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
2623 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
2624 if(is_h264){
8390
31f8d52753e4 Move idct_(dc)add closer to where it is needed.
michael
parents: 8389
diff changeset
2625 idct_add = s->dsp.h264_idct_add;
31f8d52753e4 Move idct_(dc)add closer to where it is needed.
michael
parents: 8389
diff changeset
2626 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
2627 for(i=16; i<16+8; i++){
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
2628 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
2629 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
2630 else if(h->mb[i*16])
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
2631 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
2632 }
8389
michael
parents: 8388
diff changeset
2633 }else{
michael
parents: 8388
diff changeset
2634 for(i=16; i<16+8; i++){
michael
parents: 8388
diff changeset
2635 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){
michael
parents: 8388
diff changeset
2636 uint8_t * const ptr= dest[(i&4)>>2] + block_offset[i];
michael
parents: 8388
diff changeset
2637 svq3_add_idct_c(ptr, h->mb + i*16, uvlinesize, chroma_qp[s->qscale + 12] - 12, 2);
michael
parents: 8388
diff changeset
2638 }
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2639 }
1250
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
2640 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2641 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2642 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2643 }
8415
938824a1f42f Only execute clear_blocks() when needed.
michael
parents: 8411
diff changeset
2644 if(h->cbp || IS_INTRA(mb_type))
938824a1f42f Only execute clear_blocks() when needed.
michael
parents: 8411
diff changeset
2645 s->dsp.clear_blocks(h->mb);
938824a1f42f Only execute clear_blocks() when needed.
michael
parents: 8411
diff changeset
2646
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2647 if(h->deblocking_filter) {
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2648 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
2649 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
2650 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
2651 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
2652 if (!simple && FRAME_MBAFF) {
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
2653 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
2654 } else {
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
2655 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
2656 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2657 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2658 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2659
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2660 /**
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2661 * 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
2662 */
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2663 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
2664 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
2665 }
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2666
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2667 /**
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2668 * 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
2669 */
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2670 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
2671 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
2672 }
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2673
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2674 static void hl_decode_mb(H264Context *h){
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2675 MpegEncContext * const s = &h->s;
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
2676 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
2677 const int mb_type= s->current_picture.mb_type[mb_xy];
8354
5e6f65181881 Move ENABLE_SMALL back to the per MB check, as otherwise gcc wont remove
michael
parents: 8353
diff changeset
2678 int is_complex = ENABLE_SMALL || h->is_complex || IS_INTRA_PCM(mb_type) || s->qscale == 0;
7178
9a31b6a8ae52 Don't test for H264 encoding unless an encoder exists.
astrange
parents: 7040
diff changeset
2679
9a31b6a8ae52 Don't test for H264 encoding unless an encoder exists.
astrange
parents: 7040
diff changeset
2680 if(ENABLE_H264_ENCODER && !s->decode)
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2681 return;
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2682
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2683 if (is_complex)
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2684 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
2685 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
2686 }
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2687
5825
18859ffa5705 Fix chroma mv offsets for PAFF in a way that is compatible with MBAFF by
cehoyos
parents: 5822
diff changeset
2688 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
2689 int i;
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2690 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
2691 if (parity == PICT_BOTTOM_FIELD)
5778
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2692 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
2693 pic->reference = parity;
5778
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2694 pic->linesize[i] *= 2;
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2695 }
7462
5cbf11f56c02 Picture.ref_count/ref_poc have to be stored per field (actually also per
michael
parents: 7450
diff changeset
2696 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
2697 }
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2698
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2699 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
2700 int parity, int id_add){
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2701 int match = !!(src->reference & parity);
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2702
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2703 if (match) {
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2704 *dest = *src;
7398
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2705 if(parity != PICT_FRAME){
7399
michael
parents: 7398
diff changeset
2706 pic_as_field(dest, parity);
michael
parents: 7398
diff changeset
2707 dest->pic_id *= 2;
michael
parents: 7398
diff changeset
2708 dest->pic_id += id_add;
7398
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2709 }
5778
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2710 }
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2711
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2712 return match;
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2713 }
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2714
7398
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2715 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
2716 int i[2]={0};
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2717 int index=0;
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2718
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2719 while(i[0]<len || i[1]<len){
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2720 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
2721 i[0]++;
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2722 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
2723 i[1]++;
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2724 if(i[0] < len){
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2725 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
2726 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
2727 }
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2728 if(i[1] < len){
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2729 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
2730 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
2731 }
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2732 }
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2733
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2734 return index;
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2735 }
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2736
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2737 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
2738 int i, best_poc;
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2739 int out_i= 0;
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2740
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2741 for(;;){
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2742 best_poc= dir ? INT_MIN : INT_MAX;
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2743
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2744 for(i=0; i<len; i++){
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2745 const int poc= src[i]->poc;
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2746 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
2747 best_poc= poc;
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2748 sorted[out_i]= src[i];
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2749 }
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2750 }
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2751 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
2752 break;
7398
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2753 limit= sorted[out_i++]->poc - dir;
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2754 }
5778
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2755 return out_i;
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2756 }
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2757
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2758 /**
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2759 * fills the default_ref_list.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2760 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2761 static int fill_default_ref_list(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2762 MpegEncContext * const s = &h->s;
7398
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2763 int i, len;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2764
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
2765 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
2766 Picture *sorted[32];
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2767 int cur_poc, list;
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2768 int lens[2];
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2769
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2770 if(FIELD_PICTURE)
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2771 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
2772 else
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2773 cur_poc= s->current_picture_ptr->poc;
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2774
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2775 for(list= 0; list<2; list++){
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2776 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
2777 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
2778 assert(len<=32);
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2779 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
2780 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
2781 assert(len<=32);
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2782
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2783 if(len < h->ref_count[list])
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2784 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
2785 lens[list]= len;
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2786 }
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2787
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2788 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
2789 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
2790 if(i == lens[0])
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2791 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
2792 }
5779
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2793 }else{
7398
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2794 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
2795 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
2796 assert(len <= 32);
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2797 if(len < h->ref_count[0])
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2798 memset(&h->default_ref_list[0][len], 0, sizeof(Picture)*(h->ref_count[0] - len));
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2799 }
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
2800 #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
2801 for (i=0; i<h->ref_count[0]; i++) {
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
2802 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
2803 }
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
2804 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
2805 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
2806 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
2807 }
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
2808 }
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
2809 #endif
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2810 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2811 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2812
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
2813 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
2814 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
2815
5780
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2816 /**
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2817 * 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
2818 * 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
2819 * 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
2820 * @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
2821 * @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
2822 * with pic_num
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2823 * @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
2824 * described by pic_num
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2825 */
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2826 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
2827 MpegEncContext * const s = &h->s;
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2828
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2829 *structure = s->picture_structure;
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2830 if(FIELD_PICTURE){
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2831 if (!(pic_num & 1))
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2832 /* opposite field */
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2833 *structure ^= PICT_FRAME;
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2834 pic_num >>= 1;
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2835 }
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2836
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2837 return pic_num;
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2838 }
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2839
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2840 static int decode_ref_pic_list_reordering(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2841 MpegEncContext * const s = &h->s;
5780
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2842 int list, index, pic_structure;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2843
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
2844 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
2845 print_long_term(h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2846
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
2847 for(list=0; list<h->list_count; list++){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2848 memcpy(h->ref_list[list], h->default_ref_list[list], sizeof(Picture)*h->ref_count[list]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2849
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2850 if(get_bits1(&s->gb)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2851 int pred= h->curr_pic_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2852
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2853 for(index=0; ; index++){
8451
384600e3fe5b Use get_ue_golomb_31() where possible, almost all are just in headers
michael
parents: 8448
diff changeset
2854 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
2855 unsigned int pic_id;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2856 int i;
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
2857 Picture *ref = NULL;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2858
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2859 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
2860 break;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2861
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2862 if(index >= h->ref_count[list]){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
2863 av_log(h->s.avctx, AV_LOG_ERROR, "reference count overflow\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2864 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2865 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2866
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2867 if(reordering_of_pic_nums_idc<3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2868 if(reordering_of_pic_nums_idc<2){
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
2869 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
2870 int frame_num;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2871
5805
12b1717f80a3 fix incorrect check for abs_diff_pic_num overflow
andoma
parents: 5803
diff changeset
2872 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
2873 av_log(h->s.avctx, AV_LOG_ERROR, "abs_diff_pic_num overflow\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2874 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2875 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2876
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2877 if(reordering_of_pic_nums_idc == 0) pred-= abs_diff_pic_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2878 else pred+= abs_diff_pic_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2879 pred &= h->max_pic_num - 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2880
5780
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2881 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
2882
2683
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
2883 for(i= h->short_ref_count-1; i>=0; i--){
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
2884 ref = h->short_ref[i];
5780
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2885 assert(ref->reference);
2683
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
2886 assert(!ref->long_ref);
7402
3c04b2988f19 Remove mysterious ref->data[0] check.
michael
parents: 7401
diff changeset
2887 if(
7405
dfe1d1d104eb Revert r14404
michael
parents: 7404
diff changeset
2888 ref->frame_num == frame_num &&
dfe1d1d104eb Revert r14404
michael
parents: 7404
diff changeset
2889 (ref->reference & pic_structure)
7402
3c04b2988f19 Remove mysterious ref->data[0] check.
michael
parents: 7401
diff changeset
2890 )
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2891 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2892 }
2683
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
2893 if(i>=0)
5780
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2894 ref->pic_id= pred;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2895 }else{
5780
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2896 int long_idx;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2897 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
2898
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2899 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
2900
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2901 if(long_idx>31){
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
2902 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
2903 return -1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
2904 }
5780
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2905 ref = h->long_ref[long_idx];
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2906 assert(!(ref && !ref->reference));
7405
dfe1d1d104eb Revert r14404
michael
parents: 7404
diff changeset
2907 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
2908 ref->pic_id= pic_id;
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
2909 assert(ref->long_ref);
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
2910 i=0;
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
2911 }else{
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
2912 i=-1;
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
2913 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2914 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2915
2485
2844b8cf4e11 H.264 multiplce instance in reference list patch by (Loic <lll+ffmpeg m4x org )
michael
parents: 2484
diff changeset
2916 if (i < 0) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
2917 av_log(h->s.avctx, AV_LOG_ERROR, "reference picture missing during reorder\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2918 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
2919 } else {
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
2920 for(i=index; i+1<h->ref_count[list]; i++){
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
2921 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
2922 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
2923 }
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
2924 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
2925 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
2926 }
2683
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
2927 h->ref_list[list][index]= *ref;
5780
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2928 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
2929 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
2930 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2931 }
2284
6d26e105f68f h.264 ref list reordering bugfix patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2272
diff changeset
2932 }else{
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
2933 av_log(h->s.avctx, AV_LOG_ERROR, "illegal reordering_of_pic_nums_idc\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2934 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2935 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2936 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2937 }
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
2938 }
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
2939 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
2940 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
2941 if(!h->ref_list[list][index].data[0]){
aff96834b8cd Print an error if a reference picture is missing.
michael
parents: 7402
diff changeset
2942 av_log(h->s.avctx, AV_LOG_ERROR, "Missing reference picture\n");
aff96834b8cd Print an error if a reference picture is missing.
michael
parents: 7402
diff changeset
2943 h->ref_list[list][index]= s->current_picture; //FIXME this is not a sensible solution
aff96834b8cd Print an error if a reference picture is missing.
michael
parents: 7402
diff changeset
2944 }
2680
1a6192e0b1f9 fill missing reference pictures with something to avoid assertion failure
michael
parents: 2675
diff changeset
2945 }
1a6192e0b1f9 fill missing reference pictures with something to avoid assertion failure
michael
parents: 2675
diff changeset
2946 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2947
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2948 return 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2949 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2950
3379
69901769c811 fill_mbaff_ref_list is missing a return statement, its return value
mru
parents: 3341
diff changeset
2951 static void fill_mbaff_ref_list(H264Context *h){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2952 int list, i, j;
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
2953 for(list=0; list<2; list++){ //FIXME try list_count
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2954 for(i=0; i<h->ref_count[list]; i++){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2955 Picture *frame = &h->ref_list[list][i];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2956 Picture *field = &h->ref_list[list][16+2*i];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2957 field[0] = *frame;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2958 for(j=0; j<3; j++)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2959 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
2960 field[0].reference = PICT_TOP_FIELD;
7896
3557386b7a97 Set poc for field references in MBAFF.
michael
parents: 7894
diff changeset
2961 field[0].poc= field[0].field_poc[0];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2962 field[1] = field[0];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2963 for(j=0; j<3; j++)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2964 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
2965 field[1].reference = PICT_BOTTOM_FIELD;
7896
3557386b7a97 Set poc for field references in MBAFF.
michael
parents: 7894
diff changeset
2966 field[1].poc= field[1].field_poc[1];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2967
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2968 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
2969 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
2970 for(j=0; j<2; j++){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2971 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
2972 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
2973 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2974 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2975 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2976 for(j=0; j<h->ref_count[1]; j++){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2977 for(i=0; i<h->ref_count[0]; i++)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2978 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
2979 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
2980 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
2981 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2982 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2983
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2984 static int pred_weight_table(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2985 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2986 int list, i;
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2987 int luma_def, chroma_def;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2988
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2989 h->use_weight= 0;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2990 h->use_weight_chroma= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2991 h->luma_log2_weight_denom= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2992 h->chroma_log2_weight_denom= get_ue_golomb(&s->gb);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2993 luma_def = 1<<h->luma_log2_weight_denom;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2994 chroma_def = 1<<h->chroma_log2_weight_denom;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2995
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2996 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2997 for(i=0; i<h->ref_count[list]; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2998 int luma_weight_flag, chroma_weight_flag;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2999
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3000 luma_weight_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3001 if(luma_weight_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3002 h->luma_weight[list][i]= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3003 h->luma_offset[list][i]= get_se_golomb(&s->gb);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3004 if( h->luma_weight[list][i] != luma_def
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3005 || h->luma_offset[list][i] != 0)
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3006 h->use_weight= 1;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3007 }else{
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3008 h->luma_weight[list][i]= luma_def;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3009 h->luma_offset[list][i]= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3010 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3011
7407
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
3012 if(CHROMA){
7408
michael
parents: 7407
diff changeset
3013 chroma_weight_flag= get_bits1(&s->gb);
michael
parents: 7407
diff changeset
3014 if(chroma_weight_flag){
michael
parents: 7407
diff changeset
3015 int j;
michael
parents: 7407
diff changeset
3016 for(j=0; j<2; j++){
michael
parents: 7407
diff changeset
3017 h->chroma_weight[list][i][j]= get_se_golomb(&s->gb);
michael
parents: 7407
diff changeset
3018 h->chroma_offset[list][i][j]= get_se_golomb(&s->gb);
michael
parents: 7407
diff changeset
3019 if( h->chroma_weight[list][i][j] != chroma_def
michael
parents: 7407
diff changeset
3020 || h->chroma_offset[list][i][j] != 0)
michael
parents: 7407
diff changeset
3021 h->use_weight_chroma= 1;
michael
parents: 7407
diff changeset
3022 }
michael
parents: 7407
diff changeset
3023 }else{
michael
parents: 7407
diff changeset
3024 int j;
michael
parents: 7407
diff changeset
3025 for(j=0; j<2; j++){
michael
parents: 7407
diff changeset
3026 h->chroma_weight[list][i][j]= chroma_def;
michael
parents: 7407
diff changeset
3027 h->chroma_offset[list][i][j]= 0;
michael
parents: 7407
diff changeset
3028 }
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3029 }
7407
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
3030 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3031 }
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
3032 if(h->slice_type_nos != FF_B_TYPE) break;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3033 }
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3034 h->use_weight= h->use_weight || h->use_weight_chroma;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3035 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3036 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3037
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3038 static void implicit_weight_table(H264Context *h){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3039 MpegEncContext * const s = &h->s;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3040 int ref0, ref1;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3041 int cur_poc = s->current_picture_ptr->poc;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3042
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3043 if( h->ref_count[0] == 1 && h->ref_count[1] == 1
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3044 && 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
3045 h->use_weight= 0;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3046 h->use_weight_chroma= 0;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3047 return;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3048 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3049
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3050 h->use_weight= 2;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3051 h->use_weight_chroma= 2;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3052 h->luma_log2_weight_denom= 5;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3053 h->chroma_log2_weight_denom= 5;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3054
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3055 for(ref0=0; ref0 < h->ref_count[0]; ref0++){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3056 int poc0 = h->ref_list[0][ref0].poc;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3057 for(ref1=0; ref1 < h->ref_count[1]; ref1++){
2519
b34f2cac6a71 10l in implicit_weight_table
lorenm
parents: 2509
diff changeset
3058 int poc1 = h->ref_list[1][ref1].poc;
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
3059 int td = av_clip(poc1 - poc0, -128, 127);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3060 if(td){
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
3061 int tb = av_clip(cur_poc - poc0, -128, 127);
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
3062 int tx = (16384 + (FFABS(td) >> 1)) / td;
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
3063 int dist_scale_factor = av_clip((tb*tx + 32) >> 6, -1024, 1023) >> 2;
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3064 if(dist_scale_factor < -64 || dist_scale_factor > 128)
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3065 h->implicit_weight[ref0][ref1] = 32;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3066 else
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3067 h->implicit_weight[ref0][ref1] = 64 - dist_scale_factor;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3068 }else
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3069 h->implicit_weight[ref0][ref1] = 32;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3070 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3071 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3072 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3073
5768
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3074 /**
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3075 * 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
3076 * argument allows unreferencing of individual fields or the whole frame.
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3077 * 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
3078 * display purposes, it is marked as such.
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3079 * @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
3080 * anded with the reference marking of pic
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3081 * @return non-zero if pic becomes entirely unreferenced (except possibly
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3082 * 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
3083 * reference
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3084 */
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3085 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
3086 int i;
5768
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3087 if (pic->reference &= refmask) {
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3088 return 0;
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3089 } else {
7313
michael
parents: 7312
diff changeset
3090 for(i = 0; h->delayed_pic[i]; i++)
michael
parents: 7312
diff changeset
3091 if(pic == h->delayed_pic[i]){
michael
parents: 7312
diff changeset
3092 pic->reference=DELAYED_PIC_REF;
michael
parents: 7312
diff changeset
3093 break;
michael
parents: 7312
diff changeset
3094 }
5768
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3095 return 1;
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3096 }
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3097 }
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3098
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3099 /**
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
3100 * instantaneous decoder refresh.
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3101 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3102 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
3103 int i;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3104
2484
a3188eb4266c correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents: 2471
diff changeset
3105 for(i=0; i<16; i++){
7394
4ac8769cbb01 Make remove_long() call unreference_pic() internally.
michael
parents: 7393
diff changeset
3106 remove_long(h, i, 0);
7385
617eababb511 Clear long_ref when a frame is no longer a long_ref.
michael
parents: 7384
diff changeset
3107 }
617eababb511 Clear long_ref when a frame is no longer a long_ref.
michael
parents: 7384
diff changeset
3108 assert(h->long_ref_count==0);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3109
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3110 for(i=0; i<h->short_ref_count; i++){
5768
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3111 unreference_pic(h, h->short_ref[i], 0);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3112 h->short_ref[i]= NULL;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3113 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3114 h->short_ref_count=0;
7362
443fdc440854 Reset prev_frame_num for idr frames as required by the spec.
michael
parents: 7361
diff changeset
3115 h->prev_frame_num= 0;
7379
d3bd73e0f9a9 init_poc() vs. idr() cleanup
michael
parents: 7378
diff changeset
3116 h->prev_frame_num_offset= 0;
d3bd73e0f9a9 init_poc() vs. idr() cleanup
michael
parents: 7378
diff changeset
3117 h->prev_poc_msb=
d3bd73e0f9a9 init_poc() vs. idr() cleanup
michael
parents: 7378
diff changeset
3118 h->prev_poc_lsb= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3119 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3120
2640
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3121 /* forget old pics after a seek */
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3122 static void flush_dpb(AVCodecContext *avctx){
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3123 H264Context *h= avctx->priv_data;
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3124 int i;
7283
39e81fdd8d23 Move the size of the H264Context delayed_pic array into a #define.
astrange
parents: 7277
diff changeset
3125 for(i=0; i<MAX_DELAYED_PIC_COUNT; i++) {
3144
84406a59134c fix a memory leak on seeking.
lorenm
parents: 3138
diff changeset
3126 if(h->delayed_pic[i])
84406a59134c fix a memory leak on seeking.
lorenm
parents: 3138
diff changeset
3127 h->delayed_pic[i]->reference= 0;
2640
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3128 h->delayed_pic[i]= NULL;
3144
84406a59134c fix a memory leak on seeking.
lorenm
parents: 3138
diff changeset
3129 }
7310
033d10927d45 Remove delayed_output_pic, I do not understand what this variable was good for.
michael
parents: 7309
diff changeset
3130 h->outputed_poc= INT_MIN;
2640
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3131 idr(h);
2751
3247049dfc7a fix segfault if flush is called before the first frame
mru
parents: 2748
diff changeset
3132 if(h->s.current_picture_ptr)
3247049dfc7a fix segfault if flush is called before the first frame
mru
parents: 2748
diff changeset
3133 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
3134 h->s.first_field= 0;
5926
77403dc808cd Call mpegvideo flush routine on h264 flush. Needed in particular
heydowns
parents: 5904
diff changeset
3135 ff_mpeg_flush(avctx);
2640
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3136 }
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3137
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3138 /**
5770
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3139 * 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
3140 * @param frame_num frame number to search for
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3141 * @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
3142 * undefined if no picture found.
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3143 * @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
3144 * frame number is found
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3145 */
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3146 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
3147 MpegEncContext * const s = &h->s;
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3148 int i;
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3149
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3150 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
3151 Picture *pic= h->short_ref[i];
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3152 if(s->avctx->debug&FF_DEBUG_MMCO)
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3153 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
3154 if(pic->frame_num == frame_num) {
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3155 *idx = i;
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3156 return pic;
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3157 }
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3158 }
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3159 return NULL;
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3160 }
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3161
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3162 /**
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3163 * 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
3164 * 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
3165 * 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
3166 * @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
3167 */
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3168 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
3169 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
3170 h->short_ref[i]= NULL;
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3171 if (--h->short_ref_count)
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3172 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
3173 }
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3174
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3175 /**
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3176 *
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
3177 * @return the removed picture or NULL if an error occurs
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3178 */
7396
9f765ea6d6df Make remove_short() match remove_long() in that it calls unreference_pic().
michael
parents: 7395
diff changeset
3179 static Picture * remove_short(H264Context *h, int frame_num, int ref_mask){
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
3180 MpegEncContext * const s = &h->s;
5770
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3181 Picture *pic;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3182 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3183
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
3184 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
3185 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
3186
5770
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3187 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
3188 if (pic){
9f765ea6d6df Make remove_short() match remove_long() in that it calls unreference_pic().
michael
parents: 7395
diff changeset
3189 if(unreference_pic(h, pic, ref_mask))
5770
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3190 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
3191 }
5770
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3192
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3193 return pic;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3194 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3195
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3196 /**
5774
e71de81878c4 Reorganize long reference management to minimize code duplication in upcoming PAFF implementation.
andoma
parents: 5773
diff changeset
3197 * 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
3198 * that list.
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
3199 * @return the removed picture or NULL if an error occurs
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3200 */
7394
4ac8769cbb01 Make remove_long() call unreference_pic() internally.
michael
parents: 7393
diff changeset
3201 static Picture * remove_long(H264Context *h, int i, int ref_mask){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3202 Picture *pic;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3203
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3204 pic= h->long_ref[i];
7393
309c59802769 Merge oddly duplicated remove_long/remove_long_at_index() function.
michael
parents: 7392
diff changeset
3205 if (pic){
7394
4ac8769cbb01 Make remove_long() call unreference_pic() internally.
michael
parents: 7393
diff changeset
3206 if(unreference_pic(h, pic, ref_mask)){
4ac8769cbb01 Make remove_long() call unreference_pic() internally.
michael
parents: 7393
diff changeset
3207 assert(h->long_ref[i]->long_ref == 1);
4ac8769cbb01 Make remove_long() call unreference_pic() internally.
michael
parents: 7393
diff changeset
3208 h->long_ref[i]->long_ref= 0;
4ac8769cbb01 Make remove_long() call unreference_pic() internally.
michael
parents: 7393
diff changeset
3209 h->long_ref[i]= NULL;
4ac8769cbb01 Make remove_long() call unreference_pic() internally.
michael
parents: 7393
diff changeset
3210 h->long_ref_count--;
4ac8769cbb01 Make remove_long() call unreference_pic() internally.
michael
parents: 7393
diff changeset
3211 }
7393
309c59802769 Merge oddly duplicated remove_long/remove_long_at_index() function.
michael
parents: 7392
diff changeset
3212 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3213
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3214 return pic;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3215 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3216
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3217 /**
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
3218 * 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
3219 */
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
3220 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
3221 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
3222 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
3223 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
3224 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
3225 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
3226 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
3227 }
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
3228 }
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
3229 }
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
3230
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
3231 /**
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
3232 * 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
3233 */
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
3234 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
3235 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
3236 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
3237 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
3238 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
3239 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
3240 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
3241 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
3242 }
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
3243 }
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
3244 }
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
3245 }
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
3246
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
3247 /**
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3248 * Executes the reference picture marking (memory management control operations).
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3249 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3250 static int execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3251 MpegEncContext * const s = &h->s;
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3252 int i, j;
5785
74fa2587b8de Cosmetic renaming variable so that it makes more sense for forthcoming PAFF mmco patches.
andoma
parents: 5784
diff changeset
3253 int current_ref_assigned=0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3254 Picture *pic;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3255
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3256 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
3257 av_log(h->s.avctx, AV_LOG_DEBUG, "no mmco here\n");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3258
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3259 for(i=0; i<mmco_count; i++){
7383
c4e5f2158b20 Simplify strange obfuscated code in MMCO_LONG handling.
michael
parents: 7382
diff changeset
3260 int structure, frame_num;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3261 if(s->avctx->debug&FF_DEBUG_MMCO)
5756
db5a041fd77c Rename MMCO stuff to prepare for h264/PAFF implementation.
andoma
parents: 5727
diff changeset
3262 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
3263
7395
08e81ea44a38 Removing yet another weird field pic special case,
michael
parents: 7394
diff changeset
3264 if( mmco[i].opcode == MMCO_SHORT2UNUSED
08e81ea44a38 Removing yet another weird field pic special case,
michael
parents: 7394
diff changeset
3265 || mmco[i].opcode == MMCO_SHORT2LONG){
08e81ea44a38 Removing yet another weird field pic special case,
michael
parents: 7394
diff changeset
3266 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
3267 pic = find_short(h, frame_num, &j);
08e81ea44a38 Removing yet another weird field pic special case,
michael
parents: 7394
diff changeset
3268 if(!pic){
7397
535664ced6f0 Do not scare the user with error messages when everything is ok.
michael
parents: 7396
diff changeset
3269 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
3270 || 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
3271 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
3272 continue;
08e81ea44a38 Removing yet another weird field pic special case,
michael
parents: 7394
diff changeset
3273 }
08e81ea44a38 Removing yet another weird field pic special case,
michael
parents: 7394
diff changeset
3274 }
08e81ea44a38 Removing yet another weird field pic special case,
michael
parents: 7394
diff changeset
3275
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3276 switch(mmco[i].opcode){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3277 case MMCO_SHORT2UNUSED:
5786
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3278 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
3279 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
3280 remove_short(h, frame_num, structure ^ PICT_FRAME);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3281 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3282 case MMCO_SHORT2LONG:
7395
08e81ea44a38 Removing yet another weird field pic special case,
michael
parents: 7394
diff changeset
3283 if (h->long_ref[mmco[i].long_arg] != pic)
08e81ea44a38 Removing yet another weird field pic special case,
michael
parents: 7394
diff changeset
3284 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
3285
7396
9f765ea6d6df Make remove_short() match remove_long() in that it calls unreference_pic().
michael
parents: 7395
diff changeset
3286 remove_short_at_index(h, j);
9f765ea6d6df Make remove_short() match remove_long() in that it calls unreference_pic().
michael
parents: 7395
diff changeset
3287 h->long_ref[ mmco[i].long_arg ]= pic;
5787
b92c03847d60 Re-indent after PAFF MMCO implementation patch.
cehoyos
parents: 5786
diff changeset
3288 if (h->long_ref[ mmco[i].long_arg ]){
b92c03847d60 Re-indent after PAFF MMCO implementation patch.
cehoyos
parents: 5786
diff changeset
3289 h->long_ref[ mmco[i].long_arg ]->long_ref=1;
b92c03847d60 Re-indent after PAFF MMCO implementation patch.
cehoyos
parents: 5786
diff changeset
3290 h->long_ref_count++;
b92c03847d60 Re-indent after PAFF MMCO implementation patch.
cehoyos
parents: 5786
diff changeset
3291 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3292 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3293 case MMCO_LONG2UNUSED:
5786
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3294 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
3295 pic = h->long_ref[j];
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3296 if (pic) {
7394
4ac8769cbb01 Make remove_long() call unreference_pic() internally.
michael
parents: 7393
diff changeset
3297 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
3298 } 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
3299 av_log(h->s.avctx, AV_LOG_DEBUG, "mmco: unref long failure\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3300 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3301 case MMCO_LONG:
7383
c4e5f2158b20 Simplify strange obfuscated code in MMCO_LONG handling.
michael
parents: 7382
diff changeset
3302 // 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
3303 /* 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
3304 * at a different long term index.
7420
30e8c4bf08a4 Fix reference to spec to be more specific and correct.
heydowns
parents: 7417
diff changeset
3305 * 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
3306 * 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
3307 * and mark this field valid.
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3308 */
7383
c4e5f2158b20 Simplify strange obfuscated code in MMCO_LONG handling.
michael
parents: 7382
diff changeset
3309
c4e5f2158b20 Simplify strange obfuscated code in MMCO_LONG handling.
michael
parents: 7382
diff changeset
3310 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
3311 remove_long(h, mmco[i].long_arg, 0);
5787
b92c03847d60 Re-indent after PAFF MMCO implementation patch.
cehoyos
parents: 5786
diff changeset
3312
b92c03847d60 Re-indent after PAFF MMCO implementation patch.
cehoyos
parents: 5786
diff changeset
3313 h->long_ref[ mmco[i].long_arg ]= s->current_picture_ptr;
b92c03847d60 Re-indent after PAFF MMCO implementation patch.
cehoyos
parents: 5786
diff changeset
3314 h->long_ref[ mmco[i].long_arg ]->long_ref=1;
b92c03847d60 Re-indent after PAFF MMCO implementation patch.
cehoyos
parents: 5786
diff changeset
3315 h->long_ref_count++;
5786
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3316 }
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3317
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3318 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
3319 current_ref_assigned=1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3320 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3321 case MMCO_SET_MAX_LONG:
5756
db5a041fd77c Rename MMCO stuff to prepare for h264/PAFF implementation.
andoma
parents: 5727
diff changeset
3322 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
3323 // 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
3324 for(j = mmco[i].long_arg; j<16; j++){
7394
4ac8769cbb01 Make remove_long() call unreference_pic() internally.
michael
parents: 7393
diff changeset
3325 remove_long(h, j, 0);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3326 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3327 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3328 case MMCO_RESET:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3329 while(h->short_ref_count){
7396
9f765ea6d6df Make remove_short() match remove_long() in that it calls unreference_pic().
michael
parents: 7395
diff changeset
3330 remove_short(h, h->short_ref[0]->frame_num, 0);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3331 }
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
3332 for(j = 0; j < 16; j++) {
7394
4ac8769cbb01 Make remove_long() call unreference_pic() internally.
michael
parents: 7393
diff changeset
3333 remove_long(h, j, 0);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3334 }
7350
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3335 s->current_picture_ptr->poc=
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3336 s->current_picture_ptr->field_poc[0]=
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3337 s->current_picture_ptr->field_poc[1]=
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3338 h->poc_lsb=
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3339 h->poc_msb=
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3340 h->frame_num=
7349
ee0fa5935e1a Reset frame_num for MMCO 5.
michael
parents: 7348
diff changeset
3341 s->current_picture_ptr->frame_num= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3342 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3343 default: assert(0);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3344 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3345 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3346
7389
8ef2e8f077ff Remove another of these obfuscated special cases for field pictures
michael
parents: 7388
diff changeset
3347 if (!current_ref_assigned) {
5786
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3348 /* 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
3349 * 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
3350 * 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
3351 * 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
3352 * 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
3353 */
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3354 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
3355 /* 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
3356 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
3357 } 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
3358 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
3359 "assignment for second field "
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3360 "in complementary field pair "
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3361 "(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
3362 } else {
7396
9f765ea6d6df Make remove_short() match remove_long() in that it calls unreference_pic().
michael
parents: 7395
diff changeset
3363 pic= remove_short(h, s->current_picture_ptr->frame_num, 0);
7391
michael
parents: 7390
diff changeset
3364 if(pic){
michael
parents: 7390
diff changeset
3365 av_log(h->s.avctx, AV_LOG_ERROR, "illegal short term buffer state detected\n");
michael
parents: 7390
diff changeset
3366 }
michael
parents: 7390
diff changeset
3367
michael
parents: 7390
diff changeset
3368 if(h->short_ref_count)
michael
parents: 7390
diff changeset
3369 memmove(&h->short_ref[1], &h->short_ref[0], h->short_ref_count*sizeof(Picture*));
michael
parents: 7390
diff changeset
3370
michael
parents: 7390
diff changeset
3371 h->short_ref[0]= s->current_picture_ptr;
michael
parents: 7390
diff changeset
3372 h->short_ref_count++;
michael
parents: 7390
diff changeset
3373 s->current_picture_ptr->reference |= s->picture_structure;
michael
parents: 7390
diff changeset
3374 }
7390
7abedf6425d8 10000l, forgotton }
michael
parents: 7389
diff changeset
3375 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3376
6019
42de24a34fd2 Fix brain-dead parts of r11216, specifically:
heydowns
parents: 6018
diff changeset
3377 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
3378
9d1654835629 Ensure that our total reference frame count does not exceed the SPS
heydowns
parents: 6017
diff changeset
3379 /* 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
3380 * 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
3381 * short_ref and long_ref buffers.
9d1654835629 Ensure that our total reference frame count does not exceed the SPS
heydowns
parents: 6017
diff changeset
3382 */
9d1654835629 Ensure that our total reference frame count does not exceed the SPS
heydowns
parents: 6017
diff changeset
3383 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
3384 "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
3385 "corrupt input), discarding one\n");
9d1654835629 Ensure that our total reference frame count does not exceed the SPS
heydowns
parents: 6017
diff changeset
3386
7350
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3387 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
3388 for (i = 0; i < 16; ++i)
9d1654835629 Ensure that our total reference frame count does not exceed the SPS
heydowns
parents: 6017
diff changeset
3389 if (h->long_ref[i])
9d1654835629 Ensure that our total reference frame count does not exceed the SPS
heydowns
parents: 6017
diff changeset
3390 break;
9d1654835629 Ensure that our total reference frame count does not exceed the SPS
heydowns
parents: 6017
diff changeset
3391
9d1654835629 Ensure that our total reference frame count does not exceed the SPS
heydowns
parents: 6017
diff changeset
3392 assert(i < 16);
7394
4ac8769cbb01 Make remove_long() call unreference_pic() internally.
michael
parents: 7393
diff changeset
3393 remove_long(h, i, 0);
6018
9d1654835629 Ensure that our total reference frame count does not exceed the SPS
heydowns
parents: 6017
diff changeset
3394 } else {
6019
42de24a34fd2 Fix brain-dead parts of r11216, specifically:
heydowns
parents: 6018
diff changeset
3395 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
3396 remove_short(h, pic->frame_num, 0);
7394
4ac8769cbb01 Make remove_long() call unreference_pic() internally.
michael
parents: 7393
diff changeset
3397 }
6018
9d1654835629 Ensure that our total reference frame count does not exceed the SPS
heydowns
parents: 6017
diff changeset
3398 }
9d1654835629 Ensure that our total reference frame count does not exceed the SPS
heydowns
parents: 6017
diff changeset
3399
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
3400 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
3401 print_long_term(h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3402 return 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3403 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3404
5172
60a4f209838b Decouple bit context from h264 context in decode_ref_pic_marking()
gpoirier
parents: 5170
diff changeset
3405 static int decode_ref_pic_marking(H264Context *h, GetBitContext *gb){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3406 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3407 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3408
7384
8b9a02536781 Make sure mmco index is 0 (instead of uninitialized) in all error returns.
michael
parents: 7383
diff changeset
3409 h->mmco_index= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3410 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
3411 s->broken_link= get_bits1(gb) -1;
7388
d2d876733e9e Simplify mmco setup code used in IDR pictures.
michael
parents: 7387
diff changeset
3412 if(get_bits1(gb)){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3413 h->mmco[0].opcode= MMCO_LONG;
7388
d2d876733e9e Simplify mmco setup code used in IDR pictures.
michael
parents: 7387
diff changeset
3414 h->mmco[0].long_arg= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3415 h->mmco_index= 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3416 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3417 }else{
5172
60a4f209838b Decouple bit context from h264 context in decode_ref_pic_marking()
gpoirier
parents: 5170
diff changeset
3418 if(get_bits1(gb)){ // adaptive_ref_pic_marking_mode_flag
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3419 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
3420 MMCOOpcode opcode= get_ue_golomb_31(gb);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3421
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3422 h->mmco[i].opcode= opcode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3423 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
3424 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
3425 /* 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
3426 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
3427 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3428 }*/
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3429 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3430 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
3431 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
3432 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
3433 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
3434 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3435 }
5771
5290a3850c03 Rename variable to make sense in both field and frame contexts (support of PAFF implementation).
andoma
parents: 5770
diff changeset
3436 h->mmco[i].long_arg= long_arg;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3437 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3438
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3439 if(opcode > (unsigned)MMCO_LONG){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3440 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
3441 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3442 }
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
3443 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
3444 break;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3445 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3446 h->mmco_index= i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3447 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3448 assert(h->long_ref_count + h->short_ref_count <= h->sps.ref_frame_count);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3449
5987
bc6d765d1d53 Verify long_ref_count!=0. Fix issue 281.
takis
parents: 5984
diff changeset
3450 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
3451 !(FIELD_PICTURE && !s->first_field && s->current_picture_ptr->reference)) {
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3452 h->mmco[0].opcode= MMCO_SHORT2UNUSED;
5756
db5a041fd77c Rename MMCO stuff to prepare for h264/PAFF implementation.
andoma
parents: 5727
diff changeset
3453 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
3454 h->mmco_index= 1;
5784
af2dab646def Augment mmcodecoding process to work properly with fields. Part of PAFF implementation.
andoma
parents: 5783
diff changeset
3455 if (FIELD_PICTURE) {
af2dab646def Augment mmcodecoding process to work properly with fields. Part of PAFF implementation.
andoma
parents: 5783
diff changeset
3456 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
3457 h->mmco[1].opcode= MMCO_SHORT2UNUSED;
af2dab646def Augment mmcodecoding process to work properly with fields. Part of PAFF implementation.
andoma
parents: 5783
diff changeset
3458 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
3459 h->mmco_index= 2;
af2dab646def Augment mmcodecoding process to work properly with fields. Part of PAFF implementation.
andoma
parents: 5783
diff changeset
3460 }
7387
dee39446a364 Remove redundant h->mmco_index= 0.
michael
parents: 7386
diff changeset
3461 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3462 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3463 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3464
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3465 return 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3466 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3467
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3468 static int init_poc(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3469 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3470 const int max_frame_num= 1<<h->sps.log2_max_frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3471 int field_poc[2];
7382
f9e70983fc35 Set field_poc (it was half uninitialized before) and use it
michael
parents: 7381
diff changeset
3472 Picture *cur = s->current_picture_ptr;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3473
7381
16a60b2f7a7d Minor simplification of code in init_poc().
michael
parents: 7380
diff changeset
3474 h->frame_num_offset= h->prev_frame_num_offset;
7380
9faeb82ba80b cosmetics (indent and 2 empty lines)
michael
parents: 7379
diff changeset
3475 if(h->frame_num < h->prev_frame_num)
7381
16a60b2f7a7d Minor simplification of code in init_poc().
michael
parents: 7380
diff changeset
3476 h->frame_num_offset += max_frame_num;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3477
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3478 if(h->sps.poc_type==0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3479 const int max_poc_lsb= 1<<h->sps.log2_max_poc_lsb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3480
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3481 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
3482 h->poc_msb = h->prev_poc_msb + max_poc_lsb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3483 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
3484 h->poc_msb = h->prev_poc_msb - max_poc_lsb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3485 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3486 h->poc_msb = h->prev_poc_msb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3487 //printf("poc: %d %d\n", h->poc_msb, h->poc_lsb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3488 field_poc[0] =
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3489 field_poc[1] = h->poc_msb + h->poc_lsb;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3490 if(s->picture_structure == PICT_FRAME)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3491 field_poc[1] += h->delta_poc_bottom;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3492 }else if(h->sps.poc_type==1){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3493 int abs_frame_num, expected_delta_per_poc_cycle, expectedpoc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3494 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3495
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3496 if(h->sps.poc_cycle_length != 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3497 abs_frame_num = h->frame_num_offset + h->frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3498 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3499 abs_frame_num = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3500
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3501 if(h->nal_ref_idc==0 && abs_frame_num > 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3502 abs_frame_num--;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3503
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3504 expected_delta_per_poc_cycle = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3505 for(i=0; i < h->sps.poc_cycle_length; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3506 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
3507
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3508 if(abs_frame_num > 0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3509 int poc_cycle_cnt = (abs_frame_num - 1) / h->sps.poc_cycle_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3510 int frame_num_in_poc_cycle = (abs_frame_num - 1) % h->sps.poc_cycle_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3511
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3512 expectedpoc = poc_cycle_cnt * expected_delta_per_poc_cycle;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3513 for(i = 0; i <= frame_num_in_poc_cycle; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3514 expectedpoc = expectedpoc + h->sps.offset_for_ref_frame[ i ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3515 } else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3516 expectedpoc = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3517
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3518 if(h->nal_ref_idc == 0)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3519 expectedpoc = expectedpoc + h->sps.offset_for_non_ref_pic;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3520
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3521 field_poc[0] = expectedpoc + h->delta_poc[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3522 field_poc[1] = field_poc[0] + h->sps.offset_for_top_to_bottom_field;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3523
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3524 if(s->picture_structure == PICT_FRAME)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3525 field_poc[1] += h->delta_poc[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3526 }else{
7381
16a60b2f7a7d Minor simplification of code in init_poc().
michael
parents: 7380
diff changeset
3527 int poc= 2*(h->frame_num_offset + h->frame_num);
16a60b2f7a7d Minor simplification of code in init_poc().
michael
parents: 7380
diff changeset
3528
16a60b2f7a7d Minor simplification of code in init_poc().
michael
parents: 7380
diff changeset
3529 if(!h->nal_ref_idc)
16a60b2f7a7d Minor simplification of code in init_poc().
michael
parents: 7380
diff changeset
3530 poc--;
7380
9faeb82ba80b cosmetics (indent and 2 empty lines)
michael
parents: 7379
diff changeset
3531
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3532 field_poc[0]= poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3533 field_poc[1]= poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3534 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3535
7382
f9e70983fc35 Set field_poc (it was half uninitialized before) and use it
michael
parents: 7381
diff changeset
3536 if(s->picture_structure != PICT_BOTTOM_FIELD)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3537 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
3538 if(s->picture_structure != PICT_TOP_FIELD)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3539 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
3540 cur->poc= FFMIN(cur->field_poc[0], cur->field_poc[1]);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3541
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3542 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3543 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3544
5160
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3545
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3546 /**
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3547 * initialize scan tables
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3548 */
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3549 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
3550 MpegEncContext * const s = &h->s;
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3551 int i;
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3552 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
3553 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
3554 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
3555 }else{
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3556 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
3557 #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
3558 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
3559 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
3560 #undef T
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3561 }
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3562 }
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3563 if(s->dsp.h264_idct8_add == ff_h264_idct8_add_c){
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3564 memcpy(h->zigzag_scan8x8, zigzag_scan8x8, 64*sizeof(uint8_t));
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3565 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
3566 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
3567 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
3568 }else{
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3569 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
3570 #define T(x) (x>>3) | ((x&7)<<3)
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3571 h->zigzag_scan8x8[i] = T(zigzag_scan8x8[i]);
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3572 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
3573 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
3574 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
3575 #undef T
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3576 }
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3577 }
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3578 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
3579 h->zigzag_scan_q0 = zigzag_scan;
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3580 h->zigzag_scan8x8_q0 = zigzag_scan8x8;
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3581 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
3582 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
3583 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
3584 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
3585 }else{
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3586 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
3587 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
3588 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
3589 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
3590 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
3591 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
3592 }
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3593 }
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3594
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3595 /**
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3596 * Replicates H264 "master" context to thread contexts.
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3597 */
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3598 static void clone_slice(H264Context *dst, H264Context *src)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3599 {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3600 memcpy(dst->block_offset, src->block_offset, sizeof(dst->block_offset));
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3601 dst->s.current_picture_ptr = src->s.current_picture_ptr;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3602 dst->s.current_picture = src->s.current_picture;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3603 dst->s.linesize = src->s.linesize;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3604 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
3605 dst->s.first_field = src->s.first_field;
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3606
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3607 dst->prev_poc_msb = src->prev_poc_msb;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3608 dst->prev_poc_lsb = src->prev_poc_lsb;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3609 dst->prev_frame_num_offset = src->prev_frame_num_offset;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3610 dst->prev_frame_num = src->prev_frame_num;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3611 dst->short_ref_count = src->short_ref_count;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3612
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3613 memcpy(dst->short_ref, src->short_ref, sizeof(dst->short_ref));
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3614 memcpy(dst->long_ref, src->long_ref, sizeof(dst->long_ref));
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3615 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
3616 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
3617
070a376d496b fix image corruption when with multi-threaded decoding.
gpoirier
parents: 5647
diff changeset
3618 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
3619 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
3620 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3621
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3622 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3623 * decodes a slice header.
6918
c1b722b79649 cosmetics: spelling typo fixes
diego
parents: 6903
diff changeset
3624 * 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
3625 *
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3626 * @param h h264context
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3627 * @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
3628 *
6524
01647ac078a7 typo: occured --> occurred
diego
parents: 6517
diff changeset
3629 * @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
3630 */
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3631 static int decode_slice_header(H264Context *h, H264Context *h0){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3632 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
3633 MpegEncContext * const s0 = &h0->s;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3634 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
3635 unsigned int pps_id;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3636 int num_ref_idx_active_override_flag;
7332
b1003e468c3d Fix used references indexes in the loop filter.
michael
parents: 7327
diff changeset
3637 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
3638 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
3639 int last_pic_structure;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3640
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
3641 s->dropable= h->nal_ref_idc == 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3642
5984
ba13cc3e38bb Initialize function pointers used by error resilience code before any
heydowns
parents: 5963
diff changeset
3643 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
3644 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
3645 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
3646 }else{
ba13cc3e38bb Initialize function pointers used by error resilience code before any
heydowns
parents: 5963
diff changeset
3647 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
3648 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
3649 }
ba13cc3e38bb Initialize function pointers used by error resilience code before any
heydowns
parents: 5963
diff changeset
3650
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3651 first_mb_in_slice= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3652
4616
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
3653 if((s->flags2 & CODEC_FLAG2_CHUNKS) && first_mb_in_slice == 0){
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3654 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
3655 if (!s0->first_field)
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
3656 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
3657 }
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
3658
8451
384600e3fe5b Use get_ue_golomb_31() where possible, almost all are just in headers
michael
parents: 8448
diff changeset
3659 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
3660 if(slice_type > 9){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3661 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
3662 return -1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3663 }
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3664 if(slice_type > 4){
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3665 slice_type -= 5;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3666 h->slice_type_fixed=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3667 }else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3668 h->slice_type_fixed=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3669
8206
5f399949a6a6 Use golomb_to_pict_type instead of its duplicate, slice_type_map.
diego
parents: 8140
diff changeset
3670 slice_type= golomb_to_pict_type[ slice_type ];
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6429
diff changeset
3671 if (slice_type == FF_I_TYPE
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3672 || (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
3673 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
3674 }
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3675 h->slice_type= slice_type;
7338
b088035801d5 Simplify slice type checks.
michael
parents: 7337
diff changeset
3676 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
3677
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
3678 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
3679 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
3680 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
3681 "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
3682 return -1;
5455f4e43948 Make h264 decoder conform to requirements of mpegvideo's MPV_frame_start.
heydowns
parents: 6014
diff changeset
3683 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3684
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3685 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
3686 if(pps_id>=MAX_PPS_COUNT){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3687 av_log(h->s.avctx, AV_LOG_ERROR, "pps_id out of range\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3688 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3689 }
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3690 if(!h0->pps_buffers[pps_id]) {
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
3691 av_log(h->s.avctx, AV_LOG_ERROR, "non-existing PPS referenced\n");
1174
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
3692 return -1;
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
3693 }
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3694 h->pps= *h0->pps_buffers[pps_id];
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3695
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3696 if(!h0->sps_buffers[h->pps.sps_id]) {
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
3697 av_log(h->s.avctx, AV_LOG_ERROR, "non-existing SPS referenced\n");
1174
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
3698 return -1;
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
3699 }
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3700 h->sps = *h0->sps_buffers[h->pps.sps_id];
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3701
5685
070a376d496b fix image corruption when with multi-threaded decoding.
gpoirier
parents: 5647
diff changeset
3702 if(h == h0 && h->dequant_coeff_pps != pps_id){
4363
9b7662fa4905 remove useless cast that makes code unreadable
gpoirier
parents: 4362
diff changeset
3703 h->dequant_coeff_pps = pps_id;
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3704 init_dequant_tables(h);
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3705 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3706
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3707 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
3708 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
3709
3178
bd995b8c64fd Alignment fixes, caused problems on SPARC.
diego
parents: 3177
diff changeset
3710 h->b_stride= s->mb_width*4;
bd995b8c64fd Alignment fixes, caused problems on SPARC.
diego
parents: 3177
diff changeset
3711 h->b8_stride= s->mb_width*2;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3712
6581
e6d8c5bbeeac Avoid crash with idiotic cropping. Fixes crash with CVFC1_Sony_C.jsv
michael
parents: 6524
diff changeset
3713 s->width = 16*s->mb_width - 2*FFMIN(h->sps.crop_right, 7);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3714 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
3715 s->height= 16*s->mb_height - 2*FFMIN(h->sps.crop_bottom, 7);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3716 else
6581
e6d8c5bbeeac Avoid crash with idiotic cropping. Fixes crash with CVFC1_Sony_C.jsv
michael
parents: 6524
diff changeset
3717 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
3718
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3719 if (s->context_initialized
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
3720 && ( s->width != s->avctx->width || s->height != s->avctx->height)) {
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3721 if(h != h0)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3722 return -1; // width / height changed during parallelized decoding
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3723 free_tables(h);
8231
0df3402e6b41 Fix segfault due to deallocated entries in delayed_pic after size change.
michael
parents: 8216
diff changeset
3724 flush_dpb(s->avctx);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3725 MPV_common_end(s);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3726 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3727 if (!s->context_initialized) {
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3728 if(h != h0)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3729 return -1; // we cant (re-)initialize context during parallel decoding
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3730 if (MPV_common_init(s) < 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3731 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
3732 s->first_field = 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3733
5160
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3734 init_scan_tables(h);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3735 alloc_tables(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3736
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3737 for(i = 1; i < s->avctx->thread_count; i++) {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3738 H264Context *c;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3739 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
3740 memcpy(c, h->s.thread_context[i], sizeof(MpegEncContext));
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3741 memset(&c->s + 1, 0, sizeof(H264Context) - sizeof(MpegEncContext));
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3742 c->sps = h->sps;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3743 c->pps = h->pps;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3744 init_scan_tables(c);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3745 clone_tables(c, h);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3746 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3747
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3748 for(i = 0; i < s->avctx->thread_count; i++)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3749 if(context_init(h->thread_context[i]) < 0)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3750 return -1;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3751
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3752 s->avctx->width = s->width;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3753 s->avctx->height = s->height;
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
3754 s->avctx->sample_aspect_ratio= h->sps.sar;
2440
cf97353f94c6 div by zero aspect fix
michael
parents: 2422
diff changeset
3755 if(!s->avctx->sample_aspect_ratio.den)
cf97353f94c6 div by zero aspect fix
michael
parents: 2422
diff changeset
3756 s->avctx->sample_aspect_ratio.den = 1;
2174
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
3757
2648
c3a06b0b00e2 set time_base for variable fps too
michael
parents: 2645
diff changeset
3758 if(h->sps.timing_info_present_flag){
3052
6c3f87300378 interpret H264 VUI timing info correctly
mru
parents: 3036
diff changeset
3759 s->avctx->time_base= (AVRational){h->sps.num_units_in_tick * 2, h->sps.time_scale};
3063
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3052
diff changeset
3760 if(h->x264_build > 0 && h->x264_build < 44)
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3052
diff changeset
3761 s->avctx->time_base.den *= 2;
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3052
diff changeset
3762 av_reduce(&s->avctx->time_base.num, &s->avctx->time_base.den,
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3052
diff changeset
3763 s->avctx->time_base.num, s->avctx->time_base.den, 1<<30);
2174
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
3764 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3765 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3766
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3767 h->frame_num= get_bits(&s->gb, h->sps.log2_max_frame_num);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3768
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3769 h->mb_mbaff = 0;
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3770 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
3771 last_pic_structure = s0->picture_structure;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3772 if(h->sps.frame_mbs_only_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3773 s->picture_structure= PICT_FRAME;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3774 }else{
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3775 if(get_bits1(&s->gb)) { //field_pic_flag
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3776 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
3777 } else {
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3778 s->picture_structure= PICT_FRAME;
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3779 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
3780 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3781 }
7468
38e9f32f8d43 mb_field_decoding_flag was not initialized
michael
parents: 7462
diff changeset
3782 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
3783
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
3784 if(h0->current_slice == 0){
7350
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3785 while(h->frame_num != h->prev_frame_num &&
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3786 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
3787 av_log(NULL, AV_LOG_DEBUG, "Frame num gap %d %d\n", h->frame_num, h->prev_frame_num);
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3788 frame_start(h);
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3789 h->prev_frame_num++;
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3790 h->prev_frame_num %= 1<<h->sps.log2_max_frame_num;
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3791 s->current_picture_ptr->frame_num= h->prev_frame_num;
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3792 execute_ref_pic_marking(h, NULL, 0);
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3793 }
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3794
5798
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3795 /* 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
3796 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
3797 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
3798 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
3799 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
3800
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3801 /* 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
3802 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
3803 /*
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3804 * 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
3805 * 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
3806 */
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3807 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
3808 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
3809
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3810 } else {
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3811 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
3812 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
3813 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
3814 /*
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3815 * 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
3816 * 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
3817 * 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
3818 * purposes.
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3819 */
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3820 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
3821 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
3822
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3823 } else {
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3824 /* 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
3825 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
3826 }
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3827 }
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3828
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3829 } else {
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3830 /* 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
3831 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
3832 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
3833 }
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3834
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3835 if((!FIELD_PICTURE || s0->first_field) && frame_start(h) < 0) {
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3836 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
3837 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
3838 }
5723
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
3839 }
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
3840 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
3841 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
3842
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
3843 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
3844
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3845 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
3846 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
3847 first_mb_in_slice >= s->mb_num){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3848 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
3849 return -1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3850 }
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3851 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
3852 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
3853 if (s->picture_structure == PICT_BOTTOM_FIELD)
0b3aa6f4c313 Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents: 5780
diff changeset
3854 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
3855 assert(s->mb_y < s->mb_height);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3856
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3857 if(s->picture_structure==PICT_FRAME){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3858 h->curr_pic_num= h->frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3859 h->max_pic_num= 1<< h->sps.log2_max_frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3860 }else{
5772
65b71bd21a4d Fix h->curr_pic_num for field pictures. Necessary for proper PAFF support.
andoma
parents: 5771
diff changeset
3861 h->curr_pic_num= 2*h->frame_num + 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3862 h->max_pic_num= 1<<(h->sps.log2_max_frame_num + 1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3863 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3864
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3865 if(h->nal_unit_type == NAL_IDR_SLICE){
1453
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
3866 get_ue_golomb(&s->gb); /* idr_pic_id */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3867 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3868
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3869 if(h->sps.poc_type==0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3870 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
3871
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3872 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3873 h->delta_poc_bottom= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3874 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3875 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3876
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3877 if(h->sps.poc_type==1 && !h->sps.delta_pic_order_always_zero_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3878 h->delta_poc[0]= get_se_golomb(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3879
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3880 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3881 h->delta_poc[1]= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3882 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3883
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3884 init_poc(h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3885
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3886 if(h->pps.redundant_pic_cnt_present){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3887 h->redundant_pic_count= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3888 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3889
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
3890 //set defaults, might be overridden a few lines later
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3891 h->ref_count[0]= h->pps.ref_count[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3892 h->ref_count[1]= h->pps.ref_count[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3893
7338
b088035801d5 Simplify slice type checks.
michael
parents: 7337
diff changeset
3894 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
3895 if(h->slice_type_nos == FF_B_TYPE){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3896 h->direct_spatial_mv_pred= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3897 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3898 num_ref_idx_active_override_flag= get_bits1(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3899
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3900 if(num_ref_idx_active_override_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3901 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
3902 if(h->slice_type_nos==FF_B_TYPE)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3903 h->ref_count[1]= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3904
4532
c296efb7575e fix 2nd ref_count check
michael
parents: 4531
diff changeset
3905 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
3906 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
3907 h->ref_count[0]= h->ref_count[1]= 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3908 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3909 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3910 }
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
3911 if(h->slice_type_nos == FF_B_TYPE)
4532
c296efb7575e fix 2nd ref_count check
michael
parents: 4531
diff changeset
3912 h->list_count= 2;
c296efb7575e fix 2nd ref_count check
michael
parents: 4531
diff changeset
3913 else
c296efb7575e fix 2nd ref_count check
michael
parents: 4531
diff changeset
3914 h->list_count= 1;
c296efb7575e fix 2nd ref_count check
michael
parents: 4531
diff changeset
3915 }else
c296efb7575e fix 2nd ref_count check
michael
parents: 4531
diff changeset
3916 h->list_count= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3917
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3918 if(!default_ref_list_done){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3919 fill_default_ref_list(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3920 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3921
7417
5b281979b60e Simple refactoring to resolve a FIXME. Patch by Paul Kendall.
darkshikari
parents: 7408
diff changeset
3922 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
3923 return -1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3924
7921
44570b9b3aa1 Initialize next/last_picture* as the generic code does not always
michael
parents: 7920
diff changeset
3925 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
3926 s->last_picture_ptr= &h->ref_list[0][0];
7974
2b20ad98e424 Rename copy_picture to ff_copy_picture.
cehoyos
parents: 7928
diff changeset
3927 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
3928 }
44570b9b3aa1 Initialize next/last_picture* as the generic code does not always
michael
parents: 7920
diff changeset
3929 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
3930 s->next_picture_ptr= &h->ref_list[1][0];
7974
2b20ad98e424 Rename copy_picture to ff_copy_picture.
cehoyos
parents: 7928
diff changeset
3931 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
3932 }
44570b9b3aa1 Initialize next/last_picture* as the generic code does not always
michael
parents: 7920
diff changeset
3933
7339
7d5cc12d8fe2 Remove superfluous ().
michael
parents: 7338
diff changeset
3934 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
3935 || (h->pps.weighted_bipred_idc==1 && h->slice_type_nos== FF_B_TYPE ) )
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3936 pred_weight_table(h);
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
3937 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
3938 implicit_weight_table(h);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3939 else
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3940 h->use_weight = 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3941
5723
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
3942 if(h->nal_ref_idc)
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3943 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
3944
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3945 if(FRAME_MBAFF)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3946 fill_mbaff_ref_list(h);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3947
7897
004f3c69fe7b Move direct_dist_scale_factor() and direct_ref_list_init() after fill_mbaff_ref_list()
michael
parents: 7896
diff changeset
3948 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
3949 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
3950 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
3951
7338
b088035801d5 Simplify slice type checks.
michael
parents: 7337
diff changeset
3952 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
3953 tmp = get_ue_golomb_31(&s->gb);
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3954 if(tmp > 2){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3955 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
3956 return -1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3957 }
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3958 h->cabac_init_idc= tmp;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3959 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3960
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3961 h->last_qscale_diff = 0;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3962 tmp = h->pps.init_qp + get_se_golomb(&s->gb);
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3963 if(tmp>51){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3964 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
3965 return -1;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
3966 }
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3967 s->qscale= tmp;
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
3968 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
3969 h->chroma_qp[1] = get_chroma_qp(h, 1, s->qscale);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3970 //FIXME qscale / qp ... stuff
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6429
diff changeset
3971 if(h->slice_type == FF_SP_TYPE){
1453
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
3972 get_bits1(&s->gb); /* sp_for_switch_flag */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3973 }
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6429
diff changeset
3974 if(h->slice_type==FF_SP_TYPE || h->slice_type == FF_SI_TYPE){
1453
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
3975 get_se_golomb(&s->gb); /* slice_qs_delta */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3976 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3977
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3978 h->deblocking_filter = 1;
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
3979 h->slice_alpha_c0_offset = 0;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
3980 h->slice_beta_offset = 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3981 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
3982 tmp= get_ue_golomb_31(&s->gb);
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3983 if(tmp > 2){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3984 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
3985 return -1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3986 }
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3987 h->deblocking_filter= tmp;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3988 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
3989 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
3990
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3991 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
3992 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
3993 h->slice_beta_offset = get_se_golomb(&s->gb) << 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3994 }
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
3995 }
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3996
5698
9a26cb6747a9 Apply skip_loop_filter before checking if we can parallelize with the selected
reimar
parents: 5694
diff changeset
3997 if( s->avctx->skip_loop_filter >= AVDISCARD_ALL
7340
ef40221c1452 SI/SP slice support. (not bitexact)
michael
parents: 7339
diff changeset
3998 ||(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
3999 ||(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
4000 ||(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
4001 h->deblocking_filter= 0;
9a26cb6747a9 Apply skip_loop_filter before checking if we can parallelize with the selected
reimar
parents: 5694
diff changeset
4002
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
4003 if(h->deblocking_filter == 1 && h0->max_contexts > 1) {
5646
adc9ec0f7385 Let H.264 decoder skip deblocking across slices
benoit
parents: 5643
diff changeset
4004 if(s->avctx->flags2 & CODEC_FLAG2_FAST) {
adc9ec0f7385 Let H.264 decoder skip deblocking across slices
benoit
parents: 5643
diff changeset
4005 /* Cheat slightly for speed:
6029
fc51a6ffa64f cosmetics: comment typo fixes
diego
parents: 6020
diff changeset
4006 Do not bother to deblock across slices. */
5646
adc9ec0f7385 Let H.264 decoder skip deblocking across slices
benoit
parents: 5643
diff changeset
4007 h->deblocking_filter = 2;
adc9ec0f7385 Let H.264 decoder skip deblocking across slices
benoit
parents: 5643
diff changeset
4008 } else {
5647
7c139ea9065e Indentation
benoit
parents: 5646
diff changeset
4009 h0->max_contexts = 1;
7c139ea9065e Indentation
benoit
parents: 5646
diff changeset
4010 if(!h0->single_decode_warning) {
7c139ea9065e Indentation
benoit
parents: 5646
diff changeset
4011 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
4012 h0->single_decode_warning = 1;
7c139ea9065e Indentation
benoit
parents: 5646
diff changeset
4013 }
7c139ea9065e Indentation
benoit
parents: 5646
diff changeset
4014 if(h != h0)
7c139ea9065e Indentation
benoit
parents: 5646
diff changeset
4015 return 1; // deblocking switched inside frame
5646
adc9ec0f7385 Let H.264 decoder skip deblocking across slices
benoit
parents: 5643
diff changeset
4016 }
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
4017 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
4018
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4019 #if 0 //FMO
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4020 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
4021 slice_group_change_cycle= get_bits(&s->gb, ?);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4022 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4023
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
4024 h0->last_slice_type = slice_type;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
4025 h->slice_num = ++h0->current_slice;
8079
2d3c7cd7d143 Replace literally hardcoded max slice number by named constant.
michael
parents: 8042
diff changeset
4026 if(h->slice_num >= MAX_SLICES){
2d3c7cd7d143 Replace literally hardcoded max slice number by named constant.
michael
parents: 8042
diff changeset
4027 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
4028 }
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
4029
7343
9a4cb430d8ff Loop filtering with multiple slice types fix.
michael
parents: 7341
diff changeset
4030 for(j=0; j<2; j++){
8079
2d3c7cd7d143 Replace literally hardcoded max slice number by named constant.
michael
parents: 8042
diff changeset
4031 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
4032 ref2frm[0]=
9a4cb430d8ff Loop filtering with multiple slice types fix.
michael
parents: 7341
diff changeset
4033 ref2frm[1]= -1;
7526
3749f13a0d02 Use the correct reference tables for interlaced MBAFF MBs in the loop filter.
michael
parents: 7525
diff changeset
4034 for(i=0; i<16; i++)
7343
9a4cb430d8ff Loop filtering with multiple slice types fix.
michael
parents: 7341
diff changeset
4035 ref2frm[i+2]= 4*h->ref_list[j][i].frame_num
9a4cb430d8ff Loop filtering with multiple slice types fix.
michael
parents: 7341
diff changeset
4036 +(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
4037 ref2frm[18+0]=
3749f13a0d02 Use the correct reference tables for interlaced MBAFF MBs in the loop filter.
michael
parents: 7525
diff changeset
4038 ref2frm[18+1]= -1;
3749f13a0d02 Use the correct reference tables for interlaced MBAFF MBs in the loop filter.
michael
parents: 7525
diff changeset
4039 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
4040 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
4041 +(h->ref_list[j][i].reference&3);
7343
9a4cb430d8ff Loop filtering with multiple slice types fix.
michael
parents: 7341
diff changeset
4042 }
9a4cb430d8ff Loop filtering with multiple slice types fix.
michael
parents: 7341
diff changeset
4043
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4044 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
4045 h->emu_edge_height= (FRAME_MBAFF || FIELD_PICTURE) ? 0 : h->emu_edge_width;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4046
8456
30f2b80242b2 export refs
michael
parents: 8454
diff changeset
4047 s->avctx->refs= h->sps.ref_frame_count;
30f2b80242b2 export refs
michael
parents: 8454
diff changeset
4048
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4049 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
4050 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
4051 h->slice_num,
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
4052 (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
4053 first_mb_in_slice,
7920
b731ef917a01 Print which slices are IDR not just the slice type.
michael
parents: 7919
diff changeset
4054 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
4055 pps_id, h->frame_num,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4056 s->current_picture_ptr->field_poc[0], s->current_picture_ptr->field_poc[1],
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4057 h->ref_count[0], h->ref_count[1],
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4058 s->qscale,
2583
61a08e2b9822 display deblocking strength in FF_DEBUG_PICT_INFO
lorenm
parents: 2582
diff changeset
4059 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
4060 h->use_weight,
6890
5ddf098691d3 print direct_spatial_mv_pred
michael
parents: 6785
diff changeset
4061 h->use_weight==1 && h->use_weight_chroma ? "c" : "",
5ddf098691d3 print direct_spatial_mv_pred
michael
parents: 6785
diff changeset
4062 h->slice_type == FF_B_TYPE ? (h->direct_spatial_mv_pred ? "SPAT" : "TEMP") : ""
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4063 );
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 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4067 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4068
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4069 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4070 *
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4071 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4072 static inline int get_level_prefix(GetBitContext *gb){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4073 unsigned int buf;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4074 int log;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4075
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4076 OPEN_READER(re, gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4077 UPDATE_CACHE(re, gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4078 buf=GET_CACHE(re, gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4079
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4080 log= 32 - av_log2(buf);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4081 #ifdef TRACE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4082 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
4083 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
4084 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4085
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4086 LAST_SKIP_BITS(re, gb, log);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4087 CLOSE_READER(re, gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4088
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4089 return log-1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4090 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4091
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4092 static inline int get_dct8x8_allowed(H264Context *h){
8411
b749b637ecfa Optimize get_dct8x8_allowed().
michael
parents: 8405
diff changeset
4093 if(h->sps.direct_8x8_inference_flag)
b749b637ecfa Optimize get_dct8x8_allowed().
michael
parents: 8405
diff changeset
4094 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
4095 else
b749b637ecfa Optimize get_dct8x8_allowed().
michael
parents: 8405
diff changeset
4096 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
4097 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4098
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4099 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4100 * decodes a residual block.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4101 * @param n block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4102 * @param scantable scantable
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4103 * @param max_coeff number of coefficients in the block
6524
01647ac078a7 typo: occured --> occurred
diego
parents: 6517
diff changeset
4104 * @return <0 if an error occurred
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4105 */
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
4106 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
4107 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4108 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
4109 int level[16];
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4110 int zeros_left, coeff_num, coeff_token, total_coeff, i, j, trailing_ones, run_before;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4111
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4112 //FIXME put trailing_onex into the context
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4113
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4114 if(n == CHROMA_DC_BLOCK_INDEX){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4115 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
4116 total_coeff= coeff_token>>2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4117 }else{
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4118 if(n == LUMA_DC_BLOCK_INDEX){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4119 total_coeff= pred_non_zero_count(h, 0);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4120 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
4121 total_coeff= coeff_token>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4122 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4123 total_coeff= pred_non_zero_count(h, n);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4124 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
4125 total_coeff= coeff_token>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4126 h->non_zero_count_cache[ scan8[n] ]= total_coeff;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4127 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4128 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4129
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4130 //FIXME set last_non_zero?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4131
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4132 if(total_coeff==0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4133 return 0;
4391
20944c70a3c0 fix segfault with darkkben.free.fr/corrupted_h264.mp4
michael
parents: 4390
diff changeset
4134 if(total_coeff > (unsigned)max_coeff) {
20944c70a3c0 fix segfault with darkkben.free.fr/corrupted_h264.mp4
michael
parents: 4390
diff changeset
4135 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
4136 return -1;
758ba4a18478 fix crash when decoding a truncated H264 slice
gpoirier
parents: 4269
diff changeset
4137 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4138
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4139 trailing_ones= coeff_token&3;
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
4140 tprintf(h->s.avctx, "trailing:%d, total:%d\n", trailing_ones, total_coeff);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4141 assert(total_coeff<=16);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4142
8386
102b197185d1 Faster CAVLC decoding of trailing_ones. Based on a patch by dark shikari.
michael
parents: 8385
diff changeset
4143 i = show_bits(gb, 3);
102b197185d1 Faster CAVLC decoding of trailing_ones. Based on a patch by dark shikari.
michael
parents: 8385
diff changeset
4144 skip_bits(gb, trailing_ones);
102b197185d1 Faster CAVLC decoding of trailing_ones. Based on a patch by dark shikari.
michael
parents: 8385
diff changeset
4145 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
4146 level[1] = 1-((i&2) );
102b197185d1 Faster CAVLC decoding of trailing_ones. Based on a patch by dark shikari.
michael
parents: 8385
diff changeset
4147 level[2] = 1-((i&1)<<1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4148
8385
af35581ac2ca Replace i by trailing_ones, part of a patch by dark shikari.
michael
parents: 8384
diff changeset
4149 if(trailing_ones<total_coeff) {
8447
42198817a5ba Use the new VLC table for the first non trailing coeff too.
michael
parents: 8446
diff changeset
4150 int mask, prefix;
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4151 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
4152 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
4153 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
4154
42198817a5ba Use the new VLC table for the first non trailing coeff too.
michael
parents: 8446
diff changeset
4155 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
4156 if(level_code >= 100){
42198817a5ba Use the new VLC table for the first non trailing coeff too.
michael
parents: 8446
diff changeset
4157 prefix= level_code - 100;
42198817a5ba Use the new VLC table for the first non trailing coeff too.
michael
parents: 8446
diff changeset
4158 if(prefix == LEVEL_TAB_BITS)
42198817a5ba Use the new VLC table for the first non trailing coeff too.
michael
parents: 8446
diff changeset
4159 prefix += get_level_prefix(gb);
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4160
8448
michael
parents: 8447
diff changeset
4161 //first coefficient has suffix_length equal to 0 or 1
michael
parents: 8447
diff changeset
4162 if(prefix<14){ //FIXME try to build a large unified VLC table for all this
michael
parents: 8447
diff changeset
4163 if(suffix_length)
michael
parents: 8447
diff changeset
4164 level_code= (prefix<<suffix_length) + get_bits(gb, suffix_length); //part
michael
parents: 8447
diff changeset
4165 else
michael
parents: 8447
diff changeset
4166 level_code= (prefix<<suffix_length); //part
michael
parents: 8447
diff changeset
4167 }else if(prefix==14){
michael
parents: 8447
diff changeset
4168 if(suffix_length)
michael
parents: 8447
diff changeset
4169 level_code= (prefix<<suffix_length) + get_bits(gb, suffix_length); //part
michael
parents: 8447
diff changeset
4170 else
michael
parents: 8447
diff changeset
4171 level_code= prefix + get_bits(gb, 4); //part
michael
parents: 8447
diff changeset
4172 }else{
michael
parents: 8447
diff changeset
4173 level_code= (15<<suffix_length) + get_bits(gb, prefix-3); //part
michael
parents: 8447
diff changeset
4174 if(suffix_length==0) level_code+=15; //FIXME doesn't make (much)sense
michael
parents: 8447
diff changeset
4175 if(prefix>=16)
michael
parents: 8447
diff changeset
4176 level_code += (1<<(prefix-3))-4096;
michael
parents: 8447
diff changeset
4177 }
michael
parents: 8447
diff changeset
4178
michael
parents: 8447
diff changeset
4179 if(trailing_ones < 3) level_code += 2;
michael
parents: 8447
diff changeset
4180
michael
parents: 8447
diff changeset
4181 suffix_length = 2;
michael
parents: 8447
diff changeset
4182 mask= -(level_code&1);
michael
parents: 8447
diff changeset
4183 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
4184 }else{
42198817a5ba Use the new VLC table for the first non trailing coeff too.
michael
parents: 8446
diff changeset
4185 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
4186
42198817a5ba Use the new VLC table for the first non trailing coeff too.
michael
parents: 8446
diff changeset
4187 suffix_length = 1;
42198817a5ba Use the new VLC table for the first non trailing coeff too.
michael
parents: 8446
diff changeset
4188 if(level_code + 3U > 6U)
42198817a5ba Use the new VLC table for the first non trailing coeff too.
michael
parents: 8446
diff changeset
4189 suffix_length++;
42198817a5ba Use the new VLC table for the first non trailing coeff too.
michael
parents: 8446
diff changeset
4190 level[trailing_ones]= level_code;
42198817a5ba Use the new VLC table for the first non trailing coeff too.
michael
parents: 8446
diff changeset
4191 }
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4192
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4193 //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
4194 for(i=trailing_ones+1;i<total_coeff;i++) {
8443
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
4195 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
4196 int bitsi= show_bits(gb, LEVEL_TAB_BITS);
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
4197 level_code= cavlc_level_tab[suffix_length][bitsi][0];
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
4198
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
4199 skip_bits(gb, cavlc_level_tab[suffix_length][bitsi][1]);
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
4200 if(level_code >= 100){
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
4201 prefix= level_code - 100;
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
4202 if(prefix == LEVEL_TAB_BITS){
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
4203 prefix += get_level_prefix(gb);
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
4204 }
8444
michael
parents: 8443
diff changeset
4205 if(prefix<15){
michael
parents: 8443
diff changeset
4206 level_code = (prefix<<suffix_length) + get_bits(gb, suffix_length);
michael
parents: 8443
diff changeset
4207 }else{
michael
parents: 8443
diff changeset
4208 level_code = (15<<suffix_length) + get_bits(gb, prefix-3);
michael
parents: 8443
diff changeset
4209 if(prefix>=16)
michael
parents: 8443
diff changeset
4210 level_code += (1<<(prefix-3))-4096;
michael
parents: 8443
diff changeset
4211 }
michael
parents: 8443
diff changeset
4212 mask= -(level_code&1);
8443
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
4213 level_code= (((2+level_code)>>1) ^ mask) - mask;
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
4214 }
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
4215 level[i]= level_code;
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
4216
cf81cdbf8ca9 unified CAVLC level decoding LUT.
michael
parents: 8441
diff changeset
4217 if(suffix_limit[suffix_length] + level_code > 2U*suffix_limit[suffix_length])
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4218 suffix_length++;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4219 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4220 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4221
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4222 if(total_coeff == max_coeff)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4223 zeros_left=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4224 else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4225 if(n == CHROMA_DC_BLOCK_INDEX)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4226 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
4227 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4228 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
4229 }
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4230
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4231 coeff_num = zeros_left + total_coeff - 1;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4232 j = scantable[coeff_num];
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4233 if(n > 24){
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4234 block[j] = level[0];
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4235 for(i=1;i<total_coeff;i++) {
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4236 if(zeros_left <= 0)
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4237 run_before = 0;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4238 else if(zeros_left < 7){
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4239 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
4240 }else{
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4241 run_before= get_vlc2(gb, run7_vlc.table, RUN7_VLC_BITS, 2);
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4242 }
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4243 zeros_left -= run_before;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4244 coeff_num -= 1 + run_before;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4245 j= scantable[ coeff_num ];
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4246
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4247 block[j]= level[i];
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4248 }
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4249 }else{
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
4250 block[j] = (level[0] * qmul[j] + 32)>>6;
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4251 for(i=1;i<total_coeff;i++) {
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4252 if(zeros_left <= 0)
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4253 run_before = 0;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4254 else if(zeros_left < 7){
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4255 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
4256 }else{
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4257 run_before= get_vlc2(gb, run7_vlc.table, RUN7_VLC_BITS, 2);
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4258 }
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4259 zeros_left -= run_before;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4260 coeff_num -= 1 + run_before;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4261 j= scantable[ coeff_num ];
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4262
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
4263 block[j]= (level[i] * qmul[j] + 32)>>6;
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4264 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4265 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4266
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4267 if(zeros_left<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
4268 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
4269 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4270 }
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4271
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4272 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4273 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4274
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4275 static void predict_field_decoding_flag(H264Context *h){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4276 MpegEncContext * const s = &h->s;
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
4277 const int mb_xy= h->mb_xy;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4278 int mb_type = (h->slice_table[mb_xy-1] == h->slice_num)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4279 ? s->current_picture.mb_type[mb_xy-1]
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4280 : (h->slice_table[mb_xy-s->mb_stride] == h->slice_num)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4281 ? s->current_picture.mb_type[mb_xy-s->mb_stride]
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4282 : 0;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4283 h->mb_mbaff = h->mb_field_decoding_flag = IS_INTERLACED(mb_type) ? 1 : 0;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4284 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4285
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4286 /**
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4287 * decodes a P_SKIP or B_SKIP macroblock
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4288 */
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4289 static void decode_mb_skip(H264Context *h){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4290 MpegEncContext * const s = &h->s;
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
4291 const int mb_xy= h->mb_xy;
2674
58fb8e1efcae 10l (mb_type uninitalized and then changed and overwritten)
michael
parents: 2673
diff changeset
4292 int mb_type=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4293
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4294 memset(h->non_zero_count[mb_xy], 0, 16);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4295 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
4296
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4297 if(MB_FIELD)
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
4298 mb_type|= MB_TYPE_INTERLACED;
2674
58fb8e1efcae 10l (mb_type uninitalized and then changed and overwritten)
michael
parents: 2673
diff changeset
4299
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
4300 if( h->slice_type_nos == FF_B_TYPE )
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4301 {
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4302 // 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
4303 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
4304
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
4305 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
4306 pred_direct_motion(h, &mb_type);
3927
f44a3341bfdf simplify write_back_motion for skip mbs
lorenm
parents: 3807
diff changeset
4307 mb_type|= MB_TYPE_SKIP;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4308 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4309 else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4310 {
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4311 int mx, my;
2674
58fb8e1efcae 10l (mb_type uninitalized and then changed and overwritten)
michael
parents: 2673
diff changeset
4312 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
4313
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
4314 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
4315 pred_pskip_motion(h, &mx, &my);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4316 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
4317 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
4318 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4319
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4320 write_back_motion(h, mb_type);
3927
f44a3341bfdf simplify write_back_motion for skip mbs
lorenm
parents: 3807
diff changeset
4321 s->current_picture.mb_type[mb_xy]= mb_type;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4322 s->current_picture.qscale_table[mb_xy]= s->qscale;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4323 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
4324 h->prev_mb_skipped= 1;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4325 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4326
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4327 /**
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4328 * decodes a macroblock
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
4329 * @returns 0 if OK, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4330 */
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4331 static int decode_mb_cavlc(H264Context *h){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4332 MpegEncContext * const s = &h->s;
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
4333 int mb_xy;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4334 int partition_count;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4335 unsigned int mb_type, cbp;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4336 int dct8x8_allowed= h->pps.transform_8x8_mode;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4337
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
4338 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
4339
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
4340 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
4341 cbp = 0; /* avoid warning. FIXME: find a solution without slowing
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
4342 down the code */
7338
b088035801d5 Simplify slice type checks.
michael
parents: 7337
diff changeset
4343 if(h->slice_type_nos != FF_I_TYPE){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4344 if(s->mb_skip_run==-1)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4345 s->mb_skip_run= get_ue_golomb(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4346
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4347 if (s->mb_skip_run--) {
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4348 if(FRAME_MBAFF && (s->mb_y&1) == 0){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4349 if(s->mb_skip_run==0)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4350 h->mb_mbaff = h->mb_field_decoding_flag = get_bits1(&s->gb);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4351 else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4352 predict_field_decoding_flag(h);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4353 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4354 decode_mb_skip(h);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4355 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4356 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4357 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4358 if(FRAME_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4359 if( (s->mb_y&1) == 0 )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4360 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
4361 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4362
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
4363 h->prev_mb_skipped= 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4364
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4365 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
4366 if(h->slice_type_nos == FF_B_TYPE){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4367 if(mb_type < 23){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4368 partition_count= b_mb_type_info[mb_type].partition_count;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4369 mb_type= b_mb_type_info[mb_type].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4370 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4371 mb_type -= 23;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4372 goto decode_intra_mb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4373 }
7340
ef40221c1452 SI/SP slice support. (not bitexact)
michael
parents: 7339
diff changeset
4374 }else if(h->slice_type_nos == FF_P_TYPE){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4375 if(mb_type < 5){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4376 partition_count= p_mb_type_info[mb_type].partition_count;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4377 mb_type= p_mb_type_info[mb_type].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4378 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4379 mb_type -= 5;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4380 goto decode_intra_mb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4381 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4382 }else{
7340
ef40221c1452 SI/SP slice support. (not bitexact)
michael
parents: 7339
diff changeset
4383 assert(h->slice_type_nos == FF_I_TYPE);
ef40221c1452 SI/SP slice support. (not bitexact)
michael
parents: 7339
diff changeset
4384 if(h->slice_type == FF_SI_TYPE && mb_type)
ef40221c1452 SI/SP slice support. (not bitexact)
michael
parents: 7339
diff changeset
4385 mb_type--;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4386 decode_intra_mb:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4387 if(mb_type > 25){
3954
00a12ef7d800 output typo fixes
diego
parents: 3948
diff changeset
4388 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
4389 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4390 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4391 partition_count=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4392 cbp= i_mb_type_info[mb_type].cbp;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4393 h->intra16x16_pred_mode= i_mb_type_info[mb_type].pred_mode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4394 mb_type= i_mb_type_info[mb_type].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4395 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4396
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4397 if(MB_FIELD)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4398 mb_type |= MB_TYPE_INTERLACED;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4399
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4400 h->slice_table[ mb_xy ]= h->slice_num;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4401
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4402 if(IS_INTRA_PCM(mb_type)){
7450
30d38a880fde Simplify intra PCM MB handling.
michael
parents: 7445
diff changeset
4403 unsigned int x;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4404
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5106
diff changeset
4405 // We assume these blocks are very rare so we do not optimize it.
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4406 align_get_bits(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4407
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4408 // 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
4409 for(x=0; x < (CHROMA ? 384 : 256); x++){
30d38a880fde Simplify intra PCM MB handling.
michael
parents: 7445
diff changeset
4410 ((uint8_t*)h->mb)[x]= get_bits(&s->gb, 8);
7407
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
4411 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4412
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
4413 // In deblocking, the quantizer is 0
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4414 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
4415 // 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
4416 memset(h->non_zero_count[mb_xy], 16, 16);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4417
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4418 s->current_picture.mb_type[mb_xy]= mb_type;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4419 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4420 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4421
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4422 if(MB_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4423 h->ref_count[0] <<= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4424 h->ref_count[1] <<= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4425 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4426
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
4427 fill_caches(h, mb_type, 0);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4428
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4429 //mb_pred
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4430 if(IS_INTRA(mb_type)){
7408
michael
parents: 7407
diff changeset
4431 int pred_mode;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4432 // init_top_left_availability(h);
7408
michael
parents: 7407
diff changeset
4433 if(IS_INTRA4x4(mb_type)){
michael
parents: 7407
diff changeset
4434 int i;
michael
parents: 7407
diff changeset
4435 int di = 1;
michael
parents: 7407
diff changeset
4436 if(dct8x8_allowed && get_bits1(&s->gb)){
michael
parents: 7407
diff changeset
4437 mb_type |= MB_TYPE_8x8DCT;
michael
parents: 7407
diff changeset
4438 di = 4;
michael
parents: 7407
diff changeset
4439 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4440
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4441 // fill_intra4x4_pred_table(h);
7408
michael
parents: 7407
diff changeset
4442 for(i=0; i<16; i+=di){
michael
parents: 7407
diff changeset
4443 int mode= pred_intra_mode(h, i);
michael
parents: 7407
diff changeset
4444
michael
parents: 7407
diff changeset
4445 if(!get_bits1(&s->gb)){
michael
parents: 7407
diff changeset
4446 const int rem_mode= get_bits(&s->gb, 3);
michael
parents: 7407
diff changeset
4447 mode = rem_mode + (rem_mode >= mode);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4448 }
7408
michael
parents: 7407
diff changeset
4449
michael
parents: 7407
diff changeset
4450 if(di==4)
michael
parents: 7407
diff changeset
4451 fill_rectangle( &h->intra4x4_pred_mode_cache[ scan8[i] ], 2, 2, 8, mode, 1 );
michael
parents: 7407
diff changeset
4452 else
michael
parents: 7407
diff changeset
4453 h->intra4x4_pred_mode_cache[ scan8[i] ] = mode;
michael
parents: 7407
diff changeset
4454 }
michael
parents: 7407
diff changeset
4455 write_back_intra_pred_mode(h);
michael
parents: 7407
diff changeset
4456 if( check_intra4x4_pred_mode(h) < 0)
michael
parents: 7407
diff changeset
4457 return -1;
michael
parents: 7407
diff changeset
4458 }else{
michael
parents: 7407
diff changeset
4459 h->intra16x16_pred_mode= check_intra_pred_mode(h, h->intra16x16_pred_mode);
michael
parents: 7407
diff changeset
4460 if(h->intra16x16_pred_mode < 0)
michael
parents: 7407
diff changeset
4461 return -1;
michael
parents: 7407
diff changeset
4462 }
michael
parents: 7407
diff changeset
4463 if(CHROMA){
8451
384600e3fe5b Use get_ue_golomb_31() where possible, almost all are just in headers
michael
parents: 8448
diff changeset
4464 pred_mode= 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
4465 if(pred_mode < 0)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4466 return -1;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4467 h->chroma_pred_mode= pred_mode;
7408
michael
parents: 7407
diff changeset
4468 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4469 }else if(partition_count==4){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4470 int i, j, sub_partition_count[4], list, ref[2][4];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4471
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
4472 if(h->slice_type_nos == FF_B_TYPE){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4473 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
4474 h->sub_mb_type[i]= get_ue_golomb_31(&s->gb);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4475 if(h->sub_mb_type[i] >=13){
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4476 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
4477 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4478 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4479 sub_partition_count[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4480 h->sub_mb_type[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4481 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4482 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
4483 || 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
4484 pred_direct_motion(h, &mb_type);
3003
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
4485 h->ref_cache[0][scan8[4]] =
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
4486 h->ref_cache[1][scan8[4]] =
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
4487 h->ref_cache[0][scan8[12]] =
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
4488 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
4489 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4490 }else{
7338
b088035801d5 Simplify slice type checks.
michael
parents: 7337
diff changeset
4491 assert(h->slice_type_nos == FF_P_TYPE); //FIXME SP correct ?
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4492 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
4493 h->sub_mb_type[i]= get_ue_golomb_31(&s->gb);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4494 if(h->sub_mb_type[i] >=4){
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4495 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
4496 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4497 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4498 sub_partition_count[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4499 h->sub_mb_type[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4500 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4501 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4502
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
4503 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
4504 int ref_count= IS_REF0(mb_type) ? 1 : h->ref_count[list];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4505 for(i=0; i<4; i++){
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4506 if(IS_DIRECT(h->sub_mb_type[i])) continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4507 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
4508 unsigned int tmp;
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4509 if(ref_count == 1){
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4510 tmp= 0;
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4511 }else if(ref_count == 2){
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4512 tmp= get_bits1(&s->gb)^1;
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4513 }else{
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4514 tmp= get_ue_golomb_31(&s->gb);
8453
michael
parents: 8452
diff changeset
4515 if(tmp>=ref_count){
michael
parents: 8452
diff changeset
4516 av_log(h->s.avctx, AV_LOG_ERROR, "ref %u overflow\n", tmp);
michael
parents: 8452
diff changeset
4517 return -1;
michael
parents: 8452
diff changeset
4518 }
8452
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4519 }
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4520 ref[list][i]= tmp;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4521 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4522 //FIXME
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4523 ref[list][i] = -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4524 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4525 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4526 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4527
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4528 if(dct8x8_allowed)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4529 dct8x8_allowed = get_dct8x8_allowed(h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4530
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
4531 for(list=0; list<h->list_count; list++){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4532 for(i=0; i<4; i++){
3003
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
4533 if(IS_DIRECT(h->sub_mb_type[i])) {
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
4534 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
4535 continue;
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
4536 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4537 h->ref_cache[list][ scan8[4*i] ]=h->ref_cache[list][ scan8[4*i]+1 ]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4538 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
4539
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4540 if(IS_DIR(h->sub_mb_type[i], 0, list)){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4541 const int sub_mb_type= h->sub_mb_type[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4542 const int block_width= (sub_mb_type & (MB_TYPE_16x16|MB_TYPE_16x8)) ? 2 : 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4543 for(j=0; j<sub_partition_count[i]; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4544 int mx, my;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4545 const int index= 4*i + block_width*j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4546 int16_t (* mv_cache)[2]= &h->mv_cache[list][ scan8[index] ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4547 pred_motion(h, index, block_width, list, h->ref_cache[list][ scan8[index] ], &mx, &my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4548 mx += get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4549 my += get_se_golomb(&s->gb);
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
4550 tprintf(s->avctx, "final mv:%d %d\n", mx, my);
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
4551
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4552 if(IS_SUB_8X8(sub_mb_type)){
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
4553 mv_cache[ 1 ][0]=
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4554 mv_cache[ 8 ][0]= mv_cache[ 9 ][0]= mx;
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
4555 mv_cache[ 1 ][1]=
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4556 mv_cache[ 8 ][1]= mv_cache[ 9 ][1]= my;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4557 }else if(IS_SUB_8X4(sub_mb_type)){
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
4558 mv_cache[ 1 ][0]= mx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
4559 mv_cache[ 1 ][1]= my;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4560 }else if(IS_SUB_4X8(sub_mb_type)){
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
4561 mv_cache[ 8 ][0]= mx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
4562 mv_cache[ 8 ][1]= my;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4563 }
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
4564 mv_cache[ 0 ][0]= mx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
4565 mv_cache[ 0 ][1]= my;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4566 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4567 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4568 uint32_t *p= (uint32_t *)&h->mv_cache[list][ scan8[4*i] ][0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4569 p[0] = p[1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4570 p[8] = p[9]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4571 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4572 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4573 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4574 }else if(IS_DIRECT(mb_type)){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4575 pred_direct_motion(h, &mb_type);
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4576 dct8x8_allowed &= h->sps.direct_8x8_inference_flag;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4577 }else{
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4578 int list, mx, my, i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4579 //FIXME we should set ref_idx_l? to 0 if we use that later ...
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4580 if(IS_16X16(mb_type)){
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4581 for(list=0; list<h->list_count; list++){
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4582 unsigned int val;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4583 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
4584 if(h->ref_count[list]==1){
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4585 val= 0;
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4586 }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
4587 val= get_bits1(&s->gb)^1;
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4588 }else{
8453
michael
parents: 8452
diff changeset
4589 val= get_ue_golomb_31(&s->gb);
michael
parents: 8452
diff changeset
4590 if(val >= h->ref_count[list]){
michael
parents: 8452
diff changeset
4591 av_log(h->s.avctx, AV_LOG_ERROR, "ref %u overflow\n", val);
michael
parents: 8452
diff changeset
4592 return -1;
michael
parents: 8452
diff changeset
4593 }
8452
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4594 }
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
4595 }else
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4596 val= LIST_NOT_USED&0xFF;
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4597 fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, val, 1);
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4598 }
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4599 for(list=0; list<h->list_count; list++){
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4600 unsigned int val;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4601 if(IS_DIR(mb_type, 0, list)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4602 pred_motion(h, 0, 4, list, h->ref_cache[list][ scan8[0] ], &mx, &my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4603 mx += get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4604 my += get_se_golomb(&s->gb);
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
4605 tprintf(s->avctx, "final mv:%d %d\n", mx, my);
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
4606
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4607 val= pack16to32(mx,my);
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
4608 }else
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4609 val=0;
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4610 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, val, 4);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4611 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4612 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4613 else if(IS_16X8(mb_type)){
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4614 for(list=0; list<h->list_count; list++){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4615 for(i=0; i<2; i++){
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4616 unsigned int val;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4617 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
4618 if(h->ref_count[list] == 1){
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4619 val= 0;
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4620 }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
4621 val= get_bits1(&s->gb)^1;
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4622 }else{
8453
michael
parents: 8452
diff changeset
4623 val= get_ue_golomb_31(&s->gb);
michael
parents: 8452
diff changeset
4624 if(val >= h->ref_count[list]){
michael
parents: 8452
diff changeset
4625 av_log(h->s.avctx, AV_LOG_ERROR, "ref %u overflow\n", val);
michael
parents: 8452
diff changeset
4626 return -1;
michael
parents: 8452
diff changeset
4627 }
8452
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4628 }
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
4629 }else
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4630 val= LIST_NOT_USED&0xFF;
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4631 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, val, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4632 }
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4633 }
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4634 for(list=0; list<h->list_count; list++){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4635 for(i=0; i<2; i++){
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4636 unsigned int val;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4637 if(IS_DIR(mb_type, i, list)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4638 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
4639 mx += get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4640 my += get_se_golomb(&s->gb);
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
4641 tprintf(s->avctx, "final mv:%d %d\n", mx, my);
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
4642
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4643 val= pack16to32(mx,my);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4644 }else
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4645 val=0;
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4646 fill_rectangle(h->mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, val, 4);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4647 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4648 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4649 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4650 assert(IS_8X16(mb_type));
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4651 for(list=0; list<h->list_count; list++){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4652 for(i=0; i<2; i++){
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4653 unsigned int val;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4654 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
4655 if(h->ref_count[list]==1){
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4656 val= 0;
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4657 }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
4658 val= get_bits1(&s->gb)^1;
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4659 }else{
8453
michael
parents: 8452
diff changeset
4660 val= get_ue_golomb_31(&s->gb);
michael
parents: 8452
diff changeset
4661 if(val >= h->ref_count[list]){
michael
parents: 8452
diff changeset
4662 av_log(h->s.avctx, AV_LOG_ERROR, "ref %u overflow\n", val);
michael
parents: 8452
diff changeset
4663 return -1;
michael
parents: 8452
diff changeset
4664 }
8452
06d4e91d7c24 Integrate get_te0_golomb() calls into the code, this allows some checks
michael
parents: 8451
diff changeset
4665 }
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
4666 }else
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4667 val= LIST_NOT_USED&0xFF;
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4668 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, val, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4669 }
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4670 }
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4671 for(list=0; list<h->list_count; list++){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4672 for(i=0; i<2; i++){
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4673 unsigned int val;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4674 if(IS_DIR(mb_type, i, list)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4675 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
4676 mx += get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4677 my += get_se_golomb(&s->gb);
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
4678 tprintf(s->avctx, "final mv:%d %d\n", mx, my);
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
4679
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4680 val= pack16to32(mx,my);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4681 }else
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4682 val=0;
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4683 fill_rectangle(h->mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, val, 4);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4684 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4685 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4686 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4687 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4688
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4689 if(IS_INTER(mb_type))
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4690 write_back_motion(h, mb_type);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4691
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4692 if(!IS_INTRA16x16(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4693 cbp= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4694 if(cbp > 47){
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4695 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
4696 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4697 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4698
7407
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
4699 if(CHROMA){
7408
michael
parents: 7407
diff changeset
4700 if(IS_INTRA4x4(mb_type)) cbp= golomb_to_intra4x4_cbp[cbp];
michael
parents: 7407
diff changeset
4701 else cbp= golomb_to_inter_cbp [cbp];
7407
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
4702 }else{
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
4703 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
4704 else cbp= golomb_to_inter_cbp_gray[cbp];
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
4705 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4706 }
3651
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
4707 h->cbp = cbp;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4708
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4709 if(dct8x8_allowed && (cbp&15) && !IS_INTRA(mb_type)){
7378
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
4710 if(get_bits1(&s->gb)){
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4711 mb_type |= MB_TYPE_8x8DCT;
7378
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
4712 h->cbp_table[mb_xy]= cbp;
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
4713 }
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4714 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4715 s->current_picture.mb_type[mb_xy]= mb_type;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4716
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4717 if(cbp || IS_INTRA16x16(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4718 int i8x8, i4x4, chroma_idx;
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
4719 int dquant;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4720 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
4721 const uint8_t *scan, *scan8x8, *dc_scan;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4722
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4723 // fill_non_zero_count_cache(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4724
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4725 if(IS_INTERLACED(mb_type)){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4726 scan8x8= s->qscale ? h->field_scan8x8_cavlc : h->field_scan8x8_cavlc_q0;
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
4727 scan= s->qscale ? h->field_scan : h->field_scan_q0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4728 dc_scan= luma_dc_field_scan;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4729 }else{
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4730 scan8x8= s->qscale ? h->zigzag_scan8x8_cavlc : h->zigzag_scan8x8_cavlc_q0;
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
4731 scan= s->qscale ? h->zigzag_scan : h->zigzag_scan_q0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4732 dc_scan= luma_dc_zigzag_scan;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4733 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4734
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4735 dquant= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4736
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4737 if( dquant > 25 || dquant < -26 ){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
4738 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
4739 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4740 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4741
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4742 s->qscale += dquant;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4743 if(((unsigned)s->qscale) > 51){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4744 if(s->qscale<0) s->qscale+= 52;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4745 else s->qscale-= 52;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4746 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4747
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
4748 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
4749 h->chroma_qp[1]= get_chroma_qp(h, 1, s->qscale);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4750 if(IS_INTRA16x16(mb_type)){
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
4751 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
4752 return -1; //FIXME continue if partitioned and other return -1 too
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4753 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4754
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4755 assert((cbp&15) == 0 || (cbp&15) == 15);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4756
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4757 if(cbp&15){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4758 for(i8x8=0; i8x8<4; i8x8++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4759 for(i4x4=0; i4x4<4; i4x4++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4760 const int index= i4x4 + 4*i8x8;
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
4761 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
4762 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4763 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4764 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4765 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4766 }else{
1636
d9d98cdcfcde intra16x16 fix
michael
parents: 1598
diff changeset
4767 fill_rectangle(&h->non_zero_count_cache[scan8[0]], 4, 4, 8, 0, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4768 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4769 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4770 for(i8x8=0; i8x8<4; i8x8++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4771 if(cbp & (1<<i8x8)){
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4772 if(IS_8x8DCT(mb_type)){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4773 DCTELEM *buf = &h->mb[64*i8x8];
2757
fa1c8955e291 remove mixed code/declarations
mru
parents: 2755
diff changeset
4774 uint8_t *nnz;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4775 for(i4x4=0; i4x4<4; i4x4++){
3174
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
4776 if( decode_residual(h, gb, buf, i4x4+4*i8x8, scan8x8+16*i4x4,
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
4777 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
4778 return -1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4779 }
2757
fa1c8955e291 remove mixed code/declarations
mru
parents: 2755
diff changeset
4780 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
4781 nnz[0] += nnz[1] + nnz[8] + nnz[9];
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4782 }else{
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4783 for(i4x4=0; i4x4<4; i4x4++){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4784 const int index= i4x4 + 4*i8x8;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4785
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
4786 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
4787 return -1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4788 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4789 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4790 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4791 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4792 uint8_t * const nnz= &h->non_zero_count_cache[ scan8[4*i8x8] ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4793 nnz[0] = nnz[1] = nnz[8] = nnz[9] = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4794 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4795 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4796 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4797
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4798 if(cbp&0x30){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4799 for(chroma_idx=0; chroma_idx<2; chroma_idx++)
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
4800 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
4801 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4802 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4803 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4804
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4805 if(cbp&0x20){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4806 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
4807 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
4808 for(i4x4=0; i4x4<4; i4x4++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4809 const int index= 16 + 4*chroma_idx + i4x4;
5225
099c495618c1 Compute the dequant coefficient table ptr outside the loop,
gpoirier
parents: 5215
diff changeset
4810 if( decode_residual(h, gb, h->mb + 16*index, index, scan + 1, qmul, 15) < 0){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4811 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4812 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4813 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4814 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4815 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4816 uint8_t * const nnz= &h->non_zero_count_cache[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4817 nnz[ scan8[16]+0 ] = nnz[ scan8[16]+1 ] =nnz[ scan8[16]+8 ] =nnz[ scan8[16]+9 ] =
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4818 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
4819 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4820 }else{
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
4821 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
4822 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
4823 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
4824 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
4825 }
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
4826 s->current_picture.qscale_table[mb_xy]= s->qscale;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4827 write_back_non_zero_count(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4828
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4829 if(MB_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4830 h->ref_count[0] >>= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4831 h->ref_count[1] >>= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4832 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4833
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4834 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4835 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4836
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4837 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
4838 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
4839 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
4840 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
4841 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
4842 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
4843
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4844 unsigned int ctx = 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4845
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4846 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
4847 ctx += 1;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4848 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4849 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
4850 ctx += 1;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4851 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4852
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
4853 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
4854 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4855
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4856 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
4857 uint8_t *state= &h->cabac_state[ctx_base];
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4858 int mb_type;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4859
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4860 if(intra_slice){
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4861 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
4862 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
4863 const int mbb_xy = h->top_mb_xy;
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4864 int ctx=0;
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4865 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
4866 ctx++;
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4867 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
4868 ctx++;
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
4869 if( get_cabac_noinline( &h->cabac, &state[ctx] ) == 0 )
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4870 return 0; /* I4x4 */
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4871 state += 2;
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4872 }else{
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
4873 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
4874 return 0; /* I4x4 */
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4875 }
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4876
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4877 if( get_cabac_terminate( &h->cabac ) )
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4878 return 25; /* PCM */
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4879
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4880 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
4881 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
4882 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
4883 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
4884 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
4885 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
4886 return mb_type;
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4887 }
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4888
8436
59171c70bc9f inline decode_cabac_mb_type for I & P frames, 9 cycles faster on pentium dual.
michael
parents: 8435
diff changeset
4889 static int decode_cabac_mb_type_b( H264Context *h ) {
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4890 MpegEncContext * const s = &h->s;
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4891
2597
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
4892 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
4893 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
4894 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
4895 int bits;
8383
4be7fab48777 Remove unreachable else clause, found by dark shikari.
michael
parents: 8382
diff changeset
4896 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
4897
3138
c12fc3d1c612 minor simplifications in cabac_mb_type
lorenm
parents: 3128
diff changeset
4898 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
4899 ctx++;
3138
c12fc3d1c612 minor simplifications in cabac_mb_type
lorenm
parents: 3128
diff changeset
4900 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
4901 ctx++;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4902
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
4903 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
4904 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
4905
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
4906 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
4907 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
4908 }
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
4909
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
4910 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
4911 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
4912 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
4913 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
4914 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
4915 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
4916 else if( bits == 13 ) {
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4917 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
4918 } 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
4919 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
4920 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
4921 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
4922
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
4923 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
4924 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
4925 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4926
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4927 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
4928 MpegEncContext * const s = &h->s;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4929 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
4930 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
4931
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4932 if(FRAME_MBAFF){ //FIXME merge with the stuff in fill_caches?
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4933 int mb_xy = mb_x + (mb_y&~1)*s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4934 mba_xy = mb_xy - 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4935 if( (mb_y&1)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4936 && h->slice_table[mba_xy] == h->slice_num
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4937 && MB_FIELD == !!IS_INTERLACED( s->current_picture.mb_type[mba_xy] ) )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4938 mba_xy += s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4939 if( MB_FIELD ){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4940 mbb_xy = mb_xy - s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4941 if( !(mb_y&1)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4942 && h->slice_table[mbb_xy] == h->slice_num
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4943 && IS_INTERLACED( s->current_picture.mb_type[mbb_xy] ) )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4944 mbb_xy -= s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4945 }else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4946 mbb_xy = mb_x + (mb_y-1)*s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4947 }else{
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
4948 int mb_xy = h->mb_xy;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4949 mba_xy = mb_xy - 1;
5781
0b3aa6f4c313 Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents: 5780
diff changeset
4950 mbb_xy = mb_xy - (s->mb_stride << FIELD_PICTURE);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4951 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4952
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4953 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
4954 ctx++;
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4955 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
4956 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
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
4958 if( h->slice_type_nos == FF_B_TYPE )
3138
c12fc3d1c612 minor simplifications in cabac_mb_type
lorenm
parents: 3128
diff changeset
4959 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
4960 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
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
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4963 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
4964 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
4965
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4966 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
4967 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
4968
2928
16d67170715c tidier cabac_intra4x4_pred_mode
lorenm
parents: 2926
diff changeset
4969 mode += 1 * get_cabac( &h->cabac, &h->cabac_state[69] );
16d67170715c tidier cabac_intra4x4_pred_mode
lorenm
parents: 2926
diff changeset
4970 mode += 2 * get_cabac( &h->cabac, &h->cabac_state[69] );
16d67170715c tidier cabac_intra4x4_pred_mode
lorenm
parents: 2926
diff changeset
4971 mode += 4 * get_cabac( &h->cabac, &h->cabac_state[69] );
16d67170715c tidier cabac_intra4x4_pred_mode
lorenm
parents: 2926
diff changeset
4972
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4973 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
4974 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
4975 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4976 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
4977 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4978
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4979 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
4980 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
4981 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
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 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
4984
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
4985 /* 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
4986 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
4987 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
4988
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4989 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
4990 ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4991
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
4992 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
4993 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
4994
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
4995 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
4996 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
4997 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
4998 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
4999 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5000 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
5001 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5002
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5003 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
5004 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
5005
7c2ce28a0314 Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.
diego
parents: 5685
diff changeset
5006 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
5007 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
5008
7c2ce28a0314 Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.
diego
parents: 5685
diff changeset
5009 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
5010 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
5011 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
5012 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
5013 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
5014 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
5015 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
5016 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
5017 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
5018 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5019 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
5020 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
5021 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
5022
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5023 cbp_a = (h->left_cbp>>4)&0x03;
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5024 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
5025
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5026 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
5027 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
5028 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
5029 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
5030 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
5031
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5032 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
5033 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
5034 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
5035 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
5036 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5037 static int decode_cabac_mb_dqp( H264Context *h) {
8397
81c6cec28a62 Simplify ctx calculation in decode_cabac_mb_dqp()
michael
parents: 8396
diff changeset
5038 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
5039 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
5040
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5041 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
5042 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
5043 val++;
3128
dd3f6be492bd don't arbitrarily limit delta_qp
lorenm
parents: 3126
diff changeset
5044 if(val > 102) //prevent infinite loop
2844
5f20ab245501 prevent assert failures and infinite loops with broken streams
michael
parents: 2834
diff changeset
5045 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
5046 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5047
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5048 if( val&0x01 )
8399
3019af3f98fa Replace /2 by >>1 in decode_cabac_mb_dqp()
michael
parents: 8398
diff changeset
5049 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
5050 else
8399
3019af3f98fa Replace /2 by >>1 in decode_cabac_mb_dqp()
michael
parents: 8398
diff changeset
5051 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
5052 }
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5053 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
5054 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
5055 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
5056 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
5057 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
5058 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
5059 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
5060 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
5061 }
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5062 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
5063 int type;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5064 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
5065 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
5066 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
5067 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
5068 type = 3;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5069 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
5070 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
5071 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
5072 type += 4;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5073 }
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5074 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
5075 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
5076 return type;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5077 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5078
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5079 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
5080 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
5081 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5082
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5083 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
5084 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
5085 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
5086 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
5087 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
5088
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
5089 if( h->slice_type_nos == FF_B_TYPE) {
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5090 if( refa > 0 && !h->direct_cache[scan8[n] - 1] )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5091 ctx++;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5092 if( refb > 0 && !h->direct_cache[scan8[n] - 8] )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5093 ctx += 2;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5094 } else {
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5095 if( refa > 0 )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5096 ctx++;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5097 if( refb > 0 )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5098 ctx += 2;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5099 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5100
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5101 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
5102 ref++;
8438
89f7279e1eaa Simplify decode_cabac_mb_ref() a little bit, 2 cpu cycles faster on
michael
parents: 8437
diff changeset
5103 ctx = (ctx>>2)+4;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
5104 if(ref >= 32 /*h->ref_list[list]*/){
8391
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5105 return -1;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
5106 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5107 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5108 return ref;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5109 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5110
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5111 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
5112 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
5113 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
5114 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
5115 int mvd;
64a0415da32f Optimize ctx calculation in decode_cabac_mb_mvd(), code by dark shikari.
michael
parents: 8392
diff changeset
5116 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
5117
2317
2865f759882a optimzation
michael
parents: 2316
diff changeset
5118 if(!get_cabac(&h->cabac, &h->cabac_state[ctxbase+ctx]))
2865f759882a optimzation
michael
parents: 2316
diff changeset
5119 return 0;
2865f759882a optimzation
michael
parents: 2316
diff changeset
5120
2865f759882a optimzation
michael
parents: 2316
diff changeset
5121 mvd= 1;
2865f759882a optimzation
michael
parents: 2316
diff changeset
5122 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
5123 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
5124 mvd++;
2317
2865f759882a optimzation
michael
parents: 2316
diff changeset
5125 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
5126 ctx++;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5127 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5128
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5129 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
5130 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
5131 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
5132 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
5133 k++;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
5134 if(k>24){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
5135 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
5136 return INT_MIN;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
5137 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5138 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5139 while( k-- ) {
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5140 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
5141 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
5142 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5143 }
4042
643cdc58bd69 slightly faster decode_cabac_mb_mvd()
michael
parents: 4041
diff changeset
5144 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
5145 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5146
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
5147 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
5148 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
5149 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
5150
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
5151 if( is_dc ) {
7181
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5152 if( cat == 0 ) {
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5153 nza = h->left_cbp&0x100;
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5154 nzb = h-> top_cbp&0x100;
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5155 } else {
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5156 nza = (h->left_cbp>>(6+idx))&0x01;
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5157 nzb = (h-> top_cbp>>(6+idx))&0x01;
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5158 }
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
5159 } else {
8394
a9132c1bd56a Simplify chroma AC in CABAC residual decoding.
darkshikari
parents: 8393
diff changeset
5160 assert(cat == 1 || cat == 2 || cat == 4);
a9132c1bd56a Simplify chroma AC in CABAC residual decoding.
darkshikari
parents: 8393
diff changeset
5161 nza = h->non_zero_count_cache[scan8[idx] - 1];
a9132c1bd56a Simplify chroma AC in CABAC residual decoding.
darkshikari
parents: 8393
diff changeset
5162 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
5163 }
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5164
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5165 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
5166 ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5167
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5168 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
5169 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
5170
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5171 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
5172 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5173
6753
73de16350531 One const per declaration is enough.
cehoyos
parents: 6749
diff changeset
5174 DECLARE_ASM_CONST(1, uint8_t, last_coeff_flag_offset_8x8[63]) = {
4051
19f07b651d79 decode_significance_8x8_x86()
michael
parents: 4042
diff changeset
5175 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
5176 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
5177 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
5178 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
5179 };
19f07b651d79 decode_significance_8x8_x86()
michael
parents: 4042
diff changeset
5180
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
5181 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
5182 static const int significant_coeff_flag_offset[2][6] = {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5183 { 105+0, 105+15, 105+29, 105+44, 105+47, 402 },
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5184 { 277+0, 277+15, 277+29, 277+44, 277+47, 436 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5185 };
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5186 static const int last_coeff_flag_offset[2][6] = {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5187 { 166+0, 166+15, 166+29, 166+44, 166+47, 417 },
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5188 { 338+0, 338+15, 338+29, 338+44, 338+47, 451 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5189 };
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5190 static const int coeff_abs_level_m1_offset[6] = {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5191 227+0, 227+10, 227+20, 227+30, 227+39, 426
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5192 };
4007
33d3d4ab9f59 int->uint8_t for 2 tables
michael
parents: 4001
diff changeset
5193 static const uint8_t significant_coeff_flag_offset_8x8[2][63] = {
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5194 { 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
5195 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
5196 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
5197 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
5198 { 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
5199 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
5200 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
5201 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
5202 };
6749
b1778cf7f3b1 Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents: 6717
diff changeset
5203 /* 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
5204 * 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
5205 * 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
5206 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
5207 /* 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
5208 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
5209 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
5210 /* 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
5211 { 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
5212 /* 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
5213 { 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
5214 };
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5215
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5216 int index[64];
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5217
5262
b2a95ab5d017 bring back h264 build
benoit
parents: 5254
diff changeset
5218 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
5219 int coeff_count = 0;
6749
b1778cf7f3b1 Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents: 6717
diff changeset
5220 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
5221
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5222 uint8_t *significant_coeff_ctx_base;
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5223 uint8_t *last_coeff_ctx_base;
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5224 uint8_t *abs_level_m1_ctx_base;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5225
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
5226 #ifndef ARCH_X86
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
5227 #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
5228 #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
5229 #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
5230 #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
5231 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
5232 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
5233 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
5234 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
5235 #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
5236 #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
5237 #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
5238
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
5239
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5240 /* 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
5241 * 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
5242 * 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
5243 * 3-> DC Chroma n = iCbCr
8394
a9132c1bd56a Simplify chroma AC in CABAC residual decoding.
darkshikari
parents: 8393
diff changeset
5244 * 4-> AC Chroma n = 16 + 4 * iCbCr + chroma4x4idx
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5245 * 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
5246 */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5247
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5248 /* 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
5249 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
5250 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
5251 if( !is_dc )
a9132c1bd56a Simplify chroma AC in CABAC residual decoding.
darkshikari
parents: 8393
diff changeset
5252 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
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 #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
5255 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
5256 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
5257 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
5258 #endif
5528
4c3b1222ff57 Don't check the return value of decode_cabac_residual since it always
conrad
parents: 5508
diff changeset
5259 return;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5260 }
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5261 }
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5262
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5263 significant_coeff_ctx_base = h->cabac_state
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5264 + significant_coeff_flag_offset[MB_FIELD][cat];
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5265 last_coeff_ctx_base = h->cabac_state
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5266 + last_coeff_flag_offset[MB_FIELD][cat];
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5267 abs_level_m1_ctx_base = h->cabac_state
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5268 + coeff_abs_level_m1_offset[cat];
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5269
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
5270 if( !is_dc && cat == 5 ) {
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5271 #define DECODE_SIGNIFICANCE( coefs, sig_off, last_off ) \
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5272 for(last= 0; last < coefs; last++) { \
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5273 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
5274 if( get_cabac( CC, sig_ctx )) { \
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5275 uint8_t *last_ctx = last_coeff_ctx_base + last_off; \
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5276 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
5277 if( get_cabac( CC, last_ctx ) ) { \
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5278 last= max_coeff; \
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5279 break; \
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5280 } \
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5281 } \
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
5282 }\
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
5283 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
5284 index[coeff_count++] = last;\
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5285 }
4009
e5f7797e53c7 10l int vs uint8_t
michael
parents: 4008
diff changeset
5286 const uint8_t *sig_off = significant_coeff_flag_offset_8x8[MB_FIELD];
5547
81226e690378 CONFIG_7REGS -> HAVE_7REGS
ramiro
parents: 5545
diff changeset
5287 #if defined(ARCH_X86) && defined(HAVE_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS)
4051
19f07b651d79 decode_significance_8x8_x86()
michael
parents: 4042
diff changeset
5288 coeff_count= decode_significance_8x8_x86(CC, significant_coeff_ctx_base, index, sig_off);
19f07b651d79 decode_significance_8x8_x86()
michael
parents: 4042
diff changeset
5289 } else {
19f07b651d79 decode_significance_8x8_x86()
michael
parents: 4042
diff changeset
5290 coeff_count= decode_significance_x86(CC, max_coeff, significant_coeff_ctx_base, index);
19f07b651d79 decode_significance_8x8_x86()
michael
parents: 4042
diff changeset
5291 #else
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5292 DECODE_SIGNIFICANCE( 63, sig_off[last], last_coeff_flag_offset_8x8[last] );
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5293 } else {
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5294 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
5295 #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
5296 }
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5297 assert(coeff_count > 0);
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5298
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 if( is_dc ) {
7181
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5300 if( cat == 0 )
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5301 h->cbp_table[h->mb_xy] |= 0x100;
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5302 else
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5303 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
5304 } else {
7183
db32d2544050 Reorder the if/else for residual cats to match gcc's branch prediction.
astrange
parents: 7182
diff changeset
5305 if( cat == 5 )
db32d2544050 Reorder the if/else for residual cats to match gcc's branch prediction.
astrange
parents: 7182
diff changeset
5306 fill_rectangle(&h->non_zero_count_cache[scan8[n]], 2, 2, 8, coeff_count, 1);
7181
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5307 else {
8394
a9132c1bd56a Simplify chroma AC in CABAC residual decoding.
darkshikari
parents: 8393
diff changeset
5308 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
5309 h->non_zero_count_cache[scan8[n]] = coeff_count;
7181
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5310 }
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
5311 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5312
7444
a9da32d66fec Small h264 decoding speed optimization: while->do/while
darkshikari
parents: 7424
diff changeset
5313 do {
6749
b1778cf7f3b1 Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents: 6717
diff changeset
5314 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
5315
7444
a9da32d66fec Small h264 decoding speed optimization: while->do/while
darkshikari
parents: 7424
diff changeset
5316 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
5317
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
5318 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
5319 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
5320 if( is_dc ) {
4040
9eaea06c5ba6 optimize sign decoding code in decode_residual()
michael
parents: 4038
diff changeset
5321 block[j] = get_cabac_bypass_sign( CC, -1);
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5322 }else{
6377
michael
parents: 6311
diff changeset
5323 block[j] = (get_cabac_bypass_sign( CC, -qmul[j]) + 32) >> 6;
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5324 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5325 } else {
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5326 int coeff_abs = 2;
6749
b1778cf7f3b1 Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents: 6717
diff changeset
5327 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
5328 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
5329
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
5330 while( coeff_abs < 15 && get_cabac( CC, ctx ) ) {
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5331 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
5332 }
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5333
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5334 if( coeff_abs >= 15 ) {
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5335 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
5336 while( get_cabac_bypass( CC ) ) {
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5337 j++;
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5338 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5339
4016
29ea06410ce7 simplify escape decoding
michael
parents: 4009
diff changeset
5340 coeff_abs=1;
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5341 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
5342 coeff_abs += coeff_abs + get_cabac_bypass( CC );
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5343 }
4016
29ea06410ce7 simplify escape decoding
michael
parents: 4009
diff changeset
5344 coeff_abs+= 14;
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5345 }
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5346
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
5347 if( is_dc ) {
7184
9a8278d65858 Use get_cabac_bypass_sign instead of an if/else.
astrange
parents: 7183
diff changeset
5348 block[j] = get_cabac_bypass_sign( CC, -coeff_abs );
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5349 }else{
7184
9a8278d65858 Use get_cabac_bypass_sign instead of an if/else.
astrange
parents: 7183
diff changeset
5350 block[j] = (get_cabac_bypass_sign( CC, -coeff_abs ) * qmul[j] + 32) >> 6;
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5351 }
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 }
7444
a9da32d66fec Small h264 decoding speed optimization: while->do/while
darkshikari
parents: 7424
diff changeset
5353 } 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
5354 #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
5355 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
5356 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
5357 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
5358 #endif
5528
4c3b1222ff57 Don't check the return value of decode_cabac_residual since it always
conrad
parents: 5508
diff changeset
5359
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5360 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5361
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
5362 #ifndef CONFIG_SMALL
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
5363 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
5364 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
5365 }
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
5366
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
5367 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
5368 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
5369 }
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
5370 #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
5371
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
5372 static void decode_cabac_residual( 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
5373 #ifdef CONFIG_SMALL
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
5374 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
5375 #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
5376 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
5377 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
5378 #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
5379 }
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
5380
4908
777f250df232 Fix multiple "inline/static is not at beginning of declaration" warnings.
diego
parents: 4896
diff changeset
5381 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
5382 {
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5383 MpegEncContext * const s = &h->s;
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
5384 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
5385 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
5386 h->left_mb_xy[0] = mb_xy - 1;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5387 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
5388 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
5389 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
5390 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
5391 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
5392 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
5393 const int bottom = (s->mb_y & 1);
8431
405a44077331 Simplify if(), 3 cpu cycles faster in pentium dual.
michael
parents: 8430
diff changeset
5394
8435
adab508880c6 Negate 2 more variables, 1 cpu cycle faster on pentium dual.
michael
parents: 8434
diff changeset
5395 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
5396 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
5397 }
8435
adab508880c6 Negate 2 more variables, 1 cpu cycle faster on pentium dual.
michael
parents: 8434
diff changeset
5398 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
5399 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
5400 }
5781
0b3aa6f4c313 Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents: 5780
diff changeset
5401 } else if (FIELD_PICTURE) {
0b3aa6f4c313 Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents: 5780
diff changeset
5402 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
5403 }
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5404 return;
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5405 }
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5406
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5407 /**
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5408 * decodes a macroblock
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
5409 * @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
5410 */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5411 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
5412 MpegEncContext * const s = &h->s;
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
5413 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
5414 int mb_type, partition_count, cbp = 0;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5415 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
5416
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
5417 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
5418
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
5419 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
5420 if( h->slice_type_nos != FF_I_TYPE ) {
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5421 int skip;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5422 /* a skipped mb needs the aff flag from the following mb */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5423 if( FRAME_MBAFF && s->mb_x==0 && (s->mb_y&1)==0 )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5424 predict_field_decoding_flag(h);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5425 if( FRAME_MBAFF && (s->mb_y&1)==1 && h->prev_mb_skipped )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5426 skip = h->next_mb_skipped;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5427 else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5428 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
5429 /* read skip flags */
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5430 if( skip ) {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5431 if( FRAME_MBAFF && (s->mb_y&1)==0 ){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5432 s->current_picture.mb_type[mb_xy] = MB_TYPE_SKIP;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5433 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
5434 if(!h->next_mb_skipped)
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5435 h->mb_mbaff = h->mb_field_decoding_flag = decode_cabac_field_decoding_flag(h);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5436 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5437
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5438 decode_mb_skip(h);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5439
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5440 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
5441 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
5442 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
5443
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5444 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
5445
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5446 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5447 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5448 if(FRAME_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5449 if( (s->mb_y&1) == 0 )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5450 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
5451 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
5452 }
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5453
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
5454 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
5455
3077
385e54795a9e Fix silly typos.
diego
parents: 3071
diff changeset
5456 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
5457
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
5458 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
5459 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
5460 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
5461 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
5462 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
5463 }else{
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5464 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
5465 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
5466 }
7340
ef40221c1452 SI/SP slice support. (not bitexact)
michael
parents: 7339
diff changeset
5467 } 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
5468 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
5469 /* P-type */
59171c70bc9f inline decode_cabac_mb_type for I & P frames, 9 cycles faster on pentium dual.
michael
parents: 8435
diff changeset
5470 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
5471 /* 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
5472 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
5473 } else {
59171c70bc9f inline decode_cabac_mb_type for I & P frames, 9 cycles faster on pentium dual.
michael
parents: 8435
diff changeset
5474 /* 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
5475 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
5476 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5477 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
5478 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
5479 } else {
8436
59171c70bc9f inline decode_cabac_mb_type for I & P frames, 9 cycles faster on pentium dual.
michael
parents: 8435
diff changeset
5480 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
5481 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
5482 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5483 } else {
8436
59171c70bc9f inline decode_cabac_mb_type for I & P frames, 9 cycles faster on pentium dual.
michael
parents: 8435
diff changeset
5484 mb_type= decode_cabac_intra_mb_type(h, 3, 1);
7340
ef40221c1452 SI/SP slice support. (not bitexact)
michael
parents: 7339
diff changeset
5485 if(h->slice_type == FF_SI_TYPE && mb_type)
ef40221c1452 SI/SP slice support. (not bitexact)
michael
parents: 7339
diff changeset
5486 mb_type--;
ef40221c1452 SI/SP slice support. (not bitexact)
michael
parents: 7339
diff changeset
5487 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
5488 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
5489 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
5490 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
5491 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
5492 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
5493 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5494 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
5495 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
5496
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5497 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
5498
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5499 if(IS_INTRA_PCM(mb_type)) {
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5500 const uint8_t *ptr;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5501
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5106
diff changeset
5502 // 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
5503 // 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
5504 // 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
5505 ptr= h->cabac.bytestream;
4344
4aa24216f71a fix 16 CABAC_BIT * 10l bug introduced in r6578
michael
parents: 4283
diff changeset
5506 if(h->cabac.low&0x1) ptr--;
4aa24216f71a fix 16 CABAC_BIT * 10l bug introduced in r6578
michael
parents: 4283
diff changeset
5507 if(CABAC_BITS==16){
4aa24216f71a fix 16 CABAC_BIT * 10l bug introduced in r6578
michael
parents: 4283
diff changeset
5508 if(h->cabac.low&0x1FF) ptr--;
4aa24216f71a fix 16 CABAC_BIT * 10l bug introduced in r6578
michael
parents: 4283
diff changeset
5509 }
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5510
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5511 // 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
5512 memcpy(h->mb, ptr, 256); ptr+=256;
7407
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
5513 if(CHROMA){
7450
30d38a880fde Simplify intra PCM MB handling.
michael
parents: 7445
diff changeset
5514 memcpy(h->mb+128, ptr, 128); ptr+=128;
7407
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
5515 }
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5516
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5517 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
5518
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
5519 // All blocks are present
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5520 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
5521 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
5522 // In deblocking, the quantizer is 0
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5523 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
5524 // All coeffs are present
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5525 memset(h->non_zero_count[mb_xy], 16, 16);
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5526 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
5527 h->last_qscale_diff = 0;
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5528 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
5529 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5530
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5531 if(MB_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5532 h->ref_count[0] <<= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5533 h->ref_count[1] <<= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5534 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5535
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
5536 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
5537
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5538 if( IS_INTRA( mb_type ) ) {
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
5539 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
5540 if( IS_INTRA4x4( mb_type ) ) {
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5541 if( dct8x8_allowed && decode_cabac_mb_transform_size( h ) ) {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5542 mb_type |= MB_TYPE_8x8DCT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5543 for( i = 0; i < 16; i+=4 ) {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5544 int pred = pred_intra_mode( h, i );
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5545 int mode = decode_cabac_mb_intra4x4_pred_mode( h, pred );
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5546 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
5547 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5548 } else {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5549 for( i = 0; i < 16; i++ ) {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5550 int pred = pred_intra_mode( h, i );
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5551 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
5552
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5553 //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
5554 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5555 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5556 write_back_intra_pred_mode(h);
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5557 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
5558 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5559 h->intra16x16_pred_mode= check_intra_pred_mode( h, h->intra16x16_pred_mode );
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5560 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
5561 }
7407
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
5562 if(CHROMA){
7408
michael
parents: 7407
diff changeset
5563 h->chroma_pred_mode_table[mb_xy] =
michael
parents: 7407
diff changeset
5564 pred_mode = decode_cabac_mb_chroma_pre_mode( h );
michael
parents: 7407
diff changeset
5565
michael
parents: 7407
diff changeset
5566 pred_mode= check_intra_pred_mode( h, pred_mode );
michael
parents: 7407
diff changeset
5567 if( pred_mode < 0 ) return -1;
michael
parents: 7407
diff changeset
5568 h->chroma_pred_mode= pred_mode;
7407
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
5569 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5570 } 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
5571 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
5572
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
5573 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
5574 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
5575 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
5576 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
5577 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
5578 }
3482
c08b46172204 slightly faster h264 fill_caches()
lorenm
parents: 3455
diff changeset
5579 if( IS_DIRECT(h->sub_mb_type[0] | h->sub_mb_type[1] |
c08b46172204 slightly faster h264 fill_caches()
lorenm
parents: 3455
diff changeset
5580 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
5581 pred_direct_motion(h, &mb_type);
5425
1fdfea5024a7 fix cabac decoding with some Blue-Ray sources
gpoirier
parents: 5380
diff changeset
5582 h->ref_cache[0][scan8[4]] =
1fdfea5024a7 fix cabac decoding with some Blue-Ray sources
gpoirier
parents: 5380
diff changeset
5583 h->ref_cache[1][scan8[4]] =
1fdfea5024a7 fix cabac decoding with some Blue-Ray sources
gpoirier
parents: 5380
diff changeset
5584 h->ref_cache[0][scan8[12]] =
1fdfea5024a7 fix cabac decoding with some Blue-Ray sources
gpoirier
parents: 5380
diff changeset
5585 h->ref_cache[1][scan8[12]] = PART_NOT_AVAILABLE;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5586 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
5587 for( i = 0; i < 4; i++ )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5588 if( IS_DIRECT(h->sub_mb_type[i]) )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5589 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
5590 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5591 }
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5592 } else {
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5593 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
5594 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
5595 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
5596 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
5597 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5598 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5599
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
5600 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
5601 for( i = 0; i < 4; i++ ) {
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5602 if(IS_DIRECT(h->sub_mb_type[i])) continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5603 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
5604 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
5605 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
5606 if(ref[list][i] >= (unsigned)h->ref_count[list]){
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5607 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
5608 return -1;
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5609 }
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5610 }else
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5611 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
5612 } else {
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5613 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
5614 }
2110
michael
parents: 2099
diff changeset
5615 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
5616 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
5617 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5618 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5619
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5620 if(dct8x8_allowed)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5621 dct8x8_allowed = get_dct8x8_allowed(h);
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5622
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
5623 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
5624 for(i=0; i<4; i++){
5425
1fdfea5024a7 fix cabac decoding with some Blue-Ray sources
gpoirier
parents: 5380
diff changeset
5625 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
5626 if(IS_DIRECT(h->sub_mb_type[i])){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5627 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
5628 continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5629 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5630
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5631 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
5632 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
5633 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
5634 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
5635 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
5636 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
5637 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
5638 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
5639 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
5640 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
5641
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5642 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
5643 my = mpy + decode_cabac_mb_mvd( h, list, index, 1 );
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
5644 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
5645
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5646 if(IS_SUB_8X8(sub_mb_type)){
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5647 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
5648 mv_cache[ 8 ][0]= mv_cache[ 9 ][0]= mx;
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5649 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
5650 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
5651
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5652 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
5653 mvd_cache[ 8 ][0]= mvd_cache[ 9 ][0]= mx - mpx;
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5654 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
5655 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
5656 }else if(IS_SUB_8X4(sub_mb_type)){
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5657 mv_cache[ 1 ][0]= mx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5658 mv_cache[ 1 ][1]= my;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5659
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5660 mvd_cache[ 1 ][0]= mx - mpx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5661 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
5662 }else if(IS_SUB_4X8(sub_mb_type)){
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5663 mv_cache[ 8 ][0]= mx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5664 mv_cache[ 8 ][1]= my;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5665
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5666 mvd_cache[ 8 ][0]= mx - mpx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5667 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
5668 }
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5669 mv_cache[ 0 ][0]= mx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5670 mv_cache[ 0 ][1]= my;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5671
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5672 mvd_cache[ 0 ][0]= mx - mpx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5673 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
5674 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5675 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5676 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
5677 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
5678 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
5679 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
5680 }
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 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5683 } else if( IS_DIRECT(mb_type) ) {
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5684 pred_direct_motion(h, &mb_type);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5685 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
5686 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
5687 dct8x8_allowed &= h->sps.direct_8x8_inference_flag;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5688 } else {
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5689 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
5690 if(IS_16X16(mb_type)){
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
5691 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
5692 if(IS_DIR(mb_type, 0, list)){
8391
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5693 int ref;
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5694 if(h->ref_count[list] > 1){
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5695 ref= decode_cabac_mb_ref(h, list, 0);
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5696 if(ref >= (unsigned)h->ref_count[list]){
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5697 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
5698 return -1;
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5699 }
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5700 }else
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5701 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
5702 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
5703 }else
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
5704 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
5705 }
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
5706 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
5707 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
5708 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
5709
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5710 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
5711 my = mpy + decode_cabac_mb_mvd( h, list, 0, 1 );
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
5712 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
5713
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5714 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
5715 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
5716 }else
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
5717 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
5718 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5719 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5720 else if(IS_16X8(mb_type)){
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
5721 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
5722 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
5723 if(IS_DIR(mb_type, i, list)){
8391
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5724 int ref;
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5725 if(h->ref_count[list] > 1){
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5726 ref= decode_cabac_mb_ref( h, list, 8*i );
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5727 if(ref >= (unsigned)h->ref_count[list]){
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5728 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
5729 return -1;
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5730 }
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5731 }else
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5732 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
5733 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
5734 }else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5735 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
5736 }
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
5737 }
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
5738 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
5739 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
5740 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
5741 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
5742 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
5743 my = mpy + decode_cabac_mb_mvd( h, list, 8*i, 1 );
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
5744 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
5745
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5746 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
5747 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
5748 }else{
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5749 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
5750 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
5751 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5752 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5753 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5754 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5755 assert(IS_8X16(mb_type));
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
5756 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
5757 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
5758 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
5759 int ref;
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5760 if(h->ref_count[list] > 1){
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5761 ref= decode_cabac_mb_ref( h, list, 4*i );
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5762 if(ref >= (unsigned)h->ref_count[list]){
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5763 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
5764 return -1;
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5765 }
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5766 }else
c1eb379daf90 Check ref values in CABAC H.264 for validity.
michael
parents: 8390
diff changeset
5767 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
5768 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
5769 }else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5770 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
5771 }
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
5772 }
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
5773 for(list=0; list<h->list_count; list++){
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5774 for(i=0; i<2; i++){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5775 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
5776 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
5777 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
5778 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
5779
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
5780 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
5781 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
5782 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
5783 }else{
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5784 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
5785 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
5786 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5787 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5788 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5789 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5790 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5791
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
5792 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
5793 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
5794 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
5795 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5796
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5797 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
5798 cbp = decode_cabac_mb_cbp_luma( h );
7407
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
5799 if(CHROMA)
7408
michael
parents: 7407
diff changeset
5800 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
5801 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5802
3651
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
5803 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
5804
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5805 if( dct8x8_allowed && (cbp&15) && !IS_INTRA( mb_type ) ) {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5806 if( decode_cabac_mb_transform_size( h ) )
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5807 mb_type |= MB_TYPE_8x8DCT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5808 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5809 s->current_picture.mb_type[mb_xy]= mb_type;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5810
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5811 if( cbp || IS_INTRA16x16( mb_type ) ) {
3174
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
5812 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
5813 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
5814 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
5815
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5816 if(IS_INTERLACED(mb_type)){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5817 scan8x8= s->qscale ? h->field_scan8x8 : h->field_scan8x8_q0;
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
5818 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
5819 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
5820 }else{
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5821 scan8x8= s->qscale ? h->zigzag_scan8x8 : h->zigzag_scan8x8_q0;
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
5822 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
5823 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
5824 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5825
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5826 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
5827 if( dqp == INT_MIN ){
a95e55679dfa check return value of decode_cabac_mb_dqp, it is INT_MIN on error.
reimar
parents: 2867
diff changeset
5828 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
5829 return -1;
a95e55679dfa check return value of decode_cabac_mb_dqp, it is INT_MIN on error.
reimar
parents: 2867
diff changeset
5830 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5831 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
5832 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
5833 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
5834 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
5835 }
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
5836 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
5837 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
5838
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5839 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
5840 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
5841 //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
5842 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
5843
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5844 if( cbp&15 ) {
5705
c08c9340c7ca factor out dequant table lookup outside loops, gives a 1-2% speed-up
gpoirier
parents: 5698
diff changeset
5845 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
5846 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
5847 //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
5848 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
5849 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5850 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5851 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
5852 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5853 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5854 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
5855 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
5856 if( cbp & (1<<i8x8) ) {
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5857 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
5858 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
5859 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
5860 } else {
5713
f45228f65e06 reindent
andoma
parents: 5705
diff changeset
5861 qmul = h->dequant4_coeff[IS_INTRA( mb_type ) ? 0:3][s->qscale];
f45228f65e06 reindent
andoma
parents: 5705
diff changeset
5862 for( i4x4 = 0; i4x4 < 4; i4x4++ ) {
f45228f65e06 reindent
andoma
parents: 5705
diff changeset
5863 const int index = 4*i8x8 + i4x4;
f45228f65e06 reindent
andoma
parents: 5705
diff changeset
5864 //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
5865 //START_TIMER
5713
f45228f65e06 reindent
andoma
parents: 5705
diff changeset
5866 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
5867 //STOP_TIMER("decode_residual")
5713
f45228f65e06 reindent
andoma
parents: 5705
diff changeset
5868 }
5705
c08c9340c7ca factor out dequant table lookup outside loops, gives a 1-2% speed-up
gpoirier
parents: 5698
diff changeset
5869 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5870 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5871 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
5872 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
5873 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5874 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5875 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5876
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5877 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
5878 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
5879 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
5880 //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
5881 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
5882 }
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
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5885 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
5886 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
5887 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
5888 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
5889 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
5890 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
5891 //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
5892 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
5893 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5894 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5895 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5896 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
5897 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
5898 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
5899 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5900 } else {
2315
29b67549d0cc fix CABAC+LOOP missmatch
michael
parents: 2314
diff changeset
5901 uint8_t * const nnz= &h->non_zero_count_cache[0];
29b67549d0cc fix CABAC+LOOP missmatch
michael
parents: 2314
diff changeset
5902 fill_rectangle(&nnz[scan8[0]], 4, 4, 8, 0, 1);
29b67549d0cc fix CABAC+LOOP missmatch
michael
parents: 2314
diff changeset
5903 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
5904 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
5905 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
5906 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5907
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5908 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
5909 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
5910
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5911 if(MB_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5912 h->ref_count[0] >>= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5913 h->ref_count[1] >>= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5914 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5915
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5916 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
5917 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5918
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5919
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
5920 static void filter_mb_edgev( H264Context *h, uint8_t *pix, int stride, int16_t bS[4], int qp ) {
4118
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
5921 const int index_a = qp + h->slice_alpha_c0_offset;
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
5922 const int alpha = (alpha_table+52)[index_a];
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
5923 const int beta = (beta_table+52)[qp + h->slice_beta_offset];
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5924
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
5925 if( bS[0] < 4 ) {
2707
360024d31dab H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents: 2683
diff changeset
5926 int8_t tc[4];
8405
f94a6d6df87e H.264 loopfilter speed tweaks
darkshikari
parents: 8402
diff changeset
5927 tc[0] = (tc0_table+52)[index_a][bS[0]];
f94a6d6df87e H.264 loopfilter speed tweaks
darkshikari
parents: 8402
diff changeset
5928 tc[1] = (tc0_table+52)[index_a][bS[1]];
f94a6d6df87e H.264 loopfilter speed tweaks
darkshikari
parents: 8402
diff changeset
5929 tc[2] = (tc0_table+52)[index_a][bS[2]];
f94a6d6df87e H.264 loopfilter speed tweaks
darkshikari
parents: 8402
diff changeset
5930 tc[3] = (tc0_table+52)[index_a][bS[3]];
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
5931 h->s.dsp.h264_h_loop_filter_luma(pix, stride, alpha, beta, tc);
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
5932 } else {
8395
195cba8f6257 Move filter_luma_intra into dsputil for later addition of asm.
darkshikari
parents: 8394
diff changeset
5933 h->s.dsp.h264_h_loop_filter_luma_intra(pix, stride, alpha, beta);
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5934 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5935 }
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
5936 static void filter_mb_edgecv( H264Context *h, uint8_t *pix, int stride, int16_t bS[4], int qp ) {
4118
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
5937 const int index_a = qp + h->slice_alpha_c0_offset;
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
5938 const int alpha = (alpha_table+52)[index_a];
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
5939 const int beta = (beta_table+52)[qp + h->slice_beta_offset];
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5940
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
5941 if( bS[0] < 4 ) {
2707
360024d31dab H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents: 2683
diff changeset
5942 int8_t tc[4];
8405
f94a6d6df87e H.264 loopfilter speed tweaks
darkshikari
parents: 8402
diff changeset
5943 tc[0] = (tc0_table+52)[index_a][bS[0]]+1;
f94a6d6df87e H.264 loopfilter speed tweaks
darkshikari
parents: 8402
diff changeset
5944 tc[1] = (tc0_table+52)[index_a][bS[1]]+1;
f94a6d6df87e H.264 loopfilter speed tweaks
darkshikari
parents: 8402
diff changeset
5945 tc[2] = (tc0_table+52)[index_a][bS[2]]+1;
f94a6d6df87e H.264 loopfilter speed tweaks
darkshikari
parents: 8402
diff changeset
5946 tc[3] = (tc0_table+52)[index_a][bS[3]]+1;
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
5947 h->s.dsp.h264_h_loop_filter_chroma(pix, stride, alpha, beta, tc);
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
5948 } else {
2707
360024d31dab H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents: 2683
diff changeset
5949 h->s.dsp.h264_h_loop_filter_chroma_intra(pix, stride, alpha, beta);
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5950 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5951 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5952
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
5953 static void filter_mb_mbaff_edgev( H264Context *h, uint8_t *pix, int stride, int16_t bS[8], int qp[2] ) {
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5954 int i;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5955 for( i = 0; i < 16; i++, pix += stride) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5956 int index_a;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5957 int alpha;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5958 int beta;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5959
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5960 int qp_index;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5961 int bS_index = (i >> 1);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5962 if (!MB_FIELD) {
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5963 bS_index &= ~1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5964 bS_index |= (i & 1);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5965 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5966
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5967 if( bS[bS_index] == 0 ) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5968 continue;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5969 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5970
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5971 qp_index = MB_FIELD ? (i >> 3) : (i & 1);
4118
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
5972 index_a = qp[qp_index] + h->slice_alpha_c0_offset;
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
5973 alpha = (alpha_table+52)[index_a];
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
5974 beta = (beta_table+52)[qp[qp_index] + h->slice_beta_offset];
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5975
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5976 if( bS[bS_index] < 4 ) {
8405
f94a6d6df87e H.264 loopfilter speed tweaks
darkshikari
parents: 8402
diff changeset
5977 const int tc0 = (tc0_table+52)[index_a][bS[bS_index]];
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5978 const int p0 = pix[-1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5979 const int p1 = pix[-2];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5980 const int p2 = pix[-3];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5981 const int q0 = pix[0];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5982 const int q1 = pix[1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5983 const int q2 = pix[2];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5984
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
5985 if( FFABS( p0 - q0 ) < alpha &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
5986 FFABS( p1 - p0 ) < beta &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
5987 FFABS( q1 - q0 ) < beta ) {
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5988 int tc = tc0;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5989 int i_delta;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5990
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
5991 if( FFABS( p2 - p0 ) < beta ) {
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
5992 pix[-2] = p1 + av_clip( ( p2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( p1 << 1 ) ) >> 1, -tc0, tc0 );
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5993 tc++;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5994 }
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
5995 if( FFABS( q2 - q0 ) < beta ) {
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
5996 pix[1] = q1 + av_clip( ( q2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( q1 << 1 ) ) >> 1, -tc0, tc0 );
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5997 tc++;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5998 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5999
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
6000 i_delta = av_clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc );
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
6001 pix[-1] = av_clip_uint8( p0 + i_delta ); /* p0' */
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
6002 pix[0] = av_clip_uint8( q0 - i_delta ); /* q0' */
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
6003 tprintf(h->s.avctx, "filter_mb_mbaff_edgev i:%d, qp:%d, indexA:%d, alpha:%d, beta:%d, tc:%d\n# bS:%d -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x]\n", i, qp[qp_index], index_a, alpha, beta, tc, bS[bS_index], pix[-3], p1, p0, q0, q1, pix[2], p1, pix[-1], pix[0], q1);
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6004 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6005 }else{
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6006 const int p0 = pix[-1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6007 const int p1 = pix[-2];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6008 const int p2 = pix[-3];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6009
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6010 const int q0 = pix[0];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6011 const int q1 = pix[1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6012 const int q2 = pix[2];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6013
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6014 if( FFABS( p0 - q0 ) < alpha &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6015 FFABS( p1 - p0 ) < beta &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6016 FFABS( q1 - q0 ) < beta ) {
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6017
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6018 if(FFABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6019 if( FFABS( p2 - p0 ) < beta)
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6020 {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6021 const int p3 = pix[-4];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6022 /* p0', p1', p2' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6023 pix[-1] = ( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6024 pix[-2] = ( p2 + p1 + p0 + q0 + 2 ) >> 2;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6025 pix[-3] = ( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6026 } else {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6027 /* p0' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6028 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6029 }
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6030 if( FFABS( q2 - q0 ) < beta)
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6031 {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6032 const int q3 = pix[3];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6033 /* q0', q1', q2' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6034 pix[0] = ( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6035 pix[1] = ( p0 + q0 + q1 + q2 + 2 ) >> 2;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6036 pix[2] = ( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6037 } else {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6038 /* q0' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6039 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6040 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6041 }else{
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6042 /* p0', q0' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6043 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6044 pix[ 0] = ( 2*q1 + q0 + p1 + 2 ) >> 2;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6045 }
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
6046 tprintf(h->s.avctx, "filter_mb_mbaff_edgev i:%d, qp:%d, indexA:%d, alpha:%d, beta:%d\n# bS:4 -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x, %02x, %02x]\n", i, qp[qp_index], index_a, alpha, beta, p2, p1, p0, q0, q1, q2, pix[-3], pix[-2], pix[-1], pix[0], pix[1], pix[2]);
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6047 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6048 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6049 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6050 }
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6051 static void filter_mb_mbaff_edgecv( H264Context *h, uint8_t *pix, int stride, int16_t bS[8], int qp[2] ) {
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6052 int i;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6053 for( i = 0; i < 8; i++, pix += stride) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6054 int index_a;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6055 int alpha;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6056 int beta;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6057
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6058 int qp_index;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6059 int bS_index = i;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6060
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6061 if( bS[bS_index] == 0 ) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6062 continue;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6063 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6064
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6065 qp_index = MB_FIELD ? (i >> 2) : (i & 1);
4118
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
6066 index_a = qp[qp_index] + h->slice_alpha_c0_offset;
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
6067 alpha = (alpha_table+52)[index_a];
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
6068 beta = (beta_table+52)[qp[qp_index] + h->slice_beta_offset];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6069
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6070 if( bS[bS_index] < 4 ) {
8405
f94a6d6df87e H.264 loopfilter speed tweaks
darkshikari
parents: 8402
diff changeset
6071 const int tc = (tc0_table+52)[index_a][bS[bS_index]] + 1;
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6072 const int p0 = pix[-1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6073 const int p1 = pix[-2];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6074 const int q0 = pix[0];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6075 const int q1 = pix[1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6076
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6077 if( FFABS( p0 - q0 ) < alpha &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6078 FFABS( p1 - p0 ) < beta &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6079 FFABS( q1 - q0 ) < beta ) {
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
6080 const int i_delta = av_clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc );
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
6081
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
6082 pix[-1] = av_clip_uint8( p0 + i_delta ); /* p0' */
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
6083 pix[0] = av_clip_uint8( q0 - i_delta ); /* q0' */
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
6084 tprintf(h->s.avctx, "filter_mb_mbaff_edgecv i:%d, qp:%d, indexA:%d, alpha:%d, beta:%d, tc:%d\n# bS:%d -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x]\n", i, qp[qp_index], index_a, alpha, beta, tc, bS[bS_index], pix[-3], p1, p0, q0, q1, pix[2], p1, pix[-1], pix[0], q1);
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6085 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6086 }else{
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6087 const int p0 = pix[-1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6088 const int p1 = pix[-2];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6089 const int q0 = pix[0];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6090 const int q1 = pix[1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6091
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6092 if( FFABS( p0 - q0 ) < alpha &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6093 FFABS( p1 - p0 ) < beta &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6094 FFABS( q1 - q0 ) < beta ) {
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6095
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6096 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2; /* p0' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6097 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; /* q0' */
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
6098 tprintf(h->s.avctx, "filter_mb_mbaff_edgecv i:%d\n# bS:4 -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x, %02x, %02x]\n", i, pix[-3], p1, p0, q0, q1, pix[2], pix[-3], pix[-2], pix[-1], pix[0], pix[1], pix[2]);
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6099 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6100 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6101 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6102 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6103
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6104 static void filter_mb_edgeh( H264Context *h, uint8_t *pix, int stride, int16_t bS[4], int qp ) {
4118
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
6105 const int index_a = qp + h->slice_alpha_c0_offset;
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
6106 const int alpha = (alpha_table+52)[index_a];
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
6107 const int beta = (beta_table+52)[qp + h->slice_beta_offset];
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6108
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6109 if( bS[0] < 4 ) {
2707
360024d31dab H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents: 2683
diff changeset
6110 int8_t tc[4];
8405
f94a6d6df87e H.264 loopfilter speed tweaks
darkshikari
parents: 8402
diff changeset
6111 tc[0] = (tc0_table+52)[index_a][bS[0]];
f94a6d6df87e H.264 loopfilter speed tweaks
darkshikari
parents: 8402
diff changeset
6112 tc[1] = (tc0_table+52)[index_a][bS[1]];
f94a6d6df87e H.264 loopfilter speed tweaks
darkshikari
parents: 8402
diff changeset
6113 tc[2] = (tc0_table+52)[index_a][bS[2]];
f94a6d6df87e H.264 loopfilter speed tweaks
darkshikari
parents: 8402
diff changeset
6114 tc[3] = (tc0_table+52)[index_a][bS[3]];
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6115 h->s.dsp.h264_v_loop_filter_luma(pix, stride, alpha, beta, tc);
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6116 } else {
8395
195cba8f6257 Move filter_luma_intra into dsputil for later addition of asm.
darkshikari
parents: 8394
diff changeset
6117 h->s.dsp.h264_v_loop_filter_luma_intra(pix, stride, alpha, beta);
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6118 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6119 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6120
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6121 static void filter_mb_edgech( H264Context *h, uint8_t *pix, int stride, int16_t bS[4], int qp ) {
4118
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
6122 const int index_a = qp + h->slice_alpha_c0_offset;
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
6123 const int alpha = (alpha_table+52)[index_a];
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
6124 const int beta = (beta_table+52)[qp + h->slice_beta_offset];
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6125
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6126 if( bS[0] < 4 ) {
2707
360024d31dab H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents: 2683
diff changeset
6127 int8_t tc[4];
8405
f94a6d6df87e H.264 loopfilter speed tweaks
darkshikari
parents: 8402
diff changeset
6128 tc[0] = (tc0_table+52)[index_a][bS[0]]+1;
f94a6d6df87e H.264 loopfilter speed tweaks
darkshikari
parents: 8402
diff changeset
6129 tc[1] = (tc0_table+52)[index_a][bS[1]]+1;
f94a6d6df87e H.264 loopfilter speed tweaks
darkshikari
parents: 8402
diff changeset
6130 tc[2] = (tc0_table+52)[index_a][bS[2]]+1;
f94a6d6df87e H.264 loopfilter speed tweaks
darkshikari
parents: 8402
diff changeset
6131 tc[3] = (tc0_table+52)[index_a][bS[3]]+1;
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6132 h->s.dsp.h264_v_loop_filter_chroma(pix, stride, alpha, beta, tc);
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6133 } else {
2707
360024d31dab H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents: 2683
diff changeset
6134 h->s.dsp.h264_v_loop_filter_chroma_intra(pix, stride, alpha, beta);
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6135 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6136 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6137
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6138 static void filter_mb_fast( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr, unsigned int linesize, unsigned int uvlinesize) {
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6139 MpegEncContext * const s = &h->s;
5883
c64d94561b19 Fix deblocking filter for field pictures by properly looking for first
heydowns
parents: 5878
diff changeset
6140 int mb_y_firstrow = s->picture_structure == PICT_BOTTOM_FIELD;
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6141 int mb_xy, mb_type;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6142 int qp, qp0, qp1, qpc, qpc0, qpc1, qp_thresh;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6143
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
6144 mb_xy = h->mb_xy;
5093
f0ffa056b77c filter_mb_fast() doesn't handle h->deblocking_filter==2 (skip slice edges), so delegate that case to filter_mb().
lorenm
parents: 5083
diff changeset
6145
5883
c64d94561b19 Fix deblocking filter for field pictures by properly looking for first
heydowns
parents: 5878
diff changeset
6146 if(mb_x==0 || mb_y==mb_y_firstrow || !s->dsp.h264_loop_filter_strength || h->pps.chroma_qp_diff ||
8330
7c00e980c153 Enable filter_mb_fast if CODEC_FLAG2_FAST is set.
michael
parents: 8320
diff changeset
6147 !(s->flags2 & CODEC_FLAG2_FAST) || //FIXME filter_mb_fast is broken, thus hasto be, but should not under CODEC_FLAG2_FAST
5093
f0ffa056b77c filter_mb_fast() doesn't handle h->deblocking_filter==2 (skip slice edges), so delegate that case to filter_mb().
lorenm
parents: 5083
diff changeset
6148 (h->deblocking_filter == 2 && (h->slice_table[mb_xy] != h->slice_table[h->top_mb_xy] ||
f0ffa056b77c filter_mb_fast() doesn't handle h->deblocking_filter==2 (skip slice edges), so delegate that case to filter_mb().
lorenm
parents: 5083
diff changeset
6149 h->slice_table[mb_xy] != h->slice_table[mb_xy - 1]))) {
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6150 filter_mb(h, mb_x, mb_y, img_y, img_cb, img_cr, linesize, uvlinesize);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6151 return;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6152 }
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6153 assert(!FRAME_MBAFF);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6154
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6155 mb_type = s->current_picture.mb_type[mb_xy];
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6156 qp = s->current_picture.qscale_table[mb_xy];
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6157 qp0 = s->current_picture.qscale_table[mb_xy-1];
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6158 qp1 = s->current_picture.qscale_table[h->top_mb_xy];
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6159 qpc = get_chroma_qp( h, 0, qp );
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6160 qpc0 = get_chroma_qp( h, 0, qp0 );
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6161 qpc1 = get_chroma_qp( h, 0, qp1 );
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6162 qp0 = (qp + qp0 + 1) >> 1;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6163 qp1 = (qp + qp1 + 1) >> 1;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6164 qpc0 = (qpc + qpc0 + 1) >> 1;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6165 qpc1 = (qpc + qpc1 + 1) >> 1;
3651
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6166 qp_thresh = 15 - h->slice_alpha_c0_offset;
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6167 if(qp <= qp_thresh && qp0 <= qp_thresh && qp1 <= qp_thresh &&
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6168 qpc <= qp_thresh && qpc0 <= qp_thresh && qpc1 <= qp_thresh)
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6169 return;
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6170
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6171 if( IS_INTRA(mb_type) ) {
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6172 int16_t bS4[4] = {4,4,4,4};
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6173 int16_t bS3[4] = {3,3,3,3};
5797
cd21fd29cf7c Fix deblocking for PAFF content
andoma
parents: 5787
diff changeset
6174 int16_t *bSH = FIELD_PICTURE ? bS3 : bS4;
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6175 if( IS_8x8DCT(mb_type) ) {
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6176 filter_mb_edgev( h, &img_y[4*0], linesize, bS4, qp0 );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6177 filter_mb_edgev( h, &img_y[4*2], linesize, bS3, qp );
5797
cd21fd29cf7c Fix deblocking for PAFF content
andoma
parents: 5787
diff changeset
6178 filter_mb_edgeh( h, &img_y[4*0*linesize], linesize, bSH, qp1 );
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6179 filter_mb_edgeh( h, &img_y[4*2*linesize], linesize, bS3, qp );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6180 } else {
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6181 filter_mb_edgev( h, &img_y[4*0], linesize, bS4, qp0 );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6182 filter_mb_edgev( h, &img_y[4*1], linesize, bS3, qp );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6183 filter_mb_edgev( h, &img_y[4*2], linesize, bS3, qp );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6184 filter_mb_edgev( h, &img_y[4*3], linesize, bS3, qp );
5797
cd21fd29cf7c Fix deblocking for PAFF content
andoma
parents: 5787
diff changeset
6185 filter_mb_edgeh( h, &img_y[4*0*linesize], linesize, bSH, qp1 );
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6186 filter_mb_edgeh( h, &img_y[4*1*linesize], linesize, bS3, qp );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6187 filter_mb_edgeh( h, &img_y[4*2*linesize], linesize, bS3, qp );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6188 filter_mb_edgeh( h, &img_y[4*3*linesize], linesize, bS3, qp );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6189 }
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6190 filter_mb_edgecv( h, &img_cb[2*0], uvlinesize, bS4, qpc0 );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6191 filter_mb_edgecv( h, &img_cb[2*2], uvlinesize, bS3, qpc );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6192 filter_mb_edgecv( h, &img_cr[2*0], uvlinesize, bS4, qpc0 );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6193 filter_mb_edgecv( h, &img_cr[2*2], uvlinesize, bS3, qpc );
5797
cd21fd29cf7c Fix deblocking for PAFF content
andoma
parents: 5787
diff changeset
6194 filter_mb_edgech( h, &img_cb[2*0*uvlinesize], uvlinesize, bSH, qpc1 );
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6195 filter_mb_edgech( h, &img_cb[2*2*uvlinesize], uvlinesize, bS3, qpc );
5797
cd21fd29cf7c Fix deblocking for PAFF content
andoma
parents: 5787
diff changeset
6196 filter_mb_edgech( h, &img_cr[2*0*uvlinesize], uvlinesize, bSH, qpc1 );
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6197 filter_mb_edgech( h, &img_cr[2*2*uvlinesize], uvlinesize, bS3, qpc );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6198 return;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6199 } else {
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6200 DECLARE_ALIGNED_8(int16_t, bS[2][4][4]);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6201 uint64_t (*bSv)[4] = (uint64_t(*)[4])bS;
3651
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6202 int edges;
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6203 if( IS_8x8DCT(mb_type) && (h->cbp&7) == 7 ) {
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6204 edges = 4;
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6205 bSv[0][0] = bSv[0][2] = bSv[1][0] = bSv[1][2] = 0x0002000200020002ULL;
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6206 } else {
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6207 int mask_edge1 = (mb_type & (MB_TYPE_16x16 | MB_TYPE_8x16)) ? 3 :
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6208 (mb_type & MB_TYPE_16x8) ? 1 : 0;
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6209 int mask_edge0 = (mb_type & (MB_TYPE_16x16 | MB_TYPE_8x16))
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6210 && (s->current_picture.mb_type[mb_xy-1] & (MB_TYPE_16x16 | MB_TYPE_8x16))
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6211 ? 3 : 0;
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6212 int step = IS_8x8DCT(mb_type) ? 2 : 1;
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6213 edges = (mb_type & MB_TYPE_16x16) && !(h->cbp & 15) ? 1 : 4;
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6214 s->dsp.h264_loop_filter_strength( bS, h->non_zero_count_cache, h->ref_cache, h->mv_cache,
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
6215 (h->slice_type_nos == FF_B_TYPE), edges, step, mask_edge0, mask_edge1, FIELD_PICTURE);
3651
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6216 }
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6217 if( IS_INTRA(s->current_picture.mb_type[mb_xy-1]) )
5822
b49be74d387c Fix mix-up of values in r10690 (deblocking for PAFF).
cehoyos
parents: 5815
diff changeset
6218 bSv[0][0] = 0x0004000400040004ULL;
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6219 if( IS_INTRA(s->current_picture.mb_type[h->top_mb_xy]) )
5822
b49be74d387c Fix mix-up of values in r10690 (deblocking for PAFF).
cehoyos
parents: 5815
diff changeset
6220 bSv[1][0] = FIELD_PICTURE ? 0x0003000300030003ULL : 0x0004000400040004ULL;
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6221
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6222 #define FILTER(hv,dir,edge)\
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6223 if(bSv[dir][edge]) {\
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6224 filter_mb_edge##hv( h, &img_y[4*edge*(dir?linesize:1)], linesize, bS[dir][edge], edge ? qp : qp##dir );\
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6225 if(!(edge&1)) {\
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6226 filter_mb_edgec##hv( h, &img_cb[2*edge*(dir?uvlinesize:1)], uvlinesize, bS[dir][edge], edge ? qpc : qpc##dir );\
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6227 filter_mb_edgec##hv( h, &img_cr[2*edge*(dir?uvlinesize:1)], uvlinesize, bS[dir][edge], edge ? qpc : qpc##dir );\
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6228 }\
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6229 }
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6230 if( edges == 1 ) {
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6231 FILTER(v,0,0);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6232 FILTER(h,1,0);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6233 } else if( IS_8x8DCT(mb_type) ) {
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6234 FILTER(v,0,0);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6235 FILTER(v,0,2);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6236 FILTER(h,1,0);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6237 FILTER(h,1,2);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6238 } else {
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6239 FILTER(v,0,0);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6240 FILTER(v,0,1);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6241 FILTER(v,0,2);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6242 FILTER(v,0,3);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6243 FILTER(h,1,0);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6244 FILTER(h,1,1);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6245 FILTER(h,1,2);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6246 FILTER(h,1,3);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6247 }
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6248 #undef FILTER
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6249 }
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6250 }
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6251
8362
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6252
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6253 static void av_always_inline filter_mb_dir(H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr, unsigned int linesize, unsigned int uvlinesize, int mb_xy, int mb_type, int mvy_limit, int first_vertical_edge_done, int dir) {
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6254 MpegEncContext * const s = &h->s;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6255 int edge;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6256 const int mbm_xy = dir == 0 ? mb_xy -1 : h->top_mb_xy;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6257 const int mbm_type = s->current_picture.mb_type[mbm_xy];
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6258 int (*ref2frm) [64] = h->ref2frm[ h->slice_num &(MAX_SLICES-1) ][0] + (MB_MBAFF ? 20 : 2);
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6259 int (*ref2frmm)[64] = h->ref2frm[ h->slice_table[mbm_xy]&(MAX_SLICES-1) ][0] + (MB_MBAFF ? 20 : 2);
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6260 int start = h->slice_table[mbm_xy] == 0xFFFF ? 1 : 0;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6261
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6262 const int edges = (mb_type & (MB_TYPE_16x16|MB_TYPE_SKIP))
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6263 == (MB_TYPE_16x16|MB_TYPE_SKIP) ? 1 : 4;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6264 // how often to recheck mv-based bS when iterating between edges
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6265 const int mask_edge = (mb_type & (MB_TYPE_16x16 | (MB_TYPE_16x8 << dir))) ? 3 :
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6266 (mb_type & (MB_TYPE_8x16 >> dir)) ? 1 : 0;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6267 // how often to recheck mv-based bS when iterating along each edge
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6268 const int mask_par0 = mb_type & (MB_TYPE_16x16 | (MB_TYPE_8x16 >> dir));
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6269
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6270 if (first_vertical_edge_done) {
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6271 start = 1;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6272 }
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6273
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6274 if (h->deblocking_filter==2 && h->slice_table[mbm_xy] != h->slice_table[mb_xy])
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6275 start = 1;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6276
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6277 if (FRAME_MBAFF && (dir == 1) && ((mb_y&1) == 0) && start == 0
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6278 && !IS_INTERLACED(mb_type)
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6279 && IS_INTERLACED(mbm_type)
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6280 ) {
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6281 // This is a special case in the norm where the filtering must
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6282 // be done twice (one each of the field) even if we are in a
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6283 // frame macroblock.
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6284 //
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6285 static const int nnz_idx[4] = {4,5,6,3};
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6286 unsigned int tmp_linesize = 2 * linesize;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6287 unsigned int tmp_uvlinesize = 2 * uvlinesize;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6288 int mbn_xy = mb_xy - 2 * s->mb_stride;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6289 int qp;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6290 int i, j;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6291 int16_t bS[4];
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6292
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6293 for(j=0; j<2; j++, mbn_xy += s->mb_stride){
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6294 if( IS_INTRA(mb_type) ||
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6295 IS_INTRA(s->current_picture.mb_type[mbn_xy]) ) {
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6296 bS[0] = bS[1] = bS[2] = bS[3] = 3;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6297 } else {
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6298 const uint8_t *mbn_nnz = h->non_zero_count[mbn_xy];
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6299 for( i = 0; i < 4; i++ ) {
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6300 if( h->non_zero_count_cache[scan8[0]+i] != 0 ||
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6301 mbn_nnz[nnz_idx[i]] != 0 )
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6302 bS[i] = 2;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6303 else
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6304 bS[i] = 1;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6305 }
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6306 }
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6307 // Do not use s->qscale as luma quantizer because it has not the same
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6308 // value in IPCM macroblocks.
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6309 qp = ( s->current_picture.qscale_table[mb_xy] + s->current_picture.qscale_table[mbn_xy] + 1 ) >> 1;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6310 tprintf(s->avctx, "filter mb:%d/%d dir:%d edge:%d, QPy:%d ls:%d uvls:%d", mb_x, mb_y, dir, edge, qp, tmp_linesize, tmp_uvlinesize);
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6311 { int i; for (i = 0; i < 4; i++) tprintf(s->avctx, " bS[%d]:%d", i, bS[i]); tprintf(s->avctx, "\n"); }
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6312 filter_mb_edgeh( h, &img_y[j*linesize], tmp_linesize, bS, qp );
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6313 filter_mb_edgech( h, &img_cb[j*uvlinesize], tmp_uvlinesize, bS,
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6314 ( h->chroma_qp[0] + get_chroma_qp( h, 0, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1);
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6315 filter_mb_edgech( h, &img_cr[j*uvlinesize], tmp_uvlinesize, bS,
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6316 ( h->chroma_qp[1] + get_chroma_qp( h, 1, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1);
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6317 }
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6318
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6319 start = 1;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6320 }
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6321
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6322 /* Calculate bS */
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6323 for( edge = start; edge < edges; edge++ ) {
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6324 /* mbn_xy: neighbor macroblock */
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6325 const int mbn_xy = edge > 0 ? mb_xy : mbm_xy;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6326 const int mbn_type = s->current_picture.mb_type[mbn_xy];
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6327 int (*ref2frmn)[64] = edge > 0 ? ref2frm : ref2frmm;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6328 int16_t bS[4];
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6329 int qp;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6330
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6331 if( (edge&1) && IS_8x8DCT(mb_type) )
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6332 continue;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6333
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6334 if( IS_INTRA(mb_type) ||
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6335 IS_INTRA(mbn_type) ) {
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6336 int value;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6337 if (edge == 0) {
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6338 if ( (!IS_INTERLACED(mb_type) && !IS_INTERLACED(mbm_type))
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6339 || ((FRAME_MBAFF || (s->picture_structure != PICT_FRAME)) && (dir == 0))
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6340 ) {
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6341 value = 4;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6342 } else {
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6343 value = 3;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6344 }
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6345 } else {
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6346 value = 3;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6347 }
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6348 bS[0] = bS[1] = bS[2] = bS[3] = value;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6349 } else {
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6350 int i, l;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6351 int mv_done;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6352
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6353 if( edge & mask_edge ) {
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6354 bS[0] = bS[1] = bS[2] = bS[3] = 0;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6355 mv_done = 1;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6356 }
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6357 else if( FRAME_MBAFF && IS_INTERLACED(mb_type ^ mbn_type)) {
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6358 bS[0] = bS[1] = bS[2] = bS[3] = 1;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6359 mv_done = 1;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6360 }
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6361 else if( mask_par0 && (edge || (mbn_type & (MB_TYPE_16x16 | (MB_TYPE_8x16 >> dir)))) ) {
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6362 int b_idx= 8 + 4 + edge * (dir ? 8:1);
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6363 int bn_idx= b_idx - (dir ? 8:1);
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6364 int v = 0;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6365
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6366 for( l = 0; !v && l < 1 + (h->slice_type_nos == FF_B_TYPE); l++ ) {
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6367 v |= ref2frm[l][h->ref_cache[l][b_idx]] != ref2frmn[l][h->ref_cache[l][bn_idx]] ||
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6368 FFABS( h->mv_cache[l][b_idx][0] - h->mv_cache[l][bn_idx][0] ) >= 4 ||
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6369 FFABS( h->mv_cache[l][b_idx][1] - h->mv_cache[l][bn_idx][1] ) >= mvy_limit;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6370 }
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6371
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6372 if(h->slice_type_nos == FF_B_TYPE && v){
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6373 v=0;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6374 for( l = 0; !v && l < 2; l++ ) {
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6375 int ln= 1-l;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6376 v |= ref2frm[l][h->ref_cache[l][b_idx]] != ref2frmn[ln][h->ref_cache[ln][bn_idx]] ||
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6377 FFABS( h->mv_cache[l][b_idx][0] - h->mv_cache[ln][bn_idx][0] ) >= 4 ||
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6378 FFABS( h->mv_cache[l][b_idx][1] - h->mv_cache[ln][bn_idx][1] ) >= mvy_limit;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6379 }
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6380 }
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6381
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6382 bS[0] = bS[1] = bS[2] = bS[3] = v;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6383 mv_done = 1;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6384 }
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6385 else
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6386 mv_done = 0;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6387
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6388 for( i = 0; i < 4; i++ ) {
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6389 int x = dir == 0 ? edge : i;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6390 int y = dir == 0 ? i : edge;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6391 int b_idx= 8 + 4 + x + 8*y;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6392 int bn_idx= b_idx - (dir ? 8:1);
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6393
8363
7c36f4ce172c Replace != 0 || check by |
michael
parents: 8362
diff changeset
6394 if( h->non_zero_count_cache[b_idx] |
7c36f4ce172c Replace != 0 || check by |
michael
parents: 8362
diff changeset
6395 h->non_zero_count_cache[bn_idx] ) {
8362
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6396 bS[i] = 2;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6397 }
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6398 else if(!mv_done)
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6399 {
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6400 bS[i] = 0;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6401 for( l = 0; l < 1 + (h->slice_type_nos == FF_B_TYPE); l++ ) {
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6402 if( ref2frm[l][h->ref_cache[l][b_idx]] != ref2frmn[l][h->ref_cache[l][bn_idx]] ||
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6403 FFABS( h->mv_cache[l][b_idx][0] - h->mv_cache[l][bn_idx][0] ) >= 4 ||
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6404 FFABS( h->mv_cache[l][b_idx][1] - h->mv_cache[l][bn_idx][1] ) >= mvy_limit ) {
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6405 bS[i] = 1;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6406 break;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6407 }
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6408 }
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6409
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6410 if(h->slice_type_nos == FF_B_TYPE && bS[i]){
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6411 bS[i] = 0;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6412 for( l = 0; l < 2; l++ ) {
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6413 int ln= 1-l;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6414 if( ref2frm[l][h->ref_cache[l][b_idx]] != ref2frmn[ln][h->ref_cache[ln][bn_idx]] ||
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6415 FFABS( h->mv_cache[l][b_idx][0] - h->mv_cache[ln][bn_idx][0] ) >= 4 ||
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6416 FFABS( h->mv_cache[l][b_idx][1] - h->mv_cache[ln][bn_idx][1] ) >= mvy_limit ) {
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6417 bS[i] = 1;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6418 break;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6419 }
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6420 }
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6421 }
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6422 }
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6423 }
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6424
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6425 if(bS[0]+bS[1]+bS[2]+bS[3] == 0)
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6426 continue;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6427 }
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6428
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6429 /* Filter edge */
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6430 // Do not use s->qscale as luma quantizer because it has not the same
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6431 // value in IPCM macroblocks.
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6432 qp = ( s->current_picture.qscale_table[mb_xy] + s->current_picture.qscale_table[mbn_xy] + 1 ) >> 1;
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6433 //tprintf(s->avctx, "filter mb:%d/%d dir:%d edge:%d, QPy:%d, QPc:%d, QPcn:%d\n", mb_x, mb_y, dir, edge, qp, h->chroma_qp, s->current_picture.qscale_table[mbn_xy]);
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6434 tprintf(s->avctx, "filter mb:%d/%d dir:%d edge:%d, QPy:%d ls:%d uvls:%d", mb_x, mb_y, dir, edge, qp, linesize, uvlinesize);
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6435 { int i; for (i = 0; i < 4; i++) tprintf(s->avctx, " bS[%d]:%d", i, bS[i]); tprintf(s->avctx, "\n"); }
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6436 if( dir == 0 ) {
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6437 filter_mb_edgev( h, &img_y[4*edge], linesize, bS, qp );
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6438 if( (edge&1) == 0 ) {
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6439 filter_mb_edgecv( h, &img_cb[2*edge], uvlinesize, bS,
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6440 ( h->chroma_qp[0] + get_chroma_qp( h, 0, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1);
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6441 filter_mb_edgecv( h, &img_cr[2*edge], uvlinesize, bS,
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6442 ( h->chroma_qp[1] + get_chroma_qp( h, 1, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1);
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6443 }
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6444 } else {
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6445 filter_mb_edgeh( h, &img_y[4*edge*linesize], linesize, bS, qp );
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6446 if( (edge&1) == 0 ) {
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6447 filter_mb_edgech( h, &img_cb[2*edge*uvlinesize], uvlinesize, bS,
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6448 ( h->chroma_qp[0] + get_chroma_qp( h, 0, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1);
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6449 filter_mb_edgech( h, &img_cr[2*edge*uvlinesize], uvlinesize, bS,
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6450 ( h->chroma_qp[1] + get_chroma_qp( h, 1, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1);
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6451 }
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6452 }
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6453 }
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6454 }
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6455
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6456 static void filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr, unsigned int linesize, unsigned int uvlinesize) {
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6457 MpegEncContext * const s = &h->s;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6458 const int mb_xy= mb_x + mb_y*s->mb_stride;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6459 const int mb_type = s->current_picture.mb_type[mb_xy];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6460 const int mvy_limit = IS_INTERLACED(mb_type) ? 2 : 4;
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6461 int first_vertical_edge_done = 0;
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6462 int dir;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6463
3101
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
6464 //for sufficiently low qp, filtering wouldn't do anything
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
6465 //this is a conservative estimate: could also check beta_offset and more accurate chroma_qp
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6466 if(!FRAME_MBAFF){
6655
22cca5d3173a Implement FFMAX3(a,b,c) - maximum over three arguments.
voroshil
parents: 6604
diff changeset
6467 int qp_thresh = 15 - h->slice_alpha_c0_offset - FFMAX3(0, h->pps.chroma_qp_index_offset[0], h->pps.chroma_qp_index_offset[1]);
3101
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
6468 int qp = s->current_picture.qscale_table[mb_xy];
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
6469 if(qp <= qp_thresh
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
6470 && (mb_x == 0 || ((qp + s->current_picture.qscale_table[mb_xy-1] + 1)>>1) <= qp_thresh)
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
6471 && (mb_y == 0 || ((qp + s->current_picture.qscale_table[h->top_mb_xy] + 1)>>1) <= qp_thresh)){
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
6472 return;
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
6473 }
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
6474 }
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
6475
7378
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6476 // CAVLC 8x8dct requires NNZ values for residual decoding that differ from what the loop filter needs
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6477 if(!h->pps.cabac && h->pps.transform_8x8_mode){
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6478 int top_type, left_type[2];
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6479 top_type = s->current_picture.mb_type[h->top_mb_xy] ;
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6480 left_type[0] = s->current_picture.mb_type[h->left_mb_xy[0]];
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6481 left_type[1] = s->current_picture.mb_type[h->left_mb_xy[1]];
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6482
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6483 if(IS_8x8DCT(top_type)){
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6484 h->non_zero_count_cache[4+8*0]=
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6485 h->non_zero_count_cache[5+8*0]= h->cbp_table[h->top_mb_xy] & 4;
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6486 h->non_zero_count_cache[6+8*0]=
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6487 h->non_zero_count_cache[7+8*0]= h->cbp_table[h->top_mb_xy] & 8;
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6488 }
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6489 if(IS_8x8DCT(left_type[0])){
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6490 h->non_zero_count_cache[3+8*1]=
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6491 h->non_zero_count_cache[3+8*2]= h->cbp_table[h->left_mb_xy[0]]&2; //FIXME check MBAFF
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6492 }
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6493 if(IS_8x8DCT(left_type[1])){
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6494 h->non_zero_count_cache[3+8*3]=
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6495 h->non_zero_count_cache[3+8*4]= h->cbp_table[h->left_mb_xy[1]]&8; //FIXME check MBAFF
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6496 }
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6497
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6498 if(IS_8x8DCT(mb_type)){
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6499 h->non_zero_count_cache[scan8[0 ]]= h->non_zero_count_cache[scan8[1 ]]=
8387
3e6e09814d0c s/h->cbp_table[mb_xy]/h->cbp/
michael
parents: 8386
diff changeset
6500 h->non_zero_count_cache[scan8[2 ]]= h->non_zero_count_cache[scan8[3 ]]= h->cbp & 1;
7378
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6501
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6502 h->non_zero_count_cache[scan8[0+ 4]]= h->non_zero_count_cache[scan8[1+ 4]]=
8387
3e6e09814d0c s/h->cbp_table[mb_xy]/h->cbp/
michael
parents: 8386
diff changeset
6503 h->non_zero_count_cache[scan8[2+ 4]]= h->non_zero_count_cache[scan8[3+ 4]]= h->cbp & 2;
7378
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6504
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6505 h->non_zero_count_cache[scan8[0+ 8]]= h->non_zero_count_cache[scan8[1+ 8]]=
8387
3e6e09814d0c s/h->cbp_table[mb_xy]/h->cbp/
michael
parents: 8386
diff changeset
6506 h->non_zero_count_cache[scan8[2+ 8]]= h->non_zero_count_cache[scan8[3+ 8]]= h->cbp & 4;
7378
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6507
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6508 h->non_zero_count_cache[scan8[0+12]]= h->non_zero_count_cache[scan8[1+12]]=
8387
3e6e09814d0c s/h->cbp_table[mb_xy]/h->cbp/
michael
parents: 8386
diff changeset
6509 h->non_zero_count_cache[scan8[2+12]]= h->non_zero_count_cache[scan8[3+12]]= h->cbp & 8;
7378
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6510 }
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6511 }
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6512
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6513 if (FRAME_MBAFF
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6514 // left mb is in picture
8079
2d3c7cd7d143 Replace literally hardcoded max slice number by named constant.
michael
parents: 8042
diff changeset
6515 && h->slice_table[mb_xy-1] != 0xFFFF
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6516 // and current and left pair do not have the same interlaced type
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6517 && (IS_INTERLACED(mb_type) != IS_INTERLACED(s->current_picture.mb_type[mb_xy-1]))
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6518 // and left mb is in the same slice if deblocking_filter == 2
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6519 && (h->deblocking_filter!=2 || h->slice_table[mb_xy-1] == h->slice_table[mb_xy])) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6520 /* First vertical edge is different in MBAFF frames
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
6521 * There are 8 different bS to compute and 2 different Qp
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6522 */
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6523 const int pair_xy = mb_x + (mb_y&~1)*s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6524 const int left_mb_xy[2] = { pair_xy-1, pair_xy-1+s->mb_stride };
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6525 int16_t bS[8];
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6526 int qp[2];
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6527 int bqp[2];
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6528 int rqp[2];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6529 int mb_qp, mbn0_qp, mbn1_qp;
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6530 int i;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6531 first_vertical_edge_done = 1;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6532
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6533 if( IS_INTRA(mb_type) )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6534 bS[0] = bS[1] = bS[2] = bS[3] = bS[4] = bS[5] = bS[6] = bS[7] = 4;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6535 else {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6536 for( i = 0; i < 8; i++ ) {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6537 int mbn_xy = MB_FIELD ? left_mb_xy[i>>2] : left_mb_xy[i&1];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6538
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6539 if( IS_INTRA( s->current_picture.mb_type[mbn_xy] ) )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6540 bS[i] = 4;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6541 else if( h->non_zero_count_cache[12+8*(i>>1)] != 0 ||
7919
17b22bf9fac6 Fix CAVLC+8x8+MBAFF loop filter.
michael
parents: 7918
diff changeset
6542 ((!h->pps.cabac && IS_8x8DCT(s->current_picture.mb_type[mbn_xy])) ?
17b22bf9fac6 Fix CAVLC+8x8+MBAFF loop filter.
michael
parents: 7918
diff changeset
6543 (h->cbp_table[mbn_xy] & ((MB_FIELD ? (i&2) : (mb_y&1)) ? 8 : 2))
17b22bf9fac6 Fix CAVLC+8x8+MBAFF loop filter.
michael
parents: 7918
diff changeset
6544 :
17b22bf9fac6 Fix CAVLC+8x8+MBAFF loop filter.
michael
parents: 7918
diff changeset
6545 h->non_zero_count[mbn_xy][MB_FIELD ? i&3 : (i>>2)+(mb_y&1)*2]))
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6546 bS[i] = 2;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6547 else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6548 bS[i] = 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6549 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6550 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6551
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6552 mb_qp = s->current_picture.qscale_table[mb_xy];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6553 mbn0_qp = s->current_picture.qscale_table[left_mb_xy[0]];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6554 mbn1_qp = s->current_picture.qscale_table[left_mb_xy[1]];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6555 qp[0] = ( mb_qp + mbn0_qp + 1 ) >> 1;
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6556 bqp[0] = ( get_chroma_qp( h, 0, mb_qp ) +
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6557 get_chroma_qp( h, 0, mbn0_qp ) + 1 ) >> 1;
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6558 rqp[0] = ( get_chroma_qp( h, 1, mb_qp ) +
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6559 get_chroma_qp( h, 1, mbn0_qp ) + 1 ) >> 1;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6560 qp[1] = ( mb_qp + mbn1_qp + 1 ) >> 1;
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6561 bqp[1] = ( get_chroma_qp( h, 0, mb_qp ) +
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6562 get_chroma_qp( h, 0, mbn1_qp ) + 1 ) >> 1;
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6563 rqp[1] = ( get_chroma_qp( h, 1, mb_qp ) +
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6564 get_chroma_qp( h, 1, mbn1_qp ) + 1 ) >> 1;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6565
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6566 /* Filter edge */
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6567 tprintf(s->avctx, "filter mb:%d/%d MBAFF, QPy:%d/%d, QPb:%d/%d QPr:%d/%d ls:%d uvls:%d", mb_x, mb_y, qp[0], qp[1], bqp[0], bqp[1], rqp[0], rqp[1], linesize, uvlinesize);
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
6568 { int i; for (i = 0; i < 8; i++) tprintf(s->avctx, " bS[%d]:%d", i, bS[i]); tprintf(s->avctx, "\n"); }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6569 filter_mb_mbaff_edgev ( h, &img_y [0], linesize, bS, qp );
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6570 filter_mb_mbaff_edgecv( h, &img_cb[0], uvlinesize, bS, bqp );
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6571 filter_mb_mbaff_edgecv( h, &img_cr[0], uvlinesize, bS, rqp );
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6572 }
8362
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6573
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6574 #ifdef CONFIG_SMALL
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
6575 for( dir = 0; dir < 2; dir++ )
8362
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6576 filter_mb_dir(h, mb_x, mb_y, img_y, img_cb, img_cr, linesize, uvlinesize, mb_xy, mb_type, mvy_limit, dir ? 0 : first_vertical_edge_done, dir);
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6577 #else
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6578 filter_mb_dir(h, mb_x, mb_y, img_y, img_cb, img_cr, linesize, uvlinesize, mb_xy, mb_type, mvy_limit, first_vertical_edge_done, 0);
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6579 filter_mb_dir(h, mb_x, mb_y, img_y, img_cb, img_cr, linesize, uvlinesize, mb_xy, mb_type, mvy_limit, 0, 1);
156137b60026 Split filter_mb_dir() out of filter_mb().
michael
parents: 8357
diff changeset
6580 #endif
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
6581 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6582
8129
a9734fe0811e Making it easier to send arbitrary structures as work orders to MT workers
romansh
parents: 8107
diff changeset
6583 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
6584 H264Context *h = *(void**)arg;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6585 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6586 const int part_mask= s->partitioned_frame ? (AC_END|AC_ERROR) : 0x7F;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6587
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6588 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
6589
8353
add1a0d65370 Do not recalculate constant part of is_complex for every MB.
michael
parents: 8352
diff changeset
6590 h->is_complex = FRAME_MBAFF || s->picture_structure != PICT_FRAME || s->codec_id != CODEC_ID_H264 ||
8354
5e6f65181881 Move ENABLE_SMALL back to the per MB check, as otherwise gcc wont remove
michael
parents: 8353
diff changeset
6591 (ENABLE_GRAY && (s->flags&CODEC_FLAG_GRAY)) || (ENABLE_H264_ENCODER && s->encoding);
8353
add1a0d65370 Do not recalculate constant part of is_complex for every MB.
michael
parents: 8352
diff changeset
6592
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6593 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
6594 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
6595
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6596 /* realign */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6597 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
6598
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6599 /* 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
6600 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
6601 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
6602 s->gb.buffer + get_bits_count(&s->gb)/8,
2116
48d9f86fb047 overread fix
michael
parents: 2110
diff changeset
6603 ( s->gb.size_in_bits - get_bits_count(&s->gb) + 7)/8);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6604 /* calculate pre-state */
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6605 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
6606 int pre;
7340
ef40221c1452 SI/SP slice support. (not bitexact)
michael
parents: 7339
diff changeset
6607 if( h->slice_type_nos == FF_I_TYPE )
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
6608 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
6609 else
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
6610 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
6611
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6612 if( pre <= 63 )
3976
27e90123b346 reverse remainder of the failed attempt to optimize *state=c->mps_state[s]
michael
parents: 3972
diff changeset
6613 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
6614 else
3976
27e90123b346 reverse remainder of the failed attempt to optimize *state=c->mps_state[s]
michael
parents: 3972
diff changeset
6615 h->cabac_state[i] = 2 * ( pre - 64 ) + 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6616 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6617
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6618 for(;;){
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
6619 //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
6620 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
6621 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
6622 //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
6623
2163
b25df257eab0 segfault fix
michael
parents: 2116
diff changeset
6624 if(ret>=0) hl_decode_mb(h);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6625
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6626 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
6627 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
6628
8416
7f93fb360055 Remove useless code.
michael
parents: 8415
diff changeset
6629 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
6630
2844
5f20ab245501 prevent assert failures and infinite loops with broken streams
michael
parents: 2834
diff changeset
6631 if(ret>=0) hl_decode_mb(h);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6632 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
6633 }
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
6634 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
6635
3948
3edbf131ee44 refill cabac variables in 16bit steps, 3% faster get_cabac()
michael
parents: 3947
diff changeset
6636 if( ret < 0 || h->cabac.bytestream > h->cabac.bytestream_end + 2) {
5153
b985439e3e15 fix some printf format specifiers
mru
parents: 5129
diff changeset
6637 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
6638 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
6639 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
6640 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6641
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6642 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
6643 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
6644 ff_draw_horiz_band(s, 16*s->mb_y, 16);
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
6645 ++s->mb_y;
5781
0b3aa6f4c313 Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents: 5780
diff changeset
6646 if(FIELD_OR_MBAFF_PICTURE) {
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
6647 ++s->mb_y;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
6648 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6649 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6650
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6651 if( eos || s->mb_y >= s->mb_height ) {
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
6652 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
6653 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
6654 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
6655 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6656 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6657
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6658 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6659 for(;;){
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6660 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
6661
2163
b25df257eab0 segfault fix
michael
parents: 2116
diff changeset
6662 if(ret>=0) hl_decode_mb(h);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6663
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6664 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
6665 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
6666 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
6667
2163
b25df257eab0 segfault fix
michael
parents: 2116
diff changeset
6668 if(ret>=0) hl_decode_mb(h);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6669 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
6670 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6671
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6672 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
6673 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
6674 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
6675
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6676 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
6677 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6678
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6679 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
6680 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
6681 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
6682 ++s->mb_y;
5781
0b3aa6f4c313 Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents: 5780
diff changeset
6683 if(FIELD_OR_MBAFF_PICTURE) {
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
6684 ++s->mb_y;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
6685 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
6686 if(s->mb_y >= s->mb_height){
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
6687 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
6688
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6689 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
6690 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
6691
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6692 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
6693 }else{
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6694 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
6695
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6696 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
6697 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6698 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6699 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6700
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6701 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
6702 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
6703 if(get_bits_count(&s->gb) == s->gb.size_in_bits ){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6704 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
6705
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6706 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6707 }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
6708 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
6709
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6710 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6711 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6712 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6713 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6714 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6715
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6716 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6717 for(;s->mb_y < s->mb_height; s->mb_y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6718 for(;s->mb_x < s->mb_width; s->mb_x++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6719 int ret= decode_mb(h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6720
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6721 hl_decode_mb(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6722
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6723 if(ret<0){
3177
8d1b2cc2a75b (f)printf --> av_log conversion
diego
parents: 3174
diff changeset
6724 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
6725 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
6726
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6727 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6728 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6729
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6730 if(++s->mb_x >= s->mb_width){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6731 s->mb_x=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6732 if(++s->mb_y >= s->mb_height){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6733 if(get_bits_count(s->gb) == s->gb.size_in_bits){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6734 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
6735
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6736 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6737 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6738 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
6739
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6740 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6741 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6742 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6743 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6744
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6745 if(get_bits_count(s->?gb) >= s->gb?.size_in_bits){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6746 if(get_bits_count(s->gb) == s->gb.size_in_bits){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6747 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
6748
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6749 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6750 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6751 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
6752
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6753 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6754 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6755 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6756 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6757 s->mb_x=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6758 ff_draw_horiz_band(s, 16*s->mb_y, 16);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6759 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6760 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6761 return -1; //not reached
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6762 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6763
8107
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6764 static int decode_picture_timing(H264Context *h){
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6765 MpegEncContext * const s = &h->s;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6766 if(h->sps.nal_hrd_parameters_present_flag || h->sps.vcl_hrd_parameters_present_flag){
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6767 skip_bits(&s->gb, h->sps.cpb_removal_delay_length); /* cpb_removal_delay */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6768 skip_bits(&s->gb, h->sps.dpb_output_delay_length); /* dpb_output_delay */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6769 }
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6770 if(h->sps.pic_struct_present_flag){
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6771 unsigned int i, num_clock_ts;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6772 h->sei_pic_struct = get_bits(&s->gb, 4);
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6773
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6774 if (h->sei_pic_struct > SEI_PIC_STRUCT_FRAME_TRIPLING)
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6775 return -1;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6776
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6777 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
6778
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6779 for (i = 0 ; i < num_clock_ts ; i++){
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6780 if(get_bits(&s->gb, 1)){ /* clock_timestamp_flag */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6781 unsigned int full_timestamp_flag;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6782 skip_bits(&s->gb, 2); /* ct_type */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6783 skip_bits(&s->gb, 1); /* nuit_field_based_flag */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6784 skip_bits(&s->gb, 5); /* counting_type */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6785 full_timestamp_flag = get_bits(&s->gb, 1);
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6786 skip_bits(&s->gb, 1); /* discontinuity_flag */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6787 skip_bits(&s->gb, 1); /* cnt_dropped_flag */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6788 skip_bits(&s->gb, 8); /* n_frames */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6789 if(full_timestamp_flag){
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6790 skip_bits(&s->gb, 6); /* seconds_value 0..59 */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6791 skip_bits(&s->gb, 6); /* minutes_value 0..59 */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6792 skip_bits(&s->gb, 5); /* hours_value 0..23 */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6793 }else{
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6794 if(get_bits(&s->gb, 1)){ /* seconds_flag */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6795 skip_bits(&s->gb, 6); /* seconds_value range 0..59 */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6796 if(get_bits(&s->gb, 1)){ /* minutes_flag */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6797 skip_bits(&s->gb, 6); /* minutes_value 0..59 */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6798 if(get_bits(&s->gb, 1)) /* hours_flag */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6799 skip_bits(&s->gb, 5); /* hours_value 0..23 */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6800 }
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6801 }
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6802 }
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6803 if(h->sps.time_offset_length > 0)
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6804 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
6805 }
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6806 }
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6807 }
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6808 return 0;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6809 }
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6810
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6811 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
6812 MpegEncContext * const s = &h->s;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6813 uint8_t user_data[16+256];
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6814 int e, build, i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6815
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6816 if(size<16)
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6817 return -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6818
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6819 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
6820 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
6821 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6822
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6823 user_data[i]= 0;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6824 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
6825 if(e==1 && build>=0)
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6826 h->x264_build= build;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6827
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6828 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
6829 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
6830
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6831 for(; i<size; i++)
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6832 skip_bits(&s->gb, 8);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6833
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6834 return 0;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6835 }
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6836
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6837 static int decode_sei(H264Context *h){
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6838 MpegEncContext * const s = &h->s;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6839
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6840 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
6841 int size, type;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6842
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6843 type=0;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6844 do{
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6845 type+= show_bits(&s->gb, 8);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6846 }while(get_bits(&s->gb, 8) == 255);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6847
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6848 size=0;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6849 do{
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6850 size+= show_bits(&s->gb, 8);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6851 }while(get_bits(&s->gb, 8) == 255);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6852
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6853 switch(type){
8107
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6854 case 1: // Picture timing SEI
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6855 if(decode_picture_timing(h) < 0)
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6856 return -1;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6857 break;
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6858 case 5:
3318
8dc886b9568a typo me thinks ...
michael
parents: 3316
diff changeset
6859 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
6860 return -1;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6861 break;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6862 default:
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6863 skip_bits(&s->gb, 8*size);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6864 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6865
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6866 //FIXME check bits here
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6867 align_get_bits(&s->gb);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6868 }
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6869
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6870 return 0;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6871 }
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6872
8263
2e8368ea591a Check that cpb_count is within the allowed range.
michael
parents: 8235
diff changeset
6873 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
6874 MpegEncContext * const s = &h->s;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6875 int cpb_count, i;
8451
384600e3fe5b Use get_ue_golomb_31() where possible, almost all are just in headers
michael
parents: 8448
diff changeset
6876 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
6877
2e8368ea591a Check that cpb_count is within the allowed range.
michael
parents: 8235
diff changeset
6878 if(cpb_count > 32U){
2e8368ea591a Check that cpb_count is within the allowed range.
michael
parents: 8235
diff changeset
6879 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
6880 return -1;
2e8368ea591a Check that cpb_count is within the allowed range.
michael
parents: 8235
diff changeset
6881 }
2e8368ea591a Check that cpb_count is within the allowed range.
michael
parents: 8235
diff changeset
6882
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6883 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
6884 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
6885 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
6886 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
6887 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
6888 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
6889 }
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6890 get_bits(&s->gb, 5); /* initial_cpb_removal_delay_length_minus1 */
8107
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6891 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
6892 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
6893 sps->time_offset_length = get_bits(&s->gb, 5);
8263
2e8368ea591a Check that cpb_count is within the allowed range.
michael
parents: 8235
diff changeset
6894 return 0;
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6895 }
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6896
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6897 static inline int decode_vui_parameters(H264Context *h, SPS *sps){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6898 MpegEncContext * const s = &h->s;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
6899 int aspect_ratio_info_present_flag;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
6900 unsigned int aspect_ratio_idc;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6901
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6902 aspect_ratio_info_present_flag= get_bits1(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6903
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6904 if( aspect_ratio_info_present_flag ) {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6905 aspect_ratio_idc= get_bits(&s->gb, 8);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6906 if( aspect_ratio_idc == EXTENDED_SAR ) {
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
6907 sps->sar.num= get_bits(&s->gb, 16);
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
6908 sps->sar.den= get_bits(&s->gb, 16);
8042
e70975d5ff80 uses FF_ARRAY_ELEMS() where appropriate
aurel
parents: 7993
diff changeset
6909 }else if(aspect_ratio_idc < FF_ARRAY_ELEMS(pixel_aspect)){
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
6910 sps->sar= pixel_aspect[aspect_ratio_idc];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6911 }else{
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
6912 av_log(h->s.avctx, AV_LOG_ERROR, "illegal aspect ratio\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6913 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6914 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6915 }else{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6916 sps->sar.num=
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
6917 sps->sar.den= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6918 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6919 // 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
6920
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6921 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
6922 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
6923 }
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6924
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6925 if(get_bits1(&s->gb)){ /* video_signal_type_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
6926 get_bits(&s->gb, 3); /* video_format */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6927 get_bits1(&s->gb); /* video_full_range_flag */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6928 if(get_bits1(&s->gb)){ /* colour_description_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
6929 get_bits(&s->gb, 8); /* colour_primaries */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6930 get_bits(&s->gb, 8); /* transfer_characteristics */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6931 get_bits(&s->gb, 8); /* matrix_coefficients */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6932 }
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6933 }
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6934
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6935 if(get_bits1(&s->gb)){ /* chroma_location_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
6936 get_ue_golomb(&s->gb); /* chroma_sample_location_type_top_field */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6937 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
6938 }
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6939
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6940 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
6941 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
6942 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
6943 sps->time_scale = 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
6944 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
6945 }
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6946
8107
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6947 sps->nal_hrd_parameters_present_flag = get_bits1(&s->gb);
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6948 if(sps->nal_hrd_parameters_present_flag)
8263
2e8368ea591a Check that cpb_count is within the allowed range.
michael
parents: 8235
diff changeset
6949 if(decode_hrd_parameters(h, sps) < 0)
2e8368ea591a Check that cpb_count is within the allowed range.
michael
parents: 8235
diff changeset
6950 return -1;
8107
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6951 sps->vcl_hrd_parameters_present_flag = get_bits1(&s->gb);
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6952 if(sps->vcl_hrd_parameters_present_flag)
8263
2e8368ea591a Check that cpb_count is within the allowed range.
michael
parents: 8235
diff changeset
6953 if(decode_hrd_parameters(h, sps) < 0)
2e8368ea591a Check that cpb_count is within the allowed range.
michael
parents: 8235
diff changeset
6954 return -1;
8107
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6955 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
6956 get_bits1(&s->gb); /* low_delay_hrd_flag */
8107
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
6957 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
6958
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6959 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
6960 if(sps->bitstream_restriction_flag){
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6961 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
6962 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
6963 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
6964 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
6965 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
6966 sps->num_reorder_frames= get_ue_golomb(&s->gb);
4389
3afddc65631b check num_reorder_frames for validity
michael
parents: 4388
diff changeset
6967 get_ue_golomb(&s->gb); /*max_dec_frame_buffering*/
3afddc65631b check num_reorder_frames for validity
michael
parents: 4388
diff changeset
6968
8235
61b5b99f3b77 Get rid of now unneeded pps/sps correctness code as pps/sps will not
michael
parents: 8234
diff changeset
6969 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
6970 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
6971 return -1;
3afddc65631b check num_reorder_frames for validity
michael
parents: 4388
diff changeset
6972 }
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6973 }
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6974
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6975 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6976 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6977
3004
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
6978 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
6979 const uint8_t *jvt_list, const uint8_t *fallback_list){
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6980 MpegEncContext * const s = &h->s;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6981 int i, last = 8, next = 8;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6982 const uint8_t *scan = size == 16 ? zigzag_scan : zigzag_scan8x8;
3004
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
6983 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
6984 memcpy(factors, fallback_list, size*sizeof(uint8_t));
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6985 else
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6986 for(i=0;i<size;i++){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6987 if(next)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6988 next = (last + get_se_golomb(&s->gb)) & 0xff;
3004
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
6989 if(!i && !next){ /* matrix not written, we use the preset one */
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
6990 memcpy(factors, jvt_list, size*sizeof(uint8_t));
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6991 break;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6992 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6993 last = factors[scan[i]] = next ? next : last;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6994 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6995 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6996
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6997 static void decode_scaling_matrices(H264Context *h, SPS *sps, PPS *pps, int is_sps,
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6998 uint8_t (*scaling_matrix4)[16], uint8_t (*scaling_matrix8)[64]){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6999 MpegEncContext * const s = &h->s;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7000 int fallback_sps = !is_sps && sps->scaling_matrix_present;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7001 const uint8_t *fallback[4] = {
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7002 fallback_sps ? sps->scaling_matrix4[0] : default_scaling4[0],
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7003 fallback_sps ? sps->scaling_matrix4[3] : default_scaling4[1],
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7004 fallback_sps ? sps->scaling_matrix8[0] : default_scaling8[0],
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7005 fallback_sps ? sps->scaling_matrix8[1] : default_scaling8[1]
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7006 };
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7007 if(get_bits1(&s->gb)){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7008 sps->scaling_matrix_present |= is_sps;
3004
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
7009 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
7010 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
7011 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
7012 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
7013 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
7014 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
7015 if(is_sps || pps->transform_8x8_mode){
3004
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
7016 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
7017 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
7018 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7019 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7020 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7021
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7022 static inline int decode_seq_parameter_set(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7023 MpegEncContext * const s = &h->s;
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7024 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
7025 unsigned int sps_id;
4362
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
7026 int i;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7027 SPS *sps;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7028
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7029 profile_idc= get_bits(&s->gb, 8);
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7030 get_bits1(&s->gb); //constraint_set0_flag
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7031 get_bits1(&s->gb); //constraint_set1_flag
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7032 get_bits1(&s->gb); //constraint_set2_flag
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
7033 get_bits1(&s->gb); //constraint_set3_flag
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
7034 get_bits(&s->gb, 4); // reserved
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7035 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
7036 sps_id= get_ue_golomb_31(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7037
8234
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
7038 if(sps_id >= MAX_SPS_COUNT) {
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
7039 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
7040 return -1;
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
7041 }
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
7042 sps= av_mallocz(sizeof(SPS));
5079
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7043 if(sps == NULL)
4362
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
7044 return -1;
5079
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7045
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7046 sps->profile_idc= profile_idc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7047 sps->level_idc= level_idc;
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
7048
7892
59e42f624d4d Make pps/sps scaling_matrix initialization closer to the spec.
michael
parents: 7888
diff changeset
7049 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
7050 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
7051 sps->scaling_matrix_present = 0;
59e42f624d4d Make pps/sps scaling_matrix initialization closer to the spec.
michael
parents: 7888
diff changeset
7052
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7053 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
7054 sps->chroma_format_idc= get_ue_golomb_31(&s->gb);
7407
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
7055 if(sps->chroma_format_idc == 3)
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7056 get_bits1(&s->gb); //residual_color_transform_flag
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7057 get_ue_golomb(&s->gb); //bit_depth_luma_minus8
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7058 get_ue_golomb(&s->gb); //bit_depth_chroma_minus8
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
7059 sps->transform_bypass = get_bits1(&s->gb);
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7060 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
7061 }else{
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
7062 sps->chroma_format_idc= 1;
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
7063 }
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7064
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7065 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
7066 sps->poc_type= get_ue_golomb_31(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7067
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7068 if(sps->poc_type == 0){ //FIXME #define
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7069 sps->log2_max_poc_lsb= get_ue_golomb(&s->gb) + 4;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7070 } else if(sps->poc_type == 1){//FIXME #define
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7071 sps->delta_pic_order_always_zero_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7072 sps->offset_for_non_ref_pic= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7073 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
7074 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
7075
61b5b99f3b77 Get rid of now unneeded pps/sps correctness code as pps/sps will not
michael
parents: 8234
diff changeset
7076 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
7077 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
7078 goto fail;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7079 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7080
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7081 for(i=0; i<sps->poc_cycle_length; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7082 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
7083 }else if(sps->poc_type != 2){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
7084 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
7085 goto fail;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7086 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7087
8451
384600e3fe5b Use get_ue_golomb_31() where possible, almost all are just in headers
michael
parents: 8448
diff changeset
7088 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
7089 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
7090 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
7091 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
7092 }
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7093 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
7094 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
7095 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
7096 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
7097 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
7098 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
7099 goto fail;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7100 }
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2417
diff changeset
7101
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7102 sps->frame_mbs_only_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7103 if(!sps->frame_mbs_only_flag)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7104 sps->mb_aff= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7105 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7106 sps->mb_aff= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7107
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7108 sps->direct_8x8_inference_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7109
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7110 #ifndef ALLOW_INTERLACE
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7111 if(sps->mb_aff)
3954
00a12ef7d800 output typo fixes
diego
parents: 3948
diff changeset
7112 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
7113 #endif
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7114 sps->crop= get_bits1(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7115 if(sps->crop){
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7116 sps->crop_left = get_ue_golomb(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7117 sps->crop_right = get_ue_golomb(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7118 sps->crop_top = get_ue_golomb(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7119 sps->crop_bottom= get_ue_golomb(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7120 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
7121 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
7122 }
7844
d35a71a3db5f Fix incorrect printing of brainfart cropping error in some cases in progressive mode.
darkshikari
parents: 7831
diff changeset
7123 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
7124 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
7125 }
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7126 }else{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7127 sps->crop_left =
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7128 sps->crop_right =
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7129 sps->crop_top =
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7130 sps->crop_bottom= 0;
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7131 }
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7132
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7133 sps->vui_parameters_present_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7134 if( sps->vui_parameters_present_flag )
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7135 decode_vui_parameters(h, sps);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7136
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7137 if(s->avctx->debug&FF_DEBUG_PICT_INFO){
7407
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
7138 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\n",
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7139 sps_id, sps->profile_idc, sps->level_idc,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7140 sps->poc_type,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7141 sps->ref_frame_count,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7142 sps->mb_width, sps->mb_height,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7143 sps->frame_mbs_only_flag ? "FRM" : (sps->mb_aff ? "MB-AFF" : "PIC-AFF"),
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7144 sps->direct_8x8_inference_flag ? "8B8" : "",
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7145 sps->crop_left, sps->crop_right,
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7146 sps->crop_top, sps->crop_bottom,
7407
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
7147 sps->vui_parameters_present_flag ? "VUI" : "",
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
7148 ((const char*[]){"Gray","420","422","444"})[sps->chroma_format_idc]
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7149 );
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7150 }
8234
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
7151 av_free(h->sps_buffers[sps_id]);
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
7152 h->sps_buffers[sps_id]= sps;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7153 return 0;
8234
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
7154 fail:
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
7155 av_free(sps);
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
7156 return -1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7157 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7158
5226
65bffcc5571a Precompute a chroma_qp table with index offset for each pps,
gpoirier
parents: 5225
diff changeset
7159 static void
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
7160 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
7161 {
65bffcc5571a Precompute a chroma_qp table with index offset for each pps,
gpoirier
parents: 5225
diff changeset
7162 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
7163 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
7164 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
7165 }
65bffcc5571a Precompute a chroma_qp table with index offset for each pps,
gpoirier
parents: 5225
diff changeset
7166
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7167 static inline int decode_picture_parameter_set(H264Context *h, int bit_length){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7168 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
7169 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
7170 PPS *pps;
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
7171
8234
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
7172 if(pps_id >= MAX_PPS_COUNT) {
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
7173 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
7174 return -1;
8234
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
7175 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7176
8234
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
7177 pps= av_mallocz(sizeof(PPS));
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
7178 if(pps == NULL)
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
7179 return -1;
8451
384600e3fe5b Use get_ue_golomb_31() where possible, almost all are just in headers
michael
parents: 8448
diff changeset
7180 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
7181 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
7182 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
7183 goto fail;
61b5b99f3b77 Get rid of now unneeded pps/sps correctness code as pps/sps will not
michael
parents: 8234
diff changeset
7184 }
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7185
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7186 pps->cabac= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7187 pps->pic_order_present= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7188 pps->slice_group_count= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7189 if(pps->slice_group_count > 1 ){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7190 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
7191 av_log(h->s.avctx, AV_LOG_ERROR, "FMO not supported\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7192 switch(pps->mb_slice_group_map_type){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7193 case 0:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7194 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7195 | for( i = 0; i <= num_slice_groups_minus1; i++ ) | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7196 | run_length[ i ] |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7197 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7198 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7199 case 2:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7200 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7201 | for( i = 0; i < num_slice_groups_minus1; i++ ) | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7202 |{ | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7203 | top_left_mb[ i ] |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7204 | bottom_right_mb[ i ] |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7205 | } | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7206 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7207 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7208 case 3:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7209 case 4:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7210 case 5:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7211 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7212 | slice_group_change_direction_flag |1 |u(1) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7213 | slice_group_change_rate_minus1 |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7214 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7215 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7216 case 6:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7217 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7218 | slice_group_id_cnt_minus1 |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7219 | for( i = 0; i <= slice_group_id_cnt_minus1; i++ | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7220 |) | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7221 | slice_group_id[ i ] |1 |u(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7222 #endif
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1187
diff changeset
7223 break;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7224 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7225 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7226 pps->ref_count[0]= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7227 pps->ref_count[1]= get_ue_golomb(&s->gb) + 1;
4531
8a5a3dd25390 fix ref_count check
michael
parents: 4530
diff changeset
7228 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
7229 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
7230 goto fail;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7231 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7232
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7233 pps->weighted_pred= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7234 pps->weighted_bipred_idc= get_bits(&s->gb, 2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7235 pps->init_qp= get_se_golomb(&s->gb) + 26;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7236 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
7237 pps->chroma_qp_index_offset[0]= get_se_golomb(&s->gb);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7238 pps->deblocking_filter_parameters_present= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7239 pps->constrained_intra_pred= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7240 pps->redundant_pic_cnt_present = get_bits1(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7241
3291
454de57e45cf reinit quant matrices if pps is overwritten by another of the same pps_id.
lorenm
parents: 3285
diff changeset
7242 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
7243 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
7244 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
7245 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
7246
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7247 if(get_bits_count(&s->gb) < bit_length){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7248 pps->transform_8x8_mode= get_bits1(&s->gb);
5079
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7249 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
7250 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
7251 } else {
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
7252 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
7253 }
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
7254
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
7255 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
7256 build_qp_table(pps, 1, pps->chroma_qp_index_offset[1]);
a36996f67748 Deobfusate chroma_qp_table[1] init code.
michael
parents: 7344
diff changeset
7257 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
7258 h->pps.chroma_qp_diff= 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7259
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7260 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
7261 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
7262 pps_id, pps->sps_id,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7263 pps->cabac ? "CABAC" : "CAVLC",
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7264 pps->slice_group_count,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7265 pps->ref_count[0], pps->ref_count[1],
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7266 pps->weighted_pred ? "weighted" : "",
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
7267 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
7268 pps->deblocking_filter_parameters_present ? "LPAR" : "",
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7269 pps->constrained_intra_pred ? "CONSTR" : "",
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7270 pps->redundant_pic_cnt_present ? "REDU" : "",
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7271 pps->transform_8x8_mode ? "8x8DCT" : ""
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7272 );
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7273 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7274
8234
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
7275 av_free(h->pps_buffers[pps_id]);
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
7276 h->pps_buffers[pps_id]= pps;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7277 return 0;
8234
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
7278 fail:
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
7279 av_free(pps);
4a8f9bbc5e81 Allocate parameter sets sanely instead of using alloc_parameter_set().
michael
parents: 8231
diff changeset
7280 return -1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7281 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7282
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7283 /**
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7284 * Call decode_slice() for each context.
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7285 *
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7286 * @param h h264 master context
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7287 * @param context_count number of contexts to execute
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7288 */
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7289 static void execute_decode_slices(H264Context *h, int context_count){
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7290 MpegEncContext * const s = &h->s;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7291 AVCodecContext * const avctx= s->avctx;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7292 H264Context *hx;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7293 int i;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7294
8522
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
7295 if(avctx->codec_id == CODEC_ID_H264_VDPAU)
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
7296 return;
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7297 if(context_count == 1) {
8140
54d7d6a63f3c Fix H.264 decoding.
cehoyos
parents: 8129
diff changeset
7298 decode_slice(avctx, &h);
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7299 } else {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7300 for(i = 1; i < context_count; i++) {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7301 hx = h->thread_context[i];
7831
8195c970d077 Rename error_resilience to error_recognition.
michael
parents: 7789
diff changeset
7302 hx->s.error_recognition = avctx->error_recognition;
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7303 hx->s.error_count = 0;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7304 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7305
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7306 avctx->execute(avctx, (void *)decode_slice,
8129
a9734fe0811e Making it easier to send arbitrary structures as work orders to MT workers
romansh
parents: 8107
diff changeset
7307 (void **)h->thread_context, NULL, context_count, sizeof(void*));
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7308
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7309 /* pull back stuff from slices to master context */
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7310 hx = h->thread_context[context_count - 1];
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7311 s->mb_x = hx->s.mb_x;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7312 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
7313 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
7314 s->picture_structure = hx->s.picture_structure;
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7315 for(i = 1; i < context_count; i++)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7316 h->s.error_count += h->thread_context[i]->s.error_count;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7317 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7318 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7319
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7320
6216
michael
parents: 6213
diff changeset
7321 static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7322 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7323 AVCodecContext * const avctx= s->avctx;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7324 int buf_index=0;
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7325 H264Context *hx; ///< thread context
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7326 int context_count = 0;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7327
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7328 h->max_contexts = avctx->thread_count;
1322
f78341ab5fba some warning fixes
al3x
parents: 1319
diff changeset
7329 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7330 int i;
2867
7c7edddaa835 dont be so picky with .mp4 ... fixes Mr&MrsSmith.mp4
michael
parents: 2861
diff changeset
7331 for(i=0; i<50; i++){
7c7edddaa835 dont be so picky with .mp4 ... fixes Mr&MrsSmith.mp4
michael
parents: 2861
diff changeset
7332 av_log(NULL, AV_LOG_ERROR,"%02X ", buf[i]);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7333 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7334 #endif
4616
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7335 if(!(s->flags2 & CODEC_FLAG2_CHUNKS)){
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7336 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
7337 if (!s->first_field)
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7338 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
7339 }
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7340
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7341 for(;;){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7342 int consumed;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7343 int dst_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7344 int bit_length;
6216
michael
parents: 6213
diff changeset
7345 const uint8_t *ptr;
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7346 int i, nalsize = 0;
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7347 int err;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7348
5170
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7349 if(h->is_avc) {
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7350 if(buf_index >= buf_size) break;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7351 nalsize = 0;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7352 for(i = 0; i < h->nal_length_size; i++)
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7353 nalsize = (nalsize << 8) | buf[buf_index++];
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7354 if(nalsize <= 1 || (nalsize+buf_index > buf_size)){
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7355 if(nalsize == 1){
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7356 buf_index++;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7357 continue;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7358 }else{
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7359 av_log(h->s.avctx, AV_LOG_ERROR, "AVC: nal size %d\n", nalsize);
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7360 break;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7361 }
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7362 }
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7363 } else {
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7364 // start code prefix search
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7365 for(; buf_index + 3 < buf_size; buf_index++){
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7366 // This should always succeed in the first iteration.
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7367 if(buf[buf_index] == 0 && buf[buf_index+1] == 0 && buf[buf_index+2] == 1)
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7368 break;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7369 }
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7370
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7371 if(buf_index+3 >= buf_size) break;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7372
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7373 buf_index+=3;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7374 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7375
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7376 hx = h->thread_context[context_count];
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7377
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7378 ptr= decode_nal(hx, buf + buf_index, &dst_length, &consumed, h->is_avc ? nalsize : buf_size - buf_index);
4828
58f1856608f6 scenario: A properly coded frame is followed by an end of sequence NAL unit,
diego
parents: 4795
diff changeset
7379 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
7380 return -1;
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
7381 }
4829
e3161603a048 Remove a NAL unit's trailing zero bytes even when dst_length is 1.
diego
parents: 4828
diff changeset
7382 while(ptr[dst_length - 1] == 0 && dst_length > 0)
3341
bd7a496e44c9 h264: accept rbsp_trailing longer than 1 byte
lorenm
parents: 3318
diff changeset
7383 dst_length--;
4830
5a523aee7379 When dst_length == 0 bit_length has to be 0, too, but the current code still
diego
parents: 4829
diff changeset
7384 bit_length= !dst_length ? 0 : (8*dst_length - decode_rbsp_trailing(h, ptr + dst_length - 1));
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7385
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7386 if(s->avctx->debug&FF_DEBUG_STARTCODE){
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7387 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
7388 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7389
6490
bb799e3bc64b If consumed does not match nalsize, favor nalsize.
michael
parents: 6488
diff changeset
7390 if (h->is_avc && (nalsize != consumed)){
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7391 av_log(h->s.avctx, AV_LOG_ERROR, "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
7392 consumed= nalsize;
bb799e3bc64b If consumed does not match nalsize, favor nalsize.
michael
parents: 6488
diff changeset
7393 }
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7394
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7395 buf_index += consumed;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7396
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5106
diff changeset
7397 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
7398 ||(avctx->skip_frame >= AVDISCARD_NONREF && h->nal_ref_idc == 0))
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7399 continue;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7400
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7401 again:
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7402 err = 0;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7403 switch(hx->nal_unit_type){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7404 case NAL_IDR_SLICE:
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7405 if (h->nal_unit_type != NAL_IDR_SLICE) {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7406 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
7407 return -1;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7408 }
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
7409 idr(h); //FIXME ensure we don't loose some frames if there is reordering
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7410 case NAL_SLICE:
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7411 init_get_bits(&hx->s.gb, ptr, bit_length);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7412 hx->intra_gb_ptr=
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7413 hx->inter_gb_ptr= &hx->s.gb;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7414 hx->s.data_partitioning = 0;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7415
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7416 if((err = decode_slice_header(hx, h)))
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7417 break;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7418
5773
e3d7a78e2df3 Fix Picture.key_frame setting to be compatible with frame and field contexts. Part of PAFF implementation.
andoma
parents: 5772
diff changeset
7419 s->current_picture_ptr->key_frame|= (hx->nal_unit_type == NAL_IDR_SLICE);
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7420 if(hx->redundant_pic_count==0 && hx->s.hurry_up < 5
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7421 && (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
7422 && (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
7423 && (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
7424 && avctx->skip_frame < AVDISCARD_ALL){
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
7425 if(ENABLE_H264_VDPAU_DECODER && avctx->codec_id == CODEC_ID_H264_VDPAU){
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
7426 static const uint8_t start_code[] = {0x00, 0x00, 0x01};
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
7427 ff_VDPAU_h264_add_data_chunk(h, start_code, sizeof(start_code));
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
7428 ff_VDPAU_h264_add_data_chunk(h, &buf[buf_index - consumed], consumed );
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
7429 }else
8524
e2d97d1449d4 Cosmetics: Fix indentation.
cehoyos
parents: 8522
diff changeset
7430 context_count++;
8522
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
7431 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7432 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7433 case NAL_DPA:
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7434 init_get_bits(&hx->s.gb, ptr, bit_length);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7435 hx->intra_gb_ptr=
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7436 hx->inter_gb_ptr= NULL;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7437 hx->s.data_partitioning = 1;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7438
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7439 err = decode_slice_header(hx, h);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7440 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7441 case NAL_DPB:
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7442 init_get_bits(&hx->intra_gb, ptr, bit_length);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7443 hx->intra_gb_ptr= &hx->intra_gb;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7444 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7445 case NAL_DPC:
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7446 init_get_bits(&hx->inter_gb, ptr, bit_length);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7447 hx->inter_gb_ptr= &hx->inter_gb;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7448
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7449 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
7450 && s->context_initialized
2793
ae85da6c5c2f more fine grained skip_frame
michael
parents: 2792
diff changeset
7451 && s->hurry_up < 5
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7452 && (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
7453 && (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
7454 && (avctx->skip_frame < AVDISCARD_NONKEY || hx->slice_type_nos==FF_I_TYPE)
2793
ae85da6c5c2f more fine grained skip_frame
michael
parents: 2792
diff changeset
7455 && avctx->skip_frame < AVDISCARD_ALL)
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7456 context_count++;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7457 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7458 case NAL_SEI:
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7459 init_get_bits(&s->gb, ptr, bit_length);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7460 decode_sei(h);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7461 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7462 case NAL_SPS:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7463 init_get_bits(&s->gb, ptr, bit_length);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7464 decode_seq_parameter_set(h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7465
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7466 if(s->flags& CODEC_FLAG_LOW_DELAY)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7467 s->low_delay=1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7468
2538
34b0996cc10d 10l (fix reordering when B-frames are not present)
lorenm
parents: 2537
diff changeset
7469 if(avctx->has_b_frames < 2)
34b0996cc10d 10l (fix reordering when B-frames are not present)
lorenm
parents: 2537
diff changeset
7470 avctx->has_b_frames= !s->low_delay;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7471 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7472 case NAL_PPS:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7473 init_get_bits(&s->gb, ptr, bit_length);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7474
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7475 decode_picture_parameter_set(h, bit_length);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7476
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7477 break;
2960
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
7478 case NAL_AUD:
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
7479 case NAL_END_SEQUENCE:
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
7480 case NAL_END_STREAM:
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
7481 case NAL_FILLER_DATA:
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
7482 case NAL_SPS_EXT:
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
7483 case NAL_AUXILIARY_SLICE:
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7484 break;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2971
diff changeset
7485 default:
5631
550e37ec2204 Silence warnings about NAL_SVC_NON_IDR in H.264.
diego
parents: 5629
diff changeset
7486 av_log(avctx, AV_LOG_DEBUG, "Unknown NAL code: %d (%d bits)\n", h->nal_unit_type, bit_length);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7487 }
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7488
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7489 if(context_count == h->max_contexts) {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7490 execute_decode_slices(h, context_count);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7491 context_count = 0;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7492 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7493
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7494 if (err < 0)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7495 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
7496 else if(err == 1) {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7497 /* Slice could not be decoded in parallel mode, copy down
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7498 * NAL unit stuff to context 0 and restart. Note that
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
7499 * rbsp_buffer is not transferred, but since we no longer
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7500 * run in parallel mode this should not be an issue. */
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7501 h->nal_unit_type = hx->nal_unit_type;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7502 h->nal_ref_idc = hx->nal_ref_idc;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7503 hx = h;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7504 goto again;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7505 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7506 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7507 if(context_count)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7508 execute_decode_slices(h, context_count);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7509 return buf_index;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7510 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7511
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7512 /**
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
7513 * returns the number of bytes consumed for building the current frame
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7514 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7515 static int get_consumed_bytes(MpegEncContext *s, int pos, int buf_size){
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5106
diff changeset
7516 if(pos==0) pos=1; //avoid infinite loops (i doubt that is needed but ...)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7517 if(pos+10>buf_size) pos=buf_size; // oops ;)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7518
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7519 return pos;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7520 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7521
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7522 static int decode_frame(AVCodecContext *avctx,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7523 void *data, int *data_size,
6216
michael
parents: 6213
diff changeset
7524 const uint8_t *buf, int buf_size)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7525 {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7526 H264Context *h = avctx->priv_data;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7527 MpegEncContext *s = &h->s;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7528 AVFrame *pict = data;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7529 int buf_index;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7530
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7531 s->flags= avctx->flags;
1754
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1706
diff changeset
7532 s->flags2= avctx->flags2;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7533
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
7534 /* end of stream, output what is still in the buffers */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7535 if (buf_size == 0) {
4556
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7536 Picture *out;
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7537 int i, out_idx;
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7538
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7539 //FIXME factorize this with the output code below
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7540 out = h->delayed_pic[0];
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7541 out_idx = 0;
7772
834a8f89b75e Try to support invalid h264 that does not mark IDR with POC=0.
michael
parents: 7558
diff changeset
7542 for(i=1; h->delayed_pic[i] && (h->delayed_pic[i]->poc && !h->delayed_pic[i]->key_frame); i++)
4556
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7543 if(h->delayed_pic[i]->poc < out->poc){
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7544 out = h->delayed_pic[i];
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7545 out_idx = i;
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7546 }
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7547
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7548 for(i=out_idx; h->delayed_pic[i]; i++)
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7549 h->delayed_pic[i] = h->delayed_pic[i+1];
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7550
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7551 if(out){
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7552 *data_size = sizeof(AVFrame);
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7553 *pict= *(AVFrame*)out;
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7554 }
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7555
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7556 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7557 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7558
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7559 if(h->is_avc && !h->got_avcC) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7560 int i, cnt, nalsize;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7561 unsigned char *p = avctx->extradata;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7562 if(avctx->extradata_size < 7) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7563 av_log(avctx, AV_LOG_ERROR, "avcC too short\n");
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7564 return -1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7565 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7566 if(*p != 1) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7567 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
7568 return -1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7569 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7570 /* 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
7571 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
7572 h->nal_length_size = 2;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7573 // Decode sps from avcC
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7574 cnt = *(p+5) & 0x1f; // Number of sps
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7575 p += 6;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7576 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
7577 nalsize = AV_RB16(p) + 2;
2867
7c7edddaa835 dont be so picky with .mp4 ... fixes Mr&MrsSmith.mp4
michael
parents: 2861
diff changeset
7578 if(decode_nal_units(h, p, nalsize) < 0) {
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7579 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
7580 return -1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7581 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7582 p += nalsize;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7583 }
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7584 // Decode pps from avcC
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7585 cnt = *(p++); // Number of pps
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7586 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
7587 nalsize = AV_RB16(p) + 2;
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7588 if(decode_nal_units(h, p, nalsize) != nalsize) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7589 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
7590 return -1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7591 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7592 p += nalsize;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7593 }
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7594 // 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
7595 h->nal_length_size = ((*(((char*)(avctx->extradata))+4))&0x03)+1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7596 // Do not reparse avcC
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7597 h->got_avcC = 1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7598 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7599
7888
d0489fa75c41 Ensure that extradata is not parsed twice.
michael
parents: 7844
diff changeset
7600 if(!h->got_avcC && !h->is_avc && s->avctx->extradata_size){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7601 if(decode_nal_units(h, s->avctx->extradata, s->avctx->extradata_size) < 0)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7602 return -1;
7888
d0489fa75c41 Ensure that extradata is not parsed twice.
michael
parents: 7844
diff changeset
7603 h->got_avcC = 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7604 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7605
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7606 buf_index=decode_nal_units(h, buf, buf_size);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7607 if(buf_index < 0)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7608 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7609
4620
f23c20cf7579 check for no frame and prevent segfault
michael
parents: 4616
diff changeset
7610 if(!(s->flags2 & CODEC_FLAG2_CHUNKS) && !s->current_picture_ptr){
5629
7e5ebda833e9 Remove error raising when explicitely skipping frame
benoit
parents: 5547
diff changeset
7611 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
7612 av_log(avctx, AV_LOG_ERROR, "no frame!\n");
f23c20cf7579 check for no frame and prevent segfault
michael
parents: 4616
diff changeset
7613 return -1;
f23c20cf7579 check for no frame and prevent segfault
michael
parents: 4616
diff changeset
7614 }
f23c20cf7579 check for no frame and prevent segfault
michael
parents: 4616
diff changeset
7615
4616
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7616 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
7617 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
7618 Picture *cur = s->current_picture_ptr;
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7619 int i, pics, cross_idr, out_of_order, out_idx;
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7620
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7621 s->mb_y= 0;
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7622
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7623 s->current_picture_ptr->qscale_type= FF_QSCALE_TYPE_H264;
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7624 s->current_picture_ptr->pict_type= s->pict_type;
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7625
7350
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
7626 if(!s->dropable) {
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
7627 execute_ref_pic_marking(h, h->mmco, h->mmco_index);
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
7628 h->prev_poc_msb= h->poc_msb;
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
7629 h->prev_poc_lsb= h->poc_lsb;
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
7630 }
4616
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7631 h->prev_frame_num_offset= h->frame_num_offset;
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7632 h->prev_frame_num= h->frame_num;
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7633
8522
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
7634 if (ENABLE_H264_VDPAU_DECODER && avctx->codec_id == CODEC_ID_H264_VDPAU)
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
7635 ff_VDPAU_h264_picture_complete(h);
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
7636
5798
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
7637 /*
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
7638 * FIXME: Error handling code does not seem to support interlaced
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
7639 * when slices span multiple rows
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
7640 * The ff_er_add_slice calls don't work right for bottom
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
7641 * fields; they cause massive erroneous error concealing
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
7642 * Error marking covers both fields (top and bottom).
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
7643 * This causes a mismatched s->error_count
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
7644 * and a bad error table. Further, the error count goes to
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
7645 * INT_MAX when called for bottom field, because mb_y is
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
7646 * past end by one (callers fault) and resync_mb_y != 0
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
7647 * causes problems for the first MB line, too.
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
7648 */
8525
53f8d9be29ee 50l: Reenable error resilience for H264 (Patch by Dark Shikari).
cehoyos
parents: 8524
diff changeset
7649 if (avctx->codec_id != CODEC_ID_H264_VDPAU && !FIELD_PICTURE)
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7650 ff_er_frame_end(s);
4616
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7651
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7652 MPV_frame_end(s);
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7653
7382
f9e70983fc35 Set field_poc (it was half uninitialized before) and use it
michael
parents: 7381
diff changeset
7654 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
7655 /* 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
7656 *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
7657
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
7658 } else {
8107
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7659 cur->repeat_pict = 0;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7660
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7661 /* Signal interlacing information externally. */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7662 /* Prioritize picture timing SEI information over used decoding process if it exists. */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7663 if(h->sps.pic_struct_present_flag){
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7664 switch (h->sei_pic_struct)
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7665 {
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7666 case SEI_PIC_STRUCT_FRAME:
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7667 cur->interlaced_frame = 0;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7668 break;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7669 case SEI_PIC_STRUCT_TOP_FIELD:
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7670 case SEI_PIC_STRUCT_BOTTOM_FIELD:
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7671 case SEI_PIC_STRUCT_TOP_BOTTOM:
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7672 case SEI_PIC_STRUCT_BOTTOM_TOP:
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7673 cur->interlaced_frame = 1;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7674 break;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7675 case SEI_PIC_STRUCT_TOP_BOTTOM_TOP:
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7676 case SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM:
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7677 // 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
7678 // 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
7679 cur->repeat_pict = 1;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7680 cur->interlaced_frame = FIELD_OR_MBAFF_PICTURE;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7681 break;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7682 case SEI_PIC_STRUCT_FRAME_DOUBLING:
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7683 // 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
7684 cur->interlaced_frame = 0;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7685 cur->repeat_pict = 2;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7686 break;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7687 case SEI_PIC_STRUCT_FRAME_TRIPLING:
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7688 cur->interlaced_frame = 0;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7689 cur->repeat_pict = 4;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7690 break;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7691 }
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7692 }else{
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7693 /* Derive interlacing flag from used decoding process. */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7694 cur->interlaced_frame = FIELD_OR_MBAFF_PICTURE;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7695 }
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7696
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7697 if (cur->field_poc[0] != cur->field_poc[1]){
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7698 /* Derive top_field_first from field pocs. */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7699 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
7700 }else{
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7701 if(cur->interlaced_frame || h->sps.pic_struct_present_flag){
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7702 /* 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
7703 if(h->sei_pic_struct == SEI_PIC_STRUCT_TOP_BOTTOM
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7704 || h->sei_pic_struct == SEI_PIC_STRUCT_TOP_BOTTOM_TOP)
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7705 cur->top_field_first = 1;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7706 else
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7707 cur->top_field_first = 0;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7708 }else{
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7709 /* Most likely progressive */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7710 cur->top_field_first = 0;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7711 }
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
7712 }
5876
731ee5ad6bde Correct assignment of interlaced_frame; was being set on output frames,
heydowns
parents: 5825
diff changeset
7713
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7714 //FIXME do something with unavailable reference frames
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7715
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7716 /* Sort B-frames into display order */
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7717
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7718 if(h->sps.bitstream_restriction_flag
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7719 && s->avctx->has_b_frames < h->sps.num_reorder_frames){
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7720 s->avctx->has_b_frames = h->sps.num_reorder_frames;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7721 s->low_delay = 0;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7722 }
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7723
7325
af725308adf4 Take the brain amputated spec literally if the user asks for it (-strict 1).
michael
parents: 7320
diff changeset
7724 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
7725 && !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
7726 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
7727 s->low_delay= 0;
af725308adf4 Take the brain amputated spec literally if the user asks for it (-strict 1).
michael
parents: 7320
diff changeset
7728 }
af725308adf4 Take the brain amputated spec literally if the user asks for it (-strict 1).
michael
parents: 7320
diff changeset
7729
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7730 pics = 0;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7731 while(h->delayed_pic[pics]) pics++;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7732
7283
39e81fdd8d23 Move the size of the H264Context delayed_pic array into a #define.
astrange
parents: 7277
diff changeset
7733 assert(pics <= MAX_DELAYED_PIC_COUNT);
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7734
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7735 h->delayed_pic[pics++] = cur;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7736 if(cur->reference == 0)
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7737 cur->reference = DELAYED_PIC_REF;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7738
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7739 out = h->delayed_pic[0];
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7740 out_idx = 0;
7772
834a8f89b75e Try to support invalid h264 that does not mark IDR with POC=0.
michael
parents: 7558
diff changeset
7741 for(i=1; h->delayed_pic[i] && (h->delayed_pic[i]->poc && !h->delayed_pic[i]->key_frame); i++)
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7742 if(h->delayed_pic[i]->poc < out->poc){
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7743 out = h->delayed_pic[i];
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7744 out_idx = i;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7745 }
7772
834a8f89b75e Try to support invalid h264 that does not mark IDR with POC=0.
michael
parents: 7558
diff changeset
7746 cross_idr = !h->delayed_pic[0]->poc || !!h->delayed_pic[i] || h->delayed_pic[0]->key_frame;
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7747
7310
033d10927d45 Remove delayed_output_pic, I do not understand what this variable was good for.
michael
parents: 7309
diff changeset
7748 out_of_order = !cross_idr && out->poc < h->outputed_poc;
033d10927d45 Remove delayed_output_pic, I do not understand what this variable was good for.
michael
parents: 7309
diff changeset
7749
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7750 if(h->sps.bitstream_restriction_flag && s->avctx->has_b_frames >= h->sps.num_reorder_frames)
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7751 { }
7320
927ac918cddb Make the automatic has_b_frames increasing code increase it up to the
michael
parents: 7318
diff changeset
7752 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
7753 || (s->low_delay &&
7317
c010b69e12eb Remove apparently unneeded out!=NULL check.
michael
parents: 7316
diff changeset
7754 ((!cross_idr && out->poc > h->outputed_poc + 2)
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6429
diff changeset
7755 || cur->pict_type == FF_B_TYPE)))
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7756 {
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7757 s->low_delay = 0;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7758 s->avctx->has_b_frames++;
7312
f9eaaadcd611 simplify
michael
parents: 7310
diff changeset
7759 }
f9eaaadcd611 simplify
michael
parents: 7310
diff changeset
7760
7316
cf1b80029862 Simplify picture output code.
michael
parents: 7315
diff changeset
7761 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
7762 out->reference &= ~DELAYED_PIC_REF;
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7763 for(i=out_idx; h->delayed_pic[i]; i++)
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7764 h->delayed_pic[i] = h->delayed_pic[i+1];
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7765 }
7316
cf1b80029862 Simplify picture output code.
michael
parents: 7315
diff changeset
7766 if(!out_of_order && pics > s->avctx->has_b_frames){
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7767 *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
7768
033d10927d45 Remove delayed_output_pic, I do not understand what this variable was good for.
michael
parents: 7309
diff changeset
7769 h->outputed_poc = out->poc;
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7770 *pict= *(AVFrame*)out;
7316
cf1b80029862 Simplify picture output code.
michael
parents: 7315
diff changeset
7771 }else{
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7772 av_log(avctx, AV_LOG_DEBUG, "no picture\n");
7316
cf1b80029862 Simplify picture output code.
michael
parents: 7315
diff changeset
7773 }
5798
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
7774 }
2937
e63bbb945ebd fix a crash on seeking to an invalid frame
lorenm
parents: 2935
diff changeset
7775 }
e63bbb945ebd fix a crash on seeking to an invalid frame
lorenm
parents: 2935
diff changeset
7776
e63bbb945ebd fix a crash on seeking to an invalid frame
lorenm
parents: 2935
diff changeset
7777 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
7778 ff_print_debug_info(s, pict);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7779 //printf("out %d\n", (int)pict->data[0]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7780 #if 0 //?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7781
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7782 /* Return the Picture timestamp as the frame number */
5963
80103098c797 spelling
vitor
parents: 5934
diff changeset
7783 /* we subtract 1 because it is added on utils.c */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7784 avctx->frame_number = s->picture_number - 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7785 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7786 return get_consumed_bytes(s, buf_index, buf_size);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7787 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7788 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7789 static inline void fill_mb_avail(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7790 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
7791 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7792
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7793 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
7794 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
7795 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
7796 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
7797 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7798 h->mb_avail[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7799 h->mb_avail[1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7800 h->mb_avail[2]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7801 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7802 h->mb_avail[3]= s->mb_x && h->slice_table[mb_xy - 1] == h->slice_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7803 h->mb_avail[4]= 1; //FIXME move out
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7804 h->mb_avail[5]= 0; //FIXME move out
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7805 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7806 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7807
6164
ecaf5226e9b0 Consistently use TEST as the preprocessor condition to enable test code.
diego
parents: 6046
diff changeset
7808 #ifdef TEST
6172
13aa4cac4dde Add #undef printf and disable non-functional code to make test program compile.
diego
parents: 6164
diff changeset
7809 #undef printf
5380
389366aa3458 Fix the self tests which are contained in some codecs and are using random().
takis
parents: 5338
diff changeset
7810 #undef random
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7811 #define COUNT 8000
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7812 #define SIZE (COUNT*40)
5934
bd5f4dc81fbe main() --> main(void)
diego
parents: 5926
diff changeset
7813 int main(void){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7814 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7815 uint8_t temp[SIZE];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7816 PutBitContext pb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7817 GetBitContext gb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7818 // int int_temp[10000];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7819 DSPContext dsp;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7820 AVCodecContext avctx;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7821
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7822 dsputil_init(&dsp, &avctx);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7823
1522
79dddc5cd990 removed the obsolete and unused parameters of init_put_bits
alex
parents: 1453
diff changeset
7824 init_put_bits(&pb, temp, SIZE);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7825 printf("testing unsigned exp golomb\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7826 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7827 START_TIMER
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7828 set_ue_golomb(&pb, i);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7829 STOP_TIMER("set_ue_golomb");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7830 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7831 flush_put_bits(&pb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7832
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7833 init_get_bits(&gb, temp, 8*SIZE);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7834 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7835 int j, s;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7836
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7837 s= show_bits(&gb, 24);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7838
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7839 START_TIMER
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7840 j= get_ue_golomb(&gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7841 if(j != i){
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5106
diff changeset
7842 printf("mismatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7843 // return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7844 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7845 STOP_TIMER("get_ue_golomb");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7846 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7847
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7848
1524
alex
parents: 1522
diff changeset
7849 init_put_bits(&pb, temp, SIZE);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7850 printf("testing signed exp golomb\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7851 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7852 START_TIMER
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7853 set_se_golomb(&pb, i - COUNT/2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7854 STOP_TIMER("set_se_golomb");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7855 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7856 flush_put_bits(&pb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7857
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7858 init_get_bits(&gb, temp, 8*SIZE);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7859 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7860 int j, s;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7861
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7862 s= show_bits(&gb, 24);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7863
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7864 START_TIMER
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7865 j= get_se_golomb(&gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7866 if(j != i - COUNT/2){
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5106
diff changeset
7867 printf("mismatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7868 // return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7869 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7870 STOP_TIMER("get_se_golomb");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7871 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7872
6172
13aa4cac4dde Add #undef printf and disable non-functional code to make test program compile.
diego
parents: 6164
diff changeset
7873 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7874 printf("testing 4x4 (I)DCT\n");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7875
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7876 DCTELEM block[16];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7877 uint8_t src[16], ref[16];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7878 uint64_t error= 0, max_error=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7879
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7880 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7881 int j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7882 // printf("%d %d %d\n", r1, r2, (r2-r1)*16);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7883 for(j=0; j<16; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7884 ref[j]= random()%255;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7885 src[j]= random()%255;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7886 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7887
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7888 h264_diff_dct_c(block, src, ref, 4);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7889
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7890 //normalize
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7891 for(j=0; j<16; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7892 // printf("%d ", block[j]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7893 block[j]= block[j]*4;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7894 if(j&1) block[j]= (block[j]*4 + 2)/5;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7895 if(j&4) block[j]= (block[j]*4 + 2)/5;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7896 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7897 // printf("\n");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7898
2272
cd43603c46f9 move h264 idct to its own file and call via function pointer in DspContext
michael
parents: 2255
diff changeset
7899 s->dsp.h264_idct_add(ref, block, 4);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7900 /* for(j=0; j<16; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7901 printf("%d ", ref[j]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7902 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7903 printf("\n");*/
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7904
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7905 for(j=0; j<16; j++){
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
7906 int diff= FFABS(src[j] - ref[j]);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7907
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7908 error+= diff*diff;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7909 max_error= FFMAX(max_error, diff);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7910 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7911 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7912 printf("error=%f max_error=%d\n", ((float)error)/COUNT/16, (int)max_error );
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7913 printf("testing quantizer\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7914 for(qp=0; qp<52; qp++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7915 for(i=0; i<16; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7916 src1_block[i]= src2_block[i]= random()%255;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7917
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7918 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7919 printf("Testing NAL layer\n");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7920
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7921 uint8_t bitstream[COUNT];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7922 uint8_t nal[COUNT*2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7923 H264Context h;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7924 memset(&h, 0, sizeof(H264Context));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7925
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7926 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7927 int zeros= i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7928 int nal_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7929 int consumed;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7930 int out_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7931 uint8_t *out;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7932 int j;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7933
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7934 for(j=0; j<COUNT; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7935 bitstream[j]= (random() % 255) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7936 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7937
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7938 for(j=0; j<zeros; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7939 int pos= random() % COUNT;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7940 while(bitstream[pos] == 0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7941 pos++;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7942 pos %= COUNT;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7943 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7944 bitstream[pos]=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7945 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7946
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7947 START_TIMER
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7948
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7949 nal_length= encode_nal(&h, nal, bitstream, COUNT, COUNT*2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7950 if(nal_length<0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7951 printf("encoding failed\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7952 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7953 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7954
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7955 out= decode_nal(&h, nal, &out_length, &consumed, nal_length);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7956
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7957 STOP_TIMER("NAL")
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7958
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7959 if(out_length != COUNT){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7960 printf("incorrect length %d %d\n", out_length, COUNT);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7961 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7962 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7963
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7964 if(consumed != nal_length){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7965 printf("incorrect consumed length %d %d\n", nal_length, consumed);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7966 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7967 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7968
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7969 if(memcmp(bitstream, out, COUNT)){
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5106
diff changeset
7970 printf("mismatch\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7971 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7972 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7973 }
6172
13aa4cac4dde Add #undef printf and disable non-functional code to make test program compile.
diego
parents: 6164
diff changeset
7974 #endif
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7975
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7976 printf("Testing RBSP\n");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7977
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7978
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7979 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7980 }
6164
ecaf5226e9b0 Consistently use TEST as the preprocessor condition to enable test code.
diego
parents: 6046
diff changeset
7981 #endif /* TEST */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7982
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7983
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6490
diff changeset
7984 static av_cold int decode_end(AVCodecContext *avctx)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7985 {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7986 H264Context *h = avctx->priv_data;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7987 MpegEncContext *s = &h->s;
7923
2c15748c530a Do not free sps & pps on width/height changes.
michael
parents: 7921
diff changeset
7988 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7989
5174
2e038003cdfb Do not reuse the rbsp de-escape buffer if both
benoit
parents: 5172
diff changeset
7990 av_freep(&h->rbsp_buffer[0]);
2e038003cdfb Do not reuse the rbsp de-escape buffer if both
benoit
parents: 5172
diff changeset
7991 av_freep(&h->rbsp_buffer[1]);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7992 free_tables(h); //FIXME cleanup init stuff perhaps
7923
2c15748c530a Do not free sps & pps on width/height changes.
michael
parents: 7921
diff changeset
7993
2c15748c530a Do not free sps & pps on width/height changes.
michael
parents: 7921
diff changeset
7994 for(i = 0; i < MAX_SPS_COUNT; i++)
2c15748c530a Do not free sps & pps on width/height changes.
michael
parents: 7921
diff changeset
7995 av_freep(h->sps_buffers + i);
2c15748c530a Do not free sps & pps on width/height changes.
michael
parents: 7921
diff changeset
7996
2c15748c530a Do not free sps & pps on width/height changes.
michael
parents: 7921
diff changeset
7997 for(i = 0; i < MAX_PPS_COUNT; i++)
2c15748c530a Do not free sps & pps on width/height changes.
michael
parents: 7921
diff changeset
7998 av_freep(h->pps_buffers + i);
2c15748c530a Do not free sps & pps on width/height changes.
michael
parents: 7921
diff changeset
7999
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8000 MPV_common_end(s);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8001
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8002 // memset(h, 0, sizeof(H264Context));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8003
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8004 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8005 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8006
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8007
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8008 AVCodec h264_decoder = {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8009 "h264",
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8010 CODEC_TYPE_VIDEO,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8011 CODEC_ID_H264,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8012 sizeof(H264Context),
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8013 decode_init,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8014 NULL,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8015 decode_end,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8016 decode_frame,
7359
1980cae356ad Remove truncated support, use an AVParser if you used that, it is the same.
michael
parents: 7358
diff changeset
8017 /*CODEC_CAP_DRAW_HORIZ_BAND |*/ CODEC_CAP_DR1 | CODEC_CAP_DELAY,
2640
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
8018 .flush= flush_dpb,
7040
e943e1409077 Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents: 6933
diff changeset
8019 .long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"),
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8020 };
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8021
8522
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
8022 #ifdef CONFIG_H264_VDPAU_DECODER
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
8023 AVCodec h264_vdpau_decoder = {
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
8024 "h264_vdpau",
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
8025 CODEC_TYPE_VIDEO,
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
8026 CODEC_ID_H264_VDPAU,
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
8027 sizeof(H264Context),
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
8028 decode_init,
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
8029 NULL,
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
8030 decode_end,
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
8031 decode_frame,
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
8032 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
8033 .flush= flush_dpb,
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
8034 .long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10 (VDPAU acceleration)"),
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
8035 };
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
8036 #endif
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
8037
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
8038 #include "svq3.c"