annotate h264.c @ 7445:a202753ce99d libavcodec

Use #define instead of a constant. Patch by Paul Kendall.
author darkshikari
date Tue, 29 Jul 2008 05:39:33 +0000
parents a9da32d66fec
children 30d38a880fde
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"
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
36
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
37 #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
38 #ifdef ARCH_X86
e226f34ca284 Redo r12838, this time using svn copy to create h264_i386.h from cabac.h.
heydowns
parents: 6603
diff changeset
39 #include "i386/h264_i386.h"
e226f34ca284 Redo r12838, this time using svn copy to create h264_i386.h from cabac.h.
heydowns
parents: 6603
diff changeset
40 #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
41
3284
a224d9752912 don't force asserts in release builds. 2% faster h264.
lorenm
parents: 3219
diff changeset
42 //#undef NDEBUG
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
43 #include <assert.h>
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
44
5723
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
45 /**
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
46 * 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
47 * 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
48 */
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
49 #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
50
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
51 static VLC coeff_token_vlc[4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
52 static VLC chroma_dc_coeff_token_vlc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
53
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
54 static VLC total_zeros_vlc[15];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
55 static VLC chroma_dc_total_zeros_vlc[3];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
56
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
57 static VLC run_vlc[6];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
58 static VLC run7_vlc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
59
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
60 static void svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
61 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
62 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
63 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
64 static Picture * remove_long(H264Context *h, int i, int ref_mask);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
65
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4277
diff changeset
66 static av_always_inline uint32_t pack16to32(int a, int b){
1269
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
67 #ifdef WORDS_BIGENDIAN
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
68 return (b&0xFFFF) + (a<<16);
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
69 #else
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
70 return (a&0xFFFF) + (b<<16);
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
71 #endif
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
72 }
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
73
4277
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
74 const uint8_t ff_rem6[52]={
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
75 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
76 };
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
77
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
78 const uint8_t ff_div6[52]={
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
79 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
80 };
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
81
7423
2eb0e5a2efad left_block intialisation optimisation.
michael
parents: 7421
diff changeset
82 static const int left_block_options[4][8]={
2eb0e5a2efad left_block intialisation optimisation.
michael
parents: 7421
diff changeset
83 {0,1,2,3,7,10,8,11},
2eb0e5a2efad left_block intialisation optimisation.
michael
parents: 7421
diff changeset
84 {2,2,3,3,8,11,8,11},
2eb0e5a2efad left_block intialisation optimisation.
michael
parents: 7421
diff changeset
85 {0,0,1,1,7,10,7,10},
2eb0e5a2efad left_block intialisation optimisation.
michael
parents: 7421
diff changeset
86 {0,2,0,2,7,10,7,10}
2eb0e5a2efad left_block intialisation optimisation.
michael
parents: 7421
diff changeset
87 };
4277
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
88
3028
1fadd4c26175 tweak inlines.
lorenm
parents: 3005
diff changeset
89 static void fill_caches(H264Context *h, int mb_type, int for_deblock){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
90 MpegEncContext * const s = &h->s;
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
91 const int mb_xy= h->mb_xy;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
92 int topleft_xy, top_xy, topright_xy, left_xy[2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
93 int topleft_type, top_type, topright_type, left_type[2];
7423
2eb0e5a2efad left_block intialisation optimisation.
michael
parents: 7421
diff changeset
94 int * left_block;
6310
f0457c910be3 fix mbaff diagonal neighbor mv
lorenm
parents: 6309
diff changeset
95 int topleft_partition= -1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
96 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
97
6014
33b0514769b2 Fix non_zero_count_cache for deblocking in field pictures.
heydowns
parents: 5987
diff changeset
98 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
99
3482
c08b46172204 slightly faster h264 fill_caches()
lorenm
parents: 3455
diff changeset
100 //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
101 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
102 return;
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
103
6488
ecbe9565dcae typo fixes
diego
parents: 6481
diff changeset
104 /* Wow, what a mess, why didn't they simplify the interlacing & intra
ecbe9565dcae typo fixes
diego
parents: 6481
diff changeset
105 * stuff, I can't imagine that these complex rules are worth it. */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
106
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
107 topleft_xy = top_xy - 1;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
108 topright_xy= top_xy + 1;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
109 left_xy[1] = left_xy[0] = mb_xy-1;
7423
2eb0e5a2efad left_block intialisation optimisation.
michael
parents: 7421
diff changeset
110 left_block = left_block_options[0];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
111 if(FRAME_MBAFF){
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
112 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
113 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
114 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
115 const int topright_pair_xy = top_pair_xy + 1;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
116 const int topleft_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[topleft_pair_xy]);
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
117 const int top_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[top_pair_xy]);
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
118 const int topright_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[topright_pair_xy]);
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
119 const int left_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[pair_xy-1]);
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
120 const int curr_mb_frame_flag = !IS_INTERLACED(mb_type);
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
121 const int bottom = (s->mb_y & 1);
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
122 tprintf(s->avctx, "fill_caches: curr_mb_frame_flag:%d, left_mb_frame_flag:%d, topleft_mb_frame_flag:%d, top_mb_frame_flag:%d, topright_mb_frame_flag:%d\n", curr_mb_frame_flag, left_mb_frame_flag, topleft_mb_frame_flag, top_mb_frame_flag, topright_mb_frame_flag);
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
123 if (bottom
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
124 ? !curr_mb_frame_flag // bottom macroblock
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
125 : (!curr_mb_frame_flag && !top_mb_frame_flag) // top macroblock
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
126 ) {
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
127 top_xy -= s->mb_stride;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
128 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
129 if (bottom
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
130 ? !curr_mb_frame_flag // bottom macroblock
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
131 : (!curr_mb_frame_flag && !topleft_mb_frame_flag) // top macroblock
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
132 ) {
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
133 topleft_xy -= s->mb_stride;
6310
f0457c910be3 fix mbaff diagonal neighbor mv
lorenm
parents: 6309
diff changeset
134 } else if(bottom && curr_mb_frame_flag && !left_mb_frame_flag) {
f0457c910be3 fix mbaff diagonal neighbor mv
lorenm
parents: 6309
diff changeset
135 topleft_xy += s->mb_stride;
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
136 // 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
137 topleft_partition = 0;
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
138 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
139 if (bottom
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
140 ? !curr_mb_frame_flag // bottom macroblock
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
141 : (!curr_mb_frame_flag && !topright_mb_frame_flag) // top macroblock
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
142 ) {
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
143 topright_xy -= s->mb_stride;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
144 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
145 if (left_mb_frame_flag != curr_mb_frame_flag) {
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
146 left_xy[1] = left_xy[0] = pair_xy - 1;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
147 if (curr_mb_frame_flag) {
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
148 if (bottom) {
7423
2eb0e5a2efad left_block intialisation optimisation.
michael
parents: 7421
diff changeset
149 left_block = left_block_options[1];
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
150 } else {
7423
2eb0e5a2efad left_block intialisation optimisation.
michael
parents: 7421
diff changeset
151 left_block= left_block_options[2];
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
152 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
153 } else {
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
154 left_xy[1] += s->mb_stride;
7423
2eb0e5a2efad left_block intialisation optimisation.
michael
parents: 7421
diff changeset
155 left_block = left_block_options[3];
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
156 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
157 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
158 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
159
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
160 h->top_mb_xy = top_xy;
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
161 h->left_mb_xy[0] = left_xy[0];
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
162 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
163 if(for_deblock){
3482
c08b46172204 slightly faster h264 fill_caches()
lorenm
parents: 3455
diff changeset
164 topleft_type = 0;
c08b46172204 slightly faster h264 fill_caches()
lorenm
parents: 3455
diff changeset
165 topright_type = 0;
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
166 top_type = h->slice_table[top_xy ] < 255 ? s->current_picture.mb_type[top_xy] : 0;
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
167 left_type[0] = h->slice_table[left_xy[0] ] < 255 ? s->current_picture.mb_type[left_xy[0]] : 0;
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
168 left_type[1] = h->slice_table[left_xy[1] ] < 255 ? s->current_picture.mb_type[left_xy[1]] : 0;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
169
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
170 if(FRAME_MBAFF && !IS_INTRA(mb_type)){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
171 int list;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
172 int v = *(uint16_t*)&h->non_zero_count[mb_xy][14];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
173 for(i=0; i<16; i++)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
174 h->non_zero_count_cache[scan8[i]] = (v>>i)&1;
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
175 for(list=0; list<h->list_count; list++){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
176 if(USES_LIST(mb_type,list)){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
177 uint32_t *src = (uint32_t*)s->current_picture.motion_val[list][h->mb2b_xy[mb_xy]];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
178 uint32_t *dst = (uint32_t*)h->mv_cache[list][scan8[0]];
3776
1843a85123b7 fix some signedness warnings
mru
parents: 3651
diff changeset
179 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
180 for(i=0; i<4; i++, dst+=8, src+=h->b_stride){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
181 dst[0] = src[0];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
182 dst[1] = src[1];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
183 dst[2] = src[2];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
184 dst[3] = src[3];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
185 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
186 *(uint32_t*)&h->ref_cache[list][scan8[ 0]] =
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
187 *(uint32_t*)&h->ref_cache[list][scan8[ 2]] = pack16to32(ref[0],ref[1])*0x0101;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
188 ref += h->b8_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
189 *(uint32_t*)&h->ref_cache[list][scan8[ 8]] =
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
190 *(uint32_t*)&h->ref_cache[list][scan8[10]] = pack16to32(ref[0],ref[1])*0x0101;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
191 }else{
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
192 fill_rectangle(&h-> mv_cache[list][scan8[ 0]], 4, 4, 8, 0, 4);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
193 fill_rectangle(&h->ref_cache[list][scan8[ 0]], 4, 4, 8, (uint8_t)LIST_NOT_USED, 1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
194 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
195 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
196 }
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
197 }else{
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
198 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
199 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
200 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
201 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
202 left_type[1] = h->slice_table[left_xy[1] ] == h->slice_num ? s->current_picture.mb_type[left_xy[1]] : 0;
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
203 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
204
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
205 if(IS_INTRA(mb_type)){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
206 h->topleft_samples_available=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
207 h->top_samples_available=
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
208 h->left_samples_available= 0xFFFF;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
209 h->topright_samples_available= 0xEEEA;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
210
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
211 if(!IS_INTRA(top_type) && (top_type==0 || h->pps.constrained_intra_pred)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
212 h->topleft_samples_available= 0xB3FF;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
213 h->top_samples_available= 0x33FF;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
214 h->topright_samples_available= 0x26EA;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
215 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
216 for(i=0; i<2; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
217 if(!IS_INTRA(left_type[i]) && (left_type[i]==0 || h->pps.constrained_intra_pred)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
218 h->topleft_samples_available&= 0xDF5F;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
219 h->left_samples_available&= 0x5F5F;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
220 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
221 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
222
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
223 if(!IS_INTRA(topleft_type) && (topleft_type==0 || h->pps.constrained_intra_pred))
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
224 h->topleft_samples_available&= 0x7FFF;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
225
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
226 if(!IS_INTRA(topright_type) && (topright_type==0 || h->pps.constrained_intra_pred))
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
227 h->topright_samples_available&= 0xFBFF;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
228
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
229 if(IS_INTRA4x4(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
230 if(IS_INTRA4x4(top_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
231 h->intra4x4_pred_mode_cache[4+8*0]= h->intra4x4_pred_mode[top_xy][4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
232 h->intra4x4_pred_mode_cache[5+8*0]= h->intra4x4_pred_mode[top_xy][5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
233 h->intra4x4_pred_mode_cache[6+8*0]= h->intra4x4_pred_mode[top_xy][6];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
234 h->intra4x4_pred_mode_cache[7+8*0]= h->intra4x4_pred_mode[top_xy][3];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
235 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
236 int pred;
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
237 if(!top_type || (IS_INTER(top_type) && h->pps.constrained_intra_pred))
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
238 pred= -1;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
239 else{
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
240 pred= 2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
241 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
242 h->intra4x4_pred_mode_cache[4+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
243 h->intra4x4_pred_mode_cache[5+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
244 h->intra4x4_pred_mode_cache[6+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
245 h->intra4x4_pred_mode_cache[7+8*0]= pred;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
246 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
247 for(i=0; i<2; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
248 if(IS_INTRA4x4(left_type[i])){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
249 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
250 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
251 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
252 int pred;
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
253 if(!left_type[i] || (IS_INTER(left_type[i]) && h->pps.constrained_intra_pred))
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
254 pred= -1;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
255 else{
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
256 pred= 2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
257 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
258 h->intra4x4_pred_mode_cache[3+8*1 + 2*8*i]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
259 h->intra4x4_pred_mode_cache[3+8*2 + 2*8*i]= pred;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
260 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
261 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
262 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
263 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
264
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
265
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
266 /*
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
267 0 . T T. T T T T
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
268 1 L . .L . . . .
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
269 2 L . .L . . . .
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
270 3 . T TL . . . .
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
271 4 L . .L . . . .
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
272 5 L . .. . . . .
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
273 */
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
274 //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
275 if(top_type){
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
276 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
277 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
278 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
279 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
280
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
281 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
282 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
283
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
284 h->non_zero_count_cache[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
285 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
286
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
287 }else{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
288 h->non_zero_count_cache[4+8*0]=
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
289 h->non_zero_count_cache[5+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
290 h->non_zero_count_cache[6+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
291 h->non_zero_count_cache[7+8*0]=
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
292
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
293 h->non_zero_count_cache[1+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
294 h->non_zero_count_cache[2+8*0]=
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
295
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
296 h->non_zero_count_cache[1+8*3]=
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
297 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
298
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
299 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
300
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
301 for (i=0; i<2; i++) {
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
302 if(left_type[i]){
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
303 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
304 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
305 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
306 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
307 }else{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
308 h->non_zero_count_cache[3+8*1 + 2*8*i]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
309 h->non_zero_count_cache[3+8*2 + 2*8*i]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
310 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
311 h->non_zero_count_cache[0+8*4 + 8*i]= h->pps.cabac && !IS_INTRA(mb_type) ? 0 : 64;
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
312 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
313 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
314
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
315 if( h->pps.cabac ) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
316 // top_cbp
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
317 if(top_type) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
318 h->top_cbp = h->cbp_table[top_xy];
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
319 } else if(IS_INTRA(mb_type)) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
320 h->top_cbp = 0x1C0;
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
321 } else {
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
322 h->top_cbp = 0;
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
323 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
324 // left_cbp
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
325 if (left_type[0]) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
326 h->left_cbp = h->cbp_table[left_xy[0]] & 0x1f0;
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
327 } else if(IS_INTRA(mb_type)) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
328 h->left_cbp = 0x1C0;
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
329 } else {
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
330 h->left_cbp = 0;
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
331 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
332 if (left_type[0]) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
333 h->left_cbp |= ((h->cbp_table[left_xy[0]]>>((left_block[0]&(~1))+1))&0x1) << 1;
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
334 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
335 if (left_type[1]) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
336 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
337 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
338 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
339
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
340 #if 1
2623
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
341 if(IS_INTER(mb_type) || IS_DIRECT(mb_type)){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
342 int list;
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
343 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
344 if(!USES_LIST(mb_type, list) && !IS_DIRECT(mb_type) && !h->deblocking_filter){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
345 /*if(!h->mv_cache_clean[list]){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
346 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
347 memset(h->ref_cache[list], PART_NOT_AVAILABLE, 8*5*sizeof(int8_t));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
348 h->mv_cache_clean[list]= 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
349 }*/
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
350 continue;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
351 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
352 h->mv_cache_clean[list]= 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
353
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
354 if(USES_LIST(top_type, list)){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
355 const int b_xy= h->mb2b_xy[top_xy] + 3*h->b_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
356 const int b8_xy= h->mb2b8_xy[top_xy] + h->b8_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
357 *(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
358 *(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
359 *(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
360 *(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
361 h->ref_cache[list][scan8[0] + 0 - 1*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
362 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
363 h->ref_cache[list][scan8[0] + 2 - 1*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
364 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
365 }else{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
366 *(uint32_t*)h->mv_cache [list][scan8[0] + 0 - 1*8]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
367 *(uint32_t*)h->mv_cache [list][scan8[0] + 1 - 1*8]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
368 *(uint32_t*)h->mv_cache [list][scan8[0] + 2 - 1*8]=
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
369 *(uint32_t*)h->mv_cache [list][scan8[0] + 3 - 1*8]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
370 *(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
371 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
372
4546
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
373 for(i=0; i<2; i++){
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
374 int cache_idx = scan8[0] - 1 + i*2*8;
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
375 if(USES_LIST(left_type[i], list)){
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
376 const int b_xy= h->mb2b_xy[left_xy[i]] + 3;
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
377 const int b8_xy= h->mb2b8_xy[left_xy[i]] + 1;
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
378 *(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
379 *(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
380 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
381 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
382 }else{
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
383 *(uint32_t*)h->mv_cache [list][cache_idx ]=
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
384 *(uint32_t*)h->mv_cache [list][cache_idx+8]= 0;
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
385 h->ref_cache[list][cache_idx ]=
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
386 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
387 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
388 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
389
3519
5ef29058581e 10l in r5768 (broke mbaff)
lorenm
parents: 3482
diff changeset
390 if((for_deblock || (IS_DIRECT(mb_type) && !h->direct_spatial_mv_pred)) && !FRAME_MBAFF)
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
391 continue;
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
392
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
393 if(USES_LIST(topleft_type, list)){
6310
f0457c910be3 fix mbaff diagonal neighbor mv
lorenm
parents: 6309
diff changeset
394 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
395 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
396 *(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
397 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
398 }else{
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
399 *(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
400 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
401 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
402
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
403 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
404 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
405 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
406 *(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
407 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
408 }else{
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
409 *(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
410 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
411 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
412
3519
5ef29058581e 10l in r5768 (broke mbaff)
lorenm
parents: 3482
diff changeset
413 if((IS_SKIP(mb_type) || IS_DIRECT(mb_type)) && !FRAME_MBAFF)
3482
c08b46172204 slightly faster h264 fill_caches()
lorenm
parents: 3455
diff changeset
414 continue;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
415
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
416 h->ref_cache[list][scan8[5 ]+1] =
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
417 h->ref_cache[list][scan8[7 ]+1] =
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
418 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
419 h->ref_cache[list][scan8[4 ]] =
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
420 h->ref_cache[list][scan8[12]] = PART_NOT_AVAILABLE;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
421 *(uint32_t*)h->mv_cache [list][scan8[5 ]+1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
422 *(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
423 *(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
424 *(uint32_t*)h->mv_cache [list][scan8[4 ]]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
425 *(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
426
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
427 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
428 /* XXX beurk, Load mvd */
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
429 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
430 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
431 *(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
432 *(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
433 *(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
434 *(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
435 }else{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
436 *(uint32_t*)h->mvd_cache [list][scan8[0] + 0 - 1*8]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
437 *(uint32_t*)h->mvd_cache [list][scan8[0] + 1 - 1*8]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
438 *(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
439 *(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
440 }
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
441 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
442 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
443 *(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
444 *(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
445 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
446 *(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
447 *(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
448 }
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
449 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
450 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
451 *(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
452 *(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
453 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
454 *(uint32_t*)h->mvd_cache [list][scan8[0] - 1 + 2*8]=
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
455 *(uint32_t*)h->mvd_cache [list][scan8[0] - 1 + 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
456 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
457 *(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
458 *(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
459 *(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
460 *(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
461 *(uint32_t*)h->mvd_cache [list][scan8[12]]= 0;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
462
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
463 if(h->slice_type_nos == FF_B_TYPE){
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
464 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
465
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
466 if(IS_DIRECT(top_type)){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
467 *(uint32_t*)&h->direct_cache[scan8[0] - 1*8]= 0x01010101;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
468 }else if(IS_8X8(top_type)){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
469 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
470 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
471 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
472 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
473 *(uint32_t*)&h->direct_cache[scan8[0] - 1*8]= 0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
474 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
475
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
476 if(IS_DIRECT(left_type[0]))
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
477 h->direct_cache[scan8[0] - 1 + 0*8]= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
478 else if(IS_8X8(left_type[0]))
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
479 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
480 else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
481 h->direct_cache[scan8[0] - 1 + 0*8]= 0;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
482
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
483 if(IS_DIRECT(left_type[1]))
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
484 h->direct_cache[scan8[0] - 1 + 2*8]= 1;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
485 else if(IS_8X8(left_type[1]))
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
486 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
487 else
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
488 h->direct_cache[scan8[0] - 1 + 2*8]= 0;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
489 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
490 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
491
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
492 if(FRAME_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
493 #define MAP_MVS\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
494 MAP_F2F(scan8[0] - 1 - 1*8, topleft_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
495 MAP_F2F(scan8[0] + 0 - 1*8, top_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
496 MAP_F2F(scan8[0] + 1 - 1*8, top_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
497 MAP_F2F(scan8[0] + 2 - 1*8, top_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
498 MAP_F2F(scan8[0] + 3 - 1*8, top_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
499 MAP_F2F(scan8[0] + 4 - 1*8, topright_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
500 MAP_F2F(scan8[0] - 1 + 0*8, left_type[0])\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
501 MAP_F2F(scan8[0] - 1 + 1*8, left_type[0])\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
502 MAP_F2F(scan8[0] - 1 + 2*8, left_type[1])\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
503 MAP_F2F(scan8[0] - 1 + 3*8, left_type[1])
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
504 if(MB_FIELD){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
505 #define MAP_F2F(idx, mb_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
506 if(!IS_INTERLACED(mb_type) && h->ref_cache[list][idx] >= 0){\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
507 h->ref_cache[list][idx] <<= 1;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
508 h->mv_cache[list][idx][1] /= 2;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
509 h->mvd_cache[list][idx][1] /= 2;\
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
510 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
511 MAP_MVS
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
512 #undef MAP_F2F
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
513 }else{
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
514 #define MAP_F2F(idx, mb_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
515 if(IS_INTERLACED(mb_type) && h->ref_cache[list][idx] >= 0){\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
516 h->ref_cache[list][idx] >>= 1;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
517 h->mv_cache[list][idx][1] <<= 1;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
518 h->mvd_cache[list][idx][1] <<= 1;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
519 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
520 MAP_MVS
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
521 #undef MAP_F2F
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
522 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
523 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
524 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
525 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
526 #endif
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
527
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
528 h->neighbor_transform_size= !!IS_8x8DCT(top_type) + !!IS_8x8DCT(left_type[0]);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
529 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
530
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
531 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
532 const int mb_xy= h->mb_xy;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
533
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
534 h->intra4x4_pred_mode[mb_xy][0]= h->intra4x4_pred_mode_cache[7+8*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
535 h->intra4x4_pred_mode[mb_xy][1]= h->intra4x4_pred_mode_cache[7+8*2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
536 h->intra4x4_pred_mode[mb_xy][2]= h->intra4x4_pred_mode_cache[7+8*3];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
537 h->intra4x4_pred_mode[mb_xy][3]= h->intra4x4_pred_mode_cache[7+8*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
538 h->intra4x4_pred_mode[mb_xy][4]= h->intra4x4_pred_mode_cache[4+8*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
539 h->intra4x4_pred_mode[mb_xy][5]= h->intra4x4_pred_mode_cache[5+8*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
540 h->intra4x4_pred_mode[mb_xy][6]= h->intra4x4_pred_mode_cache[6+8*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
541 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
542
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
543 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
544 * 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
545 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
546 static inline int check_intra4x4_pred_mode(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
547 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
548 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
549 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
550 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
551
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
552 if(!(h->top_samples_available&0x8000)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
553 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
554 int status= top[ h->intra4x4_pred_mode_cache[scan8[0] + i] ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
555 if(status<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
556 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
557 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
558 } else if(status){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
559 h->intra4x4_pred_mode_cache[scan8[0] + i]= status;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
560 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
561 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
562 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
563
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
564 if(!(h->left_samples_available&0x8000)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
565 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
566 int status= left[ h->intra4x4_pred_mode_cache[scan8[0] + 8*i] ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
567 if(status<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
568 av_log(h->s.avctx, AV_LOG_ERROR, "left block unavailable for requested intra4x4 mode %d at %d %d\n", status, s->mb_x, s->mb_y);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
569 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
570 } else if(status){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
571 h->intra4x4_pred_mode_cache[scan8[0] + 8*i]= status;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
572 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
573 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
574 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
575
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
576 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
577 } //FIXME cleanup like next
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
578
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
579 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
580 * 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
581 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
582 static inline int check_intra_pred_mode(H264Context *h, int mode){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
583 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
584 static const int8_t top [7]= {LEFT_DC_PRED8x8, 1,-1,-1};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
585 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
586
4529
a8082e1ed672 simplify
michael
parents: 4507
diff changeset
587 if(mode > 6U) {
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
588 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
589 return -1;
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
590 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
591
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
592 if(!(h->top_samples_available&0x8000)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
593 mode= top[ mode ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
594 if(mode<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
595 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
596 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
597 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
598 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
599
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
600 if(!(h->left_samples_available&0x8000)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
601 mode= left[ mode ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
602 if(mode<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
603 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
604 return -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
605 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
606 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
607
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
608 return mode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
609 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
610
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
611 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
612 * gets the predicted intra4x4 prediction mode.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
613 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
614 static inline int pred_intra_mode(H264Context *h, int n){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
615 const int index8= scan8[n];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
616 const int left= h->intra4x4_pred_mode_cache[index8 - 1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
617 const int top = h->intra4x4_pred_mode_cache[index8 - 8];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
618 const int min= FFMIN(left, top);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
619
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
620 tprintf(h->s.avctx, "mode:%d %d min:%d\n", left ,top, min);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
621
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
622 if(min<0) return DC_PRED;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
623 else return min;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
624 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
625
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
626 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
627 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
628
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
629 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
630 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
631 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
632 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
633 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
634 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
635 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
636
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
637 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
638 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
639 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
640
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
641 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
642 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
643 h->non_zero_count[mb_xy][10]=h->non_zero_count_cache[2+8*4];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
644
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
645 if(FRAME_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
646 // store all luma nnzs, for deblocking
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
647 int v = 0, i;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
648 for(i=0; i<16; i++)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
649 v += (!!h->non_zero_count_cache[scan8[i]]) << i;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
650 *(uint16_t*)&h->non_zero_count[mb_xy][14] = v;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
651 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
652 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
653
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
654 /**
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
655 * gets the predicted number of non-zero coefficients.
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
656 * @param n block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
657 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
658 static inline int pred_non_zero_count(H264Context *h, int n){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
659 const int index8= scan8[n];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
660 const int left= h->non_zero_count_cache[index8 - 1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
661 const int top = h->non_zero_count_cache[index8 - 8];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
662 int i= left + top;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
663
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
664 if(i<64) i= (i+1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
665
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
666 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
667
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
668 return i&31;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
669 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
670
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
671 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
672 const int topright_ref= h->ref_cache[list][ i - 8 + part_width ];
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
673 MpegEncContext *s = &h->s;
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
674
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
675 /* there is no consistent mapping of mvs to neighboring locations that will
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
676 * make mbaff happy, so we can't move all this logic to fill_caches */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
677 if(FRAME_MBAFF){
3776
1843a85123b7 fix some signedness warnings
mru
parents: 3651
diff changeset
678 const uint32_t *mb_types = s->current_picture_ptr->mb_type;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
679 const int16_t *mv;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
680 *(uint32_t*)h->mv_cache[list][scan8[0]-2] = 0;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
681 *C = h->mv_cache[list][scan8[0]-2];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
682
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
683 if(!MB_FIELD
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
684 && (s->mb_y&1) && i < scan8[0]+8 && topright_ref != PART_NOT_AVAILABLE){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
685 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
686 if(IS_INTERLACED(mb_types[topright_xy])){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
687 #define SET_DIAG_MV(MV_OP, REF_OP, X4, Y4)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
688 const int x4 = X4, y4 = Y4;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
689 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
690 if(!USES_LIST(mb_type,list))\
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
691 return LIST_NOT_USED;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
692 mv = s->current_picture_ptr->motion_val[list][x4 + y4*h->b_stride];\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
693 h->mv_cache[list][scan8[0]-2][0] = mv[0];\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
694 h->mv_cache[list][scan8[0]-2][1] = mv[1] MV_OP;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
695 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
696
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
697 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
698 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
699 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
700 if(topright_ref == PART_NOT_AVAILABLE
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
701 && ((s->mb_y&1) || i >= scan8[0]+8) && (i&7)==4
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
702 && h->ref_cache[list][scan8[0]-1] != PART_NOT_AVAILABLE){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
703 if(!MB_FIELD
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
704 && IS_INTERLACED(mb_types[h->left_mb_xy[0]])){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
705 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
706 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
707 if(MB_FIELD
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
708 && !IS_INTERLACED(mb_types[h->left_mb_xy[0]])
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
709 && i >= scan8[0]+8){
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
710 // 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
711 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
712 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
713 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
714 #undef SET_DIAG_MV
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
715 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
716
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
717 if(topright_ref != PART_NOT_AVAILABLE){
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
718 *C= h->mv_cache[list][ i - 8 + part_width ];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
719 return topright_ref;
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
720 }else{
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
721 tprintf(s->avctx, "topright MV not available\n");
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
722
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
723 *C= h->mv_cache[list][ i - 8 - 1 ];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
724 return h->ref_cache[list][ i - 8 - 1 ];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
725 }
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
726 }
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
727
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
728 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
729 * gets the predicted MV.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
730 * @param n the block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
731 * @param part_width the width of the partition (4, 8,16) -> (1, 2, 4)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
732 * @param mx the x component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
733 * @param my the y component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
734 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
735 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
736 const int index8= scan8[n];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
737 const int top_ref= h->ref_cache[list][ index8 - 8 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
738 const int left_ref= h->ref_cache[list][ index8 - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
739 const int16_t * const A= h->mv_cache[list][ index8 - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
740 const int16_t * const B= h->mv_cache[list][ index8 - 8 ];
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
741 const int16_t * C;
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
742 int diagonal_ref, match_count;
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
743
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
744 assert(part_width==1 || part_width==2 || part_width==4);
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
745
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
746 /* mv_cache
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
747 B . . A T T T T
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
748 U . . L . . , .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
749 U . . L . . . .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
750 U . . L . . , .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
751 . . . L . . . .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
752 */
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
753
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
754 diagonal_ref= fetch_diagonal_mv(h, &C, index8, list, part_width);
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
755 match_count= (diagonal_ref==ref) + (top_ref==ref) + (left_ref==ref);
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
756 tprintf(h->s.avctx, "pred_motion match_count=%d\n", match_count);
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
757 if(match_count > 1){ //most common
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
758 *mx= mid_pred(A[0], B[0], C[0]);
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
759 *my= mid_pred(A[1], B[1], C[1]);
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
760 }else if(match_count==1){
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
761 if(left_ref==ref){
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
762 *mx= A[0];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
763 *my= A[1];
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
764 }else if(top_ref==ref){
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
765 *mx= B[0];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
766 *my= B[1];
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
767 }else{
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
768 *mx= C[0];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
769 *my= C[1];
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
770 }
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
771 }else{
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
772 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
773 *mx= A[0];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
774 *my= A[1];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
775 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
776 *mx= mid_pred(A[0], B[0], C[0]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
777 *my= mid_pred(A[1], B[1], C[1]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
778 }
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
779 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
780
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
781 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
782 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
783
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
784 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
785 * gets the directionally predicted 16x8 MV.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
786 * @param n the block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
787 * @param mx the x component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
788 * @param my the y component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
789 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
790 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
791 if(n==0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
792 const int top_ref= h->ref_cache[list][ scan8[0] - 8 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
793 const int16_t * const B= h->mv_cache[list][ scan8[0] - 8 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
794
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
795 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
796
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
797 if(top_ref == ref){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
798 *mx= B[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
799 *my= B[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
800 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
801 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
802 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
803 const int left_ref= h->ref_cache[list][ scan8[8] - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
804 const int16_t * const A= h->mv_cache[list][ scan8[8] - 1 ];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
805
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
806 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
807
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
808 if(left_ref == ref){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
809 *mx= A[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
810 *my= A[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
811 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
812 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
813 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
814
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
815 //RARE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
816 pred_motion(h, n, 4, list, ref, mx, my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
817 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
818
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
819 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
820 * gets the directionally predicted 8x16 MV.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
821 * @param n the block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
822 * @param mx the x component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
823 * @param my the y component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
824 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
825 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
826 if(n==0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
827 const int left_ref= h->ref_cache[list][ scan8[0] - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
828 const int16_t * const A= h->mv_cache[list][ scan8[0] - 1 ];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
829
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
830 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
831
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
832 if(left_ref == ref){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
833 *mx= A[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
834 *my= A[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
835 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
836 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
837 }else{
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
838 const int16_t * C;
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
839 int diagonal_ref;
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
840
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
841 diagonal_ref= fetch_diagonal_mv(h, &C, scan8[4], list, 2);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
842
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
843 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
844
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
845 if(diagonal_ref == ref){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
846 *mx= C[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
847 *my= C[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
848 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
849 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
850 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
851
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
852 //RARE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
853 pred_motion(h, n, 2, list, ref, mx, my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
854 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
855
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
856 static inline void pred_pskip_motion(H264Context * const h, int * const mx, int * const my){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
857 const int top_ref = h->ref_cache[0][ scan8[0] - 8 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
858 const int left_ref= h->ref_cache[0][ scan8[0] - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
859
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
860 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
861
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
862 if(top_ref == PART_NOT_AVAILABLE || left_ref == PART_NOT_AVAILABLE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
863 || (top_ref == 0 && *(uint32_t*)h->mv_cache[0][ scan8[0] - 8 ] == 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
864 || (left_ref == 0 && *(uint32_t*)h->mv_cache[0][ scan8[0] - 1 ] == 0)){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
865
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
866 *mx = *my = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
867 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
868 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
869
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
870 pred_motion(h, 0, 4, 0, 0, mx, my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
871
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
872 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
873 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
874
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
875 static inline void direct_dist_scale_factor(H264Context * const h){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
876 const int poc = h->s.current_picture_ptr->poc;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
877 const int poc1 = h->ref_list[1][0].poc;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
878 int i;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
879 for(i=0; i<h->ref_count[0]; i++){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
880 int poc0 = h->ref_list[0][i].poc;
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
881 int td = av_clip(poc1 - poc0, -128, 127);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
882 if(td == 0 /* FIXME || pic0 is a long-term ref */){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
883 h->dist_scale_factor[i] = 256;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
884 }else{
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
885 int tb = av_clip(poc - poc0, -128, 127);
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
886 int tx = (16384 + (FFABS(td) >> 1)) / td;
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
887 h->dist_scale_factor[i] = av_clip((tb*tx + 32) >> 6, -1024, 1023);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
888 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
889 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
890 if(FRAME_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
891 for(i=0; i<h->ref_count[0]; i++){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
892 h->dist_scale_factor_field[2*i] =
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
893 h->dist_scale_factor_field[2*i+1] = h->dist_scale_factor[i];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
894 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
895 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
896 }
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
897 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
898 MpegEncContext * const s = &h->s;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
899 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
900 Picture * const cur = s->current_picture_ptr;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
901 int list, i, j;
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6429
diff changeset
902 if(cur->pict_type == FF_I_TYPE)
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
903 cur->ref_count[0] = 0;
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6429
diff changeset
904 if(cur->pict_type != FF_B_TYPE)
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
905 cur->ref_count[1] = 0;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
906 for(list=0; list<2; list++){
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
907 cur->ref_count[list] = h->ref_count[list];
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
908 for(j=0; j<h->ref_count[list]; j++)
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
909 cur->ref_poc[list][j] = h->ref_list[list][j].poc;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
910 }
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6429
diff changeset
911 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
912 return;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
913 for(list=0; list<2; list++){
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
914 for(i=0; i<ref1->ref_count[list]; i++){
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
915 const int poc = ref1->ref_poc[list][i];
3125
16f9d33c027d fix some crashes when missing frames
lorenm
parents: 3105
diff changeset
916 h->map_col_to_list0[list][i] = 0; /* bogus; fills in for missing frames */
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
917 for(j=0; j<h->ref_count[list]; j++)
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
918 if(h->ref_list[list][j].poc == poc){
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
919 h->map_col_to_list0[list][i] = j;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
920 break;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
921 }
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
922 }
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
923 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
924 if(FRAME_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
925 for(list=0; list<2; list++){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
926 for(i=0; i<ref1->ref_count[list]; i++){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
927 j = h->map_col_to_list0[list][i];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
928 h->map_col_to_list0_field[list][2*i] = 2*j;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
929 h->map_col_to_list0_field[list][2*i+1] = 2*j+1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
930 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
931 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
932 }
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
933 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
934
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
935 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
936 MpegEncContext * const s = &h->s;
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
937 const int mb_xy = h->mb_xy;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
938 const int b8_xy = 2*s->mb_x + 2*s->mb_y*h->b8_stride;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
939 const int b4_xy = 4*s->mb_x + 4*s->mb_y*h->b_stride;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
940 const int mb_type_col = h->ref_list[1][0].mb_type[mb_xy];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
941 const int16_t (*l1mv0)[2] = (const int16_t (*)[2]) &h->ref_list[1][0].motion_val[0][b4_xy];
2808
932ec96933f5 fixing colocated mv if colocated block is L1 predicted
michael
parents: 2803
diff changeset
942 const int16_t (*l1mv1)[2] = (const int16_t (*)[2]) &h->ref_list[1][0].motion_val[1][b4_xy];
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
943 const int8_t *l1ref0 = &h->ref_list[1][0].ref_index[0][b8_xy];
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
944 const int8_t *l1ref1 = &h->ref_list[1][0].ref_index[1][b8_xy];
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
945 const int is_b8x8 = IS_8X8(*mb_type);
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
946 unsigned int sub_mb_type;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
947 int i8, i4;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
948
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
949 #define MB_TYPE_16x16_OR_INTRA (MB_TYPE_16x16|MB_TYPE_INTRA4x4|MB_TYPE_INTRA16x16|MB_TYPE_INTRA_PCM)
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
950 if(IS_8X8(mb_type_col) && !h->sps.direct_8x8_inference_flag){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
951 /* FIXME save sub mb types from previous frames (or derive from MVs)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
952 * so we know exactly what block size to use */
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
953 sub_mb_type = MB_TYPE_8x8|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_4x4 */
2536
943b0615fc93 oops, other half of the vismv patch
lorenm
parents: 2535
diff changeset
954 *mb_type = MB_TYPE_8x8|MB_TYPE_L0L1;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
955 }else if(!is_b8x8 && (mb_type_col & MB_TYPE_16x16_OR_INTRA)){
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
956 sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
957 *mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_16x16 */
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
958 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
959 sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */
2536
943b0615fc93 oops, other half of the vismv patch
lorenm
parents: 2535
diff changeset
960 *mb_type = MB_TYPE_8x8|MB_TYPE_L0L1;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
961 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
962 if(!is_b8x8)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
963 *mb_type |= MB_TYPE_DIRECT2;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
964 if(MB_FIELD)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
965 *mb_type |= MB_TYPE_INTERLACED;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
966
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
967 tprintf(s->avctx, "mb_type = %08x, sub_mb_type = %08x, is_b8x8 = %d, mb_type_col = %08x\n", *mb_type, sub_mb_type, is_b8x8, mb_type_col);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
968
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
969 if(h->direct_spatial_mv_pred){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
970 int ref[2];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
971 int mv[2][2];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
972 int list;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
973
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
974 /* FIXME interlacing + spatial direct uses wrong colocated block positions */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
975
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
976 /* ref = min(neighbors) */
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
977 for(list=0; list<2; list++){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
978 int refa = h->ref_cache[list][scan8[0] - 1];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
979 int refb = h->ref_cache[list][scan8[0] - 8];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
980 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
981 if(refc == PART_NOT_AVAILABLE)
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
982 refc = h->ref_cache[list][scan8[0] - 8 - 1];
7336
aaf3e396f094 Simplify spatial direct ref selection with FFMIN3()
michael
parents: 7332
diff changeset
983 ref[list] = FFMIN3((unsigned)refa, (unsigned)refb, (unsigned)refc);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
984 if(ref[list] < 0)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
985 ref[list] = -1;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
986 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
987
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
988 if(ref[0] < 0 && ref[1] < 0){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
989 ref[0] = ref[1] = 0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
990 mv[0][0] = mv[0][1] =
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
991 mv[1][0] = mv[1][1] = 0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
992 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
993 for(list=0; list<2; list++){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
994 if(ref[list] >= 0)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
995 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
996 else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
997 mv[list][0] = mv[list][1] = 0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
998 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
999 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1000
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1001 if(ref[1] < 0){
6309
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1002 if(!is_b8x8)
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1003 *mb_type &= ~MB_TYPE_L1;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1004 sub_mb_type &= ~MB_TYPE_L1;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1005 }else if(ref[0] < 0){
6309
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1006 if(!is_b8x8)
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1007 *mb_type &= ~MB_TYPE_L0;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1008 sub_mb_type &= ~MB_TYPE_L0;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1009 }
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1010
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1011 if(IS_INTERLACED(*mb_type) != IS_INTERLACED(mb_type_col)){
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1012 int pair_xy = s->mb_x + (s->mb_y&~1)*s->mb_stride;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1013 int mb_types_col[2];
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1014 int b8_stride = h->b8_stride;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1015 int b4_stride = h->b_stride;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1016
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1017 *mb_type = (*mb_type & ~MB_TYPE_16x16) | MB_TYPE_8x8;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1018
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1019 if(IS_INTERLACED(*mb_type)){
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1020 mb_types_col[0] = h->ref_list[1][0].mb_type[pair_xy];
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1021 mb_types_col[1] = h->ref_list[1][0].mb_type[pair_xy+s->mb_stride];
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1022 if(s->mb_y&1){
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1023 l1ref0 -= 2*b8_stride;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1024 l1ref1 -= 2*b8_stride;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1025 l1mv0 -= 4*b4_stride;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1026 l1mv1 -= 4*b4_stride;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1027 }
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1028 b8_stride *= 3;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1029 b4_stride *= 6;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1030 }else{
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1031 int cur_poc = s->current_picture_ptr->poc;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1032 int *col_poc = h->ref_list[1]->field_poc;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1033 int col_parity = FFABS(col_poc[0] - cur_poc) >= FFABS(col_poc[1] - cur_poc);
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1034 int dy = 2*col_parity - (s->mb_y&1);
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1035 mb_types_col[0] =
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1036 mb_types_col[1] = h->ref_list[1][0].mb_type[pair_xy + col_parity*s->mb_stride];
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1037 l1ref0 += dy*b8_stride;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1038 l1ref1 += dy*b8_stride;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1039 l1mv0 += 2*dy*b4_stride;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1040 l1mv1 += 2*dy*b4_stride;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1041 b8_stride = 0;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1042 }
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1043
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1044 for(i8=0; i8<4; i8++){
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1045 int x8 = i8&1;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1046 int y8 = i8>>1;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1047 int xy8 = x8+y8*b8_stride;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1048 int xy4 = 3*x8+y8*b4_stride;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1049 int a=0, b=0;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1050
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1051 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8]))
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1052 continue;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1053 h->sub_mb_type[i8] = sub_mb_type;
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1054
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1055 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
1056 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, (uint8_t)ref[1], 1);
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1057 if(!IS_INTRA(mb_types_col[y8])
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1058 && ( (l1ref0[xy8] == 0 && FFABS(l1mv0[xy4][0]) <= 1 && FFABS(l1mv0[xy4][1]) <= 1)
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1059 || (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
1060 if(ref[0] > 0)
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1061 a= pack16to32(mv[0][0],mv[0][1]);
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1062 if(ref[1] > 0)
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1063 b= pack16to32(mv[1][0],mv[1][1]);
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1064 }else{
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1065 a= pack16to32(mv[0][0],mv[0][1]);
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1066 b= pack16to32(mv[1][0],mv[1][1]);
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1067 }
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1068 fill_rectangle(&h->mv_cache[0][scan8[i8*4]], 2, 2, 8, a, 4);
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1069 fill_rectangle(&h->mv_cache[1][scan8[i8*4]], 2, 2, 8, b, 4);
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1070 }
af4b8e1f9b6c mbaff spatial direct
lorenm
parents: 6216
diff changeset
1071 }else if(IS_16X16(*mb_type)){
4540
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
1072 int a=0, b=0;
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
1073
3001
b52d8ee430f6 fix some potential arithmetic overflows in pred_direct_motion() and
lorenm
parents: 2979
diff changeset
1074 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
1075 fill_rectangle(&h->ref_cache[1][scan8[0]], 4, 4, 8, (uint8_t)ref[1], 1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1076 if(!IS_INTRA(mb_type_col)
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
1077 && ( (l1ref0[0] == 0 && FFABS(l1mv0[0][0]) <= 1 && FFABS(l1mv0[0][1]) <= 1)
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
1078 || (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
1079 && (h->x264_build>33 || !h->x264_build)))){
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1080 if(ref[0] > 0)
4540
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
1081 a= pack16to32(mv[0][0],mv[0][1]);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1082 if(ref[1] > 0)
4540
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
1083 b= pack16to32(mv[1][0],mv[1][1]);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1084 }else{
4540
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
1085 a= pack16to32(mv[0][0],mv[0][1]);
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
1086 b= pack16to32(mv[1][0],mv[1][1]);
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
1087 }
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
1088 fill_rectangle(&h->mv_cache[0][scan8[0]], 4, 4, 8, a, 4);
d81e41071424 factorize fill_rectangle() calls
michael
parents: 4534
diff changeset
1089 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
1090 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1091 for(i8=0; i8<4; i8++){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1092 const int x8 = i8&1;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1093 const int y8 = i8>>1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1094
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1095 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8]))
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1096 continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1097 h->sub_mb_type[i8] = sub_mb_type;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1098
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1099 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
1100 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
1101 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
1102 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
1103
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1104 /* col_zero_flag */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1105 if(!IS_INTRA(mb_type_col) && ( l1ref0[x8 + y8*h->b8_stride] == 0
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1106 || (l1ref0[x8 + y8*h->b8_stride] < 0 && l1ref1[x8 + y8*h->b8_stride] == 0
2834
fd5d7c732c6b kill a bunch of compiler warnings
mru
parents: 2815
diff changeset
1107 && (h->x264_build>33 || !h->x264_build)))){
2808
932ec96933f5 fixing colocated mv if colocated block is L1 predicted
michael
parents: 2803
diff changeset
1108 const int16_t (*l1mv)[2]= l1ref0[x8 + y8*h->b8_stride] == 0 ? l1mv0 : l1mv1;
3002
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1109 if(IS_SUB_8X8(sub_mb_type)){
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1110 const int16_t *mv_col = l1mv[x8*3 + y8*3*h->b_stride];
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
1111 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
1112 if(ref[0] == 0)
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1113 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
1114 if(ref[1] == 0)
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1115 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
1116 }
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1117 }else
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1118 for(i4=0; i4<4; i4++){
2808
932ec96933f5 fixing colocated mv if colocated block is L1 predicted
michael
parents: 2803
diff changeset
1119 const int16_t *mv_col = l1mv[x8*2 + (i4&1) + (y8*2 + (i4>>1))*h->b_stride];
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
1120 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
1121 if(ref[0] == 0)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1122 *(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
1123 if(ref[1] == 0)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1124 *(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
1125 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1126 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1127 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1128 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1129 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1130 }else{ /* direct temporal mv pred */
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1131 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
1132 const int *dist_scale_factor = h->dist_scale_factor;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1133
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1134 if(FRAME_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1135 if(IS_INTERLACED(*mb_type)){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1136 map_col_to_list0[0] = h->map_col_to_list0_field[0];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1137 map_col_to_list0[1] = h->map_col_to_list0_field[1];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1138 dist_scale_factor = h->dist_scale_factor_field;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1139 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1140 if(IS_INTERLACED(*mb_type) != IS_INTERLACED(mb_type_col)){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1141 /* FIXME assumes direct_8x8_inference == 1 */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1142 const int pair_xy = s->mb_x + (s->mb_y&~1)*s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1143 int mb_types_col[2];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1144 int y_shift;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1145
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1146 *mb_type = MB_TYPE_8x8|MB_TYPE_L0L1
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1147 | (is_b8x8 ? 0 : MB_TYPE_DIRECT2)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1148 | (*mb_type & MB_TYPE_INTERLACED);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1149 sub_mb_type = MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2|MB_TYPE_16x16;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1150
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1151 if(IS_INTERLACED(*mb_type)){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1152 /* frame to field scaling */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1153 mb_types_col[0] = h->ref_list[1][0].mb_type[pair_xy];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1154 mb_types_col[1] = h->ref_list[1][0].mb_type[pair_xy+s->mb_stride];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1155 if(s->mb_y&1){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1156 l1ref0 -= 2*h->b8_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1157 l1ref1 -= 2*h->b8_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1158 l1mv0 -= 4*h->b_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1159 l1mv1 -= 4*h->b_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1160 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1161 y_shift = 0;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1162
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1163 if( (mb_types_col[0] & MB_TYPE_16x16_OR_INTRA)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1164 && (mb_types_col[1] & MB_TYPE_16x16_OR_INTRA)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1165 && !is_b8x8)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1166 *mb_type |= MB_TYPE_16x8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1167 else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1168 *mb_type |= MB_TYPE_8x8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1169 }else{
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1170 /* field to frame scaling */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1171 /* col_mb_y = (mb_y&~1) + (topAbsDiffPOC < bottomAbsDiffPOC ? 0 : 1)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1172 * but in MBAFF, top and bottom POC are equal */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1173 int dy = (s->mb_y&1) ? 1 : 2;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1174 mb_types_col[0] =
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1175 mb_types_col[1] = h->ref_list[1][0].mb_type[pair_xy+s->mb_stride];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1176 l1ref0 += dy*h->b8_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1177 l1ref1 += dy*h->b8_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1178 l1mv0 += 2*dy*h->b_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1179 l1mv1 += 2*dy*h->b_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1180 y_shift = 2;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1181
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1182 if((mb_types_col[0] & (MB_TYPE_16x16_OR_INTRA|MB_TYPE_16x8))
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1183 && !is_b8x8)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1184 *mb_type |= MB_TYPE_16x16;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1185 else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1186 *mb_type |= MB_TYPE_8x8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1187 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1188
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1189 for(i8=0; i8<4; i8++){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1190 const int x8 = i8&1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1191 const int y8 = i8>>1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1192 int ref0, scale;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1193 const int16_t (*l1mv)[2]= l1mv0;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1194
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1195 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8]))
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1196 continue;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1197 h->sub_mb_type[i8] = sub_mb_type;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1198
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1199 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, 0, 1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1200 if(IS_INTRA(mb_types_col[y8])){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1201 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, 0, 1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1202 fill_rectangle(&h-> mv_cache[0][scan8[i8*4]], 2, 2, 8, 0, 4);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1203 fill_rectangle(&h-> mv_cache[1][scan8[i8*4]], 2, 2, 8, 0, 4);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1204 continue;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1205 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1206
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1207 ref0 = l1ref0[x8 + (y8*2>>y_shift)*h->b8_stride];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1208 if(ref0 >= 0)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1209 ref0 = map_col_to_list0[0][ref0*2>>y_shift];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1210 else{
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1211 ref0 = map_col_to_list0[1][l1ref1[x8 + (y8*2>>y_shift)*h->b8_stride]*2>>y_shift];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1212 l1mv= l1mv1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1213 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1214 scale = dist_scale_factor[ref0];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1215 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, ref0, 1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1216
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1217 {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1218 const int16_t *mv_col = l1mv[x8*3 + (y8*6>>y_shift)*h->b_stride];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1219 int my_col = (mv_col[1]<<y_shift)/2;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1220 int mx = (scale * mv_col[0] + 128) >> 8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1221 int my = (scale * my_col + 128) >> 8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1222 fill_rectangle(&h->mv_cache[0][scan8[i8*4]], 2, 2, 8, pack16to32(mx,my), 4);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1223 fill_rectangle(&h->mv_cache[1][scan8[i8*4]], 2, 2, 8, pack16to32(mx-mv_col[0],my-my_col), 4);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1224 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1225 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1226 return;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1227 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1228 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1229
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1230 /* one-to-one mv scaling */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1231
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1232 if(IS_16X16(*mb_type)){
4541
1c8bc533da57 factorize more calls to fill_rectangle()
michael
parents: 4540
diff changeset
1233 int ref, mv0, mv1;
1c8bc533da57 factorize more calls to fill_rectangle()
michael
parents: 4540
diff changeset
1234
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1235 fill_rectangle(&h->ref_cache[1][scan8[0]], 4, 4, 8, 0, 1);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1236 if(IS_INTRA(mb_type_col)){
4541
1c8bc533da57 factorize more calls to fill_rectangle()
michael
parents: 4540
diff changeset
1237 ref=mv0=mv1=0;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1238 }else{
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1239 const int ref0 = l1ref0[0] >= 0 ? map_col_to_list0[0][l1ref0[0]]
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1240 : map_col_to_list0[1][l1ref1[0]];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1241 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
1242 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
1243 int mv_l0[2];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1244 mv_l0[0] = (scale * mv_col[0] + 128) >> 8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1245 mv_l0[1] = (scale * mv_col[1] + 128) >> 8;
4541
1c8bc533da57 factorize more calls to fill_rectangle()
michael
parents: 4540
diff changeset
1246 ref= ref0;
1c8bc533da57 factorize more calls to fill_rectangle()
michael
parents: 4540
diff changeset
1247 mv0= pack16to32(mv_l0[0],mv_l0[1]);
1c8bc533da57 factorize more calls to fill_rectangle()
michael
parents: 4540
diff changeset
1248 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
1249 }
1c8bc533da57 factorize more calls to fill_rectangle()
michael
parents: 4540
diff changeset
1250 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
1251 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
1252 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
1253 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1254 for(i8=0; i8<4; i8++){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1255 const int x8 = i8&1;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1256 const int y8 = i8>>1;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1257 int ref0, scale;
2834
fd5d7c732c6b kill a bunch of compiler warnings
mru
parents: 2815
diff changeset
1258 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
1259
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1260 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8]))
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1261 continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1262 h->sub_mb_type[i8] = sub_mb_type;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1263 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, 0, 1);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1264 if(IS_INTRA(mb_type_col)){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1265 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
1266 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
1267 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
1268 continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1269 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1270
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1271 ref0 = l1ref0[x8 + y8*h->b8_stride];
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1272 if(ref0 >= 0)
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1273 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
1274 else{
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1275 ref0 = map_col_to_list0[1][l1ref1[x8 + y8*h->b8_stride]];
2809
75400dfbe117 fixing colocated mv if colocated block is L1 predicted for the temporal direct case
michael
parents: 2808
diff changeset
1276 l1mv= l1mv1;
75400dfbe117 fixing colocated mv if colocated block is L1 predicted for the temporal direct case
michael
parents: 2808
diff changeset
1277 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1278 scale = dist_scale_factor[ref0];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1279
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1280 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
1281 if(IS_SUB_8X8(sub_mb_type)){
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1282 const int16_t *mv_col = l1mv[x8*3 + y8*3*h->b_stride];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1283 int mx = (scale * mv_col[0] + 128) >> 8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1284 int my = (scale * mv_col[1] + 128) >> 8;
3002
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1285 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
1286 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
1287 }else
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1288 for(i4=0; i4<4; i4++){
2809
75400dfbe117 fixing colocated mv if colocated block is L1 predicted for the temporal direct case
michael
parents: 2808
diff changeset
1289 const int16_t *mv_col = l1mv[x8*2 + (i4&1) + (y8*2 + (i4>>1))*h->b_stride];
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1290 int16_t *mv_l0 = h->mv_cache[0][scan8[i8*4+i4]];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1291 mv_l0[0] = (scale * mv_col[0] + 128) >> 8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1292 mv_l0[1] = (scale * mv_col[1] + 128) >> 8;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1293 *(uint32_t*)h->mv_cache[1][scan8[i8*4+i4]] =
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1294 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
1295 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1296 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1297 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1298 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1299 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1300
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1301 static inline void write_back_motion(H264Context *h, int mb_type){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1302 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1303 const int b_xy = 4*s->mb_x + 4*s->mb_y*h->b_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1304 const int b8_xy= 2*s->mb_x + 2*s->mb_y*h->b8_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1305 int list;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1306
3219
cf233efbcece 10l in 1.199 (write_back_motion with B-pyramid + spatial)
lorenm
parents: 3215
diff changeset
1307 if(!USES_LIST(mb_type, 0))
cf233efbcece 10l in 1.199 (write_back_motion with B-pyramid + spatial)
lorenm
parents: 3215
diff changeset
1308 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
1309
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
1310 for(list=0; list<h->list_count; list++){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1311 int y;
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
1312 if(!USES_LIST(mb_type, list))
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1313 continue;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1314
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1315 for(y=0; y<4; y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1316 *(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
1317 *(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
1318 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
1319 if( h->pps.cabac ) {
3927
f44a3341bfdf simplify write_back_motion for skip mbs
lorenm
parents: 3807
diff changeset
1320 if(IS_SKIP(mb_type))
f44a3341bfdf simplify write_back_motion for skip mbs
lorenm
parents: 3807
diff changeset
1321 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
1322 else
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
1323 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
1324 *(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
1325 *(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
1326 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
1327 }
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
1328
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
1329 {
3776
1843a85123b7 fix some signedness warnings
mru
parents: 3651
diff changeset
1330 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
1331 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
1332 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
1333 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
1334 ref_index[1+1*h->b8_stride]= h->ref_cache[list][scan8[12]];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1335 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1336 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1337
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
1338 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
1339 if(IS_8X8(mb_type)){
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
1340 uint8_t *direct_table = &h->direct_table[b8_xy];
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
1341 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
1342 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
1343 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
1344 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1345 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1346 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1347
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1348 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1349 * Decodes a network abstraction layer unit.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1350 * @param consumed is the number of bytes used as input
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1351 * @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
1352 * @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
1353 * @returns decoded bytes, might be src+1 if no escapes
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1354 */
6216
michael
parents: 6213
diff changeset
1355 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
1356 int i, si, di;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1357 uint8_t *dst;
5174
2e038003cdfb Do not reuse the rbsp de-escape buffer if both
benoit
parents: 5172
diff changeset
1358 int bufidx;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1359
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2971
diff changeset
1360 // src[0]&0x80; //forbidden bit
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1361 h->nal_ref_idc= src[0]>>5;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1362 h->nal_unit_type= src[0]&0x1F;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1363
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1364 src++; length--;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1365 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1366 for(i=0; i<length; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1367 printf("%2X ", src[i]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1368 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1369 for(i=0; i+1<length; i+=2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1370 if(src[i]) continue;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1371 if(i>0 && src[i-1]==0) i--;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1372 if(i+2<length && src[i+1]==0 && src[i+2]<=3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1373 if(src[i+2]!=3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1374 /* startcode, so we must be past the end */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1375 length=i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1376 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1377 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1378 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1379 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1380
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1381 if(i>=length-1){ //no escaped 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1382 *dst_length= length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1383 *consumed= length+1; //+1 for the header
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1384 return src;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1385 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1386
5174
2e038003cdfb Do not reuse the rbsp de-escape buffer if both
benoit
parents: 5172
diff changeset
1387 bufidx = h->nal_unit_type == NAL_DPC ? 1 : 0; // use second escape buffer for inter data
2e038003cdfb Do not reuse the rbsp de-escape buffer if both
benoit
parents: 5172
diff changeset
1388 h->rbsp_buffer[bufidx]= av_fast_realloc(h->rbsp_buffer[bufidx], &h->rbsp_buffer_size[bufidx], length);
2e038003cdfb Do not reuse the rbsp de-escape buffer if both
benoit
parents: 5172
diff changeset
1389 dst= h->rbsp_buffer[bufidx];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1390
4362
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
1391 if (dst == NULL){
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
1392 return NULL;
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
1393 }
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
1394
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
1395 //printf("decoding esc\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1396 si=di=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1397 while(si<length){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1398 //remove escapes (very rare 1:2^22)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1399 if(si+2<length && src[si]==0 && src[si+1]==0 && src[si+2]<=3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1400 if(src[si+2]==3){ //escape
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1401 dst[di++]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1402 dst[di++]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1403 si+=3;
1957
54411768fa38 h264 nal decoding fix by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1956
diff changeset
1404 continue;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1405 }else //next start code
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1406 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1407 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1408
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1409 dst[di++]= src[si++];
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 *dst_length= di;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1413 *consumed= si + 1;//+1 for the header
5129
0244bba24b43 misc typo fixes
diego
parents: 5127
diff changeset
1414 //FIXME store exact number of bits in the getbitcontext (it is needed for decoding)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1415 return dst;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1416 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1417
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1418 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1419 * identifies the exact end of the bitstream
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1420 * @return the length of the trailing, or 0 if damaged
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1421 */
6216
michael
parents: 6213
diff changeset
1422 static int decode_rbsp_trailing(H264Context *h, const uint8_t *src){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1423 int v= *src;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1424 int r;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1425
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
1426 tprintf(h->s.avctx, "rbsp trailing %X\n", v);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1427
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1428 for(r=1; r<9; r++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1429 if(v&1) return r;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1430 v>>=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1431 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1432 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1433 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1434
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1435 /**
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
1436 * IDCT transforms the 16 dc values and dequantizes them.
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1437 * @param qp quantization parameter
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1438 */
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1439 static void h264_luma_dc_dequant_idct_c(DCTELEM *block, int qp, int qmul){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1440 #define stride 16
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1441 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1442 int temp[16]; //FIXME check if this is a good idea
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1443 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1444 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1445
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1446 //memset(block, 64, 2*256);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1447 //return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1448 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1449 const int offset= y_offset[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1450 const int z0= block[offset+stride*0] + block[offset+stride*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1451 const int z1= block[offset+stride*0] - block[offset+stride*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1452 const int z2= block[offset+stride*1] - block[offset+stride*5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1453 const int z3= block[offset+stride*1] + block[offset+stride*5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1454
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1455 temp[4*i+0]= z0+z3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1456 temp[4*i+1]= z1+z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1457 temp[4*i+2]= z1-z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1458 temp[4*i+3]= z0-z3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1459 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1460
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1461 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1462 const int offset= x_offset[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1463 const int z0= temp[4*0+i] + temp[4*2+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1464 const int z1= temp[4*0+i] - temp[4*2+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1465 const int z2= temp[4*1+i] - temp[4*3+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1466 const int z3= temp[4*1+i] + temp[4*3+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1467
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
1468 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
1469 block[stride*2 +offset]= ((((z1 + z2)*qmul + 128 ) >> 8));
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1470 block[stride*8 +offset]= ((((z1 - z2)*qmul + 128 ) >> 8));
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1471 block[stride*10+offset]= ((((z0 - z3)*qmul + 128 ) >> 8));
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1472 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1473 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1474
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1475 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1476 /**
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
1477 * DCT transforms the 16 dc values.
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1478 * @param qp quantization parameter ??? FIXME
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1479 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1480 static void h264_luma_dc_dct_c(DCTELEM *block/*, int qp*/){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1481 // const int qmul= dequant_coeff[qp][0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1482 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1483 int temp[16]; //FIXME check if this is a good idea
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1484 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1485 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1486
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1487 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1488 const int offset= y_offset[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1489 const int z0= block[offset+stride*0] + block[offset+stride*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1490 const int z1= block[offset+stride*0] - block[offset+stride*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1491 const int z2= block[offset+stride*1] - block[offset+stride*5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1492 const int z3= block[offset+stride*1] + block[offset+stride*5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1493
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1494 temp[4*i+0]= z0+z3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1495 temp[4*i+1]= z1+z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1496 temp[4*i+2]= z1-z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1497 temp[4*i+3]= z0-z3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1498 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1499
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1500 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1501 const int offset= x_offset[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1502 const int z0= temp[4*0+i] + temp[4*2+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1503 const int z1= temp[4*0+i] - temp[4*2+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1504 const int z2= temp[4*1+i] - temp[4*3+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1505 const int z3= temp[4*1+i] + temp[4*3+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1506
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1507 block[stride*0 +offset]= (z0 + z3)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1508 block[stride*2 +offset]= (z1 + z2)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1509 block[stride*8 +offset]= (z1 - z2)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1510 block[stride*10+offset]= (z0 - z3)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1511 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1512 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1513 #endif
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1514
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1515 #undef xStride
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1516 #undef stride
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1517
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1518 static void chroma_dc_dequant_idct_c(DCTELEM *block, int qp, int qmul){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1519 const int stride= 16*2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1520 const int xStride= 16;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1521 int a,b,c,d,e;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1522
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1523 a= block[stride*0 + xStride*0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1524 b= block[stride*0 + xStride*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1525 c= block[stride*1 + xStride*0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1526 d= block[stride*1 + xStride*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1527
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1528 e= a-b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1529 a= a+b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1530 b= c-d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1531 c= c+d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1532
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1533 block[stride*0 + xStride*0]= ((a+c)*qmul) >> 7;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1534 block[stride*0 + xStride*1]= ((e+b)*qmul) >> 7;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1535 block[stride*1 + xStride*0]= ((a-c)*qmul) >> 7;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1536 block[stride*1 + xStride*1]= ((e-b)*qmul) >> 7;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1537 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1538
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1539 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1540 static void chroma_dc_dct_c(DCTELEM *block){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1541 const int stride= 16*2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1542 const int xStride= 16;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1543 int a,b,c,d,e;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1544
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1545 a= block[stride*0 + xStride*0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1546 b= block[stride*0 + xStride*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1547 c= block[stride*1 + xStride*0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1548 d= block[stride*1 + xStride*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1549
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1550 e= a-b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1551 a= a+b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1552 b= c-d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1553 c= c+d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1554
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1555 block[stride*0 + xStride*0]= (a+c);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1556 block[stride*0 + xStride*1]= (e+b);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1557 block[stride*1 + xStride*0]= (a-c);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1558 block[stride*1 + xStride*1]= (e-b);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1559 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1560 #endif
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1561
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1562 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1563 * gets the chroma qp.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1564 */
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
1565 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
1566 return h->pps.chroma_qp_table[t][qscale];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1567 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1568
6488
ecbe9565dcae typo fixes
diego
parents: 6481
diff changeset
1569 //FIXME need to check that this does not overflow signed 32 bit for low qp, I am not sure, it's very close
4553
1a714d3f0233 cosmetics: Fix a common typo, sepErate --> sepArate.
diego
parents: 4546
diff changeset
1570 //FIXME check that gcc inlines this (and optimizes intra & separate_dc stuff away)
1a714d3f0233 cosmetics: Fix a common typo, sepErate --> sepArate.
diego
parents: 4546
diff changeset
1571 static inline int quantize_c(DCTELEM *block, uint8_t *scantable, int qscale, int intra, int separate_dc){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1572 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1573 const int * const quant_table= quant_coeff[qscale];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1574 const int bias= intra ? (1<<QUANT_SHIFT)/3 : (1<<QUANT_SHIFT)/6;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1575 const unsigned int threshold1= (1<<QUANT_SHIFT) - bias - 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1576 const unsigned int threshold2= (threshold1<<1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1577 int last_non_zero;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1578
4553
1a714d3f0233 cosmetics: Fix a common typo, sepErate --> sepArate.
diego
parents: 4546
diff changeset
1579 if(separate_dc){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1580 if(qscale<=18){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1581 //avoid overflows
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1582 const int dc_bias= intra ? (1<<(QUANT_SHIFT-2))/3 : (1<<(QUANT_SHIFT-2))/6;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1583 const unsigned int dc_threshold1= (1<<(QUANT_SHIFT-2)) - dc_bias - 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1584 const unsigned int dc_threshold2= (dc_threshold1<<1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1585
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1586 int level= block[0]*quant_coeff[qscale+18][0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1587 if(((unsigned)(level+dc_threshold1))>dc_threshold2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1588 if(level>0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1589 level= (dc_bias + level)>>(QUANT_SHIFT-2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1590 block[0]= level;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1591 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1592 level= (dc_bias - level)>>(QUANT_SHIFT-2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1593 block[0]= -level;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1594 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1595 // last_non_zero = i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1596 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1597 block[0]=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1598 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1599 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1600 const int dc_bias= intra ? (1<<(QUANT_SHIFT+1))/3 : (1<<(QUANT_SHIFT+1))/6;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1601 const unsigned int dc_threshold1= (1<<(QUANT_SHIFT+1)) - dc_bias - 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1602 const unsigned int dc_threshold2= (dc_threshold1<<1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1603
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1604 int level= block[0]*quant_table[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1605 if(((unsigned)(level+dc_threshold1))>dc_threshold2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1606 if(level>0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1607 level= (dc_bias + level)>>(QUANT_SHIFT+1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1608 block[0]= level;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1609 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1610 level= (dc_bias - level)>>(QUANT_SHIFT+1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1611 block[0]= -level;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1612 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1613 // last_non_zero = i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1614 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1615 block[0]=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1616 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1617 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1618 last_non_zero= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1619 i=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1620 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1621 last_non_zero= -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1622 i=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1623 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1624
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1625 for(; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1626 const int j= scantable[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1627 int level= block[j]*quant_table[j];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1628
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1629 // if( bias+level >= (1<<(QMAT_SHIFT - 3))
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1630 // || bias-level >= (1<<(QMAT_SHIFT - 3))){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1631 if(((unsigned)(level+threshold1))>threshold2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1632 if(level>0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1633 level= (bias + level)>>QUANT_SHIFT;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1634 block[j]= level;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1635 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1636 level= (bias - level)>>QUANT_SHIFT;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1637 block[j]= -level;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1638 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1639 last_non_zero = i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1640 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1641 block[j]=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1642 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1643 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1644
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1645 return last_non_zero;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1646 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1647
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1648 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
1649 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1650 int src_x_offset, int src_y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1651 qpel_mc_func *qpix_op, h264_chroma_mc_func chroma_op){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1652 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1653 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
1654 int my= h->mv_cache[list][ scan8[n] ][1] + src_y_offset*8;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1655 const int luma_xy= (mx&3) + ((my&3)<<2);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1656 uint8_t * src_y = pic->data[0] + (mx>>2) + (my>>2)*h->mb_linesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1657 uint8_t * src_cb, * src_cr;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1658 int extra_width= h->emu_edge_width;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1659 int extra_height= h->emu_edge_height;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1660 int emu=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1661 const int full_mx= mx>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1662 const int full_my= my>>2;
2861
3b920e274b26 fix emulated edge motion compensation when resolution%16!=0
lorenm
parents: 2846
diff changeset
1663 const int pic_width = 16*s->mb_width;
5815
fb293531e983 Simplify tests for field macroblocks
andoma
parents: 5812
diff changeset
1664 const int pic_height = 16*s->mb_height >> MB_FIELD;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1665
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
1666 if(!pic->data[0]) //FIXME this is unacceptable, some sensible error concealment must be done for missing reference frames
3125
16f9d33c027d fix some crashes when missing frames
lorenm
parents: 3105
diff changeset
1667 return;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1668
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1669 if(mx&7) extra_width -= 3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1670 if(my&7) extra_height -= 3;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1671
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1672 if( full_mx < 0-extra_width
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1673 || full_my < 0-extra_height
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1674 || full_mx + 16/*FIXME*/ > pic_width + extra_width
2861
3b920e274b26 fix emulated edge motion compensation when resolution%16!=0
lorenm
parents: 2846
diff changeset
1675 || full_my + 16/*FIXME*/ > pic_height + extra_height){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1676 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
1677 src_y= s->edge_emu_buffer + 2 + 2*h->mb_linesize;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1678 emu=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1679 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1680
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1681 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
1682 if(!square){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1683 qpix_op[luma_xy](dest_y + delta, src_y + delta, h->mb_linesize);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1684 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1685
5434
4f2e3ef72b32 use ENABLE_GRAY
michael
parents: 5425
diff changeset
1686 if(ENABLE_GRAY && s->flags&CODEC_FLAG_GRAY) return;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1687
5815
fb293531e983 Simplify tests for field macroblocks
andoma
parents: 5812
diff changeset
1688 if(MB_FIELD){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1689 // 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
1690 my += 2 * ((s->mb_y & 1) - (pic->reference - 1));
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1691 emu |= (my>>3) < 0 || (my>>3) + 8 >= (pic_height>>1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1692 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1693 src_cb= pic->data[1] + (mx>>3) + (my>>3)*h->mb_uvlinesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1694 src_cr= pic->data[2] + (mx>>3) + (my>>3)*h->mb_uvlinesize;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1695
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1696 if(emu){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1697 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
1698 src_cb= s->edge_emu_buffer;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1699 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1700 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
1701
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1702 if(emu){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1703 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
1704 src_cr= s->edge_emu_buffer;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1705 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1706 chroma_op(dest_cr, src_cr, h->mb_uvlinesize, chroma_height, mx&7, my&7);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1707 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1708
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1709 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
1710 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1711 int x_offset, int y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1712 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1713 qpel_mc_func *qpix_avg, h264_chroma_mc_func chroma_avg,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1714 int list0, int list1){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1715 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1716 qpel_mc_func *qpix_op= qpix_put;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1717 h264_chroma_mc_func chroma_op= chroma_put;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1718
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1719 dest_y += 2*x_offset + 2*y_offset*h-> mb_linesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1720 dest_cb += x_offset + y_offset*h->mb_uvlinesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1721 dest_cr += x_offset + y_offset*h->mb_uvlinesize;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1722 x_offset += 8*s->mb_x;
5815
fb293531e983 Simplify tests for field macroblocks
andoma
parents: 5812
diff changeset
1723 y_offset += 8*(s->mb_y >> MB_FIELD);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1724
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1725 if(list0){
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1726 Picture *ref= &h->ref_list[0][ h->ref_cache[0][ scan8[n] ] ];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1727 mc_dir_part(h, ref, n, square, chroma_height, delta, 0,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1728 dest_y, dest_cb, dest_cr, x_offset, y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1729 qpix_op, chroma_op);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1730
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1731 qpix_op= qpix_avg;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1732 chroma_op= chroma_avg;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1733 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1734
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1735 if(list1){
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1736 Picture *ref= &h->ref_list[1][ h->ref_cache[1][ scan8[n] ] ];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1737 mc_dir_part(h, ref, n, square, chroma_height, delta, 1,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1738 dest_y, dest_cb, dest_cr, x_offset, y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1739 qpix_op, chroma_op);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1740 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1741 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1742
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1743 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
1744 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1745 int x_offset, int y_offset,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1746 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1747 h264_weight_func luma_weight_op, h264_weight_func chroma_weight_op,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1748 h264_biweight_func luma_weight_avg, h264_biweight_func chroma_weight_avg,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1749 int list0, int list1){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1750 MpegEncContext * const s = &h->s;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1751
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1752 dest_y += 2*x_offset + 2*y_offset*h-> mb_linesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1753 dest_cb += x_offset + y_offset*h->mb_uvlinesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1754 dest_cr += x_offset + y_offset*h->mb_uvlinesize;
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1755 x_offset += 8*s->mb_x;
5815
fb293531e983 Simplify tests for field macroblocks
andoma
parents: 5812
diff changeset
1756 y_offset += 8*(s->mb_y >> MB_FIELD);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1757
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1758 if(list0 && list1){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1759 /* don't optimize for luma-only case, since B-frames usually
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1760 * use implicit weights => chroma too. */
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1761 uint8_t *tmp_cb = s->obmc_scratchpad;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1762 uint8_t *tmp_cr = s->obmc_scratchpad + 8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1763 uint8_t *tmp_y = s->obmc_scratchpad + 8*h->mb_uvlinesize;
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1764 int refn0 = h->ref_cache[0][ scan8[n] ];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1765 int refn1 = h->ref_cache[1][ scan8[n] ];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1766
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1767 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
1768 dest_y, dest_cb, dest_cr,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1769 x_offset, y_offset, qpix_put, chroma_put);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1770 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
1771 tmp_y, tmp_cb, tmp_cr,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1772 x_offset, y_offset, qpix_put, chroma_put);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1773
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1774 if(h->use_weight == 2){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1775 int weight0 = h->implicit_weight[refn0][refn1];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1776 int weight1 = 64 - weight0;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1777 luma_weight_avg( dest_y, tmp_y, h-> mb_linesize, 5, weight0, weight1, 0);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1778 chroma_weight_avg(dest_cb, tmp_cb, h->mb_uvlinesize, 5, weight0, weight1, 0);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1779 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
1780 }else{
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1781 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
1782 h->luma_weight[0][refn0], h->luma_weight[1][refn1],
3029
7a92269a3ccd tweak h264_biweight
lorenm
parents: 3028
diff changeset
1783 h->luma_offset[0][refn0] + h->luma_offset[1][refn1]);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1784 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
1785 h->chroma_weight[0][refn0][0], h->chroma_weight[1][refn1][0],
3029
7a92269a3ccd tweak h264_biweight
lorenm
parents: 3028
diff changeset
1786 h->chroma_offset[0][refn0][0] + h->chroma_offset[1][refn1][0]);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1787 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
1788 h->chroma_weight[0][refn0][1], h->chroma_weight[1][refn1][1],
3029
7a92269a3ccd tweak h264_biweight
lorenm
parents: 3028
diff changeset
1789 h->chroma_offset[0][refn0][1] + h->chroma_offset[1][refn1][1]);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1790 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1791 }else{
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1792 int list = list1 ? 1 : 0;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1793 int refn = h->ref_cache[list][ scan8[n] ];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1794 Picture *ref= &h->ref_list[list][refn];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1795 mc_dir_part(h, ref, n, square, chroma_height, delta, list,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1796 dest_y, dest_cb, dest_cr, x_offset, y_offset,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1797 qpix_put, chroma_put);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1798
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1799 luma_weight_op(dest_y, h->mb_linesize, h->luma_log2_weight_denom,
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1800 h->luma_weight[list][refn], h->luma_offset[list][refn]);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1801 if(h->use_weight_chroma){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1802 chroma_weight_op(dest_cb, h->mb_uvlinesize, h->chroma_log2_weight_denom,
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1803 h->chroma_weight[list][refn][0], h->chroma_offset[list][refn][0]);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1804 chroma_weight_op(dest_cr, h->mb_uvlinesize, h->chroma_log2_weight_denom,
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1805 h->chroma_weight[list][refn][1], h->chroma_offset[list][refn][1]);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1806 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1807 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1808 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1809
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1810 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
1811 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1812 int x_offset, int y_offset,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1813 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1814 qpel_mc_func *qpix_avg, h264_chroma_mc_func chroma_avg,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1815 h264_weight_func *weight_op, h264_biweight_func *weight_avg,
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1816 int list0, int list1){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1817 if((h->use_weight==2 && list0 && list1
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1818 && (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
1819 || h->use_weight==1)
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1820 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
1821 x_offset, y_offset, qpix_put, chroma_put,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1822 weight_op[0], weight_op[3], weight_avg[0], weight_avg[3], list0, list1);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1823 else
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1824 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
1825 x_offset, y_offset, qpix_put, chroma_put, qpix_avg, chroma_avg, list0, list1);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1826 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1827
3215
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1828 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
1829 /* fetch pixels for estimated mv 4 macroblocks ahead
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1830 * optimized for 64byte cache lines */
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1831 MpegEncContext * const s = &h->s;
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1832 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
1833 if(refn >= 0){
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1834 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
1835 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
1836 uint8_t **src= h->ref_list[list][refn].data;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1837 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
1838 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
1839 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
1840 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
1841 }
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1842 }
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1843
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1844 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
1845 qpel_mc_func (*qpix_put)[16], h264_chroma_mc_func (*chroma_put),
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1846 qpel_mc_func (*qpix_avg)[16], h264_chroma_mc_func (*chroma_avg),
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1847 h264_weight_func *weight_op, h264_biweight_func *weight_avg){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1848 MpegEncContext * const s = &h->s;
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
1849 const int mb_xy= h->mb_xy;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1850 const int mb_type= s->current_picture.mb_type[mb_xy];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1851
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1852 assert(IS_INTER(mb_type));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1853
3215
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1854 prefetch_motion(h, 0);
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1855
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1856 if(IS_16X16(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1857 mc_part(h, 0, 1, 8, 0, dest_y, dest_cb, dest_cr, 0, 0,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1858 qpix_put[0], chroma_put[0], qpix_avg[0], chroma_avg[0],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1859 &weight_op[0], &weight_avg[0],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1860 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1861 }else if(IS_16X8(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1862 mc_part(h, 0, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 0,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1863 qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1864 &weight_op[1], &weight_avg[1],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1865 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1866 mc_part(h, 8, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 4,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1867 qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1868 &weight_op[1], &weight_avg[1],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1869 IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1870 }else if(IS_8X16(mb_type)){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1871 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
1872 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1873 &weight_op[2], &weight_avg[2],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1874 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1));
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1875 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
1876 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1877 &weight_op[2], &weight_avg[2],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1878 IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1879 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1880 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1881
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1882 assert(IS_8X8(mb_type));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1883
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1884 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1885 const int sub_mb_type= h->sub_mb_type[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1886 const int n= 4*i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1887 int x_offset= (i&1)<<2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1888 int y_offset= (i&2)<<1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1889
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1890 if(IS_SUB_8X8(sub_mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1891 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
1892 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1893 &weight_op[3], &weight_avg[3],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1894 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1895 }else if(IS_SUB_8X4(sub_mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1896 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
1897 qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1898 &weight_op[4], &weight_avg[4],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1899 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1900 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
1901 qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1902 &weight_op[4], &weight_avg[4],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1903 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1904 }else if(IS_SUB_4X8(sub_mb_type)){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1905 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
1906 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1907 &weight_op[5], &weight_avg[5],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1908 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
1909 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
1910 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1911 &weight_op[5], &weight_avg[5],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1912 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1913 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1914 int j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1915 assert(IS_SUB_4X4(sub_mb_type));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1916 for(j=0; j<4; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1917 int sub_x_offset= x_offset + 2*(j&1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1918 int sub_y_offset= y_offset + (j&2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1919 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
1920 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1921 &weight_op[6], &weight_avg[6],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1922 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1923 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1924 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1925 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1926 }
3215
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1927
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
1928 prefetch_motion(h, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1929 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1930
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6490
diff changeset
1931 static av_cold void decode_init_vlc(void){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1932 static int done = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1933
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1934 if (!done) {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1935 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1936 done = 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1937
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1938 init_vlc(&chroma_dc_coeff_token_vlc, CHROMA_DC_COEFF_TOKEN_VLC_BITS, 4*5,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1939 &chroma_dc_coeff_token_len [0], 1, 1,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2365
diff changeset
1940 &chroma_dc_coeff_token_bits[0], 1, 1, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1941
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1942 for(i=0; i<4; i++){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1943 init_vlc(&coeff_token_vlc[i], COEFF_TOKEN_VLC_BITS, 4*17,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1944 &coeff_token_len [i][0], 1, 1,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2365
diff changeset
1945 &coeff_token_bits[i][0], 1, 1, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1946 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1947
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1948 for(i=0; i<3; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1949 init_vlc(&chroma_dc_total_zeros_vlc[i], CHROMA_DC_TOTAL_ZEROS_VLC_BITS, 4,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1950 &chroma_dc_total_zeros_len [i][0], 1, 1,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2365
diff changeset
1951 &chroma_dc_total_zeros_bits[i][0], 1, 1, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1952 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1953 for(i=0; i<15; i++){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1954 init_vlc(&total_zeros_vlc[i], TOTAL_ZEROS_VLC_BITS, 16,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1955 &total_zeros_len [i][0], 1, 1,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2365
diff changeset
1956 &total_zeros_bits[i][0], 1, 1, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1957 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1958
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1959 for(i=0; i<6; i++){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1960 init_vlc(&run_vlc[i], RUN_VLC_BITS, 7,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1961 &run_len [i][0], 1, 1,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2365
diff changeset
1962 &run_bits[i][0], 1, 1, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1963 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1964 init_vlc(&run7_vlc, RUN7_VLC_BITS, 16,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1965 &run_len [6][0], 1, 1,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2365
diff changeset
1966 &run_bits[6][0], 1, 1, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1967 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1968 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1969
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1970 static void free_tables(H264Context *h){
5079
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
1971 int i;
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1972 H264Context *hx;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1973 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
1974 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
1975 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
1976 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
1977 av_freep(&h->mvd_table[1]);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1978 av_freep(&h->direct_table);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1979 av_freep(&h->non_zero_count);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1980 av_freep(&h->slice_table_base);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1981 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
1982
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1983 av_freep(&h->mb2b_xy);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1984 av_freep(&h->mb2b8_xy);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1985
5079
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
1986 for(i = 0; i < MAX_SPS_COUNT; i++)
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
1987 av_freep(h->sps_buffers + i);
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
1988
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
1989 for(i = 0; i < MAX_PPS_COUNT; i++)
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
1990 av_freep(h->pps_buffers + i);
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1991
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1992 for(i = 0; i < h->s.avctx->thread_count; i++) {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1993 hx = h->thread_context[i];
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1994 if(!hx) continue;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1995 av_freep(&hx->top_borders[1]);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1996 av_freep(&hx->top_borders[0]);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1997 av_freep(&hx->s.obmc_scratchpad);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1998 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1999 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2000
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2001 static void init_dequant8_coeff_table(H264Context *h){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2002 int i,q,x;
3174
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
2003 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
2004 h->dequant8_coeff[0] = h->dequant8_buffer[0];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2005 h->dequant8_coeff[1] = h->dequant8_buffer[1];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2006
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2007 for(i=0; i<2; i++ ){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2008 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
2009 h->dequant8_coeff[1] = h->dequant8_buffer[0];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2010 break;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2011 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2012
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2013 for(q=0; q<52; q++){
4277
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
2014 int shift = ff_div6[q];
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
2015 int idx = ff_rem6[q];
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2016 for(x=0; x<64; x++)
3174
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
2017 h->dequant8_coeff[i][q][transpose ? (x>>3)|((x&7)<<3) : x] =
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
2018 ((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
2019 h->pps.scaling_matrix8[i][x]) << shift;
2919
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 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2023
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2024 static void init_dequant4_coeff_table(H264Context *h){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2025 int i,j,q,x;
3005
6f6f307cffac fix asymmetric CQMs with pre-transposed DCT.
lorenm
parents: 3004
diff changeset
2026 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
2027 for(i=0; i<6; i++ ){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2028 h->dequant4_coeff[i] = h->dequant4_buffer[i];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2029 for(j=0; j<i; j++){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2030 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
2031 h->dequant4_coeff[i] = h->dequant4_buffer[j];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2032 break;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2033 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2034 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2035 if(j<i)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2036 continue;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2037
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2038 for(q=0; q<52; q++){
4277
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
2039 int shift = ff_div6[q] + 2;
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
2040 int idx = ff_rem6[q];
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2041 for(x=0; x<16; x++)
3005
6f6f307cffac fix asymmetric CQMs with pre-transposed DCT.
lorenm
parents: 3004
diff changeset
2042 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
2043 ((uint32_t)dequant4_coeff_init[idx][(x&1) + ((x>>2)&1)] *
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2044 h->pps.scaling_matrix4[i][x]) << shift;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2045 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2046 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2047 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2048
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2049 static void init_dequant_tables(H264Context *h){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2050 int i,x;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2051 init_dequant4_coeff_table(h);
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2052 if(h->pps.transform_8x8_mode)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2053 init_dequant8_coeff_table(h);
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2054 if(h->sps.transform_bypass){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2055 for(i=0; i<6; i++)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2056 for(x=0; x<16; x++)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2057 h->dequant4_coeff[i][0][x] = 1<<6;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2058 if(h->pps.transform_8x8_mode)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2059 for(i=0; i<2; i++)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2060 for(x=0; x<64; x++)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2061 h->dequant8_coeff[i][0][x] = 1<<6;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2062 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2063 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2064
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2065
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2066 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2067 * allocates tables.
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
2068 * needs width/height
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2069 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2070 static int alloc_tables(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2071 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
2072 const int big_mb_num= s->mb_stride * (s->mb_height+1);
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2073 int x,y;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2074
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2075 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
2076
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2077 CHECKED_ALLOCZ(h->non_zero_count , big_mb_num * 16 * sizeof(uint8_t))
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2078 CHECKED_ALLOCZ(h->slice_table_base , (big_mb_num+s->mb_stride) * sizeof(uint8_t))
2336
9cd834fc7325 segfault fix
michael
parents: 2317
diff changeset
2079 CHECKED_ALLOCZ(h->cbp_table, big_mb_num * sizeof(uint16_t))
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2080
6213
b26ccd688817 Indention, it seems i have forgotton to commit this.
michael
parents: 6203
diff changeset
2081 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
2082 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
2083 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
2084 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
2085
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2086 memset(h->slice_table_base, -1, (big_mb_num+s->mb_stride) * sizeof(uint8_t));
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2087 h->slice_table= h->slice_table_base + s->mb_stride*2 + 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2088
2641
c337f851d0f9 fix storage of motion vectors for frames with more than 4096 macroblocks.
lorenm
parents: 2640
diff changeset
2089 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
2090 CHECKED_ALLOCZ(h->mb2b8_xy , big_mb_num * sizeof(uint32_t));
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2091 for(y=0; y<s->mb_height; y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2092 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
2093 const int mb_xy= x + y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2094 const int b_xy = 4*x + 4*y*h->b_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2095 const int b8_xy= 2*x + 2*y*h->b8_stride;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2096
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2097 h->mb2b_xy [mb_xy]= b_xy;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2098 h->mb2b8_xy[mb_xy]= b8_xy;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2099 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2100 }
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2101
2417
991f39305057 10l (obmc_scratchpad not always initialize)
lorenm
parents: 2416
diff changeset
2102 s->obmc_scratchpad = NULL;
991f39305057 10l (obmc_scratchpad not always initialize)
lorenm
parents: 2416
diff changeset
2103
2920
1443b4d3f4ab 10l: cqm weren't initialized in svq3.
lorenm
parents: 2919
diff changeset
2104 if(!h->dequant4_coeff[0])
1443b4d3f4ab 10l: cqm weren't initialized in svq3.
lorenm
parents: 2919
diff changeset
2105 init_dequant_tables(h);
1443b4d3f4ab 10l: cqm weren't initialized in svq3.
lorenm
parents: 2919
diff changeset
2106
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2107 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2108 fail:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2109 free_tables(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2110 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2111 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2112
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2113 /**
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2114 * Mimic alloc_tables(), but for every context thread.
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2115 */
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2116 static void clone_tables(H264Context *dst, H264Context *src){
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2117 dst->intra4x4_pred_mode = src->intra4x4_pred_mode;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2118 dst->non_zero_count = src->non_zero_count;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2119 dst->slice_table = src->slice_table;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2120 dst->cbp_table = src->cbp_table;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2121 dst->mb2b_xy = src->mb2b_xy;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2122 dst->mb2b8_xy = src->mb2b8_xy;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2123 dst->chroma_pred_mode_table = src->chroma_pred_mode_table;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2124 dst->mvd_table[0] = src->mvd_table[0];
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2125 dst->mvd_table[1] = src->mvd_table[1];
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2126 dst->direct_table = src->direct_table;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2127
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2128 dst->s.obmc_scratchpad = NULL;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2129 ff_h264_pred_init(&dst->hpc, src->s.codec_id);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2130 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2131
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2132 /**
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2133 * Init context
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2134 * Allocate buffers which are not shared amongst multiple threads.
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2135 */
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2136 static int context_init(H264Context *h){
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2137 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
2138 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
2139
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2140 return 0;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2141 fail:
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2142 return -1; // free_tables will clean up for us
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2143 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2144
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6490
diff changeset
2145 static av_cold void common_init(H264Context *h){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2146 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2147
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2148 s->width = s->avctx->width;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2149 s->height = s->avctx->height;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2150 s->codec_id= s->avctx->codec->id;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2151
5638
4a26dc4ca11d Move H.264 intra prediction functions into their own context
kostya
parents: 5631
diff changeset
2152 ff_h264_pred_init(&h->hpc, s->codec_id);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2153
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2154 h->dequant_coeff_pps= -1;
1698
420cac032278 svq3 fix
michael
parents: 1636
diff changeset
2155 s->unrestricted_mv=1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2156 s->decode=1; //FIXME
2920
1443b4d3f4ab 10l: cqm weren't initialized in svq3.
lorenm
parents: 2919
diff changeset
2157
1443b4d3f4ab 10l: cqm weren't initialized in svq3.
lorenm
parents: 2919
diff changeset
2158 memset(h->pps.scaling_matrix4, 16, 6*16*sizeof(uint8_t));
1443b4d3f4ab 10l: cqm weren't initialized in svq3.
lorenm
parents: 2919
diff changeset
2159 memset(h->pps.scaling_matrix8, 16, 2*64*sizeof(uint8_t));
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2160 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2161
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6490
diff changeset
2162 static av_cold int decode_init(AVCodecContext *avctx){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2163 H264Context *h= avctx->priv_data;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2164 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2165
1892
5ac49e7a1b8f init cleanup
michael
parents: 1786
diff changeset
2166 MPV_decode_defaults(s);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2167
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2168 s->avctx = avctx;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2169 common_init(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2170
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2171 s->out_format = FMT_H264;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2172 s->workaround_bugs= avctx->workaround_bugs;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2173
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2174 // set defaults
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2175 // 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
2176 s->quarter_sample = 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2177 s->low_delay= 1;
7289
1595c063d68d SVQ3 uses the JPEG variant of YUV 4:2:0.
michael
parents: 7283
diff changeset
2178
1595c063d68d SVQ3 uses the JPEG variant of YUV 4:2:0.
michael
parents: 7283
diff changeset
2179 if(avctx->codec_id == CODEC_ID_SVQ3)
1595c063d68d SVQ3 uses the JPEG variant of YUV 4:2:0.
michael
parents: 7283
diff changeset
2180 avctx->pix_fmt= PIX_FMT_YUVJ420P;
1595c063d68d SVQ3 uses the JPEG variant of YUV 4:2:0.
michael
parents: 7283
diff changeset
2181 else
7290
michael
parents: 7289
diff changeset
2182 avctx->pix_fmt= PIX_FMT_YUV420P;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2183
4164
171e768324cd Remove the H264Context parameter from decode_init_vlc() as it is not being used.
takis
parents: 4118
diff changeset
2184 decode_init_vlc();
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2185
2547
c5781912ad8a improved detection of "AVC1" style H.264 patch by (M«©ns Rullg«©rd <mru inprovide com>)
michael
parents: 2538
diff changeset
2186 if(avctx->extradata_size > 0 && avctx->extradata &&
c5781912ad8a improved detection of "AVC1" style H.264 patch by (M«©ns Rullg«©rd <mru inprovide com>)
michael
parents: 2538
diff changeset
2187 *(char *)avctx->extradata == 1){
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2188 h->is_avc = 1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2189 h->got_avcC = 0;
2547
c5781912ad8a improved detection of "AVC1" style H.264 patch by (M«©ns Rullg«©rd <mru inprovide com>)
michael
parents: 2538
diff changeset
2190 } else {
c5781912ad8a improved detection of "AVC1" style H.264 patch by (M«©ns Rullg«©rd <mru inprovide com>)
michael
parents: 2538
diff changeset
2191 h->is_avc = 0;
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2192 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2193
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2194 h->thread_context[0] = h;
7424
69766900be2d Initialize outputed_poc to INT_MIN at decoder initialization.
heydowns
parents: 7423
diff changeset
2195 h->outputed_poc = INT_MIN;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2196 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2197 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2198
2935
b564bb15e63c check MPV_frame_start() return value
michael
parents: 2928
diff changeset
2199 static int frame_start(H264Context *h){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2200 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2201 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2202
2935
b564bb15e63c check MPV_frame_start() return value
michael
parents: 2928
diff changeset
2203 if(MPV_frame_start(s, s->avctx) < 0)
b564bb15e63c check MPV_frame_start() return value
michael
parents: 2928
diff changeset
2204 return -1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2205 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
2206 /*
e3d7a78e2df3 Fix Picture.key_frame setting to be compatible with frame and field contexts. Part of PAFF implementation.
andoma
parents: 5772
diff changeset
2207 * 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
2208 * This is incorrect for H.264; IDR markings must be used.
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
2209 * 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
2210 * 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
2211 */
e3d7a78e2df3 Fix Picture.key_frame setting to be compatible with frame and field contexts. Part of PAFF implementation.
andoma
parents: 5772
diff changeset
2212 s->current_picture_ptr->key_frame= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2213
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2214 assert(s->linesize && s->uvlinesize);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2215
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2216 for(i=0; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2217 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
2218 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
2219 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2220 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2221 h->block_offset[16+i]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2222 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
2223 h->block_offset[24+16+i]=
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2224 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
2225 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2226
2416
06b7d678b582 10l: scratchpad could be allocated before its size was known.
lorenm
parents: 2415
diff changeset
2227 /* 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
2228 * FIXME: redo bipred weight to not require extra buffer? */
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2229 for(i = 0; i < s->avctx->thread_count; i++)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2230 if(!h->thread_context[i]->s.obmc_scratchpad)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2231 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
2232
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2233 /* some macroblocks will be accessed before they're available */
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2234 if(FRAME_MBAFF || s->avctx->thread_count > 1)
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2235 memset(h->slice_table, -1, (s->mb_height*s->mb_stride-1) * sizeof(uint8_t));
2416
06b7d678b582 10l: scratchpad could be allocated before its size was known.
lorenm
parents: 2415
diff changeset
2236
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2237 // 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
2238
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
2239 // 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
2240 // 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
2241 // in the next MPV_frame_start().
cd231f79c52b Try to fix my latest 100l fate SVQ3 breakage.
michael
parents: 7317
diff changeset
2242 // 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
2243 // 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
2244 // mark frames as reference later "naturally".
cd231f79c52b Try to fix my latest 100l fate SVQ3 breakage.
michael
parents: 7317
diff changeset
2245 if(s->codec_id != CODEC_ID_SVQ3)
cd231f79c52b Try to fix my latest 100l fate SVQ3 breakage.
michael
parents: 7317
diff changeset
2246 s->current_picture_ptr->reference= 0;
7382
f9e70983fc35 Set field_poc (it was half uninitialized before) and use it
michael
parents: 7381
diff changeset
2247
f9e70983fc35 Set field_poc (it was half uninitialized before) and use it
michael
parents: 7381
diff changeset
2248 s->current_picture_ptr->field_poc[0]=
f9e70983fc35 Set field_poc (it was half uninitialized before) and use it
michael
parents: 7381
diff changeset
2249 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
2250 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
2251
2935
b564bb15e63c check MPV_frame_start() return value
michael
parents: 2928
diff changeset
2252 return 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2253 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2254
5106
ddb5abe164f3 h264: use 'simple' in border backup / xchg
benoit
parents: 5093
diff changeset
2255 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
2256 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
2257 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2258
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2259 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
2260 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
2261 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
2262
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
2263 // 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
2264 // and the line above the bottom macroblock
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2265 h->left_border[0]= h->top_borders[0][s->mb_x][15];
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2266 for(i=1; i<17; i++){
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2267 h->left_border[i]= src_y[15+i* linesize];
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2268 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2269
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2270 *(uint64_t*)(h->top_borders[0][s->mb_x]+0)= *(uint64_t*)(src_y + 16*linesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2271 *(uint64_t*)(h->top_borders[0][s->mb_x]+8)= *(uint64_t*)(src_y +8+16*linesize);
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2272
5434
4f2e3ef72b32 use ENABLE_GRAY
michael
parents: 5425
diff changeset
2273 if(simple || !ENABLE_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2274 h->left_border[17 ]= h->top_borders[0][s->mb_x][16+7];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2275 h->left_border[17+9]= h->top_borders[0][s->mb_x][24+7];
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2276 for(i=1; i<9; i++){
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2277 h->left_border[i+17 ]= src_cb[7+i*uvlinesize];
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2278 h->left_border[i+17+9]= src_cr[7+i*uvlinesize];
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2279 }
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2280 *(uint64_t*)(h->top_borders[0][s->mb_x]+16)= *(uint64_t*)(src_cb+8*uvlinesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2281 *(uint64_t*)(h->top_borders[0][s->mb_x]+24)= *(uint64_t*)(src_cr+8*uvlinesize);
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2282 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2283 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2284
5106
ddb5abe164f3 h264: use 'simple' in border backup / xchg
benoit
parents: 5093
diff changeset
2285 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
2286 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
2287 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
2288 uint64_t temp64;
5177
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2289 int deblock_left;
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2290 int deblock_top;
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2291 int mb_xy;
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2292
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2293 if(h->deblocking_filter == 2) {
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
2294 mb_xy = h->mb_xy;
5177
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2295 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
2296 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
2297 } else {
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2298 deblock_left = (s->mb_x > 0);
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2299 deblock_top = (s->mb_y > 0);
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
2300 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2301
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2302 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
2303 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
2304 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
2305
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2306 #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
2307 t= a;\
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2308 if(xchg)\
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2309 a= b;\
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2310 b= t;
2200
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2311
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2312 if(deblock_left){
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2313 for(i = !deblock_top; i<17; i++){
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2314 XCHG(h->left_border[i ], src_y [i* linesize], temp8, xchg);
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2315 }
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2316 }
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2317
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2318 if(deblock_top){
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2319 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+0), *(uint64_t*)(src_y +1), temp64, xchg);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2320 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+8), *(uint64_t*)(src_y +9), temp64, 1);
2803
26970df644f1 Add missing +1 in bounds check.
reimar
parents: 2793
diff changeset
2321 if(s->mb_x+1 < s->mb_width){
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2322 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x+1]), *(uint64_t*)(src_y +17), temp64, 1);
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2323 }
2200
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2324 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2325
5434
4f2e3ef72b32 use ENABLE_GRAY
michael
parents: 5425
diff changeset
2326 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
2327 if(deblock_left){
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2328 for(i = !deblock_top; i<9; i++){
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2329 XCHG(h->left_border[i+17 ], src_cb[i*uvlinesize], temp8, xchg);
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2330 XCHG(h->left_border[i+17+9], src_cr[i*uvlinesize], temp8, xchg);
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2331 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2332 }
2200
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2333 if(deblock_top){
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2334 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+16), *(uint64_t*)(src_cb+1), temp64, 1);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2335 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+24), *(uint64_t*)(src_cr+1), temp64, 1);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2336 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2337 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2338 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2339
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2340 static inline void backup_pair_border(H264Context *h, uint8_t *src_y, uint8_t *src_cb, uint8_t *src_cr, int linesize, int uvlinesize){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2341 MpegEncContext * const s = &h->s;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2342 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2343
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2344 src_y -= 2 * linesize;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2345 src_cb -= 2 * uvlinesize;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2346 src_cr -= 2 * uvlinesize;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2347
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
2348 // There are two lines saved, the line above the the top macroblock of a pair,
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2349 // and the line above the bottom macroblock
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2350 h->left_border[0]= h->top_borders[0][s->mb_x][15];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2351 h->left_border[1]= h->top_borders[1][s->mb_x][15];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2352 for(i=2; i<34; i++){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2353 h->left_border[i]= src_y[15+i* linesize];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2354 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2355
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2356 *(uint64_t*)(h->top_borders[0][s->mb_x]+0)= *(uint64_t*)(src_y + 32*linesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2357 *(uint64_t*)(h->top_borders[0][s->mb_x]+8)= *(uint64_t*)(src_y +8+32*linesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2358 *(uint64_t*)(h->top_borders[1][s->mb_x]+0)= *(uint64_t*)(src_y + 33*linesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2359 *(uint64_t*)(h->top_borders[1][s->mb_x]+8)= *(uint64_t*)(src_y +8+33*linesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2360
5434
4f2e3ef72b32 use ENABLE_GRAY
michael
parents: 5425
diff changeset
2361 if(!ENABLE_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2362 h->left_border[34 ]= h->top_borders[0][s->mb_x][16+7];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2363 h->left_border[34+ 1]= h->top_borders[1][s->mb_x][16+7];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2364 h->left_border[34+18 ]= h->top_borders[0][s->mb_x][24+7];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2365 h->left_border[34+18+1]= h->top_borders[1][s->mb_x][24+7];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2366 for(i=2; i<18; i++){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2367 h->left_border[i+34 ]= src_cb[7+i*uvlinesize];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2368 h->left_border[i+34+18]= src_cr[7+i*uvlinesize];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2369 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2370 *(uint64_t*)(h->top_borders[0][s->mb_x]+16)= *(uint64_t*)(src_cb+16*uvlinesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2371 *(uint64_t*)(h->top_borders[0][s->mb_x]+24)= *(uint64_t*)(src_cr+16*uvlinesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2372 *(uint64_t*)(h->top_borders[1][s->mb_x]+16)= *(uint64_t*)(src_cb+17*uvlinesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2373 *(uint64_t*)(h->top_borders[1][s->mb_x]+24)= *(uint64_t*)(src_cr+17*uvlinesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2374 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2375 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2376
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2377 static inline void xchg_pair_border(H264Context *h, uint8_t *src_y, uint8_t *src_cb, uint8_t *src_cr, int linesize, int uvlinesize, int xchg){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2378 MpegEncContext * const s = &h->s;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2379 int temp8, i;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2380 uint64_t temp64;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2381 int deblock_left = (s->mb_x > 0);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2382 int deblock_top = (s->mb_y > 1);
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2383
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
2384 tprintf(s->avctx, "xchg_pair_border: src_y:%p src_cb:%p src_cr:%p ls:%d uvls:%d\n", src_y, src_cb, src_cr, linesize, uvlinesize);
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2385
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2386 src_y -= 2 * linesize + 1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2387 src_cb -= 2 * uvlinesize + 1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2388 src_cr -= 2 * uvlinesize + 1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2389
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2390 #define XCHG(a,b,t,xchg)\
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2391 t= a;\
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2392 if(xchg)\
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2393 a= b;\
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2394 b= t;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2395
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2396 if(deblock_left){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2397 for(i = (!deblock_top)<<1; i<34; i++){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2398 XCHG(h->left_border[i ], src_y [i* linesize], temp8, xchg);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2399 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2400 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2401
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2402 if(deblock_top){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2403 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+0), *(uint64_t*)(src_y +1), temp64, xchg);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2404 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+8), *(uint64_t*)(src_y +9), temp64, 1);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2405 XCHG(*(uint64_t*)(h->top_borders[1][s->mb_x]+0), *(uint64_t*)(src_y +1 +linesize), temp64, xchg);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2406 XCHG(*(uint64_t*)(h->top_borders[1][s->mb_x]+8), *(uint64_t*)(src_y +9 +linesize), temp64, 1);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2407 if(s->mb_x+1 < s->mb_width){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2408 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x+1]), *(uint64_t*)(src_y +17), temp64, 1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2409 XCHG(*(uint64_t*)(h->top_borders[1][s->mb_x+1]), *(uint64_t*)(src_y +17 +linesize), temp64, 1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2410 }
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2411 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2412
5434
4f2e3ef72b32 use ENABLE_GRAY
michael
parents: 5425
diff changeset
2413 if(!ENABLE_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2414 if(deblock_left){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2415 for(i = (!deblock_top) << 1; i<18; i++){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2416 XCHG(h->left_border[i+34 ], src_cb[i*uvlinesize], temp8, xchg);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2417 XCHG(h->left_border[i+34+18], src_cr[i*uvlinesize], temp8, xchg);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2418 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2419 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2420 if(deblock_top){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2421 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+16), *(uint64_t*)(src_cb+1), temp64, 1);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2422 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+24), *(uint64_t*)(src_cr+1), temp64, 1);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2423 XCHG(*(uint64_t*)(h->top_borders[1][s->mb_x]+16), *(uint64_t*)(src_cb+1 +uvlinesize), temp64, 1);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2424 XCHG(*(uint64_t*)(h->top_borders[1][s->mb_x]+24), *(uint64_t*)(src_cr+1 +uvlinesize), temp64, 1);
2200
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2425 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2426 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2427 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2428
4908
777f250df232 Fix multiple "¡Æinline/static¡Ç is not at beginning of declaration" warnings.
diego
parents: 4896
diff changeset
2429 static av_always_inline void hl_decode_mb_internal(H264Context *h, int simple){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2430 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2431 const int mb_x= s->mb_x;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2432 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
2433 const int mb_xy= h->mb_xy;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2434 const int mb_type= s->current_picture.mb_type[mb_xy];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2435 uint8_t *dest_y, *dest_cb, *dest_cr;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2436 int linesize, uvlinesize /*dct_offset*/;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2437 int i;
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2438 int *block_offset = &h->block_offset[0];
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2439 const unsigned int bottom = mb_y & 1;
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2440 const int transform_bypass = (s->qscale == 0 && h->sps.transform_bypass), is_h264 = (simple || s->codec_id == CODEC_ID_H264);
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
2441 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
2442 void (*idct_dc_add)(uint8_t *dst, DCTELEM *block, int stride);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2443
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2444 dest_y = s->current_picture.data[0] + (mb_y * 16* s->linesize ) + mb_x * 16;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2445 dest_cb = s->current_picture.data[1] + (mb_y * 8 * s->uvlinesize) + mb_x * 8;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2446 dest_cr = s->current_picture.data[2] + (mb_y * 8 * s->uvlinesize) + mb_x * 8;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2447
4000
eeab02251056 more prefetches, 2% faster h264
lorenm
parents: 3993
diff changeset
2448 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
2449 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
2450
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2451 if (!simple && MB_FIELD) {
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2452 linesize = h->mb_linesize = s->linesize * 2;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2453 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
2454 block_offset = &h->block_offset[24];
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
2455 if(mb_y&1){ //FIXME move out of this function?
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2456 dest_y -= s->linesize*15;
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2457 dest_cb-= s->uvlinesize*7;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2458 dest_cr-= s->uvlinesize*7;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2459 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2460 if(FRAME_MBAFF) {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2461 int list;
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
2462 for(list=0; list<h->list_count; list++){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2463 if(!USES_LIST(mb_type, list))
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2464 continue;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2465 if(IS_16X16(mb_type)){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2466 int8_t *ref = &h->ref_cache[list][scan8[0]];
6203
c9433472cb95 Fix the following warnings:
andoma
parents: 6193
diff changeset
2467 fill_rectangle(ref, 4, 4, 8, (16+*ref)^(s->mb_y&1), 1);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2468 }else{
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2469 for(i=0; i<16; i+=4){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2470 //FIXME can refs be smaller than 8x8 when !direct_8x8_inference ?
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2471 int ref = h->ref_cache[list][scan8[i]];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2472 if(ref >= 0)
6203
c9433472cb95 Fix the following warnings:
andoma
parents: 6193
diff changeset
2473 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
2474 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2475 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2476 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2477 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2478 } else {
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2479 linesize = h->mb_linesize = s->linesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2480 uvlinesize = h->mb_uvlinesize = s->uvlinesize;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2481 // dct_offset = s->linesize * 16;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2482 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2483
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2484 if(transform_bypass){
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2485 idct_dc_add =
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2486 idct_add = IS_8x8DCT(mb_type) ? s->dsp.add_pixels8 : s->dsp.add_pixels4;
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2487 }else if(IS_8x8DCT(mb_type)){
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2488 idct_dc_add = s->dsp.h264_idct8_dc_add;
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2489 idct_add = s->dsp.h264_idct8_add;
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2490 }else{
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2491 idct_dc_add = s->dsp.h264_idct_dc_add;
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2492 idct_add = s->dsp.h264_idct_add;
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2493 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2494
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2495 if(!simple && FRAME_MBAFF && h->deblocking_filter && IS_INTRA(mb_type)
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2496 && (!bottom || !IS_INTRA(s->current_picture.mb_type[mb_xy-s->mb_stride]))){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2497 int mbt_y = mb_y&~1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2498 uint8_t *top_y = s->current_picture.data[0] + (mbt_y * 16* s->linesize ) + mb_x * 16;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2499 uint8_t *top_cb = s->current_picture.data[1] + (mbt_y * 8 * s->uvlinesize) + mb_x * 8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2500 uint8_t *top_cr = s->current_picture.data[2] + (mbt_y * 8 * s->uvlinesize) + mb_x * 8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2501 xchg_pair_border(h, top_y, top_cb, top_cr, s->linesize, s->uvlinesize, 1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2502 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2503
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2504 if (!simple && IS_INTRA_PCM(mb_type)) {
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2505 unsigned int x, y;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2506
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2507 // The pixels are stored in h->mb array in the same order as levels,
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2508 // copy them in output in the correct order.
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2509 for(i=0; i<16; i++) {
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2510 for (y=0; y<4; y++) {
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2511 for (x=0; x<4; x++) {
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2512 *(dest_y + block_offset[i] + y*linesize + x) = h->mb[i*16+y*4+x];
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2513 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2514 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2515 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2516 for(i=16; i<16+4; i++) {
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2517 for (y=0; y<4; y++) {
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2518 for (x=0; x<4; x++) {
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2519 *(dest_cb + block_offset[i] + y*uvlinesize + x) = h->mb[i*16+y*4+x];
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2520 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2521 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2522 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2523 for(i=20; i<20+4; i++) {
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2524 for (y=0; y<4; y++) {
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2525 for (x=0; x<4; x++) {
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2526 *(dest_cr + block_offset[i] + y*uvlinesize + x) = h->mb[i*16+y*4+x];
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2527 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2528 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2529 }
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2530 } else {
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2531 if(IS_INTRA(mb_type)){
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2532 if(h->deblocking_filter && (simple || !FRAME_MBAFF))
5106
ddb5abe164f3 h264: use 'simple' in border backup / xchg
benoit
parents: 5093
diff changeset
2533 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
2534
5434
4f2e3ef72b32 use ENABLE_GRAY
michael
parents: 5425
diff changeset
2535 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
2536 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
2537 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
2538 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2539
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2540 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
2541 if(simple || !s->encoding){
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2542 if(IS_8x8DCT(mb_type)){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2543 for(i=0; i<16; i+=4){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2544 uint8_t * const ptr= dest_y + block_offset[i];
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2545 const int dir= h->intra4x4_pred_mode_cache[ scan8[i] ];
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2546 const int nnz = h->non_zero_count_cache[ scan8[i] ];
5638
4a26dc4ca11d Move H.264 intra prediction functions into their own context
kostya
parents: 5631
diff changeset
2547 h->hpc.pred8x8l[ dir ](ptr, (h->topleft_samples_available<<i)&0x8000,
4546
211b40fb255b simplify in fill_caches
lorenm
parents: 4541
diff changeset
2548 (h->topright_samples_available<<i)&0x4000, linesize);
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2549 if(nnz){
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2550 if(nnz == 1 && h->mb[i*16])
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2551 idct_dc_add(ptr, h->mb + i*16, linesize);
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2552 else
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2553 idct_add(ptr, h->mb + i*16, linesize);
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2554 }
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2555 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2556 }else
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2557 for(i=0; i<16; i++){
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2558 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
2559 uint8_t *topright;
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2560 const int dir= h->intra4x4_pred_mode_cache[ scan8[i] ];
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2561 int nnz, tr;
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2562
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2563 if(dir == DIAG_DOWN_LEFT_PRED || dir == VERT_LEFT_PRED){
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2564 const int topright_avail= (h->topright_samples_available<<i)&0x8000;
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2565 assert(mb_y || linesize <= block_offset[i]);
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2566 if(!topright_avail){
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2567 tr= ptr[3 - linesize]*0x01010101;
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2568 topright= (uint8_t*) &tr;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2569 }else
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2570 topright= ptr + 4 - linesize;
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2571 }else
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2572 topright= NULL;
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2573
5638
4a26dc4ca11d Move H.264 intra prediction functions into their own context
kostya
parents: 5631
diff changeset
2574 h->hpc.pred4x4[ dir ](ptr, topright, linesize);
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2575 nnz = h->non_zero_count_cache[ scan8[i] ];
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2576 if(nnz){
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2577 if(is_h264){
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2578 if(nnz == 1 && h->mb[i*16])
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2579 idct_dc_add(ptr, h->mb + i*16, linesize);
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2580 else
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2581 idct_add(ptr, h->mb + i*16, linesize);
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2582 }else
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2583 svq3_add_idct_c(ptr, h->mb + i*16, linesize, s->qscale, 0);
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2584 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2585 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2586 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2587 }else{
5638
4a26dc4ca11d Move H.264 intra prediction functions into their own context
kostya
parents: 5631
diff changeset
2588 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
2589 if(is_h264){
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
2590 if(!transform_bypass)
5727
0591d5928fe8 Remove redundant test.
takis
parents: 5723
diff changeset
2591 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
2592 }else
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2593 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
2594 }
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2595 if(h->deblocking_filter && (simple || !FRAME_MBAFF))
5106
ddb5abe164f3 h264: use 'simple' in border backup / xchg
benoit
parents: 5093
diff changeset
2596 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
2597 }else if(is_h264){
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2598 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
2599 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
2600 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
2601 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
2602 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2603
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2604
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2605 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
2606 if(is_h264){
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2607 if(IS_INTRA16x16(mb_type)){
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2608 for(i=0; i<16; i++){
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2609 if(h->non_zero_count_cache[ scan8[i] ])
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2610 idct_add(dest_y + block_offset[i], h->mb + i*16, linesize);
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2611 else if(h->mb[i*16])
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2612 idct_dc_add(dest_y + block_offset[i], h->mb + i*16, linesize);
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2613 }
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2614 }else{
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2615 const int di = IS_8x8DCT(mb_type) ? 4 : 1;
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2616 for(i=0; i<16; i+=di){
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2617 int nnz = h->non_zero_count_cache[ scan8[i] ];
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2618 if(nnz){
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2619 if(nnz==1 && h->mb[i*16])
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2620 idct_dc_add(dest_y + block_offset[i], h->mb + i*16, linesize);
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2621 else
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2622 idct_add(dest_y + block_offset[i], h->mb + i*16, linesize);
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2623 }
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2624 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2625 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2626 }else{
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2627 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
2628 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
2629 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
2630 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
2631 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2632 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2633 }
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2634 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2635
5434
4f2e3ef72b32 use ENABLE_GRAY
michael
parents: 5425
diff changeset
2636 if(simple || !ENABLE_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2637 uint8_t *dest[2] = {dest_cb, dest_cr};
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2638 if(transform_bypass){
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2639 idct_add = idct_dc_add = s->dsp.add_pixels4;
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2640 }else{
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2641 idct_add = s->dsp.h264_idct_add;
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2642 idct_dc_add = s->dsp.h264_idct_dc_add;
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
2643 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
2644 chroma_dc_dequant_idct_c(h->mb + 16*16+4*16, h->chroma_qp[1], h->dequant4_coeff[IS_INTRA(mb_type) ? 2:5][h->chroma_qp[1]][0]);
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
2645 }
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2646 if(is_h264){
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2647 for(i=16; i<16+8; i++){
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2648 if(h->non_zero_count_cache[ scan8[i] ])
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2649 idct_add(dest[(i&4)>>2] + block_offset[i], h->mb + i*16, uvlinesize);
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2650 else if(h->mb[i*16])
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2651 idct_dc_add(dest[(i&4)>>2] + block_offset[i], h->mb + i*16, uvlinesize);
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2652 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2653 }else{
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2654 for(i=16; i<16+8; i++){
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2655 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
2656 uint8_t * const ptr= dest[(i&4)>>2] + block_offset[i];
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2657 svq3_add_idct_c(ptr, h->mb + i*16, uvlinesize, chroma_qp[s->qscale + 12] - 12, 2);
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2658 }
1250
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
2659 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2660 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2661 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2662 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2663 if(h->deblocking_filter) {
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2664 if (!simple && FRAME_MBAFF) {
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2665 //FIXME try deblocking one mb at a time?
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2666 // the reduction in load/storing mvs and such might outweigh the extra backup/xchg_border
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2667 const int mb_y = s->mb_y - 1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2668 uint8_t *pair_dest_y, *pair_dest_cb, *pair_dest_cr;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2669 const int mb_xy= mb_x + mb_y*s->mb_stride;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2670 const int mb_type_top = s->current_picture.mb_type[mb_xy];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2671 const int mb_type_bottom= s->current_picture.mb_type[mb_xy+s->mb_stride];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2672 if (!bottom) return;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2673 pair_dest_y = s->current_picture.data[0] + (mb_y * 16* s->linesize ) + mb_x * 16;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2674 pair_dest_cb = s->current_picture.data[1] + (mb_y * 8 * s->uvlinesize) + mb_x * 8;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2675 pair_dest_cr = s->current_picture.data[2] + (mb_y * 8 * s->uvlinesize) + mb_x * 8;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2676
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2677 if(IS_INTRA(mb_type_top | mb_type_bottom))
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2678 xchg_pair_border(h, pair_dest_y, pair_dest_cb, pair_dest_cr, s->linesize, s->uvlinesize, 0);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2679
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2680 backup_pair_border(h, pair_dest_y, pair_dest_cb, pair_dest_cr, s->linesize, s->uvlinesize);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2681 // deblock a pair
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2682 // top
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
2683 s->mb_y--; h->mb_xy -= s->mb_stride;
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
2684 tprintf(h->s.avctx, "call mbaff filter_mb mb_x:%d mb_y:%d pair_dest_y = %p, dest_y = %p\n", mb_x, mb_y, pair_dest_y, dest_y);
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
2685 fill_caches(h, mb_type_top, 1); //FIXME don't fill stuff which isn't used by filter_mb
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
2686 h->chroma_qp[0] = get_chroma_qp(h, 0, s->current_picture.qscale_table[mb_xy]);
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
2687 h->chroma_qp[1] = get_chroma_qp(h, 1, s->current_picture.qscale_table[mb_xy]);
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2688 filter_mb(h, mb_x, mb_y, pair_dest_y, pair_dest_cb, pair_dest_cr, linesize, uvlinesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2689 // bottom
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
2690 s->mb_y++; h->mb_xy += s->mb_stride;
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
2691 tprintf(h->s.avctx, "call mbaff filter_mb\n");
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
2692 fill_caches(h, mb_type_bottom, 1); //FIXME don't fill stuff which isn't used by filter_mb
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
2693 h->chroma_qp[0] = get_chroma_qp(h, 0, s->current_picture.qscale_table[mb_xy+s->mb_stride]);
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
2694 h->chroma_qp[1] = get_chroma_qp(h, 1, s->current_picture.qscale_table[mb_xy+s->mb_stride]);
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2695 filter_mb(h, mb_x, mb_y+1, dest_y, dest_cb, dest_cr, linesize, uvlinesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2696 } else {
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
2697 tprintf(h->s.avctx, "call filter_mb\n");
5106
ddb5abe164f3 h264: use 'simple' in border backup / xchg
benoit
parents: 5093
diff changeset
2698 backup_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, simple);
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
2699 fill_caches(h, mb_type, 1); //FIXME don't fill stuff which isn't used by filter_mb
7346
def19f6f7ce9 Setting chroma_qp to 0 for PCM blocks is really an interesting minor
michael
parents: 7345
diff changeset
2700 h->chroma_qp[0] = get_chroma_qp(h, 0, s->current_picture.qscale_table[mb_xy]);
def19f6f7ce9 Setting chroma_qp to 0 for PCM blocks is really an interesting minor
michael
parents: 7345
diff changeset
2701 h->chroma_qp[1] = get_chroma_qp(h, 1, s->current_picture.qscale_table[mb_xy]);
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
2702 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
2703 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2704 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2705 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2706
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2707 /**
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2708 * 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
2709 */
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2710 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
2711 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
2712 }
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2713
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2714 /**
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2715 * 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
2716 */
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2717 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
2718 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
2719 }
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2720
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2721 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
2722 MpegEncContext * const s = &h->s;
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
2723 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
2724 const int mb_type= s->current_picture.mb_type[mb_xy];
7185
82ab987bca8a Cosmetics: split a long line.
astrange
parents: 7184
diff changeset
2725 int is_complex = FRAME_MBAFF || MB_FIELD || IS_INTRA_PCM(mb_type) || s->codec_id != CODEC_ID_H264 ||
82ab987bca8a Cosmetics: split a long line.
astrange
parents: 7184
diff changeset
2726 (ENABLE_GRAY && (s->flags&CODEC_FLAG_GRAY)) || (ENABLE_H264_ENCODER && s->encoding) || ENABLE_SMALL;
7178
9a31b6a8ae52 Don't test for H264 encoding unless an encoder exists.
astrange
parents: 7040
diff changeset
2727
9a31b6a8ae52 Don't test for H264 encoding unless an encoder exists.
astrange
parents: 7040
diff changeset
2728 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
2729 return;
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2730
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2731 if (is_complex)
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2732 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
2733 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
2734 }
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
2735
5825
18859ffa5705 Fix chroma mv offsets for PAFF in a way that is compatible with MBAFF by
cehoyos
parents: 5822
diff changeset
2736 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
2737 int i;
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2738 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
2739 if (parity == PICT_BOTTOM_FIELD)
5778
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2740 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
2741 pic->reference = parity;
5778
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2742 pic->linesize[i] *= 2;
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2743 }
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2744 }
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2745
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2746 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
2747 int parity, int id_add){
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2748 int match = !!(src->reference & parity);
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2749
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2750 if (match) {
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2751 *dest = *src;
7398
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2752 if(parity != PICT_FRAME){
7399
michael
parents: 7398
diff changeset
2753 pic_as_field(dest, parity);
michael
parents: 7398
diff changeset
2754 dest->pic_id *= 2;
michael
parents: 7398
diff changeset
2755 dest->pic_id += id_add;
7398
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2756 }
5778
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
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2759 return match;
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2760 }
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2761
7398
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2762 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
2763 int i[2]={0};
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2764 int index=0;
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2765
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2766 while(i[0]<len || i[1]<len){
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2767 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
2768 i[0]++;
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2769 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
2770 i[1]++;
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2771 if(i[0] < len){
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2772 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
2773 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
2774 }
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2775 if(i[1] < len){
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2776 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
2777 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
2778 }
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2779 }
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2780
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2781 return index;
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
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2784 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
2785 int i, best_poc;
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2786 int out_i= 0;
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 for(;;){
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2789 best_poc= dir ? INT_MIN : INT_MAX;
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2790
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2791 for(i=0; i<len; i++){
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2792 const int poc= src[i]->poc;
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2793 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
2794 best_poc= poc;
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2795 sorted[out_i]= src[i];
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2796 }
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2797 }
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2798 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
2799 break;
7398
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2800 limit= sorted[out_i++]->poc - dir;
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2801 }
5778
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2802 return out_i;
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2803 }
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2804
c4984d69d373 Support functions and changes to default reference list creation for PAFF.
andoma
parents: 5774
diff changeset
2805 /**
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2806 * fills the default_ref_list.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2807 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2808 static int fill_default_ref_list(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2809 MpegEncContext * const s = &h->s;
7398
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2810 int i, len;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2811
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
2812 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
2813 Picture *sorted[32];
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2814 int cur_poc, list;
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2815 int lens[2];
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2816
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2817 if(FIELD_PICTURE)
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2818 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
2819 else
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2820 cur_poc= s->current_picture_ptr->poc;
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2821
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2822 for(list= 0; list<2; list++){
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2823 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
2824 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
2825 assert(len<=32);
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2826 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
2827 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
2828 assert(len<=32);
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2829
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2830 if(len < h->ref_count[list])
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2831 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
2832 lens[list]= len;
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2833 }
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2834
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2835 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
2836 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
2837 if(i == lens[0])
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2838 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
2839 }
5779
ad3168a70fbe Reindent fill_default_ref_list after changes for PAFF
andoma
parents: 5778
diff changeset
2840 }else{
7398
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2841 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
2842 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
2843 assert(len <= 32);
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2844 if(len < h->ref_count[0])
bcede7e06618 Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents: 7397
diff changeset
2845 memset(&h->default_ref_list[0][len], 0, sizeof(Picture)*(h->ref_count[0] - len));
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2846 }
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
2847 #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
2848 for (i=0; i<h->ref_count[0]; i++) {
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
2849 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
2850 }
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
2851 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
2852 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
2853 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
2854 }
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
2855 }
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
2856 #endif
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2857 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2858 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2859
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
2860 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
2861 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
2862
5780
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2863 /**
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2864 * 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
2865 * 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
2866 * 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
2867 * @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
2868 * @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
2869 * with pic_num
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2870 * @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
2871 * described by pic_num
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2872 */
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2873 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
2874 MpegEncContext * const s = &h->s;
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2875
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2876 *structure = s->picture_structure;
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2877 if(FIELD_PICTURE){
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2878 if (!(pic_num & 1))
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2879 /* opposite field */
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2880 *structure ^= PICT_FRAME;
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2881 pic_num >>= 1;
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2882 }
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2883
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2884 return pic_num;
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2885 }
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2886
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2887 static int decode_ref_pic_list_reordering(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2888 MpegEncContext * const s = &h->s;
5780
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2889 int list, index, pic_structure;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2890
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
2891 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
2892 print_long_term(h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2893
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
2894 for(list=0; list<h->list_count; list++){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2895 memcpy(h->ref_list[list], h->default_ref_list[list], sizeof(Picture)*h->ref_count[list]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2896
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2897 if(get_bits1(&s->gb)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2898 int pred= h->curr_pic_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2899
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2900 for(index=0; ; index++){
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
2901 unsigned int reordering_of_pic_nums_idc= get_ue_golomb(&s->gb);
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
2902 unsigned int pic_id;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2903 int i;
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
2904 Picture *ref = NULL;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2905
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2906 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
2907 break;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2908
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2909 if(index >= h->ref_count[list]){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
2910 av_log(h->s.avctx, AV_LOG_ERROR, "reference count overflow\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2911 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2912 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2913
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2914 if(reordering_of_pic_nums_idc<3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2915 if(reordering_of_pic_nums_idc<2){
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
2916 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
2917 int frame_num;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2918
5805
12b1717f80a3 fix incorrect check for abs_diff_pic_num overflow
andoma
parents: 5803
diff changeset
2919 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
2920 av_log(h->s.avctx, AV_LOG_ERROR, "abs_diff_pic_num overflow\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2921 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2922 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2923
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2924 if(reordering_of_pic_nums_idc == 0) pred-= abs_diff_pic_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2925 else pred+= abs_diff_pic_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2926 pred &= h->max_pic_num - 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2927
5780
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2928 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
2929
2683
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
2930 for(i= h->short_ref_count-1; i>=0; i--){
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
2931 ref = h->short_ref[i];
5780
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2932 assert(ref->reference);
2683
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
2933 assert(!ref->long_ref);
7402
3c04b2988f19 Remove mysterious ref->data[0] check.
michael
parents: 7401
diff changeset
2934 if(
7405
dfe1d1d104eb Revert r14404
michael
parents: 7404
diff changeset
2935 ref->frame_num == frame_num &&
dfe1d1d104eb Revert r14404
michael
parents: 7404
diff changeset
2936 (ref->reference & pic_structure)
7402
3c04b2988f19 Remove mysterious ref->data[0] check.
michael
parents: 7401
diff changeset
2937 )
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2938 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2939 }
2683
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
2940 if(i>=0)
5780
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2941 ref->pic_id= pred;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2942 }else{
5780
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2943 int long_idx;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2944 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
2945
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2946 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
2947
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2948 if(long_idx>31){
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
2949 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
2950 return -1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
2951 }
5780
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2952 ref = h->long_ref[long_idx];
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2953 assert(!(ref && !ref->reference));
7405
dfe1d1d104eb Revert r14404
michael
parents: 7404
diff changeset
2954 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
2955 ref->pic_id= pic_id;
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
2956 assert(ref->long_ref);
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
2957 i=0;
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
2958 }else{
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
2959 i=-1;
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
2960 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2961 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2962
2485
2844b8cf4e11 H.264 multiplce instance in reference list patch by (Loic <lll+ffmpeg m4x org )
michael
parents: 2484
diff changeset
2963 if (i < 0) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
2964 av_log(h->s.avctx, AV_LOG_ERROR, "reference picture missing during reorder\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2965 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
2966 } else {
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
2967 for(i=index; i+1<h->ref_count[list]; i++){
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
2968 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
2969 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
2970 }
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
2971 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
2972 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
2973 }
2683
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
2974 h->ref_list[list][index]= *ref;
5780
bd3d1e4f937a Support function and changes to reference picture reordering for PAFF.
andoma
parents: 5779
diff changeset
2975 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
2976 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
2977 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2978 }
2284
6d26e105f68f h.264 ref list reordering bugfix patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2272
diff changeset
2979 }else{
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
2980 av_log(h->s.avctx, AV_LOG_ERROR, "illegal reordering_of_pic_nums_idc\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2981 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2982 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2983 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2984 }
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
2985 }
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
2986 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
2987 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
2988 if(!h->ref_list[list][index].data[0]){
aff96834b8cd Print an error if a reference picture is missing.
michael
parents: 7402
diff changeset
2989 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
2990 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
2991 }
2680
1a6192e0b1f9 fill missing reference pictures with something to avoid assertion failure
michael
parents: 2675
diff changeset
2992 }
1a6192e0b1f9 fill missing reference pictures with something to avoid assertion failure
michael
parents: 2675
diff changeset
2993 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2994
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
2995 if(h->slice_type_nos==FF_B_TYPE && !h->direct_spatial_mv_pred)
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
2996 direct_dist_scale_factor(h);
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
2997 direct_ref_list_init(h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2998 return 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2999 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3000
3379
69901769c811 fill_mbaff_ref_list is missing a return statement, its return value
mru
parents: 3341
diff changeset
3001 static void fill_mbaff_ref_list(H264Context *h){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3002 int list, i, j;
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
3003 for(list=0; list<2; list++){ //FIXME try list_count
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3004 for(i=0; i<h->ref_count[list]; i++){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3005 Picture *frame = &h->ref_list[list][i];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3006 Picture *field = &h->ref_list[list][16+2*i];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3007 field[0] = *frame;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3008 for(j=0; j<3; j++)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3009 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
3010 field[0].reference = PICT_TOP_FIELD;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3011 field[1] = field[0];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3012 for(j=0; j<3; j++)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3013 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
3014 field[1].reference = PICT_BOTTOM_FIELD;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3015
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3016 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
3017 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
3018 for(j=0; j<2; j++){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3019 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
3020 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
3021 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3022 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3023 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3024 for(j=0; j<h->ref_count[1]; j++){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3025 for(i=0; i<h->ref_count[0]; i++)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3026 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
3027 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
3028 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
3029 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3030 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3031
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3032 static int pred_weight_table(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3033 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3034 int list, i;
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3035 int luma_def, chroma_def;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3036
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3037 h->use_weight= 0;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3038 h->use_weight_chroma= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3039 h->luma_log2_weight_denom= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3040 h->chroma_log2_weight_denom= get_ue_golomb(&s->gb);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3041 luma_def = 1<<h->luma_log2_weight_denom;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3042 chroma_def = 1<<h->chroma_log2_weight_denom;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3043
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3044 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3045 for(i=0; i<h->ref_count[list]; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3046 int luma_weight_flag, chroma_weight_flag;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3047
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3048 luma_weight_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3049 if(luma_weight_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3050 h->luma_weight[list][i]= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3051 h->luma_offset[list][i]= get_se_golomb(&s->gb);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3052 if( h->luma_weight[list][i] != luma_def
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3053 || h->luma_offset[list][i] != 0)
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3054 h->use_weight= 1;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3055 }else{
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3056 h->luma_weight[list][i]= luma_def;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3057 h->luma_offset[list][i]= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3058 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3059
7407
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
3060 if(CHROMA){
7408
michael
parents: 7407
diff changeset
3061 chroma_weight_flag= get_bits1(&s->gb);
michael
parents: 7407
diff changeset
3062 if(chroma_weight_flag){
michael
parents: 7407
diff changeset
3063 int j;
michael
parents: 7407
diff changeset
3064 for(j=0; j<2; j++){
michael
parents: 7407
diff changeset
3065 h->chroma_weight[list][i][j]= get_se_golomb(&s->gb);
michael
parents: 7407
diff changeset
3066 h->chroma_offset[list][i][j]= get_se_golomb(&s->gb);
michael
parents: 7407
diff changeset
3067 if( h->chroma_weight[list][i][j] != chroma_def
michael
parents: 7407
diff changeset
3068 || h->chroma_offset[list][i][j] != 0)
michael
parents: 7407
diff changeset
3069 h->use_weight_chroma= 1;
michael
parents: 7407
diff changeset
3070 }
michael
parents: 7407
diff changeset
3071 }else{
michael
parents: 7407
diff changeset
3072 int j;
michael
parents: 7407
diff changeset
3073 for(j=0; j<2; j++){
michael
parents: 7407
diff changeset
3074 h->chroma_weight[list][i][j]= chroma_def;
michael
parents: 7407
diff changeset
3075 h->chroma_offset[list][i][j]= 0;
michael
parents: 7407
diff changeset
3076 }
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3077 }
7407
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
3078 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3079 }
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
3080 if(h->slice_type_nos != FF_B_TYPE) break;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3081 }
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3082 h->use_weight= h->use_weight || h->use_weight_chroma;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3083 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3084 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3085
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3086 static void implicit_weight_table(H264Context *h){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3087 MpegEncContext * const s = &h->s;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3088 int ref0, ref1;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3089 int cur_poc = s->current_picture_ptr->poc;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3090
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3091 if( h->ref_count[0] == 1 && h->ref_count[1] == 1
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3092 && 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
3093 h->use_weight= 0;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3094 h->use_weight_chroma= 0;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3095 return;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3096 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3097
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3098 h->use_weight= 2;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3099 h->use_weight_chroma= 2;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3100 h->luma_log2_weight_denom= 5;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3101 h->chroma_log2_weight_denom= 5;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3102
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3103 for(ref0=0; ref0 < h->ref_count[0]; ref0++){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3104 int poc0 = h->ref_list[0][ref0].poc;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3105 for(ref1=0; ref1 < h->ref_count[1]; ref1++){
2519
b34f2cac6a71 10l in implicit_weight_table
lorenm
parents: 2509
diff changeset
3106 int poc1 = h->ref_list[1][ref1].poc;
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
3107 int td = av_clip(poc1 - poc0, -128, 127);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3108 if(td){
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
3109 int tb = av_clip(cur_poc - poc0, -128, 127);
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
3110 int tx = (16384 + (FFABS(td) >> 1)) / td;
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
3111 int dist_scale_factor = av_clip((tb*tx + 32) >> 6, -1024, 1023) >> 2;
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3112 if(dist_scale_factor < -64 || dist_scale_factor > 128)
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3113 h->implicit_weight[ref0][ref1] = 32;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3114 else
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3115 h->implicit_weight[ref0][ref1] = 64 - dist_scale_factor;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3116 }else
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3117 h->implicit_weight[ref0][ref1] = 32;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3118 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3119 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3120 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3121
5768
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3122 /**
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3123 * 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
3124 * argument allows unreferencing of individual fields or the whole frame.
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3125 * 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
3126 * display purposes, it is marked as such.
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3127 * @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
3128 * anded with the reference marking of pic
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3129 * @return non-zero if pic becomes entirely unreferenced (except possibly
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3130 * 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
3131 * reference
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3132 */
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3133 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
3134 int i;
5768
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3135 if (pic->reference &= refmask) {
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3136 return 0;
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3137 } else {
7313
michael
parents: 7312
diff changeset
3138 for(i = 0; h->delayed_pic[i]; i++)
michael
parents: 7312
diff changeset
3139 if(pic == h->delayed_pic[i]){
michael
parents: 7312
diff changeset
3140 pic->reference=DELAYED_PIC_REF;
michael
parents: 7312
diff changeset
3141 break;
michael
parents: 7312
diff changeset
3142 }
5768
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3143 return 1;
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3144 }
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3145 }
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3146
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3147 /**
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
3148 * instantaneous decoder refresh.
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3149 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3150 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
3151 int i;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3152
2484
a3188eb4266c correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents: 2471
diff changeset
3153 for(i=0; i<16; i++){
7394
4ac8769cbb01 Make remove_long() call unreference_pic() internally.
michael
parents: 7393
diff changeset
3154 remove_long(h, i, 0);
7385
617eababb511 Clear long_ref when a frame is no longer a long_ref.
michael
parents: 7384
diff changeset
3155 }
617eababb511 Clear long_ref when a frame is no longer a long_ref.
michael
parents: 7384
diff changeset
3156 assert(h->long_ref_count==0);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3157
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3158 for(i=0; i<h->short_ref_count; i++){
5768
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
3159 unreference_pic(h, h->short_ref[i], 0);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3160 h->short_ref[i]= NULL;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3161 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3162 h->short_ref_count=0;
7362
443fdc440854 Reset prev_frame_num for idr frames as required by the spec.
michael
parents: 7361
diff changeset
3163 h->prev_frame_num= 0;
7379
d3bd73e0f9a9 init_poc() vs. idr() cleanup
michael
parents: 7378
diff changeset
3164 h->prev_frame_num_offset= 0;
d3bd73e0f9a9 init_poc() vs. idr() cleanup
michael
parents: 7378
diff changeset
3165 h->prev_poc_msb=
d3bd73e0f9a9 init_poc() vs. idr() cleanup
michael
parents: 7378
diff changeset
3166 h->prev_poc_lsb= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3167 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3168
2640
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3169 /* forget old pics after a seek */
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3170 static void flush_dpb(AVCodecContext *avctx){
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3171 H264Context *h= avctx->priv_data;
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3172 int i;
7283
39e81fdd8d23 Move the size of the H264Context delayed_pic array into a #define.
astrange
parents: 7277
diff changeset
3173 for(i=0; i<MAX_DELAYED_PIC_COUNT; i++) {
3144
84406a59134c fix a memory leak on seeking.
lorenm
parents: 3138
diff changeset
3174 if(h->delayed_pic[i])
84406a59134c fix a memory leak on seeking.
lorenm
parents: 3138
diff changeset
3175 h->delayed_pic[i]->reference= 0;
2640
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3176 h->delayed_pic[i]= NULL;
3144
84406a59134c fix a memory leak on seeking.
lorenm
parents: 3138
diff changeset
3177 }
7310
033d10927d45 Remove delayed_output_pic, I do not understand what this variable was good for.
michael
parents: 7309
diff changeset
3178 h->outputed_poc= INT_MIN;
2640
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3179 idr(h);
2751
3247049dfc7a fix segfault if flush is called before the first frame
mru
parents: 2748
diff changeset
3180 if(h->s.current_picture_ptr)
3247049dfc7a fix segfault if flush is called before the first frame
mru
parents: 2748
diff changeset
3181 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
3182 h->s.first_field= 0;
5926
77403dc808cd Call mpegvideo flush routine on h264 flush. Needed in particular
heydowns
parents: 5904
diff changeset
3183 ff_mpeg_flush(avctx);
2640
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3184 }
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3185
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3186 /**
5770
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3187 * 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
3188 * @param frame_num frame number to search for
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3189 * @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
3190 * undefined if no picture found.
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3191 * @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
3192 * frame number is found
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3193 */
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3194 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
3195 MpegEncContext * const s = &h->s;
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3196 int i;
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3197
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3198 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
3199 Picture *pic= h->short_ref[i];
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3200 if(s->avctx->debug&FF_DEBUG_MMCO)
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3201 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
3202 if(pic->frame_num == frame_num) {
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3203 *idx = i;
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3204 return pic;
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3205 }
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3206 }
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3207 return NULL;
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3208 }
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3209
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3210 /**
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3211 * 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
3212 * 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
3213 * 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
3214 * @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
3215 */
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3216 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
3217 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
3218 h->short_ref[i]= NULL;
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3219 if (--h->short_ref_count)
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3220 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
3221 }
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3222
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3223 /**
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3224 *
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
3225 * @return the removed picture or NULL if an error occurs
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3226 */
7396
9f765ea6d6df Make remove_short() match remove_long() in that it calls unreference_pic().
michael
parents: 7395
diff changeset
3227 static Picture * remove_short(H264Context *h, int frame_num, int ref_mask){
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
3228 MpegEncContext * const s = &h->s;
5770
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3229 Picture *pic;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3230 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3231
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
3232 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
3233 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
3234
5770
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3235 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
3236 if (pic){
9f765ea6d6df Make remove_short() match remove_long() in that it calls unreference_pic().
michael
parents: 7395
diff changeset
3237 if(unreference_pic(h, pic, ref_mask))
5770
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3238 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
3239 }
5770
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3240
a1a947d67948 Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents: 5769
diff changeset
3241 return pic;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3242 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3243
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3244 /**
5774
e71de81878c4 Reorganize long reference management to minimize code duplication in upcoming PAFF implementation.
andoma
parents: 5773
diff changeset
3245 * 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
3246 * that list.
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
3247 * @return the removed picture or NULL if an error occurs
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3248 */
7394
4ac8769cbb01 Make remove_long() call unreference_pic() internally.
michael
parents: 7393
diff changeset
3249 static Picture * remove_long(H264Context *h, int i, int ref_mask){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3250 Picture *pic;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3251
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3252 pic= h->long_ref[i];
7393
309c59802769 Merge oddly duplicated remove_long/remove_long_at_index() function.
michael
parents: 7392
diff changeset
3253 if (pic){
7394
4ac8769cbb01 Make remove_long() call unreference_pic() internally.
michael
parents: 7393
diff changeset
3254 if(unreference_pic(h, pic, ref_mask)){
4ac8769cbb01 Make remove_long() call unreference_pic() internally.
michael
parents: 7393
diff changeset
3255 assert(h->long_ref[i]->long_ref == 1);
4ac8769cbb01 Make remove_long() call unreference_pic() internally.
michael
parents: 7393
diff changeset
3256 h->long_ref[i]->long_ref= 0;
4ac8769cbb01 Make remove_long() call unreference_pic() internally.
michael
parents: 7393
diff changeset
3257 h->long_ref[i]= NULL;
4ac8769cbb01 Make remove_long() call unreference_pic() internally.
michael
parents: 7393
diff changeset
3258 h->long_ref_count--;
4ac8769cbb01 Make remove_long() call unreference_pic() internally.
michael
parents: 7393
diff changeset
3259 }
7393
309c59802769 Merge oddly duplicated remove_long/remove_long_at_index() function.
michael
parents: 7392
diff changeset
3260 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3261
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3262 return pic;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3263 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3264
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3265 /**
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
3266 * 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
3267 */
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3268 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
3269 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
3270 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
3271 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
3272 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
3273 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
3274 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
3275 }
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
3276 }
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
3277 }
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3278
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3279 /**
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
3280 * 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
3281 */
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
3282 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
3283 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
3284 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
3285 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
3286 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
3287 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
3288 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
3289 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
3290 }
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
3291 }
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
3292 }
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
3293 }
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
3294
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
3295 /**
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3296 * Executes the reference picture marking (memory management control operations).
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3297 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3298 static int execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3299 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
3300 int i, j;
5785
74fa2587b8de Cosmetic renaming variable so that it makes more sense for forthcoming PAFF mmco patches.
andoma
parents: 5784
diff changeset
3301 int current_ref_assigned=0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3302 Picture *pic;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3303
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3304 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
3305 av_log(h->s.avctx, AV_LOG_DEBUG, "no mmco here\n");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3306
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3307 for(i=0; i<mmco_count; i++){
7383
c4e5f2158b20 Simplify strange obfuscated code in MMCO_LONG handling.
michael
parents: 7382
diff changeset
3308 int structure, frame_num;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3309 if(s->avctx->debug&FF_DEBUG_MMCO)
5756
db5a041fd77c Rename MMCO stuff to prepare for h264/PAFF implementation.
andoma
parents: 5727
diff changeset
3310 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
3311
7395
08e81ea44a38 Removing yet another weird field pic special case,
michael
parents: 7394
diff changeset
3312 if( mmco[i].opcode == MMCO_SHORT2UNUSED
08e81ea44a38 Removing yet another weird field pic special case,
michael
parents: 7394
diff changeset
3313 || mmco[i].opcode == MMCO_SHORT2LONG){
08e81ea44a38 Removing yet another weird field pic special case,
michael
parents: 7394
diff changeset
3314 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
3315 pic = find_short(h, frame_num, &j);
08e81ea44a38 Removing yet another weird field pic special case,
michael
parents: 7394
diff changeset
3316 if(!pic){
7397
535664ced6f0 Do not scare the user with error messages when everything is ok.
michael
parents: 7396
diff changeset
3317 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
3318 || 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
3319 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
3320 continue;
08e81ea44a38 Removing yet another weird field pic special case,
michael
parents: 7394
diff changeset
3321 }
08e81ea44a38 Removing yet another weird field pic special case,
michael
parents: 7394
diff changeset
3322 }
08e81ea44a38 Removing yet another weird field pic special case,
michael
parents: 7394
diff changeset
3323
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3324 switch(mmco[i].opcode){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3325 case MMCO_SHORT2UNUSED:
5786
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3326 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
3327 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
3328 remove_short(h, frame_num, structure ^ PICT_FRAME);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3329 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3330 case MMCO_SHORT2LONG:
7395
08e81ea44a38 Removing yet another weird field pic special case,
michael
parents: 7394
diff changeset
3331 if (h->long_ref[mmco[i].long_arg] != pic)
08e81ea44a38 Removing yet another weird field pic special case,
michael
parents: 7394
diff changeset
3332 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
3333
7396
9f765ea6d6df Make remove_short() match remove_long() in that it calls unreference_pic().
michael
parents: 7395
diff changeset
3334 remove_short_at_index(h, j);
9f765ea6d6df Make remove_short() match remove_long() in that it calls unreference_pic().
michael
parents: 7395
diff changeset
3335 h->long_ref[ mmco[i].long_arg ]= pic;
5787
b92c03847d60 Re-indent after PAFF MMCO implementation patch.
cehoyos
parents: 5786
diff changeset
3336 if (h->long_ref[ mmco[i].long_arg ]){
b92c03847d60 Re-indent after PAFF MMCO implementation patch.
cehoyos
parents: 5786
diff changeset
3337 h->long_ref[ mmco[i].long_arg ]->long_ref=1;
b92c03847d60 Re-indent after PAFF MMCO implementation patch.
cehoyos
parents: 5786
diff changeset
3338 h->long_ref_count++;
b92c03847d60 Re-indent after PAFF MMCO implementation patch.
cehoyos
parents: 5786
diff changeset
3339 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3340 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3341 case MMCO_LONG2UNUSED:
5786
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3342 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
3343 pic = h->long_ref[j];
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3344 if (pic) {
7394
4ac8769cbb01 Make remove_long() call unreference_pic() internally.
michael
parents: 7393
diff changeset
3345 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
3346 } 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
3347 av_log(h->s.avctx, AV_LOG_DEBUG, "mmco: unref long failure\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3348 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3349 case MMCO_LONG:
7383
c4e5f2158b20 Simplify strange obfuscated code in MMCO_LONG handling.
michael
parents: 7382
diff changeset
3350 // 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
3351 /* 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
3352 * at a different long term index.
7420
30e8c4bf08a4 Fix reference to spec to be more specific and correct.
heydowns
parents: 7417
diff changeset
3353 * 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
3354 * 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
3355 * and mark this field valid.
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3356 */
7383
c4e5f2158b20 Simplify strange obfuscated code in MMCO_LONG handling.
michael
parents: 7382
diff changeset
3357
c4e5f2158b20 Simplify strange obfuscated code in MMCO_LONG handling.
michael
parents: 7382
diff changeset
3358 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
3359 remove_long(h, mmco[i].long_arg, 0);
5787
b92c03847d60 Re-indent after PAFF MMCO implementation patch.
cehoyos
parents: 5786
diff changeset
3360
b92c03847d60 Re-indent after PAFF MMCO implementation patch.
cehoyos
parents: 5786
diff changeset
3361 h->long_ref[ mmco[i].long_arg ]= s->current_picture_ptr;
b92c03847d60 Re-indent after PAFF MMCO implementation patch.
cehoyos
parents: 5786
diff changeset
3362 h->long_ref[ mmco[i].long_arg ]->long_ref=1;
b92c03847d60 Re-indent after PAFF MMCO implementation patch.
cehoyos
parents: 5786
diff changeset
3363 h->long_ref_count++;
5786
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3364 }
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3365
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3366 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
3367 current_ref_assigned=1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3368 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3369 case MMCO_SET_MAX_LONG:
5756
db5a041fd77c Rename MMCO stuff to prepare for h264/PAFF implementation.
andoma
parents: 5727
diff changeset
3370 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
3371 // 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
3372 for(j = mmco[i].long_arg; j<16; j++){
7394
4ac8769cbb01 Make remove_long() call unreference_pic() internally.
michael
parents: 7393
diff changeset
3373 remove_long(h, j, 0);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3374 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3375 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3376 case MMCO_RESET:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3377 while(h->short_ref_count){
7396
9f765ea6d6df Make remove_short() match remove_long() in that it calls unreference_pic().
michael
parents: 7395
diff changeset
3378 remove_short(h, h->short_ref[0]->frame_num, 0);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3379 }
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
3380 for(j = 0; j < 16; j++) {
7394
4ac8769cbb01 Make remove_long() call unreference_pic() internally.
michael
parents: 7393
diff changeset
3381 remove_long(h, j, 0);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3382 }
7350
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3383 s->current_picture_ptr->poc=
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3384 s->current_picture_ptr->field_poc[0]=
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3385 s->current_picture_ptr->field_poc[1]=
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3386 h->poc_lsb=
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3387 h->poc_msb=
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3388 h->frame_num=
7349
ee0fa5935e1a Reset frame_num for MMCO 5.
michael
parents: 7348
diff changeset
3389 s->current_picture_ptr->frame_num= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3390 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3391 default: assert(0);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3392 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3393 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3394
7389
8ef2e8f077ff Remove another of these obfuscated special cases for field pictures
michael
parents: 7388
diff changeset
3395 if (!current_ref_assigned) {
5786
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3396 /* 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
3397 * 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
3398 * 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
3399 * 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
3400 * 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
3401 */
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3402 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
3403 /* 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
3404 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
3405 } 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
3406 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
3407 "assignment for second field "
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3408 "in complementary field pair "
8121e27dd9cc Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents: 5785
diff changeset
3409 "(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
3410 } else {
7396
9f765ea6d6df Make remove_short() match remove_long() in that it calls unreference_pic().
michael
parents: 7395
diff changeset
3411 pic= remove_short(h, s->current_picture_ptr->frame_num, 0);
7391
michael
parents: 7390
diff changeset
3412 if(pic){
michael
parents: 7390
diff changeset
3413 av_log(h->s.avctx, AV_LOG_ERROR, "illegal short term buffer state detected\n");
michael
parents: 7390
diff changeset
3414 }
michael
parents: 7390
diff changeset
3415
michael
parents: 7390
diff changeset
3416 if(h->short_ref_count)
michael
parents: 7390
diff changeset
3417 memmove(&h->short_ref[1], &h->short_ref[0], h->short_ref_count*sizeof(Picture*));
michael
parents: 7390
diff changeset
3418
michael
parents: 7390
diff changeset
3419 h->short_ref[0]= s->current_picture_ptr;
michael
parents: 7390
diff changeset
3420 h->short_ref_count++;
michael
parents: 7390
diff changeset
3421 s->current_picture_ptr->reference |= s->picture_structure;
michael
parents: 7390
diff changeset
3422 }
7390
7abedf6425d8 10000l, forgotton }
michael
parents: 7389
diff changeset
3423 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3424
6019
42de24a34fd2 Fix brain-dead parts of r11216, specifically:
heydowns
parents: 6018
diff changeset
3425 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
3426
9d1654835629 Ensure that our total reference frame count does not exceed the SPS
heydowns
parents: 6017
diff changeset
3427 /* 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
3428 * 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
3429 * short_ref and long_ref buffers.
9d1654835629 Ensure that our total reference frame count does not exceed the SPS
heydowns
parents: 6017
diff changeset
3430 */
9d1654835629 Ensure that our total reference frame count does not exceed the SPS
heydowns
parents: 6017
diff changeset
3431 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
3432 "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
3433 "corrupt input), discarding one\n");
9d1654835629 Ensure that our total reference frame count does not exceed the SPS
heydowns
parents: 6017
diff changeset
3434
7350
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3435 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
3436 for (i = 0; i < 16; ++i)
9d1654835629 Ensure that our total reference frame count does not exceed the SPS
heydowns
parents: 6017
diff changeset
3437 if (h->long_ref[i])
9d1654835629 Ensure that our total reference frame count does not exceed the SPS
heydowns
parents: 6017
diff changeset
3438 break;
9d1654835629 Ensure that our total reference frame count does not exceed the SPS
heydowns
parents: 6017
diff changeset
3439
9d1654835629 Ensure that our total reference frame count does not exceed the SPS
heydowns
parents: 6017
diff changeset
3440 assert(i < 16);
7394
4ac8769cbb01 Make remove_long() call unreference_pic() internally.
michael
parents: 7393
diff changeset
3441 remove_long(h, i, 0);
6018
9d1654835629 Ensure that our total reference frame count does not exceed the SPS
heydowns
parents: 6017
diff changeset
3442 } else {
6019
42de24a34fd2 Fix brain-dead parts of r11216, specifically:
heydowns
parents: 6018
diff changeset
3443 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
3444 remove_short(h, pic->frame_num, 0);
7394
4ac8769cbb01 Make remove_long() call unreference_pic() internally.
michael
parents: 7393
diff changeset
3445 }
6018
9d1654835629 Ensure that our total reference frame count does not exceed the SPS
heydowns
parents: 6017
diff changeset
3446 }
9d1654835629 Ensure that our total reference frame count does not exceed the SPS
heydowns
parents: 6017
diff changeset
3447
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
3448 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
3449 print_long_term(h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3450 return 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3451 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3452
5172
60a4f209838b Decouple bit context from h264 context in decode_ref_pic_marking()
gpoirier
parents: 5170
diff changeset
3453 static int decode_ref_pic_marking(H264Context *h, GetBitContext *gb){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3454 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3455 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3456
7384
8b9a02536781 Make sure mmco index is 0 (instead of uninitialized) in all error returns.
michael
parents: 7383
diff changeset
3457 h->mmco_index= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3458 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
3459 s->broken_link= get_bits1(gb) -1;
7388
d2d876733e9e Simplify mmco setup code used in IDR pictures.
michael
parents: 7387
diff changeset
3460 if(get_bits1(gb)){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3461 h->mmco[0].opcode= MMCO_LONG;
7388
d2d876733e9e Simplify mmco setup code used in IDR pictures.
michael
parents: 7387
diff changeset
3462 h->mmco[0].long_arg= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3463 h->mmco_index= 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3464 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3465 }else{
5172
60a4f209838b Decouple bit context from h264 context in decode_ref_pic_marking()
gpoirier
parents: 5170
diff changeset
3466 if(get_bits1(gb)){ // adaptive_ref_pic_marking_mode_flag
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3467 for(i= 0; i<MAX_MMCO_COUNT; i++) {
5172
60a4f209838b Decouple bit context from h264 context in decode_ref_pic_marking()
gpoirier
parents: 5170
diff changeset
3468 MMCOOpcode opcode= get_ue_golomb(gb);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3469
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3470 h->mmco[i].opcode= opcode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3471 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
3472 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
3473 /* 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
3474 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
3475 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3476 }*/
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3477 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3478 if(opcode==MMCO_SHORT2LONG || opcode==MMCO_LONG2UNUSED || opcode==MMCO_LONG || opcode==MMCO_SET_MAX_LONG){
5771
5290a3850c03 Rename variable to make sense in both field and frame contexts (support of PAFF implementation).
andoma
parents: 5770
diff changeset
3479 unsigned int long_arg= get_ue_golomb(gb);
5784
af2dab646def Augment mmcodecoding process to work properly with fields. Part of PAFF implementation.
andoma
parents: 5783
diff changeset
3480 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
3481 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
3482 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3483 }
5771
5290a3850c03 Rename variable to make sense in both field and frame contexts (support of PAFF implementation).
andoma
parents: 5770
diff changeset
3484 h->mmco[i].long_arg= long_arg;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3485 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3486
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3487 if(opcode > (unsigned)MMCO_LONG){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3488 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
3489 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3490 }
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
3491 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
3492 break;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3493 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3494 h->mmco_index= i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3495 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3496 assert(h->long_ref_count + h->short_ref_count <= h->sps.ref_frame_count);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3497
5987
bc6d765d1d53 Verify long_ref_count!=0. Fix issue 281.
takis
parents: 5984
diff changeset
3498 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
3499 !(FIELD_PICTURE && !s->first_field && s->current_picture_ptr->reference)) {
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3500 h->mmco[0].opcode= MMCO_SHORT2UNUSED;
5756
db5a041fd77c Rename MMCO stuff to prepare for h264/PAFF implementation.
andoma
parents: 5727
diff changeset
3501 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
3502 h->mmco_index= 1;
5784
af2dab646def Augment mmcodecoding process to work properly with fields. Part of PAFF implementation.
andoma
parents: 5783
diff changeset
3503 if (FIELD_PICTURE) {
af2dab646def Augment mmcodecoding process to work properly with fields. Part of PAFF implementation.
andoma
parents: 5783
diff changeset
3504 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
3505 h->mmco[1].opcode= MMCO_SHORT2UNUSED;
af2dab646def Augment mmcodecoding process to work properly with fields. Part of PAFF implementation.
andoma
parents: 5783
diff changeset
3506 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
3507 h->mmco_index= 2;
af2dab646def Augment mmcodecoding process to work properly with fields. Part of PAFF implementation.
andoma
parents: 5783
diff changeset
3508 }
7387
dee39446a364 Remove redundant h->mmco_index= 0.
michael
parents: 7386
diff changeset
3509 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3510 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3511 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3512
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3513 return 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3514 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3515
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3516 static int init_poc(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3517 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3518 const int max_frame_num= 1<<h->sps.log2_max_frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3519 int field_poc[2];
7382
f9e70983fc35 Set field_poc (it was half uninitialized before) and use it
michael
parents: 7381
diff changeset
3520 Picture *cur = s->current_picture_ptr;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3521
7381
16a60b2f7a7d Minor simplification of code in init_poc().
michael
parents: 7380
diff changeset
3522 h->frame_num_offset= h->prev_frame_num_offset;
7380
9faeb82ba80b cosmetics (indent and 2 empty lines)
michael
parents: 7379
diff changeset
3523 if(h->frame_num < h->prev_frame_num)
7381
16a60b2f7a7d Minor simplification of code in init_poc().
michael
parents: 7380
diff changeset
3524 h->frame_num_offset += max_frame_num;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3525
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3526 if(h->sps.poc_type==0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3527 const int max_poc_lsb= 1<<h->sps.log2_max_poc_lsb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3528
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3529 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
3530 h->poc_msb = h->prev_poc_msb + max_poc_lsb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3531 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
3532 h->poc_msb = h->prev_poc_msb - max_poc_lsb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3533 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3534 h->poc_msb = h->prev_poc_msb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3535 //printf("poc: %d %d\n", h->poc_msb, h->poc_lsb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3536 field_poc[0] =
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3537 field_poc[1] = h->poc_msb + h->poc_lsb;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3538 if(s->picture_structure == PICT_FRAME)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3539 field_poc[1] += h->delta_poc_bottom;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3540 }else if(h->sps.poc_type==1){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3541 int abs_frame_num, expected_delta_per_poc_cycle, expectedpoc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3542 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3543
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3544 if(h->sps.poc_cycle_length != 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3545 abs_frame_num = h->frame_num_offset + h->frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3546 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3547 abs_frame_num = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3548
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3549 if(h->nal_ref_idc==0 && abs_frame_num > 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3550 abs_frame_num--;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3551
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3552 expected_delta_per_poc_cycle = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3553 for(i=0; i < h->sps.poc_cycle_length; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3554 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
3555
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3556 if(abs_frame_num > 0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3557 int poc_cycle_cnt = (abs_frame_num - 1) / h->sps.poc_cycle_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3558 int frame_num_in_poc_cycle = (abs_frame_num - 1) % h->sps.poc_cycle_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3559
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3560 expectedpoc = poc_cycle_cnt * expected_delta_per_poc_cycle;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3561 for(i = 0; i <= frame_num_in_poc_cycle; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3562 expectedpoc = expectedpoc + h->sps.offset_for_ref_frame[ i ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3563 } else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3564 expectedpoc = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3565
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3566 if(h->nal_ref_idc == 0)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3567 expectedpoc = expectedpoc + h->sps.offset_for_non_ref_pic;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3568
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3569 field_poc[0] = expectedpoc + h->delta_poc[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3570 field_poc[1] = field_poc[0] + h->sps.offset_for_top_to_bottom_field;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3571
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3572 if(s->picture_structure == PICT_FRAME)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3573 field_poc[1] += h->delta_poc[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3574 }else{
7381
16a60b2f7a7d Minor simplification of code in init_poc().
michael
parents: 7380
diff changeset
3575 int poc= 2*(h->frame_num_offset + h->frame_num);
16a60b2f7a7d Minor simplification of code in init_poc().
michael
parents: 7380
diff changeset
3576
16a60b2f7a7d Minor simplification of code in init_poc().
michael
parents: 7380
diff changeset
3577 if(!h->nal_ref_idc)
16a60b2f7a7d Minor simplification of code in init_poc().
michael
parents: 7380
diff changeset
3578 poc--;
7380
9faeb82ba80b cosmetics (indent and 2 empty lines)
michael
parents: 7379
diff changeset
3579
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3580 field_poc[0]= poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3581 field_poc[1]= poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3582 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3583
7382
f9e70983fc35 Set field_poc (it was half uninitialized before) and use it
michael
parents: 7381
diff changeset
3584 if(s->picture_structure != PICT_BOTTOM_FIELD)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3585 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
3586 if(s->picture_structure != PICT_TOP_FIELD)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3587 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
3588 cur->poc= FFMIN(cur->field_poc[0], cur->field_poc[1]);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3589
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3590 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3591 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3592
5160
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3593
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3594 /**
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3595 * initialize scan tables
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3596 */
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3597 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
3598 MpegEncContext * const s = &h->s;
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3599 int i;
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3600 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
3601 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
3602 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
3603 }else{
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3604 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
3605 #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
3606 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
3607 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
3608 #undef T
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3609 }
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3610 }
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3611 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
3612 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
3613 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
3614 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
3615 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
3616 }else{
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3617 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
3618 #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
3619 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
3620 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
3621 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
3622 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
3623 #undef T
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3624 }
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3625 }
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3626 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
3627 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
3628 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
3629 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
3630 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
3631 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
3632 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
3633 }else{
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3634 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
3635 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
3636 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
3637 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
3638 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
3639 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
3640 }
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3641 }
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3643 /**
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3644 * Replicates H264 "master" context to thread contexts.
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3645 */
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3646 static void clone_slice(H264Context *dst, H264Context *src)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3647 {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3648 memcpy(dst->block_offset, src->block_offset, sizeof(dst->block_offset));
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3649 dst->s.current_picture_ptr = src->s.current_picture_ptr;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3650 dst->s.current_picture = src->s.current_picture;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3651 dst->s.linesize = src->s.linesize;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3652 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
3653 dst->s.first_field = src->s.first_field;
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3654
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3655 dst->prev_poc_msb = src->prev_poc_msb;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3656 dst->prev_poc_lsb = src->prev_poc_lsb;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3657 dst->prev_frame_num_offset = src->prev_frame_num_offset;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3658 dst->prev_frame_num = src->prev_frame_num;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3659 dst->short_ref_count = src->short_ref_count;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3660
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3661 memcpy(dst->short_ref, src->short_ref, sizeof(dst->short_ref));
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3662 memcpy(dst->long_ref, src->long_ref, sizeof(dst->long_ref));
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3663 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
3664 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
3665
070a376d496b fix image corruption when with multi-threaded decoding.
gpoirier
parents: 5647
diff changeset
3666 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
3667 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
3668 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3669
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3670 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3671 * decodes a slice header.
6918
c1b722b79649 cosmetics: spelling typo fixes
diego
parents: 6903
diff changeset
3672 * 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
3673 *
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3674 * @param h h264context
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3675 * @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
3676 *
6524
01647ac078a7 typo: occured --> occurred
diego
parents: 6517
diff changeset
3677 * @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
3678 */
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3679 static int decode_slice_header(H264Context *h, H264Context *h0){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3680 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
3681 MpegEncContext * const s0 = &h0->s;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3682 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
3683 unsigned int pps_id;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3684 int num_ref_idx_active_override_flag;
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6429
diff changeset
3685 static const uint8_t slice_type_map[5]= {FF_P_TYPE, FF_B_TYPE, FF_I_TYPE, FF_SP_TYPE, FF_SI_TYPE};
7332
b1003e468c3d Fix used references indexes in the loop filter.
michael
parents: 7327
diff changeset
3686 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
3687 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
3688 int last_pic_structure;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3689
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
3690 s->dropable= h->nal_ref_idc == 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3691
5984
ba13cc3e38bb Initialize function pointers used by error resilience code before any
heydowns
parents: 5963
diff changeset
3692 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
3693 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
3694 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
3695 }else{
ba13cc3e38bb Initialize function pointers used by error resilience code before any
heydowns
parents: 5963
diff changeset
3696 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
3697 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
3698 }
ba13cc3e38bb Initialize function pointers used by error resilience code before any
heydowns
parents: 5963
diff changeset
3699
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3700 first_mb_in_slice= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3701
4616
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
3702 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
3703 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
3704 if (!s0->first_field)
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
3705 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
3706 }
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
3707
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3708 slice_type= get_ue_golomb(&s->gb);
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3709 if(slice_type > 9){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3710 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
3711 return -1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3712 }
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3713 if(slice_type > 4){
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3714 slice_type -= 5;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3715 h->slice_type_fixed=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3716 }else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3717 h->slice_type_fixed=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3718
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3719 slice_type= slice_type_map[ slice_type ];
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6429
diff changeset
3720 if (slice_type == FF_I_TYPE
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3721 || (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
3722 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
3723 }
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3724 h->slice_type= slice_type;
7338
b088035801d5 Simplify slice type checks.
michael
parents: 7337
diff changeset
3725 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
3726
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
3727 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
3728 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
3729 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
3730 "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
3731 return -1;
5455f4e43948 Make h264 decoder conform to requirements of mpegvideo's MPV_frame_start.
heydowns
parents: 6014
diff changeset
3732 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3733
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3734 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
3735 if(pps_id>=MAX_PPS_COUNT){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3736 av_log(h->s.avctx, AV_LOG_ERROR, "pps_id out of range\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3737 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3738 }
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3739 if(!h0->pps_buffers[pps_id]) {
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
3740 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
3741 return -1;
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
3742 }
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3743 h->pps= *h0->pps_buffers[pps_id];
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3744
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3745 if(!h0->sps_buffers[h->pps.sps_id]) {
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
3746 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
3747 return -1;
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
3748 }
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3749 h->sps = *h0->sps_buffers[h->pps.sps_id];
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3750
5685
070a376d496b fix image corruption when with multi-threaded decoding.
gpoirier
parents: 5647
diff changeset
3751 if(h == h0 && h->dequant_coeff_pps != pps_id){
4363
9b7662fa4905 remove useless cast that makes code unreadable
gpoirier
parents: 4362
diff changeset
3752 h->dequant_coeff_pps = pps_id;
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3753 init_dequant_tables(h);
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3754 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3755
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3756 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
3757 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
3758
3178
bd995b8c64fd Alignment fixes, caused problems on SPARC.
diego
parents: 3177
diff changeset
3759 h->b_stride= s->mb_width*4;
bd995b8c64fd Alignment fixes, caused problems on SPARC.
diego
parents: 3177
diff changeset
3760 h->b8_stride= s->mb_width*2;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3761
6581
e6d8c5bbeeac Avoid crash with idiotic cropping. Fixes crash with CVFC1_Sony_C.jsv
michael
parents: 6524
diff changeset
3762 s->width = 16*s->mb_width - 2*FFMIN(h->sps.crop_right, 7);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3763 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
3764 s->height= 16*s->mb_height - 2*FFMIN(h->sps.crop_bottom, 7);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3765 else
6581
e6d8c5bbeeac Avoid crash with idiotic cropping. Fixes crash with CVFC1_Sony_C.jsv
michael
parents: 6524
diff changeset
3766 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
3767
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3768 if (s->context_initialized
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
3769 && ( s->width != s->avctx->width || s->height != s->avctx->height)) {
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3770 if(h != h0)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3771 return -1; // width / height changed during parallelized decoding
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3772 free_tables(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3773 MPV_common_end(s);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3774 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3775 if (!s->context_initialized) {
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3776 if(h != h0)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3777 return -1; // we cant (re-)initialize context during parallel decoding
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3778 if (MPV_common_init(s) < 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3779 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
3780 s->first_field = 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3781
5160
13386224ff72 Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
3782 init_scan_tables(h);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3783 alloc_tables(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3784
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3785 for(i = 1; i < s->avctx->thread_count; i++) {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3786 H264Context *c;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3787 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
3788 memcpy(c, h->s.thread_context[i], sizeof(MpegEncContext));
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3789 memset(&c->s + 1, 0, sizeof(H264Context) - sizeof(MpegEncContext));
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3790 c->sps = h->sps;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3791 c->pps = h->pps;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3792 init_scan_tables(c);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3793 clone_tables(c, h);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3794 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3795
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3796 for(i = 0; i < s->avctx->thread_count; i++)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3797 if(context_init(h->thread_context[i]) < 0)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3798 return -1;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3799
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3800 s->avctx->width = s->width;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3801 s->avctx->height = s->height;
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
3802 s->avctx->sample_aspect_ratio= h->sps.sar;
2440
cf97353f94c6 div by zero aspect fix
michael
parents: 2422
diff changeset
3803 if(!s->avctx->sample_aspect_ratio.den)
cf97353f94c6 div by zero aspect fix
michael
parents: 2422
diff changeset
3804 s->avctx->sample_aspect_ratio.den = 1;
2174
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
3805
2648
c3a06b0b00e2 set time_base for variable fps too
michael
parents: 2645
diff changeset
3806 if(h->sps.timing_info_present_flag){
3052
6c3f87300378 interpret H264 VUI timing info correctly
mru
parents: 3036
diff changeset
3807 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
3808 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
3809 s->avctx->time_base.den *= 2;
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3052
diff changeset
3810 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
3811 s->avctx->time_base.num, s->avctx->time_base.den, 1<<30);
2174
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
3812 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3813 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3814
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3815 h->frame_num= get_bits(&s->gb, h->sps.log2_max_frame_num);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3816
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3817 h->mb_mbaff = 0;
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3818 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
3819 last_pic_structure = s0->picture_structure;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3820 if(h->sps.frame_mbs_only_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3821 s->picture_structure= PICT_FRAME;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3822 }else{
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3823 if(get_bits1(&s->gb)) { //field_pic_flag
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3824 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
3825 } else {
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3826 s->picture_structure= PICT_FRAME;
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3827 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
3828 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3829 }
5723
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
3830
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
3831 if(h0->current_slice == 0){
7350
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3832 while(h->frame_num != h->prev_frame_num &&
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3833 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
3834 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
3835 frame_start(h);
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3836 h->prev_frame_num++;
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3837 h->prev_frame_num %= 1<<h->sps.log2_max_frame_num;
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3838 s->current_picture_ptr->frame_num= h->prev_frame_num;
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3839 execute_ref_pic_marking(h, NULL, 0);
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3840 }
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
3841
5798
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3842 /* 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
3843 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
3844 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
3845 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
3846 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
3847
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3848 /* 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
3849 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
3850 /*
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3851 * 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
3852 * 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
3853 */
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3854 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
3855 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
3856
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3857 } else {
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3858 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
3859 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
3860 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
3861 /*
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3862 * 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
3863 * 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
3864 * 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
3865 * purposes.
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3866 */
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3867 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
3868 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
3869
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3870 } else {
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3871 /* 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
3872 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
3873 }
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3874 }
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3875
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3876 } else {
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3877 /* 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
3878 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
3879 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
3880 }
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3881
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
3882 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
3883 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
3884 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
3885 }
5723
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
3886 }
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
3887 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
3888 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
3889
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
3890 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
3891
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3892 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
3893 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
3894 first_mb_in_slice >= s->mb_num){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3895 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
3896 return -1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3897 }
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3898 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
3899 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
3900 if (s->picture_structure == PICT_BOTTOM_FIELD)
0b3aa6f4c313 Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents: 5780
diff changeset
3901 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
3902 assert(s->mb_y < s->mb_height);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3903
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3904 if(s->picture_structure==PICT_FRAME){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3905 h->curr_pic_num= h->frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3906 h->max_pic_num= 1<< h->sps.log2_max_frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3907 }else{
5772
65b71bd21a4d Fix h->curr_pic_num for field pictures. Necessary for proper PAFF support.
andoma
parents: 5771
diff changeset
3908 h->curr_pic_num= 2*h->frame_num + 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3909 h->max_pic_num= 1<<(h->sps.log2_max_frame_num + 1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3910 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3911
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3912 if(h->nal_unit_type == NAL_IDR_SLICE){
1453
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
3913 get_ue_golomb(&s->gb); /* idr_pic_id */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3914 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3915
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3916 if(h->sps.poc_type==0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3917 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
3918
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3919 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3920 h->delta_poc_bottom= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3921 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3922 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3923
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3924 if(h->sps.poc_type==1 && !h->sps.delta_pic_order_always_zero_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3925 h->delta_poc[0]= get_se_golomb(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3926
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3927 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3928 h->delta_poc[1]= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3929 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3930
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3931 init_poc(h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3932
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3933 if(h->pps.redundant_pic_cnt_present){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3934 h->redundant_pic_count= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3935 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3936
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
3937 //set defaults, might be overridden a few lines later
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3938 h->ref_count[0]= h->pps.ref_count[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3939 h->ref_count[1]= h->pps.ref_count[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3940
7338
b088035801d5 Simplify slice type checks.
michael
parents: 7337
diff changeset
3941 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
3942 if(h->slice_type_nos == FF_B_TYPE){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3943 h->direct_spatial_mv_pred= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3944 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3945 num_ref_idx_active_override_flag= get_bits1(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3946
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3947 if(num_ref_idx_active_override_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3948 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
3949 if(h->slice_type_nos==FF_B_TYPE)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3950 h->ref_count[1]= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3951
4532
c296efb7575e fix 2nd ref_count check
michael
parents: 4531
diff changeset
3952 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
3953 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
3954 h->ref_count[0]= h->ref_count[1]= 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3955 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3956 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3957 }
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
3958 if(h->slice_type_nos == FF_B_TYPE)
4532
c296efb7575e fix 2nd ref_count check
michael
parents: 4531
diff changeset
3959 h->list_count= 2;
c296efb7575e fix 2nd ref_count check
michael
parents: 4531
diff changeset
3960 else
c296efb7575e fix 2nd ref_count check
michael
parents: 4531
diff changeset
3961 h->list_count= 1;
c296efb7575e fix 2nd ref_count check
michael
parents: 4531
diff changeset
3962 }else
c296efb7575e fix 2nd ref_count check
michael
parents: 4531
diff changeset
3963 h->list_count= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3964
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3965 if(!default_ref_list_done){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3966 fill_default_ref_list(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3967 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3968
7417
5b281979b60e Simple refactoring to resolve a FIXME. Patch by Paul Kendall.
darkshikari
parents: 7408
diff changeset
3969 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
3970 return -1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3971
7339
7d5cc12d8fe2 Remove superfluous ().
michael
parents: 7338
diff changeset
3972 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
3973 || (h->pps.weighted_bipred_idc==1 && h->slice_type_nos== FF_B_TYPE ) )
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3974 pred_weight_table(h);
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
3975 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
3976 implicit_weight_table(h);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3977 else
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3978 h->use_weight = 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3979
5723
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
3980 if(h->nal_ref_idc)
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
3981 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
3982
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3983 if(FRAME_MBAFF)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3984 fill_mbaff_ref_list(h);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3985
7338
b088035801d5 Simplify slice type checks.
michael
parents: 7337
diff changeset
3986 if( h->slice_type_nos != FF_I_TYPE && h->pps.cabac ){
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3987 tmp = get_ue_golomb(&s->gb);
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3988 if(tmp > 2){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3989 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
3990 return -1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3991 }
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3992 h->cabac_init_idc= tmp;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3993 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3994
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3995 h->last_qscale_diff = 0;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3996 tmp = h->pps.init_qp + get_se_golomb(&s->gb);
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3997 if(tmp>51){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
3998 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
3999 return -1;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4000 }
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4001 s->qscale= tmp;
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
4002 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
4003 h->chroma_qp[1] = get_chroma_qp(h, 1, s->qscale);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4004 //FIXME qscale / qp ... stuff
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6429
diff changeset
4005 if(h->slice_type == FF_SP_TYPE){
1453
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
4006 get_bits1(&s->gb); /* sp_for_switch_flag */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4007 }
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6429
diff changeset
4008 if(h->slice_type==FF_SP_TYPE || h->slice_type == FF_SI_TYPE){
1453
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
4009 get_se_golomb(&s->gb); /* slice_qs_delta */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4010 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4011
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
4012 h->deblocking_filter = 1;
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4013 h->slice_alpha_c0_offset = 0;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4014 h->slice_beta_offset = 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4015 if( h->pps.deblocking_filter_parameters_present ) {
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4016 tmp= get_ue_golomb(&s->gb);
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4017 if(tmp > 2){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4018 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
4019 return -1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4020 }
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4021 h->deblocking_filter= tmp;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4022 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
4023 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
4024
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
4025 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
4026 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
4027 h->slice_beta_offset = get_se_golomb(&s->gb) << 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4028 }
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
4029 }
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
4030
5698
9a26cb6747a9 Apply skip_loop_filter before checking if we can parallelize with the selected
reimar
parents: 5694
diff changeset
4031 if( s->avctx->skip_loop_filter >= AVDISCARD_ALL
7340
ef40221c1452 SI/SP slice support. (not bitexact)
michael
parents: 7339
diff changeset
4032 ||(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
4033 ||(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
4034 ||(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
4035 h->deblocking_filter= 0;
9a26cb6747a9 Apply skip_loop_filter before checking if we can parallelize with the selected
reimar
parents: 5694
diff changeset
4036
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
4037 if(h->deblocking_filter == 1 && h0->max_contexts > 1) {
5646
adc9ec0f7385 Let H.264 decoder skip deblocking across slices
benoit
parents: 5643
diff changeset
4038 if(s->avctx->flags2 & CODEC_FLAG2_FAST) {
adc9ec0f7385 Let H.264 decoder skip deblocking across slices
benoit
parents: 5643
diff changeset
4039 /* Cheat slightly for speed:
6029
fc51a6ffa64f cosmetics: comment typo fixes
diego
parents: 6020
diff changeset
4040 Do not bother to deblock across slices. */
5646
adc9ec0f7385 Let H.264 decoder skip deblocking across slices
benoit
parents: 5643
diff changeset
4041 h->deblocking_filter = 2;
adc9ec0f7385 Let H.264 decoder skip deblocking across slices
benoit
parents: 5643
diff changeset
4042 } else {
5647
7c139ea9065e Indentation
benoit
parents: 5646
diff changeset
4043 h0->max_contexts = 1;
7c139ea9065e Indentation
benoit
parents: 5646
diff changeset
4044 if(!h0->single_decode_warning) {
7c139ea9065e Indentation
benoit
parents: 5646
diff changeset
4045 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
4046 h0->single_decode_warning = 1;
7c139ea9065e Indentation
benoit
parents: 5646
diff changeset
4047 }
7c139ea9065e Indentation
benoit
parents: 5646
diff changeset
4048 if(h != h0)
7c139ea9065e Indentation
benoit
parents: 5646
diff changeset
4049 return 1; // deblocking switched inside frame
5646
adc9ec0f7385 Let H.264 decoder skip deblocking across slices
benoit
parents: 5643
diff changeset
4050 }
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
4051 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
4052
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4053 #if 0 //FMO
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4054 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
4055 slice_group_change_cycle= get_bits(&s->gb, ?);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4056 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4057
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
4058 h0->last_slice_type = slice_type;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
4059 h->slice_num = ++h0->current_slice;
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
4060
7343
9a4cb430d8ff Loop filtering with multiple slice types fix.
michael
parents: 7341
diff changeset
4061 for(j=0; j<2; j++){
9a4cb430d8ff Loop filtering with multiple slice types fix.
michael
parents: 7341
diff changeset
4062 int *ref2frm= h->ref2frm[h->slice_num&15][j];
9a4cb430d8ff Loop filtering with multiple slice types fix.
michael
parents: 7341
diff changeset
4063 ref2frm[0]=
9a4cb430d8ff Loop filtering with multiple slice types fix.
michael
parents: 7341
diff changeset
4064 ref2frm[1]= -1;
9a4cb430d8ff Loop filtering with multiple slice types fix.
michael
parents: 7341
diff changeset
4065 for(i=0; i<48; i++)
9a4cb430d8ff Loop filtering with multiple slice types fix.
michael
parents: 7341
diff changeset
4066 ref2frm[i+2]= 4*h->ref_list[j][i].frame_num
9a4cb430d8ff Loop filtering with multiple slice types fix.
michael
parents: 7341
diff changeset
4067 +(h->ref_list[j][i].reference&3);
9a4cb430d8ff Loop filtering with multiple slice types fix.
michael
parents: 7341
diff changeset
4068 }
9a4cb430d8ff Loop filtering with multiple slice types fix.
michael
parents: 7341
diff changeset
4069
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4070 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
4071 h->emu_edge_height= (FRAME_MBAFF || FIELD_PICTURE) ? 0 : h->emu_edge_width;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4072
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4073 if(s->avctx->debug&FF_DEBUG_PICT_INFO){
6890
5ddf098691d3 print direct_spatial_mv_pred
michael
parents: 6785
diff changeset
4074 av_log(h->s.avctx, AV_LOG_DEBUG, "slice:%d %s mb:%d %c pps:%u frame:%d poc:%d/%d ref:%d/%d qp:%d loop:%d:%d:%d weight:%d%s %s\n",
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
4075 h->slice_num,
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
4076 (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
4077 first_mb_in_slice,
1264
2fa34e615c76 cleanup
michaelni
parents: 1252
diff changeset
4078 av_get_pict_type_char(h->slice_type),
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4079 pps_id, h->frame_num,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4080 s->current_picture_ptr->field_poc[0], s->current_picture_ptr->field_poc[1],
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4081 h->ref_count[0], h->ref_count[1],
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4082 s->qscale,
2583
61a08e2b9822 display deblocking strength in FF_DEBUG_PICT_INFO
lorenm
parents: 2582
diff changeset
4083 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
4084 h->use_weight,
6890
5ddf098691d3 print direct_spatial_mv_pred
michael
parents: 6785
diff changeset
4085 h->use_weight==1 && h->use_weight_chroma ? "c" : "",
5ddf098691d3 print direct_spatial_mv_pred
michael
parents: 6785
diff changeset
4086 h->slice_type == FF_B_TYPE ? (h->direct_spatial_mv_pred ? "SPAT" : "TEMP") : ""
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4087 );
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4088 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4089
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4090 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4091 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4092
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4093 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4094 *
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4095 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4096 static inline int get_level_prefix(GetBitContext *gb){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4097 unsigned int buf;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4098 int log;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4099
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4100 OPEN_READER(re, gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4101 UPDATE_CACHE(re, gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4102 buf=GET_CACHE(re, gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4103
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4104 log= 32 - av_log2(buf);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4105 #ifdef TRACE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4106 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
4107 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
4108 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4109
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4110 LAST_SKIP_BITS(re, gb, log);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4111 CLOSE_READER(re, gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4112
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4113 return log-1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4114 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4115
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4116 static inline int get_dct8x8_allowed(H264Context *h){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4117 int i;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4118 for(i=0; i<4; i++){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4119 if(!IS_SUB_8X8(h->sub_mb_type[i])
2781
899a2ea0907c parenthesing to avoid compiler errors in the future - compared asm outputs, behaviour didnt changed
alex
parents: 2774
diff changeset
4120 || (!h->sps.direct_8x8_inference_flag && IS_DIRECT(h->sub_mb_type[i])))
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4121 return 0;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4122 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4123 return 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4124 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4125
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4126 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4127 * decodes a residual block.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4128 * @param n block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4129 * @param scantable scantable
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4130 * @param max_coeff number of coefficients in the block
6524
01647ac078a7 typo: occured --> occurred
diego
parents: 6517
diff changeset
4131 * @return <0 if an error occurred
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4132 */
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
4133 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
4134 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4135 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
4136 int level[16];
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4137 int zeros_left, coeff_num, coeff_token, total_coeff, i, j, trailing_ones, run_before;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4138
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4139 //FIXME put trailing_onex into the context
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4140
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4141 if(n == CHROMA_DC_BLOCK_INDEX){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4142 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
4143 total_coeff= coeff_token>>2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4144 }else{
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4145 if(n == LUMA_DC_BLOCK_INDEX){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4146 total_coeff= pred_non_zero_count(h, 0);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4147 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
4148 total_coeff= coeff_token>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4149 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4150 total_coeff= pred_non_zero_count(h, n);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4151 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
4152 total_coeff= coeff_token>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4153 h->non_zero_count_cache[ scan8[n] ]= total_coeff;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4154 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4155 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4156
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4157 //FIXME set last_non_zero?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4158
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4159 if(total_coeff==0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4160 return 0;
4391
20944c70a3c0 fix segfault with darkkben.free.fr/corrupted_h264.mp4
michael
parents: 4390
diff changeset
4161 if(total_coeff > (unsigned)max_coeff) {
20944c70a3c0 fix segfault with darkkben.free.fr/corrupted_h264.mp4
michael
parents: 4390
diff changeset
4162 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
4163 return -1;
758ba4a18478 fix crash when decoding a truncated H264 slice
gpoirier
parents: 4269
diff changeset
4164 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4165
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4166 trailing_ones= coeff_token&3;
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
4167 tprintf(h->s.avctx, "trailing:%d, total:%d\n", trailing_ones, total_coeff);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4168 assert(total_coeff<=16);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4169
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4170 for(i=0; i<trailing_ones; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4171 level[i]= 1 - 2*get_bits1(gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4172 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4173
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4174 if(i<total_coeff) {
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4175 int level_code, mask;
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4176 int suffix_length = total_coeff > 10 && trailing_ones < 3;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4177 int prefix= get_level_prefix(gb);
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4178
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4179 //first coefficient has suffix_length equal to 0 or 1
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4180 if(prefix<14){ //FIXME try to build a large unified VLC table for all this
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4181 if(suffix_length)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4182 level_code= (prefix<<suffix_length) + get_bits(gb, suffix_length); //part
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4183 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4184 level_code= (prefix<<suffix_length); //part
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4185 }else if(prefix==14){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4186 if(suffix_length)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4187 level_code= (prefix<<suffix_length) + get_bits(gb, suffix_length); //part
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4188 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4189 level_code= prefix + get_bits(gb, 4); //part
7225
f8b6ec3e5538 fix IPCM_decode_error.h264
michael
parents: 7185
diff changeset
4190 }else{
f8b6ec3e5538 fix IPCM_decode_error.h264
michael
parents: 7185
diff changeset
4191 level_code= (15<<suffix_length) + get_bits(gb, prefix-3); //part
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
4192 if(suffix_length==0) level_code+=15; //FIXME doesn't make (much)sense
7225
f8b6ec3e5538 fix IPCM_decode_error.h264
michael
parents: 7185
diff changeset
4193 if(prefix>=16)
f8b6ec3e5538 fix IPCM_decode_error.h264
michael
parents: 7185
diff changeset
4194 level_code += (1<<(prefix-3))-4096;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4195 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4196
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4197 if(trailing_ones < 3) level_code += 2;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4198
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4199 suffix_length = 1;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4200 if(level_code > 5)
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4201 suffix_length++;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4202 mask= -(level_code&1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4203 level[i]= (((2+level_code)>>1) ^ mask) - mask;
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4204 i++;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4205
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4206 //remaining coefficients have suffix_length > 0
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4207 for(;i<total_coeff;i++) {
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4208 static const int suffix_limit[7] = {0,5,11,23,47,95,INT_MAX };
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4209 prefix = get_level_prefix(gb);
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4210 if(prefix<15){
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4211 level_code = (prefix<<suffix_length) + get_bits(gb, suffix_length);
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4212 }else{
7225
f8b6ec3e5538 fix IPCM_decode_error.h264
michael
parents: 7185
diff changeset
4213 level_code = (15<<suffix_length) + get_bits(gb, prefix-3);
f8b6ec3e5538 fix IPCM_decode_error.h264
michael
parents: 7185
diff changeset
4214 if(prefix>=16)
f8b6ec3e5538 fix IPCM_decode_error.h264
michael
parents: 7185
diff changeset
4215 level_code += (1<<(prefix-3))-4096;
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4216 }
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4217 mask= -(level_code&1);
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4218 level[i]= (((2+level_code)>>1) ^ mask) - mask;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4219 if(level_code > suffix_limit[suffix_length])
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4220 suffix_length++;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4221 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4222 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4223
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4224 if(total_coeff == max_coeff)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4225 zeros_left=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4226 else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4227 if(n == CHROMA_DC_BLOCK_INDEX)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4228 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
4229 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4230 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
4231 }
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4232
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4233 coeff_num = zeros_left + total_coeff - 1;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4234 j = scantable[coeff_num];
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4235 if(n > 24){
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4236 block[j] = level[0];
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4237 for(i=1;i<total_coeff;i++) {
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4238 if(zeros_left <= 0)
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4239 run_before = 0;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4240 else if(zeros_left < 7){
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4241 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
4242 }else{
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4243 run_before= get_vlc2(gb, run7_vlc.table, RUN7_VLC_BITS, 2);
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4244 }
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4245 zeros_left -= run_before;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4246 coeff_num -= 1 + run_before;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4247 j= scantable[ coeff_num ];
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4248
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4249 block[j]= level[i];
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4250 }
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4251 }else{
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
4252 block[j] = (level[0] * qmul[j] + 32)>>6;
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4253 for(i=1;i<total_coeff;i++) {
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4254 if(zeros_left <= 0)
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4255 run_before = 0;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4256 else if(zeros_left < 7){
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4257 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
4258 }else{
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4259 run_before= get_vlc2(gb, run7_vlc.table, RUN7_VLC_BITS, 2);
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4260 }
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4261 zeros_left -= run_before;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4262 coeff_num -= 1 + run_before;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4263 j= scantable[ coeff_num ];
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4264
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
4265 block[j]= (level[i] * qmul[j] + 32)>>6;
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4266 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4267 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4268
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4269 if(zeros_left<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
4270 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
4271 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4272 }
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4273
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4274 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4275 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4276
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4277 static void predict_field_decoding_flag(H264Context *h){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4278 MpegEncContext * const s = &h->s;
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
4279 const int mb_xy= h->mb_xy;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4280 int mb_type = (h->slice_table[mb_xy-1] == h->slice_num)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4281 ? s->current_picture.mb_type[mb_xy-1]
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4282 : (h->slice_table[mb_xy-s->mb_stride] == h->slice_num)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4283 ? s->current_picture.mb_type[mb_xy-s->mb_stride]
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4284 : 0;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4285 h->mb_mbaff = h->mb_field_decoding_flag = IS_INTERLACED(mb_type) ? 1 : 0;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4286 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4287
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4288 /**
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4289 * decodes a P_SKIP or B_SKIP macroblock
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4290 */
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4291 static void decode_mb_skip(H264Context *h){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4292 MpegEncContext * const s = &h->s;
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
4293 const int mb_xy= h->mb_xy;
2674
58fb8e1efcae 10l (mb_type uninitalized and then changed and overwritten)
michael
parents: 2673
diff changeset
4294 int mb_type=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4295
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4296 memset(h->non_zero_count[mb_xy], 0, 16);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4297 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
4298
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4299 if(MB_FIELD)
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
4300 mb_type|= MB_TYPE_INTERLACED;
2674
58fb8e1efcae 10l (mb_type uninitalized and then changed and overwritten)
michael
parents: 2673
diff changeset
4301
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
4302 if( h->slice_type_nos == FF_B_TYPE )
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4303 {
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4304 // just for fill_caches. pred_direct_motion will set the real mb_type
2674
58fb8e1efcae 10l (mb_type uninitalized and then changed and overwritten)
michael
parents: 2673
diff changeset
4305 mb_type|= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2|MB_TYPE_SKIP;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4306
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
4307 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
4308 pred_direct_motion(h, &mb_type);
3927
f44a3341bfdf simplify write_back_motion for skip mbs
lorenm
parents: 3807
diff changeset
4309 mb_type|= MB_TYPE_SKIP;
2396
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 else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4312 {
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4313 int mx, my;
2674
58fb8e1efcae 10l (mb_type uninitalized and then changed and overwritten)
michael
parents: 2673
diff changeset
4314 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
4315
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
4316 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
4317 pred_pskip_motion(h, &mx, &my);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4318 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
4319 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
4320 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4321
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4322 write_back_motion(h, mb_type);
3927
f44a3341bfdf simplify write_back_motion for skip mbs
lorenm
parents: 3807
diff changeset
4323 s->current_picture.mb_type[mb_xy]= mb_type;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4324 s->current_picture.qscale_table[mb_xy]= s->qscale;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4325 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
4326 h->prev_mb_skipped= 1;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4327 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4328
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4329 /**
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4330 * decodes a macroblock
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
4331 * @returns 0 if OK, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4332 */
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4333 static int decode_mb_cavlc(H264Context *h){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4334 MpegEncContext * const s = &h->s;
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
4335 int mb_xy;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4336 int partition_count;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4337 unsigned int mb_type, cbp;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4338 int dct8x8_allowed= h->pps.transform_8x8_mode;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4339
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
4340 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
4341
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4342 s->dsp.clear_blocks(h->mb); //FIXME avoid if already clear (move after skip handlong?
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4343
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
4344 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
4345 cbp = 0; /* avoid warning. FIXME: find a solution without slowing
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
4346 down the code */
7338
b088035801d5 Simplify slice type checks.
michael
parents: 7337
diff changeset
4347 if(h->slice_type_nos != FF_I_TYPE){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4348 if(s->mb_skip_run==-1)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4349 s->mb_skip_run= get_ue_golomb(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4350
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4351 if (s->mb_skip_run--) {
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4352 if(FRAME_MBAFF && (s->mb_y&1) == 0){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4353 if(s->mb_skip_run==0)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4354 h->mb_mbaff = h->mb_field_decoding_flag = get_bits1(&s->gb);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4355 else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4356 predict_field_decoding_flag(h);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4357 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4358 decode_mb_skip(h);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4359 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4360 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4361 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4362 if(FRAME_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4363 if( (s->mb_y&1) == 0 )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4364 h->mb_mbaff = h->mb_field_decoding_flag = get_bits1(&s->gb);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4365 }else
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
4366 h->mb_field_decoding_flag= (s->picture_structure!=PICT_FRAME);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4367
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
4368 h->prev_mb_skipped= 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4369
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4370 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
4371 if(h->slice_type_nos == FF_B_TYPE){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4372 if(mb_type < 23){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4373 partition_count= b_mb_type_info[mb_type].partition_count;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4374 mb_type= b_mb_type_info[mb_type].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4375 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4376 mb_type -= 23;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4377 goto decode_intra_mb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4378 }
7340
ef40221c1452 SI/SP slice support. (not bitexact)
michael
parents: 7339
diff changeset
4379 }else if(h->slice_type_nos == FF_P_TYPE){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4380 if(mb_type < 5){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4381 partition_count= p_mb_type_info[mb_type].partition_count;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4382 mb_type= p_mb_type_info[mb_type].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4383 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4384 mb_type -= 5;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4385 goto decode_intra_mb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4386 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4387 }else{
7340
ef40221c1452 SI/SP slice support. (not bitexact)
michael
parents: 7339
diff changeset
4388 assert(h->slice_type_nos == FF_I_TYPE);
ef40221c1452 SI/SP slice support. (not bitexact)
michael
parents: 7339
diff changeset
4389 if(h->slice_type == FF_SI_TYPE && mb_type)
ef40221c1452 SI/SP slice support. (not bitexact)
michael
parents: 7339
diff changeset
4390 mb_type--;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4391 decode_intra_mb:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4392 if(mb_type > 25){
3954
00a12ef7d800 output typo fixes
diego
parents: 3948
diff changeset
4393 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
4394 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4395 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4396 partition_count=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4397 cbp= i_mb_type_info[mb_type].cbp;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4398 h->intra16x16_pred_mode= i_mb_type_info[mb_type].pred_mode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4399 mb_type= i_mb_type_info[mb_type].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4400 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4401
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4402 if(MB_FIELD)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4403 mb_type |= MB_TYPE_INTERLACED;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4404
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4405 h->slice_table[ mb_xy ]= h->slice_num;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4406
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4407 if(IS_INTRA_PCM(mb_type)){
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4408 unsigned int x, y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4409
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5106
diff changeset
4410 // We assume these blocks are very rare so we do not optimize it.
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4411 align_get_bits(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4412
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4413 // The pixels are stored in the same order as levels in h->mb array.
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4414 for(y=0; y<16; y++){
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4415 const int index= 4*(y&3) + 32*((y>>2)&1) + 128*(y>>3);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4416 for(x=0; x<16; x++){
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
4417 tprintf(s->avctx, "LUMA ICPM LEVEL (%3d)\n", show_bits(&s->gb, 8));
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4418 h->mb[index + (x&3) + 16*((x>>2)&1) + 64*(x>>3)]= get_bits(&s->gb, 8);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4419 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4420 }
7407
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
4421 if(CHROMA){
7408
michael
parents: 7407
diff changeset
4422 for(y=0; y<8; y++){
michael
parents: 7407
diff changeset
4423 const int index= 256 + 4*(y&3) + 32*(y>>2);
michael
parents: 7407
diff changeset
4424 for(x=0; x<8; x++){
michael
parents: 7407
diff changeset
4425 tprintf(s->avctx, "CHROMA U ICPM LEVEL (%3d)\n", show_bits(&s->gb, 8));
michael
parents: 7407
diff changeset
4426 h->mb[index + (x&3) + 16*(x>>2)]= get_bits(&s->gb, 8);
michael
parents: 7407
diff changeset
4427 }
michael
parents: 7407
diff changeset
4428 }
michael
parents: 7407
diff changeset
4429 for(y=0; y<8; y++){
michael
parents: 7407
diff changeset
4430 const int index= 256 + 64 + 4*(y&3) + 32*(y>>2);
michael
parents: 7407
diff changeset
4431 for(x=0; x<8; x++){
michael
parents: 7407
diff changeset
4432 tprintf(s->avctx, "CHROMA V ICPM LEVEL (%3d)\n", show_bits(&s->gb, 8));
michael
parents: 7407
diff changeset
4433 h->mb[index + (x&3) + 16*(x>>2)]= get_bits(&s->gb, 8);
michael
parents: 7407
diff changeset
4434 }
michael
parents: 7407
diff changeset
4435 }
7407
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
4436 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4437
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
4438 // In deblocking, the quantizer is 0
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4439 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
4440 // 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
4441 memset(h->non_zero_count[mb_xy], 16, 16);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4442
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4443 s->current_picture.mb_type[mb_xy]= mb_type;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4444 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4445 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4446
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4447 if(MB_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4448 h->ref_count[0] <<= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4449 h->ref_count[1] <<= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4450 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4451
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
4452 fill_caches(h, mb_type, 0);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4453
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4454 //mb_pred
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4455 if(IS_INTRA(mb_type)){
7408
michael
parents: 7407
diff changeset
4456 int pred_mode;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4457 // init_top_left_availability(h);
7408
michael
parents: 7407
diff changeset
4458 if(IS_INTRA4x4(mb_type)){
michael
parents: 7407
diff changeset
4459 int i;
michael
parents: 7407
diff changeset
4460 int di = 1;
michael
parents: 7407
diff changeset
4461 if(dct8x8_allowed && get_bits1(&s->gb)){
michael
parents: 7407
diff changeset
4462 mb_type |= MB_TYPE_8x8DCT;
michael
parents: 7407
diff changeset
4463 di = 4;
michael
parents: 7407
diff changeset
4464 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4465
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4466 // fill_intra4x4_pred_table(h);
7408
michael
parents: 7407
diff changeset
4467 for(i=0; i<16; i+=di){
michael
parents: 7407
diff changeset
4468 int mode= pred_intra_mode(h, i);
michael
parents: 7407
diff changeset
4469
michael
parents: 7407
diff changeset
4470 if(!get_bits1(&s->gb)){
michael
parents: 7407
diff changeset
4471 const int rem_mode= get_bits(&s->gb, 3);
michael
parents: 7407
diff changeset
4472 mode = rem_mode + (rem_mode >= mode);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4473 }
7408
michael
parents: 7407
diff changeset
4474
michael
parents: 7407
diff changeset
4475 if(di==4)
michael
parents: 7407
diff changeset
4476 fill_rectangle( &h->intra4x4_pred_mode_cache[ scan8[i] ], 2, 2, 8, mode, 1 );
michael
parents: 7407
diff changeset
4477 else
michael
parents: 7407
diff changeset
4478 h->intra4x4_pred_mode_cache[ scan8[i] ] = mode;
michael
parents: 7407
diff changeset
4479 }
michael
parents: 7407
diff changeset
4480 write_back_intra_pred_mode(h);
michael
parents: 7407
diff changeset
4481 if( check_intra4x4_pred_mode(h) < 0)
michael
parents: 7407
diff changeset
4482 return -1;
michael
parents: 7407
diff changeset
4483 }else{
michael
parents: 7407
diff changeset
4484 h->intra16x16_pred_mode= check_intra_pred_mode(h, h->intra16x16_pred_mode);
michael
parents: 7407
diff changeset
4485 if(h->intra16x16_pred_mode < 0)
michael
parents: 7407
diff changeset
4486 return -1;
michael
parents: 7407
diff changeset
4487 }
michael
parents: 7407
diff changeset
4488 if(CHROMA){
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4489 pred_mode= check_intra_pred_mode(h, get_ue_golomb(&s->gb));
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4490 if(pred_mode < 0)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4491 return -1;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4492 h->chroma_pred_mode= pred_mode;
7408
michael
parents: 7407
diff changeset
4493 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4494 }else if(partition_count==4){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4495 int i, j, sub_partition_count[4], list, ref[2][4];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4496
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
4497 if(h->slice_type_nos == FF_B_TYPE){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4498 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4499 h->sub_mb_type[i]= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4500 if(h->sub_mb_type[i] >=13){
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4501 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
4502 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4503 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4504 sub_partition_count[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4505 h->sub_mb_type[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4506 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4507 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
4508 || 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
4509 pred_direct_motion(h, &mb_type);
3003
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
4510 h->ref_cache[0][scan8[4]] =
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
4511 h->ref_cache[1][scan8[4]] =
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
4512 h->ref_cache[0][scan8[12]] =
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
4513 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
4514 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4515 }else{
7338
b088035801d5 Simplify slice type checks.
michael
parents: 7337
diff changeset
4516 assert(h->slice_type_nos == FF_P_TYPE); //FIXME SP correct ?
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4517 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4518 h->sub_mb_type[i]= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4519 if(h->sub_mb_type[i] >=4){
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4520 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
4521 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4522 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4523 sub_partition_count[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4524 h->sub_mb_type[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].type;
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
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
4528 for(list=0; list<h->list_count; list++){
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4529 int ref_count= IS_REF0(mb_type) ? 1 : h->ref_count[list];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4530 for(i=0; i<4; i++){
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4531 if(IS_DIRECT(h->sub_mb_type[i])) continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4532 if(IS_DIR(h->sub_mb_type[i], 0, list)){
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4533 unsigned int tmp = get_te0_golomb(&s->gb, ref_count); //FIXME init to 0 before and skip?
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4534 if(tmp>=ref_count){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4535 av_log(h->s.avctx, AV_LOG_ERROR, "ref %u overflow\n", tmp);
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4536 return -1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4537 }
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4538 ref[list][i]= tmp;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4539 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4540 //FIXME
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4541 ref[list][i] = -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4542 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4543 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4544 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4545
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4546 if(dct8x8_allowed)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4547 dct8x8_allowed = get_dct8x8_allowed(h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4548
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
4549 for(list=0; list<h->list_count; list++){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4550 for(i=0; i<4; i++){
3003
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
4551 if(IS_DIRECT(h->sub_mb_type[i])) {
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
4552 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
4553 continue;
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
4554 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4555 h->ref_cache[list][ scan8[4*i] ]=h->ref_cache[list][ scan8[4*i]+1 ]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4556 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
4557
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4558 if(IS_DIR(h->sub_mb_type[i], 0, list)){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4559 const int sub_mb_type= h->sub_mb_type[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4560 const int block_width= (sub_mb_type & (MB_TYPE_16x16|MB_TYPE_16x8)) ? 2 : 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4561 for(j=0; j<sub_partition_count[i]; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4562 int mx, my;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4563 const int index= 4*i + block_width*j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4564 int16_t (* mv_cache)[2]= &h->mv_cache[list][ scan8[index] ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4565 pred_motion(h, index, block_width, list, h->ref_cache[list][ scan8[index] ], &mx, &my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4566 mx += get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4567 my += get_se_golomb(&s->gb);
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
4568 tprintf(s->avctx, "final mv:%d %d\n", mx, my);
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
4569
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4570 if(IS_SUB_8X8(sub_mb_type)){
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
4571 mv_cache[ 1 ][0]=
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4572 mv_cache[ 8 ][0]= mv_cache[ 9 ][0]= mx;
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
4573 mv_cache[ 1 ][1]=
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4574 mv_cache[ 8 ][1]= mv_cache[ 9 ][1]= my;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4575 }else if(IS_SUB_8X4(sub_mb_type)){
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
4576 mv_cache[ 1 ][0]= mx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
4577 mv_cache[ 1 ][1]= my;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4578 }else if(IS_SUB_4X8(sub_mb_type)){
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
4579 mv_cache[ 8 ][0]= mx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
4580 mv_cache[ 8 ][1]= my;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4581 }
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
4582 mv_cache[ 0 ][0]= mx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
4583 mv_cache[ 0 ][1]= my;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4584 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4585 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4586 uint32_t *p= (uint32_t *)&h->mv_cache[list][ scan8[4*i] ][0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4587 p[0] = p[1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4588 p[8] = p[9]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4589 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4590 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4591 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4592 }else if(IS_DIRECT(mb_type)){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4593 pred_direct_motion(h, &mb_type);
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4594 dct8x8_allowed &= h->sps.direct_8x8_inference_flag;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4595 }else{
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4596 int list, mx, my, i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4597 //FIXME we should set ref_idx_l? to 0 if we use that later ...
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4598 if(IS_16X16(mb_type)){
4534
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)){
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4602 val= get_te0_golomb(&s->gb, h->ref_count[list]);
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4603 if(val >= h->ref_count[list]){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4604 av_log(h->s.avctx, AV_LOG_ERROR, "ref %u overflow\n", val);
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4605 return -1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4606 }
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
4607 }else
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4608 val= LIST_NOT_USED&0xFF;
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4609 fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, val, 1);
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4610 }
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4611 for(list=0; list<h->list_count; list++){
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4612 unsigned int val;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4613 if(IS_DIR(mb_type, 0, list)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4614 pred_motion(h, 0, 4, list, h->ref_cache[list][ scan8[0] ], &mx, &my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4615 mx += get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4616 my += get_se_golomb(&s->gb);
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
4617 tprintf(s->avctx, "final mv:%d %d\n", mx, my);
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
4618
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4619 val= pack16to32(mx,my);
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
4620 }else
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4621 val=0;
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4622 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, val, 4);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4623 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4624 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4625 else if(IS_16X8(mb_type)){
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4626 for(list=0; list<h->list_count; list++){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4627 for(i=0; i<2; i++){
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4628 unsigned int val;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4629 if(IS_DIR(mb_type, i, list)){
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4630 val= get_te0_golomb(&s->gb, h->ref_count[list]);
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4631 if(val >= h->ref_count[list]){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4632 av_log(h->s.avctx, AV_LOG_ERROR, "ref %u overflow\n", val);
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4633 return -1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4634 }
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
4635 }else
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4636 val= LIST_NOT_USED&0xFF;
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4637 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, val, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4638 }
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4639 }
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4640 for(list=0; list<h->list_count; list++){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4641 for(i=0; i<2; i++){
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4642 unsigned int val;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4643 if(IS_DIR(mb_type, i, list)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4644 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
4645 mx += get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4646 my += get_se_golomb(&s->gb);
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
4647 tprintf(s->avctx, "final mv:%d %d\n", mx, my);
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
4648
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4649 val= pack16to32(mx,my);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4650 }else
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4651 val=0;
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4652 fill_rectangle(h->mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, val, 4);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4653 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4654 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4655 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4656 assert(IS_8X16(mb_type));
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4657 for(list=0; list<h->list_count; list++){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4658 for(i=0; i<2; i++){
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4659 unsigned int val;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4660 if(IS_DIR(mb_type, i, list)){ //FIXME optimize
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
4661 val= get_te0_golomb(&s->gb, h->ref_count[list]);
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4662 if(val >= h->ref_count[list]){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4663 av_log(h->s.avctx, AV_LOG_ERROR, "ref %u overflow\n", val);
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
4664 return -1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
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 (Lo«Ác 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 (Lo«Ác 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 (Lo«Ác 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 (Lo«Ác 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 (Lo«Ác 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 (Lo«Ác 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 (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4843
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác 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 (Lo«Ác 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 (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4847 ctx += 1;
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4848 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác 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 (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4850 ctx += 1;
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4851 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác 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 (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4854 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác 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 (Lo«Ác 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 (Lo«Ác 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
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4889 static int decode_cabac_mb_type( H264Context *h ) {
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
7340
ef40221c1452 SI/SP slice support. (not bitexact)
michael
parents: 7339
diff changeset
4892 if( h->slice_type_nos == FF_I_TYPE ) {
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4893 return decode_cabac_intra_mb_type(h, 3, 1);
7340
ef40221c1452 SI/SP slice support. (not bitexact)
michael
parents: 7339
diff changeset
4894 } else if( h->slice_type_nos == FF_P_TYPE ) {
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
4895 if( get_cabac_noinline( &h->cabac, &h->cabac_state[14] ) == 0 ) {
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4896 /* P-type */
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
4897 if( get_cabac_noinline( &h->cabac, &h->cabac_state[15] ) == 0 ) {
3138
c12fc3d1c612 minor simplifications in cabac_mb_type
lorenm
parents: 3128
diff changeset
4898 /* P_L0_D16x16, P_8x8 */
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
4899 return 3 * get_cabac_noinline( &h->cabac, &h->cabac_state[16] );
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4900 } else {
3138
c12fc3d1c612 minor simplifications in cabac_mb_type
lorenm
parents: 3128
diff changeset
4901 /* P_L0_D8x16, P_L0_D16x8 */
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
4902 return 2 - get_cabac_noinline( &h->cabac, &h->cabac_state[17] );
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4903 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4904 } else {
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4905 return decode_cabac_intra_mb_type(h, 17, 0) + 5;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4906 }
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
4907 } else if( h->slice_type_nos == FF_B_TYPE ) {
2597
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
4908 const int mba_xy = h->left_mb_xy[0];
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
4909 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
4910 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
4911 int bits;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4912
3138
c12fc3d1c612 minor simplifications in cabac_mb_type
lorenm
parents: 3128
diff changeset
4913 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
4914 ctx++;
3138
c12fc3d1c612 minor simplifications in cabac_mb_type
lorenm
parents: 3128
diff changeset
4915 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
4916 ctx++;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4917
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
4918 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
4919 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
4920
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
4921 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
4922 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
4923 }
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
4924
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
4925 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
4926 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
4927 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
4928 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
4929 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
4930 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
4931 else if( bits == 13 ) {
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4932 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
4933 } 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
4934 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
4935 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
4936 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
4937
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
4938 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
4939 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
4940 } else {
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4941 /* TODO SI/SP frames? */
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4942 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
4943 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4944 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4945
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4946 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
4947 MpegEncContext * const s = &h->s;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4948 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
4949 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
4950
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4951 if(FRAME_MBAFF){ //FIXME merge with the stuff in fill_caches?
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4952 int mb_xy = mb_x + (mb_y&~1)*s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4953 mba_xy = mb_xy - 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4954 if( (mb_y&1)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4955 && h->slice_table[mba_xy] == h->slice_num
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4956 && MB_FIELD == !!IS_INTERLACED( s->current_picture.mb_type[mba_xy] ) )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4957 mba_xy += s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4958 if( MB_FIELD ){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4959 mbb_xy = mb_xy - s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4960 if( !(mb_y&1)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4961 && h->slice_table[mbb_xy] == h->slice_num
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4962 && IS_INTERLACED( s->current_picture.mb_type[mbb_xy] ) )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4963 mbb_xy -= s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4964 }else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4965 mbb_xy = mb_x + (mb_y-1)*s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4966 }else{
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
4967 int mb_xy = h->mb_xy;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4968 mba_xy = mb_xy - 1;
5781
0b3aa6f4c313 Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents: 5780
diff changeset
4969 mbb_xy = mb_xy - (s->mb_stride << FIELD_PICTURE);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4970 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4971
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4972 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
4973 ctx++;
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4974 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
4975 ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4976
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
4977 if( h->slice_type_nos == FF_B_TYPE )
3138
c12fc3d1c612 minor simplifications in cabac_mb_type
lorenm
parents: 3128
diff changeset
4978 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
4979 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
4980 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4981
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4982 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
4983 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
4984
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4985 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
4986 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
4987
2928
16d67170715c tidier cabac_intra4x4_pred_mode
lorenm
parents: 2926
diff changeset
4988 mode += 1 * get_cabac( &h->cabac, &h->cabac_state[69] );
16d67170715c tidier cabac_intra4x4_pred_mode
lorenm
parents: 2926
diff changeset
4989 mode += 2 * get_cabac( &h->cabac, &h->cabac_state[69] );
16d67170715c tidier cabac_intra4x4_pred_mode
lorenm
parents: 2926
diff changeset
4990 mode += 4 * get_cabac( &h->cabac, &h->cabac_state[69] );
16d67170715c tidier cabac_intra4x4_pred_mode
lorenm
parents: 2926
diff changeset
4991
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4992 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
4993 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
4994 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4995 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
4996 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4997
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4998 static int decode_cabac_mb_chroma_pre_mode( H264Context *h) {
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4999 const int mba_xy = h->left_mb_xy[0];
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5000 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
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 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
5003
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
5004 /* 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
5005 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
5006 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
5007
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
5008 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
5009 ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5010
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5011 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
5012 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
5013
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5014 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
5015 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
5016 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
5017 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
5018 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5019 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
5020 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5021
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5022 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
5023 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
5024
7c2ce28a0314 Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.
diego
parents: 5685
diff changeset
5025 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
5026 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
5027
7c2ce28a0314 Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.
diego
parents: 5685
diff changeset
5028 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
5029 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
5030 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
5031 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
5032 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
5033 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
5034 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
5035 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
5036 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
5037 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5038 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
5039 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
5040 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
5041
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5042 cbp_a = (h->left_cbp>>4)&0x03;
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5043 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
5044
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5045 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
5046 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
5047 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
5048 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
5049 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
5050
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5051 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
5052 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
5053 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
5054 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
5055 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5056 static int decode_cabac_mb_dqp( H264Context *h) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5057 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
5058 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
5059
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5060 if( h->last_qscale_diff != 0 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5061 ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5062
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5063 while( get_cabac_noinline( &h->cabac, &h->cabac_state[60 + ctx] ) ) {
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5064 if( ctx < 2 )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5065 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
5066 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5067 ctx = 3;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5068 val++;
3128
dd3f6be492bd don't arbitrarily limit delta_qp
lorenm
parents: 3126
diff changeset
5069 if(val > 102) //prevent infinite loop
2844
5f20ab245501 prevent assert failures and infinite loops with broken streams
michael
parents: 2834
diff changeset
5070 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
5071 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5072
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5073 if( val&0x01 )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5074 return (val + 1)/2;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5075 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5076 return -(val + 1)/2;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5077 }
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5078 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
5079 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
5080 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
5081 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
5082 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
5083 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
5084 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
5085 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
5086 }
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5087 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
5088 int type;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5089 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
5090 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
5091 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
5092 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
5093 type = 3;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5094 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
5095 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
5096 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
5097 type += 4;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5098 }
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5099 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
5100 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
5101 return type;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5102 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5103
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5104 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
5105 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
5106 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5107
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5108 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
5109 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
5110 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
5111 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
5112 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
5113
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
5114 if( h->slice_type_nos == FF_B_TYPE) {
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5115 if( refa > 0 && !h->direct_cache[scan8[n] - 1] )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5116 ctx++;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5117 if( refb > 0 && !h->direct_cache[scan8[n] - 8] )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5118 ctx += 2;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5119 } else {
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5120 if( refa > 0 )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5121 ctx++;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5122 if( refb > 0 )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5123 ctx += 2;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5124 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5125
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5126 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
5127 ref++;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5128 if( ctx < 4 )
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5129 ctx = 4;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5130 else
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5131 ctx = 5;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
5132 if(ref >= 32 /*h->ref_list[list]*/){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
5133 av_log(h->s.avctx, AV_LOG_ERROR, "overflow in decode_cabac_mb_ref\n");
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
5134 return 0; //FIXME we should return -1 and check the return everywhere
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
5135 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5136 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5137 return ref;
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
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5140 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
5141 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
5142 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
5143 int ctxbase = (l == 0) ? 40 : 47;
2317
2865f759882a optimzation
michael
parents: 2316
diff changeset
5144 int ctx, mvd;
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5145
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5146 if( amvd < 3 )
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5147 ctx = 0;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5148 else if( amvd > 32 )
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5149 ctx = 2;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5150 else
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5151 ctx = 1;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5152
2317
2865f759882a optimzation
michael
parents: 2316
diff changeset
5153 if(!get_cabac(&h->cabac, &h->cabac_state[ctxbase+ctx]))
2865f759882a optimzation
michael
parents: 2316
diff changeset
5154 return 0;
2865f759882a optimzation
michael
parents: 2316
diff changeset
5155
2865f759882a optimzation
michael
parents: 2316
diff changeset
5156 mvd= 1;
2865f759882a optimzation
michael
parents: 2316
diff changeset
5157 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
5158 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
5159 mvd++;
2317
2865f759882a optimzation
michael
parents: 2316
diff changeset
5160 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
5161 ctx++;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5162 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5163
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5164 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
5165 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
5166 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
5167 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
5168 k++;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
5169 if(k>24){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
5170 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
5171 return INT_MIN;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
5172 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5173 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5174 while( k-- ) {
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5175 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
5176 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
5177 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5178 }
4042
643cdc58bd69 slightly faster decode_cabac_mb_mvd()
michael
parents: 4041
diff changeset
5179 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
5180 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5181
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
5182 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
5183 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
5184 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
5185
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
5186 if( is_dc ) {
7181
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5187 if( cat == 0 ) {
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5188 nza = h->left_cbp&0x100;
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5189 nzb = h-> top_cbp&0x100;
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5190 } else {
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5191 nza = (h->left_cbp>>(6+idx))&0x01;
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5192 nzb = (h-> top_cbp>>(6+idx))&0x01;
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5193 }
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
5194 } else {
7183
db32d2544050 Reorder the if/else for residual cats to match gcc's branch prediction.
astrange
parents: 7182
diff changeset
5195 if( cat == 4 ) {
db32d2544050 Reorder the if/else for residual cats to match gcc's branch prediction.
astrange
parents: 7182
diff changeset
5196 nza = h->non_zero_count_cache[scan8[16+idx] - 1];
db32d2544050 Reorder the if/else for residual cats to match gcc's branch prediction.
astrange
parents: 7182
diff changeset
5197 nzb = h->non_zero_count_cache[scan8[16+idx] - 8];
db32d2544050 Reorder the if/else for residual cats to match gcc's branch prediction.
astrange
parents: 7182
diff changeset
5198 } else {
db32d2544050 Reorder the if/else for residual cats to match gcc's branch prediction.
astrange
parents: 7182
diff changeset
5199 assert(cat == 1 || cat == 2);
7181
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5200 nza = h->non_zero_count_cache[scan8[idx] - 1];
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5201 nzb = h->non_zero_count_cache[scan8[idx] - 8];
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5202 }
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
5203 }
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5204
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5205 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
5206 ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5207
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5208 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
5209 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
5210
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5211 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
5212 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5213
6753
73de16350531 One const per declaration is enough.
cehoyos
parents: 6749
diff changeset
5214 DECLARE_ASM_CONST(1, uint8_t, last_coeff_flag_offset_8x8[63]) = {
4051
19f07b651d79 decode_significance_8x8_x86()
michael
parents: 4042
diff changeset
5215 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
5216 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
5217 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
5218 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
5219 };
19f07b651d79 decode_significance_8x8_x86()
michael
parents: 4042
diff changeset
5220
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
5221 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
5222 static const int significant_coeff_flag_offset[2][6] = {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5223 { 105+0, 105+15, 105+29, 105+44, 105+47, 402 },
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5224 { 277+0, 277+15, 277+29, 277+44, 277+47, 436 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5225 };
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5226 static const int last_coeff_flag_offset[2][6] = {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5227 { 166+0, 166+15, 166+29, 166+44, 166+47, 417 },
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5228 { 338+0, 338+15, 338+29, 338+44, 338+47, 451 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5229 };
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5230 static const int coeff_abs_level_m1_offset[6] = {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5231 227+0, 227+10, 227+20, 227+30, 227+39, 426
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5232 };
4007
33d3d4ab9f59 int->uint8_t for 2 tables
michael
parents: 4001
diff changeset
5233 static const uint8_t significant_coeff_flag_offset_8x8[2][63] = {
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5234 { 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
5235 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
5236 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
5237 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
5238 { 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
5239 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
5240 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
5241 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
5242 };
6749
b1778cf7f3b1 Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents: 6717
diff changeset
5243 /* 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
5244 * 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
5245 * 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
5246 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
5247 /* 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
5248 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
5249 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
5250 /* 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
5251 { 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
5252 /* 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
5253 { 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
5254 };
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5255
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5256 int index[64];
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5257
5262
b2a95ab5d017 bring back h264 build
benoit
parents: 5254
diff changeset
5258 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
5259 int coeff_count = 0;
6749
b1778cf7f3b1 Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents: 6717
diff changeset
5260 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
5261
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5262 uint8_t *significant_coeff_ctx_base;
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5263 uint8_t *last_coeff_ctx_base;
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5264 uint8_t *abs_level_m1_ctx_base;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5265
4038
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
5266 #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
5267 #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
5268 #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
5269 #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
5270 #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
5271 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
5272 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
5273 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
5274 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
5275 #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
5276 #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
5277 #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
5278
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
5279
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5280 /* 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
5281 * 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
5282 * 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
5283 * 3-> DC Chroma n = iCbCr
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5284 * 4-> AC Chroma n = 4 * iCbCr + chroma4x4idx
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5285 * 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
5286 */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5287
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5288 /* 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
5289 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
5290 if( get_cabac( CC, &h->cabac_state[85 + get_cabac_cbf_ctx( h, cat, n, is_dc ) ] ) == 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
5291 if( !is_dc ) {
7183
db32d2544050 Reorder the if/else for residual cats to match gcc's branch prediction.
astrange
parents: 7182
diff changeset
5292 if( cat == 4 )
db32d2544050 Reorder the if/else for residual cats to match gcc's branch prediction.
astrange
parents: 7182
diff changeset
5293 h->non_zero_count_cache[scan8[16+n]] = 0;
db32d2544050 Reorder the if/else for residual cats to match gcc's branch prediction.
astrange
parents: 7182
diff changeset
5294 else
7181
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5295 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
5296 }
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
5297
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
5298 #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
5299 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
5300 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
5301 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
5302 #endif
5528
4c3b1222ff57 Don't check the return value of decode_cabac_residual since it always
conrad
parents: 5508
diff changeset
5303 return;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5304 }
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5305 }
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5306
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5307 significant_coeff_ctx_base = h->cabac_state
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5308 + significant_coeff_flag_offset[MB_FIELD][cat];
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5309 last_coeff_ctx_base = h->cabac_state
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5310 + last_coeff_flag_offset[MB_FIELD][cat];
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5311 abs_level_m1_ctx_base = h->cabac_state
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5312 + coeff_abs_level_m1_offset[cat];
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5313
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
5314 if( !is_dc && cat == 5 ) {
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5315 #define DECODE_SIGNIFICANCE( coefs, sig_off, last_off ) \
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5316 for(last= 0; last < coefs; last++) { \
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5317 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
5318 if( get_cabac( CC, sig_ctx )) { \
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5319 uint8_t *last_ctx = last_coeff_ctx_base + last_off; \
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5320 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
5321 if( get_cabac( CC, last_ctx ) ) { \
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5322 last= max_coeff; \
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5323 break; \
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5324 } \
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5325 } \
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
5326 }\
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
5327 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
5328 index[coeff_count++] = last;\
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5329 }
4009
e5f7797e53c7 10l int vs uint8_t
michael
parents: 4008
diff changeset
5330 const uint8_t *sig_off = significant_coeff_flag_offset_8x8[MB_FIELD];
5547
81226e690378 CONFIG_7REGS -> HAVE_7REGS
ramiro
parents: 5545
diff changeset
5331 #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
5332 coeff_count= decode_significance_8x8_x86(CC, significant_coeff_ctx_base, index, sig_off);
19f07b651d79 decode_significance_8x8_x86()
michael
parents: 4042
diff changeset
5333 } else {
19f07b651d79 decode_significance_8x8_x86()
michael
parents: 4042
diff changeset
5334 coeff_count= decode_significance_x86(CC, max_coeff, significant_coeff_ctx_base, index);
19f07b651d79 decode_significance_8x8_x86()
michael
parents: 4042
diff changeset
5335 #else
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5336 DECODE_SIGNIFICANCE( 63, sig_off[last], last_coeff_flag_offset_8x8[last] );
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5337 } else {
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
5338 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
5339 #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
5340 }
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5341 assert(coeff_count > 0);
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5342
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
5343 if( is_dc ) {
7181
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5344 if( cat == 0 )
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5345 h->cbp_table[h->mb_xy] |= 0x100;
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5346 else
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5347 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
5348 } else {
7183
db32d2544050 Reorder the if/else for residual cats to match gcc's branch prediction.
astrange
parents: 7182
diff changeset
5349 if( cat == 5 )
db32d2544050 Reorder the if/else for residual cats to match gcc's branch prediction.
astrange
parents: 7182
diff changeset
5350 fill_rectangle(&h->non_zero_count_cache[scan8[n]], 2, 2, 8, coeff_count, 1);
7181
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5351 else if( cat == 4 )
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5352 h->non_zero_count_cache[scan8[16+n]] = coeff_count;
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5353 else {
7183
db32d2544050 Reorder the if/else for residual cats to match gcc's branch prediction.
astrange
parents: 7182
diff changeset
5354 assert( cat == 1 || cat == 2 );
db32d2544050 Reorder the if/else for residual cats to match gcc's branch prediction.
astrange
parents: 7182
diff changeset
5355 h->non_zero_count_cache[scan8[n]] = coeff_count;
7181
069ef3bf1cef Reindent.
astrange
parents: 7180
diff changeset
5356 }
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
5357 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5358
7444
a9da32d66fec Small h264 decoding speed optimization: while->do/while
darkshikari
parents: 7424
diff changeset
5359 do {
6749
b1778cf7f3b1 Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents: 6717
diff changeset
5360 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
5361
7444
a9da32d66fec Small h264 decoding speed optimization: while->do/while
darkshikari
parents: 7424
diff changeset
5362 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
5363
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
5364 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
5365 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
5366 if( is_dc ) {
4040
9eaea06c5ba6 optimize sign decoding code in decode_residual()
michael
parents: 4038
diff changeset
5367 block[j] = get_cabac_bypass_sign( CC, -1);
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5368 }else{
6377
michael
parents: 6311
diff changeset
5369 block[j] = (get_cabac_bypass_sign( CC, -qmul[j]) + 32) >> 6;
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5370 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5371 } else {
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5372 int coeff_abs = 2;
6749
b1778cf7f3b1 Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents: 6717
diff changeset
5373 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
5374 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
5375
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
5376 while( coeff_abs < 15 && get_cabac( CC, ctx ) ) {
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5377 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
5378 }
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5379
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5380 if( coeff_abs >= 15 ) {
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5381 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
5382 while( get_cabac_bypass( CC ) ) {
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5383 j++;
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5384 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5385
4016
29ea06410ce7 simplify escape decoding
michael
parents: 4009
diff changeset
5386 coeff_abs=1;
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5387 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
5388 coeff_abs += coeff_abs + get_cabac_bypass( CC );
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5389 }
4016
29ea06410ce7 simplify escape decoding
michael
parents: 4009
diff changeset
5390 coeff_abs+= 14;
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5391 }
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5392
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
5393 if( is_dc ) {
7184
9a8278d65858 Use get_cabac_bypass_sign instead of an if/else.
astrange
parents: 7183
diff changeset
5394 block[j] = get_cabac_bypass_sign( CC, -coeff_abs );
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5395 }else{
7184
9a8278d65858 Use get_cabac_bypass_sign instead of an if/else.
astrange
parents: 7183
diff changeset
5396 block[j] = (get_cabac_bypass_sign( CC, -coeff_abs ) * qmul[j] + 32) >> 6;
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5397 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5398 }
7444
a9da32d66fec Small h264 decoding speed optimization: while->do/while
darkshikari
parents: 7424
diff changeset
5399 } 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
5400 #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
5401 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
5402 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
5403 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
5404 #endif
5528
4c3b1222ff57 Don't check the return value of decode_cabac_residual since it always
conrad
parents: 5508
diff changeset
5405
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5406 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5407
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
5408 #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
5409 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
5410 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
5411 }
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
5412
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
5413 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
5414 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
5415 }
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
5416 #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
5417
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
5418 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
5419 #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
5420 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
5421 #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
5422 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
5423 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
5424 #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
5425 }
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
5426
4908
777f250df232 Fix multiple "¡Æinline/static¡Ç is not at beginning of declaration" warnings.
diego
parents: 4896
diff changeset
5427 static inline void compute_mb_neighbors(H264Context *h)
2597
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5428 {
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5429 MpegEncContext * const s = &h->s;
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
5430 const int mb_xy = h->mb_xy;
2597
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5431 h->top_mb_xy = mb_xy - s->mb_stride;
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5432 h->left_mb_xy[0] = mb_xy - 1;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5433 if(FRAME_MBAFF){
2597
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5434 const int pair_xy = s->mb_x + (s->mb_y & ~1)*s->mb_stride;
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5435 const int top_pair_xy = pair_xy - s->mb_stride;
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5436 const int top_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[top_pair_xy]);
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5437 const int left_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[pair_xy-1]);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5438 const int curr_mb_frame_flag = !MB_FIELD;
2597
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5439 const int bottom = (s->mb_y & 1);
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5440 if (bottom
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5441 ? !curr_mb_frame_flag // bottom macroblock
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5442 : (!curr_mb_frame_flag && !top_mb_frame_flag) // top macroblock
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5443 ) {
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5444 h->top_mb_xy -= s->mb_stride;
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5445 }
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5446 if (left_mb_frame_flag != curr_mb_frame_flag) {
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5447 h->left_mb_xy[0] = pair_xy - 1;
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5448 }
5781
0b3aa6f4c313 Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents: 5780
diff changeset
5449 } else if (FIELD_PICTURE) {
0b3aa6f4c313 Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents: 5780
diff changeset
5450 h->top_mb_xy -= s->mb_stride;
2597
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5451 }
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5452 return;
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5453 }
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5454
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 /**
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5456 * decodes a macroblock
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
5457 * @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
5458 */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5459 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
5460 MpegEncContext * const s = &h->s;
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
5461 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
5462 int mb_type, partition_count, cbp = 0;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5463 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
5464
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
5465 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
5466
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
5467 s->dsp.clear_blocks(h->mb); //FIXME avoid if already clear (move after skip handlong?)
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5468
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
5469 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
5470 if( h->slice_type_nos != FF_I_TYPE ) {
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5471 int skip;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5472 /* a skipped mb needs the aff flag from the following mb */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5473 if( FRAME_MBAFF && s->mb_x==0 && (s->mb_y&1)==0 )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5474 predict_field_decoding_flag(h);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5475 if( FRAME_MBAFF && (s->mb_y&1)==1 && h->prev_mb_skipped )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5476 skip = h->next_mb_skipped;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5477 else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5478 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
5479 /* read skip flags */
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5480 if( skip ) {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5481 if( FRAME_MBAFF && (s->mb_y&1)==0 ){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5482 s->current_picture.mb_type[mb_xy] = MB_TYPE_SKIP;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5483 h->next_mb_skipped = decode_cabac_mb_skip( h, s->mb_x, s->mb_y+1 );
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5484 if(h->next_mb_skipped)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5485 predict_field_decoding_flag(h);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5486 else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5487 h->mb_mbaff = h->mb_field_decoding_flag = decode_cabac_field_decoding_flag(h);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5488 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5489
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5490 decode_mb_skip(h);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5491
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5492 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
5493 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
5494 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
5495
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5496 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
5497
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 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5500 if(FRAME_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5501 if( (s->mb_y&1) == 0 )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5502 h->mb_mbaff =
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5503 h->mb_field_decoding_flag = decode_cabac_field_decoding_flag(h);
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5504 }else
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5505 h->mb_field_decoding_flag= (s->picture_structure!=PICT_FRAME);
5357b214eda0 CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5506
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
5507 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
5508
3077
385e54795a9e Fix silly typos.
diego
parents: 3071
diff changeset
5509 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
5510 if( ( mb_type = decode_cabac_mb_type( h ) ) < 0 ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5511 av_log( h->s.avctx, AV_LOG_ERROR, "decode_cabac_mb_type failed\n" );
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5512 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
5513 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5514
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
5515 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
5516 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
5517 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
5518 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
5519 }else{
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5520 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
5521 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
5522 }
7340
ef40221c1452 SI/SP slice support. (not bitexact)
michael
parents: 7339
diff changeset
5523 } else if( h->slice_type_nos == FF_P_TYPE ) {
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5524 if( mb_type < 5) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5525 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
5526 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
5527 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5528 mb_type -= 5;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5529 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
5530 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5531 } else {
7340
ef40221c1452 SI/SP slice support. (not bitexact)
michael
parents: 7339
diff changeset
5532 if(h->slice_type == FF_SI_TYPE && mb_type)
ef40221c1452 SI/SP slice support. (not bitexact)
michael
parents: 7339
diff changeset
5533 mb_type--;
ef40221c1452 SI/SP slice support. (not bitexact)
michael
parents: 7339
diff changeset
5534 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
5535 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
5536 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
5537 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
5538 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
5539 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
5540 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5541 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
5542 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
5543
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5544 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
5545
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5546 if(IS_INTRA_PCM(mb_type)) {
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5547 const uint8_t *ptr;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5548 unsigned int x, y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5549
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5106
diff changeset
5550 // 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
5551 // 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
5552 // 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
5553 ptr= h->cabac.bytestream;
4344
4aa24216f71a fix 16 CABAC_BIT * 10l bug introduced in r6578
michael
parents: 4283
diff changeset
5554 if(h->cabac.low&0x1) ptr--;
4aa24216f71a fix 16 CABAC_BIT * 10l bug introduced in r6578
michael
parents: 4283
diff changeset
5555 if(CABAC_BITS==16){
4aa24216f71a fix 16 CABAC_BIT * 10l bug introduced in r6578
michael
parents: 4283
diff changeset
5556 if(h->cabac.low&0x1FF) ptr--;
4aa24216f71a fix 16 CABAC_BIT * 10l bug introduced in r6578
michael
parents: 4283
diff changeset
5557 }
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5558
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5559 // The pixels are stored in the same order as levels in h->mb array.
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5560 for(y=0; y<16; y++){
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5561 const int index= 4*(y&3) + 32*((y>>2)&1) + 128*(y>>3);
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5562 for(x=0; x<16; x++){
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
5563 tprintf(s->avctx, "LUMA ICPM LEVEL (%3d)\n", *ptr);
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5564 h->mb[index + (x&3) + 16*((x>>2)&1) + 64*(x>>3)]= *ptr++;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5565 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5566 }
7407
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
5567 if(CHROMA){
7408
michael
parents: 7407
diff changeset
5568 for(y=0; y<8; y++){
michael
parents: 7407
diff changeset
5569 const int index= 256 + 4*(y&3) + 32*(y>>2);
michael
parents: 7407
diff changeset
5570 for(x=0; x<8; x++){
michael
parents: 7407
diff changeset
5571 tprintf(s->avctx, "CHROMA U ICPM LEVEL (%3d)\n", *ptr);
michael
parents: 7407
diff changeset
5572 h->mb[index + (x&3) + 16*(x>>2)]= *ptr++;
michael
parents: 7407
diff changeset
5573 }
michael
parents: 7407
diff changeset
5574 }
michael
parents: 7407
diff changeset
5575 for(y=0; y<8; y++){
michael
parents: 7407
diff changeset
5576 const int index= 256 + 64 + 4*(y&3) + 32*(y>>2);
michael
parents: 7407
diff changeset
5577 for(x=0; x<8; x++){
michael
parents: 7407
diff changeset
5578 tprintf(s->avctx, "CHROMA V ICPM LEVEL (%3d)\n", *ptr);
michael
parents: 7407
diff changeset
5579 h->mb[index + (x&3) + 16*(x>>2)]= *ptr++;
michael
parents: 7407
diff changeset
5580 }
michael
parents: 7407
diff changeset
5581 }
7407
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
5582 }
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5583
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5584 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
5585
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
5586 // All blocks are present
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5587 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
5588 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
5589 // In deblocking, the quantizer is 0
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5590 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
5591 // All coeffs are present
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5592 memset(h->non_zero_count[mb_xy], 16, 16);
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5593 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
5594 h->last_qscale_diff = 0;
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5595 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
5596 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5597
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5598 if(MB_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5599 h->ref_count[0] <<= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5600 h->ref_count[1] <<= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5601 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5602
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
5603 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
5604
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5605 if( IS_INTRA( mb_type ) ) {
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
5606 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
5607 if( IS_INTRA4x4( mb_type ) ) {
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5608 if( dct8x8_allowed && decode_cabac_mb_transform_size( h ) ) {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5609 mb_type |= MB_TYPE_8x8DCT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5610 for( i = 0; i < 16; i+=4 ) {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5611 int pred = pred_intra_mode( h, i );
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5612 int mode = decode_cabac_mb_intra4x4_pred_mode( h, pred );
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5613 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
5614 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5615 } else {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5616 for( i = 0; i < 16; i++ ) {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5617 int pred = pred_intra_mode( h, i );
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5618 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
5619
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5620 //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
5621 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5622 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5623 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
5624 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
5625 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5626 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
5627 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
5628 }
7407
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
5629 if(CHROMA){
7408
michael
parents: 7407
diff changeset
5630 h->chroma_pred_mode_table[mb_xy] =
michael
parents: 7407
diff changeset
5631 pred_mode = decode_cabac_mb_chroma_pre_mode( h );
michael
parents: 7407
diff changeset
5632
michael
parents: 7407
diff changeset
5633 pred_mode= check_intra_pred_mode( h, pred_mode );
michael
parents: 7407
diff changeset
5634 if( pred_mode < 0 ) return -1;
michael
parents: 7407
diff changeset
5635 h->chroma_pred_mode= pred_mode;
7407
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
5636 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5637 } 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
5638 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
5639
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
5640 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
5641 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
5642 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
5643 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
5644 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
5645 }
3482
c08b46172204 slightly faster h264 fill_caches()
lorenm
parents: 3455
diff changeset
5646 if( IS_DIRECT(h->sub_mb_type[0] | h->sub_mb_type[1] |
c08b46172204 slightly faster h264 fill_caches()
lorenm
parents: 3455
diff changeset
5647 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
5648 pred_direct_motion(h, &mb_type);
5425
1fdfea5024a7 fix cabac decoding with some Blue-Ray sources
gpoirier
parents: 5380
diff changeset
5649 h->ref_cache[0][scan8[4]] =
1fdfea5024a7 fix cabac decoding with some Blue-Ray sources
gpoirier
parents: 5380
diff changeset
5650 h->ref_cache[1][scan8[4]] =
1fdfea5024a7 fix cabac decoding with some Blue-Ray sources
gpoirier
parents: 5380
diff changeset
5651 h->ref_cache[0][scan8[12]] =
1fdfea5024a7 fix cabac decoding with some Blue-Ray sources
gpoirier
parents: 5380
diff changeset
5652 h->ref_cache[1][scan8[12]] = PART_NOT_AVAILABLE;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5653 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
5654 for( i = 0; i < 4; i++ )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5655 if( IS_DIRECT(h->sub_mb_type[i]) )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5656 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
5657 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5658 }
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5659 } else {
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5660 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
5661 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
5662 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
5663 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
5664 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5665 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5666
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
5667 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
5668 for( i = 0; i < 4; i++ ) {
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5669 if(IS_DIRECT(h->sub_mb_type[i])) continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5670 if(IS_DIR(h->sub_mb_type[i], 0, list)){
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5671 if( h->ref_count[list] > 1 )
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5672 ref[list][i] = decode_cabac_mb_ref( h, list, 4*i );
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5673 else
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5674 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
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 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
5677 }
2110
michael
parents: 2099
diff changeset
5678 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
5679 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
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
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5683 if(dct8x8_allowed)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5684 dct8x8_allowed = get_dct8x8_allowed(h);
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5685
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
5686 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
5687 for(i=0; i<4; i++){
5425
1fdfea5024a7 fix cabac decoding with some Blue-Ray sources
gpoirier
parents: 5380
diff changeset
5688 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
5689 if(IS_DIRECT(h->sub_mb_type[i])){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5690 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
5691 continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5692 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5693
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5694 if(IS_DIR(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
5695 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
5696 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
5697 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
5698 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
5699 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
5700 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
5701 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
5702 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
5703 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
5704
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5705 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
5706 my = mpy + decode_cabac_mb_mvd( h, list, index, 1 );
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
5707 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
5708
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5709 if(IS_SUB_8X8(sub_mb_type)){
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5710 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
5711 mv_cache[ 8 ][0]= mv_cache[ 9 ][0]= mx;
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5712 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
5713 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
5714
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5715 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
5716 mvd_cache[ 8 ][0]= mvd_cache[ 9 ][0]= mx - mpx;
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5717 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
5718 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
5719 }else if(IS_SUB_8X4(sub_mb_type)){
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5720 mv_cache[ 1 ][0]= mx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5721 mv_cache[ 1 ][1]= my;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5722
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5723 mvd_cache[ 1 ][0]= mx - mpx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5724 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
5725 }else if(IS_SUB_4X8(sub_mb_type)){
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5726 mv_cache[ 8 ][0]= mx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5727 mv_cache[ 8 ][1]= my;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5728
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5729 mvd_cache[ 8 ][0]= mx - mpx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5730 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
5731 }
4530
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5732 mv_cache[ 0 ][0]= mx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5733 mv_cache[ 0 ][1]= my;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5734
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5735 mvd_cache[ 0 ][0]= mx - mpx;
e47cc0486771 factorize mv_cache and mvd_cache init
michael
parents: 4529
diff changeset
5736 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
5737 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5738 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5739 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
5740 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
5741 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
5742 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
5743 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5744 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5745 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5746 } else if( IS_DIRECT(mb_type) ) {
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5747 pred_direct_motion(h, &mb_type);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5748 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
5749 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
5750 dct8x8_allowed &= h->sps.direct_8x8_inference_flag;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5751 } else {
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5752 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
5753 if(IS_16X16(mb_type)){
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
5754 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
5755 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
5756 const int ref = h->ref_count[list] > 1 ? decode_cabac_mb_ref( h, list, 0 ) : 0;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5757 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
5758 }else
4534
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
5759 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
5760 }
a856fe4b80f0 factorize fill_rectangle()
michael
parents: 4533
diff changeset
5761 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
5762 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
5763 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
5764
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5765 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
5766 my = mpy + decode_cabac_mb_mvd( h, list, 0, 1 );
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
5767 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
5768
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5769 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
5770 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
5771 }else
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
5772 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
5773 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5774 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5775 else if(IS_16X8(mb_type)){
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
5776 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
5777 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
5778 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
5779 const int ref= h->ref_count[list] > 1 ? decode_cabac_mb_ref( h, list, 8*i ) : 0;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5780 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
5781 }else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5782 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
5783 }
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
5784 }
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
5785 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
5786 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
5787 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
5788 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
5789 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
5790 my = mpy + decode_cabac_mb_mvd( h, list, 8*i, 1 );
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
5791 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
5792
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5793 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
5794 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
5795 }else{
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5796 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
5797 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
5798 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5799 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5800 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5801 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5802 assert(IS_8X16(mb_type));
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
5803 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
5804 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
5805 if(IS_DIR(mb_type, i, list)){ //FIXME optimize
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5806 const int ref= h->ref_count[list] > 1 ? decode_cabac_mb_ref( h, list, 4*i ) : 0;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5807 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
5808 }else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5809 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
5810 }
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
5811 }
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
5812 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
5813 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
5814 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
5815 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
5816 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
5817 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
5818
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
5819 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
5820 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
5821 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
5822 }else{
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5823 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
5824 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
5825 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5826 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5827 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5828 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5829 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5830
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
5831 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
5832 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
5833 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
5834 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5835
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5836 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
5837 cbp = decode_cabac_mb_cbp_luma( h );
7407
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
5838 if(CHROMA)
7408
michael
parents: 7407
diff changeset
5839 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
5840 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5841
3651
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
5842 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
5843
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5844 if( dct8x8_allowed && (cbp&15) && !IS_INTRA( mb_type ) ) {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5845 if( decode_cabac_mb_transform_size( h ) )
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5846 mb_type |= MB_TYPE_8x8DCT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5847 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5848 s->current_picture.mb_type[mb_xy]= mb_type;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5849
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5850 if( cbp || IS_INTRA16x16( mb_type ) ) {
3174
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
5851 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
5852 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
5853 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
5854
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5855 if(IS_INTERLACED(mb_type)){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5856 scan8x8= s->qscale ? h->field_scan8x8 : h->field_scan8x8_q0;
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
5857 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
5858 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
5859 }else{
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5860 scan8x8= s->qscale ? h->zigzag_scan8x8 : h->zigzag_scan8x8_q0;
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
5861 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
5862 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
5863 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5864
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5865 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
5866 if( dqp == INT_MIN ){
a95e55679dfa check return value of decode_cabac_mb_dqp, it is INT_MIN on error.
reimar
parents: 2867
diff changeset
5867 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
5868 return -1;
a95e55679dfa check return value of decode_cabac_mb_dqp, it is INT_MIN on error.
reimar
parents: 2867
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 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
5871 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
5872 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
5873 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
5874 }
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
5875 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
5876 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
5877
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5878 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
5879 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
5880 //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
5881 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
5882
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5883 if( cbp&15 ) {
5705
c08c9340c7ca factor out dequant table lookup outside loops, gives a 1-2% speed-up
gpoirier
parents: 5698
diff changeset
5884 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
5885 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
5886 //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
5887 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
5888 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5889 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5890 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
5891 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5892 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5893 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
5894 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
5895 if( cbp & (1<<i8x8) ) {
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5896 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
5897 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
5898 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
5899 } else {
5713
f45228f65e06 reindent
andoma
parents: 5705
diff changeset
5900 qmul = h->dequant4_coeff[IS_INTRA( mb_type ) ? 0:3][s->qscale];
f45228f65e06 reindent
andoma
parents: 5705
diff changeset
5901 for( i4x4 = 0; i4x4 < 4; i4x4++ ) {
f45228f65e06 reindent
andoma
parents: 5705
diff changeset
5902 const int index = 4*i8x8 + i4x4;
f45228f65e06 reindent
andoma
parents: 5705
diff changeset
5903 //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
5904 //START_TIMER
5713
f45228f65e06 reindent
andoma
parents: 5705
diff changeset
5905 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
5906 //STOP_TIMER("decode_residual")
5713
f45228f65e06 reindent
andoma
parents: 5705
diff changeset
5907 }
5705
c08c9340c7ca factor out dequant table lookup outside loops, gives a 1-2% speed-up
gpoirier
parents: 5698
diff changeset
5908 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5909 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5910 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
5911 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
5912 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5913 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5914 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5915
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5916 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
5917 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
5918 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
5919 //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
5920 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
5921 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5922 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5923
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5924 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
5925 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
5926 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
5927 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
5928 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
5929 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
5930 //av_log( s->avctx, AV_LOG_ERROR, "INTRA C%d-AC %d\n",c, index - 16 );
5528
4c3b1222ff57 Don't check the return value of decode_cabac_residual since it always
conrad
parents: 5508
diff changeset
5931 decode_cabac_residual(h, h->mb + 16*index, 4, index - 16, scan + 1, qmul, 15);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5932 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5933 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5934 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5935 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
5936 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
5937 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
5938 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5939 } else {
2315
29b67549d0cc fix CABAC+LOOP missmatch
michael
parents: 2314
diff changeset
5940 uint8_t * const nnz= &h->non_zero_count_cache[0];
29b67549d0cc fix CABAC+LOOP missmatch
michael
parents: 2314
diff changeset
5941 fill_rectangle(&nnz[scan8[0]], 4, 4, 8, 0, 1);
29b67549d0cc fix CABAC+LOOP missmatch
michael
parents: 2314
diff changeset
5942 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
5943 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
5944 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
5945 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5946
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5947 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
5948 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
5949
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5950 if(MB_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5951 h->ref_count[0] >>= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5952 h->ref_count[1] >>= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5953 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5954
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5955 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
5956 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5957
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5958
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
5959 static void filter_mb_edgev( H264Context *h, uint8_t *pix, int stride, int16_t bS[4], int qp ) {
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5960 int i, d;
4118
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
5961 const int index_a = qp + h->slice_alpha_c0_offset;
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
5962 const int alpha = (alpha_table+52)[index_a];
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
5963 const int beta = (beta_table+52)[qp + h->slice_beta_offset];
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5964
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
5965 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
5966 int8_t tc[4];
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
5967 for(i=0; i<4; i++)
4118
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
5968 tc[i] = bS[i] ? (tc0_table+52)[index_a][bS[i] - 1] : -1;
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
5969 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
5970 } else {
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
5971 /* 16px edge length, because bS=4 is triggered by being at
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
5972 * the edge of an intra MB, so all 4 bS are the same */
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
5973 for( d = 0; d < 16; d++ ) {
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5974 const int p0 = pix[-1];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5975 const int p1 = pix[-2];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5976 const int p2 = pix[-3];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5977
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5978 const int q0 = pix[0];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5979 const int q1 = pix[1];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5980 const int q2 = pix[2];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5981
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
5982 if( FFABS( p0 - q0 ) < alpha &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
5983 FFABS( p1 - p0 ) < beta &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
5984 FFABS( q1 - q0 ) < beta ) {
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
5985
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
5986 if(FFABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
5987 if( FFABS( p2 - p0 ) < beta)
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5988 {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5989 const int p3 = pix[-4];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5990 /* p0', p1', p2' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5991 pix[-1] = ( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5992 pix[-2] = ( p2 + p1 + p0 + q0 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5993 pix[-3] = ( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5994 } else {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5995 /* p0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5996 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5997 }
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
5998 if( FFABS( q2 - q0 ) < beta)
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5999 {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6000 const int q3 = pix[3];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6001 /* q0', q1', q2' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6002 pix[0] = ( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6003 pix[1] = ( p0 + q0 + q1 + q2 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6004 pix[2] = ( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6005 } else {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6006 /* q0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6007 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6008 }
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6009 }else{
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6010 /* p0', q0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6011 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6012 pix[ 0] = ( 2*q1 + q0 + p1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6013 }
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
6014 tprintf(h->s.avctx, "filter_mb_edgev i:%d d:%d\n# bS:4 -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x]\n", i, d, p2, p1, p0, q0, q1, q2, pix[-2], pix[-1], pix[0], pix[1]);
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6015 }
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6016 pix += stride;
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6017 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6018 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6019 }
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6020 static void filter_mb_edgecv( H264Context *h, uint8_t *pix, int stride, int16_t bS[4], int qp ) {
2834
fd5d7c732c6b kill a bunch of compiler warnings
mru
parents: 2815
diff changeset
6021 int i;
4118
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
6022 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
6023 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
6024 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
6025
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6026 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
6027 int8_t tc[4];
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6028 for(i=0; i<4; i++)
4118
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
6029 tc[i] = bS[i] ? (tc0_table+52)[index_a][bS[i] - 1] + 1 : 0;
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6030 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
6031 } else {
2707
360024d31dab H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents: 2683
diff changeset
6032 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
6033 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6034 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6035
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6036 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
6037 int i;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6038 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
6039 int index_a;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6040 int alpha;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6041 int beta;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6042
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6043 int qp_index;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6044 int bS_index = (i >> 1);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6045 if (!MB_FIELD) {
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6046 bS_index &= ~1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6047 bS_index |= (i & 1);
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 if( bS[bS_index] == 0 ) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6051 continue;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6052 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6053
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6054 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
6055 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
6056 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
6057 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
6058
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6059 if( bS[bS_index] < 4 ) {
4118
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
6060 const int tc0 = (tc0_table+52)[index_a][bS[bS_index] - 1];
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6061 const int p0 = pix[-1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6062 const int p1 = pix[-2];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6063 const int p2 = pix[-3];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6064 const int q0 = pix[0];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6065 const int q1 = pix[1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6066 const int q2 = pix[2];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6067
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6068 if( FFABS( p0 - q0 ) < alpha &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6069 FFABS( p1 - p0 ) < beta &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6070 FFABS( q1 - q0 ) < beta ) {
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6071 int tc = tc0;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6072 int i_delta;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6073
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6074 if( FFABS( p2 - p0 ) < beta ) {
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
6075 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
6076 tc++;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6077 }
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6078 if( FFABS( q2 - q0 ) < beta ) {
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
6079 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
6080 tc++;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6081 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6082
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
6083 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
6084 pix[-1] = av_clip_uint8( p0 + i_delta ); /* p0' */
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
6085 pix[0] = av_clip_uint8( q0 - i_delta ); /* q0' */
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
6086 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
6087 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6088 }else{
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6089 const int p0 = pix[-1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6090 const int p1 = pix[-2];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6091 const int p2 = pix[-3];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6092
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6093 const int q0 = pix[0];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6094 const int q1 = pix[1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6095 const int q2 = pix[2];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6096
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6097 if( FFABS( p0 - q0 ) < alpha &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6098 FFABS( p1 - p0 ) < beta &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6099 FFABS( q1 - q0 ) < beta ) {
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6100
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6101 if(FFABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6102 if( FFABS( p2 - p0 ) < beta)
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6103 {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6104 const int p3 = pix[-4];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6105 /* p0', p1', p2' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6106 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
6107 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
6108 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
6109 } else {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6110 /* p0' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6111 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
6112 }
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6113 if( FFABS( q2 - q0 ) < beta)
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6114 {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6115 const int q3 = pix[3];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6116 /* q0', q1', q2' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6117 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
6118 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
6119 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
6120 } else {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6121 /* q0' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6122 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
6123 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6124 }else{
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6125 /* p0', q0' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6126 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
6127 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
6128 }
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
6129 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
6130 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6131 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6132 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6133 }
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6134 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
6135 int i;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6136 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
6137 int index_a;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6138 int alpha;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6139 int beta;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6140
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6141 int qp_index;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6142 int bS_index = i;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6143
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6144 if( bS[bS_index] == 0 ) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6145 continue;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6146 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6147
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6148 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
6149 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
6150 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
6151 beta = (beta_table+52)[qp[qp_index] + h->slice_beta_offset];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6152
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6153 if( bS[bS_index] < 4 ) {
4118
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
6154 const int tc = (tc0_table+52)[index_a][bS[bS_index] - 1] + 1;
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6155 const int p0 = pix[-1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6156 const int p1 = pix[-2];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6157 const int q0 = pix[0];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6158 const int q1 = pix[1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6159
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6160 if( FFABS( p0 - q0 ) < alpha &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6161 FFABS( p1 - p0 ) < beta &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6162 FFABS( q1 - q0 ) < beta ) {
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
6163 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
6164
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
6165 pix[-1] = av_clip_uint8( p0 + i_delta ); /* p0' */
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
6166 pix[0] = av_clip_uint8( q0 - i_delta ); /* q0' */
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
6167 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
6168 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6169 }else{
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6170 const int p0 = pix[-1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6171 const int p1 = pix[-2];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6172 const int q0 = pix[0];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6173 const int q1 = pix[1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6174
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6175 if( FFABS( p0 - q0 ) < alpha &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6176 FFABS( p1 - p0 ) < beta &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6177 FFABS( q1 - q0 ) < beta ) {
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6178
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6179 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
6180 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; /* q0' */
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
6181 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
6182 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6183 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6184 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6185 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6186
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6187 static void filter_mb_edgeh( H264Context *h, uint8_t *pix, int stride, int16_t bS[4], int qp ) {
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6188 int i, d;
4118
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
6189 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
6190 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
6191 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
6192 const int pix_next = stride;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6193
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6194 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
6195 int8_t tc[4];
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6196 for(i=0; i<4; i++)
4118
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
6197 tc[i] = bS[i] ? (tc0_table+52)[index_a][bS[i] - 1] : -1;
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6198 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
6199 } else {
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6200 /* 16px edge length, see filter_mb_edgev */
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6201 for( d = 0; d < 16; d++ ) {
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6202 const int p0 = pix[-1*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6203 const int p1 = pix[-2*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6204 const int p2 = pix[-3*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6205 const int q0 = pix[0];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6206 const int q1 = pix[1*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6207 const int q2 = pix[2*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6208
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6209 if( FFABS( p0 - q0 ) < alpha &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6210 FFABS( p1 - p0 ) < beta &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6211 FFABS( q1 - q0 ) < beta ) {
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6212
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6213 const int p3 = pix[-4*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6214 const int q3 = pix[ 3*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6215
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6216 if(FFABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6217 if( FFABS( p2 - p0 ) < beta) {
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6218 /* p0', p1', p2' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6219 pix[-1*pix_next] = ( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6220 pix[-2*pix_next] = ( p2 + p1 + p0 + q0 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6221 pix[-3*pix_next] = ( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6222 } else {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6223 /* p0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6224 pix[-1*pix_next] = ( 2*p1 + p0 + q1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6225 }
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6226 if( FFABS( q2 - q0 ) < beta) {
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6227 /* q0', q1', q2' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6228 pix[0*pix_next] = ( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6229 pix[1*pix_next] = ( p0 + q0 + q1 + q2 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6230 pix[2*pix_next] = ( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6231 } else {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6232 /* q0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6233 pix[0*pix_next] = ( 2*q1 + q0 + p1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6234 }
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6235 }else{
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6236 /* p0', q0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6237 pix[-1*pix_next] = ( 2*p1 + p0 + q1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6238 pix[ 0*pix_next] = ( 2*q1 + q0 + p1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6239 }
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
6240 tprintf(h->s.avctx, "filter_mb_edgeh i:%d d:%d, qp:%d, indexA:%d, alpha:%d, beta:%d\n# bS:%d -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x]\n", i, d, qp, index_a, alpha, beta, bS[i], p2, p1, p0, q0, q1, q2, pix[-2*pix_next], pix[-pix_next], pix[0], pix[pix_next]);
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6241 }
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6242 pix++;
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6243 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6244 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6245 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6246
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6247 static void filter_mb_edgech( H264Context *h, uint8_t *pix, int stride, int16_t bS[4], int qp ) {
2834
fd5d7c732c6b kill a bunch of compiler warnings
mru
parents: 2815
diff changeset
6248 int i;
4118
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
6249 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
6250 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
6251 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
6252
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6253 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
6254 int8_t tc[4];
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6255 for(i=0; i<4; i++)
4118
a1786732cd62 merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents: 4113
diff changeset
6256 tc[i] = bS[i] ? (tc0_table+52)[index_a][bS[i] - 1] + 1 : 0;
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6257 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
6258 } else {
2707
360024d31dab H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents: 2683
diff changeset
6259 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
6260 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6261 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6262
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6263 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
6264 MpegEncContext * const s = &h->s;
5883
c64d94561b19 Fix deblocking filter for field pictures by properly looking for first
heydowns
parents: 5878
diff changeset
6265 int mb_y_firstrow = s->picture_structure == PICT_BOTTOM_FIELD;
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6266 int mb_xy, mb_type;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6267 int qp, qp0, qp1, qpc, qpc0, qpc1, qp_thresh;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6268
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
6269 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
6270
5883
c64d94561b19 Fix deblocking filter for field pictures by properly looking for first
heydowns
parents: 5878
diff changeset
6271 if(mb_x==0 || mb_y==mb_y_firstrow || !s->dsp.h264_loop_filter_strength || h->pps.chroma_qp_diff ||
7332
b1003e468c3d Fix used references indexes in the loop filter.
michael
parents: 7327
diff changeset
6272 1 ||
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
6273 (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
6274 h->slice_table[mb_xy] != h->slice_table[mb_xy - 1]))) {
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6275 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
6276 return;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6277 }
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6278 assert(!FRAME_MBAFF);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6279
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6280 mb_type = s->current_picture.mb_type[mb_xy];
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6281 qp = s->current_picture.qscale_table[mb_xy];
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6282 qp0 = s->current_picture.qscale_table[mb_xy-1];
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6283 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
6284 qpc = get_chroma_qp( h, 0, qp );
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6285 qpc0 = get_chroma_qp( h, 0, qp0 );
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6286 qpc1 = get_chroma_qp( h, 0, qp1 );
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6287 qp0 = (qp + qp0 + 1) >> 1;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6288 qp1 = (qp + qp1 + 1) >> 1;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6289 qpc0 = (qpc + qpc0 + 1) >> 1;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6290 qpc1 = (qpc + qpc1 + 1) >> 1;
3651
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6291 qp_thresh = 15 - h->slice_alpha_c0_offset;
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6292 if(qp <= qp_thresh && qp0 <= qp_thresh && qp1 <= qp_thresh &&
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6293 qpc <= qp_thresh && qpc0 <= qp_thresh && qpc1 <= qp_thresh)
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6294 return;
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6295
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6296 if( IS_INTRA(mb_type) ) {
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6297 int16_t bS4[4] = {4,4,4,4};
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6298 int16_t bS3[4] = {3,3,3,3};
5797
cd21fd29cf7c Fix deblocking for PAFF content
andoma
parents: 5787
diff changeset
6299 int16_t *bSH = FIELD_PICTURE ? bS3 : bS4;
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6300 if( IS_8x8DCT(mb_type) ) {
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6301 filter_mb_edgev( h, &img_y[4*0], linesize, bS4, qp0 );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6302 filter_mb_edgev( h, &img_y[4*2], linesize, bS3, qp );
5797
cd21fd29cf7c Fix deblocking for PAFF content
andoma
parents: 5787
diff changeset
6303 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
6304 filter_mb_edgeh( h, &img_y[4*2*linesize], linesize, bS3, qp );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6305 } else {
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6306 filter_mb_edgev( h, &img_y[4*0], linesize, bS4, qp0 );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6307 filter_mb_edgev( h, &img_y[4*1], linesize, bS3, qp );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6308 filter_mb_edgev( h, &img_y[4*2], linesize, bS3, qp );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6309 filter_mb_edgev( h, &img_y[4*3], linesize, bS3, qp );
5797
cd21fd29cf7c Fix deblocking for PAFF content
andoma
parents: 5787
diff changeset
6310 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
6311 filter_mb_edgeh( h, &img_y[4*1*linesize], linesize, bS3, qp );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6312 filter_mb_edgeh( h, &img_y[4*2*linesize], linesize, bS3, qp );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6313 filter_mb_edgeh( h, &img_y[4*3*linesize], linesize, bS3, qp );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6314 }
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6315 filter_mb_edgecv( h, &img_cb[2*0], uvlinesize, bS4, qpc0 );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6316 filter_mb_edgecv( h, &img_cb[2*2], uvlinesize, bS3, qpc );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6317 filter_mb_edgecv( h, &img_cr[2*0], uvlinesize, bS4, qpc0 );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6318 filter_mb_edgecv( h, &img_cr[2*2], uvlinesize, bS3, qpc );
5797
cd21fd29cf7c Fix deblocking for PAFF content
andoma
parents: 5787
diff changeset
6319 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
6320 filter_mb_edgech( h, &img_cb[2*2*uvlinesize], uvlinesize, bS3, qpc );
5797
cd21fd29cf7c Fix deblocking for PAFF content
andoma
parents: 5787
diff changeset
6321 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
6322 filter_mb_edgech( h, &img_cr[2*2*uvlinesize], uvlinesize, bS3, qpc );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6323 return;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6324 } else {
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6325 DECLARE_ALIGNED_8(int16_t, bS[2][4][4]);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6326 uint64_t (*bSv)[4] = (uint64_t(*)[4])bS;
3651
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6327 int edges;
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6328 if( IS_8x8DCT(mb_type) && (h->cbp&7) == 7 ) {
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6329 edges = 4;
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6330 bSv[0][0] = bSv[0][2] = bSv[1][0] = bSv[1][2] = 0x0002000200020002ULL;
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6331 } else {
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6332 int mask_edge1 = (mb_type & (MB_TYPE_16x16 | MB_TYPE_8x16)) ? 3 :
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6333 (mb_type & MB_TYPE_16x8) ? 1 : 0;
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6334 int mask_edge0 = (mb_type & (MB_TYPE_16x16 | MB_TYPE_8x16))
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6335 && (s->current_picture.mb_type[mb_xy-1] & (MB_TYPE_16x16 | MB_TYPE_8x16))
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6336 ? 3 : 0;
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6337 int step = IS_8x8DCT(mb_type) ? 2 : 1;
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6338 edges = (mb_type & MB_TYPE_16x16) && !(h->cbp & 15) ? 1 : 4;
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6339 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
6340 (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
6341 }
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6342 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
6343 bSv[0][0] = 0x0004000400040004ULL;
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6344 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
6345 bSv[1][0] = FIELD_PICTURE ? 0x0003000300030003ULL : 0x0004000400040004ULL;
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6346
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6347 #define FILTER(hv,dir,edge)\
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6348 if(bSv[dir][edge]) {\
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6349 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
6350 if(!(edge&1)) {\
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6351 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
6352 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
6353 }\
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6354 }
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6355 if( edges == 1 ) {
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6356 FILTER(v,0,0);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6357 FILTER(h,1,0);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6358 } else if( IS_8x8DCT(mb_type) ) {
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6359 FILTER(v,0,0);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6360 FILTER(v,0,2);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6361 FILTER(h,1,0);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6362 FILTER(h,1,2);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6363 } else {
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6364 FILTER(v,0,0);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6365 FILTER(v,0,1);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6366 FILTER(v,0,2);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6367 FILTER(v,0,3);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6368 FILTER(h,1,0);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6369 FILTER(h,1,1);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6370 FILTER(h,1,2);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6371 FILTER(h,1,3);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6372 }
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6373 #undef FILTER
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6374 }
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6375 }
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6376
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6377 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
6378 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
6379 const int mb_xy= mb_x + mb_y*s->mb_stride;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6380 const int mb_type = s->current_picture.mb_type[mb_xy];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6381 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
6382 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
6383 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
6384
3101
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
6385 //for sufficiently low qp, filtering wouldn't do anything
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
6386 //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
6387 if(!FRAME_MBAFF){
6655
22cca5d3173a Implement FFMAX3(a,b,c) - maximum over three arguments.
voroshil
parents: 6604
diff changeset
6388 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
6389 int qp = s->current_picture.qscale_table[mb_xy];
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
6390 if(qp <= qp_thresh
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
6391 && (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
6392 && (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
6393 return;
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
6394 }
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
6395 }
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
6396
7378
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6397 // 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
6398 if(!h->pps.cabac && h->pps.transform_8x8_mode){
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6399 int top_type, left_type[2];
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6400 top_type = s->current_picture.mb_type[h->top_mb_xy] ;
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6401 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
6402 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
6403
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6404 if(IS_8x8DCT(top_type)){
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6405 h->non_zero_count_cache[4+8*0]=
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6406 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
6407 h->non_zero_count_cache[6+8*0]=
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6408 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
6409 }
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6410 if(IS_8x8DCT(left_type[0])){
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6411 h->non_zero_count_cache[3+8*1]=
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6412 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
6413 }
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6414 if(IS_8x8DCT(left_type[1])){
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6415 h->non_zero_count_cache[3+8*3]=
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6416 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
6417 }
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6418
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6419 if(IS_8x8DCT(mb_type)){
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6420 h->non_zero_count_cache[scan8[0 ]]= h->non_zero_count_cache[scan8[1 ]]=
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6421 h->non_zero_count_cache[scan8[2 ]]= h->non_zero_count_cache[scan8[3 ]]= h->cbp_table[mb_xy] & 1;
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6422
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6423 h->non_zero_count_cache[scan8[0+ 4]]= h->non_zero_count_cache[scan8[1+ 4]]=
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6424 h->non_zero_count_cache[scan8[2+ 4]]= h->non_zero_count_cache[scan8[3+ 4]]= h->cbp_table[mb_xy] & 2;
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6425
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6426 h->non_zero_count_cache[scan8[0+ 8]]= h->non_zero_count_cache[scan8[1+ 8]]=
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6427 h->non_zero_count_cache[scan8[2+ 8]]= h->non_zero_count_cache[scan8[3+ 8]]= h->cbp_table[mb_xy] & 4;
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6428
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6429 h->non_zero_count_cache[scan8[0+12]]= h->non_zero_count_cache[scan8[1+12]]=
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6430 h->non_zero_count_cache[scan8[2+12]]= h->non_zero_count_cache[scan8[3+12]]= h->cbp_table[mb_xy] & 8;
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6431 }
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6432 }
eee233178dd6 Fix loop filter with CAVLC 8x8dct.
michael
parents: 7374
diff changeset
6433
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6434 if (FRAME_MBAFF
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6435 // left mb is in picture
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6436 && h->slice_table[mb_xy-1] != 255
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6437 // and current and left pair do not have the same interlaced type
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6438 && (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
6439 // 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
6440 && (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
6441 /* 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
6442 * 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
6443 */
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6444 const int pair_xy = mb_x + (mb_y&~1)*s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6445 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
6446 int16_t bS[8];
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6447 int qp[2];
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6448 int bqp[2];
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6449 int rqp[2];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6450 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
6451 int i;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6452 first_vertical_edge_done = 1;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6453
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6454 if( IS_INTRA(mb_type) )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6455 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
6456 else {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6457 for( i = 0; i < 8; i++ ) {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6458 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
6459
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6460 if( IS_INTRA( s->current_picture.mb_type[mbn_xy] ) )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6461 bS[i] = 4;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6462 else if( h->non_zero_count_cache[12+8*(i>>1)] != 0 ||
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6463 /* FIXME: with 8x8dct + cavlc, should check cbp instead of nnz */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6464 h->non_zero_count[mbn_xy][MB_FIELD ? i&3 : (i>>2)+(mb_y&1)*2] )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6465 bS[i] = 2;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6466 else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6467 bS[i] = 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6468 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6469 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6470
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6471 mb_qp = s->current_picture.qscale_table[mb_xy];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6472 mbn0_qp = s->current_picture.qscale_table[left_mb_xy[0]];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6473 mbn1_qp = s->current_picture.qscale_table[left_mb_xy[1]];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6474 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
6475 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
6476 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
6477 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
6478 get_chroma_qp( h, 1, mbn0_qp ) + 1 ) >> 1;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6479 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
6480 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
6481 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
6482 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
6483 get_chroma_qp( h, 1, mbn1_qp ) + 1 ) >> 1;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6484
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6485 /* Filter edge */
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6486 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
6487 { 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
6488 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
6489 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
6490 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
6491 }
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6492 /* dir : 0 -> vertical edge, 1 -> horizontal edge */
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6493 for( dir = 0; dir < 2; dir++ )
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6494 {
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6495 int edge;
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6496 const int mbm_xy = dir == 0 ? mb_xy -1 : h->top_mb_xy;
2924
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6497 const int mbm_type = s->current_picture.mb_type[mbm_xy];
7343
9a4cb430d8ff Loop filtering with multiple slice types fix.
michael
parents: 7341
diff changeset
6498 int (*ref2frm) [48+2] = h->ref2frm[ h->slice_num &15 ];
9a4cb430d8ff Loop filtering with multiple slice types fix.
michael
parents: 7341
diff changeset
6499 int (*ref2frmm)[48+2] = h->ref2frm[ h->slice_table[mbm_xy]&15 ];
2454
300f1207768d simplify
michael
parents: 2453
diff changeset
6500 int start = h->slice_table[mbm_xy] == 255 ? 1 : 0;
300f1207768d simplify
michael
parents: 2453
diff changeset
6501
3101
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
6502 const int edges = (mb_type & (MB_TYPE_16x16|MB_TYPE_SKIP))
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
6503 == (MB_TYPE_16x16|MB_TYPE_SKIP) ? 1 : 4;
2926
dfdbef4bfdc5 no mixing of code and declarations
mru
parents: 2924
diff changeset
6504 // how often to recheck mv-based bS when iterating between edges
dfdbef4bfdc5 no mixing of code and declarations
mru
parents: 2924
diff changeset
6505 const int mask_edge = (mb_type & (MB_TYPE_16x16 | (MB_TYPE_16x8 << dir))) ? 3 :
dfdbef4bfdc5 no mixing of code and declarations
mru
parents: 2924
diff changeset
6506 (mb_type & (MB_TYPE_8x16 >> dir)) ? 1 : 0;
dfdbef4bfdc5 no mixing of code and declarations
mru
parents: 2924
diff changeset
6507 // how often to recheck mv-based bS when iterating along each edge
dfdbef4bfdc5 no mixing of code and declarations
mru
parents: 2924
diff changeset
6508 const int mask_par0 = mb_type & (MB_TYPE_16x16 | (MB_TYPE_8x16 >> dir));
dfdbef4bfdc5 no mixing of code and declarations
mru
parents: 2924
diff changeset
6509
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6510 if (first_vertical_edge_done) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6511 start = 1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6512 first_vertical_edge_done = 0;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6513 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6514
2454
300f1207768d simplify
michael
parents: 2453
diff changeset
6515 if (h->deblocking_filter==2 && h->slice_table[mbm_xy] != h->slice_table[mb_xy])
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6516 start = 1;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6517
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6518 if (FRAME_MBAFF && (dir == 1) && ((mb_y&1) == 0) && start == 0
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6519 && !IS_INTERLACED(mb_type)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6520 && IS_INTERLACED(mbm_type)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6521 ) {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6522 // This is a special case in the norm where the filtering must
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6523 // be done twice (one each of the field) even if we are in a
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6524 // frame macroblock.
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6525 //
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6526 static const int nnz_idx[4] = {4,5,6,3};
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6527 unsigned int tmp_linesize = 2 * linesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6528 unsigned int tmp_uvlinesize = 2 * uvlinesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6529 int mbn_xy = mb_xy - 2 * s->mb_stride;
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6530 int qp;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6531 int i, j;
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6532 int16_t bS[4];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6533
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6534 for(j=0; j<2; j++, mbn_xy += s->mb_stride){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6535 if( IS_INTRA(mb_type) ||
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6536 IS_INTRA(s->current_picture.mb_type[mbn_xy]) ) {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6537 bS[0] = bS[1] = bS[2] = bS[3] = 3;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6538 } else {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6539 const uint8_t *mbn_nnz = h->non_zero_count[mbn_xy];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6540 for( i = 0; i < 4; i++ ) {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6541 if( h->non_zero_count_cache[scan8[0]+i] != 0 ||
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6542 mbn_nnz[nnz_idx[i]] != 0 )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6543 bS[i] = 2;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6544 else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6545 bS[i] = 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6546 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6547 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6548 // Do not use s->qscale as luma quantizer because it has not the same
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6549 // value in IPCM macroblocks.
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6550 qp = ( s->current_picture.qscale_table[mb_xy] + s->current_picture.qscale_table[mbn_xy] + 1 ) >> 1;
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
6551 tprintf(s->avctx, "filter mb:%d/%d dir:%d edge:%d, QPy:%d ls:%d uvls:%d", mb_x, mb_y, dir, edge, qp, tmp_linesize, tmp_uvlinesize);
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
6552 { int i; for (i = 0; i < 4; i++) tprintf(s->avctx, " bS[%d]:%d", i, bS[i]); tprintf(s->avctx, "\n"); }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6553 filter_mb_edgeh( h, &img_y[j*linesize], tmp_linesize, bS, qp );
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6554 filter_mb_edgech( h, &img_cb[j*uvlinesize], tmp_uvlinesize, bS,
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6555 ( h->chroma_qp[0] + get_chroma_qp( h, 0, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1);
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6556 filter_mb_edgech( h, &img_cr[j*uvlinesize], tmp_uvlinesize, bS,
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6557 ( h->chroma_qp[1] + get_chroma_qp( h, 1, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6558 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6559
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6560 start = 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6561 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6562
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6563 /* Calculate bS */
2924
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6564 for( edge = start; edge < edges; edge++ ) {
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
6565 /* mbn_xy: neighbor macroblock */
2924
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6566 const int mbn_xy = edge > 0 ? mb_xy : mbm_xy;
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6567 const int mbn_type = s->current_picture.mb_type[mbn_xy];
7343
9a4cb430d8ff Loop filtering with multiple slice types fix.
michael
parents: 7341
diff changeset
6568 int (*ref2frmn)[48+2] = edge > 0 ? ref2frm : ref2frmm;
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6569 int16_t bS[4];
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6570 int qp;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6571
2924
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6572 if( (edge&1) && IS_8x8DCT(mb_type) )
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6573 continue;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6574
2924
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6575 if( IS_INTRA(mb_type) ||
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6576 IS_INTRA(mbn_type) ) {
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6577 int value;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6578 if (edge == 0) {
2924
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6579 if ( (!IS_INTERLACED(mb_type) && !IS_INTERLACED(mbm_type))
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6580 || ((FRAME_MBAFF || (s->picture_structure != PICT_FRAME)) && (dir == 0))
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6581 ) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6582 value = 4;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6583 } else {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6584 value = 3;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6585 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6586 } else {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6587 value = 3;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6588 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6589 bS[0] = bS[1] = bS[2] = bS[3] = value;
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6590 } else {
2924
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6591 int i, l;
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6592 int mv_done;
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6593
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6594 if( edge & mask_edge ) {
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6595 bS[0] = bS[1] = bS[2] = bS[3] = 0;
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6596 mv_done = 1;
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6597 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6598 else if( FRAME_MBAFF && IS_INTERLACED(mb_type ^ mbn_type)) {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6599 bS[0] = bS[1] = bS[2] = bS[3] = 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6600 mv_done = 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6601 }
2924
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6602 else if( mask_par0 && (edge || (mbn_type & (MB_TYPE_16x16 | (MB_TYPE_8x16 >> dir)))) ) {
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6603 int b_idx= 8 + 4 + edge * (dir ? 8:1);
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6604 int bn_idx= b_idx - (dir ? 8:1);
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6605 int v = 0;
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
6606
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
6607 for( l = 0; !v && l < 1 + (h->slice_type_nos == FF_B_TYPE); l++ ) {
7348
39e5cadcebab 3rd try to get the loop filter ref/mv check working correctly.
michael
parents: 7347
diff changeset
6608 v |= ref2frm[l][h->ref_cache[l][b_idx]+2] != ref2frmn[l][h->ref_cache[l][bn_idx]+2] ||
39e5cadcebab 3rd try to get the loop filter ref/mv check working correctly.
michael
parents: 7347
diff changeset
6609 FFABS( h->mv_cache[l][b_idx][0] - h->mv_cache[l][bn_idx][0] ) >= 4 ||
39e5cadcebab 3rd try to get the loop filter ref/mv check working correctly.
michael
parents: 7347
diff changeset
6610 FFABS( h->mv_cache[l][b_idx][1] - h->mv_cache[l][bn_idx][1] ) >= mvy_limit;
2924
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6611 }
7348
39e5cadcebab 3rd try to get the loop filter ref/mv check working correctly.
michael
parents: 7347
diff changeset
6612
39e5cadcebab 3rd try to get the loop filter ref/mv check working correctly.
michael
parents: 7347
diff changeset
6613 if(h->slice_type_nos == FF_B_TYPE && v){
39e5cadcebab 3rd try to get the loop filter ref/mv check working correctly.
michael
parents: 7347
diff changeset
6614 v=0;
39e5cadcebab 3rd try to get the loop filter ref/mv check working correctly.
michael
parents: 7347
diff changeset
6615 for( l = 0; !v && l < 2; l++ ) {
39e5cadcebab 3rd try to get the loop filter ref/mv check working correctly.
michael
parents: 7347
diff changeset
6616 int ln= 1-l;
39e5cadcebab 3rd try to get the loop filter ref/mv check working correctly.
michael
parents: 7347
diff changeset
6617 v |= ref2frm[l][h->ref_cache[l][b_idx]+2] != ref2frmn[ln][h->ref_cache[ln][bn_idx]+2] ||
39e5cadcebab 3rd try to get the loop filter ref/mv check working correctly.
michael
parents: 7347
diff changeset
6618 FFABS( h->mv_cache[l][b_idx][0] - h->mv_cache[ln][bn_idx][0] ) >= 4 ||
39e5cadcebab 3rd try to get the loop filter ref/mv check working correctly.
michael
parents: 7347
diff changeset
6619 FFABS( h->mv_cache[l][b_idx][1] - h->mv_cache[ln][bn_idx][1] ) >= mvy_limit;
39e5cadcebab 3rd try to get the loop filter ref/mv check working correctly.
michael
parents: 7347
diff changeset
6620 }
39e5cadcebab 3rd try to get the loop filter ref/mv check working correctly.
michael
parents: 7347
diff changeset
6621 }
39e5cadcebab 3rd try to get the loop filter ref/mv check working correctly.
michael
parents: 7347
diff changeset
6622
2924
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6623 bS[0] = bS[1] = bS[2] = bS[3] = v;
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6624 mv_done = 1;
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6625 }
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6626 else
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6627 mv_done = 0;
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6628
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
6629 for( i = 0; i < 4; i++ ) {
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6630 int x = dir == 0 ? edge : i;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6631 int y = dir == 0 ? i : edge;
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
6632 int b_idx= 8 + 4 + x + 8*y;
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
6633 int bn_idx= b_idx - (dir ? 8:1);
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
6634
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
6635 if( h->non_zero_count_cache[b_idx] != 0 ||
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
6636 h->non_zero_count_cache[bn_idx] != 0 ) {
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6637 bS[i] = 2;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6638 }
2924
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
6639 else if(!mv_done)
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
6640 {
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
6641 bS[i] = 0;
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
6642 for( l = 0; l < 1 + (h->slice_type_nos == FF_B_TYPE); l++ ) {
7348
39e5cadcebab 3rd try to get the loop filter ref/mv check working correctly.
michael
parents: 7347
diff changeset
6643 if( ref2frm[l][h->ref_cache[l][b_idx]+2] != ref2frmn[l][h->ref_cache[l][bn_idx]+2] ||
39e5cadcebab 3rd try to get the loop filter ref/mv check working correctly.
michael
parents: 7347
diff changeset
6644 FFABS( h->mv_cache[l][b_idx][0] - h->mv_cache[l][bn_idx][0] ) >= 4 ||
39e5cadcebab 3rd try to get the loop filter ref/mv check working correctly.
michael
parents: 7347
diff changeset
6645 FFABS( h->mv_cache[l][b_idx][1] - h->mv_cache[l][bn_idx][1] ) >= mvy_limit ) {
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
6646 bS[i] = 1;
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
6647 break;
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
6648 }
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
6649 }
7348
39e5cadcebab 3rd try to get the loop filter ref/mv check working correctly.
michael
parents: 7347
diff changeset
6650
39e5cadcebab 3rd try to get the loop filter ref/mv check working correctly.
michael
parents: 7347
diff changeset
6651 if(h->slice_type_nos == FF_B_TYPE && bS[i]){
39e5cadcebab 3rd try to get the loop filter ref/mv check working correctly.
michael
parents: 7347
diff changeset
6652 bS[i] = 0;
39e5cadcebab 3rd try to get the loop filter ref/mv check working correctly.
michael
parents: 7347
diff changeset
6653 for( l = 0; l < 2; l++ ) {
39e5cadcebab 3rd try to get the loop filter ref/mv check working correctly.
michael
parents: 7347
diff changeset
6654 int ln= 1-l;
39e5cadcebab 3rd try to get the loop filter ref/mv check working correctly.
michael
parents: 7347
diff changeset
6655 if( ref2frm[l][h->ref_cache[l][b_idx]+2] != ref2frmn[ln][h->ref_cache[ln][bn_idx]+2] ||
39e5cadcebab 3rd try to get the loop filter ref/mv check working correctly.
michael
parents: 7347
diff changeset
6656 FFABS( h->mv_cache[l][b_idx][0] - h->mv_cache[ln][bn_idx][0] ) >= 4 ||
39e5cadcebab 3rd try to get the loop filter ref/mv check working correctly.
michael
parents: 7347
diff changeset
6657 FFABS( h->mv_cache[l][b_idx][1] - h->mv_cache[ln][bn_idx][1] ) >= mvy_limit ) {
39e5cadcebab 3rd try to get the loop filter ref/mv check working correctly.
michael
parents: 7347
diff changeset
6658 bS[i] = 1;
39e5cadcebab 3rd try to get the loop filter ref/mv check working correctly.
michael
parents: 7347
diff changeset
6659 break;
39e5cadcebab 3rd try to get the loop filter ref/mv check working correctly.
michael
parents: 7347
diff changeset
6660 }
39e5cadcebab 3rd try to get the loop filter ref/mv check working correctly.
michael
parents: 7347
diff changeset
6661 }
39e5cadcebab 3rd try to get the loop filter ref/mv check working correctly.
michael
parents: 7347
diff changeset
6662 }
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
6663 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6664 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
6665
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
6666 if(bS[0]+bS[1]+bS[2]+bS[3] == 0)
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
6667 continue;
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6668 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6669
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6670 /* Filter edge */
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
6671 // Do not use s->qscale as luma quantizer because it has not the same
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6672 // value in IPCM macroblocks.
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6673 qp = ( s->current_picture.qscale_table[mb_xy] + s->current_picture.qscale_table[mbn_xy] + 1 ) >> 1;
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
6674 //tprintf(s->avctx, "filter mb:%d/%d dir:%d edge:%d, QPy:%d, QPc:%d, QPcn:%d\n", mb_x, mb_y, dir, edge, qp, h->chroma_qp, s->current_picture.qscale_table[mbn_xy]);
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
6675 tprintf(s->avctx, "filter mb:%d/%d dir:%d edge:%d, QPy:%d ls:%d uvls:%d", mb_x, mb_y, dir, edge, qp, linesize, uvlinesize);
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
6676 { int i; for (i = 0; i < 4; i++) tprintf(s->avctx, " bS[%d]:%d", i, bS[i]); tprintf(s->avctx, "\n"); }
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6677 if( dir == 0 ) {
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6678 filter_mb_edgev( h, &img_y[4*edge], linesize, bS, qp );
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6679 if( (edge&1) == 0 ) {
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6680 filter_mb_edgecv( h, &img_cb[2*edge], uvlinesize, bS,
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6681 ( h->chroma_qp[0] + get_chroma_qp( h, 0, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1);
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6682 filter_mb_edgecv( h, &img_cr[2*edge], uvlinesize, bS,
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6683 ( h->chroma_qp[1] + get_chroma_qp( h, 1, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1);
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6684 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6685 } else {
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6686 filter_mb_edgeh( h, &img_y[4*edge*linesize], linesize, bS, qp );
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6687 if( (edge&1) == 0 ) {
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6688 filter_mb_edgech( h, &img_cb[2*edge*uvlinesize], uvlinesize, bS,
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6689 ( h->chroma_qp[0] + get_chroma_qp( h, 0, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1);
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6690 filter_mb_edgech( h, &img_cr[2*edge*uvlinesize], uvlinesize, bS,
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
6691 ( h->chroma_qp[1] + get_chroma_qp( h, 1, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1);
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6692 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6693 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6694 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6695 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6696 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6697
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
6698 static int decode_slice(struct AVCodecContext *avctx, H264Context *h){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6699 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6700 const int part_mask= s->partitioned_frame ? (AC_END|AC_ERROR) : 0x7F;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6701
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6702 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
6703
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6704 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
6705 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
6706
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6707 /* realign */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6708 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
6709
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6710 /* 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
6711 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
6712 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
6713 s->gb.buffer + get_bits_count(&s->gb)/8,
2116
48d9f86fb047 overread fix
michael
parents: 2110
diff changeset
6714 ( 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
6715 /* calculate pre-state */
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6716 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
6717 int pre;
7340
ef40221c1452 SI/SP slice support. (not bitexact)
michael
parents: 7339
diff changeset
6718 if( h->slice_type_nos == FF_I_TYPE )
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
6719 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
6720 else
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
6721 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
6722
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6723 if( pre <= 63 )
3976
27e90123b346 reverse remainder of the failed attempt to optimize *state=c->mps_state[s]
michael
parents: 3972
diff changeset
6724 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
6725 else
3976
27e90123b346 reverse remainder of the failed attempt to optimize *state=c->mps_state[s]
michael
parents: 3972
diff changeset
6726 h->cabac_state[i] = 2 * ( pre - 64 ) + 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6727 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6728
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6729 for(;;){
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
6730 //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
6731 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
6732 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
6733 //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
6734
2163
b25df257eab0 segfault fix
michael
parents: 2116
diff changeset
6735 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
6736
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6737 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
6738 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
6739
2163
b25df257eab0 segfault fix
michael
parents: 2116
diff changeset
6740 if(ret>=0) ret = decode_mb_cabac(h);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6741
2844
5f20ab245501 prevent assert failures and infinite loops with broken streams
michael
parents: 2834
diff changeset
6742 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
6743 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
6744 }
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
6745 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
6746
3948
3edbf131ee44 refill cabac variables in 16bit steps, 3% faster get_cabac()
michael
parents: 3947
diff changeset
6747 if( ret < 0 || h->cabac.bytestream > h->cabac.bytestream_end + 2) {
5153
b985439e3e15 fix some printf format specifiers
mru
parents: 5129
diff changeset
6748 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
6749 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
6750 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
6751 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6752
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6753 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
6754 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
6755 ff_draw_horiz_band(s, 16*s->mb_y, 16);
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
6756 ++s->mb_y;
5781
0b3aa6f4c313 Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents: 5780
diff changeset
6757 if(FIELD_OR_MBAFF_PICTURE) {
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
6758 ++s->mb_y;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
6759 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6760 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6761
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6762 if( eos || s->mb_y >= s->mb_height ) {
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
6763 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
6764 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
6765 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
6766 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6767 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6768
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6769 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6770 for(;;){
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6771 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
6772
2163
b25df257eab0 segfault fix
michael
parents: 2116
diff changeset
6773 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
6774
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6775 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
6776 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
6777 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
6778
2163
b25df257eab0 segfault fix
michael
parents: 2116
diff changeset
6779 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
6780 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
6781 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6782
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6783 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
6784 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
6785 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
6786
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6787 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
6788 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6789
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6790 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
6791 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
6792 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
6793 ++s->mb_y;
5781
0b3aa6f4c313 Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents: 5780
diff changeset
6794 if(FIELD_OR_MBAFF_PICTURE) {
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
6795 ++s->mb_y;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
6796 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
6797 if(s->mb_y >= s->mb_height){
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
6798 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
6799
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6800 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
6801 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
6802
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6803 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
6804 }else{
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6805 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
6806
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6807 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
6808 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6809 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6810 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6811
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6812 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
6813 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
6814 if(get_bits_count(&s->gb) == s->gb.size_in_bits ){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6815 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
6816
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6817 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6818 }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
6819 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
6820
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6821 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6822 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6823 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6824 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6825 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6826
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6827 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6828 for(;s->mb_y < s->mb_height; s->mb_y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6829 for(;s->mb_x < s->mb_width; s->mb_x++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6830 int ret= decode_mb(h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6831
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6832 hl_decode_mb(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6833
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6834 if(ret<0){
3177
8d1b2cc2a75b (f)printf --> av_log conversion
diego
parents: 3174
diff changeset
6835 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
6836 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
6837
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6838 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6839 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6840
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6841 if(++s->mb_x >= s->mb_width){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6842 s->mb_x=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6843 if(++s->mb_y >= s->mb_height){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6844 if(get_bits_count(s->gb) == s->gb.size_in_bits){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6845 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
6846
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6847 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6848 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6849 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
6850
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6851 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6852 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6853 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6854 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6855
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6856 if(get_bits_count(s->?gb) >= s->gb?.size_in_bits){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6857 if(get_bits_count(s->gb) == s->gb.size_in_bits){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6858 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, (AC_END|DC_END|MV_END)&part_mask);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6859
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6860 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6861 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6862 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, (AC_ERROR|DC_ERROR|MV_ERROR)&part_mask);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6863
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6864 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6865 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6866 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6867 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6868 s->mb_x=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6869 ff_draw_horiz_band(s, 16*s->mb_y, 16);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6870 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6871 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6872 return -1; //not reached
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6873 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6874
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6875 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
6876 MpegEncContext * const s = &h->s;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6877 uint8_t user_data[16+256];
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6878 int e, build, i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6879
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6880 if(size<16)
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6881 return -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6882
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6883 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
6884 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
6885 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6886
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6887 user_data[i]= 0;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6888 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
6889 if(e==1 && build>=0)
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6890 h->x264_build= build;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6891
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6892 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
6893 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
6894
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6895 for(; i<size; i++)
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6896 skip_bits(&s->gb, 8);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6897
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6898 return 0;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6899 }
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6900
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6901 static int decode_sei(H264Context *h){
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6902 MpegEncContext * const s = &h->s;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6903
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6904 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
6905 int size, type;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6906
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6907 type=0;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6908 do{
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6909 type+= show_bits(&s->gb, 8);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6910 }while(get_bits(&s->gb, 8) == 255);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6911
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6912 size=0;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6913 do{
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6914 size+= show_bits(&s->gb, 8);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6915 }while(get_bits(&s->gb, 8) == 255);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6916
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6917 switch(type){
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6918 case 5:
3318
8dc886b9568a typo me thinks ...
michael
parents: 3316
diff changeset
6919 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
6920 return -1;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6921 break;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6922 default:
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6923 skip_bits(&s->gb, 8*size);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6924 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6925
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6926 //FIXME check bits here
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6927 align_get_bits(&s->gb);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6928 }
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6929
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6930 return 0;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6931 }
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6932
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6933 static inline void decode_hrd_parameters(H264Context *h, SPS *sps){
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6934 MpegEncContext * const s = &h->s;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6935 int cpb_count, i;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6936 cpb_count = get_ue_golomb(&s->gb) + 1;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6937 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
6938 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
6939 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
6940 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
6941 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
6942 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
6943 }
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6944 get_bits(&s->gb, 5); /* initial_cpb_removal_delay_length_minus1 */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6945 get_bits(&s->gb, 5); /* cpb_removal_delay_length_minus1 */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6946 get_bits(&s->gb, 5); /* dpb_output_delay_length_minus1 */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6947 get_bits(&s->gb, 5); /* time_offset_length */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6948 }
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6949
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6950 static inline int decode_vui_parameters(H264Context *h, SPS *sps){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6951 MpegEncContext * const s = &h->s;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
6952 int aspect_ratio_info_present_flag;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
6953 unsigned int aspect_ratio_idc;
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6954 int nal_hrd_parameters_present_flag, vcl_hrd_parameters_present_flag;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6955
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6956 aspect_ratio_info_present_flag= get_bits1(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6957
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6958 if( aspect_ratio_info_present_flag ) {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6959 aspect_ratio_idc= get_bits(&s->gb, 8);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6960 if( aspect_ratio_idc == EXTENDED_SAR ) {
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
6961 sps->sar.num= get_bits(&s->gb, 16);
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
6962 sps->sar.den= get_bits(&s->gb, 16);
6429
3c67363d6fa0 more aspect ratios added in one of the ammendments
lorenm
parents: 6377
diff changeset
6963 }else if(aspect_ratio_idc < sizeof(pixel_aspect)/sizeof(*pixel_aspect)){
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
6964 sps->sar= pixel_aspect[aspect_ratio_idc];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6965 }else{
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
6966 av_log(h->s.avctx, AV_LOG_ERROR, "illegal aspect ratio\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6967 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6968 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6969 }else{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6970 sps->sar.num=
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
6971 sps->sar.den= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6972 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6973 // s->avctx->aspect_ratio= sar_width*s->width / (float)(s->height*sar_height);
2174
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6974
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6975 if(get_bits1(&s->gb)){ /* overscan_info_present_flag */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6976 get_bits1(&s->gb); /* overscan_appropriate_flag */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6977 }
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6978
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6979 if(get_bits1(&s->gb)){ /* video_signal_type_present_flag */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6980 get_bits(&s->gb, 3); /* video_format */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6981 get_bits1(&s->gb); /* video_full_range_flag */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6982 if(get_bits1(&s->gb)){ /* colour_description_present_flag */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6983 get_bits(&s->gb, 8); /* colour_primaries */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6984 get_bits(&s->gb, 8); /* transfer_characteristics */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6985 get_bits(&s->gb, 8); /* matrix_coefficients */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6986 }
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6987 }
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6988
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6989 if(get_bits1(&s->gb)){ /* chroma_location_info_present_flag */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6990 get_ue_golomb(&s->gb); /* chroma_sample_location_type_top_field */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6991 get_ue_golomb(&s->gb); /* chroma_sample_location_type_bottom_field */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6992 }
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6993
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6994 sps->timing_info_present_flag = get_bits1(&s->gb);
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6995 if(sps->timing_info_present_flag){
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6996 sps->num_units_in_tick = get_bits_long(&s->gb, 32);
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6997 sps->time_scale = get_bits_long(&s->gb, 32);
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6998 sps->fixed_frame_rate_flag = get_bits1(&s->gb);
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6999 }
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (M«©ns Rullg«©rd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7000
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7001 nal_hrd_parameters_present_flag = get_bits1(&s->gb);
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7002 if(nal_hrd_parameters_present_flag)
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7003 decode_hrd_parameters(h, sps);
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7004 vcl_hrd_parameters_present_flag = get_bits1(&s->gb);
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7005 if(vcl_hrd_parameters_present_flag)
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7006 decode_hrd_parameters(h, sps);
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7007 if(nal_hrd_parameters_present_flag || vcl_hrd_parameters_present_flag)
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7008 get_bits1(&s->gb); /* low_delay_hrd_flag */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7009 get_bits1(&s->gb); /* pic_struct_present_flag */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7010
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7011 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
7012 if(sps->bitstream_restriction_flag){
4389
3afddc65631b check num_reorder_frames for validity
michael
parents: 4388
diff changeset
7013 unsigned int num_reorder_frames;
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7014 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
7015 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
7016 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
7017 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
7018 get_ue_golomb(&s->gb); /* log2_max_mv_length_vertical */
4389
3afddc65631b check num_reorder_frames for validity
michael
parents: 4388
diff changeset
7019 num_reorder_frames= get_ue_golomb(&s->gb);
3afddc65631b check num_reorder_frames for validity
michael
parents: 4388
diff changeset
7020 get_ue_golomb(&s->gb); /*max_dec_frame_buffering*/
3afddc65631b check num_reorder_frames for validity
michael
parents: 4388
diff changeset
7021
3afddc65631b check num_reorder_frames for validity
michael
parents: 4388
diff changeset
7022 if(num_reorder_frames > 16 /*max_dec_frame_buffering || max_dec_frame_buffering > 16*/){
3afddc65631b check num_reorder_frames for validity
michael
parents: 4388
diff changeset
7023 av_log(h->s.avctx, AV_LOG_ERROR, "illegal num_reorder_frames %d\n", num_reorder_frames);
3afddc65631b check num_reorder_frames for validity
michael
parents: 4388
diff changeset
7024 return -1;
3afddc65631b check num_reorder_frames for validity
michael
parents: 4388
diff changeset
7025 }
3afddc65631b check num_reorder_frames for validity
michael
parents: 4388
diff changeset
7026
3afddc65631b check num_reorder_frames for validity
michael
parents: 4388
diff changeset
7027 sps->num_reorder_frames= num_reorder_frames;
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7028 }
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7029
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7030 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7031 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7032
3004
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
7033 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
7034 const uint8_t *jvt_list, const uint8_t *fallback_list){
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7035 MpegEncContext * const s = &h->s;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7036 int i, last = 8, next = 8;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7037 const uint8_t *scan = size == 16 ? zigzag_scan : zigzag_scan8x8;
3004
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
7038 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
7039 memcpy(factors, fallback_list, size*sizeof(uint8_t));
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7040 else
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7041 for(i=0;i<size;i++){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7042 if(next)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7043 next = (last + get_se_golomb(&s->gb)) & 0xff;
3004
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
7044 if(!i && !next){ /* matrix not written, we use the preset one */
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
7045 memcpy(factors, jvt_list, size*sizeof(uint8_t));
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7046 break;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7047 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7048 last = factors[scan[i]] = next ? next : last;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7049 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7050 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7051
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7052 static void decode_scaling_matrices(H264Context *h, SPS *sps, PPS *pps, int is_sps,
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7053 uint8_t (*scaling_matrix4)[16], uint8_t (*scaling_matrix8)[64]){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7054 MpegEncContext * const s = &h->s;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7055 int fallback_sps = !is_sps && sps->scaling_matrix_present;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7056 const uint8_t *fallback[4] = {
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7057 fallback_sps ? sps->scaling_matrix4[0] : default_scaling4[0],
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7058 fallback_sps ? sps->scaling_matrix4[3] : default_scaling4[1],
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7059 fallback_sps ? sps->scaling_matrix8[0] : default_scaling8[0],
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7060 fallback_sps ? sps->scaling_matrix8[1] : default_scaling8[1]
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7061 };
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7062 if(get_bits1(&s->gb)){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7063 sps->scaling_matrix_present |= is_sps;
3004
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
7064 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
7065 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
7066 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
7067 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
7068 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
7069 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
7070 if(is_sps || pps->transform_8x8_mode){
3004
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
7071 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
7072 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
7073 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7074 } else if(fallback_sps) {
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7075 memcpy(scaling_matrix4, sps->scaling_matrix4, 6*16*sizeof(uint8_t));
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7076 memcpy(scaling_matrix8, sps->scaling_matrix8, 2*64*sizeof(uint8_t));
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7077 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7078 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7079
5079
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7080 /**
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7081 * Returns and optionally allocates SPS / PPS structures in the supplied array 'vec'
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7082 */
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7083 static void *
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7084 alloc_parameter_set(H264Context *h, void **vec, const unsigned int id, const unsigned int max,
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7085 const size_t size, const char *name)
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7086 {
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7087 if(id>=max) {
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7088 av_log(h->s.avctx, AV_LOG_ERROR, "%s_id (%d) out of range\n", name, id);
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7089 return NULL;
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7090 }
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7091
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7092 if(!vec[id]) {
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7093 vec[id] = av_mallocz(size);
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7094 if(vec[id] == NULL)
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7095 av_log(h->s.avctx, AV_LOG_ERROR, "cannot allocate memory for %s\n", name);
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7096 }
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7097 return vec[id];
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7098 }
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7099
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7100 static inline int decode_seq_parameter_set(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7101 MpegEncContext * const s = &h->s;
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7102 int profile_idc, level_idc;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7103 unsigned int sps_id, tmp, mb_width, mb_height;
4362
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
7104 int i;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7105 SPS *sps;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7106
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7107 profile_idc= get_bits(&s->gb, 8);
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7108 get_bits1(&s->gb); //constraint_set0_flag
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7109 get_bits1(&s->gb); //constraint_set1_flag
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7110 get_bits1(&s->gb); //constraint_set2_flag
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
7111 get_bits1(&s->gb); //constraint_set3_flag
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
7112 get_bits(&s->gb, 4); // reserved
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7113 level_idc= get_bits(&s->gb, 8);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7114 sps_id= get_ue_golomb(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7115
5079
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7116 sps = alloc_parameter_set(h, (void **)h->sps_buffers, sps_id, MAX_SPS_COUNT, sizeof(SPS), "sps");
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7117 if(sps == NULL)
4362
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
7118 return -1;
5079
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7119
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7120 sps->profile_idc= profile_idc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7121 sps->level_idc= level_idc;
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
7122
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7123 if(sps->profile_idc >= 100){ //high profile
7407
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
7124 sps->chroma_format_idc= get_ue_golomb(&s->gb);
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
7125 if(sps->chroma_format_idc == 3)
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7126 get_bits1(&s->gb); //residual_color_transform_flag
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7127 get_ue_golomb(&s->gb); //bit_depth_luma_minus8
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7128 get_ue_golomb(&s->gb); //bit_depth_chroma_minus8
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
7129 sps->transform_bypass = get_bits1(&s->gb);
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7130 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
7131 }else{
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7132 sps->scaling_matrix_present = 0;
7407
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
7133 sps->chroma_format_idc= 1;
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
7134 }
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7135
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7136 sps->log2_max_frame_num= get_ue_golomb(&s->gb) + 4;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7137 sps->poc_type= get_ue_golomb(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7138
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7139 if(sps->poc_type == 0){ //FIXME #define
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7140 sps->log2_max_poc_lsb= get_ue_golomb(&s->gb) + 4;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7141 } else if(sps->poc_type == 1){//FIXME #define
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7142 sps->delta_pic_order_always_zero_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7143 sps->offset_for_non_ref_pic= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7144 sps->offset_for_top_to_bottom_field= get_se_golomb(&s->gb);
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7145 tmp= get_ue_golomb(&s->gb);
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7146
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7147 if(tmp >= sizeof(sps->offset_for_ref_frame) / sizeof(sps->offset_for_ref_frame[0])){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7148 av_log(h->s.avctx, AV_LOG_ERROR, "poc_cycle_length overflow %u\n", tmp);
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7149 return -1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7150 }
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7151 sps->poc_cycle_length= tmp;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7152
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7153 for(i=0; i<sps->poc_cycle_length; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7154 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
7155 }else if(sps->poc_type != 2){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
7156 av_log(h->s.avctx, AV_LOG_ERROR, "illegal POC type %d\n", sps->poc_type);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7157 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7158 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7159
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7160 tmp= get_ue_golomb(&s->gb);
6017
e1404acccac3 Actually return with an error condition if we're being asked to deal with too
heydowns
parents: 6016
diff changeset
7161 if(tmp > MAX_PICTURE_COUNT-2 || tmp >= 32){
2254
0dfe4e32b19c H.264 max reference pictures fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2227
diff changeset
7162 av_log(h->s.avctx, AV_LOG_ERROR, "too many reference frames\n");
6017
e1404acccac3 Actually return with an error condition if we're being asked to deal with too
heydowns
parents: 6016
diff changeset
7163 return -1;
2254
0dfe4e32b19c H.264 max reference pictures fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2227
diff changeset
7164 }
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7165 sps->ref_frame_count= tmp;
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7166 sps->gaps_in_frame_num_allowed_flag= get_bits1(&s->gb);
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7167 mb_width= get_ue_golomb(&s->gb) + 1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7168 mb_height= get_ue_golomb(&s->gb) + 1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7169 if(mb_width >= INT_MAX/16 || mb_height >= INT_MAX/16 ||
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7170 avcodec_check_dimensions(NULL, 16*mb_width, 16*mb_height)){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7171 av_log(h->s.avctx, AV_LOG_ERROR, "mb_width/height overflow\n");
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2417
diff changeset
7172 return -1;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7173 }
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7174 sps->mb_width = mb_width;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7175 sps->mb_height= mb_height;
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2417
diff changeset
7176
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7177 sps->frame_mbs_only_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7178 if(!sps->frame_mbs_only_flag)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7179 sps->mb_aff= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7180 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7181 sps->mb_aff= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7182
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7183 sps->direct_8x8_inference_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7184
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7185 #ifndef ALLOW_INTERLACE
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7186 if(sps->mb_aff)
3954
00a12ef7d800 output typo fixes
diego
parents: 3948
diff changeset
7187 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
7188 #endif
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7189 if(!sps->direct_8x8_inference_flag && sps->mb_aff)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7190 av_log(h->s.avctx, AV_LOG_ERROR, "MBAFF + !direct_8x8_inference is not implemented\n");
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7191
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7192 sps->crop= get_bits1(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7193 if(sps->crop){
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7194 sps->crop_left = get_ue_golomb(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7195 sps->crop_right = get_ue_golomb(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7196 sps->crop_top = get_ue_golomb(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7197 sps->crop_bottom= get_ue_golomb(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7198 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
7199 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
7200 }
6581
e6d8c5bbeeac Avoid crash with idiotic cropping. Fixes crash with CVFC1_Sony_C.jsv
michael
parents: 6524
diff changeset
7201 if(sps->crop_right >= 8 || sps->crop_bottom >= (8>> !h->sps.frame_mbs_only_flag)){
e6d8c5bbeeac Avoid crash with idiotic cropping. Fixes crash with CVFC1_Sony_C.jsv
michael
parents: 6524
diff changeset
7202 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
7203 }
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7204 }else{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7205 sps->crop_left =
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7206 sps->crop_right =
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7207 sps->crop_top =
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7208 sps->crop_bottom= 0;
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7209 }
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7210
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7211 sps->vui_parameters_present_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7212 if( sps->vui_parameters_present_flag )
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7213 decode_vui_parameters(h, sps);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7214
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7215 if(s->avctx->debug&FF_DEBUG_PICT_INFO){
7407
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
7216 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
7217 sps_id, sps->profile_idc, sps->level_idc,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7218 sps->poc_type,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7219 sps->ref_frame_count,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7220 sps->mb_width, sps->mb_height,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7221 sps->frame_mbs_only_flag ? "FRM" : (sps->mb_aff ? "MB-AFF" : "PIC-AFF"),
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7222 sps->direct_8x8_inference_flag ? "8B8" : "",
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7223 sps->crop_left, sps->crop_right,
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7224 sps->crop_top, sps->crop_bottom,
7407
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
7225 sps->vui_parameters_present_flag ? "VUI" : "",
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
7226 ((const char*[]){"Gray","420","422","444"})[sps->chroma_format_idc]
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7227 );
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7228 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7229 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7230 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7231
5226
65bffcc5571a Precompute a chroma_qp table with index offset for each pps,
gpoirier
parents: 5225
diff changeset
7232 static void
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
7233 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
7234 {
65bffcc5571a Precompute a chroma_qp table with index offset for each pps,
gpoirier
parents: 5225
diff changeset
7235 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
7236 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
7237 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
7238 }
65bffcc5571a Precompute a chroma_qp table with index offset for each pps,
gpoirier
parents: 5225
diff changeset
7239
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7240 static inline int decode_picture_parameter_set(H264Context *h, int bit_length){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7241 MpegEncContext * const s = &h->s;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7242 unsigned int tmp, pps_id= get_ue_golomb(&s->gb);
4362
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
7243 PPS *pps;
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
7244
5079
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7245 pps = alloc_parameter_set(h, (void **)h->pps_buffers, pps_id, MAX_PPS_COUNT, sizeof(PPS), "pps");
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7246 if(pps == NULL)
4362
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
7247 return -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7248
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7249 tmp= get_ue_golomb(&s->gb);
5079
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7250 if(tmp>=MAX_SPS_COUNT || h->sps_buffers[tmp] == NULL){
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7251 av_log(h->s.avctx, AV_LOG_ERROR, "sps_id out of range\n");
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7252 return -1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7253 }
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7254 pps->sps_id= tmp;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7255
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7256 pps->cabac= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7257 pps->pic_order_present= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7258 pps->slice_group_count= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7259 if(pps->slice_group_count > 1 ){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7260 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
7261 av_log(h->s.avctx, AV_LOG_ERROR, "FMO not supported\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7262 switch(pps->mb_slice_group_map_type){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7263 case 0:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7264 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7265 | for( i = 0; i <= num_slice_groups_minus1; i++ ) | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7266 | run_length[ i ] |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7267 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7268 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7269 case 2:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7270 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7271 | for( i = 0; i < num_slice_groups_minus1; i++ ) | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7272 |{ | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7273 | top_left_mb[ i ] |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7274 | bottom_right_mb[ i ] |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7275 | } | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7276 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7277 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7278 case 3:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7279 case 4:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7280 case 5:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7281 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7282 | slice_group_change_direction_flag |1 |u(1) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7283 | slice_group_change_rate_minus1 |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7284 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7285 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7286 case 6:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7287 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7288 | slice_group_id_cnt_minus1 |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7289 | for( i = 0; i <= slice_group_id_cnt_minus1; i++ | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7290 |) | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7291 | slice_group_id[ i ] |1 |u(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7292 #endif
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1187
diff changeset
7293 break;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7294 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7295 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7296 pps->ref_count[0]= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7297 pps->ref_count[1]= get_ue_golomb(&s->gb) + 1;
4531
8a5a3dd25390 fix ref_count check
michael
parents: 4530
diff changeset
7298 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
7299 av_log(h->s.avctx, AV_LOG_ERROR, "reference overflow (pps)\n");
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
7300 pps->ref_count[0]= pps->ref_count[1]= 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7301 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7302 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7303
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7304 pps->weighted_pred= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7305 pps->weighted_bipred_idc= get_bits(&s->gb, 2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7306 pps->init_qp= get_se_golomb(&s->gb) + 26;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7307 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
7308 pps->chroma_qp_index_offset[0]= get_se_golomb(&s->gb);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7309 pps->deblocking_filter_parameters_present= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7310 pps->constrained_intra_pred= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7311 pps->redundant_pic_cnt_present = get_bits1(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7312
3291
454de57e45cf reinit quant matrices if pps is overwritten by another of the same pps_id.
lorenm
parents: 3285
diff changeset
7313 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
7314 h->dequant_coeff_pps= -1; //contents of sps/pps can change even if id doesn't, so reinit
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7315 memset(pps->scaling_matrix4, 16, 6*16*sizeof(uint8_t));
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7316 memset(pps->scaling_matrix8, 16, 2*64*sizeof(uint8_t));
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7317
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7318 if(get_bits_count(&s->gb) < bit_length){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7319 pps->transform_8x8_mode= get_bits1(&s->gb);
5079
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
7320 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
7321 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
7322 } else {
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
7323 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
7324 }
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
7325
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
7326 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
7327 build_qp_table(pps, 1, pps->chroma_qp_index_offset[1]);
a36996f67748 Deobfusate chroma_qp_table[1] init code.
michael
parents: 7344
diff changeset
7328 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
7329 h->pps.chroma_qp_diff= 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7330
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7331 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
7332 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
7333 pps_id, pps->sps_id,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7334 pps->cabac ? "CABAC" : "CAVLC",
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7335 pps->slice_group_count,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7336 pps->ref_count[0], pps->ref_count[1],
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7337 pps->weighted_pred ? "weighted" : "",
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
7338 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
7339 pps->deblocking_filter_parameters_present ? "LPAR" : "",
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7340 pps->constrained_intra_pred ? "CONSTR" : "",
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7341 pps->redundant_pic_cnt_present ? "REDU" : "",
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7342 pps->transform_8x8_mode ? "8x8DCT" : ""
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7343 );
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7344 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7345
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7346 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7347 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7348
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7349 /**
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7350 * Call decode_slice() for each context.
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7351 *
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7352 * @param h h264 master context
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7353 * @param context_count number of contexts to execute
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7354 */
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7355 static void execute_decode_slices(H264Context *h, int context_count){
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7356 MpegEncContext * const s = &h->s;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7357 AVCodecContext * const avctx= s->avctx;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7358 H264Context *hx;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7359 int i;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7360
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7361 if(context_count == 1) {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7362 decode_slice(avctx, h);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7363 } else {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7364 for(i = 1; i < context_count; i++) {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7365 hx = h->thread_context[i];
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7366 hx->s.error_resilience = avctx->error_resilience;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7367 hx->s.error_count = 0;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7368 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7369
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7370 avctx->execute(avctx, (void *)decode_slice,
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7371 (void **)h->thread_context, NULL, context_count);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7372
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7373 /* pull back stuff from slices to master context */
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7374 hx = h->thread_context[context_count - 1];
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7375 s->mb_x = hx->s.mb_x;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7376 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
7377 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
7378 s->picture_structure = hx->s.picture_structure;
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7379 for(i = 1; i < context_count; i++)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7380 h->s.error_count += h->thread_context[i]->s.error_count;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7381 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7382 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7383
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7384
6216
michael
parents: 6213
diff changeset
7385 static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7386 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7387 AVCodecContext * const avctx= s->avctx;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7388 int buf_index=0;
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7389 H264Context *hx; ///< thread context
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7390 int context_count = 0;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7391
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7392 h->max_contexts = avctx->thread_count;
1322
f78341ab5fba some warning fixes
al3x
parents: 1319
diff changeset
7393 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7394 int i;
2867
7c7edddaa835 dont be so picky with .mp4 ... fixes Mr&MrsSmith.mp4
michael
parents: 2861
diff changeset
7395 for(i=0; i<50; i++){
7c7edddaa835 dont be so picky with .mp4 ... fixes Mr&MrsSmith.mp4
michael
parents: 2861
diff changeset
7396 av_log(NULL, AV_LOG_ERROR,"%02X ", buf[i]);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7397 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7398 #endif
4616
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7399 if(!(s->flags2 & CODEC_FLAG2_CHUNKS)){
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7400 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
7401 if (!s->first_field)
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7402 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
7403 }
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7404
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7405 for(;;){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7406 int consumed;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7407 int dst_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7408 int bit_length;
6216
michael
parents: 6213
diff changeset
7409 const uint8_t *ptr;
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7410 int i, nalsize = 0;
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7411 int err;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7412
5170
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7413 if(h->is_avc) {
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7414 if(buf_index >= buf_size) break;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7415 nalsize = 0;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7416 for(i = 0; i < h->nal_length_size; i++)
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7417 nalsize = (nalsize << 8) | buf[buf_index++];
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7418 if(nalsize <= 1 || (nalsize+buf_index > buf_size)){
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7419 if(nalsize == 1){
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7420 buf_index++;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7421 continue;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7422 }else{
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7423 av_log(h->s.avctx, AV_LOG_ERROR, "AVC: nal size %d\n", nalsize);
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7424 break;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7425 }
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7426 }
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7427 } else {
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7428 // start code prefix search
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7429 for(; buf_index + 3 < buf_size; buf_index++){
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7430 // This should always succeed in the first iteration.
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7431 if(buf[buf_index] == 0 && buf[buf_index+1] == 0 && buf[buf_index+2] == 1)
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7432 break;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7433 }
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7434
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7435 if(buf_index+3 >= buf_size) break;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7436
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7437 buf_index+=3;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
7438 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7439
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7440 hx = h->thread_context[context_count];
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7441
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7442 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
7443 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
7444 return -1;
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
7445 }
4829
e3161603a048 Remove a NAL unit's trailing zero bytes even when dst_length is 1.
diego
parents: 4828
diff changeset
7446 while(ptr[dst_length - 1] == 0 && dst_length > 0)
3341
bd7a496e44c9 h264: accept rbsp_trailing longer than 1 byte
lorenm
parents: 3318
diff changeset
7447 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
7448 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
7449
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7450 if(s->avctx->debug&FF_DEBUG_STARTCODE){
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7451 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
7452 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7453
6490
bb799e3bc64b If consumed does not match nalsize, favor nalsize.
michael
parents: 6488
diff changeset
7454 if (h->is_avc && (nalsize != consumed)){
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7455 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
7456 consumed= nalsize;
bb799e3bc64b If consumed does not match nalsize, favor nalsize.
michael
parents: 6488
diff changeset
7457 }
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7458
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7459 buf_index += consumed;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7460
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5106
diff changeset
7461 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
7462 ||(avctx->skip_frame >= AVDISCARD_NONREF && h->nal_ref_idc == 0))
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7463 continue;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7464
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7465 again:
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7466 err = 0;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7467 switch(hx->nal_unit_type){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7468 case NAL_IDR_SLICE:
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7469 if (h->nal_unit_type != NAL_IDR_SLICE) {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7470 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
7471 return -1;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7472 }
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
7473 idr(h); //FIXME ensure we don't loose some frames if there is reordering
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7474 case NAL_SLICE:
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7475 init_get_bits(&hx->s.gb, ptr, bit_length);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7476 hx->intra_gb_ptr=
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7477 hx->inter_gb_ptr= &hx->s.gb;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7478 hx->s.data_partitioning = 0;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7479
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7480 if((err = decode_slice_header(hx, h)))
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7481 break;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7482
5773
e3d7a78e2df3 Fix Picture.key_frame setting to be compatible with frame and field contexts. Part of PAFF implementation.
andoma
parents: 5772
diff changeset
7483 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
7484 if(hx->redundant_pic_count==0 && hx->s.hurry_up < 5
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7485 && (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
7486 && (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
7487 && (avctx->skip_frame < AVDISCARD_NONKEY || hx->slice_type_nos==FF_I_TYPE)
2793
ae85da6c5c2f more fine grained skip_frame
michael
parents: 2792
diff changeset
7488 && avctx->skip_frame < AVDISCARD_ALL)
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7489 context_count++;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7490 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7491 case NAL_DPA:
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7492 init_get_bits(&hx->s.gb, ptr, bit_length);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7493 hx->intra_gb_ptr=
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7494 hx->inter_gb_ptr= NULL;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7495 hx->s.data_partitioning = 1;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7496
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7497 err = decode_slice_header(hx, h);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7498 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7499 case NAL_DPB:
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7500 init_get_bits(&hx->intra_gb, ptr, bit_length);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7501 hx->intra_gb_ptr= &hx->intra_gb;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7502 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7503 case NAL_DPC:
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7504 init_get_bits(&hx->inter_gb, ptr, bit_length);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7505 hx->inter_gb_ptr= &hx->inter_gb;
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(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
7508 && s->context_initialized
2793
ae85da6c5c2f more fine grained skip_frame
michael
parents: 2792
diff changeset
7509 && s->hurry_up < 5
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7510 && (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
7511 && (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
7512 && (avctx->skip_frame < AVDISCARD_NONKEY || hx->slice_type_nos==FF_I_TYPE)
2793
ae85da6c5c2f more fine grained skip_frame
michael
parents: 2792
diff changeset
7513 && avctx->skip_frame < AVDISCARD_ALL)
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7514 context_count++;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7515 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7516 case NAL_SEI:
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7517 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
7518 decode_sei(h);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7519 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7520 case NAL_SPS:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7521 init_get_bits(&s->gb, ptr, bit_length);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7522 decode_seq_parameter_set(h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7523
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7524 if(s->flags& CODEC_FLAG_LOW_DELAY)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7525 s->low_delay=1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7526
2538
34b0996cc10d 10l (fix reordering when B-frames are not present)
lorenm
parents: 2537
diff changeset
7527 if(avctx->has_b_frames < 2)
34b0996cc10d 10l (fix reordering when B-frames are not present)
lorenm
parents: 2537
diff changeset
7528 avctx->has_b_frames= !s->low_delay;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7529 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7530 case NAL_PPS:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7531 init_get_bits(&s->gb, ptr, bit_length);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7532
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7533 decode_picture_parameter_set(h, bit_length);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7534
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7535 break;
2960
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
7536 case NAL_AUD:
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
7537 case NAL_END_SEQUENCE:
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
7538 case NAL_END_STREAM:
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
7539 case NAL_FILLER_DATA:
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
7540 case NAL_SPS_EXT:
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
7541 case NAL_AUXILIARY_SLICE:
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7542 break;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2971
diff changeset
7543 default:
5631
550e37ec2204 Silence warnings about NAL_SVC_NON_IDR in H.264.
diego
parents: 5629
diff changeset
7544 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
7545 }
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7546
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7547 if(context_count == h->max_contexts) {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7548 execute_decode_slices(h, context_count);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7549 context_count = 0;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7550 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7551
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7552 if (err < 0)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7553 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
7554 else if(err == 1) {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7555 /* Slice could not be decoded in parallel mode, copy down
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7556 * NAL unit stuff to context 0 and restart. Note that
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
7557 * rbsp_buffer is not transferred, but since we no longer
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7558 * run in parallel mode this should not be an issue. */
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7559 h->nal_unit_type = hx->nal_unit_type;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7560 h->nal_ref_idc = hx->nal_ref_idc;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7561 hx = h;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7562 goto again;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7563 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7564 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7565 if(context_count)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
7566 execute_decode_slices(h, context_count);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7567 return buf_index;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7568 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7569
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7570 /**
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
7571 * returns the number of bytes consumed for building the current frame
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7572 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7573 static int get_consumed_bytes(MpegEncContext *s, int pos, int buf_size){
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5106
diff changeset
7574 if(pos==0) pos=1; //avoid infinite loops (i doubt that is needed but ...)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7575 if(pos+10>buf_size) pos=buf_size; // oops ;)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7576
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7577 return pos;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7578 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7579
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7580 static int decode_frame(AVCodecContext *avctx,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7581 void *data, int *data_size,
6216
michael
parents: 6213
diff changeset
7582 const uint8_t *buf, int buf_size)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7583 {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7584 H264Context *h = avctx->priv_data;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7585 MpegEncContext *s = &h->s;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7586 AVFrame *pict = data;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7587 int buf_index;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7588
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7589 s->flags= avctx->flags;
1754
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1706
diff changeset
7590 s->flags2= avctx->flags2;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7591
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
7592 /* end of stream, output what is still in the buffers */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7593 if (buf_size == 0) {
4556
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7594 Picture *out;
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7595 int i, out_idx;
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7596
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7597 //FIXME factorize this with the output code below
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7598 out = h->delayed_pic[0];
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7599 out_idx = 0;
7356
e03fd655afe3 Remove redundant keyframe checks.
michael
parents: 7350
diff changeset
7600 for(i=1; h->delayed_pic[i] && h->delayed_pic[i]->poc; i++)
4556
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7601 if(h->delayed_pic[i]->poc < out->poc){
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7602 out = h->delayed_pic[i];
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7603 out_idx = i;
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7604 }
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7605
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7606 for(i=out_idx; h->delayed_pic[i]; i++)
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7607 h->delayed_pic[i] = h->delayed_pic[i+1];
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7608
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7609 if(out){
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7610 *data_size = sizeof(AVFrame);
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7611 *pict= *(AVFrame*)out;
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7612 }
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
7613
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7614 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7615 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7616
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7617 if(h->is_avc && !h->got_avcC) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7618 int i, cnt, nalsize;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7619 unsigned char *p = avctx->extradata;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7620 if(avctx->extradata_size < 7) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7621 av_log(avctx, AV_LOG_ERROR, "avcC too short\n");
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7622 return -1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7623 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7624 if(*p != 1) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7625 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
7626 return -1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7627 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7628 /* 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
7629 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
7630 h->nal_length_size = 2;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7631 // Decode sps from avcC
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7632 cnt = *(p+5) & 0x1f; // Number of sps
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7633 p += 6;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7634 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
7635 nalsize = AV_RB16(p) + 2;
2867
7c7edddaa835 dont be so picky with .mp4 ... fixes Mr&MrsSmith.mp4
michael
parents: 2861
diff changeset
7636 if(decode_nal_units(h, p, nalsize) < 0) {
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7637 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
7638 return -1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7639 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7640 p += nalsize;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7641 }
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7642 // Decode pps from avcC
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7643 cnt = *(p++); // Number of pps
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7644 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
7645 nalsize = AV_RB16(p) + 2;
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7646 if(decode_nal_units(h, p, nalsize) != nalsize) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7647 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
7648 return -1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7649 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7650 p += nalsize;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7651 }
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7652 // 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
7653 h->nal_length_size = ((*(((char*)(avctx->extradata))+4))&0x03)+1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7654 // Do not reparse avcC
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7655 h->got_avcC = 1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7656 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7657
4507
b80c704183e9 always decode extradata when of non-avc stream (like RTSP)
gpoirier
parents: 4391
diff changeset
7658 if(avctx->frame_number==0 && !h->is_avc && s->avctx->extradata_size){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7659 if(decode_nal_units(h, s->avctx->extradata, s->avctx->extradata_size) < 0)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7660 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7661 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7662
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7663 buf_index=decode_nal_units(h, buf, buf_size);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7664 if(buf_index < 0)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7665 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7666
4620
f23c20cf7579 check for no frame and prevent segfault
michael
parents: 4616
diff changeset
7667 if(!(s->flags2 & CODEC_FLAG2_CHUNKS) && !s->current_picture_ptr){
5629
7e5ebda833e9 Remove error raising when explicitely skipping frame
benoit
parents: 5547
diff changeset
7668 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
7669 av_log(avctx, AV_LOG_ERROR, "no frame!\n");
f23c20cf7579 check for no frame and prevent segfault
michael
parents: 4616
diff changeset
7670 return -1;
f23c20cf7579 check for no frame and prevent segfault
michael
parents: 4616
diff changeset
7671 }
f23c20cf7579 check for no frame and prevent segfault
michael
parents: 4616
diff changeset
7672
4616
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7673 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
7674 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
7675 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
7676 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
7677
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7678 s->mb_y= 0;
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7679
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7680 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
7681 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
7682
7350
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
7683 if(!s->dropable) {
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
7684 execute_ref_pic_marking(h, h->mmco, h->mmco_index);
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
7685 h->prev_poc_msb= h->poc_msb;
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
7686 h->prev_poc_lsb= h->poc_lsb;
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
7687 }
4616
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7688 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
7689 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
7690
5798
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
7691 /*
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
7692 * 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
7693 * 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
7694 * 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
7695 * 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
7696 * 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
7697 * 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
7698 * 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
7699 * 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
7700 * 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
7701 * 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
7702 */
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
7703 if (!FIELD_PICTURE)
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7704 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
7705
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7706 MPV_frame_end(s);
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
7707
7382
f9e70983fc35 Set field_poc (it was half uninitialized before) and use it
michael
parents: 7381
diff changeset
7708 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
7709 /* 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
7710 *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
7711
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
7712 } else {
5876
731ee5ad6bde Correct assignment of interlaced_frame; was being set on output frames,
heydowns
parents: 5825
diff changeset
7713 cur->interlaced_frame = FIELD_OR_MBAFF_PICTURE;
5904
4d8ecacecccb Provide top_field_first logic for h264
andoma
parents: 5883
diff changeset
7714 /* Derive top_field_first from field pocs. */
4d8ecacecccb Provide top_field_first logic for h264
andoma
parents: 5883
diff changeset
7715 cur->top_field_first = cur->field_poc[0] < cur->field_poc[1];
5876
731ee5ad6bde Correct assignment of interlaced_frame; was being set on output frames,
heydowns
parents: 5825
diff changeset
7716
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7717 //FIXME do something with unavailable reference frames
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7718
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7719 /* Sort B-frames into display order */
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7720
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7721 if(h->sps.bitstream_restriction_flag
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7722 && s->avctx->has_b_frames < h->sps.num_reorder_frames){
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7723 s->avctx->has_b_frames = h->sps.num_reorder_frames;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7724 s->low_delay = 0;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7725 }
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7726
7325
af725308adf4 Take the brain amputated spec literally if the user asks for it (-strict 1).
michael
parents: 7320
diff changeset
7727 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
7728 && !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
7729 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
7730 s->low_delay= 0;
af725308adf4 Take the brain amputated spec literally if the user asks for it (-strict 1).
michael
parents: 7320
diff changeset
7731 }
af725308adf4 Take the brain amputated spec literally if the user asks for it (-strict 1).
michael
parents: 7320
diff changeset
7732
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7733 pics = 0;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7734 while(h->delayed_pic[pics]) pics++;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7735
7283
39e81fdd8d23 Move the size of the H264Context delayed_pic array into a #define.
astrange
parents: 7277
diff changeset
7736 assert(pics <= MAX_DELAYED_PIC_COUNT);
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7737
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7738 h->delayed_pic[pics++] = cur;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7739 if(cur->reference == 0)
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7740 cur->reference = DELAYED_PIC_REF;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7741
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7742 out = h->delayed_pic[0];
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7743 out_idx = 0;
7356
e03fd655afe3 Remove redundant keyframe checks.
michael
parents: 7350
diff changeset
7744 for(i=1; h->delayed_pic[i] && h->delayed_pic[i]->poc; i++)
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7745 if(h->delayed_pic[i]->poc < out->poc){
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7746 out = h->delayed_pic[i];
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7747 out_idx = i;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7748 }
7360
ce31f986474c 100l cross_idr simplification had a typo
michael
parents: 7359
diff changeset
7749 cross_idr = !h->delayed_pic[0]->poc || !!h->delayed_pic[i];
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7750
7310
033d10927d45 Remove delayed_output_pic, I do not understand what this variable was good for.
michael
parents: 7309
diff changeset
7751 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
7752
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7753 if(h->sps.bitstream_restriction_flag && s->avctx->has_b_frames >= h->sps.num_reorder_frames)
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7754 { }
7320
927ac918cddb Make the automatic has_b_frames increasing code increase it up to the
michael
parents: 7318
diff changeset
7755 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
7756 || (s->low_delay &&
7317
c010b69e12eb Remove apparently unneeded out!=NULL check.
michael
parents: 7316
diff changeset
7757 ((!cross_idr && out->poc > h->outputed_poc + 2)
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6429
diff changeset
7758 || cur->pict_type == FF_B_TYPE)))
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7759 {
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7760 s->low_delay = 0;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7761 s->avctx->has_b_frames++;
7312
f9eaaadcd611 simplify
michael
parents: 7310
diff changeset
7762 }
f9eaaadcd611 simplify
michael
parents: 7310
diff changeset
7763
7316
cf1b80029862 Simplify picture output code.
michael
parents: 7315
diff changeset
7764 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
7765 out->reference &= ~DELAYED_PIC_REF;
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7766 for(i=out_idx; h->delayed_pic[i]; i++)
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7767 h->delayed_pic[i] = h->delayed_pic[i+1];
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7768 }
7316
cf1b80029862 Simplify picture output code.
michael
parents: 7315
diff changeset
7769 if(!out_of_order && pics > s->avctx->has_b_frames){
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7770 *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
7771
033d10927d45 Remove delayed_output_pic, I do not understand what this variable was good for.
michael
parents: 7309
diff changeset
7772 h->outputed_poc = out->poc;
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7773 *pict= *(AVFrame*)out;
7316
cf1b80029862 Simplify picture output code.
michael
parents: 7315
diff changeset
7774 }else{
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
7775 av_log(avctx, AV_LOG_DEBUG, "no picture\n");
7316
cf1b80029862 Simplify picture output code.
michael
parents: 7315
diff changeset
7776 }
5798
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
7777 }
2937
e63bbb945ebd fix a crash on seeking to an invalid frame
lorenm
parents: 2935
diff changeset
7778 }
e63bbb945ebd fix a crash on seeking to an invalid frame
lorenm
parents: 2935
diff changeset
7779
e63bbb945ebd fix a crash on seeking to an invalid frame
lorenm
parents: 2935
diff changeset
7780 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
7781 ff_print_debug_info(s, pict);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7782 //printf("out %d\n", (int)pict->data[0]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7783 #if 0 //?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7784
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7785 /* Return the Picture timestamp as the frame number */
5963
80103098c797 spelling
vitor
parents: 5934
diff changeset
7786 /* we subtract 1 because it is added on utils.c */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7787 avctx->frame_number = s->picture_number - 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7788 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7789 return get_consumed_bytes(s, buf_index, buf_size);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7790 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7791 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7792 static inline void fill_mb_avail(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7793 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
7794 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7795
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7796 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
7797 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
7798 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
7799 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
7800 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7801 h->mb_avail[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7802 h->mb_avail[1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7803 h->mb_avail[2]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7804 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7805 h->mb_avail[3]= s->mb_x && h->slice_table[mb_xy - 1] == h->slice_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7806 h->mb_avail[4]= 1; //FIXME move out
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7807 h->mb_avail[5]= 0; //FIXME move out
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7808 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7809 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7810
6164
ecaf5226e9b0 Consistently use TEST as the preprocessor condition to enable test code.
diego
parents: 6046
diff changeset
7811 #ifdef TEST
6172
13aa4cac4dde Add #undef printf and disable non-functional code to make test program compile.
diego
parents: 6164
diff changeset
7812 #undef printf
5380
389366aa3458 Fix the self tests which are contained in some codecs and are using random().
takis
parents: 5338
diff changeset
7813 #undef random
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7814 #define COUNT 8000
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7815 #define SIZE (COUNT*40)
5934
bd5f4dc81fbe main() --> main(void)
diego
parents: 5926
diff changeset
7816 int main(void){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7817 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7818 uint8_t temp[SIZE];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7819 PutBitContext pb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7820 GetBitContext gb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7821 // int int_temp[10000];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7822 DSPContext dsp;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7823 AVCodecContext avctx;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7824
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7825 dsputil_init(&dsp, &avctx);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7826
1522
79dddc5cd990 removed the obsolete and unused parameters of init_put_bits
alex
parents: 1453
diff changeset
7827 init_put_bits(&pb, temp, SIZE);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7828 printf("testing unsigned exp golomb\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7829 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7830 START_TIMER
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7831 set_ue_golomb(&pb, i);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7832 STOP_TIMER("set_ue_golomb");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7833 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7834 flush_put_bits(&pb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7835
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7836 init_get_bits(&gb, temp, 8*SIZE);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7837 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7838 int j, s;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7839
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7840 s= show_bits(&gb, 24);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7841
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7842 START_TIMER
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7843 j= get_ue_golomb(&gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7844 if(j != i){
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5106
diff changeset
7845 printf("mismatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7846 // return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7847 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7848 STOP_TIMER("get_ue_golomb");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7849 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7850
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7851
1524
alex
parents: 1522
diff changeset
7852 init_put_bits(&pb, temp, SIZE);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7853 printf("testing signed exp golomb\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7854 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7855 START_TIMER
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7856 set_se_golomb(&pb, i - COUNT/2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7857 STOP_TIMER("set_se_golomb");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7858 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7859 flush_put_bits(&pb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7860
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7861 init_get_bits(&gb, temp, 8*SIZE);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7862 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7863 int j, s;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7864
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7865 s= show_bits(&gb, 24);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7866
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7867 START_TIMER
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7868 j= get_se_golomb(&gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7869 if(j != i - COUNT/2){
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5106
diff changeset
7870 printf("mismatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7871 // return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7872 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7873 STOP_TIMER("get_se_golomb");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7874 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7875
6172
13aa4cac4dde Add #undef printf and disable non-functional code to make test program compile.
diego
parents: 6164
diff changeset
7876 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7877 printf("testing 4x4 (I)DCT\n");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7878
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7879 DCTELEM block[16];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7880 uint8_t src[16], ref[16];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7881 uint64_t error= 0, max_error=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7882
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7883 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7884 int j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7885 // printf("%d %d %d\n", r1, r2, (r2-r1)*16);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7886 for(j=0; j<16; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7887 ref[j]= random()%255;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7888 src[j]= random()%255;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7889 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7890
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7891 h264_diff_dct_c(block, src, ref, 4);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7892
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7893 //normalize
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7894 for(j=0; j<16; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7895 // printf("%d ", block[j]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7896 block[j]= block[j]*4;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7897 if(j&1) block[j]= (block[j]*4 + 2)/5;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7898 if(j&4) block[j]= (block[j]*4 + 2)/5;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7899 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7900 // printf("\n");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7901
2272
cd43603c46f9 move h264 idct to its own file and call via function pointer in DspContext
michael
parents: 2255
diff changeset
7902 s->dsp.h264_idct_add(ref, block, 4);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7903 /* for(j=0; j<16; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7904 printf("%d ", ref[j]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7905 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7906 printf("\n");*/
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7907
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7908 for(j=0; j<16; j++){
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
7909 int diff= FFABS(src[j] - ref[j]);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7910
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7911 error+= diff*diff;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7912 max_error= FFMAX(max_error, diff);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7913 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7914 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7915 printf("error=%f max_error=%d\n", ((float)error)/COUNT/16, (int)max_error );
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7916 printf("testing quantizer\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7917 for(qp=0; qp<52; qp++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7918 for(i=0; i<16; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7919 src1_block[i]= src2_block[i]= random()%255;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7920
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7921 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7922 printf("Testing NAL layer\n");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7923
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7924 uint8_t bitstream[COUNT];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7925 uint8_t nal[COUNT*2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7926 H264Context h;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7927 memset(&h, 0, sizeof(H264Context));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7928
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7929 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7930 int zeros= i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7931 int nal_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7932 int consumed;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7933 int out_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7934 uint8_t *out;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7935 int j;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7936
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7937 for(j=0; j<COUNT; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7938 bitstream[j]= (random() % 255) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7939 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7940
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7941 for(j=0; j<zeros; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7942 int pos= random() % COUNT;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7943 while(bitstream[pos] == 0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7944 pos++;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7945 pos %= COUNT;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7946 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7947 bitstream[pos]=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7948 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7949
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7950 START_TIMER
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7951
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7952 nal_length= encode_nal(&h, nal, bitstream, COUNT, COUNT*2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7953 if(nal_length<0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7954 printf("encoding failed\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7955 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7956 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7957
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7958 out= decode_nal(&h, nal, &out_length, &consumed, nal_length);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7959
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7960 STOP_TIMER("NAL")
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7961
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7962 if(out_length != COUNT){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7963 printf("incorrect length %d %d\n", out_length, COUNT);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7964 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7965 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7966
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7967 if(consumed != nal_length){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7968 printf("incorrect consumed length %d %d\n", nal_length, consumed);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7969 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7970 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7971
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7972 if(memcmp(bitstream, out, COUNT)){
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5106
diff changeset
7973 printf("mismatch\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7974 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7975 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7976 }
6172
13aa4cac4dde Add #undef printf and disable non-functional code to make test program compile.
diego
parents: 6164
diff changeset
7977 #endif
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7978
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7979 printf("Testing RBSP\n");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7980
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7981
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7982 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7983 }
6164
ecaf5226e9b0 Consistently use TEST as the preprocessor condition to enable test code.
diego
parents: 6046
diff changeset
7984 #endif /* TEST */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7985
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7986
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6490
diff changeset
7987 static av_cold int decode_end(AVCodecContext *avctx)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7988 {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7989 H264Context *h = avctx->priv_data;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7990 MpegEncContext *s = &h->s;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7991
5174
2e038003cdfb Do not reuse the rbsp de-escape buffer if both
benoit
parents: 5172
diff changeset
7992 av_freep(&h->rbsp_buffer[0]);
2e038003cdfb Do not reuse the rbsp de-escape buffer if both
benoit
parents: 5172
diff changeset
7993 av_freep(&h->rbsp_buffer[1]);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7994 free_tables(h); //FIXME cleanup init stuff perhaps
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7995 MPV_common_end(s);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7996
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7997 // memset(h, 0, sizeof(H264Context));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7998
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7999 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8000 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8001
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8002
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8003 AVCodec h264_decoder = {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8004 "h264",
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8005 CODEC_TYPE_VIDEO,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8006 CODEC_ID_H264,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8007 sizeof(H264Context),
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8008 decode_init,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8009 NULL,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8010 decode_end,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8011 decode_frame,
7359
1980cae356ad Remove truncated support, use an AVParser if you used that, it is the same.
michael
parents: 7358
diff changeset
8012 /*CODEC_CAP_DRAW_HORIZ_BAND |*/ CODEC_CAP_DR1 | CODEC_CAP_DELAY,
2640
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
8013 .flush= flush_dpb,
7040
e943e1409077 Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents: 6933
diff changeset
8014 .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
8015 };
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8016
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
8017 #include "svq3.c"