Mercurial > libavcodec.hg
comparison libschroedingerenc.c @ 10056:646065f63290 libavcodec
Remove useless braces around if/for/while expressions.
| author | diego |
|---|---|
| date | Sat, 15 Aug 2009 11:12:47 +0000 |
| parents | fdb318d12314 |
| children | d18468c5fee0 |
comparison
equal
deleted
inserted
replaced
| 10055:fdb318d12314 | 10056:646065f63290 |
|---|---|
| 148 if (!avccontext->gop_size) { | 148 if (!avccontext->gop_size) { |
| 149 schro_encoder_setting_set_double (p_schro_params->encoder, | 149 schro_encoder_setting_set_double (p_schro_params->encoder, |
| 150 "gop_structure", | 150 "gop_structure", |
| 151 SCHRO_ENCODER_GOP_INTRA_ONLY); | 151 SCHRO_ENCODER_GOP_INTRA_ONLY); |
| 152 | 152 |
| 153 if (avccontext->coder_type == FF_CODER_TYPE_VLC) { | 153 if (avccontext->coder_type == FF_CODER_TYPE_VLC) |
| 154 schro_encoder_setting_set_double (p_schro_params->encoder, | 154 schro_encoder_setting_set_double (p_schro_params->encoder, |
| 155 "enable_noarith", 1); | 155 "enable_noarith", 1); |
| 156 } | |
| 157 } | 156 } |
| 158 else { | 157 else { |
| 159 schro_encoder_setting_set_double (p_schro_params->encoder, | 158 schro_encoder_setting_set_double (p_schro_params->encoder, |
| 160 "gop_structure", | 159 "gop_structure", |
| 161 SCHRO_ENCODER_GOP_BIREF); | 160 SCHRO_ENCODER_GOP_BIREF); |
| 192 "bitrate", | 191 "bitrate", |
| 193 avccontext->bit_rate); | 192 avccontext->bit_rate); |
| 194 | 193 |
| 195 } | 194 } |
| 196 | 195 |
| 197 if (avccontext->flags & CODEC_FLAG_INTERLACED_ME) { | 196 if (avccontext->flags & CODEC_FLAG_INTERLACED_ME) |
| 198 /* All material can be coded as interlaced or progressive | 197 /* All material can be coded as interlaced or progressive |
| 199 irrespective of the type of source material. */ | 198 irrespective of the type of source material. */ |
| 200 schro_encoder_setting_set_double (p_schro_params->encoder, | 199 schro_encoder_setting_set_double (p_schro_params->encoder, |
| 201 "interlaced_coding", 1); | 200 "interlaced_coding", 1); |
| 202 } | |
| 203 | 201 |
| 204 /* FIXME: Signal range hardcoded to 8-bit data until both libschroedinger | 202 /* FIXME: Signal range hardcoded to 8-bit data until both libschroedinger |
| 205 * and libdirac support other bit-depth data. */ | 203 * and libdirac support other bit-depth data. */ |
| 206 schro_video_format_set_std_signal_range(p_schro_params->format, | 204 schro_video_format_set_std_signal_range(p_schro_params->format, |
| 207 SCHRO_SIGNAL_RANGE_8BIT_VIDEO); | 205 SCHRO_SIGNAL_RANGE_8BIT_VIDEO); |
| 322 p_frame_output = av_mallocz(sizeof(FfmpegDiracSchroEncodedFrame)); | 320 p_frame_output = av_mallocz(sizeof(FfmpegDiracSchroEncodedFrame)); |
| 323 /* Set output data. */ | 321 /* Set output data. */ |
| 324 p_frame_output->size = p_schro_params->enc_buf_size; | 322 p_frame_output->size = p_schro_params->enc_buf_size; |
| 325 p_frame_output->p_encbuf = p_schro_params->enc_buf; | 323 p_frame_output->p_encbuf = p_schro_params->enc_buf; |
| 326 if (SCHRO_PARSE_CODE_IS_INTRA(parse_code) && | 324 if (SCHRO_PARSE_CODE_IS_INTRA(parse_code) && |
| 327 SCHRO_PARSE_CODE_IS_REFERENCE(parse_code)) { | 325 SCHRO_PARSE_CODE_IS_REFERENCE(parse_code)) |
| 328 p_frame_output->key_frame = 1; | 326 p_frame_output->key_frame = 1; |
| 329 } | |
| 330 | 327 |
| 331 /* Parse the coded frame number from the bitstream. Bytes 14 | 328 /* Parse the coded frame number from the bitstream. Bytes 14 |
| 332 * through 17 represesent the frame number. */ | 329 * through 17 represesent the frame number. */ |
| 333 p_frame_output->frame_num = (enc_buf->data[13] << 24) + | 330 p_frame_output->frame_num = (enc_buf->data[13] << 24) + |
| 334 (enc_buf->data[14] << 16) + | 331 (enc_buf->data[14] << 16) + |