Add size that is needed for the wmapro codec

[ffmpeg] / libavcodec / libx264.c

diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index c9df820f5d851fbcf14acb779086ceb600e05d17..d82756b62f75b65d9bcfdf2ffdcd0f2d6959b6b3 100644 (file)
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -1,6 +1,6 @@
 /*
  * H.264 encoding using the x264 library
- * Copyright (C) 2005  Mans Rullgard <mru@inprovide.com>
+ * Copyright (C) 2005  Mans Rullgard <mans@mansr.com>
  *
  * This file is part of FFmpeg.
  *
@@ -38,7 +38,7 @@ X264_log(void *p, int level, const char *fmt, va_list args)
 {
     static const int level_map[] = {
         [X264_LOG_ERROR]   = AV_LOG_ERROR,
-        [X264_LOG_WARNING] = AV_LOG_ERROR,
+        [X264_LOG_WARNING] = AV_LOG_WARNING,
         [X264_LOG_INFO]    = AV_LOG_INFO,
         [X264_LOG_DEBUG]   = AV_LOG_DEBUG
     };
@@ -119,18 +119,20 @@ X264_frame(AVCodecContext *ctx, uint8_t *buf, int bufsize, void *data)
     return bufsize;
 }
 
-static int
+static av_cold int
 X264_close(AVCodecContext *avctx)
 {
     X264Context *x4 = avctx->priv_data;
 
+    av_freep(&avctx->extradata);
+
     if(x4->enc)
         x264_encoder_close(x4->enc);
 
     return 0;
 }
 
-static int
+static av_cold int
 X264_init(AVCodecContext *avctx)
 {
     X264Context *x4 = avctx->priv_data;
@@ -144,7 +146,7 @@ X264_init(AVCodecContext *avctx)
     x4->params.rc.i_bitrate = avctx->bit_rate / 1000;
     x4->params.rc.i_vbv_buffer_size = avctx->rc_buffer_size / 1000;
     x4->params.rc.i_vbv_max_bitrate = avctx->rc_max_rate / 1000;
-    x4->params.rc.b_stat_write = (avctx->flags & CODEC_FLAG_PASS1);
+    x4->params.rc.b_stat_write = avctx->flags & CODEC_FLAG_PASS1;
     if(avctx->flags & CODEC_FLAG_PASS2) x4->params.rc.b_stat_read = 1;
     else{
         if(avctx->crf){
@@ -162,10 +164,10 @@ X264_init(AVCodecContext *avctx)
 
     x4->params.i_bframe = avctx->max_b_frames;
     x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC;
-    x4->params.b_bframe_adaptive = avctx->b_frame_strategy;
+    x4->params.i_bframe_adaptive = avctx->b_frame_strategy;
     x4->params.i_bframe_bias = avctx->bframebias;
-    x4->params.b_bframe_pyramid = (avctx->flags2 & CODEC_FLAG2_BPYRAMID);
-    avctx->has_b_frames= (avctx->flags2 & CODEC_FLAG2_BPYRAMID) ? 2 : !!avctx->max_b_frames;
+    x4->params.b_bframe_pyramid = avctx->flags2 & CODEC_FLAG2_BPYRAMID;
+    avctx->has_b_frames= avctx->flags2 & CODEC_FLAG2_BPYRAMID ? 2 : !!avctx->max_b_frames;
 
     x4->params.i_keyint_min = avctx->keyint_min;
     if(x4->params.i_keyint_min > x4->params.i_keyint_max)
@@ -173,7 +175,7 @@ X264_init(AVCodecContext *avctx)
 
     x4->params.i_scenecut_threshold = avctx->scenechange_threshold;
 
-    x4->params.b_deblocking_filter = (avctx->flags & CODEC_FLAG_LOOP_FILTER);
+    x4->params.b_deblocking_filter = avctx->flags & CODEC_FLAG_LOOP_FILTER;
     x4->params.i_deblocking_filter_alphac0 = avctx->deblockalpha;
     x4->params.i_deblocking_filter_beta = avctx->deblockbeta;
 
@@ -210,7 +212,7 @@ X264_init(AVCodecContext *avctx)
 
     x4->params.analyse.i_direct_mv_pred = avctx->directpred;
 
-    x4->params.analyse.b_weighted_bipred = (avctx->flags2 & CODEC_FLAG2_WPRED);
+    x4->params.analyse.b_weighted_bipred = avctx->flags2 & CODEC_FLAG2_WPRED;
 
     if(avctx->me_method == ME_EPZS)
         x4->params.analyse.i_me_method = X264_ME_DIA;
@@ -220,18 +222,18 @@ X264_init(AVCodecContext *avctx)
         x4->params.analyse.i_me_method = X264_ME_UMH;
     else if(avctx->me_method == ME_FULL)
         x4->params.analyse.i_me_method = X264_ME_ESA;
+    else if(avctx->me_method == ME_TESA)
+        x4->params.analyse.i_me_method = X264_ME_TESA;
     else x4->params.analyse.i_me_method = X264_ME_HEX;
 
     x4->params.analyse.i_me_range = avctx->me_range;
     x4->params.analyse.i_subpel_refine = avctx->me_subpel_quality;
 
-    x4->params.analyse.b_bidir_me = (avctx->bidir_refine > 0);
-    x4->params.analyse.b_bframe_rdo = (avctx->flags2 & CODEC_FLAG2_BRDO);
     x4->params.analyse.b_mixed_references =
-        (avctx->flags2 & CODEC_FLAG2_MIXED_REFS);
-    x4->params.analyse.b_chroma_me = (avctx->me_cmp & FF_CMP_CHROMA);
-    x4->params.analyse.b_transform_8x8 = (avctx->flags2 & CODEC_FLAG2_8X8DCT);
-    x4->params.analyse.b_fast_pskip = (avctx->flags2 & CODEC_FLAG2_FASTPSKIP);
+        avctx->flags2 & CODEC_FLAG2_MIXED_REFS;
+    x4->params.analyse.b_chroma_me = avctx->me_cmp & FF_CMP_CHROMA;
+    x4->params.analyse.b_transform_8x8 = avctx->flags2 & CODEC_FLAG2_8X8DCT;
+    x4->params.analyse.b_fast_pskip = avctx->flags2 & CODEC_FLAG2_FASTPSKIP;
 
     x4->params.analyse.i_trellis = avctx->trellis;
     x4->params.analyse.i_noise_reduction = avctx->noise_reduction;
@@ -251,15 +253,16 @@ X264_init(AVCodecContext *avctx)
     x4->params.rc.f_ip_factor = 1/fabs(avctx->i_quant_factor);
     x4->params.rc.f_pb_factor = avctx->b_quant_factor;
     x4->params.analyse.i_chroma_qp_offset = avctx->chromaoffset;
-    x4->params.rc.psz_rc_eq = avctx->rc_eq;
 
-    x4->params.analyse.b_psnr = (avctx->flags & CODEC_FLAG_PSNR);
+    x4->params.analyse.b_psnr = avctx->flags & CODEC_FLAG_PSNR;
     x4->params.i_log_level = X264_LOG_DEBUG;
 
-    x4->params.b_aud = (avctx->flags2 & CODEC_FLAG2_AUD);
+    x4->params.b_aud = avctx->flags2 & CODEC_FLAG2_AUD;
 
     x4->params.i_threads = avctx->thread_count;
 
+    x4->params.b_interlaced = avctx->flags & CODEC_FLAG_INTERLACED_DCT;
+
     if(avctx->flags & CODEC_FLAG_GLOBAL_HEADER){
         x4->params.b_repeat_headers = 0;
     }
@@ -287,8 +290,8 @@ X264_init(AVCodecContext *avctx)
     return 0;
 }
 
-AVCodec x264_encoder = {
-    .name = "h264",
+AVCodec libx264_encoder = {
+    .name = "libx264",
     .type = CODEC_TYPE_VIDEO,
     .id = CODEC_ID_H264,
     .priv_data_size = sizeof(X264Context),
@@ -296,5 +299,6 @@ AVCodec x264_encoder = {
     .encode = X264_frame,
     .close = X264_close,
     .capabilities = CODEC_CAP_DELAY,
-    .pix_fmts = (enum PixelFormat[]) { PIX_FMT_YUV420P, -1 }
+    .pix_fmts = (enum PixelFormat[]) { PIX_FMT_YUV420P, PIX_FMT_NONE },
+    .long_name = NULL_IF_CONFIG_SMALL("libx264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"),
 };