Mercurial > libavcodec.hg
comparison libx264.c @ 10319:9e43db5ad7ef libavcodec
cosmetics: K&R coding style, prettyprinting
author | diego |
---|---|
date | Tue, 29 Sep 2009 18:03:30 +0000 |
parents | f397ad0fa67d |
children | f1d179ba9e7a |
comparison
equal
deleted
inserted
replaced
10318:6a21c6ca346f | 10319:9e43db5ad7ef |
---|---|
25 #include <stdio.h> | 25 #include <stdio.h> |
26 #include <stdlib.h> | 26 #include <stdlib.h> |
27 #include <string.h> | 27 #include <string.h> |
28 | 28 |
29 typedef struct X264Context { | 29 typedef struct X264Context { |
30 x264_param_t params; | 30 x264_param_t params; |
31 x264_t *enc; | 31 x264_t *enc; |
32 x264_picture_t pic; | 32 x264_picture_t pic; |
33 uint8_t *sei; | 33 uint8_t *sei; |
34 int sei_size; | 34 int sei_size; |
35 AVFrame out_pic; | 35 AVFrame out_pic; |
36 } X264Context; | 36 } X264Context; |
37 | 37 |
38 static void | 38 static void X264_log(void *p, int level, const char *fmt, va_list args) |
39 X264_log(void *p, int level, const char *fmt, va_list args) | |
40 { | 39 { |
41 static const int level_map[] = { | 40 static const int level_map[] = { |
42 [X264_LOG_ERROR] = AV_LOG_ERROR, | 41 [X264_LOG_ERROR] = AV_LOG_ERROR, |
43 [X264_LOG_WARNING] = AV_LOG_WARNING, | 42 [X264_LOG_WARNING] = AV_LOG_WARNING, |
44 [X264_LOG_INFO] = AV_LOG_INFO, | 43 [X264_LOG_INFO] = AV_LOG_INFO, |
45 [X264_LOG_DEBUG] = AV_LOG_DEBUG | 44 [X264_LOG_DEBUG] = AV_LOG_DEBUG |
46 }; | 45 }; |
47 | 46 |
48 if(level < 0 || level > X264_LOG_DEBUG) | 47 if (level < 0 || level > X264_LOG_DEBUG) |
49 return; | 48 return; |
50 | 49 |
51 av_vlog(p, level_map[level], fmt, args); | 50 av_vlog(p, level_map[level], fmt, args); |
52 } | 51 } |
53 | 52 |
54 | 53 |
55 static int encode_nals(AVCodecContext *ctx, uint8_t *buf, int size, x264_nal_t *nals, int nnal, int skip_sei) | 54 static int encode_nals(AVCodecContext *ctx, uint8_t *buf, int size, |
55 x264_nal_t *nals, int nnal, int skip_sei) | |
56 { | 56 { |
57 X264Context *x4 = ctx->priv_data; | 57 X264Context *x4 = ctx->priv_data; |
58 uint8_t *p = buf; | 58 uint8_t *p = buf; |
59 int i; | 59 int i; |
60 | 60 |
61 /* Write the SEI as part of the first frame. */ | 61 /* Write the SEI as part of the first frame. */ |
62 if(x4->sei_size > 0 && nnal > 0){ | 62 if (x4->sei_size > 0 && nnal > 0) { |
63 memcpy(p, x4->sei, x4->sei_size); | 63 memcpy(p, x4->sei, x4->sei_size); |
64 p += x4->sei_size; | 64 p += x4->sei_size; |
65 x4->sei_size = 0; | 65 x4->sei_size = 0; |
66 } | 66 } |
67 | 67 |
68 for(i = 0; i < nnal; i++){ | 68 for (i = 0; i < nnal; i++){ |
69 /* Don't put the SEI in extradata. */ | 69 /* Don't put the SEI in extradata. */ |
70 if(skip_sei && nals[i].i_type == NAL_SEI){ | 70 if (skip_sei && nals[i].i_type == NAL_SEI) { |
71 x4->sei_size = nals[i].i_payload; | 71 x4->sei_size = nals[i].i_payload; |
72 x4->sei = av_malloc(x4->sei_size); | 72 x4->sei = av_malloc(x4->sei_size); |
73 memcpy(x4->sei, nals[i].p_payload, nals[i].i_payload); | 73 memcpy(x4->sei, nals[i].p_payload, nals[i].i_payload); |
74 continue; | 74 continue; |
75 } | 75 } |
76 memcpy(p, nals[i].p_payload, nals[i].i_payload); | 76 memcpy(p, nals[i].p_payload, nals[i].i_payload); |
77 p += nals[i].i_payload; | 77 p += nals[i].i_payload; |
78 } | 78 } |
79 | 79 |
80 return p - buf; | 80 return p - buf; |
81 } | 81 } |
82 | 82 |
83 static int | 83 static int X264_frame(AVCodecContext *ctx, uint8_t *buf, |
84 X264_frame(AVCodecContext *ctx, uint8_t *buf, int bufsize, void *data) | 84 int bufsize, void *data) |
85 { | 85 { |
86 X264Context *x4 = ctx->priv_data; | 86 X264Context *x4 = ctx->priv_data; |
87 AVFrame *frame = data; | 87 AVFrame *frame = data; |
88 x264_nal_t *nal; | 88 x264_nal_t *nal; |
89 int nnal, i; | 89 int nnal, i; |
90 x264_picture_t pic_out; | 90 x264_picture_t pic_out; |
91 | 91 |
92 x4->pic.img.i_csp = X264_CSP_I420; | 92 x4->pic.img.i_csp = X264_CSP_I420; |
93 x4->pic.img.i_plane = 3; | 93 x4->pic.img.i_plane = 3; |
94 | 94 |
95 if(frame){ | 95 if (frame) { |
96 for(i = 0; i < 3; i++){ | 96 for (i = 0; i < 3; i++) { |
97 x4->pic.img.plane[i] = frame->data[i]; | 97 x4->pic.img.plane[i] = frame->data[i]; |
98 x4->pic.img.i_stride[i] = frame->linesize[i]; | 98 x4->pic.img.i_stride[i] = frame->linesize[i]; |
99 } | 99 } |
100 | 100 |
101 x4->pic.i_pts = frame->pts; | 101 x4->pic.i_pts = frame->pts; |
102 x4->pic.i_type = X264_TYPE_AUTO; | 102 x4->pic.i_type = X264_TYPE_AUTO; |
103 } | 103 } |
104 | 104 |
105 if(x264_encoder_encode(x4->enc, &nal, &nnal, frame? &x4->pic: NULL, &pic_out) < 0) | 105 if (x264_encoder_encode(x4->enc, &nal, &nnal, frame? &x4->pic: NULL, &pic_out) < 0) |
106 return -1; | 106 return -1; |
107 | 107 |
108 bufsize = encode_nals(ctx, buf, bufsize, nal, nnal, 0); | 108 bufsize = encode_nals(ctx, buf, bufsize, nal, nnal, 0); |
109 if(bufsize < 0) | 109 if (bufsize < 0) |
110 return -1; | 110 return -1; |
111 | 111 |
112 /* FIXME: dts */ | 112 /* FIXME: dts */ |
113 x4->out_pic.pts = pic_out.i_pts; | 113 x4->out_pic.pts = pic_out.i_pts; |
114 | 114 |
115 switch(pic_out.i_type){ | 115 switch (pic_out.i_type) { |
116 case X264_TYPE_IDR: | 116 case X264_TYPE_IDR: |
117 case X264_TYPE_I: | 117 case X264_TYPE_I: |
118 x4->out_pic.pict_type = FF_I_TYPE; | 118 x4->out_pic.pict_type = FF_I_TYPE; |
119 break; | 119 break; |
120 case X264_TYPE_P: | 120 case X264_TYPE_P: |
125 x4->out_pic.pict_type = FF_B_TYPE; | 125 x4->out_pic.pict_type = FF_B_TYPE; |
126 break; | 126 break; |
127 } | 127 } |
128 | 128 |
129 x4->out_pic.key_frame = pic_out.i_type == X264_TYPE_IDR; | 129 x4->out_pic.key_frame = pic_out.i_type == X264_TYPE_IDR; |
130 x4->out_pic.quality = (pic_out.i_qpplus1 - 1) * FF_QP2LAMBDA; | 130 x4->out_pic.quality = (pic_out.i_qpplus1 - 1) * FF_QP2LAMBDA; |
131 | 131 |
132 return bufsize; | 132 return bufsize; |
133 } | 133 } |
134 | 134 |
135 static av_cold int | 135 static av_cold int X264_close(AVCodecContext *avctx) |
136 X264_close(AVCodecContext *avctx) | |
137 { | 136 { |
138 X264Context *x4 = avctx->priv_data; | 137 X264Context *x4 = avctx->priv_data; |
139 | 138 |
140 av_freep(&avctx->extradata); | 139 av_freep(&avctx->extradata); |
141 av_free(x4->sei); | 140 av_free(x4->sei); |
142 | 141 |
143 if(x4->enc) | 142 if (x4->enc) |
144 x264_encoder_close(x4->enc); | 143 x264_encoder_close(x4->enc); |
145 | 144 |
146 return 0; | 145 return 0; |
147 } | 146 } |
148 | 147 |
149 static av_cold int | 148 static av_cold int X264_init(AVCodecContext *avctx) |
150 X264_init(AVCodecContext *avctx) | |
151 { | 149 { |
152 X264Context *x4 = avctx->priv_data; | 150 X264Context *x4 = avctx->priv_data; |
153 | 151 |
154 x4->sei_size = 0; | 152 x4->sei_size = 0; |
155 x264_param_default(&x4->params); | 153 x264_param_default(&x4->params); |
156 | 154 |
157 x4->params.pf_log = X264_log; | 155 x4->params.pf_log = X264_log; |
158 x4->params.p_log_private = avctx; | 156 x4->params.p_log_private = avctx; |
159 | 157 |
160 x4->params.i_keyint_max = avctx->gop_size; | 158 x4->params.i_keyint_max = avctx->gop_size; |
161 x4->params.rc.i_bitrate = avctx->bit_rate / 1000; | 159 x4->params.rc.i_bitrate = avctx->bit_rate / 1000; |
162 x4->params.rc.i_vbv_buffer_size = avctx->rc_buffer_size / 1000; | 160 x4->params.rc.i_vbv_buffer_size = avctx->rc_buffer_size / 1000; |
163 x4->params.rc.i_vbv_max_bitrate = avctx->rc_max_rate / 1000; | 161 x4->params.rc.i_vbv_max_bitrate = avctx->rc_max_rate / 1000; |
164 x4->params.rc.b_stat_write = avctx->flags & CODEC_FLAG_PASS1; | 162 x4->params.rc.b_stat_write = avctx->flags & CODEC_FLAG_PASS1; |
165 if(avctx->flags & CODEC_FLAG_PASS2) x4->params.rc.b_stat_read = 1; | 163 if (avctx->flags & CODEC_FLAG_PASS2) { |
166 else{ | 164 x4->params.rc.b_stat_read = 1; |
167 if(avctx->crf){ | 165 } else { |
168 x4->params.rc.i_rc_method = X264_RC_CRF; | 166 if (avctx->crf) { |
167 x4->params.rc.i_rc_method = X264_RC_CRF; | |
169 x4->params.rc.f_rf_constant = avctx->crf; | 168 x4->params.rc.f_rf_constant = avctx->crf; |
170 }else if(avctx->cqp > -1){ | 169 } else if (avctx->cqp > -1) { |
171 x4->params.rc.i_rc_method = X264_RC_CQP; | 170 x4->params.rc.i_rc_method = X264_RC_CQP; |
172 x4->params.rc.i_qp_constant = avctx->cqp; | 171 x4->params.rc.i_qp_constant = avctx->cqp; |
173 } | 172 } |
174 } | 173 } |
175 | 174 |
176 // if neither crf nor cqp modes are selected we have to enable the RC | 175 // if neither crf nor cqp modes are selected we have to enable the RC |
177 // we do it this way because we cannot check if the bitrate has been set | 176 // we do it this way because we cannot check if the bitrate has been set |
178 if(!(avctx->crf || (avctx->cqp > -1))) x4->params.rc.i_rc_method = X264_RC_ABR; | 177 if (!(avctx->crf || (avctx->cqp > -1))) |
179 | 178 x4->params.rc.i_rc_method = X264_RC_ABR; |
180 x4->params.i_bframe = avctx->max_b_frames; | 179 |
181 x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC; | 180 x4->params.i_bframe = avctx->max_b_frames; |
181 x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC; | |
182 x4->params.i_bframe_adaptive = avctx->b_frame_strategy; | 182 x4->params.i_bframe_adaptive = avctx->b_frame_strategy; |
183 x4->params.i_bframe_bias = avctx->bframebias; | 183 x4->params.i_bframe_bias = avctx->bframebias; |
184 x4->params.b_bframe_pyramid = avctx->flags2 & CODEC_FLAG2_BPYRAMID; | 184 x4->params.b_bframe_pyramid = avctx->flags2 & CODEC_FLAG2_BPYRAMID; |
185 avctx->has_b_frames= avctx->flags2 & CODEC_FLAG2_BPYRAMID ? 2 : !!avctx->max_b_frames; | 185 avctx->has_b_frames = avctx->flags2 & CODEC_FLAG2_BPYRAMID ? 2 : !!avctx->max_b_frames; |
186 | 186 |
187 x4->params.i_keyint_min = avctx->keyint_min; | 187 x4->params.i_keyint_min = avctx->keyint_min; |
188 if(x4->params.i_keyint_min > x4->params.i_keyint_max) | 188 if (x4->params.i_keyint_min > x4->params.i_keyint_max) |
189 x4->params.i_keyint_min = x4->params.i_keyint_max; | 189 x4->params.i_keyint_min = x4->params.i_keyint_max; |
190 | 190 |
191 x4->params.i_scenecut_threshold = avctx->scenechange_threshold; | 191 x4->params.i_scenecut_threshold = avctx->scenechange_threshold; |
192 | 192 |
193 x4->params.b_deblocking_filter = avctx->flags & CODEC_FLAG_LOOP_FILTER; | 193 x4->params.b_deblocking_filter = avctx->flags & CODEC_FLAG_LOOP_FILTER; |
194 x4->params.i_deblocking_filter_alphac0 = avctx->deblockalpha; | 194 x4->params.i_deblocking_filter_alphac0 = avctx->deblockalpha; |
195 x4->params.i_deblocking_filter_beta = avctx->deblockbeta; | 195 x4->params.i_deblocking_filter_beta = avctx->deblockbeta; |
196 | 196 |
197 x4->params.rc.i_qp_min = avctx->qmin; | 197 x4->params.rc.i_qp_min = avctx->qmin; |
198 x4->params.rc.i_qp_max = avctx->qmax; | 198 x4->params.rc.i_qp_max = avctx->qmax; |
199 x4->params.rc.i_qp_step = avctx->max_qdiff; | 199 x4->params.rc.i_qp_step = avctx->max_qdiff; |
200 | 200 |
201 x4->params.rc.f_qcompress = avctx->qcompress; /* 0.0 => cbr, 1.0 => constant qp */ | 201 x4->params.rc.f_qcompress = avctx->qcompress; /* 0.0 => cbr, 1.0 => constant qp */ |
202 x4->params.rc.f_qblur = avctx->qblur; /* temporally blur quants */ | 202 x4->params.rc.f_qblur = avctx->qblur; /* temporally blur quants */ |
203 x4->params.rc.f_complexity_blur = avctx->complexityblur; | 203 x4->params.rc.f_complexity_blur = avctx->complexityblur; |
204 | 204 |
205 x4->params.i_frame_reference = avctx->refs; | 205 x4->params.i_frame_reference = avctx->refs; |
206 | 206 |
207 x4->params.i_width = avctx->width; | 207 x4->params.i_width = avctx->width; |
208 x4->params.i_height = avctx->height; | 208 x4->params.i_height = avctx->height; |
209 x4->params.vui.i_sar_width = avctx->sample_aspect_ratio.num; | 209 x4->params.vui.i_sar_width = avctx->sample_aspect_ratio.num; |
210 x4->params.vui.i_sar_height = avctx->sample_aspect_ratio.den; | 210 x4->params.vui.i_sar_height = avctx->sample_aspect_ratio.den; |
211 x4->params.i_fps_num = avctx->time_base.den; | 211 x4->params.i_fps_num = avctx->time_base.den; |
212 x4->params.i_fps_den = avctx->time_base.num; | 212 x4->params.i_fps_den = avctx->time_base.num; |
213 | 213 |
214 x4->params.analyse.inter = 0; | 214 x4->params.analyse.inter = 0; |
215 if(avctx->partitions){ | 215 if (avctx->partitions) { |
216 if(avctx->partitions & X264_PART_I4X4) | 216 if (avctx->partitions & X264_PART_I4X4) |
217 x4->params.analyse.inter |= X264_ANALYSE_I4x4; | 217 x4->params.analyse.inter |= X264_ANALYSE_I4x4; |
218 if(avctx->partitions & X264_PART_I8X8) | 218 if (avctx->partitions & X264_PART_I8X8) |
219 x4->params.analyse.inter |= X264_ANALYSE_I8x8; | 219 x4->params.analyse.inter |= X264_ANALYSE_I8x8; |
220 if(avctx->partitions & X264_PART_P8X8) | 220 if (avctx->partitions & X264_PART_P8X8) |
221 x4->params.analyse.inter |= X264_ANALYSE_PSUB16x16; | 221 x4->params.analyse.inter |= X264_ANALYSE_PSUB16x16; |
222 if(avctx->partitions & X264_PART_P4X4) | 222 if (avctx->partitions & X264_PART_P4X4) |
223 x4->params.analyse.inter |= X264_ANALYSE_PSUB8x8; | 223 x4->params.analyse.inter |= X264_ANALYSE_PSUB8x8; |
224 if(avctx->partitions & X264_PART_B8X8) | 224 if (avctx->partitions & X264_PART_B8X8) |
225 x4->params.analyse.inter |= X264_ANALYSE_BSUB16x16; | 225 x4->params.analyse.inter |= X264_ANALYSE_BSUB16x16; |
226 } | 226 } |
227 | 227 |
228 x4->params.analyse.i_direct_mv_pred = avctx->directpred; | 228 x4->params.analyse.i_direct_mv_pred = avctx->directpred; |
229 | 229 |
230 x4->params.analyse.b_weighted_bipred = avctx->flags2 & CODEC_FLAG2_WPRED; | 230 x4->params.analyse.b_weighted_bipred = avctx->flags2 & CODEC_FLAG2_WPRED; |
231 | 231 |
232 if(avctx->me_method == ME_EPZS) | 232 if (avctx->me_method == ME_EPZS) |
233 x4->params.analyse.i_me_method = X264_ME_DIA; | 233 x4->params.analyse.i_me_method = X264_ME_DIA; |
234 else if(avctx->me_method == ME_HEX) | 234 else if (avctx->me_method == ME_HEX) |
235 x4->params.analyse.i_me_method = X264_ME_HEX; | 235 x4->params.analyse.i_me_method = X264_ME_HEX; |
236 else if(avctx->me_method == ME_UMH) | 236 else if (avctx->me_method == ME_UMH) |
237 x4->params.analyse.i_me_method = X264_ME_UMH; | 237 x4->params.analyse.i_me_method = X264_ME_UMH; |
238 else if(avctx->me_method == ME_FULL) | 238 else if (avctx->me_method == ME_FULL) |
239 x4->params.analyse.i_me_method = X264_ME_ESA; | 239 x4->params.analyse.i_me_method = X264_ME_ESA; |
240 else if(avctx->me_method == ME_TESA) | 240 else if (avctx->me_method == ME_TESA) |
241 x4->params.analyse.i_me_method = X264_ME_TESA; | 241 x4->params.analyse.i_me_method = X264_ME_TESA; |
242 else x4->params.analyse.i_me_method = X264_ME_HEX; | 242 else x4->params.analyse.i_me_method = X264_ME_HEX; |
243 | 243 |
244 x4->params.analyse.i_me_range = avctx->me_range; | 244 x4->params.analyse.i_me_range = avctx->me_range; |
245 x4->params.analyse.i_subpel_refine = avctx->me_subpel_quality; | 245 x4->params.analyse.i_subpel_refine = avctx->me_subpel_quality; |
246 | 246 |
247 x4->params.analyse.b_mixed_references = | 247 x4->params.analyse.b_mixed_references = avctx->flags2 & CODEC_FLAG2_MIXED_REFS; |
248 avctx->flags2 & CODEC_FLAG2_MIXED_REFS; | 248 x4->params.analyse.b_chroma_me = avctx->me_cmp & FF_CMP_CHROMA; |
249 x4->params.analyse.b_chroma_me = avctx->me_cmp & FF_CMP_CHROMA; | 249 x4->params.analyse.b_transform_8x8 = avctx->flags2 & CODEC_FLAG2_8X8DCT; |
250 x4->params.analyse.b_transform_8x8 = avctx->flags2 & CODEC_FLAG2_8X8DCT; | 250 x4->params.analyse.b_fast_pskip = avctx->flags2 & CODEC_FLAG2_FASTPSKIP; |
251 x4->params.analyse.b_fast_pskip = avctx->flags2 & CODEC_FLAG2_FASTPSKIP; | 251 |
252 | 252 x4->params.analyse.i_trellis = avctx->trellis; |
253 x4->params.analyse.i_trellis = avctx->trellis; | 253 x4->params.analyse.i_noise_reduction = avctx->noise_reduction; |
254 x4->params.analyse.i_noise_reduction = avctx->noise_reduction; | 254 |
255 | 255 if (avctx->level > 0) |
256 if(avctx->level > 0) x4->params.i_level_idc = avctx->level; | 256 x4->params.i_level_idc = avctx->level; |
257 | 257 |
258 x4->params.rc.f_rate_tolerance = | 258 x4->params.rc.f_rate_tolerance = |
259 (float)avctx->bit_rate_tolerance/avctx->bit_rate; | 259 (float)avctx->bit_rate_tolerance/avctx->bit_rate; |
260 | 260 |
261 if((avctx->rc_buffer_size != 0) && | 261 if ((avctx->rc_buffer_size != 0) && |
262 (avctx->rc_initial_buffer_occupancy <= avctx->rc_buffer_size)){ | 262 (avctx->rc_initial_buffer_occupancy <= avctx->rc_buffer_size)) { |
263 x4->params.rc.f_vbv_buffer_init = | 263 x4->params.rc.f_vbv_buffer_init = |
264 (float)avctx->rc_initial_buffer_occupancy/avctx->rc_buffer_size; | 264 (float)avctx->rc_initial_buffer_occupancy / avctx->rc_buffer_size; |
265 } | 265 } else |
266 else x4->params.rc.f_vbv_buffer_init = 0.9; | 266 x4->params.rc.f_vbv_buffer_init = 0.9; |
267 | 267 |
268 x4->params.rc.f_ip_factor = 1/fabs(avctx->i_quant_factor); | 268 x4->params.rc.f_ip_factor = 1 / fabs(avctx->i_quant_factor); |
269 x4->params.rc.f_pb_factor = avctx->b_quant_factor; | 269 x4->params.rc.f_pb_factor = avctx->b_quant_factor; |
270 x4->params.analyse.i_chroma_qp_offset = avctx->chromaoffset; | 270 x4->params.analyse.i_chroma_qp_offset = avctx->chromaoffset; |
271 | 271 |
272 x4->params.analyse.b_psnr = avctx->flags & CODEC_FLAG_PSNR; | 272 x4->params.analyse.b_psnr = avctx->flags & CODEC_FLAG_PSNR; |
273 x4->params.i_log_level = X264_LOG_DEBUG; | 273 x4->params.i_log_level = X264_LOG_DEBUG; |
274 | 274 |
275 x4->params.b_aud = avctx->flags2 & CODEC_FLAG2_AUD; | 275 x4->params.b_aud = avctx->flags2 & CODEC_FLAG2_AUD; |
276 | 276 |
277 x4->params.i_threads = avctx->thread_count; | 277 x4->params.i_threads = avctx->thread_count; |
278 | 278 |
279 x4->params.b_interlaced = avctx->flags & CODEC_FLAG_INTERLACED_DCT; | 279 x4->params.b_interlaced = avctx->flags & CODEC_FLAG_INTERLACED_DCT; |
280 | 280 |
281 if(avctx->flags & CODEC_FLAG_GLOBAL_HEADER){ | 281 if (avctx->flags & CODEC_FLAG_GLOBAL_HEADER) |
282 x4->params.b_repeat_headers = 0; | 282 x4->params.b_repeat_headers = 0; |
283 } | |
284 | 283 |
285 x4->enc = x264_encoder_open(&x4->params); | 284 x4->enc = x264_encoder_open(&x4->params); |
286 if(!x4->enc) | 285 if (!x4->enc) |
287 return -1; | 286 return -1; |
288 | 287 |
289 avctx->coded_frame = &x4->out_pic; | 288 avctx->coded_frame = &x4->out_pic; |
290 | 289 |
291 if(avctx->flags & CODEC_FLAG_GLOBAL_HEADER){ | 290 if (avctx->flags & CODEC_FLAG_GLOBAL_HEADER) { |
292 x264_nal_t *nal; | 291 x264_nal_t *nal; |
293 int nnal, s; | 292 int nnal, s; |
294 | 293 |
295 s = x264_encoder_headers(x4->enc, &nal, &nnal); | 294 s = x264_encoder_headers(x4->enc, &nal, &nnal); |
296 | 295 |
297 avctx->extradata = av_malloc(s); | 296 avctx->extradata = av_malloc(s); |
298 avctx->extradata_size = encode_nals(avctx, avctx->extradata, s, nal, nnal, 1); | 297 avctx->extradata_size = encode_nals(avctx, avctx->extradata, s, nal, nnal, 1); |
299 } | 298 } |
300 | 299 |
301 return 0; | 300 return 0; |
302 } | 301 } |
303 | 302 |
304 AVCodec libx264_encoder = { | 303 AVCodec libx264_encoder = { |
305 .name = "libx264", | 304 .name = "libx264", |
306 .type = CODEC_TYPE_VIDEO, | 305 .type = CODEC_TYPE_VIDEO, |
307 .id = CODEC_ID_H264, | 306 .id = CODEC_ID_H264, |
308 .priv_data_size = sizeof(X264Context), | 307 .priv_data_size = sizeof(X264Context), |
309 .init = X264_init, | 308 .init = X264_init, |
310 .encode = X264_frame, | 309 .encode = X264_frame, |
311 .close = X264_close, | 310 .close = X264_close, |
312 .capabilities = CODEC_CAP_DELAY, | 311 .capabilities = CODEC_CAP_DELAY, |
313 .pix_fmts = (const enum PixelFormat[]) { PIX_FMT_YUV420P, PIX_FMT_NONE }, | 312 .pix_fmts = (const enum PixelFormat[]) { PIX_FMT_YUV420P, PIX_FMT_NONE }, |
314 .long_name = NULL_IF_CONFIG_SMALL("libx264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"), | 313 .long_name = NULL_IF_CONFIG_SMALL("libx264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"), |
315 }; | 314 }; |