In order to encode with Xvid, it is preferable to use Xvid directly.
---
configure | 7 -
doc/ffmpeg.texi | 4 +-
doc/general.texi | 4 +-
libavcodec/Makefile | 1 -
libavcodec/allcodecs.c | 1 -
libavcodec/avcodec.h | 1 -
libavcodec/libxvid_internal.h | 32 --
libavcodec/libxvid_rc.c | 148 --------
libavcodec/libxvidff.c | 823 -----------------------------------------
libavcodec/ratecontrol.c | 20 -
libavcodec/ratecontrol.h | 8 -
11 files changed, 3 insertions(+), 1046 deletions(-)
delete mode 100644 libavcodec/libxvid_internal.h
delete mode 100644 libavcodec/libxvid_rc.c
delete mode 100644 libavcodec/libxvidff.c
diff --git a/configure b/configure
index f5b4a5c..01bb5e4 100755
--- a/configure
+++ b/configure
@@ -185,8 +185,6 @@ External library support:
--enable-libvpx enable VP8 support via libvpx [no]
--enable-libx264 enable H.264 encoding via x264 [no]
--enable-libxavs enable AVS encoding via xavs [no]
- --enable-libxvid enable Xvid encoding via xvidcore,
- native MPEG-4/Xvid encoder exists [no]
--enable-mlib enable Sun medialib [no]
--enable-zlib enable zlib [autodetect]
@@ -946,7 +944,6 @@ CONFIG_LIST="
libvpx
libx264
libxavs
- libxvid
lpc
lsp
mdct
@@ -1405,7 +1402,6 @@ libvpx_decoder_deps="libvpx"
libvpx_encoder_deps="libvpx"
libx264_encoder_deps="libx264"
libxavs_encoder_deps="libxavs"
-libxvid_encoder_deps="libxvid"
# demuxers / muxers
ac3_demuxer_select="ac3_parser"
@@ -2530,7 +2526,6 @@ die_license_disabled() {
die_license_disabled gpl libx264
die_license_disabled gpl libxavs
-die_license_disabled gpl libxvid
die_license_disabled gpl x11grab
die_license_disabled nonfree libfaac
@@ -2873,7 +2868,6 @@ enabled libx264 && require libx264 x264.h
x264_encoder_encode -lx264 &&
{ check_cpp_condition x264.h "X264_BUILD >= 115" ||
die "ERROR: libx264 version must be >= 0.115."; }
enabled libxavs && require libxavs xavs.h xavs_encoder_encode -lxavs
-enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore
enabled mlib && require mediaLib mlib_types.h mlib_VectorSub_S16_U8_Mod
-lmlib
# libdc1394 check
@@ -3147,7 +3141,6 @@ echo "libvorbis enabled ${libvorbis-no}"
echo "libvpx enabled ${libvpx-no}"
echo "libx264 enabled ${libx264-no}"
echo "libxavs enabled ${libxavs-no}"
-echo "libxvid enabled ${libxvid-no}"
echo "zlib enabled ${zlib-no}"
echo "bzlib enabled ${bzlib-no}"
echo
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index cabf395..b5b3101 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -287,8 +287,8 @@ at the exact requested bitrate.
On pass 1, you may just deactivate audio and set output to null,
examples for Windows and Unix:
@example
-ffmpeg -i foo.mov -vcodec libxvid -pass 1 -an -f rawvideo -y NUL
-ffmpeg -i foo.mov -vcodec libxvid -pass 1 -an -f rawvideo -y /dev/null
+ffmpeg -i foo.mov -vcodec mpeg4 -pass 1 -an -f rawvideo -y NUL
+ffmpeg -i foo.mov -vcodec mpeg4 -pass 1 -an -f rawvideo -y /dev/null
@end example
@item -passlogfile @var{prefix}
diff --git a/doc/general.texi b/doc/general.texi
index 93f563e..d794e40 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -452,7 +452,6 @@ following image formats are supported:
@item MPEG-1/2 video (VDPAU acceleration) @tab @tab X
@item MPEG-2 video @tab X @tab X
@item MPEG-4 part 2 @tab X @tab X
- @ libxvidcore can be used alternatively for encoding.
@item MPEG-4 part 2 Microsoft variant version 1 @tab @tab X
@item MPEG-4 part 2 Microsoft variant version 2 @tab X @tab X
@item MPEG-4 part 2 Microsoft variant version 3 @tab X @tab X
@@ -1047,8 +1046,7 @@ These library packages are only available from Cygwin
Ports
@example
yasm, libSDL-devel, libdirac-devel, libfaac-devel, libgsm-devel,
-libmp3lame-devel, libschroedinger1.0-devel, speex-devel, libtheora-devel,
-libxvidcore-devel
+libmp3lame-devel, libschroedinger1.0-devel, speex-devel, libtheora-devel
@end example
The recommendation for libnut and x264 is to build them from source by
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index b781ed7..2c2c3f9 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -579,7 +579,6 @@ OBJS-$(CONFIG_LIBVPX_DECODER) += libvpxdec.o
OBJS-$(CONFIG_LIBVPX_ENCODER) += libvpxenc.o
OBJS-$(CONFIG_LIBX264_ENCODER) += libx264.o
OBJS-$(CONFIG_LIBXAVS_ENCODER) += libxavs.o
-OBJS-$(CONFIG_LIBXVID) += libxvidff.o libxvid_rc.o
# parsers
OBJS-$(CONFIG_AAC_PARSER) += aac_parser.o aac_ac3_parser.o \
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 71b6094..ae7a9b2 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -373,7 +373,6 @@ void avcodec_register_all(void)
REGISTER_ENCDEC (LIBVPX, libvpx);
REGISTER_ENCODER (LIBX264, libx264);
REGISTER_ENCODER (LIBXAVS, libxavs);
- REGISTER_ENCODER (LIBXVID, libxvid);
/* parsers */
REGISTER_PARSER (AAC, aac);
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index b26bac7..6d9e419 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1308,7 +1308,6 @@ typedef struct AVCodecContext {
/** obsolete FIXME remove */
int rc_strategy;
-#define FF_RC_STRATEGY_XVID 1
int b_frame_strategy;
diff --git a/libavcodec/libxvid_internal.h b/libavcodec/libxvid_internal.h
deleted file mode 100644
index a2dc6ef..0000000
--- a/libavcodec/libxvid_internal.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * copyright (C) 2006 Corey Hickey
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_LIBXVID_INTERNAL_H
-#define AVCODEC_LIBXVID_INTERNAL_H
-
-/**
- * @file
- * common functions for use with the Xvid wrappers
- */
-
-
-int ff_tempfile(const char *prefix, char **filename);
-
-#endif /* AVCODEC_LIBXVID_INTERNAL_H */
diff --git a/libavcodec/libxvid_rc.c b/libavcodec/libxvid_rc.c
deleted file mode 100644
index b4bc715..0000000
--- a/libavcodec/libxvid_rc.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Xvid rate control wrapper for lavc video encoders
- *
- * Copyright (c) 2006 Michael Niedermayer <[email protected]>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <xvid.h>
-#include <unistd.h>
-#include "avcodec.h"
-#include "libxvid_internal.h"
-//#include "dsputil.h"
-#include "mpegvideo.h"
-
-#undef NDEBUG
-#include <assert.h>
-
-extern unsigned int xvid_debug;
-
-int ff_xvid_rate_control_init(MpegEncContext *s){
- char *tmp_name;
- int fd, i;
- xvid_plg_create_t xvid_plg_create;
- xvid_plugin_2pass2_t xvid_2pass2;
-
-//xvid_debug=-1;
-
- fd=ff_tempfile("xvidrc.", &tmp_name);
- if (fd == -1) {
- av_log(NULL, AV_LOG_ERROR, "Can't create temporary pass2 file.\n");
- return -1;
- }
-
- for(i=0; i<s->rc_context.num_entries; i++){
- static const char *frame_types = " ipbs";
- char tmp[256];
- RateControlEntry *rce;
-
- rce= &s->rc_context.entry[i];
-
- snprintf(tmp, sizeof(tmp), "%c %d %d %d %d %d %d\n",
- frame_types[rce->pict_type], (int)lrintf(rce->qscale /
FF_QP2LAMBDA), rce->i_count, s->mb_num - rce->i_count - rce->skip_count,
- rce->skip_count, (rce->i_tex_bits + rce->p_tex_bits +
rce->misc_bits+7)/8, (rce->header_bits+rce->mv_bits+7)/8);
-
-//av_log(NULL, AV_LOG_ERROR, "%s\n", tmp);
- write(fd, tmp, strlen(tmp));
- }
-
- close(fd);
-
- memset(&xvid_2pass2, 0, sizeof(xvid_2pass2));
- xvid_2pass2.version= XVID_MAKE_VERSION(1,1,0);
- xvid_2pass2.filename= tmp_name;
- xvid_2pass2.bitrate= s->avctx->bit_rate;
- xvid_2pass2.vbv_size= s->avctx->rc_buffer_size;
- xvid_2pass2.vbv_maxrate= s->avctx->rc_max_rate;
- xvid_2pass2.vbv_initial= s->avctx->rc_initial_buffer_occupancy;
-
- memset(&xvid_plg_create, 0, sizeof(xvid_plg_create));
- xvid_plg_create.version= XVID_MAKE_VERSION(1,1,0);
- xvid_plg_create.fbase= s->avctx->time_base.den;
- xvid_plg_create.fincr= s->avctx->time_base.num;
- xvid_plg_create.param= &xvid_2pass2;
-
- if(xvid_plugin_2pass2(NULL, XVID_PLG_CREATE, &xvid_plg_create,
&s->rc_context.non_lavc_opaque)<0){
- av_log(NULL, AV_LOG_ERROR, "xvid_plugin_2pass2 failed\n");
- return -1;
- }
- return 0;
-}
-
-float ff_xvid_rate_estimate_qscale(MpegEncContext *s, int dry_run){
- xvid_plg_data_t xvid_plg_data;
-
- memset(&xvid_plg_data, 0, sizeof(xvid_plg_data));
- xvid_plg_data.version= XVID_MAKE_VERSION(1,1,0);
- xvid_plg_data.width = s->width;
- xvid_plg_data.height= s->height;
- xvid_plg_data.mb_width = s->mb_width;
- xvid_plg_data.mb_height= s->mb_height;
- xvid_plg_data.fbase= s->avctx->time_base.den;
- xvid_plg_data.fincr= s->avctx->time_base.num;
- xvid_plg_data.min_quant[0]= s->avctx->qmin;
- xvid_plg_data.min_quant[1]= s->avctx->qmin;
- xvid_plg_data.min_quant[2]= s->avctx->qmin; //FIXME i/b factor & offset
- xvid_plg_data.max_quant[0]= s->avctx->qmax;
- xvid_plg_data.max_quant[1]= s->avctx->qmax;
- xvid_plg_data.max_quant[2]= s->avctx->qmax; //FIXME i/b factor & offset
- xvid_plg_data.bquant_offset = 0; // 100 * s->avctx->b_quant_offset;
- xvid_plg_data.bquant_ratio = 100; // * s->avctx->b_quant_factor;
-
-#if 0
- xvid_plg_data.stats.hlength= X
-#endif
-
- if(!s->rc_context.dry_run_qscale){
- if(s->picture_number){
- xvid_plg_data.length=
- xvid_plg_data.stats.length= (s->frame_bits + 7)/8;
- xvid_plg_data.frame_num= s->rc_context.last_picture_number;
- xvid_plg_data.quant= s->qscale;
-
- xvid_plg_data.type= s->last_pict_type;
- if(xvid_plugin_2pass2(s->rc_context.non_lavc_opaque,
XVID_PLG_AFTER, &xvid_plg_data, NULL)){
- av_log(s->avctx, AV_LOG_ERROR, "xvid_plugin_2pass2(handle,
XVID_PLG_AFTER, ...) FAILED\n");
- return -1;
- }
- }
- s->rc_context.last_picture_number=
- xvid_plg_data.frame_num= s->picture_number;
- xvid_plg_data.quant= 0;
- if(xvid_plugin_2pass2(s->rc_context.non_lavc_opaque, XVID_PLG_BEFORE,
&xvid_plg_data, NULL)){
- av_log(s->avctx, AV_LOG_ERROR, "xvid_plugin_2pass2(handle,
XVID_PLG_BEFORE, ...) FAILED\n");
- return -1;
- }
- s->rc_context.dry_run_qscale= xvid_plg_data.quant;
- }
- xvid_plg_data.quant= s->rc_context.dry_run_qscale;
- if(!dry_run)
- s->rc_context.dry_run_qscale= 0;
-
- if(s->pict_type == AV_PICTURE_TYPE_B) //FIXME this is not exactly
identical to xvid
- return xvid_plg_data.quant * FF_QP2LAMBDA * s->avctx->b_quant_factor +
s->avctx->b_quant_offset;
- else
- return xvid_plg_data.quant * FF_QP2LAMBDA;
-}
-
-void ff_xvid_rate_control_uninit(MpegEncContext *s){
- xvid_plg_destroy_t xvid_plg_destroy;
-
- xvid_plugin_2pass2(s->rc_context.non_lavc_opaque, XVID_PLG_DESTROY,
&xvid_plg_destroy, NULL);
-}
-
diff --git a/libavcodec/libxvidff.c b/libavcodec/libxvidff.c
deleted file mode 100644
index fd0aea5..0000000
--- a/libavcodec/libxvidff.c
+++ /dev/null
@@ -1,823 +0,0 @@
-/*
- * Interface to xvidcore for mpeg4 encoding
- * Copyright (c) 2004 Adam Thayer <[email protected]>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * Interface to xvidcore for MPEG-4 compliant encoding.
- * @author Adam Thayer ([email protected])
- */
-
-#include <xvid.h>
-#include <unistd.h>
-#include "avcodec.h"
-#include "libavutil/cpu.h"
-#include "libavutil/intreadwrite.h"
-#include "libavutil/mathematics.h"
-#include "libxvid_internal.h"
-#if !HAVE_MKSTEMP
-#include <fcntl.h>
-#endif
-
-/**
- * Buffer management macros.
- */
-#define BUFFER_SIZE 1024
-#define BUFFER_REMAINING(x) (BUFFER_SIZE - strlen(x))
-#define BUFFER_CAT(x) (&((x)[strlen(x)]))
-
-/**
- * Structure for the private Xvid context.
- * This stores all the private context for the codec.
- */
-struct xvid_context {
- void *encoder_handle; /**< Handle for Xvid encoder */
- int xsize; /**< Frame x size */
- int ysize; /**< Frame y size */
- int vop_flags; /**< VOP flags for Xvid encoder */
- int vol_flags; /**< VOL flags for Xvid encoder */
- int me_flags; /**< Motion Estimation flags */
- int qscale; /**< Do we use constant scale? */
- int quicktime_format; /**< Are we in a QT-based format? */
- AVFrame encoded_picture; /**< Encoded frame information */
- char *twopassbuffer; /**< Character buffer for two-pass */
- char *old_twopassbuffer; /**< Old character buffer (two-pass) */
- char *twopassfile; /**< second pass temp file name */
- unsigned char *intra_matrix; /**< P-Frame Quant Matrix */
- unsigned char *inter_matrix; /**< I-Frame Quant Matrix */
-};
-
-/**
- * Structure for the private first-pass plugin.
- */
-struct xvid_ff_pass1 {
- int version; /**< Xvid version */
- struct xvid_context *context; /**< Pointer to private context */
-};
-
-/* Prototypes - See function implementation for details */
-int xvid_strip_vol_header(AVCodecContext *avctx, unsigned char *frame,
unsigned int header_len, unsigned int frame_len);
-int xvid_ff_2pass(void *ref, int opt, void *p1, void *p2);
-void xvid_correct_framerate(AVCodecContext *avctx);
-
-/* Wrapper to work around the lack of mkstemp() on mingw.
- * Also, tries to create file in /tmp first, if possible.
- * *prefix can be a character constant; *filename will be allocated internally.
- * @return file descriptor of opened file (or -1 on error)
- * and opened file name in **filename. */
-int ff_tempfile(const char *prefix, char **filename) {
- int fd=-1;
-#if !HAVE_MKSTEMP
- *filename = tempnam(".", prefix);
-#else
- size_t len = strlen(prefix) + 12; /* room for "/tmp/" and "XXXXXX\0" */
- *filename = av_malloc(len);
-#endif
- /* -----common section-----*/
- if (*filename == NULL) {
- av_log(NULL, AV_LOG_ERROR, "ff_tempfile: Cannot allocate file name\n");
- return -1;
- }
-#if !HAVE_MKSTEMP
- fd = open(*filename, O_RDWR | O_BINARY | O_CREAT, 0444);
-#else
- snprintf(*filename, len, "/tmp/%sXXXXXX", prefix);
- fd = mkstemp(*filename);
- if (fd < 0) {
- snprintf(*filename, len, "./%sXXXXXX", prefix);
- fd = mkstemp(*filename);
- }
-#endif
- /* -----common section-----*/
- if (fd < 0) {
- av_log(NULL, AV_LOG_ERROR, "ff_tempfile: Cannot open temporary file
%s\n", *filename);
- return -1;
- }
- return fd; /* success */
-}
-
-#if CONFIG_LIBXVID_ENCODER
-
-/**
- * Create the private context for the encoder.
- * All buffers are allocated, settings are loaded from the user,
- * and the encoder context created.
- *
- * @param avctx AVCodecContext pointer to context
- * @return Returns 0 on success, -1 on failure
- */
-static av_cold int xvid_encode_init(AVCodecContext *avctx) {
- int xerr, i;
- int xvid_flags = avctx->flags;
- struct xvid_context *x = avctx->priv_data;
- uint16_t *intra, *inter;
- int fd;
-
- xvid_plugin_single_t single;
- struct xvid_ff_pass1 rc2pass1;
- xvid_plugin_2pass2_t rc2pass2;
- xvid_gbl_init_t xvid_gbl_init;
- xvid_enc_create_t xvid_enc_create;
- xvid_enc_plugin_t plugins[7];
-
- /* Bring in VOP flags from ffmpeg command-line */
- x->vop_flags = XVID_VOP_HALFPEL; /* Bare minimum quality */
- if( xvid_flags & CODEC_FLAG_4MV )
- x->vop_flags |= XVID_VOP_INTER4V; /* Level 3 */
- if( avctx->trellis
- )
- x->vop_flags |= XVID_VOP_TRELLISQUANT; /* Level 5 */
- if( xvid_flags & CODEC_FLAG_AC_PRED )
- x->vop_flags |= XVID_VOP_HQACPRED; /* Level 6 */
- if( xvid_flags & CODEC_FLAG_GRAY )
- x->vop_flags |= XVID_VOP_GREYSCALE;
-
- /* Decide which ME quality setting to use */
- x->me_flags = 0;
- switch( avctx->me_method ) {
- case ME_FULL: /* Quality 6 */
- x->me_flags |= XVID_ME_EXTSEARCH16
- | XVID_ME_EXTSEARCH8;
-
- case ME_EPZS: /* Quality 4 */
- x->me_flags |= XVID_ME_ADVANCEDDIAMOND8
- | XVID_ME_HALFPELREFINE8
- | XVID_ME_CHROMA_PVOP
- | XVID_ME_CHROMA_BVOP;
-
- case ME_LOG: /* Quality 2 */
- case ME_PHODS:
- case ME_X1:
- x->me_flags |= XVID_ME_ADVANCEDDIAMOND16
- | XVID_ME_HALFPELREFINE16;
-
- case ME_ZERO: /* Quality 0 */
- default:
- break;
- }
-
- /* Decide how we should decide blocks */
- switch( avctx->mb_decision ) {
- case 2:
- x->vop_flags |= XVID_VOP_MODEDECISION_RD;
- x->me_flags |= XVID_ME_HALFPELREFINE8_RD
- | XVID_ME_QUARTERPELREFINE8_RD
- | XVID_ME_EXTSEARCH_RD
- | XVID_ME_CHECKPREDICTION_RD;
- case 1:
- if( !(x->vop_flags & XVID_VOP_MODEDECISION_RD) )
- x->vop_flags |= XVID_VOP_FAST_MODEDECISION_RD;
- x->me_flags |= XVID_ME_HALFPELREFINE16_RD
- | XVID_ME_QUARTERPELREFINE16_RD;
-
- default:
- break;
- }
-
- /* Bring in VOL flags from ffmpeg command-line */
- x->vol_flags = 0;
- if( xvid_flags & CODEC_FLAG_GMC ) {
- x->vol_flags |= XVID_VOL_GMC;
- x->me_flags |= XVID_ME_GME_REFINE;
- }
- if( xvid_flags & CODEC_FLAG_QPEL ) {
- x->vol_flags |= XVID_VOL_QUARTERPEL;
- x->me_flags |= XVID_ME_QUARTERPELREFINE16;
- if( x->vop_flags & XVID_VOP_INTER4V )
- x->me_flags |= XVID_ME_QUARTERPELREFINE8;
- }
-
- memset(&xvid_gbl_init, 0, sizeof(xvid_gbl_init));
- xvid_gbl_init.version = XVID_VERSION;
- xvid_gbl_init.debug = 0;
-
-#if ARCH_PPC
- /* Xvid's PPC support is borked, use libavcodec to detect */
-#if HAVE_ALTIVEC
- if (av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC) {
- xvid_gbl_init.cpu_flags = XVID_CPU_FORCE | XVID_CPU_ALTIVEC;
- } else
-#endif
- xvid_gbl_init.cpu_flags = XVID_CPU_FORCE;
-#else
- /* Xvid can detect on x86 */
- xvid_gbl_init.cpu_flags = 0;
-#endif
-
- /* Initialize */
- xvid_global(NULL, XVID_GBL_INIT, &xvid_gbl_init, NULL);
-
- /* Create the encoder reference */
- memset(&xvid_enc_create, 0, sizeof(xvid_enc_create));
- xvid_enc_create.version = XVID_VERSION;
-
- /* Store the desired frame size */
- xvid_enc_create.width = x->xsize = avctx->width;
- xvid_enc_create.height = x->ysize = avctx->height;
-
- /* Xvid can determine the proper profile to use */
- /* xvid_enc_create.profile = XVID_PROFILE_S_L3; */
-
- /* We don't use zones */
- xvid_enc_create.zones = NULL;
- xvid_enc_create.num_zones = 0;
-
- xvid_enc_create.num_threads = avctx->thread_count;
-
- xvid_enc_create.plugins = plugins;
- xvid_enc_create.num_plugins = 0;
-
- /* Initialize Buffers */
- x->twopassbuffer = NULL;
- x->old_twopassbuffer = NULL;
- x->twopassfile = NULL;
-
- if( xvid_flags & CODEC_FLAG_PASS1 ) {
- memset(&rc2pass1, 0, sizeof(struct xvid_ff_pass1));
- rc2pass1.version = XVID_VERSION;
- rc2pass1.context = x;
- x->twopassbuffer = av_malloc(BUFFER_SIZE);
- x->old_twopassbuffer = av_malloc(BUFFER_SIZE);
- if( x->twopassbuffer == NULL || x->old_twopassbuffer == NULL ) {
- av_log(avctx, AV_LOG_ERROR,
- "Xvid: Cannot allocate 2-pass log buffers\n");
- return -1;
- }
- x->twopassbuffer[0] = x->old_twopassbuffer[0] = 0;
-
- plugins[xvid_enc_create.num_plugins].func = xvid_ff_2pass;
- plugins[xvid_enc_create.num_plugins].param = &rc2pass1;
- xvid_enc_create.num_plugins++;
- } else if( xvid_flags & CODEC_FLAG_PASS2 ) {
- memset(&rc2pass2, 0, sizeof(xvid_plugin_2pass2_t));
- rc2pass2.version = XVID_VERSION;
- rc2pass2.bitrate = avctx->bit_rate;
-
- fd = ff_tempfile("xvidff.", &(x->twopassfile));
- if( fd == -1 ) {
- av_log(avctx, AV_LOG_ERROR,
- "Xvid: Cannot write 2-pass pipe\n");
- return -1;
- }
-
- if( avctx->stats_in == NULL ) {
- av_log(avctx, AV_LOG_ERROR,
- "Xvid: No 2-pass information loaded for second pass\n");
- return -1;
- }
-
- if( strlen(avctx->stats_in) >
- write(fd, avctx->stats_in, strlen(avctx->stats_in)) ) {
- close(fd);
- av_log(avctx, AV_LOG_ERROR,
- "Xvid: Cannot write to 2-pass pipe\n");
- return -1;
- }
-
- close(fd);
- rc2pass2.filename = x->twopassfile;
- plugins[xvid_enc_create.num_plugins].func = xvid_plugin_2pass2;
- plugins[xvid_enc_create.num_plugins].param = &rc2pass2;
- xvid_enc_create.num_plugins++;
- } else if( !(xvid_flags & CODEC_FLAG_QSCALE) ) {
- /* Single Pass Bitrate Control! */
- memset(&single, 0, sizeof(xvid_plugin_single_t));
- single.version = XVID_VERSION;
- single.bitrate = avctx->bit_rate;
-
- plugins[xvid_enc_create.num_plugins].func = xvid_plugin_single;
- plugins[xvid_enc_create.num_plugins].param = &single;
- xvid_enc_create.num_plugins++;
- }
-
- /* Luminance Masking */
- if( 0.0 != avctx->lumi_masking ) {
- plugins[xvid_enc_create.num_plugins].func = xvid_plugin_lumimasking;
- plugins[xvid_enc_create.num_plugins].param = NULL;
- xvid_enc_create.num_plugins++;
- }
-
- /* Frame Rate and Key Frames */
- xvid_correct_framerate(avctx);
- xvid_enc_create.fincr = avctx->time_base.num;
- xvid_enc_create.fbase = avctx->time_base.den;
- if( avctx->gop_size > 0 )
- xvid_enc_create.max_key_interval = avctx->gop_size;
- else
- xvid_enc_create.max_key_interval = 240; /* Xvid's best default */
-
- /* Quants */
- if( xvid_flags & CODEC_FLAG_QSCALE ) x->qscale = 1;
- else x->qscale = 0;
-
- xvid_enc_create.min_quant[0] = avctx->qmin;
- xvid_enc_create.min_quant[1] = avctx->qmin;
- xvid_enc_create.min_quant[2] = avctx->qmin;
- xvid_enc_create.max_quant[0] = avctx->qmax;
- xvid_enc_create.max_quant[1] = avctx->qmax;
- xvid_enc_create.max_quant[2] = avctx->qmax;
-
- /* Quant Matrices */
- x->intra_matrix = x->inter_matrix = NULL;
- if( avctx->mpeg_quant )
- x->vol_flags |= XVID_VOL_MPEGQUANT;
- if( (avctx->intra_matrix || avctx->inter_matrix) ) {
- x->vol_flags |= XVID_VOL_MPEGQUANT;
-
- if( avctx->intra_matrix ) {
- intra = avctx->intra_matrix;
- x->intra_matrix = av_malloc(sizeof(unsigned char) * 64);
- } else
- intra = NULL;
- if( avctx->inter_matrix ) {
- inter = avctx->inter_matrix;
- x->inter_matrix = av_malloc(sizeof(unsigned char) * 64);
- } else
- inter = NULL;
-
- for( i = 0; i < 64; i++ ) {
- if( intra )
- x->intra_matrix[i] = (unsigned char)intra[i];
- if( inter )
- x->inter_matrix[i] = (unsigned char)inter[i];
- }
- }
-
- /* Misc Settings */
- xvid_enc_create.frame_drop_ratio = 0;
- xvid_enc_create.global = 0;
- if( xvid_flags & CODEC_FLAG_CLOSED_GOP )
- xvid_enc_create.global |= XVID_GLOBAL_CLOSED_GOP;
-
- /* Determines which codec mode we are operating in */
- avctx->extradata = NULL;
- avctx->extradata_size = 0;
- if( xvid_flags & CODEC_FLAG_GLOBAL_HEADER ) {
- /* In this case, we are claiming to be MPEG4 */
- x->quicktime_format = 1;
- avctx->codec_id = CODEC_ID_MPEG4;
- } else {
- /* We are claiming to be Xvid */
- x->quicktime_format = 0;
- if(!avctx->codec_tag)
- avctx->codec_tag = AV_RL32("xvid");
- }
-
- /* Bframes */
- xvid_enc_create.max_bframes = avctx->max_b_frames;
- xvid_enc_create.bquant_offset = 100 * avctx->b_quant_offset;
- xvid_enc_create.bquant_ratio = 100 * avctx->b_quant_factor;
- if( avctx->max_b_frames > 0 && !x->quicktime_format )
xvid_enc_create.global |= XVID_GLOBAL_PACKED;
-
- /* Create encoder context */
- xerr = xvid_encore(NULL, XVID_ENC_CREATE, &xvid_enc_create, NULL);
- if( xerr ) {
- av_log(avctx, AV_LOG_ERROR, "Xvid: Could not create encoder
reference\n");
- return -1;
- }
-
- x->encoder_handle = xvid_enc_create.handle;
- avctx->coded_frame = &x->encoded_picture;
-
- return 0;
-}
-
-/**
- * Encode a single frame.
- *
- * @param avctx AVCodecContext pointer to context
- * @param frame Pointer to encoded frame buffer
- * @param buf_size Size of encoded frame buffer
- * @param data Pointer to AVFrame of unencoded frame
- * @return Returns 0 on success, -1 on failure
- */
-static int xvid_encode_frame(AVCodecContext *avctx,
- unsigned char *frame, int buf_size, void *data) {
- int xerr, i;
- char *tmp;
- struct xvid_context *x = avctx->priv_data;
- AVFrame *picture = data;
- AVFrame *p = &(x->encoded_picture);
-
- xvid_enc_frame_t xvid_enc_frame;
- xvid_enc_stats_t xvid_enc_stats;
-
- /* Start setting up the frame */
- memset(&xvid_enc_frame, 0, sizeof(xvid_enc_frame));
- xvid_enc_frame.version = XVID_VERSION;
- memset(&xvid_enc_stats, 0, sizeof(xvid_enc_stats));
- xvid_enc_stats.version = XVID_VERSION;
- *p = *picture;
-
- /* Let Xvid know where to put the frame. */
- xvid_enc_frame.bitstream = frame;
- xvid_enc_frame.length = buf_size;
-
- /* Initialize input image fields */
- if( avctx->pix_fmt != PIX_FMT_YUV420P ) {
- av_log(avctx, AV_LOG_ERROR, "Xvid: Color spaces other than 420p not
supported\n");
- return -1;
- }
-
- xvid_enc_frame.input.csp = XVID_CSP_PLANAR; /* YUV420P */
-
- for( i = 0; i < 4; i++ ) {
- xvid_enc_frame.input.plane[i] = picture->data[i];
- xvid_enc_frame.input.stride[i] = picture->linesize[i];
- }
-
- /* Encoder Flags */
- xvid_enc_frame.vop_flags = x->vop_flags;
- xvid_enc_frame.vol_flags = x->vol_flags;
- xvid_enc_frame.motion = x->me_flags;
- xvid_enc_frame.type =
- picture->pict_type == AV_PICTURE_TYPE_I ? XVID_TYPE_IVOP :
- picture->pict_type == AV_PICTURE_TYPE_P ? XVID_TYPE_PVOP :
- picture->pict_type == AV_PICTURE_TYPE_B ? XVID_TYPE_BVOP :
- XVID_TYPE_AUTO;
-
- /* Pixel aspect ratio setting */
- if (avctx->sample_aspect_ratio.num < 1 || avctx->sample_aspect_ratio.num >
255 ||
- avctx->sample_aspect_ratio.den < 1 || avctx->sample_aspect_ratio.den >
255) {
- av_log(avctx, AV_LOG_ERROR, "Invalid pixel aspect ratio %i/%i\n",
- avctx->sample_aspect_ratio.num, avctx->sample_aspect_ratio.den);
- return -1;
- }
- xvid_enc_frame.par = XVID_PAR_EXT;
- xvid_enc_frame.par_width = avctx->sample_aspect_ratio.num;
- xvid_enc_frame.par_height = avctx->sample_aspect_ratio.den;
-
- /* Quant Setting */
- if( x->qscale ) xvid_enc_frame.quant = picture->quality / FF_QP2LAMBDA;
- else xvid_enc_frame.quant = 0;
-
- /* Matrices */
- xvid_enc_frame.quant_intra_matrix = x->intra_matrix;
- xvid_enc_frame.quant_inter_matrix = x->inter_matrix;
-
- /* Encode */
- xerr = xvid_encore(x->encoder_handle, XVID_ENC_ENCODE,
- &xvid_enc_frame, &xvid_enc_stats);
-
- /* Two-pass log buffer swapping */
- avctx->stats_out = NULL;
- if( x->twopassbuffer ) {
- tmp = x->old_twopassbuffer;
- x->old_twopassbuffer = x->twopassbuffer;
- x->twopassbuffer = tmp;
- x->twopassbuffer[0] = 0;
- if( x->old_twopassbuffer[0] != 0 ) {
- avctx->stats_out = x->old_twopassbuffer;
- }
- }
-
- if( 0 <= xerr ) {
- p->quality = xvid_enc_stats.quant * FF_QP2LAMBDA;
- if( xvid_enc_stats.type == XVID_TYPE_PVOP )
- p->pict_type = AV_PICTURE_TYPE_P;
- else if( xvid_enc_stats.type == XVID_TYPE_BVOP )
- p->pict_type = AV_PICTURE_TYPE_B;
- else if( xvid_enc_stats.type == XVID_TYPE_SVOP )
- p->pict_type = AV_PICTURE_TYPE_S;
- else
- p->pict_type = AV_PICTURE_TYPE_I;
- if( xvid_enc_frame.out_flags & XVID_KEYFRAME ) {
- p->key_frame = 1;
- if( x->quicktime_format )
- return xvid_strip_vol_header(avctx, frame,
- xvid_enc_stats.hlength, xerr);
- } else
- p->key_frame = 0;
-
- return xerr;
- } else {
- av_log(avctx, AV_LOG_ERROR, "Xvid: Encoding Error Occurred: %i\n",
xerr);
- return -1;
- }
-}
-
-/**
- * Destroy the private context for the encoder.
- * All buffers are freed, and the Xvid encoder context is destroyed.
- *
- * @param avctx AVCodecContext pointer to context
- * @return Returns 0, success guaranteed
- */
-static av_cold int xvid_encode_close(AVCodecContext *avctx) {
- struct xvid_context *x = avctx->priv_data;
-
- xvid_encore(x->encoder_handle, XVID_ENC_DESTROY, NULL, NULL);
-
- av_freep(&avctx->extradata);
- if( x->twopassbuffer != NULL ) {
- av_free(x->twopassbuffer);
- av_free(x->old_twopassbuffer);
- }
- av_free(x->twopassfile);
- av_free(x->intra_matrix);
- av_free(x->inter_matrix);
-
- return 0;
-}
-
-/**
- * Routine to create a global VO/VOL header for MP4 container.
- * What we do here is extract the header from the Xvid bitstream
- * as it is encoded. We also strip the repeated headers from the
- * bitstream when a global header is requested for MPEG-4 ISO
- * compliance.
- *
- * @param avctx AVCodecContext pointer to context
- * @param frame Pointer to encoded frame data
- * @param header_len Length of header to search
- * @param frame_len Length of encoded frame data
- * @return Returns new length of frame data
- */
-int xvid_strip_vol_header(AVCodecContext *avctx,
- unsigned char *frame,
- unsigned int header_len,
- unsigned int frame_len) {
- int vo_len = 0, i;
-
- for( i = 0; i < header_len - 3; i++ ) {
- if( frame[i] == 0x00 &&
- frame[i+1] == 0x00 &&
- frame[i+2] == 0x01 &&
- frame[i+3] == 0xB6 ) {
- vo_len = i;
- break;
- }
- }
-
- if( vo_len > 0 ) {
- /* We need to store the header, so extract it */
- if( avctx->extradata == NULL ) {
- avctx->extradata = av_malloc(vo_len);
- memcpy(avctx->extradata, frame, vo_len);
- avctx->extradata_size = vo_len;
- }
- /* Less dangerous now, memmove properly copies the two
- chunks of overlapping data */
- memmove(frame, &(frame[vo_len]), frame_len - vo_len);
- return frame_len - vo_len;
- } else
- return frame_len;
-}
-
-/**
- * Routine to correct a possibly erroneous framerate being fed to us.
- * Xvid currently chokes on framerates where the ticks per frame is
- * extremely large. This function works to correct problems in this area
- * by estimating a new framerate and taking the simpler fraction of
- * the two presented.
- *
- * @param avctx Context that contains the framerate to correct.
- */
-void xvid_correct_framerate(AVCodecContext *avctx) {
- int frate, fbase;
- int est_frate, est_fbase;
- int gcd;
- float est_fps, fps;
-
- frate = avctx->time_base.den;
- fbase = avctx->time_base.num;
-
- gcd = av_gcd(frate, fbase);
- if( gcd > 1 ) {
- frate /= gcd;
- fbase /= gcd;
- }
-
- if( frate <= 65000 && fbase <= 65000 ) {
- avctx->time_base.den = frate;
- avctx->time_base.num = fbase;
- return;
- }
-
- fps = (float)frate / (float)fbase;
- est_fps = roundf(fps * 1000.0) / 1000.0;
-
- est_frate = (int)est_fps;
- if( est_fps > (int)est_fps ) {
- est_frate = (est_frate + 1) * 1000;
- est_fbase = (int)roundf((float)est_frate / est_fps);
- } else
- est_fbase = 1;
-
- gcd = av_gcd(est_frate, est_fbase);
- if( gcd > 1 ) {
- est_frate /= gcd;
- est_fbase /= gcd;
- }
-
- if( fbase > est_fbase ) {
- avctx->time_base.den = est_frate;
- avctx->time_base.num = est_fbase;
- av_log(avctx, AV_LOG_DEBUG,
- "Xvid: framerate re-estimated: %.2f, %.3f%% correction\n",
- est_fps, (((est_fps - fps)/fps) * 100.0));
- } else {
- avctx->time_base.den = frate;
- avctx->time_base.num = fbase;
- }
-}
-
-/*
- * Xvid 2-Pass Kludge Section
- *
- * Xvid's default 2-pass doesn't allow us to create data as we need to, so
- * this section spends time replacing the first pass plugin so we can write
- * statistic information as libavcodec requests in. We have another kludge
- * that allows us to pass data to the second pass in Xvid without a custom
- * rate-control plugin.
- */
-
-/**
- * Initialize the two-pass plugin and context.
- *
- * @param param Input construction parameter structure
- * @param handle Private context handle
- * @return Returns XVID_ERR_xxxx on failure, or 0 on success.
- */
-static int xvid_ff_2pass_create(xvid_plg_create_t * param,
- void ** handle) {
- struct xvid_ff_pass1 *x = (struct xvid_ff_pass1 *)param->param;
- char *log = x->context->twopassbuffer;
-
- /* Do a quick bounds check */
- if( log == NULL )
- return XVID_ERR_FAIL;
-
- /* We use snprintf() */
- /* This is because we can safely prevent a buffer overflow */
- log[0] = 0;
- snprintf(log, BUFFER_REMAINING(log),
- "# ffmpeg 2-pass log file, using xvid codec\n");
- snprintf(BUFFER_CAT(log), BUFFER_REMAINING(log),
- "# Do not modify. libxvidcore version: %d.%d.%d\n\n",
- XVID_VERSION_MAJOR(XVID_VERSION),
- XVID_VERSION_MINOR(XVID_VERSION),
- XVID_VERSION_PATCH(XVID_VERSION));
-
- *handle = x->context;
- return 0;
-}
-
-/**
- * Destroy the two-pass plugin context.
- *
- * @param ref Context pointer for the plugin
- * @param param Destrooy context
- * @return Returns 0, success guaranteed
- */
-static int xvid_ff_2pass_destroy(struct xvid_context *ref,
- xvid_plg_destroy_t *param) {
- /* Currently cannot think of anything to do on destruction */
- /* Still, the framework should be here for reference/use */
- if( ref->twopassbuffer != NULL )
- ref->twopassbuffer[0] = 0;
- return 0;
-}
-
-/**
- * Enable fast encode mode during the first pass.
- *
- * @param ref Context pointer for the plugin
- * @param param Frame data
- * @return Returns 0, success guaranteed
- */
-static int xvid_ff_2pass_before(struct xvid_context *ref,
- xvid_plg_data_t *param) {
- int motion_remove;
- int motion_replacements;
- int vop_remove;
-
- /* Nothing to do here, result is changed too much */
- if( param->zone && param->zone->mode == XVID_ZONE_QUANT )
- return 0;
-
- /* We can implement a 'turbo' first pass mode here */
- param->quant = 2;
-
- /* Init values */
- motion_remove = ~XVID_ME_CHROMA_PVOP &
- ~XVID_ME_CHROMA_BVOP &
- ~XVID_ME_EXTSEARCH16 &
- ~XVID_ME_ADVANCEDDIAMOND16;
- motion_replacements = XVID_ME_FAST_MODEINTERPOLATE |
- XVID_ME_SKIP_DELTASEARCH |
- XVID_ME_FASTREFINE16 |
- XVID_ME_BFRAME_EARLYSTOP;
- vop_remove = ~XVID_VOP_MODEDECISION_RD &
- ~XVID_VOP_FAST_MODEDECISION_RD &
- ~XVID_VOP_TRELLISQUANT &
- ~XVID_VOP_INTER4V &
- ~XVID_VOP_HQACPRED;
-
- param->vol_flags &= ~XVID_VOL_GMC;
- param->vop_flags &= vop_remove;
- param->motion_flags &= motion_remove;
- param->motion_flags |= motion_replacements;
-
- return 0;
-}
-
-/**
- * Capture statistic data and write it during first pass.
- *
- * @param ref Context pointer for the plugin
- * @param param Statistic data
- * @return Returns XVID_ERR_xxxx on failure, or 0 on success
- */
-static int xvid_ff_2pass_after(struct xvid_context *ref,
- xvid_plg_data_t *param) {
- char *log = ref->twopassbuffer;
- char *frame_types = " ipbs";
- char frame_type;
-
- /* Quick bounds check */
- if( log == NULL )
- return XVID_ERR_FAIL;
-
- /* Convert the type given to us into a character */
- if( param->type < 5 && param->type > 0 ) {
- frame_type = frame_types[param->type];
- } else {
- return XVID_ERR_FAIL;
- }
-
- snprintf(BUFFER_CAT(log), BUFFER_REMAINING(log),
- "%c %d %d %d %d %d %d\n",
- frame_type, param->stats.quant, param->stats.kblks, param->stats.mblks,
- param->stats.ublks, param->stats.length, param->stats.hlength);
-
- return 0;
-}
-
-/**
- * Dispatch function for our custom plugin.
- * This handles the dispatch for the Xvid plugin. It passes data
- * on to other functions for actual processing.
- *
- * @param ref Context pointer for the plugin
- * @param cmd The task given for us to complete
- * @param p1 First parameter (varies)
- * @param p2 Second parameter (varies)
- * @return Returns XVID_ERR_xxxx on failure, or 0 on success
- */
-int xvid_ff_2pass(void *ref, int cmd, void *p1, void *p2) {
- switch( cmd ) {
- case XVID_PLG_INFO:
- case XVID_PLG_FRAME:
- return 0;
-
- case XVID_PLG_BEFORE:
- return xvid_ff_2pass_before(ref, p1);
-
- case XVID_PLG_CREATE:
- return xvid_ff_2pass_create(p1, p2);
-
- case XVID_PLG_AFTER:
- return xvid_ff_2pass_after(ref, p1);
-
- case XVID_PLG_DESTROY:
- return xvid_ff_2pass_destroy(ref, p1);
-
- default:
- return XVID_ERR_FAIL;
- }
-}
-
-/**
- * Xvid codec definition for libavcodec.
- */
-AVCodec ff_libxvid_encoder = {
- "libxvid",
- AVMEDIA_TYPE_VIDEO,
- CODEC_ID_MPEG4,
- sizeof(struct xvid_context),
- xvid_encode_init,
- xvid_encode_frame,
- xvid_encode_close,
- .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
- .long_name= NULL_IF_CONFIG_SMALL("libxvidcore MPEG-4 part 2"),
-};
-
-#endif /* CONFIG_LIBXVID_ENCODER */
diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c
index 0d7b995..5c59111 100644
--- a/libavcodec/ratecontrol.c
+++ b/libavcodec/ratecontrol.c
@@ -181,16 +181,6 @@ int ff_rate_control_init(MpegEncContext *s)
}
if(init_pass2(s) < 0) return -1;
-
- //FIXME maybe move to end
- if((s->flags&CODEC_FLAG_PASS2) && s->avctx->rc_strategy ==
FF_RC_STRATEGY_XVID) {
-#if CONFIG_LIBXVID
- return ff_xvid_rate_control_init(s);
-#else
- av_log(s->avctx, AV_LOG_ERROR, "Xvid ratecontrol requires
libavcodec compiled with Xvid support.\n");
- return -1;
-#endif
- }
}
if(!(s->flags&CODEC_FLAG_PASS2)){
@@ -256,11 +246,6 @@ void ff_rate_control_uninit(MpegEncContext *s)
av_expr_free(rcc->rc_eq_eval);
av_freep(&rcc->entry);
-
-#if CONFIG_LIBXVID
- if((s->flags&CODEC_FLAG_PASS2) && s->avctx->rc_strategy ==
FF_RC_STRATEGY_XVID)
- ff_xvid_rate_control_uninit(s);
-#endif
}
int ff_vbv_update(MpegEncContext *s, int frame_size){
@@ -673,11 +658,6 @@ float ff_rate_estimate_qscale(MpegEncContext *s, int
dry_run)
Picture * const pic= &s->current_picture;
emms_c();
-#if CONFIG_LIBXVID
- if((s->flags&CODEC_FLAG_PASS2) && s->avctx->rc_strategy ==
FF_RC_STRATEGY_XVID)
- return ff_xvid_rate_estimate_qscale(s, dry_run);
-#endif
-
get_qminmax(&qmin, &qmax, s, pict_type);
fps= 1/av_q2d(s->avctx->time_base);
diff --git a/libavcodec/ratecontrol.h b/libavcodec/ratecontrol.h
index 6cd4a18..ed18f2c 100644
--- a/libavcodec/ratecontrol.h
+++ b/libavcodec/ratecontrol.h
@@ -80,10 +80,6 @@ typedef struct RateControlContext{
uint64_t qscale_sum[5];
int frame_count[5];
int last_non_b_pict_type;
-
- void *non_lavc_opaque; ///< context for non lavc rc code (for
example xvid)
- float dry_run_qscale; ///< for xvid rc
- int last_picture_number; ///< for xvid rc
AVExpr * rc_eq_eval;
}RateControlContext;
@@ -97,9 +93,5 @@ void ff_rate_control_uninit(struct MpegEncContext *s);
int ff_vbv_update(struct MpegEncContext *s, int frame_size);
void ff_get_2pass_fcode(struct MpegEncContext *s);
-int ff_xvid_rate_control_init(struct MpegEncContext *s);
-void ff_xvid_rate_control_uninit(struct MpegEncContext *s);
-float ff_xvid_rate_estimate_qscale(struct MpegEncContext *s, int dry_run);
-
#endif /* AVCODEC_RATECONTROL_H */
--
1.7.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
