annotate h264.c @ 10913:497929e9d912 libavcodec

Perform reference remapping at fill_cache() time instead of in the loop filter. This removes one obstacle of getting ff_h264_filter_mb_fast() bitexact. code is maybe 0.1% faster
author michael
date Mon, 18 Jan 2010 05:15:31 +0000
parents 7cecaa3a6b38
children 7a949922866e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1 /*
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2 * H.26L/H.264/AVC/JVT/14496-10/... encoder/decoder
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3 * Copyright (c) 2003 Michael Niedermayer <michaelni@gmx.at>
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3927
diff changeset
5 * This file is part of FFmpeg.
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3927
diff changeset
6 *
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3927
diff changeset
7 * FFmpeg is free software; you can redistribute it and/or
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
9 * License as published by the Free Software Foundation; either
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3927
diff changeset
10 * version 2.1 of the License, or (at your option) any later version.
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
11 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3927
diff changeset
12 * FFmpeg is distributed in the hope that it will be useful,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
15 * Lesser General Public License for more details.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
16 *
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
17 * You should have received a copy of the GNU Lesser General Public
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3927
diff changeset
18 * License along with FFmpeg; if not, write to the Free Software
3036
0b546eab515d Update licensing information: The FSF changed postal address.
diego
parents: 3029
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
20 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
21
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
22 /**
8718
e9d9d946f213 Use full internal pathname in doxygen @file directives.
diego
parents: 8688
diff changeset
23 * @file libavcodec/h264.c
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
24 * H.264 / AVC / MPEG4 part10 codec.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
25 * @author Michael Niedermayer <michaelni@gmx.at>
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
26 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
27
9012
15a3df8c01fd More approved hunks for VAAPI & our new and cleaner hwaccel API.
michael
parents: 9004
diff changeset
28 #include "internal.h"
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
29 #include "dsputil.h"
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
30 #include "avcodec.h"
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
31 #include "mpegvideo.h"
4975
9a6a0818e93f split h264.c to move parser in its own file
aurel
parents: 4931
diff changeset
32 #include "h264.h"
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
33 #include "h264data.h"
10864
e3f5eb016712 Split motion vector prediction off h264.c/h.
michael
parents: 10863
diff changeset
34 #include "h264_mvpred.h"
4975
9a6a0818e93f split h264.c to move parser in its own file
aurel
parents: 4931
diff changeset
35 #include "h264_parser.h"
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
36 #include "golomb.h"
8627
d6bab465b82c moves mid_pred() into mathops.h (with arch specific code split by directory)
aurel
parents: 8610
diff changeset
37 #include "mathops.h"
6020
c531defb03ee Make fill_rectangle() available for other decoders
kostya
parents: 6019
diff changeset
38 #include "rectangle.h"
8522
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
39 #include "vdpau_internal.h"
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
40
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 #include "cabac.h"
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8565
diff changeset
42 #if ARCH_X86
8430
7768bdfd4f7b Rename libavcodec/i386/ --> libavcodec/x86/.
diego
parents: 8424
diff changeset
43 #include "x86/h264_i386.h"
6604
e226f34ca284 Redo r12838, this time using svn copy to create h264_i386.h from cabac.h.
heydowns
parents: 6603
diff changeset
44 #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
45
3284
a224d9752912 don't force asserts in release builds. 2% faster h264.
lorenm
parents: 3219
diff changeset
46 //#undef NDEBUG
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
47 #include <assert.h>
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
48
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
49 static void svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
50 static void svq3_add_idct_c(uint8_t *dst, DCTELEM *block, int stride, int qp, int dc);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
51
7993
2dfff0e25b47 Mark ff_div6 and ff_rem6 static in h264.c. Patch by Diego Petten
lu_zero
parents: 7974
diff changeset
52 static const uint8_t rem6[52]={
4277
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
53 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
54 };
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
55
7993
2dfff0e25b47 Mark ff_div6 and ff_rem6 static in h264.c. Patch by Diego Petten
lu_zero
parents: 7974
diff changeset
56 static const uint8_t div6[52]={
4277
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
57 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
58 };
113f3b395bac Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents: 4276
diff changeset
59
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
60 void ff_h264_write_back_intra_pred_mode(H264Context *h){
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
61 const int mb_xy= h->mb_xy;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
62
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
63 h->intra4x4_pred_mode[mb_xy][0]= h->intra4x4_pred_mode_cache[7+8*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
64 h->intra4x4_pred_mode[mb_xy][1]= h->intra4x4_pred_mode_cache[7+8*2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
65 h->intra4x4_pred_mode[mb_xy][2]= h->intra4x4_pred_mode_cache[7+8*3];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
66 h->intra4x4_pred_mode[mb_xy][3]= h->intra4x4_pred_mode_cache[7+8*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
67 h->intra4x4_pred_mode[mb_xy][4]= h->intra4x4_pred_mode_cache[4+8*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
68 h->intra4x4_pred_mode[mb_xy][5]= h->intra4x4_pred_mode_cache[5+8*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
69 h->intra4x4_pred_mode[mb_xy][6]= h->intra4x4_pred_mode_cache[6+8*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
70 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
71
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
72 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
73 * 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
74 */
10863
974ac220c93a Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents: 10862
diff changeset
75 int ff_h264_check_intra4x4_pred_mode(H264Context *h){
974ac220c93a Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents: 10862
diff changeset
76 MpegEncContext * const s = &h->s;
974ac220c93a Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents: 10862
diff changeset
77 static const int8_t top [12]= {-1, 0,LEFT_DC_PRED,-1,-1,-1,-1,-1, 0};
974ac220c93a Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents: 10862
diff changeset
78 static const int8_t left[12]= { 0,-1, TOP_DC_PRED, 0,-1,-1,-1, 0,-1,DC_128_PRED};
974ac220c93a Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents: 10862
diff changeset
79 int i;
974ac220c93a Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents: 10862
diff changeset
80
974ac220c93a Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents: 10862
diff changeset
81 if(!(h->top_samples_available&0x8000)){
974ac220c93a Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents: 10862
diff changeset
82 for(i=0; i<4; i++){
974ac220c93a Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents: 10862
diff changeset
83 int status= top[ h->intra4x4_pred_mode_cache[scan8[0] + i] ];
974ac220c93a Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents: 10862
diff changeset
84 if(status<0){
974ac220c93a Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents: 10862
diff changeset
85 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);
974ac220c93a Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents: 10862
diff changeset
86 return -1;
974ac220c93a Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents: 10862
diff changeset
87 } else if(status){
974ac220c93a Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents: 10862
diff changeset
88 h->intra4x4_pred_mode_cache[scan8[0] + i]= status;
974ac220c93a Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents: 10862
diff changeset
89 }
974ac220c93a Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents: 10862
diff changeset
90 }
974ac220c93a Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents: 10862
diff changeset
91 }
974ac220c93a Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents: 10862
diff changeset
92
974ac220c93a Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents: 10862
diff changeset
93 if((h->left_samples_available&0x8888)!=0x8888){
974ac220c93a Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents: 10862
diff changeset
94 static const int mask[4]={0x8000,0x2000,0x80,0x20};
974ac220c93a Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents: 10862
diff changeset
95 for(i=0; i<4; i++){
974ac220c93a Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents: 10862
diff changeset
96 if(!(h->left_samples_available&mask[i])){
974ac220c93a Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents: 10862
diff changeset
97 int status= left[ h->intra4x4_pred_mode_cache[scan8[0] + 8*i] ];
974ac220c93a Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents: 10862
diff changeset
98 if(status<0){
974ac220c93a Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents: 10862
diff changeset
99 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);
974ac220c93a Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents: 10862
diff changeset
100 return -1;
974ac220c93a Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents: 10862
diff changeset
101 } else if(status){
974ac220c93a Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents: 10862
diff changeset
102 h->intra4x4_pred_mode_cache[scan8[0] + 8*i]= status;
974ac220c93a Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents: 10862
diff changeset
103 }
974ac220c93a Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents: 10862
diff changeset
104 }
974ac220c93a Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents: 10862
diff changeset
105 }
974ac220c93a Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents: 10862
diff changeset
106 }
974ac220c93a Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents: 10862
diff changeset
107
974ac220c93a Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents: 10862
diff changeset
108 return 0;
974ac220c93a Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents: 10862
diff changeset
109 } //FIXME cleanup like ff_h264_check_intra_pred_mode
974ac220c93a Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents: 10862
diff changeset
110
974ac220c93a Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents: 10862
diff changeset
111 /**
974ac220c93a Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents: 10862
diff changeset
112 * checks if the top & left blocks are available if needed & changes the dc mode so it only uses the available blocks.
974ac220c93a Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents: 10862
diff changeset
113 */
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
114 int ff_h264_check_intra_pred_mode(H264Context *h, int mode){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
115 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
116 static const int8_t top [7]= {LEFT_DC_PRED8x8, 1,-1,-1};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
117 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
118
4529
a8082e1ed672 simplify
michael
parents: 4507
diff changeset
119 if(mode > 6U) {
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
120 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
121 return -1;
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
122 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
123
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
124 if(!(h->top_samples_available&0x8000)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
125 mode= top[ mode ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
126 if(mode<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
127 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
128 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
129 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
130 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
131
7532
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
132 if((h->left_samples_available&0x8080) != 0x8080){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
133 mode= left[ mode ];
7532
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
134 if(h->left_samples_available&0x8080){ //mad cow disease mode, aka MBAFF + constrained_intra_pred
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
135 mode= ALZHEIMER_DC_L0T_PRED8x8 + (!(h->left_samples_available&0x8000)) + 2*(mode == DC_128_PRED8x8);
c4de4b187b4f Support MBAFF + constrained intra prediction.
michael
parents: 7528
diff changeset
136 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
137 if(mode<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
138 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
139 return -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
140 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
141 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
142
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
143 return mode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
144 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
145
8996
e65778184ded Make the following H264 functions available to the parser:
cehoyos
parents: 8991
diff changeset
146 const uint8_t *ff_h264_decode_nal(H264Context *h, const uint8_t *src, int *dst_length, int *consumed, int length){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
147 int i, si, di;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
148 uint8_t *dst;
5174
2e038003cdfb Do not reuse the rbsp de-escape buffer if both
benoit
parents: 5172
diff changeset
149 int bufidx;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
150
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2971
diff changeset
151 // src[0]&0x80; //forbidden bit
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
152 h->nal_ref_idc= src[0]>>5;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
153 h->nal_unit_type= src[0]&0x1F;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
154
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
155 src++; length--;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
156 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
157 for(i=0; i<length; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
158 printf("%2X ", src[i]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
159 #endif
8440
649ce1b30344 Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents: 8438
diff changeset
160
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8565
diff changeset
161 #if HAVE_FAST_UNALIGNED
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8565
diff changeset
162 # if HAVE_FAST_64BIT
8440
649ce1b30344 Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents: 8438
diff changeset
163 # define RS 7
649ce1b30344 Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents: 8438
diff changeset
164 for(i=0; i+1<length; i+=9){
8987
bf9d9a79a737 Silence two warnings:
cehoyos
parents: 8972
diff changeset
165 if(!((~*(const uint64_t*)(src+i) & (*(const uint64_t*)(src+i) - 0x0100010001000101ULL)) & 0x8000800080008080ULL))
8440
649ce1b30344 Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents: 8438
diff changeset
166 # else
649ce1b30344 Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents: 8438
diff changeset
167 # define RS 3
649ce1b30344 Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents: 8438
diff changeset
168 for(i=0; i+1<length; i+=5){
8987
bf9d9a79a737 Silence two warnings:
cehoyos
parents: 8972
diff changeset
169 if(!((~*(const uint32_t*)(src+i) & (*(const uint32_t*)(src+i) - 0x01000101U)) & 0x80008080U))
8440
649ce1b30344 Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents: 8438
diff changeset
170 # endif
649ce1b30344 Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents: 8438
diff changeset
171 continue;
649ce1b30344 Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents: 8438
diff changeset
172 if(i>0 && !src[i]) i--;
649ce1b30344 Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents: 8438
diff changeset
173 while(src[i]) i++;
649ce1b30344 Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents: 8438
diff changeset
174 #else
649ce1b30344 Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents: 8438
diff changeset
175 # define RS 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
176 for(i=0; i+1<length; i+=2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
177 if(src[i]) continue;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
178 if(i>0 && src[i-1]==0) i--;
8440
649ce1b30344 Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents: 8438
diff changeset
179 #endif
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
180 if(i+2<length && src[i+1]==0 && src[i+2]<=3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
181 if(src[i+2]!=3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
182 /* startcode, so we must be past the end */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
183 length=i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
184 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
185 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
186 }
8441
f97c423dcb7f 100l, I broke H.264 again, forgot one hunk.
michael
parents: 8440
diff changeset
187 i-= RS;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
188 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
189
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
190 if(i>=length-1){ //no escaped 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
191 *dst_length= length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
192 *consumed= length+1; //+1 for the header
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
193 return src;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
194 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
195
5174
2e038003cdfb Do not reuse the rbsp de-escape buffer if both
benoit
parents: 5172
diff changeset
196 bufidx = h->nal_unit_type == NAL_DPC ? 1 : 0; // use second escape buffer for inter data
9415
141badec76fc Add a av_fast_malloc function and replace several uses of av_fast_realloc,
reimar
parents: 9386
diff changeset
197 av_fast_malloc(&h->rbsp_buffer[bufidx], &h->rbsp_buffer_size[bufidx], length+FF_INPUT_BUFFER_PADDING_SIZE);
5174
2e038003cdfb Do not reuse the rbsp de-escape buffer if both
benoit
parents: 5172
diff changeset
198 dst= h->rbsp_buffer[bufidx];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
199
4362
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
200 if (dst == NULL){
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
201 return NULL;
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
202 }
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
203
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
204 //printf("decoding esc\n");
8446
489c8d652fff Optimize esc removal code.
michael
parents: 8444
diff changeset
205 memcpy(dst, src, i);
489c8d652fff Optimize esc removal code.
michael
parents: 8444
diff changeset
206 si=di=i;
489c8d652fff Optimize esc removal code.
michael
parents: 8444
diff changeset
207 while(si+2<length){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
208 //remove escapes (very rare 1:2^22)
8446
489c8d652fff Optimize esc removal code.
michael
parents: 8444
diff changeset
209 if(src[si+2]>3){
489c8d652fff Optimize esc removal code.
michael
parents: 8444
diff changeset
210 dst[di++]= src[si++];
489c8d652fff Optimize esc removal code.
michael
parents: 8444
diff changeset
211 dst[di++]= src[si++];
489c8d652fff Optimize esc removal code.
michael
parents: 8444
diff changeset
212 }else if(src[si]==0 && src[si+1]==0){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
213 if(src[si+2]==3){ //escape
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
214 dst[di++]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
215 dst[di++]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
216 si+=3;
1957
54411768fa38 h264 nal decoding fix by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1956
diff changeset
217 continue;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
218 }else //next start code
8446
489c8d652fff Optimize esc removal code.
michael
parents: 8444
diff changeset
219 goto nsc;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
220 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
221
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
222 dst[di++]= src[si++];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
223 }
8446
489c8d652fff Optimize esc removal code.
michael
parents: 8444
diff changeset
224 while(si<length)
489c8d652fff Optimize esc removal code.
michael
parents: 8444
diff changeset
225 dst[di++]= src[si++];
489c8d652fff Optimize esc removal code.
michael
parents: 8444
diff changeset
226 nsc:
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
227
8396
11b1f7762830 Clear FF_INPUT_BUFFER_PADDING_SIZE bytes at the end of NALs in rbsp_buffer.
astrange
parents: 8395
diff changeset
228 memset(dst+di, 0, FF_INPUT_BUFFER_PADDING_SIZE);
11b1f7762830 Clear FF_INPUT_BUFFER_PADDING_SIZE bytes at the end of NALs in rbsp_buffer.
astrange
parents: 8395
diff changeset
229
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
230 *dst_length= di;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
231 *consumed= si + 1;//+1 for the header
5129
0244bba24b43 misc typo fixes
diego
parents: 5127
diff changeset
232 //FIXME store exact number of bits in the getbitcontext (it is needed for decoding)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
233 return dst;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
234 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
235
8996
e65778184ded Make the following H264 functions available to the parser:
cehoyos
parents: 8991
diff changeset
236 int ff_h264_decode_rbsp_trailing(H264Context *h, const uint8_t *src){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
237 int v= *src;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
238 int r;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
239
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
240 tprintf(h->s.avctx, "rbsp trailing %X\n", v);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
241
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
242 for(r=1; r<9; r++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
243 if(v&1) return r;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
244 v>>=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
245 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
246 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
247 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
248
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
249 /**
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
250 * IDCT transforms the 16 dc values and dequantizes them.
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
251 * @param qp quantization parameter
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
252 */
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
253 static void h264_luma_dc_dequant_idct_c(DCTELEM *block, int qp, int qmul){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
254 #define stride 16
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
255 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
256 int temp[16]; //FIXME check if this is a good idea
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
257 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
258 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
259
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
260 //memset(block, 64, 2*256);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
261 //return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
262 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
263 const int offset= y_offset[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
264 const int z0= block[offset+stride*0] + block[offset+stride*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
265 const int z1= block[offset+stride*0] - block[offset+stride*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
266 const int z2= block[offset+stride*1] - block[offset+stride*5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
267 const int z3= block[offset+stride*1] + block[offset+stride*5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
268
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
269 temp[4*i+0]= z0+z3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
270 temp[4*i+1]= z1+z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
271 temp[4*i+2]= z1-z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
272 temp[4*i+3]= z0-z3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
273 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
274
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
275 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
276 const int offset= x_offset[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
277 const int z0= temp[4*0+i] + temp[4*2+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
278 const int z1= temp[4*0+i] - temp[4*2+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
279 const int z2= temp[4*1+i] - temp[4*3+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
280 const int z3= temp[4*1+i] + temp[4*3+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
281
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
282 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
283 block[stride*2 +offset]= ((((z1 + z2)*qmul + 128 ) >> 8));
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
284 block[stride*8 +offset]= ((((z1 - z2)*qmul + 128 ) >> 8));
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
285 block[stride*10+offset]= ((((z0 - z3)*qmul + 128 ) >> 8));
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
286 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
287 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
288
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
289 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
290 /**
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
291 * DCT transforms the 16 dc values.
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
292 * @param qp quantization parameter ??? FIXME
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
293 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
294 static void h264_luma_dc_dct_c(DCTELEM *block/*, int qp*/){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
295 // const int qmul= dequant_coeff[qp][0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
296 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
297 int temp[16]; //FIXME check if this is a good idea
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
298 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
299 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
300
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
301 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
302 const int offset= y_offset[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
303 const int z0= block[offset+stride*0] + block[offset+stride*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
304 const int z1= block[offset+stride*0] - block[offset+stride*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
305 const int z2= block[offset+stride*1] - block[offset+stride*5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
306 const int z3= block[offset+stride*1] + block[offset+stride*5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
307
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
308 temp[4*i+0]= z0+z3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
309 temp[4*i+1]= z1+z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
310 temp[4*i+2]= z1-z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
311 temp[4*i+3]= z0-z3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
312 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
313
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
314 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
315 const int offset= x_offset[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
316 const int z0= temp[4*0+i] + temp[4*2+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
317 const int z1= temp[4*0+i] - temp[4*2+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
318 const int z2= temp[4*1+i] - temp[4*3+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
319 const int z3= temp[4*1+i] + temp[4*3+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
320
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
321 block[stride*0 +offset]= (z0 + z3)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
322 block[stride*2 +offset]= (z1 + z2)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
323 block[stride*8 +offset]= (z1 - z2)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
324 block[stride*10+offset]= (z0 - z3)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
325 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
326 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
327 #endif
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
328
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
329 #undef xStride
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
330 #undef stride
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
331
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
332 static void chroma_dc_dequant_idct_c(DCTELEM *block, int qp, int qmul){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
333 const int stride= 16*2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
334 const int xStride= 16;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
335 int a,b,c,d,e;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
336
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
337 a= block[stride*0 + xStride*0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
338 b= block[stride*0 + xStride*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
339 c= block[stride*1 + xStride*0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
340 d= block[stride*1 + xStride*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
341
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
342 e= a-b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
343 a= a+b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
344 b= c-d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
345 c= c+d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
346
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
347 block[stride*0 + xStride*0]= ((a+c)*qmul) >> 7;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
348 block[stride*0 + xStride*1]= ((e+b)*qmul) >> 7;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
349 block[stride*1 + xStride*0]= ((a-c)*qmul) >> 7;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
350 block[stride*1 + xStride*1]= ((e-b)*qmul) >> 7;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
351 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
352
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
353 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
354 static void chroma_dc_dct_c(DCTELEM *block){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
355 const int stride= 16*2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
356 const int xStride= 16;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
357 int a,b,c,d,e;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
358
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
359 a= block[stride*0 + xStride*0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
360 b= block[stride*0 + xStride*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
361 c= block[stride*1 + xStride*0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
362 d= block[stride*1 + xStride*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
363
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
364 e= a-b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
365 a= a+b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
366 b= c-d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
367 c= c+d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
368
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
369 block[stride*0 + xStride*0]= (a+c);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
370 block[stride*0 + xStride*1]= (e+b);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
371 block[stride*1 + xStride*0]= (a-c);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
372 block[stride*1 + xStride*1]= (e-b);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
373 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
374 #endif
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
375
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
376 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
377 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
378 int src_x_offset, int src_y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
379 qpel_mc_func *qpix_op, h264_chroma_mc_func chroma_op){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
380 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
381 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
382 int my= h->mv_cache[list][ scan8[n] ][1] + src_y_offset*8;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
383 const int luma_xy= (mx&3) + ((my&3)<<2);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
384 uint8_t * src_y = pic->data[0] + (mx>>2) + (my>>2)*h->mb_linesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
385 uint8_t * src_cb, * src_cr;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
386 int extra_width= h->emu_edge_width;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
387 int extra_height= h->emu_edge_height;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
388 int emu=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
389 const int full_mx= mx>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
390 const int full_my= my>>2;
2861
3b920e274b26 fix emulated edge motion compensation when resolution%16!=0
lorenm
parents: 2846
diff changeset
391 const int pic_width = 16*s->mb_width;
5815
fb293531e983 Simplify tests for field macroblocks
andoma
parents: 5812
diff changeset
392 const int pic_height = 16*s->mb_height >> MB_FIELD;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
393
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
394 if(mx&7) extra_width -= 3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
395 if(my&7) extra_height -= 3;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
396
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
397 if( full_mx < 0-extra_width
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
398 || full_my < 0-extra_height
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
399 || full_mx + 16/*FIXME*/ > pic_width + extra_width
2861
3b920e274b26 fix emulated edge motion compensation when resolution%16!=0
lorenm
parents: 2846
diff changeset
400 || full_my + 16/*FIXME*/ > pic_height + extra_height){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
401 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
402 src_y= s->edge_emu_buffer + 2 + 2*h->mb_linesize;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
403 emu=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
404 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
405
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
406 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
407 if(!square){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
408 qpix_op[luma_xy](dest_y + delta, src_y + delta, h->mb_linesize);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
409 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
410
8596
68e959302527 replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents: 8590
diff changeset
411 if(CONFIG_GRAY && s->flags&CODEC_FLAG_GRAY) return;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
412
5815
fb293531e983 Simplify tests for field macroblocks
andoma
parents: 5812
diff changeset
413 if(MB_FIELD){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
414 // 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
415 my += 2 * ((s->mb_y & 1) - (pic->reference - 1));
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
416 emu |= (my>>3) < 0 || (my>>3) + 8 >= (pic_height>>1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
417 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
418 src_cb= pic->data[1] + (mx>>3) + (my>>3)*h->mb_uvlinesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
419 src_cr= pic->data[2] + (mx>>3) + (my>>3)*h->mb_uvlinesize;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
420
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
421 if(emu){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
422 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
423 src_cb= s->edge_emu_buffer;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
424 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
425 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
426
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
427 if(emu){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
428 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
429 src_cr= s->edge_emu_buffer;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
430 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
431 chroma_op(dest_cr, src_cr, h->mb_uvlinesize, chroma_height, mx&7, my&7);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
432 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
433
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
434 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
435 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
436 int x_offset, int y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
437 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
438 qpel_mc_func *qpix_avg, h264_chroma_mc_func chroma_avg,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
439 int list0, int list1){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
440 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
441 qpel_mc_func *qpix_op= qpix_put;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
442 h264_chroma_mc_func chroma_op= chroma_put;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
443
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
444 dest_y += 2*x_offset + 2*y_offset*h-> mb_linesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
445 dest_cb += x_offset + y_offset*h->mb_uvlinesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
446 dest_cr += x_offset + y_offset*h->mb_uvlinesize;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
447 x_offset += 8*s->mb_x;
5815
fb293531e983 Simplify tests for field macroblocks
andoma
parents: 5812
diff changeset
448 y_offset += 8*(s->mb_y >> MB_FIELD);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
449
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
450 if(list0){
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
451 Picture *ref= &h->ref_list[0][ h->ref_cache[0][ scan8[n] ] ];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
452 mc_dir_part(h, ref, n, square, chroma_height, delta, 0,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
453 dest_y, dest_cb, dest_cr, x_offset, y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
454 qpix_op, chroma_op);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
455
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
456 qpix_op= qpix_avg;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
457 chroma_op= chroma_avg;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
458 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
459
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
460 if(list1){
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
461 Picture *ref= &h->ref_list[1][ h->ref_cache[1][ scan8[n] ] ];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
462 mc_dir_part(h, ref, n, square, chroma_height, delta, 1,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
463 dest_y, dest_cb, dest_cr, x_offset, y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
464 qpix_op, chroma_op);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
465 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
466 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
467
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
468 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
469 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
470 int x_offset, int y_offset,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
471 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
472 h264_weight_func luma_weight_op, h264_weight_func chroma_weight_op,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
473 h264_biweight_func luma_weight_avg, h264_biweight_func chroma_weight_avg,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
474 int list0, int list1){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
475 MpegEncContext * const s = &h->s;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
476
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
477 dest_y += 2*x_offset + 2*y_offset*h-> mb_linesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
478 dest_cb += x_offset + y_offset*h->mb_uvlinesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
479 dest_cr += x_offset + y_offset*h->mb_uvlinesize;
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
480 x_offset += 8*s->mb_x;
5815
fb293531e983 Simplify tests for field macroblocks
andoma
parents: 5812
diff changeset
481 y_offset += 8*(s->mb_y >> MB_FIELD);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
482
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
483 if(list0 && list1){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
484 /* don't optimize for luma-only case, since B-frames usually
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
485 * use implicit weights => chroma too. */
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
486 uint8_t *tmp_cb = s->obmc_scratchpad;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
487 uint8_t *tmp_cr = s->obmc_scratchpad + 8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
488 uint8_t *tmp_y = s->obmc_scratchpad + 8*h->mb_uvlinesize;
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
489 int refn0 = h->ref_cache[0][ scan8[n] ];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
490 int refn1 = h->ref_cache[1][ scan8[n] ];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
491
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
492 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
493 dest_y, dest_cb, dest_cr,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
494 x_offset, y_offset, qpix_put, chroma_put);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
495 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
496 tmp_y, tmp_cb, tmp_cr,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
497 x_offset, y_offset, qpix_put, chroma_put);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
498
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
499 if(h->use_weight == 2){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
500 int weight0 = h->implicit_weight[refn0][refn1];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
501 int weight1 = 64 - weight0;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
502 luma_weight_avg( dest_y, tmp_y, h-> mb_linesize, 5, weight0, weight1, 0);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
503 chroma_weight_avg(dest_cb, tmp_cb, h->mb_uvlinesize, 5, weight0, weight1, 0);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
504 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
505 }else{
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
506 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
507 h->luma_weight[0][refn0], h->luma_weight[1][refn1],
3029
7a92269a3ccd tweak h264_biweight
lorenm
parents: 3028
diff changeset
508 h->luma_offset[0][refn0] + h->luma_offset[1][refn1]);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
509 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
510 h->chroma_weight[0][refn0][0], h->chroma_weight[1][refn1][0],
3029
7a92269a3ccd tweak h264_biweight
lorenm
parents: 3028
diff changeset
511 h->chroma_offset[0][refn0][0] + h->chroma_offset[1][refn1][0]);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
512 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
513 h->chroma_weight[0][refn0][1], h->chroma_weight[1][refn1][1],
3029
7a92269a3ccd tweak h264_biweight
lorenm
parents: 3028
diff changeset
514 h->chroma_offset[0][refn0][1] + h->chroma_offset[1][refn1][1]);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
515 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
516 }else{
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
517 int list = list1 ? 1 : 0;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
518 int refn = h->ref_cache[list][ scan8[n] ];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
519 Picture *ref= &h->ref_list[list][refn];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
520 mc_dir_part(h, ref, n, square, chroma_height, delta, list,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
521 dest_y, dest_cb, dest_cr, x_offset, y_offset,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
522 qpix_put, chroma_put);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
523
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
524 luma_weight_op(dest_y, h->mb_linesize, h->luma_log2_weight_denom,
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
525 h->luma_weight[list][refn], h->luma_offset[list][refn]);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
526 if(h->use_weight_chroma){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
527 chroma_weight_op(dest_cb, h->mb_uvlinesize, h->chroma_log2_weight_denom,
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
528 h->chroma_weight[list][refn][0], h->chroma_offset[list][refn][0]);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
529 chroma_weight_op(dest_cr, h->mb_uvlinesize, h->chroma_log2_weight_denom,
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
530 h->chroma_weight[list][refn][1], h->chroma_offset[list][refn][1]);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
531 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
532 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
533 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
534
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
535 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
536 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
537 int x_offset, int y_offset,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
538 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
539 qpel_mc_func *qpix_avg, h264_chroma_mc_func chroma_avg,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
540 h264_weight_func *weight_op, h264_biweight_func *weight_avg,
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
541 int list0, int list1){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
542 if((h->use_weight==2 && list0 && list1
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
543 && (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
544 || h->use_weight==1)
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
545 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
546 x_offset, y_offset, qpix_put, chroma_put,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
547 weight_op[0], weight_op[3], weight_avg[0], weight_avg[3], list0, list1);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
548 else
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
549 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
550 x_offset, y_offset, qpix_put, chroma_put, qpix_avg, chroma_avg, list0, list1);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
551 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
552
3215
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
553 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
554 /* fetch pixels for estimated mv 4 macroblocks ahead
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
555 * optimized for 64byte cache lines */
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
556 MpegEncContext * const s = &h->s;
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
557 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
558 if(refn >= 0){
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
559 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
560 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
561 uint8_t **src= h->ref_list[list][refn].data;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
562 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
563 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
564 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
565 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
566 }
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
567 }
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
568
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
569 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
570 qpel_mc_func (*qpix_put)[16], h264_chroma_mc_func (*chroma_put),
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
571 qpel_mc_func (*qpix_avg)[16], h264_chroma_mc_func (*chroma_avg),
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
572 h264_weight_func *weight_op, h264_biweight_func *weight_avg){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
573 MpegEncContext * const s = &h->s;
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
574 const int mb_xy= h->mb_xy;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
575 const int mb_type= s->current_picture.mb_type[mb_xy];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
576
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
577 assert(IS_INTER(mb_type));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
578
3215
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
579 prefetch_motion(h, 0);
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
580
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
581 if(IS_16X16(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
582 mc_part(h, 0, 1, 8, 0, dest_y, dest_cb, dest_cr, 0, 0,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
583 qpix_put[0], chroma_put[0], qpix_avg[0], chroma_avg[0],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
584 &weight_op[0], &weight_avg[0],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
585 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
586 }else if(IS_16X8(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
587 mc_part(h, 0, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 0,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
588 qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
589 &weight_op[1], &weight_avg[1],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
590 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
591 mc_part(h, 8, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 4,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
592 qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
593 &weight_op[1], &weight_avg[1],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
594 IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
595 }else if(IS_8X16(mb_type)){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
596 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
597 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
598 &weight_op[2], &weight_avg[2],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
599 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1));
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
600 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
601 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
602 &weight_op[2], &weight_avg[2],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
603 IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
604 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
605 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
606
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
607 assert(IS_8X8(mb_type));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
608
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
609 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
610 const int sub_mb_type= h->sub_mb_type[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
611 const int n= 4*i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
612 int x_offset= (i&1)<<2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
613 int y_offset= (i&2)<<1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
614
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
615 if(IS_SUB_8X8(sub_mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
616 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
617 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
618 &weight_op[3], &weight_avg[3],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
619 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
620 }else if(IS_SUB_8X4(sub_mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
621 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
622 qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
623 &weight_op[4], &weight_avg[4],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
624 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
625 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
626 qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
627 &weight_op[4], &weight_avg[4],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
628 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
629 }else if(IS_SUB_4X8(sub_mb_type)){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
630 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
631 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
632 &weight_op[5], &weight_avg[5],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
633 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
634 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
635 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
636 &weight_op[5], &weight_avg[5],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
637 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
638 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
639 int j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
640 assert(IS_SUB_4X4(sub_mb_type));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
641 for(j=0; j<4; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
642 int sub_x_offset= x_offset + 2*(j&1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
643 int sub_y_offset= y_offset + (j&2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
644 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
645 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
646 &weight_op[6], &weight_avg[6],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
647 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
648 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
649 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
650 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
651 }
3215
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
652
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
653 prefetch_motion(h, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
654 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
655
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
656
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
657 static void free_tables(H264Context *h){
5079
4ff805f87391 allocate PPS and SPS dynamically
benoit
parents: 5066
diff changeset
658 int i;
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
659 H264Context *hx;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
660 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
661 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
662 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
663 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
664 av_freep(&h->mvd_table[1]);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
665 av_freep(&h->direct_table);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
666 av_freep(&h->non_zero_count);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
667 av_freep(&h->slice_table_base);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
668 h->slice_table= NULL;
10906
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
669 av_freep(&h->list_counts);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
670
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
671 av_freep(&h->mb2b_xy);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
672 av_freep(&h->mb2b8_xy);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
673
9386
a673af90ed8f Loop up to MAX_THREADS instead of h->s.avctx->thread_count to free the thread
reimar
parents: 9384
diff changeset
674 for(i = 0; i < MAX_THREADS; i++) {
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
675 hx = h->thread_context[i];
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
676 if(!hx) continue;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
677 av_freep(&hx->top_borders[1]);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
678 av_freep(&hx->top_borders[0]);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
679 av_freep(&hx->s.obmc_scratchpad);
9862
db929fcaeb9a H.264: Fix memory leaks with multithreading.
astrange
parents: 9831
diff changeset
680 av_freep(&hx->rbsp_buffer[1]);
db929fcaeb9a H.264: Fix memory leaks with multithreading.
astrange
parents: 9831
diff changeset
681 av_freep(&hx->rbsp_buffer[0]);
10528
6fe84da648e2 Reset rbsp buffer size when freeing its data buffer.
benoit
parents: 10514
diff changeset
682 hx->rbsp_buffer_size[0] = 0;
6fe84da648e2 Reset rbsp buffer size when freeing its data buffer.
benoit
parents: 10514
diff changeset
683 hx->rbsp_buffer_size[1] = 0;
9862
db929fcaeb9a H.264: Fix memory leaks with multithreading.
astrange
parents: 9831
diff changeset
684 if (i) av_freep(&h->thread_context[i]);
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
685 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
686 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
687
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
688 static void init_dequant8_coeff_table(H264Context *h){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
689 int i,q,x;
3174
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
690 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
691 h->dequant8_coeff[0] = h->dequant8_buffer[0];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
692 h->dequant8_coeff[1] = h->dequant8_buffer[1];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
693
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
694 for(i=0; i<2; i++ ){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
695 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
696 h->dequant8_coeff[1] = h->dequant8_buffer[0];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
697 break;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
698 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
699
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
700 for(q=0; q<52; q++){
7993
2dfff0e25b47 Mark ff_div6 and ff_rem6 static in h264.c. Patch by Diego Petten
lu_zero
parents: 7974
diff changeset
701 int shift = div6[q];
2dfff0e25b47 Mark ff_div6 and ff_rem6 static in h264.c. Patch by Diego Petten
lu_zero
parents: 7974
diff changeset
702 int idx = rem6[q];
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
703 for(x=0; x<64; x++)
3174
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
704 h->dequant8_coeff[i][q][transpose ? (x>>3)|((x&7)<<3) : x] =
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
705 ((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
706 h->pps.scaling_matrix8[i][x]) << shift;
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
707 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
708 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
709 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
710
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
711 static void init_dequant4_coeff_table(H264Context *h){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
712 int i,j,q,x;
3005
6f6f307cffac fix asymmetric CQMs with pre-transposed DCT.
lorenm
parents: 3004
diff changeset
713 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
714 for(i=0; i<6; i++ ){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
715 h->dequant4_coeff[i] = h->dequant4_buffer[i];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
716 for(j=0; j<i; j++){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
717 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
718 h->dequant4_coeff[i] = h->dequant4_buffer[j];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
719 break;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
720 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
721 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
722 if(j<i)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
723 continue;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
724
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
725 for(q=0; q<52; q++){
7993
2dfff0e25b47 Mark ff_div6 and ff_rem6 static in h264.c. Patch by Diego Petten
lu_zero
parents: 7974
diff changeset
726 int shift = div6[q] + 2;
2dfff0e25b47 Mark ff_div6 and ff_rem6 static in h264.c. Patch by Diego Petten
lu_zero
parents: 7974
diff changeset
727 int idx = rem6[q];
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
728 for(x=0; x<16; x++)
3005
6f6f307cffac fix asymmetric CQMs with pre-transposed DCT.
lorenm
parents: 3004
diff changeset
729 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
730 ((uint32_t)dequant4_coeff_init[idx][(x&1) + ((x>>2)&1)] *
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
731 h->pps.scaling_matrix4[i][x]) << shift;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
732 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
733 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
734 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
735
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
736 static void init_dequant_tables(H264Context *h){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
737 int i,x;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
738 init_dequant4_coeff_table(h);
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
739 if(h->pps.transform_8x8_mode)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
740 init_dequant8_coeff_table(h);
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
741 if(h->sps.transform_bypass){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
742 for(i=0; i<6; i++)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
743 for(x=0; x<16; x++)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
744 h->dequant4_coeff[i][0][x] = 1<<6;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
745 if(h->pps.transform_8x8_mode)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
746 for(i=0; i<2; i++)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
747 for(x=0; x<64; x++)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
748 h->dequant8_coeff[i][0][x] = 1<<6;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
749 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
750 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
751
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
752
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
753 int ff_h264_alloc_tables(H264Context *h){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
754 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
755 const int big_mb_num= s->mb_stride * (s->mb_height+1);
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
756 int x,y;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
757
10137
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9985
diff changeset
758 FF_ALLOCZ_OR_GOTO(h->s.avctx, h->intra4x4_pred_mode, big_mb_num * 8 * sizeof(uint8_t), fail)
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9985
diff changeset
759
10906
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
760 FF_ALLOCZ_OR_GOTO(h->s.avctx, h->non_zero_count , big_mb_num * 32 * sizeof(uint8_t), fail)
10137
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9985
diff changeset
761 FF_ALLOCZ_OR_GOTO(h->s.avctx, h->slice_table_base , (big_mb_num+s->mb_stride) * sizeof(*h->slice_table_base), fail)
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9985
diff changeset
762 FF_ALLOCZ_OR_GOTO(h->s.avctx, h->cbp_table, big_mb_num * sizeof(uint16_t), fail)
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9985
diff changeset
763
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9985
diff changeset
764 FF_ALLOCZ_OR_GOTO(h->s.avctx, h->chroma_pred_mode_table, big_mb_num * sizeof(uint8_t), fail)
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9985
diff changeset
765 FF_ALLOCZ_OR_GOTO(h->s.avctx, h->mvd_table[0], 32*big_mb_num * sizeof(uint16_t), fail);
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9985
diff changeset
766 FF_ALLOCZ_OR_GOTO(h->s.avctx, h->mvd_table[1], 32*big_mb_num * sizeof(uint16_t), fail);
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9985
diff changeset
767 FF_ALLOCZ_OR_GOTO(h->s.avctx, h->direct_table, 32*big_mb_num * sizeof(uint8_t) , fail);
10906
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
768 FF_ALLOCZ_OR_GOTO(h->s.avctx, h->list_counts, big_mb_num * sizeof(uint8_t), fail)
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
769
8079
2d3c7cd7d143 Replace literally hardcoded max slice number by named constant.
michael
parents: 8042
diff changeset
770 memset(h->slice_table_base, -1, (big_mb_num+s->mb_stride) * sizeof(*h->slice_table_base));
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
771 h->slice_table= h->slice_table_base + s->mb_stride*2 + 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
772
10137
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9985
diff changeset
773 FF_ALLOCZ_OR_GOTO(h->s.avctx, h->mb2b_xy , big_mb_num * sizeof(uint32_t), fail);
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9985
diff changeset
774 FF_ALLOCZ_OR_GOTO(h->s.avctx, h->mb2b8_xy , big_mb_num * sizeof(uint32_t), fail);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
775 for(y=0; y<s->mb_height; y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
776 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
777 const int mb_xy= x + y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
778 const int b_xy = 4*x + 4*y*h->b_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
779 const int b8_xy= 2*x + 2*y*h->b8_stride;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
780
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
781 h->mb2b_xy [mb_xy]= b_xy;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
782 h->mb2b8_xy[mb_xy]= b8_xy;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
783 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
784 }
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
785
2417
991f39305057 10l (obmc_scratchpad not always initialize)
lorenm
parents: 2416
diff changeset
786 s->obmc_scratchpad = NULL;
991f39305057 10l (obmc_scratchpad not always initialize)
lorenm
parents: 2416
diff changeset
787
2920
1443b4d3f4ab 10l: cqm weren't initialized in svq3.
lorenm
parents: 2919
diff changeset
788 if(!h->dequant4_coeff[0])
1443b4d3f4ab 10l: cqm weren't initialized in svq3.
lorenm
parents: 2919
diff changeset
789 init_dequant_tables(h);
1443b4d3f4ab 10l: cqm weren't initialized in svq3.
lorenm
parents: 2919
diff changeset
790
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
791 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
792 fail:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
793 free_tables(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
794 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
795 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
796
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
797 /**
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
798 * Mimic alloc_tables(), but for every context thread.
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
799 */
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
800 static void clone_tables(H264Context *dst, H264Context *src){
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
801 dst->intra4x4_pred_mode = src->intra4x4_pred_mode;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
802 dst->non_zero_count = src->non_zero_count;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
803 dst->slice_table = src->slice_table;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
804 dst->cbp_table = src->cbp_table;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
805 dst->mb2b_xy = src->mb2b_xy;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
806 dst->mb2b8_xy = src->mb2b8_xy;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
807 dst->chroma_pred_mode_table = src->chroma_pred_mode_table;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
808 dst->mvd_table[0] = src->mvd_table[0];
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
809 dst->mvd_table[1] = src->mvd_table[1];
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
810 dst->direct_table = src->direct_table;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
811
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
812 dst->s.obmc_scratchpad = NULL;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
813 ff_h264_pred_init(&dst->hpc, src->s.codec_id);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
814 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
815
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
816 /**
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
817 * Init context
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
818 * Allocate buffers which are not shared amongst multiple threads.
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
819 */
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
820 static int context_init(H264Context *h){
10137
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9985
diff changeset
821 FF_ALLOCZ_OR_GOTO(h->s.avctx, h->top_borders[0], h->s.mb_width * (16+8+8) * sizeof(uint8_t), fail)
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9985
diff changeset
822 FF_ALLOCZ_OR_GOTO(h->s.avctx, h->top_borders[1], h->s.mb_width * (16+8+8) * sizeof(uint8_t), fail)
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
823
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
824 return 0;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
825 fail:
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
826 return -1; // free_tables will clean up for us
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
827 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
828
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6490
diff changeset
829 static av_cold void common_init(H264Context *h){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
830 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
831
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
832 s->width = s->avctx->width;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
833 s->height = s->avctx->height;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
834 s->codec_id= s->avctx->codec->id;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
835
5638
4a26dc4ca11d Move H.264 intra prediction functions into their own context
kostya
parents: 5631
diff changeset
836 ff_h264_pred_init(&h->hpc, s->codec_id);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
837
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
838 h->dequant_coeff_pps= -1;
1698
420cac032278 svq3 fix
michael
parents: 1636
diff changeset
839 s->unrestricted_mv=1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
840 s->decode=1; //FIXME
2920
1443b4d3f4ab 10l: cqm weren't initialized in svq3.
lorenm
parents: 2919
diff changeset
841
8402
0199857f9000 Fix decoding with the plain C idcts of
michael
parents: 8399
diff changeset
842 dsputil_init(&s->dsp, s->avctx); // needed so that idct permutation is known early
0199857f9000 Fix decoding with the plain C idcts of
michael
parents: 8399
diff changeset
843
2920
1443b4d3f4ab 10l: cqm weren't initialized in svq3.
lorenm
parents: 2919
diff changeset
844 memset(h->pps.scaling_matrix4, 16, 6*16*sizeof(uint8_t));
1443b4d3f4ab 10l: cqm weren't initialized in svq3.
lorenm
parents: 2919
diff changeset
845 memset(h->pps.scaling_matrix8, 16, 2*64*sizeof(uint8_t));
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
846 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
847
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
848 av_cold int ff_h264_decode_init(AVCodecContext *avctx){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
849 H264Context *h= avctx->priv_data;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
850 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
851
1892
5ac49e7a1b8f init cleanup
michael
parents: 1786
diff changeset
852 MPV_decode_defaults(s);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
853
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
854 s->avctx = avctx;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
855 common_init(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
856
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
857 s->out_format = FMT_H264;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
858 s->workaround_bugs= avctx->workaround_bugs;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
859
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
860 // set defaults
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
861 // 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
862 s->quarter_sample = 1;
9075
6366106bd493 Do not set low_delay if has_b_frames has been set before init()
michael
parents: 9073
diff changeset
863 if(!avctx->has_b_frames)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
864 s->low_delay= 1;
7289
1595c063d68d SVQ3 uses the JPEG variant of YUV 4:2:0.
michael
parents: 7283
diff changeset
865
9626
bd3e11b60ccd Add a chroma_sample_location field to define positioning of chroma samples
conrad
parents: 9449
diff changeset
866 avctx->chroma_sample_location = AVCHROMA_LOC_LEFT;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
867
10866
d26e9b4d2ca1 Split cavlc out of h264.c.
michael
parents: 10864
diff changeset
868 ff_h264_decode_init_vlc();
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
869
2547
c5781912ad8a improved detection of "AVC1" style H.264 patch by (Mns Rullgrd <mru inprovide com>)
michael
parents: 2538
diff changeset
870 if(avctx->extradata_size > 0 && avctx->extradata &&
c5781912ad8a improved detection of "AVC1" style H.264 patch by (Mns Rullgrd <mru inprovide com>)
michael
parents: 2538
diff changeset
871 *(char *)avctx->extradata == 1){
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
872 h->is_avc = 1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
873 h->got_avcC = 0;
2547
c5781912ad8a improved detection of "AVC1" style H.264 patch by (Mns Rullgrd <mru inprovide com>)
michael
parents: 2538
diff changeset
874 } else {
c5781912ad8a improved detection of "AVC1" style H.264 patch by (Mns Rullgrd <mru inprovide com>)
michael
parents: 2538
diff changeset
875 h->is_avc = 0;
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
876 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
877
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
878 h->thread_context[0] = h;
7424
69766900be2d Initialize outputed_poc to INT_MIN at decoder initialization.
heydowns
parents: 7423
diff changeset
879 h->outputed_poc = INT_MIN;
7789
5c532e05faea Fix artifacts of MPEG4-720I-DN-SV8K.trp caused by lack of IDR pictures and
michael
parents: 7772
diff changeset
880 h->prev_poc_msb= 1<<16;
10858
31645cf81fcb Split SEI code off h264.c.
michael
parents: 10857
diff changeset
881 ff_h264_reset_sei(h);
9073
d1238ea3db6f Adjust time_base exactly when changing ticks_per_frame to 2 this is safer
michael
parents: 9069
diff changeset
882 if(avctx->codec_id == CODEC_ID_H264){
d1238ea3db6f Adjust time_base exactly when changing ticks_per_frame to 2 this is safer
michael
parents: 9069
diff changeset
883 if(avctx->ticks_per_frame == 1){
d1238ea3db6f Adjust time_base exactly when changing ticks_per_frame to 2 this is safer
michael
parents: 9069
diff changeset
884 s->avctx->time_base.den *=2;
d1238ea3db6f Adjust time_base exactly when changing ticks_per_frame to 2 this is safer
michael
parents: 9069
diff changeset
885 }
9065
3dbe483ce6c4 Fix SVQ3 regression since ticks_per_frame=2.
michael
parents: 9059
diff changeset
886 avctx->ticks_per_frame = 2;
9073
d1238ea3db6f Adjust time_base exactly when changing ticks_per_frame to 2 this is safer
michael
parents: 9069
diff changeset
887 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
888 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
889 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
890
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
891 int ff_h264_frame_start(H264Context *h){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
892 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
893 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
894
2935
b564bb15e63c check MPV_frame_start() return value
michael
parents: 2928
diff changeset
895 if(MPV_frame_start(s, s->avctx) < 0)
b564bb15e63c check MPV_frame_start() return value
michael
parents: 2928
diff changeset
896 return -1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
897 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
898 /*
e3d7a78e2df3 Fix Picture.key_frame setting to be compatible with frame and field contexts. Part of PAFF implementation.
andoma
parents: 5772
diff changeset
899 * 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
900 * This is incorrect for H.264; IDR markings must be used.
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
901 * 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
902 * 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
903 */
e3d7a78e2df3 Fix Picture.key_frame setting to be compatible with frame and field contexts. Part of PAFF implementation.
andoma
parents: 5772
diff changeset
904 s->current_picture_ptr->key_frame= 0;
9885
f86df3ebfef7 Improve wording: s/reseted/reset
cehoyos
parents: 9883
diff changeset
905 s->current_picture_ptr->mmco_reset= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
906
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
907 assert(s->linesize && s->uvlinesize);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
908
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
909 for(i=0; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
910 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
911 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
912 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
913 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
914 h->block_offset[16+i]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
915 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
916 h->block_offset[24+16+i]=
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
917 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
918 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
919
2416
06b7d678b582 10l: scratchpad could be allocated before its size was known.
lorenm
parents: 2415
diff changeset
920 /* 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
921 * FIXME: redo bipred weight to not require extra buffer? */
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
922 for(i = 0; i < s->avctx->thread_count; i++)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
923 if(!h->thread_context[i]->s.obmc_scratchpad)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
924 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
925
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
926 /* some macroblocks will be accessed before they're available */
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
927 if(FRAME_MBAFF || s->avctx->thread_count > 1)
8079
2d3c7cd7d143 Replace literally hardcoded max slice number by named constant.
michael
parents: 8042
diff changeset
928 memset(h->slice_table, -1, (s->mb_height*s->mb_stride-1) * sizeof(*h->slice_table));
2416
06b7d678b582 10l: scratchpad could be allocated before its size was known.
lorenm
parents: 2415
diff changeset
929
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
930 // 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
931
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
932 // 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
933 // 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
934 // in the next MPV_frame_start().
cd231f79c52b Try to fix my latest 100l fate SVQ3 breakage.
michael
parents: 7317
diff changeset
935 // 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
936 // 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
937 // mark frames as reference later "naturally".
cd231f79c52b Try to fix my latest 100l fate SVQ3 breakage.
michael
parents: 7317
diff changeset
938 if(s->codec_id != CODEC_ID_SVQ3)
cd231f79c52b Try to fix my latest 100l fate SVQ3 breakage.
michael
parents: 7317
diff changeset
939 s->current_picture_ptr->reference= 0;
7382
f9e70983fc35 Set field_poc (it was half uninitialized before) and use it
michael
parents: 7381
diff changeset
940
f9e70983fc35 Set field_poc (it was half uninitialized before) and use it
michael
parents: 7381
diff changeset
941 s->current_picture_ptr->field_poc[0]=
f9e70983fc35 Set field_poc (it was half uninitialized before) and use it
michael
parents: 7381
diff changeset
942 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
943 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
944
2935
b564bb15e63c check MPV_frame_start() return value
michael
parents: 2928
diff changeset
945 return 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
946 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
947
5106
ddb5abe164f3 h264: use 'simple' in border backup / xchg
benoit
parents: 5093
diff changeset
948 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
949 MpegEncContext * const s = &h->s;
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
950 int top_idx = 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
951
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
952 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
953 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
954 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
955
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
956 if(!simple && FRAME_MBAFF){
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
957 if(s->mb_y&1){
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
958 if(!MB_MBAFF){
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
959 *(uint64_t*)(h->top_borders[0][s->mb_x]+ 0)= *(uint64_t*)(src_y + 15*linesize);
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
960 *(uint64_t*)(h->top_borders[0][s->mb_x]+ 8)= *(uint64_t*)(src_y +8+15*linesize);
8596
68e959302527 replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents: 8590
diff changeset
961 if(simple || !CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
962 *(uint64_t*)(h->top_borders[0][s->mb_x]+16)= *(uint64_t*)(src_cb+7*uvlinesize);
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
963 *(uint64_t*)(h->top_borders[0][s->mb_x]+24)= *(uint64_t*)(src_cr+7*uvlinesize);
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
964 }
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
965 }
10906
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
966 }else if(MB_MBAFF){
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
967 top_idx = 0;
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
968 }else
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
969 return;
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
970 }
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
971
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
972 // 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
973 // and the line above the bottom macroblock
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
974
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
975 *(uint64_t*)(h->top_borders[top_idx][s->mb_x]+0)= *(uint64_t*)(src_y + 16*linesize);
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
976 *(uint64_t*)(h->top_borders[top_idx][s->mb_x]+8)= *(uint64_t*)(src_y +8+16*linesize);
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
977
8596
68e959302527 replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents: 8590
diff changeset
978 if(simple || !CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
979 *(uint64_t*)(h->top_borders[top_idx][s->mb_x]+16)= *(uint64_t*)(src_cb+8*uvlinesize);
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
980 *(uint64_t*)(h->top_borders[top_idx][s->mb_x]+24)= *(uint64_t*)(src_cr+8*uvlinesize);
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
981 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
982 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
983
5106
ddb5abe164f3 h264: use 'simple' in border backup / xchg
benoit
parents: 5093
diff changeset
984 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
985 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
986 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
987 uint64_t temp64;
5177
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
988 int deblock_left;
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
989 int deblock_top;
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
990 int mb_xy;
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
991 int top_idx = 1;
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
992
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
993 if(!simple && FRAME_MBAFF){
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
994 if(s->mb_y&1){
10906
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
995 if(!MB_MBAFF)
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
996 return;
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
997 }else{
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
998 top_idx = MB_MBAFF ? 0 : 1;
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
999 }
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
1000 }
5177
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
1001
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
1002 if(h->deblocking_filter == 2) {
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
1003 mb_xy = h->mb_xy;
5177
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
1004 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
1005 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
1006 } else {
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
1007 deblock_left = (s->mb_x > 0);
7926
224dea3d9ac8 Avoid out of picture accesses when CODEC_FLAG_EMU_EDGE is set.
michael
parents: 7923
diff changeset
1008 deblock_top = (s->mb_y > !!MB_FIELD);
5177
ea61020e5e87 Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents: 5174
diff changeset
1009 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
1010
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
1011 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
1012 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
1013 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
1014
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
1015 #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
1016 t= a;\
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
1017 if(xchg)\
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
1018 a= b;\
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
1019 b= t;
2200
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
1020
10906
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
1021 if(deblock_top){
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
1022 if(deblock_left){
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
1023 XCHG(*(uint64_t*)(h->top_borders[top_idx][s->mb_x-1]+8), *(uint64_t*)(src_y -7), temp64, 1);
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
1024 }
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
1025 XCHG(*(uint64_t*)(h->top_borders[top_idx][s->mb_x]+0), *(uint64_t*)(src_y +1), temp64, xchg);
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
1026 XCHG(*(uint64_t*)(h->top_borders[top_idx][s->mb_x]+8), *(uint64_t*)(src_y +9), temp64, 1);
2803
26970df644f1 Add missing +1 in bounds check.
reimar
parents: 2793
diff changeset
1027 if(s->mb_x+1 < s->mb_width){
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
1028 XCHG(*(uint64_t*)(h->top_borders[top_idx][s->mb_x+1]), *(uint64_t*)(src_y +17), temp64, 1);
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
1029 }
2200
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
1030 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
1031
8596
68e959302527 replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents: 8590
diff changeset
1032 if(simple || !CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
10906
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
1033 if(deblock_top){
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
1034 if(deblock_left){
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
1035 XCHG(*(uint64_t*)(h->top_borders[top_idx][s->mb_x-1]+16), *(uint64_t*)(src_cb -7), temp64, 1);
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
1036 XCHG(*(uint64_t*)(h->top_borders[top_idx][s->mb_x-1]+24), *(uint64_t*)(src_cr -7), temp64, 1);
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
1037 }
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
1038 XCHG(*(uint64_t*)(h->top_borders[top_idx][s->mb_x]+16), *(uint64_t*)(src_cb+1), temp64, 1);
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
1039 XCHG(*(uint64_t*)(h->top_borders[top_idx][s->mb_x]+24), *(uint64_t*)(src_cr+1), temp64, 1);
2200
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
1040 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
1041 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
1042 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
1043
4908
777f250df232 Fix multiple "inline/static is not at beginning of declaration" warnings.
diego
parents: 4896
diff changeset
1044 static av_always_inline void hl_decode_mb_internal(H264Context *h, int simple){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1045 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1046 const int mb_x= s->mb_x;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1047 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
1048 const int mb_xy= h->mb_xy;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1049 const int mb_type= s->current_picture.mb_type[mb_xy];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1050 uint8_t *dest_y, *dest_cb, *dest_cr;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1051 int linesize, uvlinesize /*dct_offset*/;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1052 int i;
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
1053 int *block_offset = &h->block_offset[0];
8352
82790b28b6e0 Support the new lossless mode.
michael
parents: 8330
diff changeset
1054 const int transform_bypass = !simple && (s->qscale == 0 && h->sps.transform_bypass);
8543
2cc3cf7b09b1 Disable SVQ3 checks if SVQ3 support is not compiled in.
diego
parents: 8525
diff changeset
1055 /* is_h264 should always be true if SVQ3 is disabled. */
8596
68e959302527 replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents: 8590
diff changeset
1056 const int is_h264 = !CONFIG_SVQ3_DECODER || simple || s->codec_id == CODEC_ID_H264;
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
1057 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
1058 void (*idct_dc_add)(uint8_t *dst, DCTELEM *block, int stride);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1059
8355
179f8e1327ce Factorize 3 multiplications out, code becomes 3 cpu cycles faster.
michael
parents: 8354
diff changeset
1060 dest_y = s->current_picture.data[0] + (mb_x + mb_y * s->linesize ) * 16;
179f8e1327ce Factorize 3 multiplications out, code becomes 3 cpu cycles faster.
michael
parents: 8354
diff changeset
1061 dest_cb = s->current_picture.data[1] + (mb_x + mb_y * s->uvlinesize) * 8;
179f8e1327ce Factorize 3 multiplications out, code becomes 3 cpu cycles faster.
michael
parents: 8354
diff changeset
1062 dest_cr = s->current_picture.data[2] + (mb_x + mb_y * s->uvlinesize) * 8;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1063
4000
eeab02251056 more prefetches, 2% faster h264
lorenm
parents: 3993
diff changeset
1064 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
1065 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
1066
10906
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
1067 h->list_counts[mb_xy]= h->list_count;
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
1068
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
1069 if (!simple && MB_FIELD) {
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1070 linesize = h->mb_linesize = s->linesize * 2;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1071 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
1072 block_offset = &h->block_offset[24];
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
1073 if(mb_y&1){ //FIXME move out of this function?
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1074 dest_y -= s->linesize*15;
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
1075 dest_cb-= s->uvlinesize*7;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
1076 dest_cr-= s->uvlinesize*7;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1077 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1078 if(FRAME_MBAFF) {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1079 int list;
4533
dca590e16c43 replace list<2 checks by list<list_count
michael
parents: 4532
diff changeset
1080 for(list=0; list<h->list_count; list++){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1081 if(!USES_LIST(mb_type, list))
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1082 continue;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1083 if(IS_16X16(mb_type)){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1084 int8_t *ref = &h->ref_cache[list][scan8[0]];
6203
c9433472cb95 Fix the following warnings:
andoma
parents: 6193
diff changeset
1085 fill_rectangle(ref, 4, 4, 8, (16+*ref)^(s->mb_y&1), 1);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1086 }else{
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1087 for(i=0; i<16; i+=4){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1088 int ref = h->ref_cache[list][scan8[i]];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1089 if(ref >= 0)
6203
c9433472cb95 Fix the following warnings:
andoma
parents: 6193
diff changeset
1090 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
1091 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1092 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1093 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1094 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1095 } else {
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1096 linesize = h->mb_linesize = s->linesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1097 uvlinesize = h->mb_uvlinesize = s->uvlinesize;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1098 // dct_offset = s->linesize * 16;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1099 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1100
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
1101 if (!simple && IS_INTRA_PCM(mb_type)) {
7450
30d38a880fde Simplify intra PCM MB handling.
michael
parents: 7445
diff changeset
1102 for (i=0; i<16; i++) {
30d38a880fde Simplify intra PCM MB handling.
michael
parents: 7445
diff changeset
1103 memcpy(dest_y + i* linesize, h->mb + i*8, 16);
30d38a880fde Simplify intra PCM MB handling.
michael
parents: 7445
diff changeset
1104 }
30d38a880fde Simplify intra PCM MB handling.
michael
parents: 7445
diff changeset
1105 for (i=0; i<8; i++) {
30d38a880fde Simplify intra PCM MB handling.
michael
parents: 7445
diff changeset
1106 memcpy(dest_cb+ i*uvlinesize, h->mb + 128 + i*4, 8);
30d38a880fde Simplify intra PCM MB handling.
michael
parents: 7445
diff changeset
1107 memcpy(dest_cr+ i*uvlinesize, h->mb + 160 + i*4, 8);
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
1108 }
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
1109 } else {
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
1110 if(IS_INTRA(mb_type)){
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
1111 if(h->deblocking_filter)
5106
ddb5abe164f3 h264: use 'simple' in border backup / xchg
benoit
parents: 5093
diff changeset
1112 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
1113
8596
68e959302527 replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents: 8590
diff changeset
1114 if(simple || !CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
5638
4a26dc4ca11d Move H.264 intra prediction functions into their own context
kostya
parents: 5631
diff changeset
1115 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
1116 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
1117 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
1118
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
1119 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
1120 if(simple || !s->encoding){
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
1121 if(IS_8x8DCT(mb_type)){
8379
be5e0a75b457 Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents: 8378
diff changeset
1122 if(transform_bypass){
be5e0a75b457 Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents: 8378
diff changeset
1123 idct_dc_add =
be5e0a75b457 Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents: 8378
diff changeset
1124 idct_add = s->dsp.add_pixels8;
8382
fe7d1c920aeb Remove useless IS_8x8DCT check i forgot, spotted by dark shikari.
michael
parents: 8379
diff changeset
1125 }else{
8379
be5e0a75b457 Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents: 8378
diff changeset
1126 idct_dc_add = s->dsp.h264_idct8_dc_add;
be5e0a75b457 Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents: 8378
diff changeset
1127 idct_add = s->dsp.h264_idct8_add;
be5e0a75b457 Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents: 8378
diff changeset
1128 }
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
1129 for(i=0; i<16; i+=4){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
1130 uint8_t * const ptr= dest_y + block_offset[i];
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
1131 const int dir= h->intra4x4_pred_mode_cache[ scan8[i] ];
8352
82790b28b6e0 Support the new lossless mode.
michael
parents: 8330
diff changeset
1132 if(transform_bypass && h->sps.profile_idc==244 && dir<=1){
82790b28b6e0 Support the new lossless mode.
michael
parents: 8330
diff changeset
1133 h->hpc.pred8x8l_add[dir](ptr, h->mb + i*16, linesize);
82790b28b6e0 Support the new lossless mode.
michael
parents: 8330
diff changeset
1134 }else{
8357
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
1135 const int nnz = h->non_zero_count_cache[ scan8[i] ];
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
1136 h->hpc.pred8x8l[ dir ](ptr, (h->topleft_samples_available<<i)&0x8000,
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
1137 (h->topright_samples_available<<i)&0x4000, linesize);
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
1138 if(nnz){
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
1139 if(nnz == 1 && h->mb[i*16])
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
1140 idct_dc_add(ptr, h->mb + i*16, linesize);
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
1141 else
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
1142 idct_add (ptr, h->mb + i*16, linesize);
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
1143 }
8352
82790b28b6e0 Support the new lossless mode.
michael
parents: 8330
diff changeset
1144 }
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
1145 }
8379
be5e0a75b457 Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents: 8378
diff changeset
1146 }else{
be5e0a75b457 Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents: 8378
diff changeset
1147 if(transform_bypass){
be5e0a75b457 Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents: 8378
diff changeset
1148 idct_dc_add =
be5e0a75b457 Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents: 8378
diff changeset
1149 idct_add = s->dsp.add_pixels4;
be5e0a75b457 Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents: 8378
diff changeset
1150 }else{
be5e0a75b457 Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents: 8378
diff changeset
1151 idct_dc_add = s->dsp.h264_idct_dc_add;
be5e0a75b457 Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents: 8378
diff changeset
1152 idct_add = s->dsp.h264_idct_add;
be5e0a75b457 Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents: 8378
diff changeset
1153 }
8389
michael
parents: 8388
diff changeset
1154 for(i=0; i<16; i++){
michael
parents: 8388
diff changeset
1155 uint8_t * const ptr= dest_y + block_offset[i];
michael
parents: 8388
diff changeset
1156 const int dir= h->intra4x4_pred_mode_cache[ scan8[i] ];
michael
parents: 8388
diff changeset
1157
michael
parents: 8388
diff changeset
1158 if(transform_bypass && h->sps.profile_idc==244 && dir<=1){
michael
parents: 8388
diff changeset
1159 h->hpc.pred4x4_add[dir](ptr, h->mb + i*16, linesize);
michael
parents: 8388
diff changeset
1160 }else{
michael
parents: 8388
diff changeset
1161 uint8_t *topright;
michael
parents: 8388
diff changeset
1162 int nnz, tr;
michael
parents: 8388
diff changeset
1163 if(dir == DIAG_DOWN_LEFT_PRED || dir == VERT_LEFT_PRED){
michael
parents: 8388
diff changeset
1164 const int topright_avail= (h->topright_samples_available<<i)&0x8000;
michael
parents: 8388
diff changeset
1165 assert(mb_y || linesize <= block_offset[i]);
michael
parents: 8388
diff changeset
1166 if(!topright_avail){
michael
parents: 8388
diff changeset
1167 tr= ptr[3 - linesize]*0x01010101;
michael
parents: 8388
diff changeset
1168 topright= (uint8_t*) &tr;
michael
parents: 8388
diff changeset
1169 }else
michael
parents: 8388
diff changeset
1170 topright= ptr + 4 - linesize;
8357
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
1171 }else
8389
michael
parents: 8388
diff changeset
1172 topright= NULL;
michael
parents: 8388
diff changeset
1173
michael
parents: 8388
diff changeset
1174 h->hpc.pred4x4[ dir ](ptr, topright, linesize);
michael
parents: 8388
diff changeset
1175 nnz = h->non_zero_count_cache[ scan8[i] ];
michael
parents: 8388
diff changeset
1176 if(nnz){
michael
parents: 8388
diff changeset
1177 if(is_h264){
michael
parents: 8388
diff changeset
1178 if(nnz == 1 && h->mb[i*16])
michael
parents: 8388
diff changeset
1179 idct_dc_add(ptr, h->mb + i*16, linesize);
michael
parents: 8388
diff changeset
1180 else
michael
parents: 8388
diff changeset
1181 idct_add (ptr, h->mb + i*16, linesize);
michael
parents: 8388
diff changeset
1182 }else
michael
parents: 8388
diff changeset
1183 svq3_add_idct_c(ptr, h->mb + i*16, linesize, s->qscale, 0);
michael
parents: 8388
diff changeset
1184 }
8357
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
1185 }
8352
82790b28b6e0 Support the new lossless mode.
michael
parents: 8330
diff changeset
1186 }
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
1187 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
1188 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
1189 }else{
5638
4a26dc4ca11d Move H.264 intra prediction functions into their own context
kostya
parents: 5631
diff changeset
1190 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
1191 if(is_h264){
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
1192 if(!transform_bypass)
5727
0591d5928fe8 Remove redundant test.
takis
parents: 5723
diff changeset
1193 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
1194 }else
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
1195 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
1196 }
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
1197 if(h->deblocking_filter)
5106
ddb5abe164f3 h264: use 'simple' in border backup / xchg
benoit
parents: 5093
diff changeset
1198 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
1199 }else if(is_h264){
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
1200 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
1201 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
1202 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
1203 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
1204 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
1205
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
1206
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
1207 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
1208 if(is_h264){
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
1209 if(IS_INTRA16x16(mb_type)){
8376
e1b242224970 Use the new idct functions (except chroma as it was slower in benchmarks)
michael
parents: 8374
diff changeset
1210 if(transform_bypass){
e1b242224970 Use the new idct functions (except chroma as it was slower in benchmarks)
michael
parents: 8374
diff changeset
1211 if(h->sps.profile_idc==244 && (h->intra16x16_pred_mode==VERT_PRED8x8 || h->intra16x16_pred_mode==HOR_PRED8x8)){
8377
michael
parents: 8376
diff changeset
1212 h->hpc.pred16x16_add[h->intra16x16_pred_mode](dest_y, block_offset, h->mb, linesize);
michael
parents: 8376
diff changeset
1213 }else{
michael
parents: 8376
diff changeset
1214 for(i=0; i<16; i++){
michael
parents: 8376
diff changeset
1215 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16])
8379
be5e0a75b457 Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents: 8378
diff changeset
1216 s->dsp.add_pixels4(dest_y + block_offset[i], h->mb + i*16, linesize);
8377
michael
parents: 8376
diff changeset
1217 }
8357
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
1218 }
8376
e1b242224970 Use the new idct functions (except chroma as it was slower in benchmarks)
michael
parents: 8374
diff changeset
1219 }else{
e1b242224970 Use the new idct functions (except chroma as it was slower in benchmarks)
michael
parents: 8374
diff changeset
1220 s->dsp.h264_idct_add16intra(dest_y, block_offset, h->mb, linesize, h->non_zero_count_cache);
8352
82790b28b6e0 Support the new lossless mode.
michael
parents: 8330
diff changeset
1221 }
8374
9000fd7c166e Skip non intra luma code when there is no coded luma.
michael
parents: 8372
diff changeset
1222 }else if(h->cbp&15){
8376
e1b242224970 Use the new idct functions (except chroma as it was slower in benchmarks)
michael
parents: 8374
diff changeset
1223 if(transform_bypass){
8377
michael
parents: 8376
diff changeset
1224 const int di = IS_8x8DCT(mb_type) ? 4 : 1;
8379
be5e0a75b457 Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents: 8378
diff changeset
1225 idct_add= IS_8x8DCT(mb_type) ? s->dsp.add_pixels8 : s->dsp.add_pixels4;
8377
michael
parents: 8376
diff changeset
1226 for(i=0; i<16; i+=di){
8378
9c6512be76b4 Remove redundant nnz variable.
michael
parents: 8377
diff changeset
1227 if(h->non_zero_count_cache[ scan8[i] ]){
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
1228 idct_add(dest_y + block_offset[i], h->mb + i*16, linesize);
8377
michael
parents: 8376
diff changeset
1229 }
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
1230 }
8376
e1b242224970 Use the new idct functions (except chroma as it was slower in benchmarks)
michael
parents: 8374
diff changeset
1231 }else{
e1b242224970 Use the new idct functions (except chroma as it was slower in benchmarks)
michael
parents: 8374
diff changeset
1232 if(IS_8x8DCT(mb_type)){
e1b242224970 Use the new idct functions (except chroma as it was slower in benchmarks)
michael
parents: 8374
diff changeset
1233 s->dsp.h264_idct8_add4(dest_y, block_offset, h->mb, linesize, h->non_zero_count_cache);
e1b242224970 Use the new idct functions (except chroma as it was slower in benchmarks)
michael
parents: 8374
diff changeset
1234 }else{
e1b242224970 Use the new idct functions (except chroma as it was slower in benchmarks)
michael
parents: 8374
diff changeset
1235 s->dsp.h264_idct_add16(dest_y, block_offset, h->mb, linesize, h->non_zero_count_cache);
e1b242224970 Use the new idct functions (except chroma as it was slower in benchmarks)
michael
parents: 8374
diff changeset
1236 }
e1b242224970 Use the new idct functions (except chroma as it was slower in benchmarks)
michael
parents: 8374
diff changeset
1237 }
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
1238 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
1239 }else{
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
1240 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
1241 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
1242 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
1243 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
1244 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1245 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1246 }
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
1247 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
1248
8596
68e959302527 replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents: 8590
diff changeset
1249 if((simple || !CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY)) && (h->cbp&0x30)){
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
1250 uint8_t *dest[2] = {dest_cb, dest_cr};
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
1251 if(transform_bypass){
8388
9eb29759df54 Reorder ifs in chroma hl_decode_mb to avoid a duplicate transform_bypass
michael
parents: 8387
diff changeset
1252 if(IS_INTRA(mb_type) && h->sps.profile_idc==244 && (h->chroma_pred_mode==VERT_PRED8x8 || h->chroma_pred_mode==HOR_PRED8x8)){
9eb29759df54 Reorder ifs in chroma hl_decode_mb to avoid a duplicate transform_bypass
michael
parents: 8387
diff changeset
1253 h->hpc.pred8x8_add[h->chroma_pred_mode](dest[0], block_offset + 16, h->mb + 16*16, uvlinesize);
9eb29759df54 Reorder ifs in chroma hl_decode_mb to avoid a duplicate transform_bypass
michael
parents: 8387
diff changeset
1254 h->hpc.pred8x8_add[h->chroma_pred_mode](dest[1], block_offset + 20, h->mb + 20*16, uvlinesize);
9eb29759df54 Reorder ifs in chroma hl_decode_mb to avoid a duplicate transform_bypass
michael
parents: 8387
diff changeset
1255 }else{
8390
31f8d52753e4 Move idct_(dc)add closer to where it is needed.
michael
parents: 8389
diff changeset
1256 idct_add = s->dsp.add_pixels4;
8388
9eb29759df54 Reorder ifs in chroma hl_decode_mb to avoid a duplicate transform_bypass
michael
parents: 8387
diff changeset
1257 for(i=16; i<16+8; i++){
9eb29759df54 Reorder ifs in chroma hl_decode_mb to avoid a duplicate transform_bypass
michael
parents: 8387
diff changeset
1258 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16])
9eb29759df54 Reorder ifs in chroma hl_decode_mb to avoid a duplicate transform_bypass
michael
parents: 8387
diff changeset
1259 idct_add (dest[(i&4)>>2] + block_offset[i], h->mb + i*16, uvlinesize);
9eb29759df54 Reorder ifs in chroma hl_decode_mb to avoid a duplicate transform_bypass
michael
parents: 8387
diff changeset
1260 }
9eb29759df54 Reorder ifs in chroma hl_decode_mb to avoid a duplicate transform_bypass
michael
parents: 8387
diff changeset
1261 }
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
1262 }else{
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
1263 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
1264 chroma_dc_dequant_idct_c(h->mb + 16*16+4*16, h->chroma_qp[1], h->dequant4_coeff[IS_INTRA(mb_type) ? 2:5][h->chroma_qp[1]][0]);
8389
michael
parents: 8388
diff changeset
1265 if(is_h264){
8390
31f8d52753e4 Move idct_(dc)add closer to where it is needed.
michael
parents: 8389
diff changeset
1266 idct_add = s->dsp.h264_idct_add;
31f8d52753e4 Move idct_(dc)add closer to where it is needed.
michael
parents: 8389
diff changeset
1267 idct_dc_add = s->dsp.h264_idct_dc_add;
8357
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
1268 for(i=16; i<16+8; i++){
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
1269 if(h->non_zero_count_cache[ scan8[i] ])
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
1270 idct_add (dest[(i&4)>>2] + block_offset[i], h->mb + i*16, uvlinesize);
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
1271 else if(h->mb[i*16])
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
1272 idct_dc_add(dest[(i&4)>>2] + block_offset[i], h->mb + i*16, uvlinesize);
1ef90fd7706a Fix indention, also do a little vertical alignment of changed lines.
michael
parents: 8355
diff changeset
1273 }
8389
michael
parents: 8388
diff changeset
1274 }else{
michael
parents: 8388
diff changeset
1275 for(i=16; i<16+8; i++){
michael
parents: 8388
diff changeset
1276 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){
michael
parents: 8388
diff changeset
1277 uint8_t * const ptr= dest[(i&4)>>2] + block_offset[i];
10859
762e6bb0ba40 Split (picture|seq) parameter set decoding out of h264.c.
michael
parents: 10858
diff changeset
1278 svq3_add_idct_c(ptr, h->mb + i*16, uvlinesize, ff_h264_chroma_qp[s->qscale + 12] - 12, 2);
8389
michael
parents: 8388
diff changeset
1279 }
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
1280 }
1250
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
1281 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1282 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1283 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1284 }
8415
938824a1f42f Only execute clear_blocks() when needed.
michael
parents: 8411
diff changeset
1285 if(h->cbp || IS_INTRA(mb_type))
938824a1f42f Only execute clear_blocks() when needed.
michael
parents: 8411
diff changeset
1286 s->dsp.clear_blocks(h->mb);
938824a1f42f Only execute clear_blocks() when needed.
michael
parents: 8411
diff changeset
1287
10906
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
1288 if(h->deblocking_filter && 0) {
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
1289 backup_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, simple);
10907
2d82b73b12ef Split fill_caches() between filter and decoder.
michael
parents: 10906
diff changeset
1290 fill_filter_caches(h, mb_type); //FIXME don't fill stuff which isn't used by filter_mb
7522
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
1291 h->chroma_qp[0] = get_chroma_qp(h, 0, s->current_picture.qscale_table[mb_xy]);
4017c5ba7bab Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents: 7498
diff changeset
1292 h->chroma_qp[1] = get_chroma_qp(h, 1, s->current_picture.qscale_table[mb_xy]);
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
1293 if (!simple && FRAME_MBAFF) {
10854
f6fc6ace95e3 Split h264 loop filter off h264.c.
michael
parents: 10852
diff changeset
1294 ff_h264_filter_mb (h, mb_x, mb_y, dest_y, dest_cb, dest_cr, linesize, uvlinesize);
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
1295 } else {
10854
f6fc6ace95e3 Split h264 loop filter off h264.c.
michael
parents: 10852
diff changeset
1296 ff_h264_filter_mb_fast(h, mb_x, mb_y, dest_y, dest_cb, dest_cr, linesize, uvlinesize);
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
1297 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
1298 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1299 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1300
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1301 /**
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
1302 * 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
1303 */
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
1304 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
1305 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
1306 }
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
1307
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
1308 /**
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
1309 * 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
1310 */
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
1311 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
1312 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
1313 }
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
1314
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
1315 void ff_h264_hl_decode_mb(H264Context *h){
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
1316 MpegEncContext * const s = &h->s;
6783
df0893f4fd86 Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents: 6753
diff changeset
1317 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
1318 const int mb_type= s->current_picture.mb_type[mb_xy];
8596
68e959302527 replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents: 8590
diff changeset
1319 int is_complex = CONFIG_SMALL || h->is_complex || IS_INTRA_PCM(mb_type) || s->qscale == 0;
68e959302527 replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents: 8590
diff changeset
1320
4587
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
1321 if (is_complex)
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
1322 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
1323 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
1324 }
644687c58928 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents: 4556
diff changeset
1325
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1326 static int pred_weight_table(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1327 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1328 int list, i;
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1329 int luma_def, chroma_def;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1330
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1331 h->use_weight= 0;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1332 h->use_weight_chroma= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1333 h->luma_log2_weight_denom= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1334 h->chroma_log2_weight_denom= get_ue_golomb(&s->gb);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1335 luma_def = 1<<h->luma_log2_weight_denom;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1336 chroma_def = 1<<h->chroma_log2_weight_denom;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1337
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1338 for(list=0; list<2; list++){
8735
5d7ebbb7e91b Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents: 8727
diff changeset
1339 h->luma_weight_flag[list] = 0;
5d7ebbb7e91b Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents: 8727
diff changeset
1340 h->chroma_weight_flag[list] = 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1341 for(i=0; i<h->ref_count[list]; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1342 int luma_weight_flag, chroma_weight_flag;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1343
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1344 luma_weight_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1345 if(luma_weight_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1346 h->luma_weight[list][i]= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1347 h->luma_offset[list][i]= get_se_golomb(&s->gb);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1348 if( h->luma_weight[list][i] != luma_def
8735
5d7ebbb7e91b Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents: 8727
diff changeset
1349 || h->luma_offset[list][i] != 0) {
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1350 h->use_weight= 1;
8735
5d7ebbb7e91b Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents: 8727
diff changeset
1351 h->luma_weight_flag[list]= 1;
5d7ebbb7e91b Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents: 8727
diff changeset
1352 }
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1353 }else{
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1354 h->luma_weight[list][i]= luma_def;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1355 h->luma_offset[list][i]= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1356 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1357
7407
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
1358 if(CHROMA){
7408
michael
parents: 7407
diff changeset
1359 chroma_weight_flag= get_bits1(&s->gb);
michael
parents: 7407
diff changeset
1360 if(chroma_weight_flag){
michael
parents: 7407
diff changeset
1361 int j;
michael
parents: 7407
diff changeset
1362 for(j=0; j<2; j++){
michael
parents: 7407
diff changeset
1363 h->chroma_weight[list][i][j]= get_se_golomb(&s->gb);
michael
parents: 7407
diff changeset
1364 h->chroma_offset[list][i][j]= get_se_golomb(&s->gb);
michael
parents: 7407
diff changeset
1365 if( h->chroma_weight[list][i][j] != chroma_def
8735
5d7ebbb7e91b Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents: 8727
diff changeset
1366 || h->chroma_offset[list][i][j] != 0) {
7408
michael
parents: 7407
diff changeset
1367 h->use_weight_chroma= 1;
8735
5d7ebbb7e91b Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents: 8727
diff changeset
1368 h->chroma_weight_flag[list]= 1;
5d7ebbb7e91b Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents: 8727
diff changeset
1369 }
7408
michael
parents: 7407
diff changeset
1370 }
michael
parents: 7407
diff changeset
1371 }else{
michael
parents: 7407
diff changeset
1372 int j;
michael
parents: 7407
diff changeset
1373 for(j=0; j<2; j++){
michael
parents: 7407
diff changeset
1374 h->chroma_weight[list][i][j]= chroma_def;
michael
parents: 7407
diff changeset
1375 h->chroma_offset[list][i][j]= 0;
michael
parents: 7407
diff changeset
1376 }
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1377 }
7407
6288bc103b9f chroma_format_idc=0 aka grayscale support.
michael
parents: 7405
diff changeset
1378 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1379 }
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
1380 if(h->slice_type_nos != FF_B_TYPE) break;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1381 }
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1382 h->use_weight= h->use_weight || h->use_weight_chroma;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1383 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1384 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1385
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1386 static void implicit_weight_table(H264Context *h){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1387 MpegEncContext * const s = &h->s;
8735
5d7ebbb7e91b Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents: 8727
diff changeset
1388 int ref0, ref1, i;
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1389 int cur_poc = s->current_picture_ptr->poc;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1390
8956
de631175196e Move initialization of {luma,chroma}_weight_flag[] up,
benoit
parents: 8955
diff changeset
1391 for (i = 0; i < 2; i++) {
de631175196e Move initialization of {luma,chroma}_weight_flag[] up,
benoit
parents: 8955
diff changeset
1392 h->luma_weight_flag[i] = 0;
de631175196e Move initialization of {luma,chroma}_weight_flag[] up,
benoit
parents: 8955
diff changeset
1393 h->chroma_weight_flag[i] = 0;
de631175196e Move initialization of {luma,chroma}_weight_flag[] up,
benoit
parents: 8955
diff changeset
1394 }
de631175196e Move initialization of {luma,chroma}_weight_flag[] up,
benoit
parents: 8955
diff changeset
1395
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1396 if( h->ref_count[0] == 1 && h->ref_count[1] == 1
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1397 && 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
1398 h->use_weight= 0;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1399 h->use_weight_chroma= 0;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1400 return;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1401 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1402
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1403 h->use_weight= 2;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1404 h->use_weight_chroma= 2;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1405 h->luma_log2_weight_denom= 5;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1406 h->chroma_log2_weight_denom= 5;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1407
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1408 for(ref0=0; ref0 < h->ref_count[0]; ref0++){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1409 int poc0 = h->ref_list[0][ref0].poc;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1410 for(ref1=0; ref1 < h->ref_count[1]; ref1++){
2519
b34f2cac6a71 10l in implicit_weight_table
lorenm
parents: 2509
diff changeset
1411 int poc1 = h->ref_list[1][ref1].poc;
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
1412 int td = av_clip(poc1 - poc0, -128, 127);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1413 if(td){
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
1414 int tb = av_clip(cur_poc - poc0, -128, 127);
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
1415 int tx = (16384 + (FFABS(td) >> 1)) / td;
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4592
diff changeset
1416 int dist_scale_factor = av_clip((tb*tx + 32) >> 6, -1024, 1023) >> 2;
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1417 if(dist_scale_factor < -64 || dist_scale_factor > 128)
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1418 h->implicit_weight[ref0][ref1] = 32;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1419 else
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1420 h->implicit_weight[ref0][ref1] = 64 - dist_scale_factor;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1421 }else
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1422 h->implicit_weight[ref0][ref1] = 32;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1423 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1424 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1425 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1426
5768
09b557fcfafb Modify unreference_pic implementation with PAFF in mind.
andoma
parents: 5767
diff changeset
1427 /**
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
1428 * instantaneous decoder refresh.
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1429 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1430 static void idr(H264Context *h){
10862
d9c084a0c22b Split all the reference picture handling off h264.c.
michael
parents: 10859
diff changeset
1431 ff_h264_remove_all_refs(h);
7362
443fdc440854 Reset prev_frame_num for idr frames as required by the spec.
michael
parents: 7361
diff changeset
1432 h->prev_frame_num= 0;
7379
d3bd73e0f9a9 init_poc() vs. idr() cleanup
michael
parents: 7378
diff changeset
1433 h->prev_frame_num_offset= 0;
d3bd73e0f9a9 init_poc() vs. idr() cleanup
michael
parents: 7378
diff changeset
1434 h->prev_poc_msb=
d3bd73e0f9a9 init_poc() vs. idr() cleanup
michael
parents: 7378
diff changeset
1435 h->prev_poc_lsb= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1436 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1437
2640
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
1438 /* forget old pics after a seek */
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
1439 static void flush_dpb(AVCodecContext *avctx){
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
1440 H264Context *h= avctx->priv_data;
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
1441 int i;
7283
39e81fdd8d23 Move the size of the H264Context delayed_pic array into a #define.
astrange
parents: 7277
diff changeset
1442 for(i=0; i<MAX_DELAYED_PIC_COUNT; i++) {
3144
84406a59134c fix a memory leak on seeking.
lorenm
parents: 3138
diff changeset
1443 if(h->delayed_pic[i])
84406a59134c fix a memory leak on seeking.
lorenm
parents: 3138
diff changeset
1444 h->delayed_pic[i]->reference= 0;
2640
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
1445 h->delayed_pic[i]= NULL;
3144
84406a59134c fix a memory leak on seeking.
lorenm
parents: 3138
diff changeset
1446 }
7310
033d10927d45 Remove delayed_output_pic, I do not understand what this variable was good for.
michael
parents: 7309
diff changeset
1447 h->outputed_poc= INT_MIN;
9831
febe1855b64a Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents: 9790
diff changeset
1448 h->prev_interlaced_frame = 1;
2640
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
1449 idr(h);
2751
3247049dfc7a fix segfault if flush is called before the first frame
mru
parents: 2748
diff changeset
1450 if(h->s.current_picture_ptr)
3247049dfc7a fix segfault if flush is called before the first frame
mru
parents: 2748
diff changeset
1451 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
1452 h->s.first_field= 0;
10858
31645cf81fcb Split SEI code off h264.c.
michael
parents: 10857
diff changeset
1453 ff_h264_reset_sei(h);
5926
77403dc808cd Call mpegvideo flush routine on h264 flush. Needed in particular
heydowns
parents: 5904
diff changeset
1454 ff_mpeg_flush(avctx);
2640
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
1455 }
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
1456
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1457 static int init_poc(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1458 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1459 const int max_frame_num= 1<<h->sps.log2_max_frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1460 int field_poc[2];
7382
f9e70983fc35 Set field_poc (it was half uninitialized before) and use it
michael
parents: 7381
diff changeset
1461 Picture *cur = s->current_picture_ptr;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1462
7381
16a60b2f7a7d Minor simplification of code in init_poc().
michael
parents: 7380
diff changeset
1463 h->frame_num_offset= h->prev_frame_num_offset;
7380
9faeb82ba80b cosmetics (indent and 2 empty lines)
michael
parents: 7379
diff changeset
1464 if(h->frame_num < h->prev_frame_num)
7381
16a60b2f7a7d Minor simplification of code in init_poc().
michael
parents: 7380
diff changeset
1465 h->frame_num_offset += max_frame_num;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1466
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1467 if(h->sps.poc_type==0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1468 const int max_poc_lsb= 1<<h->sps.log2_max_poc_lsb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1469
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1470 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
1471 h->poc_msb = h->prev_poc_msb + max_poc_lsb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1472 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
1473 h->poc_msb = h->prev_poc_msb - max_poc_lsb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1474 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1475 h->poc_msb = h->prev_poc_msb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1476 //printf("poc: %d %d\n", h->poc_msb, h->poc_lsb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1477 field_poc[0] =
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1478 field_poc[1] = h->poc_msb + h->poc_lsb;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1479 if(s->picture_structure == PICT_FRAME)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1480 field_poc[1] += h->delta_poc_bottom;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1481 }else if(h->sps.poc_type==1){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1482 int abs_frame_num, expected_delta_per_poc_cycle, expectedpoc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1483 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1484
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1485 if(h->sps.poc_cycle_length != 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1486 abs_frame_num = h->frame_num_offset + h->frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1487 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1488 abs_frame_num = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1489
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1490 if(h->nal_ref_idc==0 && abs_frame_num > 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1491 abs_frame_num--;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1492
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1493 expected_delta_per_poc_cycle = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1494 for(i=0; i < h->sps.poc_cycle_length; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1495 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
1496
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1497 if(abs_frame_num > 0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1498 int poc_cycle_cnt = (abs_frame_num - 1) / h->sps.poc_cycle_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1499 int frame_num_in_poc_cycle = (abs_frame_num - 1) % h->sps.poc_cycle_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1500
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1501 expectedpoc = poc_cycle_cnt * expected_delta_per_poc_cycle;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1502 for(i = 0; i <= frame_num_in_poc_cycle; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1503 expectedpoc = expectedpoc + h->sps.offset_for_ref_frame[ i ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1504 } else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1505 expectedpoc = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1506
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1507 if(h->nal_ref_idc == 0)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1508 expectedpoc = expectedpoc + h->sps.offset_for_non_ref_pic;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1509
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1510 field_poc[0] = expectedpoc + h->delta_poc[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1511 field_poc[1] = field_poc[0] + h->sps.offset_for_top_to_bottom_field;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1512
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1513 if(s->picture_structure == PICT_FRAME)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1514 field_poc[1] += h->delta_poc[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1515 }else{
7381
16a60b2f7a7d Minor simplification of code in init_poc().
michael
parents: 7380
diff changeset
1516 int poc= 2*(h->frame_num_offset + h->frame_num);
16a60b2f7a7d Minor simplification of code in init_poc().
michael
parents: 7380
diff changeset
1517
16a60b2f7a7d Minor simplification of code in init_poc().
michael
parents: 7380
diff changeset
1518 if(!h->nal_ref_idc)
16a60b2f7a7d Minor simplification of code in init_poc().
michael
parents: 7380
diff changeset
1519 poc--;
7380
9faeb82ba80b cosmetics (indent and 2 empty lines)
michael
parents: 7379
diff changeset
1520
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1521 field_poc[0]= poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1522 field_poc[1]= poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1523 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1524
7382
f9e70983fc35 Set field_poc (it was half uninitialized before) and use it
michael
parents: 7381
diff changeset
1525 if(s->picture_structure != PICT_BOTTOM_FIELD)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1526 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
1527 if(s->picture_structure != PICT_TOP_FIELD)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1528 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
1529 cur->poc= FFMIN(cur->field_poc[0], cur->field_poc[1]);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1530
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1531 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1532 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1533
5160
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
1534
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
1535 /**
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
1536 * initialize scan tables
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
1537 */
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
1538 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
1539 MpegEncContext * const s = &h->s;
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
1540 int i;
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
1541 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
1542 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
1543 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
1544 }else{
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
1545 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
1546 #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
1547 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
1548 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
1549 #undef T
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
1550 }
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
1551 }
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
1552 if(s->dsp.h264_idct8_add == ff_h264_idct8_add_c){
8646
8b52ac19a91c remove zigzag_scan8x8, it is the same as ff_zigzag_direct
stefang
parents: 8627
diff changeset
1553 memcpy(h->zigzag_scan8x8, ff_zigzag_direct, 64*sizeof(uint8_t));
5160
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
1554 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
1555 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
1556 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
1557 }else{
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
1558 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
1559 #define T(x) (x>>3) | ((x&7)<<3)
8646
8b52ac19a91c remove zigzag_scan8x8, it is the same as ff_zigzag_direct
stefang
parents: 8627
diff changeset
1560 h->zigzag_scan8x8[i] = T(ff_zigzag_direct[i]);
5160
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
1561 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
1562 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
1563 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
1564 #undef T
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
1565 }
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
1566 }
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
1567 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
1568 h->zigzag_scan_q0 = zigzag_scan;
8646
8b52ac19a91c remove zigzag_scan8x8, it is the same as ff_zigzag_direct
stefang
parents: 8627
diff changeset
1569 h->zigzag_scan8x8_q0 = ff_zigzag_direct;
5160
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
1570 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
1571 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
1572 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
1573 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
1574 }else{
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
1575 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
1576 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
1577 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
1578 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
1579 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
1580 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
1581 }
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
1582 }
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1583
9417
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1584 static void field_end(H264Context *h){
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1585 MpegEncContext * const s = &h->s;
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1586 AVCodecContext * const avctx= s->avctx;
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1587 s->mb_y= 0;
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1588
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1589 s->current_picture_ptr->qscale_type= FF_QSCALE_TYPE_H264;
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1590 s->current_picture_ptr->pict_type= s->pict_type;
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1591
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1592 if (CONFIG_H264_VDPAU_DECODER && s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1593 ff_vdpau_h264_set_reference_frames(s);
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1594
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1595 if(!s->dropable) {
10862
d9c084a0c22b Split all the reference picture handling off h264.c.
michael
parents: 10859
diff changeset
1596 ff_h264_execute_ref_pic_marking(h, h->mmco, h->mmco_index);
9417
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1597 h->prev_poc_msb= h->poc_msb;
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1598 h->prev_poc_lsb= h->poc_lsb;
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1599 }
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1600 h->prev_frame_num_offset= h->frame_num_offset;
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1601 h->prev_frame_num= h->frame_num;
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1602
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1603 if (avctx->hwaccel) {
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1604 if (avctx->hwaccel->end_frame(avctx) < 0)
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1605 av_log(avctx, AV_LOG_ERROR, "hardware accelerator failed to decode picture\n");
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1606 }
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1607
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1608 if (CONFIG_H264_VDPAU_DECODER && s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1609 ff_vdpau_h264_picture_complete(s);
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1610
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1611 /*
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1612 * FIXME: Error handling code does not seem to support interlaced
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1613 * when slices span multiple rows
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1614 * The ff_er_add_slice calls don't work right for bottom
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1615 * fields; they cause massive erroneous error concealing
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1616 * Error marking covers both fields (top and bottom).
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1617 * This causes a mismatched s->error_count
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1618 * and a bad error table. Further, the error count goes to
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1619 * INT_MAX when called for bottom field, because mb_y is
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1620 * past end by one (callers fault) and resync_mb_y != 0
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1621 * causes problems for the first MB line, too.
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1622 */
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1623 if (!FIELD_PICTURE)
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1624 ff_er_frame_end(s);
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1625
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1626 MPV_frame_end(s);
9419
f2f83796f07b Fix 2 access units in a packet mp4s.
michael
parents: 9418
diff changeset
1627
f2f83796f07b Fix 2 access units in a packet mp4s.
michael
parents: 9418
diff changeset
1628 h->current_slice=0;
9417
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1629 }
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
1630
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1631 /**
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1632 * Replicates H264 "master" context to thread contexts.
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1633 */
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1634 static void clone_slice(H264Context *dst, H264Context *src)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1635 {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1636 memcpy(dst->block_offset, src->block_offset, sizeof(dst->block_offset));
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1637 dst->s.current_picture_ptr = src->s.current_picture_ptr;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1638 dst->s.current_picture = src->s.current_picture;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1639 dst->s.linesize = src->s.linesize;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1640 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
1641 dst->s.first_field = src->s.first_field;
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1643 dst->prev_poc_msb = src->prev_poc_msb;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1644 dst->prev_poc_lsb = src->prev_poc_lsb;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1645 dst->prev_frame_num_offset = src->prev_frame_num_offset;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1646 dst->prev_frame_num = src->prev_frame_num;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1647 dst->short_ref_count = src->short_ref_count;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1648
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1649 memcpy(dst->short_ref, src->short_ref, sizeof(dst->short_ref));
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1650 memcpy(dst->long_ref, src->long_ref, sizeof(dst->long_ref));
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1651 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
1652 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
1653
070a376d496b fix image corruption when with multi-threaded decoding.
gpoirier
parents: 5647
diff changeset
1654 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
1655 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
1656 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1657
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1658 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1659 * decodes a slice header.
6918
c1b722b79649 cosmetics: spelling typo fixes
diego
parents: 6903
diff changeset
1660 * 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
1661 *
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1662 * @param h h264context
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1663 * @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
1664 *
6524
01647ac078a7 typo: occured --> occurred
diego
parents: 6517
diff changeset
1665 * @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
1666 */
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1667 static int decode_slice_header(H264Context *h, H264Context *h0){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1668 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
1669 MpegEncContext * const s0 = &h0->s;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
1670 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
1671 unsigned int pps_id;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1672 int num_ref_idx_active_override_flag;
7332
b1003e468c3d Fix used references indexes in the loop filter.
michael
parents: 7327
diff changeset
1673 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
1674 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
1675 int last_pic_structure;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1676
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1677 s->dropable= h->nal_ref_idc == 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1678
5984
ba13cc3e38bb Initialize function pointers used by error resilience code before any
heydowns
parents: 5963
diff changeset
1679 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
1680 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
1681 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
1682 }else{
ba13cc3e38bb Initialize function pointers used by error resilience code before any
heydowns
parents: 5963
diff changeset
1683 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
1684 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
1685 }
ba13cc3e38bb Initialize function pointers used by error resilience code before any
heydowns
parents: 5963
diff changeset
1686
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1687 first_mb_in_slice= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1688
9419
f2f83796f07b Fix 2 access units in a packet mp4s.
michael
parents: 9418
diff changeset
1689 if(first_mb_in_slice == 0){ //FIXME better field boundary detection
f2f83796f07b Fix 2 access units in a packet mp4s.
michael
parents: 9418
diff changeset
1690 if(h0->current_slice && FIELD_PICTURE){
f2f83796f07b Fix 2 access units in a packet mp4s.
michael
parents: 9418
diff changeset
1691 field_end(h);
f2f83796f07b Fix 2 access units in a packet mp4s.
michael
parents: 9418
diff changeset
1692 }
f2f83796f07b Fix 2 access units in a packet mp4s.
michael
parents: 9418
diff changeset
1693
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1694 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
1695 if (!s0->first_field)
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
1696 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
1697 }
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
1698
8451
384600e3fe5b Use get_ue_golomb_31() where possible, almost all are just in headers
michael
parents: 8448
diff changeset
1699 slice_type= get_ue_golomb_31(&s->gb);
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
1700 if(slice_type > 9){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
1701 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
1702 return -1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1703 }
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
1704 if(slice_type > 4){
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
1705 slice_type -= 5;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1706 h->slice_type_fixed=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1707 }else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1708 h->slice_type_fixed=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1709
8206
5f399949a6a6 Use golomb_to_pict_type instead of its duplicate, slice_type_map.
diego
parents: 8140
diff changeset
1710 slice_type= golomb_to_pict_type[ slice_type ];
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6429
diff changeset
1711 if (slice_type == FF_I_TYPE
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1712 || (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
1713 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
1714 }
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
1715 h->slice_type= slice_type;
7338
b088035801d5 Simplify slice type checks.
michael
parents: 7337
diff changeset
1716 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
1717
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
1718 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
1719 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
1720 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
1721 "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
1722 return -1;
5455f4e43948 Make h264 decoder conform to requirements of mpegvideo's MPV_frame_start.
heydowns
parents: 6014
diff changeset
1723 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1724
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1725 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
1726 if(pps_id>=MAX_PPS_COUNT){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
1727 av_log(h->s.avctx, AV_LOG_ERROR, "pps_id out of range\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1728 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1729 }
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1730 if(!h0->pps_buffers[pps_id]) {
9112
79818b0595c0 When a H.264 stream references a PPS or SPS id which doesn't exist, instead of
takis
parents: 9108
diff changeset
1731 av_log(h->s.avctx, AV_LOG_ERROR, "non-existing PPS %u referenced\n", pps_id);
1174
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
1732 return -1;
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
1733 }
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1734 h->pps= *h0->pps_buffers[pps_id];
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1735
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1736 if(!h0->sps_buffers[h->pps.sps_id]) {
9112
79818b0595c0 When a H.264 stream references a PPS or SPS id which doesn't exist, instead of
takis
parents: 9108
diff changeset
1737 av_log(h->s.avctx, AV_LOG_ERROR, "non-existing SPS %u referenced\n", h->pps.sps_id);
1174
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
1738 return -1;
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
1739 }
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1740 h->sps = *h0->sps_buffers[h->pps.sps_id];
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1741
5685
070a376d496b fix image corruption when with multi-threaded decoding.
gpoirier
parents: 5647
diff changeset
1742 if(h == h0 && h->dequant_coeff_pps != pps_id){
4363
9b7662fa4905 remove useless cast that makes code unreadable
gpoirier
parents: 4362
diff changeset
1743 h->dequant_coeff_pps = pps_id;
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1744 init_dequant_tables(h);
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1745 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1746
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1747 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
1748 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
1749
3178
bd995b8c64fd Alignment fixes, caused problems on SPARC.
diego
parents: 3177
diff changeset
1750 h->b_stride= s->mb_width*4;
bd995b8c64fd Alignment fixes, caused problems on SPARC.
diego
parents: 3177
diff changeset
1751 h->b8_stride= s->mb_width*2;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1752
6581
e6d8c5bbeeac Avoid crash with idiotic cropping. Fixes crash with CVFC1_Sony_C.jsv
michael
parents: 6524
diff changeset
1753 s->width = 16*s->mb_width - 2*FFMIN(h->sps.crop_right, 7);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1754 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
1755 s->height= 16*s->mb_height - 2*FFMIN(h->sps.crop_bottom, 7);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1756 else
6581
e6d8c5bbeeac Avoid crash with idiotic cropping. Fixes crash with CVFC1_Sony_C.jsv
michael
parents: 6524
diff changeset
1757 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
1758
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1759 if (s->context_initialized
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
1760 && ( s->width != s->avctx->width || s->height != s->avctx->height)) {
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1761 if(h != h0)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1762 return -1; // width / height changed during parallelized decoding
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1763 free_tables(h);
8231
0df3402e6b41 Fix segfault due to deallocated entries in delayed_pic after size change.
michael
parents: 8216
diff changeset
1764 flush_dpb(s->avctx);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1765 MPV_common_end(s);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1766 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1767 if (!s->context_initialized) {
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1768 if(h != h0)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1769 return -1; // we cant (re-)initialize context during parallel decoding
10565
26dc0444fa93 Call ff_find_hwaccel() after calling avcodec_set_dimensions().
cehoyos
parents: 10560
diff changeset
1770
26dc0444fa93 Call ff_find_hwaccel() after calling avcodec_set_dimensions().
cehoyos
parents: 10560
diff changeset
1771 avcodec_set_dimensions(s->avctx, s->width, s->height);
26dc0444fa93 Call ff_find_hwaccel() after calling avcodec_set_dimensions().
cehoyos
parents: 10560
diff changeset
1772 s->avctx->sample_aspect_ratio= h->sps.sar;
26dc0444fa93 Call ff_find_hwaccel() after calling avcodec_set_dimensions().
cehoyos
parents: 10560
diff changeset
1773 if(!s->avctx->sample_aspect_ratio.den)
26dc0444fa93 Call ff_find_hwaccel() after calling avcodec_set_dimensions().
cehoyos
parents: 10560
diff changeset
1774 s->avctx->sample_aspect_ratio.den = 1;
26dc0444fa93 Call ff_find_hwaccel() after calling avcodec_set_dimensions().
cehoyos
parents: 10560
diff changeset
1775
10837
e5905bfa625d Export fullrange flag and color information for h.264
conrad
parents: 10829
diff changeset
1776 if(h->sps.video_signal_type_present_flag){
e5905bfa625d Export fullrange flag and color information for h.264
conrad
parents: 10829
diff changeset
1777 s->avctx->color_range = h->sps.full_range ? AVCOL_RANGE_JPEG : AVCOL_RANGE_MPEG;
e5905bfa625d Export fullrange flag and color information for h.264
conrad
parents: 10829
diff changeset
1778 if(h->sps.colour_description_present_flag){
e5905bfa625d Export fullrange flag and color information for h.264
conrad
parents: 10829
diff changeset
1779 s->avctx->color_primaries = h->sps.color_primaries;
e5905bfa625d Export fullrange flag and color information for h.264
conrad
parents: 10829
diff changeset
1780 s->avctx->color_trc = h->sps.color_trc;
e5905bfa625d Export fullrange flag and color information for h.264
conrad
parents: 10829
diff changeset
1781 s->avctx->colorspace = h->sps.colorspace;
e5905bfa625d Export fullrange flag and color information for h.264
conrad
parents: 10829
diff changeset
1782 }
e5905bfa625d Export fullrange flag and color information for h.264
conrad
parents: 10829
diff changeset
1783 }
e5905bfa625d Export fullrange flag and color information for h.264
conrad
parents: 10829
diff changeset
1784
10565
26dc0444fa93 Call ff_find_hwaccel() after calling avcodec_set_dimensions().
cehoyos
parents: 10560
diff changeset
1785 if(h->sps.timing_info_present_flag){
26dc0444fa93 Call ff_find_hwaccel() after calling avcodec_set_dimensions().
cehoyos
parents: 10560
diff changeset
1786 s->avctx->time_base= (AVRational){h->sps.num_units_in_tick, h->sps.time_scale};
26dc0444fa93 Call ff_find_hwaccel() after calling avcodec_set_dimensions().
cehoyos
parents: 10560
diff changeset
1787 if(h->x264_build > 0 && h->x264_build < 44)
26dc0444fa93 Call ff_find_hwaccel() after calling avcodec_set_dimensions().
cehoyos
parents: 10560
diff changeset
1788 s->avctx->time_base.den *= 2;
26dc0444fa93 Call ff_find_hwaccel() after calling avcodec_set_dimensions().
cehoyos
parents: 10560
diff changeset
1789 av_reduce(&s->avctx->time_base.num, &s->avctx->time_base.den,
26dc0444fa93 Call ff_find_hwaccel() after calling avcodec_set_dimensions().
cehoyos
parents: 10560
diff changeset
1790 s->avctx->time_base.num, s->avctx->time_base.den, 1<<30);
26dc0444fa93 Call ff_find_hwaccel() after calling avcodec_set_dimensions().
cehoyos
parents: 10560
diff changeset
1791 }
26dc0444fa93 Call ff_find_hwaccel() after calling avcodec_set_dimensions().
cehoyos
parents: 10560
diff changeset
1792 s->avctx->pix_fmt = s->avctx->get_format(s->avctx, s->avctx->codec->pix_fmts);
26dc0444fa93 Call ff_find_hwaccel() after calling avcodec_set_dimensions().
cehoyos
parents: 10560
diff changeset
1793 s->avctx->hwaccel = ff_find_hwaccel(s->avctx->codec->id, s->avctx->pix_fmt);
26dc0444fa93 Call ff_find_hwaccel() after calling avcodec_set_dimensions().
cehoyos
parents: 10560
diff changeset
1794
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1795 if (MPV_common_init(s) < 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1796 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
1797 s->first_field = 0;
9831
febe1855b64a Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents: 9790
diff changeset
1798 h->prev_interlaced_frame = 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1799
5160
13386224ff72 Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents: 5153
diff changeset
1800 init_scan_tables(h);
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
1801 ff_h264_alloc_tables(h);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1802
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1803 for(i = 1; i < s->avctx->thread_count; i++) {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1804 H264Context *c;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1805 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
1806 memcpy(c, h->s.thread_context[i], sizeof(MpegEncContext));
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1807 memset(&c->s + 1, 0, sizeof(H264Context) - sizeof(MpegEncContext));
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1808 c->sps = h->sps;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1809 c->pps = h->pps;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1810 init_scan_tables(c);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1811 clone_tables(c, h);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1812 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1813
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1814 for(i = 0; i < s->avctx->thread_count; i++)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1815 if(context_init(h->thread_context[i]) < 0)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
1816 return -1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1817 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1818
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1819 h->frame_num= get_bits(&s->gb, h->sps.log2_max_frame_num);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1820
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1821 h->mb_mbaff = 0;
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
1822 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
1823 last_pic_structure = s0->picture_structure;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1824 if(h->sps.frame_mbs_only_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1825 s->picture_structure= PICT_FRAME;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1826 }else{
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
1827 if(get_bits1(&s->gb)) { //field_pic_flag
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1828 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
1829 } else {
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1830 s->picture_structure= PICT_FRAME;
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
1831 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
1832 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
1833 }
7468
38e9f32f8d43 mb_field_decoding_flag was not initialized
michael
parents: 7462
diff changeset
1834 h->mb_field_decoding_flag= s->picture_structure != PICT_FRAME;
5723
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
1835
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
1836 if(h0->current_slice == 0){
7350
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
1837 while(h->frame_num != h->prev_frame_num &&
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
1838 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
1839 av_log(NULL, AV_LOG_DEBUG, "Frame num gap %d %d\n", h->frame_num, h->prev_frame_num);
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
1840 if (ff_h264_frame_start(h) < 0)
9004
aae80543bc6e Check return value of frame_start(), this avoids a crash if AVCodecContext::get_buffer failed.
reimar
parents: 8996
diff changeset
1841 return -1;
7350
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
1842 h->prev_frame_num++;
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
1843 h->prev_frame_num %= 1<<h->sps.log2_max_frame_num;
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
1844 s->current_picture_ptr->frame_num= h->prev_frame_num;
10862
d9c084a0c22b Split all the reference picture handling off h264.c.
michael
parents: 10859
diff changeset
1845 ff_h264_execute_ref_pic_marking(h, NULL, 0);
7350
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
1846 }
5c45da72279e Support gaps in the frame num.
michael
parents: 7349
diff changeset
1847
5798
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
1848 /* 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
1849 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
1850 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
1851 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
1852 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
1853
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
1854 /* 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
1855 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
1856 /*
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
1857 * 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
1858 * 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
1859 */
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
1860 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
1861 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
1862
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
1863 } else {
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
1864 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
1865 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
1866 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
1867 /*
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
1868 * 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
1869 * 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
1870 * 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
1871 * purposes.
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
1872 */
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
1873 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
1874 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
1875
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
1876 } else {
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
1877 /* 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
1878 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
1879 }
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
1880 }
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
1881
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
1882 } else {
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
1883 /* 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
1884 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
1885 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
1886 }
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
1887
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
1888 if((!FIELD_PICTURE || s0->first_field) && ff_h264_frame_start(h) < 0) {
5798
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
1889 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
1890 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
1891 }
5723
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
1892 }
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
1893 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
1894 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
1895
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
1896 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
1897
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
1898 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
1899 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
1900 first_mb_in_slice >= s->mb_num){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
1901 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
1902 return -1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
1903 }
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
1904 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
1905 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
1906 if (s->picture_structure == PICT_BOTTOM_FIELD)
0b3aa6f4c313 Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents: 5780
diff changeset
1907 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
1908 assert(s->mb_y < s->mb_height);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1909
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1910 if(s->picture_structure==PICT_FRAME){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1911 h->curr_pic_num= h->frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1912 h->max_pic_num= 1<< h->sps.log2_max_frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1913 }else{
5772
65b71bd21a4d Fix h->curr_pic_num for field pictures. Necessary for proper PAFF support.
andoma
parents: 5771
diff changeset
1914 h->curr_pic_num= 2*h->frame_num + 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1915 h->max_pic_num= 1<<(h->sps.log2_max_frame_num + 1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1916 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1917
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1918 if(h->nal_unit_type == NAL_IDR_SLICE){
1453
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
1919 get_ue_golomb(&s->gb); /* idr_pic_id */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1920 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1921
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1922 if(h->sps.poc_type==0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1923 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
1924
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1925 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1926 h->delta_poc_bottom= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1927 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1928 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1929
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1930 if(h->sps.poc_type==1 && !h->sps.delta_pic_order_always_zero_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1931 h->delta_poc[0]= get_se_golomb(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1932
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1933 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1934 h->delta_poc[1]= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1935 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1936
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1937 init_poc(h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1938
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1939 if(h->pps.redundant_pic_cnt_present){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1940 h->redundant_pic_count= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1941 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1942
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
1943 //set defaults, might be overridden a few lines later
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1944 h->ref_count[0]= h->pps.ref_count[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1945 h->ref_count[1]= h->pps.ref_count[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1946
7338
b088035801d5 Simplify slice type checks.
michael
parents: 7337
diff changeset
1947 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
1948 if(h->slice_type_nos == FF_B_TYPE){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1949 h->direct_spatial_mv_pred= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1950 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1951 num_ref_idx_active_override_flag= get_bits1(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1952
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1953 if(num_ref_idx_active_override_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1954 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
1955 if(h->slice_type_nos==FF_B_TYPE)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1956 h->ref_count[1]= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1957
4532
c296efb7575e fix 2nd ref_count check
michael
parents: 4531
diff changeset
1958 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
1959 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
1960 h->ref_count[0]= h->ref_count[1]= 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1961 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1962 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1963 }
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
1964 if(h->slice_type_nos == FF_B_TYPE)
4532
c296efb7575e fix 2nd ref_count check
michael
parents: 4531
diff changeset
1965 h->list_count= 2;
c296efb7575e fix 2nd ref_count check
michael
parents: 4531
diff changeset
1966 else
c296efb7575e fix 2nd ref_count check
michael
parents: 4531
diff changeset
1967 h->list_count= 1;
c296efb7575e fix 2nd ref_count check
michael
parents: 4531
diff changeset
1968 }else
c296efb7575e fix 2nd ref_count check
michael
parents: 4531
diff changeset
1969 h->list_count= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1970
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
1971 if(!default_ref_list_done){
10862
d9c084a0c22b Split all the reference picture handling off h264.c.
michael
parents: 10859
diff changeset
1972 ff_h264_fill_default_ref_list(h);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1973 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1974
10862
d9c084a0c22b Split all the reference picture handling off h264.c.
michael
parents: 10859
diff changeset
1975 if(h->slice_type_nos!=FF_I_TYPE && ff_h264_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
1976 return -1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1977
7921
44570b9b3aa1 Initialize next/last_picture* as the generic code does not always
michael
parents: 7920
diff changeset
1978 if(h->slice_type_nos!=FF_I_TYPE){
44570b9b3aa1 Initialize next/last_picture* as the generic code does not always
michael
parents: 7920
diff changeset
1979 s->last_picture_ptr= &h->ref_list[0][0];
7974
2b20ad98e424 Rename copy_picture to ff_copy_picture.
cehoyos
parents: 7928
diff changeset
1980 ff_copy_picture(&s->last_picture, s->last_picture_ptr);
7921
44570b9b3aa1 Initialize next/last_picture* as the generic code does not always
michael
parents: 7920
diff changeset
1981 }
44570b9b3aa1 Initialize next/last_picture* as the generic code does not always
michael
parents: 7920
diff changeset
1982 if(h->slice_type_nos==FF_B_TYPE){
44570b9b3aa1 Initialize next/last_picture* as the generic code does not always
michael
parents: 7920
diff changeset
1983 s->next_picture_ptr= &h->ref_list[1][0];
7974
2b20ad98e424 Rename copy_picture to ff_copy_picture.
cehoyos
parents: 7928
diff changeset
1984 ff_copy_picture(&s->next_picture, s->next_picture_ptr);
7921
44570b9b3aa1 Initialize next/last_picture* as the generic code does not always
michael
parents: 7920
diff changeset
1985 }
44570b9b3aa1 Initialize next/last_picture* as the generic code does not always
michael
parents: 7920
diff changeset
1986
7339
7d5cc12d8fe2 Remove superfluous ().
michael
parents: 7338
diff changeset
1987 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
1988 || (h->pps.weighted_bipred_idc==1 && h->slice_type_nos== FF_B_TYPE ) )
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1989 pred_weight_table(h);
7341
b75aa0197be4 Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents: 7340
diff changeset
1990 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
1991 implicit_weight_table(h);
8735
5d7ebbb7e91b Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents: 8727
diff changeset
1992 else {
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
1993 h->use_weight = 0;
8735
5d7ebbb7e91b Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents: 8727
diff changeset
1994 for (i = 0; i < 2; i++) {
5d7ebbb7e91b Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents: 8727
diff changeset
1995 h->luma_weight_flag[i] = 0;
5d7ebbb7e91b Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents: 8727
diff changeset
1996 h->chroma_weight_flag[i] = 0;
5d7ebbb7e91b Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents: 8727
diff changeset
1997 }
5d7ebbb7e91b Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents: 8727
diff changeset
1998 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1999
5723
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5713
diff changeset
2000 if(h->nal_ref_idc)
10862
d9c084a0c22b Split all the reference picture handling off h264.c.
michael
parents: 10859
diff changeset
2001 ff_h264_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
2002
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2003 if(FRAME_MBAFF)
10862
d9c084a0c22b Split all the reference picture handling off h264.c.
michael
parents: 10859
diff changeset
2004 ff_h264_fill_mbaff_ref_list(h);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2005
7897
004f3c69fe7b Move direct_dist_scale_factor() and direct_ref_list_init() after fill_mbaff_ref_list()
michael
parents: 7896
diff changeset
2006 if(h->slice_type_nos==FF_B_TYPE && !h->direct_spatial_mv_pred)
10857
b20434143fd5 Split direct mode (macro)block decoding off h264.c.
michael
parents: 10854
diff changeset
2007 ff_h264_direct_dist_scale_factor(h);
b20434143fd5 Split direct mode (macro)block decoding off h264.c.
michael
parents: 10854
diff changeset
2008 ff_h264_direct_ref_list_init(h);
7897
004f3c69fe7b Move direct_dist_scale_factor() and direct_ref_list_init() after fill_mbaff_ref_list()
michael
parents: 7896
diff changeset
2009
7338
b088035801d5 Simplify slice type checks.
michael
parents: 7337
diff changeset
2010 if( h->slice_type_nos != FF_I_TYPE && h->pps.cabac ){
8451
384600e3fe5b Use get_ue_golomb_31() where possible, almost all are just in headers
michael
parents: 8448
diff changeset
2011 tmp = get_ue_golomb_31(&s->gb);
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
2012 if(tmp > 2){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
2013 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
2014 return -1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
2015 }
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
2016 h->cabac_init_idc= tmp;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
2017 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2018
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2019 h->last_qscale_diff = 0;
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
2020 tmp = h->pps.init_qp + get_se_golomb(&s->gb);
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
2021 if(tmp>51){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
2022 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
2023 return -1;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
2024 }
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
2025 s->qscale= tmp;
5231
07a97575d0c4 Add support for streams with different chroma_qp_index_offset
gpoirier
parents: 5226
diff changeset
2026 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
2027 h->chroma_qp[1] = get_chroma_qp(h, 1, s->qscale);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2028 //FIXME qscale / qp ... stuff
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6429
diff changeset
2029 if(h->slice_type == FF_SP_TYPE){
1453
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
2030 get_bits1(&s->gb); /* sp_for_switch_flag */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2031 }
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6429
diff changeset
2032 if(h->slice_type==FF_SP_TYPE || h->slice_type == FF_SI_TYPE){
1453
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
2033 get_se_golomb(&s->gb); /* slice_qs_delta */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2034 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2035
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2036 h->deblocking_filter = 1;
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
2037 h->slice_alpha_c0_offset = 0;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
2038 h->slice_beta_offset = 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2039 if( h->pps.deblocking_filter_parameters_present ) {
8451
384600e3fe5b Use get_ue_golomb_31() where possible, almost all are just in headers
michael
parents: 8448
diff changeset
2040 tmp= get_ue_golomb_31(&s->gb);
4365
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
2041 if(tmp > 2){
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
2042 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
2043 return -1;
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
2044 }
9cebff821565 checking bitstream values and other related changes
michael
parents: 4364
diff changeset
2045 h->deblocking_filter= tmp;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2046 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
2047 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
2048
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2049 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
2050 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
2051 h->slice_beta_offset = get_se_golomb(&s->gb) << 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2052 }
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
2053 }
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2054
5698
9a26cb6747a9 Apply skip_loop_filter before checking if we can parallelize with the selected
reimar
parents: 5694
diff changeset
2055 if( s->avctx->skip_loop_filter >= AVDISCARD_ALL
7340
ef40221c1452 SI/SP slice support. (not bitexact)
michael
parents: 7339
diff changeset
2056 ||(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
2057 ||(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
2058 ||(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
2059 h->deblocking_filter= 0;
9a26cb6747a9 Apply skip_loop_filter before checking if we can parallelize with the selected
reimar
parents: 5694
diff changeset
2060
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2061 if(h->deblocking_filter == 1 && h0->max_contexts > 1) {
5646
adc9ec0f7385 Let H.264 decoder skip deblocking across slices
benoit
parents: 5643
diff changeset
2062 if(s->avctx->flags2 & CODEC_FLAG2_FAST) {
adc9ec0f7385 Let H.264 decoder skip deblocking across slices
benoit
parents: 5643
diff changeset
2063 /* Cheat slightly for speed:
6029
fc51a6ffa64f cosmetics: comment typo fixes
diego
parents: 6020
diff changeset
2064 Do not bother to deblock across slices. */
5646
adc9ec0f7385 Let H.264 decoder skip deblocking across slices
benoit
parents: 5643
diff changeset
2065 h->deblocking_filter = 2;
adc9ec0f7385 Let H.264 decoder skip deblocking across slices
benoit
parents: 5643
diff changeset
2066 } else {
5647
7c139ea9065e Indentation
benoit
parents: 5646
diff changeset
2067 h0->max_contexts = 1;
7c139ea9065e Indentation
benoit
parents: 5646
diff changeset
2068 if(!h0->single_decode_warning) {
7c139ea9065e Indentation
benoit
parents: 5646
diff changeset
2069 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
2070 h0->single_decode_warning = 1;
7c139ea9065e Indentation
benoit
parents: 5646
diff changeset
2071 }
7c139ea9065e Indentation
benoit
parents: 5646
diff changeset
2072 if(h != h0)
7c139ea9065e Indentation
benoit
parents: 5646
diff changeset
2073 return 1; // deblocking switched inside frame
5646
adc9ec0f7385 Let H.264 decoder skip deblocking across slices
benoit
parents: 5643
diff changeset
2074 }
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2075 }
10897
d23f1c47fc09 Consider slice_beta_offet in qp_thresh.
michael
parents: 10896
diff changeset
2076 h->qp_thresh= 15 - FFMIN(h->slice_alpha_c0_offset, h->slice_beta_offset) - FFMAX3(0, h->pps.chroma_qp_index_offset[0], h->pps.chroma_qp_index_offset[1]);
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2077
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2078 #if 0 //FMO
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2079 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
2080 slice_group_change_cycle= get_bits(&s->gb, ?);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2081 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2082
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2083 h0->last_slice_type = slice_type;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2084 h->slice_num = ++h0->current_slice;
8079
2d3c7cd7d143 Replace literally hardcoded max slice number by named constant.
michael
parents: 8042
diff changeset
2085 if(h->slice_num >= MAX_SLICES){
2d3c7cd7d143 Replace literally hardcoded max slice number by named constant.
michael
parents: 8042
diff changeset
2086 av_log(s->avctx, AV_LOG_ERROR, "Too many slices, increase MAX_SLICES and recompile\n");
2d3c7cd7d143 Replace literally hardcoded max slice number by named constant.
michael
parents: 8042
diff changeset
2087 }
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
2088
7343
9a4cb430d8ff Loop filtering with multiple slice types fix.
michael
parents: 7341
diff changeset
2089 for(j=0; j<2; j++){
10913
497929e9d912 Perform reference remapping at fill_cache() time instead of in the
michael
parents: 10910
diff changeset
2090 int id_list[16];
8079
2d3c7cd7d143 Replace literally hardcoded max slice number by named constant.
michael
parents: 8042
diff changeset
2091 int *ref2frm= h->ref2frm[h->slice_num&(MAX_SLICES-1)][j];
10913
497929e9d912 Perform reference remapping at fill_cache() time instead of in the
michael
parents: 10910
diff changeset
2092 for(i=0; i<16; i++){
497929e9d912 Perform reference remapping at fill_cache() time instead of in the
michael
parents: 10910
diff changeset
2093 id_list[i]= 60;
497929e9d912 Perform reference remapping at fill_cache() time instead of in the
michael
parents: 10910
diff changeset
2094 if(h->ref_list[j][i].data[0]){
497929e9d912 Perform reference remapping at fill_cache() time instead of in the
michael
parents: 10910
diff changeset
2095 int k;
497929e9d912 Perform reference remapping at fill_cache() time instead of in the
michael
parents: 10910
diff changeset
2096 uint8_t *base= h->ref_list[j][i].base[0];
497929e9d912 Perform reference remapping at fill_cache() time instead of in the
michael
parents: 10910
diff changeset
2097 for(k=0; k<h->short_ref_count; k++)
497929e9d912 Perform reference remapping at fill_cache() time instead of in the
michael
parents: 10910
diff changeset
2098 if(h->short_ref[k]->base[0] == base){
497929e9d912 Perform reference remapping at fill_cache() time instead of in the
michael
parents: 10910
diff changeset
2099 id_list[i]= k;
497929e9d912 Perform reference remapping at fill_cache() time instead of in the
michael
parents: 10910
diff changeset
2100 break;
497929e9d912 Perform reference remapping at fill_cache() time instead of in the
michael
parents: 10910
diff changeset
2101 }
497929e9d912 Perform reference remapping at fill_cache() time instead of in the
michael
parents: 10910
diff changeset
2102 for(k=0; k<h->long_ref_count; k++)
497929e9d912 Perform reference remapping at fill_cache() time instead of in the
michael
parents: 10910
diff changeset
2103 if(h->long_ref[k] && h->long_ref[k]->base[0] == base){
497929e9d912 Perform reference remapping at fill_cache() time instead of in the
michael
parents: 10910
diff changeset
2104 id_list[i]= h->short_ref_count + k;
497929e9d912 Perform reference remapping at fill_cache() time instead of in the
michael
parents: 10910
diff changeset
2105 break;
497929e9d912 Perform reference remapping at fill_cache() time instead of in the
michael
parents: 10910
diff changeset
2106 }
497929e9d912 Perform reference remapping at fill_cache() time instead of in the
michael
parents: 10910
diff changeset
2107 }
497929e9d912 Perform reference remapping at fill_cache() time instead of in the
michael
parents: 10910
diff changeset
2108 }
497929e9d912 Perform reference remapping at fill_cache() time instead of in the
michael
parents: 10910
diff changeset
2109
7343
9a4cb430d8ff Loop filtering with multiple slice types fix.
michael
parents: 7341
diff changeset
2110 ref2frm[0]=
9a4cb430d8ff Loop filtering with multiple slice types fix.
michael
parents: 7341
diff changeset
2111 ref2frm[1]= -1;
7526
3749f13a0d02 Use the correct reference tables for interlaced MBAFF MBs in the loop filter.
michael
parents: 7525
diff changeset
2112 for(i=0; i<16; i++)
10913
497929e9d912 Perform reference remapping at fill_cache() time instead of in the
michael
parents: 10910
diff changeset
2113 ref2frm[i+2]= 4*id_list[i]
7343
9a4cb430d8ff Loop filtering with multiple slice types fix.
michael
parents: 7341
diff changeset
2114 +(h->ref_list[j][i].reference&3);
7526
3749f13a0d02 Use the correct reference tables for interlaced MBAFF MBs in the loop filter.
michael
parents: 7525
diff changeset
2115 ref2frm[18+0]=
3749f13a0d02 Use the correct reference tables for interlaced MBAFF MBs in the loop filter.
michael
parents: 7525
diff changeset
2116 ref2frm[18+1]= -1;
3749f13a0d02 Use the correct reference tables for interlaced MBAFF MBs in the loop filter.
michael
parents: 7525
diff changeset
2117 for(i=16; i<48; i++)
10913
497929e9d912 Perform reference remapping at fill_cache() time instead of in the
michael
parents: 10910
diff changeset
2118 ref2frm[i+4]= 4*id_list[(i-16)>>1]
7526
3749f13a0d02 Use the correct reference tables for interlaced MBAFF MBs in the loop filter.
michael
parents: 7525
diff changeset
2119 +(h->ref_list[j][i].reference&3);
7343
9a4cb430d8ff Loop filtering with multiple slice types fix.
michael
parents: 7341
diff changeset
2120 }
9a4cb430d8ff Loop filtering with multiple slice types fix.
michael
parents: 7341
diff changeset
2121
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2122 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
2123 h->emu_edge_height= (FRAME_MBAFF || FIELD_PICTURE) ? 0 : h->emu_edge_width;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2124
8456
30f2b80242b2 export refs
michael
parents: 8454
diff changeset
2125 s->avctx->refs= h->sps.ref_frame_count;
30f2b80242b2 export refs
michael
parents: 8454
diff changeset
2126
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2127 if(s->avctx->debug&FF_DEBUG_PICT_INFO){
7920
b731ef917a01 Print which slices are IDR not just the slice type.
michael
parents: 7919
diff changeset
2128 av_log(h->s.avctx, AV_LOG_DEBUG, "slice:%d %s mb:%d %c%s%s pps:%u frame:%d poc:%d/%d ref:%d/%d qp:%d loop:%d:%d:%d weight:%d%s %s\n",
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2129 h->slice_num,
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2130 (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
2131 first_mb_in_slice,
7920
b731ef917a01 Print which slices are IDR not just the slice type.
michael
parents: 7919
diff changeset
2132 av_get_pict_type_char(h->slice_type), h->slice_type_fixed ? " fix" : "", h->nal_unit_type == NAL_IDR_SLICE ? " IDR" : "",
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2133 pps_id, h->frame_num,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2134 s->current_picture_ptr->field_poc[0], s->current_picture_ptr->field_poc[1],
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2135 h->ref_count[0], h->ref_count[1],
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2136 s->qscale,
2583
61a08e2b9822 display deblocking strength in FF_DEBUG_PICT_INFO
lorenm
parents: 2582
diff changeset
2137 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
2138 h->use_weight,
6890
5ddf098691d3 print direct_spatial_mv_pred
michael
parents: 6785
diff changeset
2139 h->use_weight==1 && h->use_weight_chroma ? "c" : "",
5ddf098691d3 print direct_spatial_mv_pred
michael
parents: 6785
diff changeset
2140 h->slice_type == FF_B_TYPE ? (h->direct_spatial_mv_pred ? "SPAT" : "TEMP") : ""
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2141 );
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2142 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2143
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2144 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2145 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2146
10829
46a247e54d6e Export get_slice_type() as ff_h264_get_slice_type().
ramiro
parents: 10826
diff changeset
2147 int ff_h264_get_slice_type(H264Context *h)
46a247e54d6e Export get_slice_type() as ff_h264_get_slice_type().
ramiro
parents: 10826
diff changeset
2148 {
46a247e54d6e Export get_slice_type() as ff_h264_get_slice_type().
ramiro
parents: 10826
diff changeset
2149 switch (h->slice_type) {
46a247e54d6e Export get_slice_type() as ff_h264_get_slice_type().
ramiro
parents: 10826
diff changeset
2150 case FF_P_TYPE: return 0;
46a247e54d6e Export get_slice_type() as ff_h264_get_slice_type().
ramiro
parents: 10826
diff changeset
2151 case FF_B_TYPE: return 1;
46a247e54d6e Export get_slice_type() as ff_h264_get_slice_type().
ramiro
parents: 10826
diff changeset
2152 case FF_I_TYPE: return 2;
46a247e54d6e Export get_slice_type() as ff_h264_get_slice_type().
ramiro
parents: 10826
diff changeset
2153 case FF_SP_TYPE: return 3;
46a247e54d6e Export get_slice_type() as ff_h264_get_slice_type().
ramiro
parents: 10826
diff changeset
2154 case FF_SI_TYPE: return 4;
46a247e54d6e Export get_slice_type() as ff_h264_get_slice_type().
ramiro
parents: 10826
diff changeset
2155 default: return -1;
46a247e54d6e Export get_slice_type() as ff_h264_get_slice_type().
ramiro
parents: 10826
diff changeset
2156 }
46a247e54d6e Export get_slice_type() as ff_h264_get_slice_type().
ramiro
parents: 10826
diff changeset
2157 }
46a247e54d6e Export get_slice_type() as ff_h264_get_slice_type().
ramiro
parents: 10826
diff changeset
2158
10906
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2159 static void loop_filter(H264Context *h){
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2160 MpegEncContext * const s = &h->s;
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2161 uint8_t *dest_y, *dest_cb, *dest_cr;
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2162 int linesize, uvlinesize, mb_x, mb_y;
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2163 const int end_mb_y= s->mb_y + FRAME_MBAFF;
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2164 const int old_slice_type= h->slice_type;
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2165
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2166 if(h->deblocking_filter) {
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2167 for(mb_x= 0; mb_x<s->mb_width; mb_x++){
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2168 for(mb_y=end_mb_y - FRAME_MBAFF; mb_y<= end_mb_y; mb_y++){
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2169 int list, mb_xy, mb_type, is_complex;
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2170 mb_xy = h->mb_xy = mb_x + mb_y*s->mb_stride;
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2171 h->slice_num= h->slice_table[mb_xy];
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2172 mb_type= s->current_picture.mb_type[mb_xy];
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2173 h->list_count= h->list_counts[mb_xy];
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2174 if(h->list_count==2){
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2175 h->slice_type= h->slice_type_nos= FF_B_TYPE;
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2176 }else if(h->list_count==1){
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2177 h->slice_type= h->slice_type_nos= FF_P_TYPE;
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2178 }else
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2179 h->slice_type= h->slice_type_nos= FF_I_TYPE;
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2180
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2181 if(FRAME_MBAFF)
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2182 h->mb_mbaff = h->mb_field_decoding_flag = !!IS_INTERLACED(mb_type);
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2183
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2184 is_complex = CONFIG_SMALL || h->is_complex || IS_INTRA_PCM(mb_type) || s->qscale == 0; //FIXME qscale might be wrong
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2185
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2186 s->mb_x= mb_x;
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2187 s->mb_y= mb_y;
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2188 dest_y = s->current_picture.data[0] + (mb_x + mb_y * s->linesize ) * 16;
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2189 dest_cb = s->current_picture.data[1] + (mb_x + mb_y * s->uvlinesize) * 8;
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2190 dest_cr = s->current_picture.data[2] + (mb_x + mb_y * s->uvlinesize) * 8;
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2191 //FIXME simplify above
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2192
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2193 if (MB_FIELD) {
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2194 linesize = h->mb_linesize = s->linesize * 2;
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2195 uvlinesize = h->mb_uvlinesize = s->uvlinesize * 2;
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2196 if(mb_y&1){ //FIXME move out of this function?
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2197 dest_y -= s->linesize*15;
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2198 dest_cb-= s->uvlinesize*7;
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2199 dest_cr-= s->uvlinesize*7;
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2200 }
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2201 } else {
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2202 linesize = h->mb_linesize = s->linesize;
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2203 uvlinesize = h->mb_uvlinesize = s->uvlinesize;
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2204 }
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2205 backup_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, !is_complex);
10910
7cecaa3a6b38 Move the qp check to skip the loop filter up.
michael
parents: 10907
diff changeset
2206 if(fill_filter_caches(h, mb_type) < 0)
7cecaa3a6b38 Move the qp check to skip the loop filter up.
michael
parents: 10907
diff changeset
2207 continue;
10906
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2208 h->chroma_qp[0] = get_chroma_qp(h, 0, s->current_picture.qscale_table[mb_xy]);
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2209 h->chroma_qp[1] = get_chroma_qp(h, 1, s->current_picture.qscale_table[mb_xy]);
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2210
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2211 if (is_complex && FRAME_MBAFF) {
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2212 ff_h264_filter_mb (h, mb_x, mb_y, dest_y, dest_cb, dest_cr, linesize, uvlinesize);
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2213 } else {
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2214 ff_h264_filter_mb_fast(h, mb_x, mb_y, dest_y, dest_cb, dest_cr, linesize, uvlinesize);
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2215 }
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2216 }
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2217 }
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2218 }
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2219 h->slice_type= old_slice_type;
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2220 s->mb_x= 0;
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2221 s->mb_y= end_mb_y - FRAME_MBAFF;
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2222 }
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2223
8129
a9734fe0811e Making it easier to send arbitrary structures as work orders to MT workers
romansh
parents: 8107
diff changeset
2224 static int decode_slice(struct AVCodecContext *avctx, void *arg){
a9734fe0811e Making it easier to send arbitrary structures as work orders to MT workers
romansh
parents: 8107
diff changeset
2225 H264Context *h = *(void**)arg;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2226 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2227 const int part_mask= s->partitioned_frame ? (AC_END|AC_ERROR) : 0x7F;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2228
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2229 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
2230
8353
add1a0d65370 Do not recalculate constant part of is_complex for every MB.
michael
parents: 8352
diff changeset
2231 h->is_complex = FRAME_MBAFF || s->picture_structure != PICT_FRAME || s->codec_id != CODEC_ID_H264 ||
8742
ecabe55b66bb Remove CONFIG_H264_ENCODER references
mru
parents: 8735
diff changeset
2232 (CONFIG_GRAY && (s->flags&CODEC_FLAG_GRAY));
8353
add1a0d65370 Do not recalculate constant part of is_complex for every MB.
michael
parents: 8352
diff changeset
2233
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2234 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
2235 /* realign */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2236 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
2237
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2238 /* 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
2239 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
2240 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
2241 s->gb.buffer + get_bits_count(&s->gb)/8,
10535
95f3daa991a2 Use get_bits_left() instead of size_in_bits - get_bits_count().
rbultje
parents: 10528
diff changeset
2242 (get_bits_left(&s->gb) + 7)/8);
10869
7101061bfa0f Split cabac decoding code out of h264.c.
michael
parents: 10866
diff changeset
2243
7101061bfa0f Split cabac decoding code out of h264.c.
michael
parents: 10866
diff changeset
2244 ff_h264_init_cabac_states(h);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2245
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2246 for(;;){
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
2247 //START_TIMER
10869
7101061bfa0f Split cabac decoding code out of h264.c.
michael
parents: 10866
diff changeset
2248 int ret = ff_h264_decode_mb_cabac(h);
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2249 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
2250 //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
2251
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
2252 if(ret>=0) ff_h264_hl_decode_mb(h);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2253
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2254 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
2255 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
2256
10869
7101061bfa0f Split cabac decoding code out of h264.c.
michael
parents: 10866
diff changeset
2257 ret = ff_h264_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
2258
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
2259 if(ret>=0) ff_h264_hl_decode_mb(h);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2260 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
2261 }
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2262 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
2263
3948
3edbf131ee44 refill cabac variables in 16bit steps, 3% faster get_cabac()
michael
parents: 3947
diff changeset
2264 if( ret < 0 || h->cabac.bytestream > h->cabac.bytestream_end + 2) {
5153
b985439e3e15 fix some printf format specifiers
mru
parents: 5129
diff changeset
2265 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
2266 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
2267 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
2268 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2269
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2270 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
2271 s->mb_x = 0;
10906
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2272 loop_filter(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
2273 ff_draw_horiz_band(s, 16*s->mb_y, 16);
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
2274 ++s->mb_y;
5781
0b3aa6f4c313 Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents: 5780
diff changeset
2275 if(FIELD_OR_MBAFF_PICTURE) {
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2276 ++s->mb_y;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2277 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2278 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2279
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2280 if( eos || s->mb_y >= s->mb_height ) {
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
2281 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
2282 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
2283 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
2284 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2285 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2286
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2287 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2288 for(;;){
10866
d26e9b4d2ca1 Split cavlc out of h264.c.
michael
parents: 10864
diff changeset
2289 int ret = ff_h264_decode_mb_cavlc(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
2290
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
2291 if(ret>=0) ff_h264_hl_decode_mb(h);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2292
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2293 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
2294 s->mb_y++;
10866
d26e9b4d2ca1 Split cavlc out of h264.c.
michael
parents: 10864
diff changeset
2295 ret = ff_h264_decode_mb_cavlc(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
2296
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
2297 if(ret>=0) ff_h264_hl_decode_mb(h);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2298 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
2299 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2300
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2301 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
2302 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
2303 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
2304
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2305 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
2306 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2307
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2308 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
2309 s->mb_x=0;
10906
1b5fba731e24 Rearchitecturing the stiched up goose part 1
michael
parents: 10897
diff changeset
2310 loop_filter(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
2311 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
2312 ++s->mb_y;
5781
0b3aa6f4c313 Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents: 5780
diff changeset
2313 if(FIELD_OR_MBAFF_PICTURE) {
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2314 ++s->mb_y;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2315 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
2316 if(s->mb_y >= s->mb_height){
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4594
diff changeset
2317 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
2318
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2319 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
2320 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
2321
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2322 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
2323 }else{
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2324 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
2325
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2326 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
2327 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2328 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2329 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2330
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2331 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
2332 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
2333 if(get_bits_count(&s->gb) == s->gb.size_in_bits ){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2334 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
2335
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2336 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2337 }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
2338 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
2339
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2340 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2341 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2342 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2343 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2344 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2345
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2346 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2347 for(;s->mb_y < s->mb_height; s->mb_y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2348 for(;s->mb_x < s->mb_width; s->mb_x++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2349 int ret= decode_mb(h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2350
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
2351 ff_h264_hl_decode_mb(h);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2352
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2353 if(ret<0){
3177
8d1b2cc2a75b (f)printf --> av_log conversion
diego
parents: 3174
diff changeset
2354 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
2355 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
2356
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2357 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2358 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2359
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2360 if(++s->mb_x >= s->mb_width){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2361 s->mb_x=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2362 if(++s->mb_y >= s->mb_height){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2363 if(get_bits_count(s->gb) == s->gb.size_in_bits){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2364 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
2365
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2366 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2367 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2368 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
2369
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2370 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2371 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2372 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2373 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2374
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2375 if(get_bits_count(s->?gb) >= s->gb?.size_in_bits){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2376 if(get_bits_count(s->gb) == s->gb.size_in_bits){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2377 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
2378
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2379 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2380 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2381 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
2382
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2383 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2384 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2385 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2386 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2387 s->mb_x=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2388 ff_draw_horiz_band(s, 16*s->mb_y, 16);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2389 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2390 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2391 return -1; //not reached
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2392 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2393
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2394 /**
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2395 * Call decode_slice() for each context.
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2396 *
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2397 * @param h h264 master context
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2398 * @param context_count number of contexts to execute
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2399 */
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2400 static void execute_decode_slices(H264Context *h, int context_count){
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2401 MpegEncContext * const s = &h->s;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2402 AVCodecContext * const avctx= s->avctx;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2403 H264Context *hx;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2404 int i;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2405
9012
15a3df8c01fd More approved hunks for VAAPI & our new and cleaner hwaccel API.
michael
parents: 9004
diff changeset
2406 if (s->avctx->hwaccel)
15a3df8c01fd More approved hunks for VAAPI & our new and cleaner hwaccel API.
michael
parents: 9004
diff changeset
2407 return;
8610
2ca51be7dad8 Remove CODEC_ID_H264_VDPAU.
cehoyos
parents: 8596
diff changeset
2408 if(s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)
8522
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
2409 return;
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2410 if(context_count == 1) {
8140
54d7d6a63f3c Fix H.264 decoding.
cehoyos
parents: 8129
diff changeset
2411 decode_slice(avctx, &h);
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2412 } else {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2413 for(i = 1; i < context_count; i++) {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2414 hx = h->thread_context[i];
7831
8195c970d077 Rename error_resilience to error_recognition.
michael
parents: 7789
diff changeset
2415 hx->s.error_recognition = avctx->error_recognition;
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2416 hx->s.error_count = 0;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2417 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2418
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2419 avctx->execute(avctx, (void *)decode_slice,
10368
59ec306245a4 Remove casts that are useless since the argument is void *.
reimar
parents: 10235
diff changeset
2420 h->thread_context, NULL, context_count, sizeof(void*));
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2421
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2422 /* pull back stuff from slices to master context */
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2423 hx = h->thread_context[context_count - 1];
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2424 s->mb_x = hx->s.mb_x;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2425 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
2426 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
2427 s->picture_structure = hx->s.picture_structure;
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2428 for(i = 1; i < context_count; i++)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2429 h->s.error_count += h->thread_context[i]->s.error_count;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2430 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2431 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2432
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2433
6216
michael
parents: 6213
diff changeset
2434 static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2435 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2436 AVCodecContext * const avctx= s->avctx;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2437 int buf_index=0;
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2438 H264Context *hx; ///< thread context
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2439 int context_count = 0;
9449
0bc68f915e8e Support broken avc nal encapsulation.
michael
parents: 9419
diff changeset
2440 int next_avc= h->is_avc ? 0 : buf_size;
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2441
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2442 h->max_contexts = avctx->thread_count;
1322
f78341ab5fba some warning fixes
al3x
parents: 1319
diff changeset
2443 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2444 int i;
2867
7c7edddaa835 dont be so picky with .mp4 ... fixes Mr&MrsSmith.mp4
michael
parents: 2861
diff changeset
2445 for(i=0; i<50; i++){
7c7edddaa835 dont be so picky with .mp4 ... fixes Mr&MrsSmith.mp4
michael
parents: 2861
diff changeset
2446 av_log(NULL, AV_LOG_ERROR,"%02X ", buf[i]);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2447 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2448 #endif
4616
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
2449 if(!(s->flags2 & CODEC_FLAG2_CHUNKS)){
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2450 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
2451 if (!s->first_field)
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
2452 s->current_picture_ptr= NULL;
10858
31645cf81fcb Split SEI code off h264.c.
michael
parents: 10857
diff changeset
2453 ff_h264_reset_sei(h);
4616
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
2454 }
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
2455
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2456 for(;;){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2457 int consumed;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2458 int dst_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2459 int bit_length;
6216
michael
parents: 6213
diff changeset
2460 const uint8_t *ptr;
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2461 int i, nalsize = 0;
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2462 int err;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2463
9449
0bc68f915e8e Support broken avc nal encapsulation.
michael
parents: 9419
diff changeset
2464 if(buf_index >= next_avc) {
5170
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
2465 if(buf_index >= buf_size) break;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
2466 nalsize = 0;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
2467 for(i = 0; i < h->nal_length_size; i++)
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
2468 nalsize = (nalsize << 8) | buf[buf_index++];
9898
003d7f830e2a Fix nalsize check to avoid an integer overflow that made the check
reimar
parents: 9885
diff changeset
2469 if(nalsize <= 1 || nalsize > buf_size - buf_index){
5170
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
2470 if(nalsize == 1){
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
2471 buf_index++;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
2472 continue;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
2473 }else{
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
2474 av_log(h->s.avctx, AV_LOG_ERROR, "AVC: nal size %d\n", nalsize);
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
2475 break;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
2476 }
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
2477 }
9449
0bc68f915e8e Support broken avc nal encapsulation.
michael
parents: 9419
diff changeset
2478 next_avc= buf_index + nalsize;
5170
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
2479 } else {
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
2480 // start code prefix search
10663
dc61c373810e End startcode prefix search at the end of a AVC unit.
michael
parents: 10656
diff changeset
2481 for(; buf_index + 3 < next_avc; buf_index++){
5170
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
2482 // This should always succeed in the first iteration.
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
2483 if(buf[buf_index] == 0 && buf[buf_index+1] == 0 && buf[buf_index+2] == 1)
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
2484 break;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
2485 }
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
2486
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
2487 if(buf_index+3 >= buf_size) break;
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
2488
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
2489 buf_index+=3;
10663
dc61c373810e End startcode prefix search at the end of a AVC unit.
michael
parents: 10656
diff changeset
2490 if(buf_index >= next_avc) continue;
5170
0f6a38c1b63c indentation
benoit
parents: 5160
diff changeset
2491 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2492
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2493 hx = h->thread_context[context_count];
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2494
9449
0bc68f915e8e Support broken avc nal encapsulation.
michael
parents: 9419
diff changeset
2495 ptr= ff_h264_decode_nal(hx, buf + buf_index, &dst_length, &consumed, next_avc - buf_index);
4828
58f1856608f6 scenario: A properly coded frame is followed by an end of sequence NAL unit,
diego
parents: 4795
diff changeset
2496 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
2497 return -1;
0271b214458b harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents: 4354
diff changeset
2498 }
4829
e3161603a048 Remove a NAL unit's trailing zero bytes even when dst_length is 1.
diego
parents: 4828
diff changeset
2499 while(ptr[dst_length - 1] == 0 && dst_length > 0)
3341
bd7a496e44c9 h264: accept rbsp_trailing longer than 1 byte
lorenm
parents: 3318
diff changeset
2500 dst_length--;
8996
e65778184ded Make the following H264 functions available to the parser:
cehoyos
parents: 8991
diff changeset
2501 bit_length= !dst_length ? 0 : (8*dst_length - ff_h264_decode_rbsp_trailing(h, ptr + dst_length - 1));
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2502
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2503 if(s->avctx->debug&FF_DEBUG_STARTCODE){
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2504 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
2505 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2506
9449
0bc68f915e8e Support broken avc nal encapsulation.
michael
parents: 9419
diff changeset
2507 if (h->is_avc && (nalsize != consumed) && nalsize){
10656
34911596ffed Reduce warnings about too few consumed bytes to debug level.
michael
parents: 10565
diff changeset
2508 av_log(h->s.avctx, AV_LOG_DEBUG, "AVC: Consumed only %d bytes instead of %d\n", consumed, nalsize);
6490
bb799e3bc64b If consumed does not match nalsize, favor nalsize.
michael
parents: 6488
diff changeset
2509 }
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2510
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2511 buf_index += consumed;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2512
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5106
diff changeset
2513 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
2514 ||(avctx->skip_frame >= AVDISCARD_NONREF && h->nal_ref_idc == 0))
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2515 continue;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2516
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2517 again:
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2518 err = 0;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2519 switch(hx->nal_unit_type){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2520 case NAL_IDR_SLICE:
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2521 if (h->nal_unit_type != NAL_IDR_SLICE) {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2522 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
2523 return -1;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2524 }
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
2525 idr(h); //FIXME ensure we don't loose some frames if there is reordering
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2526 case NAL_SLICE:
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2527 init_get_bits(&hx->s.gb, ptr, bit_length);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2528 hx->intra_gb_ptr=
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2529 hx->inter_gb_ptr= &hx->s.gb;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2530 hx->s.data_partitioning = 0;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2531
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2532 if((err = decode_slice_header(hx, h)))
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2533 break;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2534
9066
77cbbce1be94 Add hardware acceleration hooks to H.264.
benoit
parents: 9065
diff changeset
2535 if (s->avctx->hwaccel && h->current_slice == 1) {
77cbbce1be94 Add hardware acceleration hooks to H.264.
benoit
parents: 9065
diff changeset
2536 if (s->avctx->hwaccel->start_frame(s->avctx, NULL, 0) < 0)
77cbbce1be94 Add hardware acceleration hooks to H.264.
benoit
parents: 9065
diff changeset
2537 return -1;
77cbbce1be94 Add hardware acceleration hooks to H.264.
benoit
parents: 9065
diff changeset
2538 }
77cbbce1be94 Add hardware acceleration hooks to H.264.
benoit
parents: 9065
diff changeset
2539
8783
e91ea98d868a Add SEI recovery point frame counter to H264Context and use it when
cehoyos
parents: 8762
diff changeset
2540 s->current_picture_ptr->key_frame |=
e91ea98d868a Add SEI recovery point frame counter to H264Context and use it when
cehoyos
parents: 8762
diff changeset
2541 (hx->nal_unit_type == NAL_IDR_SLICE) ||
e91ea98d868a Add SEI recovery point frame counter to H264Context and use it when
cehoyos
parents: 8762
diff changeset
2542 (h->sei_recovery_frame_cnt >= 0);
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2543 if(hx->redundant_pic_count==0 && hx->s.hurry_up < 5
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2544 && (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
2545 && (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
2546 && (avctx->skip_frame < AVDISCARD_NONKEY || hx->slice_type_nos==FF_I_TYPE)
8522
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
2547 && avctx->skip_frame < AVDISCARD_ALL){
9045
5fb849bddf4a Add hwaccel->decode_slice() call for avhwaccel by Gwenole Beauchesne.
michael
parents: 9035
diff changeset
2548 if(avctx->hwaccel) {
5fb849bddf4a Add hwaccel->decode_slice() call for avhwaccel by Gwenole Beauchesne.
michael
parents: 9035
diff changeset
2549 if (avctx->hwaccel->decode_slice(avctx, &buf[buf_index - consumed], consumed) < 0)
5fb849bddf4a Add hwaccel->decode_slice() call for avhwaccel by Gwenole Beauchesne.
michael
parents: 9035
diff changeset
2550 return -1;
5fb849bddf4a Add hwaccel->decode_slice() call for avhwaccel by Gwenole Beauchesne.
michael
parents: 9035
diff changeset
2551 }else
8610
2ca51be7dad8 Remove CODEC_ID_H264_VDPAU.
cehoyos
parents: 8596
diff changeset
2552 if(CONFIG_H264_VDPAU_DECODER && s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU){
8522
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
2553 static const uint8_t start_code[] = {0x00, 0x00, 0x01};
8563
b59279494d84 Cosmetics: Rename ff_vdpau_h264_add_data_chunk as ff_vdpau_add_data_chunk.
cehoyos
parents: 8562
diff changeset
2554 ff_vdpau_add_data_chunk(s, start_code, sizeof(start_code));
b59279494d84 Cosmetics: Rename ff_vdpau_h264_add_data_chunk as ff_vdpau_add_data_chunk.
cehoyos
parents: 8562
diff changeset
2555 ff_vdpau_add_data_chunk(s, &buf[buf_index - consumed], consumed );
8522
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
2556 }else
8524
e2d97d1449d4 Cosmetics: Fix indentation.
cehoyos
parents: 8522
diff changeset
2557 context_count++;
8522
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
2558 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2559 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2560 case NAL_DPA:
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2561 init_get_bits(&hx->s.gb, ptr, bit_length);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2562 hx->intra_gb_ptr=
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2563 hx->inter_gb_ptr= NULL;
9910
d07aee233d03 H.264: Don't set data_partitioning for invalid NAL_DPA.
astrange
parents: 9898
diff changeset
2564
d07aee233d03 H.264: Don't set data_partitioning for invalid NAL_DPA.
astrange
parents: 9898
diff changeset
2565 if ((err = decode_slice_header(hx, h)) < 0)
d07aee233d03 H.264: Don't set data_partitioning for invalid NAL_DPA.
astrange
parents: 9898
diff changeset
2566 break;
d07aee233d03 H.264: Don't set data_partitioning for invalid NAL_DPA.
astrange
parents: 9898
diff changeset
2567
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2568 hx->s.data_partitioning = 1;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2569
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2570 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2571 case NAL_DPB:
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2572 init_get_bits(&hx->intra_gb, ptr, bit_length);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2573 hx->intra_gb_ptr= &hx->intra_gb;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2574 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2575 case NAL_DPC:
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2576 init_get_bits(&hx->inter_gb, ptr, bit_length);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2577 hx->inter_gb_ptr= &hx->inter_gb;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2578
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2579 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
2580 && s->context_initialized
2793
ae85da6c5c2f more fine grained skip_frame
michael
parents: 2792
diff changeset
2581 && s->hurry_up < 5
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2582 && (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
2583 && (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
2584 && (avctx->skip_frame < AVDISCARD_NONKEY || hx->slice_type_nos==FF_I_TYPE)
2793
ae85da6c5c2f more fine grained skip_frame
michael
parents: 2792
diff changeset
2585 && avctx->skip_frame < AVDISCARD_ALL)
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2586 context_count++;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2587 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2588 case NAL_SEI:
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
2589 init_get_bits(&s->gb, ptr, bit_length);
8996
e65778184ded Make the following H264 functions available to the parser:
cehoyos
parents: 8991
diff changeset
2590 ff_h264_decode_sei(h);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2591 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2592 case NAL_SPS:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2593 init_get_bits(&s->gb, ptr, bit_length);
8996
e65778184ded Make the following H264 functions available to the parser:
cehoyos
parents: 8991
diff changeset
2594 ff_h264_decode_seq_parameter_set(h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2595
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2596 if(s->flags& CODEC_FLAG_LOW_DELAY)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2597 s->low_delay=1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2598
2538
34b0996cc10d 10l (fix reordering when B-frames are not present)
lorenm
parents: 2537
diff changeset
2599 if(avctx->has_b_frames < 2)
34b0996cc10d 10l (fix reordering when B-frames are not present)
lorenm
parents: 2537
diff changeset
2600 avctx->has_b_frames= !s->low_delay;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2601 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2602 case NAL_PPS:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2603 init_get_bits(&s->gb, ptr, bit_length);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2604
8996
e65778184ded Make the following H264 functions available to the parser:
cehoyos
parents: 8991
diff changeset
2605 ff_h264_decode_picture_parameter_set(h, bit_length);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2606
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2607 break;
2960
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
2608 case NAL_AUD:
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
2609 case NAL_END_SEQUENCE:
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
2610 case NAL_END_STREAM:
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
2611 case NAL_FILLER_DATA:
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
2612 case NAL_SPS_EXT:
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
2613 case NAL_AUXILIARY_SLICE:
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2614 break;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2971
diff changeset
2615 default:
10811
4b790cd2c245 Log unknown NAL code from correct context
andoma
parents: 10663
diff changeset
2616 av_log(avctx, AV_LOG_DEBUG, "Unknown NAL code: %d (%d bits)\n", hx->nal_unit_type, bit_length);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2617 }
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2618
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2619 if(context_count == h->max_contexts) {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2620 execute_decode_slices(h, context_count);
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2621 context_count = 0;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2622 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2623
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2624 if (err < 0)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2625 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
2626 else if(err == 1) {
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2627 /* Slice could not be decoded in parallel mode, copy down
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2628 * NAL unit stuff to context 0 and restart. Note that
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
2629 * rbsp_buffer is not transferred, but since we no longer
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2630 * run in parallel mode this should not be an issue. */
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2631 h->nal_unit_type = hx->nal_unit_type;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2632 h->nal_ref_idc = hx->nal_ref_idc;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2633 hx = h;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2634 goto again;
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2635 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2636 }
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2637 if(context_count)
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5638
diff changeset
2638 execute_decode_slices(h, context_count);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2639 return buf_index;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2640 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2641
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2642 /**
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
2643 * returns the number of bytes consumed for building the current frame
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2644 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2645 static int get_consumed_bytes(MpegEncContext *s, int pos, int buf_size){
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5106
diff changeset
2646 if(pos==0) pos=1; //avoid infinite loops (i doubt that is needed but ...)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2647 if(pos+10>buf_size) pos=buf_size; // oops ;)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2648
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2649 return pos;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2650 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2651
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2652 static int decode_frame(AVCodecContext *avctx,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2653 void *data, int *data_size,
9355
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9163
diff changeset
2654 AVPacket *avpkt)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2655 {
9355
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9163
diff changeset
2656 const uint8_t *buf = avpkt->data;
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9163
diff changeset
2657 int buf_size = avpkt->size;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2658 H264Context *h = avctx->priv_data;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2659 MpegEncContext *s = &h->s;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2660 AVFrame *pict = data;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2661 int buf_index;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2662
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2663 s->flags= avctx->flags;
1754
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1706
diff changeset
2664 s->flags2= avctx->flags2;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2665
7374
6d718739ee8e misc spelling/grammar fixes
diego
parents: 7362
diff changeset
2666 /* end of stream, output what is still in the buffers */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2667 if (buf_size == 0) {
4556
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
2668 Picture *out;
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
2669 int i, out_idx;
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
2670
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
2671 //FIXME factorize this with the output code below
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
2672 out = h->delayed_pic[0];
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
2673 out_idx = 0;
9885
f86df3ebfef7 Improve wording: s/reseted/reset
cehoyos
parents: 9883
diff changeset
2674 for(i=1; h->delayed_pic[i] && !h->delayed_pic[i]->key_frame && !h->delayed_pic[i]->mmco_reset; i++)
4556
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
2675 if(h->delayed_pic[i]->poc < out->poc){
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
2676 out = h->delayed_pic[i];
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
2677 out_idx = i;
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
2678 }
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
2679
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
2680 for(i=out_idx; h->delayed_pic[i]; i++)
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
2681 h->delayed_pic[i] = h->delayed_pic[i+1];
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
2682
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
2683 if(out){
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
2684 *data_size = sizeof(AVFrame);
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
2685 *pict= *(AVFrame*)out;
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
2686 }
c140a3360e18 output delayed frames
michael
parents: 4553
diff changeset
2687
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2688 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2689 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2690
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2691 if(h->is_avc && !h->got_avcC) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2692 int i, cnt, nalsize;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2693 unsigned char *p = avctx->extradata;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2694 if(avctx->extradata_size < 7) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2695 av_log(avctx, AV_LOG_ERROR, "avcC too short\n");
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2696 return -1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2697 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2698 if(*p != 1) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2699 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
2700 return -1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2701 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2702 /* 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
2703 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
2704 h->nal_length_size = 2;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2705 // Decode sps from avcC
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2706 cnt = *(p+5) & 0x1f; // Number of sps
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2707 p += 6;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2708 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
2709 nalsize = AV_RB16(p) + 2;
2867
7c7edddaa835 dont be so picky with .mp4 ... fixes Mr&MrsSmith.mp4
michael
parents: 2861
diff changeset
2710 if(decode_nal_units(h, p, nalsize) < 0) {
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2711 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
2712 return -1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2713 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2714 p += nalsize;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2715 }
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2716 // Decode pps from avcC
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2717 cnt = *(p++); // Number of pps
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2718 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
2719 nalsize = AV_RB16(p) + 2;
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2720 if(decode_nal_units(h, p, nalsize) != nalsize) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2721 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
2722 return -1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2723 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2724 p += nalsize;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2725 }
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2726 // 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
2727 h->nal_length_size = ((*(((char*)(avctx->extradata))+4))&0x03)+1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2728 // Do not reparse avcC
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2729 h->got_avcC = 1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2730 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2731
7888
d0489fa75c41 Ensure that extradata is not parsed twice.
michael
parents: 7844
diff changeset
2732 if(!h->got_avcC && !h->is_avc && s->avctx->extradata_size){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2733 if(decode_nal_units(h, s->avctx->extradata, s->avctx->extradata_size) < 0)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2734 return -1;
7888
d0489fa75c41 Ensure that extradata is not parsed twice.
michael
parents: 7844
diff changeset
2735 h->got_avcC = 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2736 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2737
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2738 buf_index=decode_nal_units(h, buf, buf_size);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2739 if(buf_index < 0)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2740 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2741
4620
f23c20cf7579 check for no frame and prevent segfault
michael
parents: 4616
diff changeset
2742 if(!(s->flags2 & CODEC_FLAG2_CHUNKS) && !s->current_picture_ptr){
5629
7e5ebda833e9 Remove error raising when explicitely skipping frame
benoit
parents: 5547
diff changeset
2743 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
2744 av_log(avctx, AV_LOG_ERROR, "no frame!\n");
f23c20cf7579 check for no frame and prevent segfault
michael
parents: 4616
diff changeset
2745 return -1;
f23c20cf7579 check for no frame and prevent segfault
michael
parents: 4616
diff changeset
2746 }
f23c20cf7579 check for no frame and prevent segfault
michael
parents: 4616
diff changeset
2747
4616
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
2748 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
2749 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
2750 Picture *cur = s->current_picture_ptr;
10511
bfea93e47391 Try to fix has_b_frame calculation for open gop files.
michael
parents: 10368
diff changeset
2751 int i, pics, out_of_order, out_idx;
4616
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
2752
9417
8d228c29a338 Factorize field_end() out.
michael
parents: 9416
diff changeset
2753 field_end(h);
4616
8036b117ae26 support feeding individual NAL units to the decoder instead of just complete frames
michael
parents: 4600
diff changeset
2754
7382
f9e70983fc35 Set field_poc (it was half uninitialized before) and use it
michael
parents: 7381
diff changeset
2755 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
2756 /* 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
2757 *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
2758
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
2759 } else {
9831
febe1855b64a Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents: 9790
diff changeset
2760 cur->interlaced_frame = 0;
8107
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
2761 cur->repeat_pict = 0;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
2762
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
2763 /* Signal interlacing information externally. */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
2764 /* Prioritize picture timing SEI information over used decoding process if it exists. */
9128
793cf8c68c4f Add support for ct_type to correctly detect interlaced flag
schreter
parents: 9125
diff changeset
2765
8107
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
2766 if(h->sps.pic_struct_present_flag){
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
2767 switch (h->sei_pic_struct)
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
2768 {
9831
febe1855b64a Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents: 9790
diff changeset
2769 case SEI_PIC_STRUCT_FRAME:
febe1855b64a Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents: 9790
diff changeset
2770 break;
febe1855b64a Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents: 9790
diff changeset
2771 case SEI_PIC_STRUCT_TOP_FIELD:
febe1855b64a Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents: 9790
diff changeset
2772 case SEI_PIC_STRUCT_BOTTOM_FIELD:
febe1855b64a Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents: 9790
diff changeset
2773 cur->interlaced_frame = 1;
febe1855b64a Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents: 9790
diff changeset
2774 break;
febe1855b64a Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents: 9790
diff changeset
2775 case SEI_PIC_STRUCT_TOP_BOTTOM:
febe1855b64a Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents: 9790
diff changeset
2776 case SEI_PIC_STRUCT_BOTTOM_TOP:
febe1855b64a Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents: 9790
diff changeset
2777 if (FIELD_OR_MBAFF_PICTURE)
febe1855b64a Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents: 9790
diff changeset
2778 cur->interlaced_frame = 1;
febe1855b64a Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents: 9790
diff changeset
2779 else
febe1855b64a Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents: 9790
diff changeset
2780 // try to flag soft telecine progressive
febe1855b64a Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents: 9790
diff changeset
2781 cur->interlaced_frame = h->prev_interlaced_frame;
febe1855b64a Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents: 9790
diff changeset
2782 break;
8107
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
2783 case SEI_PIC_STRUCT_TOP_BOTTOM_TOP:
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
2784 case SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM:
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
2785 // Signal the possibility of telecined film externally (pic_struct 5,6)
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
2786 // From these hints, let the applications decide if they apply deinterlacing.
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
2787 cur->repeat_pict = 1;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
2788 break;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
2789 case SEI_PIC_STRUCT_FRAME_DOUBLING:
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
2790 // Force progressive here, as doubling interlaced frame is a bad idea.
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
2791 cur->repeat_pict = 2;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
2792 break;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
2793 case SEI_PIC_STRUCT_FRAME_TRIPLING:
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
2794 cur->repeat_pict = 4;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
2795 break;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
2796 }
9831
febe1855b64a Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents: 9790
diff changeset
2797
febe1855b64a Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents: 9790
diff changeset
2798 if ((h->sei_ct_type & 3) && h->sei_pic_struct <= SEI_PIC_STRUCT_BOTTOM_TOP)
febe1855b64a Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents: 9790
diff changeset
2799 cur->interlaced_frame = (h->sei_ct_type & (1<<1)) != 0;
8107
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
2800 }else{
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
2801 /* Derive interlacing flag from used decoding process. */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
2802 cur->interlaced_frame = FIELD_OR_MBAFF_PICTURE;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
2803 }
9831
febe1855b64a Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents: 9790
diff changeset
2804 h->prev_interlaced_frame = cur->interlaced_frame;
8107
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
2805
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
2806 if (cur->field_poc[0] != cur->field_poc[1]){
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
2807 /* Derive top_field_first from field pocs. */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
2808 cur->top_field_first = cur->field_poc[0] < cur->field_poc[1];
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
2809 }else{
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
2810 if(cur->interlaced_frame || h->sps.pic_struct_present_flag){
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
2811 /* Use picture timing SEI information. Even if it is a information of a past frame, better than nothing. */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
2812 if(h->sei_pic_struct == SEI_PIC_STRUCT_TOP_BOTTOM
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
2813 || h->sei_pic_struct == SEI_PIC_STRUCT_TOP_BOTTOM_TOP)
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
2814 cur->top_field_first = 1;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
2815 else
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
2816 cur->top_field_first = 0;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
2817 }else{
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
2818 /* Most likely progressive */
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
2819 cur->top_field_first = 0;
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
2820 }
e61f76efc9f3 h264: Implement decoding of picture timing SEI message.
andoma
parents: 8079
diff changeset
2821 }
5876
731ee5ad6bde Correct assignment of interlaced_frame; was being set on output frames,
heydowns
parents: 5825
diff changeset
2822
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
2823 //FIXME do something with unavailable reference frames
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2824
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
2825 /* Sort B-frames into display order */
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
2826
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
2827 if(h->sps.bitstream_restriction_flag
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
2828 && s->avctx->has_b_frames < h->sps.num_reorder_frames){
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
2829 s->avctx->has_b_frames = h->sps.num_reorder_frames;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
2830 s->low_delay = 0;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
2831 }
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
2832
7325
af725308adf4 Take the brain amputated spec literally if the user asks for it (-strict 1).
michael
parents: 7320
diff changeset
2833 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
2834 && !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
2835 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
2836 s->low_delay= 0;
af725308adf4 Take the brain amputated spec literally if the user asks for it (-strict 1).
michael
parents: 7320
diff changeset
2837 }
af725308adf4 Take the brain amputated spec literally if the user asks for it (-strict 1).
michael
parents: 7320
diff changeset
2838
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
2839 pics = 0;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
2840 while(h->delayed_pic[pics]) pics++;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
2841
7283
39e81fdd8d23 Move the size of the H264Context delayed_pic array into a #define.
astrange
parents: 7277
diff changeset
2842 assert(pics <= MAX_DELAYED_PIC_COUNT);
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
2843
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
2844 h->delayed_pic[pics++] = cur;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
2845 if(cur->reference == 0)
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
2846 cur->reference = DELAYED_PIC_REF;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
2847
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
2848 out = h->delayed_pic[0];
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
2849 out_idx = 0;
9885
f86df3ebfef7 Improve wording: s/reseted/reset
cehoyos
parents: 9883
diff changeset
2850 for(i=1; h->delayed_pic[i] && !h->delayed_pic[i]->key_frame && !h->delayed_pic[i]->mmco_reset; i++)
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
2851 if(h->delayed_pic[i]->poc < out->poc){
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
2852 out = h->delayed_pic[i];
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
2853 out_idx = i;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
2854 }
10511
bfea93e47391 Try to fix has_b_frame calculation for open gop files.
michael
parents: 10368
diff changeset
2855 if(s->avctx->has_b_frames == 0 && (h->delayed_pic[0]->key_frame || h->delayed_pic[0]->mmco_reset))
bfea93e47391 Try to fix has_b_frame calculation for open gop files.
michael
parents: 10368
diff changeset
2856 h->outputed_poc= INT_MIN;
bfea93e47391 Try to fix has_b_frame calculation for open gop files.
michael
parents: 10368
diff changeset
2857 out_of_order = out->poc < h->outputed_poc;
7310
033d10927d45 Remove delayed_output_pic, I do not understand what this variable was good for.
michael
parents: 7309
diff changeset
2858
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
2859 if(h->sps.bitstream_restriction_flag && s->avctx->has_b_frames >= h->sps.num_reorder_frames)
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
2860 { }
7320
927ac918cddb Make the automatic has_b_frames increasing code increase it up to the
michael
parents: 7318
diff changeset
2861 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
2862 || (s->low_delay &&
10511
bfea93e47391 Try to fix has_b_frame calculation for open gop files.
michael
parents: 10368
diff changeset
2863 ((h->outputed_poc != INT_MIN && out->poc > h->outputed_poc + 2)
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6429
diff changeset
2864 || cur->pict_type == FF_B_TYPE)))
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
2865 {
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
2866 s->low_delay = 0;
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
2867 s->avctx->has_b_frames++;
7312
f9eaaadcd611 simplify
michael
parents: 7310
diff changeset
2868 }
f9eaaadcd611 simplify
michael
parents: 7310
diff changeset
2869
7316
cf1b80029862 Simplify picture output code.
michael
parents: 7315
diff changeset
2870 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
2871 out->reference &= ~DELAYED_PIC_REF;
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
2872 for(i=out_idx; h->delayed_pic[i]; i++)
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
2873 h->delayed_pic[i] = h->delayed_pic[i+1];
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
2874 }
7316
cf1b80029862 Simplify picture output code.
michael
parents: 7315
diff changeset
2875 if(!out_of_order && pics > s->avctx->has_b_frames){
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
2876 *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
2877
10511
bfea93e47391 Try to fix has_b_frame calculation for open gop files.
michael
parents: 10368
diff changeset
2878 if(out_idx==0 && h->delayed_pic[0] && (h->delayed_pic[0]->key_frame || h->delayed_pic[0]->mmco_reset)) {
bfea93e47391 Try to fix has_b_frame calculation for open gop files.
michael
parents: 10368
diff changeset
2879 h->outputed_poc = INT_MIN;
bfea93e47391 Try to fix has_b_frame calculation for open gop files.
michael
parents: 10368
diff changeset
2880 } else
10514
michael
parents: 10513
diff changeset
2881 h->outputed_poc = out->poc;
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
2882 *pict= *(AVFrame*)out;
7316
cf1b80029862 Simplify picture output code.
michael
parents: 7315
diff changeset
2883 }else{
5803
f896159a1a9e reindent
andoma
parents: 5801
diff changeset
2884 av_log(avctx, AV_LOG_DEBUG, "no picture\n");
7316
cf1b80029862 Simplify picture output code.
michael
parents: 7315
diff changeset
2885 }
5798
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5797
diff changeset
2886 }
2937
e63bbb945ebd fix a crash on seeking to an invalid frame
lorenm
parents: 2935
diff changeset
2887 }
e63bbb945ebd fix a crash on seeking to an invalid frame
lorenm
parents: 2935
diff changeset
2888
e63bbb945ebd fix a crash on seeking to an invalid frame
lorenm
parents: 2935
diff changeset
2889 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
2890 ff_print_debug_info(s, pict);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2891 //printf("out %d\n", (int)pict->data[0]);
9733
67f917b48068 remove unused hack which set AVCodecContext frame_number to pic timestamp
bcoudurier
parents: 9698
diff changeset
2892
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2893 return get_consumed_bytes(s, buf_index, buf_size);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2894 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2895 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2896 static inline void fill_mb_avail(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2897 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
2898 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2899
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2900 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
2901 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
2902 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
2903 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
2904 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2905 h->mb_avail[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2906 h->mb_avail[1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2907 h->mb_avail[2]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2908 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2909 h->mb_avail[3]= s->mb_x && h->slice_table[mb_xy - 1] == h->slice_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2910 h->mb_avail[4]= 1; //FIXME move out
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2911 h->mb_avail[5]= 0; //FIXME move out
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2912 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2913 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2914
6164
ecaf5226e9b0 Consistently use TEST as the preprocessor condition to enable test code.
diego
parents: 6046
diff changeset
2915 #ifdef TEST
6172
13aa4cac4dde Add #undef printf and disable non-functional code to make test program compile.
diego
parents: 6164
diff changeset
2916 #undef printf
5380
389366aa3458 Fix the self tests which are contained in some codecs and are using random().
takis
parents: 5338
diff changeset
2917 #undef random
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2918 #define COUNT 8000
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2919 #define SIZE (COUNT*40)
5934
bd5f4dc81fbe main() --> main(void)
diego
parents: 5926
diff changeset
2920 int main(void){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2921 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2922 uint8_t temp[SIZE];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2923 PutBitContext pb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2924 GetBitContext gb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2925 // int int_temp[10000];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2926 DSPContext dsp;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2927 AVCodecContext avctx;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2928
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2929 dsputil_init(&dsp, &avctx);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2930
1522
79dddc5cd990 removed the obsolete and unused parameters of init_put_bits
alex
parents: 1453
diff changeset
2931 init_put_bits(&pb, temp, SIZE);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2932 printf("testing unsigned exp golomb\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2933 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2934 START_TIMER
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2935 set_ue_golomb(&pb, i);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2936 STOP_TIMER("set_ue_golomb");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2937 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2938 flush_put_bits(&pb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2939
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2940 init_get_bits(&gb, temp, 8*SIZE);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2941 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2942 int j, s;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2943
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2944 s= show_bits(&gb, 24);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2945
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2946 START_TIMER
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2947 j= get_ue_golomb(&gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2948 if(j != i){
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5106
diff changeset
2949 printf("mismatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2950 // return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2951 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2952 STOP_TIMER("get_ue_golomb");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2953 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2954
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2955
1524
alex
parents: 1522
diff changeset
2956 init_put_bits(&pb, temp, SIZE);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2957 printf("testing signed exp golomb\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2958 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2959 START_TIMER
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2960 set_se_golomb(&pb, i - COUNT/2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2961 STOP_TIMER("set_se_golomb");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2962 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2963 flush_put_bits(&pb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2964
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2965 init_get_bits(&gb, temp, 8*SIZE);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2966 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2967 int j, s;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2968
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2969 s= show_bits(&gb, 24);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2970
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2971 START_TIMER
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2972 j= get_se_golomb(&gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2973 if(j != i - COUNT/2){
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5106
diff changeset
2974 printf("mismatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2975 // return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2976 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2977 STOP_TIMER("get_se_golomb");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2978 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2979
6172
13aa4cac4dde Add #undef printf and disable non-functional code to make test program compile.
diego
parents: 6164
diff changeset
2980 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2981 printf("testing 4x4 (I)DCT\n");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2982
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2983 DCTELEM block[16];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2984 uint8_t src[16], ref[16];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2985 uint64_t error= 0, max_error=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2986
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2987 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2988 int j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2989 // printf("%d %d %d\n", r1, r2, (r2-r1)*16);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2990 for(j=0; j<16; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2991 ref[j]= random()%255;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2992 src[j]= random()%255;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2993 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2994
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2995 h264_diff_dct_c(block, src, ref, 4);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2996
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2997 //normalize
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2998 for(j=0; j<16; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2999 // printf("%d ", block[j]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3000 block[j]= block[j]*4;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3001 if(j&1) block[j]= (block[j]*4 + 2)/5;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3002 if(j&4) block[j]= (block[j]*4 + 2)/5;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3003 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3004 // printf("\n");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3005
2272
cd43603c46f9 move h264 idct to its own file and call via function pointer in DspContext
michael
parents: 2255
diff changeset
3006 s->dsp.h264_idct_add(ref, block, 4);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3007 /* for(j=0; j<16; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3008 printf("%d ", ref[j]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3009 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3010 printf("\n");*/
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3011
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3012 for(j=0; j<16; j++){
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
3013 int diff= FFABS(src[j] - ref[j]);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3014
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3015 error+= diff*diff;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3016 max_error= FFMAX(max_error, diff);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3017 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3018 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3019 printf("error=%f max_error=%d\n", ((float)error)/COUNT/16, (int)max_error );
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3020 printf("testing quantizer\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3021 for(qp=0; qp<52; qp++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3022 for(i=0; i<16; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3023 src1_block[i]= src2_block[i]= random()%255;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3024
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3025 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3026 printf("Testing NAL layer\n");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3027
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3028 uint8_t bitstream[COUNT];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3029 uint8_t nal[COUNT*2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3030 H264Context h;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3031 memset(&h, 0, sizeof(H264Context));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3032
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3033 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3034 int zeros= i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3035 int nal_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3036 int consumed;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3037 int out_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3038 uint8_t *out;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3039 int j;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3040
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3041 for(j=0; j<COUNT; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3042 bitstream[j]= (random() % 255) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3043 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3044
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3045 for(j=0; j<zeros; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3046 int pos= random() % COUNT;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3047 while(bitstream[pos] == 0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3048 pos++;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3049 pos %= COUNT;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3050 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3051 bitstream[pos]=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3052 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3053
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3054 START_TIMER
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3055
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3056 nal_length= encode_nal(&h, nal, bitstream, COUNT, COUNT*2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3057 if(nal_length<0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3058 printf("encoding failed\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3059 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3060 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3061
8996
e65778184ded Make the following H264 functions available to the parser:
cehoyos
parents: 8991
diff changeset
3062 out= ff_h264_decode_nal(&h, nal, &out_length, &consumed, nal_length);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3063
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3064 STOP_TIMER("NAL")
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3065
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3066 if(out_length != COUNT){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3067 printf("incorrect length %d %d\n", out_length, COUNT);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3068 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3069 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3070
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3071 if(consumed != nal_length){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3072 printf("incorrect consumed length %d %d\n", nal_length, consumed);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3073 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3074 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3075
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3076 if(memcmp(bitstream, out, COUNT)){
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5106
diff changeset
3077 printf("mismatch\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3078 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3079 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3080 }
6172
13aa4cac4dde Add #undef printf and disable non-functional code to make test program compile.
diego
parents: 6164
diff changeset
3081 #endif
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3082
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3083 printf("Testing RBSP\n");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3084
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3085
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3086 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3087 }
6164
ecaf5226e9b0 Consistently use TEST as the preprocessor condition to enable test code.
diego
parents: 6046
diff changeset
3088 #endif /* TEST */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3089
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3090
9384
828d15d322ed Add forgotten void return type to ff_h264_free_context
reimar
parents: 9380
diff changeset
3091 av_cold void ff_h264_free_context(H264Context *h)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3092 {
7923
2c15748c530a Do not free sps & pps on width/height changes.
michael
parents: 7921
diff changeset
3093 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3094
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3095 free_tables(h); //FIXME cleanup init stuff perhaps
7923
2c15748c530a Do not free sps & pps on width/height changes.
michael
parents: 7921
diff changeset
3096
2c15748c530a Do not free sps & pps on width/height changes.
michael
parents: 7921
diff changeset
3097 for(i = 0; i < MAX_SPS_COUNT; i++)
2c15748c530a Do not free sps & pps on width/height changes.
michael
parents: 7921
diff changeset
3098 av_freep(h->sps_buffers + i);
2c15748c530a Do not free sps & pps on width/height changes.
michael
parents: 7921
diff changeset
3099
2c15748c530a Do not free sps & pps on width/height changes.
michael
parents: 7921
diff changeset
3100 for(i = 0; i < MAX_PPS_COUNT; i++)
2c15748c530a Do not free sps & pps on width/height changes.
michael
parents: 7921
diff changeset
3101 av_freep(h->pps_buffers + i);
9380
54e650136c87 Add a ff_h264_free_context function and call it from the H.264 parser.
reimar
parents: 9355
diff changeset
3102 }
54e650136c87 Add a ff_h264_free_context function and call it from the H.264 parser.
reimar
parents: 9355
diff changeset
3103
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
3104 av_cold int ff_h264_decode_end(AVCodecContext *avctx)
9380
54e650136c87 Add a ff_h264_free_context function and call it from the H.264 parser.
reimar
parents: 9355
diff changeset
3105 {
54e650136c87 Add a ff_h264_free_context function and call it from the H.264 parser.
reimar
parents: 9355
diff changeset
3106 H264Context *h = avctx->priv_data;
54e650136c87 Add a ff_h264_free_context function and call it from the H.264 parser.
reimar
parents: 9355
diff changeset
3107 MpegEncContext *s = &h->s;
54e650136c87 Add a ff_h264_free_context function and call it from the H.264 parser.
reimar
parents: 9355
diff changeset
3108
54e650136c87 Add a ff_h264_free_context function and call it from the H.264 parser.
reimar
parents: 9355
diff changeset
3109 ff_h264_free_context(h);
7923
2c15748c530a Do not free sps & pps on width/height changes.
michael
parents: 7921
diff changeset
3110
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3111 MPV_common_end(s);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3112
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3113 // memset(h, 0, sizeof(H264Context));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3114
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3115 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3116 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3117
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3118
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3119 AVCodec h264_decoder = {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3120 "h264",
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3121 CODEC_TYPE_VIDEO,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3122 CODEC_ID_H264,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3123 sizeof(H264Context),
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
3124 ff_h264_decode_init,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3125 NULL,
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
3126 ff_h264_decode_end,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3127 decode_frame,
7359
1980cae356ad Remove truncated support, use an AVParser if you used that, it is the same.
michael
parents: 7358
diff changeset
3128 /*CODEC_CAP_DRAW_HORIZ_BAND |*/ CODEC_CAP_DR1 | CODEC_CAP_DELAY,
2640
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3129 .flush= flush_dpb,
7040
e943e1409077 Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents: 6933
diff changeset
3130 .long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"),
9066
77cbbce1be94 Add hardware acceleration hooks to H.264.
benoit
parents: 9065
diff changeset
3131 .pix_fmts= ff_hwaccel_pixfmt_list_420,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3132 };
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3133
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8565
diff changeset
3134 #if CONFIG_H264_VDPAU_DECODER
8522
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
3135 AVCodec h264_vdpau_decoder = {
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
3136 "h264_vdpau",
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
3137 CODEC_TYPE_VIDEO,
8610
2ca51be7dad8 Remove CODEC_ID_H264_VDPAU.
cehoyos
parents: 8596
diff changeset
3138 CODEC_ID_H264,
8522
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
3139 sizeof(H264Context),
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
3140 ff_h264_decode_init,
8522
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
3141 NULL,
10852
86d7ab878805 Get rid of #include "svq3.c"
michael
parents: 10837
diff changeset
3142 ff_h264_decode_end,
8522
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
3143 decode_frame,
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
3144 CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_HWACCEL_VDPAU,
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
3145 .flush= flush_dpb,
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
3146 .long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10 (VDPAU acceleration)"),
10512
6ec7b5450ca7 Add .pix_fmts to H264 VDPAU decoder declaration and remove obsolete test
cehoyos
parents: 10511
diff changeset
3147 .pix_fmts = (const enum PixelFormat[]){PIX_FMT_VDPAU_H264, PIX_FMT_NONE},
8522
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
3148 };
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8456
diff changeset
3149 #endif