*/
/**
- * @file xvidmpeg4.c
+ * @file
* Interface to xvidcore for MPEG-4 compliant encoding.
* @author Adam Thayer (krevnik@comcast.net)
*/
#include <xvid.h>
#include <unistd.h>
#include "avcodec.h"
+#include "libavutil/intreadwrite.h"
#include "libxvid_internal.h"
/**
void xvid_correct_framerate(AVCodecContext *avctx);
/**
- * Creates the private context for the 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
*/
-av_cold int ff_xvid_encode_init(AVCodecContext *avctx) {
+static av_cold int xvid_encode_init(AVCodecContext *avctx) {
int xerr, i;
int xvid_flags = avctx->flags;
struct xvid_context *x = avctx->priv_data;
/* We are claiming to be Xvid */
x->quicktime_format = 0;
if(!avctx->codec_tag)
- avctx->codec_tag = ff_get_fourcc("xvid");
+ avctx->codec_tag = AV_RL32("xvid");
}
/* Bframes */
}
/**
- * Encodes a single frame.
+ * Encode a single frame.
*
* @param avctx AVCodecContext pointer to context
* @param frame Pointer to encoded frame buffer
* @param data Pointer to AVFrame of unencoded frame
* @return Returns 0 on success, -1 on failure
*/
-int ff_xvid_encode_frame(AVCodecContext *avctx,
+static int xvid_encode_frame(AVCodecContext *avctx,
unsigned char *frame, int buf_size, void *data) {
int xerr, i;
char *tmp;
}
/**
- * Destroys the private context for the encoder.
+ * 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
*/
-av_cold int ff_xvid_encode_close(AVCodecContext *avctx) {
+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);
if( avctx->extradata != NULL )
- av_free(avctx->extradata);
+ av_freep(&avctx->extradata);
if( x->twopassbuffer != NULL ) {
av_free(x->twopassbuffer);
av_free(x->old_twopassbuffer);
frate = avctx->time_base.den;
fbase = avctx->time_base.num;
- gcd = ff_gcd(frate, fbase);
+ gcd = av_gcd(frate, fbase);
if( gcd > 1 ) {
frate /= gcd;
fbase /= gcd;
} else
est_fbase = 1;
- gcd = ff_gcd(est_frate, est_fbase);
+ gcd = av_gcd(est_frate, est_fbase);
if( gcd > 1 ) {
est_frate /= gcd;
est_fbase /= gcd;
*/
/**
- * Initializes the two-pass plugin and context.
+ * Initialize the two-pass plugin and context.
*
* @param param Input construction parameter structure
* @param handle Private context handle
}
/**
- * Destroys the two-pass plugin context.
+ * Destroy the two-pass plugin context.
*
* @param ref Context pointer for the plugin
* @param param Destrooy context
}
/**
- * Enables fast encode mode during the first pass.
+ * Enable fast encode mode during the first pass.
*
* @param ref Context pointer for the plugin
* @param param Frame data
}
/**
- * Captures statistic data and writes it during first pass.
+ * Capture statistic data and write it during first pass.
*
* @param ref Context pointer for the plugin
* @param param Statistic data
*/
AVCodec libxvid_encoder = {
"libxvid",
- CODEC_TYPE_VIDEO,
- CODEC_ID_XVID,
+ AVMEDIA_TYPE_VIDEO,
+ CODEC_ID_MPEG4,
sizeof(struct xvid_context),
- ff_xvid_encode_init,
- ff_xvid_encode_frame,
- ff_xvid_encode_close,
- .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
+ 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"),
};