*/
/**
- * @file xvidmpeg4.c
+ * @file libavcodec/libxvidff.c
* 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"
/**
#define BUFFER_CAT(x) (&((x)[strlen(x)]))
/* For PPC Use */
-extern int has_altivec(void);
+int has_altivec(void);
/**
- * Structure for the private XviD context.
+ * Structure for the private Xvid context.
* This stores all the private context for the codec.
*/
-typedef struct xvid_context {
- void *encoder_handle; /** Handle for XviD Encoder */
+struct xvid_context {
+ void *encoder_handle; /** Handle for Xvid encoder */
int xsize, ysize; /** Frame size */
- int vop_flags; /** VOP flags for XviD Encoder */
- int vol_flags; /** VOL flags for XviD Encoder */
+ 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? */
char *twopassfile; /** second pass temp file name */
unsigned char *intra_matrix; /** P-Frame Quant Matrix */
unsigned char *inter_matrix; /** I-Frame Quant Matrix */
-} xvid_context_t;
+};
/**
* Structure for the private first-pass plugin.
*/
-typedef struct xvid_ff_pass1 {
- int version; /** XviD version */
- xvid_context_t *context; /** Pointer to private context */
-} xvid_ff_pass1_t;
+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);
* @param avctx AVCodecContext pointer to context
* @return Returns 0 on success, -1 on failure
*/
-int ff_xvid_encode_init(AVCodecContext *avctx) {
+av_cold int ff_xvid_encode_init(AVCodecContext *avctx) {
int xerr, i;
int xvid_flags = avctx->flags;
- xvid_context_t *x = avctx->priv_data;
+ struct xvid_context *x = avctx->priv_data;
uint16_t *intra, *inter;
int fd;
xvid_plugin_single_t single;
- xvid_ff_pass1_t rc2pass1;
+ struct xvid_ff_pass1 rc2pass1;
xvid_plugin_2pass2_t rc2pass2;
xvid_gbl_init_t xvid_gbl_init;
xvid_enc_create_t xvid_enc_create;
x->vop_flags = XVID_VOP_HALFPEL; /* Bare minimum quality */
if( xvid_flags & CODEC_FLAG_4MV )
x->vop_flags |= XVID_VOP_INTER4V; /* Level 3 */
- if( xvid_flags & CODEC_FLAG_TRELLIS_QUANT)
+ 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 */
xvid_gbl_init.version = XVID_VERSION;
xvid_gbl_init.debug = 0;
-#ifdef ARCH_POWERPC
- /* XviD's PPC support is borked, use libavcodec to detect */
-#ifdef HAVE_ALTIVEC
+#if ARCH_PPC
+ /* Xvid's PPC support is borked, use libavcodec to detect */
+#if HAVE_ALTIVEC
if( has_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 can detect on x86 */
xvid_gbl_init.cpu_flags = 0;
#endif
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 can determine the proper profile to use */
/* xvid_enc_create.profile = XVID_PROFILE_S_L3; */
- /* We don't use zones or threads */
+ /* We don't use zones */
xvid_enc_create.zones = NULL;
xvid_enc_create.num_zones = 0;
- xvid_enc_create.num_threads = 0;
+
+ xvid_enc_create.num_threads = avctx->thread_count;
xvid_enc_create.plugins = plugins;
xvid_enc_create.num_plugins = 0;
x->twopassfile = NULL;
if( xvid_flags & CODEC_FLAG_PASS1 ) {
- memset(&rc2pass1, 0, sizeof(xvid_ff_pass1_t));
+ 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");
+ "Xvid: Cannot allocate 2-pass log buffers\n");
return -1;
}
x->twopassbuffer[0] = x->old_twopassbuffer[0] = 0;
fd = av_tempfile("xvidff.", &(x->twopassfile));
if( fd == -1 ) {
av_log(avctx, AV_LOG_ERROR,
- "XviD: Cannot write 2-pass pipe\n");
+ "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");
+ "Xvid: No 2-pass information loaded for second pass\n");
return -1;
}
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");
+ "Xvid: Cannot write to 2-pass pipe\n");
return -1;
}
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 */
+ xvid_enc_create.max_key_interval = 240; /* Xvid's best default */
/* Quants */
if( xvid_flags & CODEC_FLAG_QSCALE ) x->qscale = 1;
x->quicktime_format = 1;
avctx->codec_id = CODEC_ID_MPEG4;
} else {
- /* We are claiming to be XviD */
+ /* 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 */
/* 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");
+ av_log(avctx, AV_LOG_ERROR, "Xvid: Could not create encoder reference\n");
return -1;
}
unsigned char *frame, int buf_size, void *data) {
int xerr, i;
char *tmp;
- xvid_context_t *x = avctx->priv_data;
+ struct xvid_context *x = avctx->priv_data;
AVFrame *picture = data;
AVFrame *p = &(x->encoded_picture);
xvid_enc_stats.version = XVID_VERSION;
*p = *picture;
- /* Let XviD know where to put the frame. */
+ /* 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");
+ av_log(avctx, AV_LOG_ERROR, "Xvid: Color spaces other than 420p not supported\n");
return -1;
}
xvid_enc_frame.motion = x->me_flags;
xvid_enc_frame.type = 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;
return xerr;
} else {
- av_log(avctx, AV_LOG_ERROR, "XviD: Encoding Error Occurred: %i\n", xerr);
+ av_log(avctx, AV_LOG_ERROR, "Xvid: Encoding Error Occurred: %i\n", xerr);
return -1;
}
}
/**
* Destroys the private context for the encoder.
- * All buffers are freed, and the XviD encoder context is destroyed.
+ * All buffers are freed, and the Xvid encoder context is destroyed.
*
* @param avctx AVCodecContext pointer to context
* @return Returns 0, success guaranteed
*/
-int ff_xvid_encode_close(AVCodecContext *avctx) {
- xvid_context_t *x = avctx->priv_data;
+av_cold int ff_xvid_encode_close(AVCodecContext *avctx) {
+ struct xvid_context *x = avctx->priv_data;
xvid_encore(x->encoder_handle, XVID_ENC_DESTROY, NULL, NULL);
/**
* Routine to create a global VO/VOL header for MP4 container.
- * What we do here is extract the header from the XviD bitstream
+ * 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.
/**
* Routine to correct a possibly erroneous framerate being fed to us.
- * XviD currently chokes on framerates where the ticks per frame is
+ * 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.
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;
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",
+ "Xvid: framerate re-estimated: %.2f, %.3f%% correction\n",
est_fps, (((est_fps - fps)/fps) * 100.0));
} else {
avctx->time_base.den = frate;
}
/*
- * XviD 2-Pass Kludge Section
+ * Xvid 2-Pass Kludge Section
*
- * XviD's default 2-pass doesn't allow us to create data as we need to, so
+ * 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
+ * that allows us to pass data to the second pass in Xvid without a custom
* rate-control plugin.
*/
*/
static int xvid_ff_2pass_create(xvid_plg_create_t * param,
void ** handle) {
- xvid_ff_pass1_t *x = (xvid_ff_pass1_t *)param->param;
+ struct xvid_ff_pass1 *x = (struct xvid_ff_pass1 *)param->param;
char *log = x->context->twopassbuffer;
/* Do a quick bounds check */
* @param param Destrooy context
* @return Returns 0, success guaranteed
*/
-static int xvid_ff_2pass_destroy(xvid_context_t *ref,
+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 */
* @param param Frame data
* @return Returns 0, success guaranteed
*/
-static int xvid_ff_2pass_before(xvid_context_t *ref,
+static int xvid_ff_2pass_before(struct xvid_context *ref,
xvid_plg_data_t *param) {
int motion_remove;
int motion_replacements;
* @param param Statistic data
* @return Returns XVID_ERR_xxxx on failure, or 0 on success
*/
-static int xvid_ff_2pass_after(xvid_context_t *ref,
+static int xvid_ff_2pass_after(struct xvid_context *ref,
xvid_plg_data_t *param) {
char *log = ref->twopassbuffer;
char *frame_types = " ipbs";
/**
* Dispatch function for our custom plugin.
- * This handles the dispatch for the XviD plugin. It passes data
+ * 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
}
/**
- * XviD codec definition for libavcodec.
+ * Xvid codec definition for libavcodec.
*/
AVCodec libxvid_encoder = {
"libxvid",
CODEC_TYPE_VIDEO,
CODEC_ID_XVID,
- sizeof(xvid_context_t),
+ sizeof(struct xvid_context),
ff_xvid_encode_init,
ff_xvid_encode_frame,
ff_xvid_encode_close,
- .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1},
+ .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
+ .long_name= NULL_IF_CONFIG_SMALL("libxvidcore MPEG-4 part 2"),
};
projects / ffmpeg / blobdiff