Commit 0a024268 authored by Gabriel Dume's avatar Gabriel Dume Committed by Diego Biurrun

libxvid: K&R formatting cosmetics

Signed-off-by: 's avatarDiego Biurrun <diego@biurrun.de>
parent 56a721f0
...@@ -25,12 +25,14 @@ ...@@ -25,12 +25,14 @@
* @author Adam Thayer (krevnik@comcast.net) * @author Adam Thayer (krevnik@comcast.net)
*/ */
#include <xvid.h>
#include <unistd.h> #include <unistd.h>
#include "avcodec.h" #include <xvid.h>
#include "libavutil/cpu.h" #include "libavutil/cpu.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"
#include "avcodec.h"
#include "libxvid.h" #include "libxvid.h"
#include "mpegvideo.h" #include "mpegvideo.h"
...@@ -92,9 +94,9 @@ struct xvid_ff_pass1 { ...@@ -92,9 +94,9 @@ struct xvid_ff_pass1 {
* @param handle Private context handle * @param handle Private context handle
* @return Returns XVID_ERR_xxxx on failure, or 0 on success. * @return Returns XVID_ERR_xxxx on failure, or 0 on success.
*/ */
static int xvid_ff_2pass_create(xvid_plg_create_t * param, static int xvid_ff_2pass_create(xvid_plg_create_t *param, void **handle)
void ** handle) { {
struct xvid_ff_pass1 *x = (struct xvid_ff_pass1 *)param->param; struct xvid_ff_pass1 *x = (struct xvid_ff_pass1 *) param->param;
char *log = x->context->twopassbuffer; char *log = x->context->twopassbuffer;
/* Do a quick bounds check */ /* Do a quick bounds check */
...@@ -124,7 +126,8 @@ static int xvid_ff_2pass_create(xvid_plg_create_t * param, ...@@ -124,7 +126,8 @@ static int xvid_ff_2pass_create(xvid_plg_create_t * param,
* @return Returns 0, success guaranteed * @return Returns 0, success guaranteed
*/ */
static int xvid_ff_2pass_destroy(struct xvid_context *ref, static int xvid_ff_2pass_destroy(struct xvid_context *ref,
xvid_plg_destroy_t *param) { xvid_plg_destroy_t *param)
{
/* Currently cannot think of anything to do on destruction */ /* Currently cannot think of anything to do on destruction */
/* Still, the framework should be here for reference/use */ /* Still, the framework should be here for reference/use */
if (ref->twopassbuffer) if (ref->twopassbuffer)
...@@ -140,13 +143,14 @@ static int xvid_ff_2pass_destroy(struct xvid_context *ref, ...@@ -140,13 +143,14 @@ static int xvid_ff_2pass_destroy(struct xvid_context *ref,
* @return Returns 0, success guaranteed * @return Returns 0, success guaranteed
*/ */
static int xvid_ff_2pass_before(struct xvid_context *ref, static int xvid_ff_2pass_before(struct xvid_context *ref,
xvid_plg_data_t *param) { xvid_plg_data_t *param)
{
int motion_remove; int motion_remove;
int motion_replacements; int motion_replacements;
int vop_remove; int vop_remove;
/* Nothing to do here, result is changed too much */ /* Nothing to do here, result is changed too much */
if( param->zone && param->zone->mode == XVID_ZONE_QUANT ) if (param->zone && param->zone->mode == XVID_ZONE_QUANT)
return 0; return 0;
/* We can implement a 'turbo' first pass mode here */ /* We can implement a 'turbo' first pass mode here */
...@@ -183,7 +187,8 @@ static int xvid_ff_2pass_before(struct xvid_context *ref, ...@@ -183,7 +187,8 @@ static int xvid_ff_2pass_before(struct xvid_context *ref,
* @return Returns XVID_ERR_xxxx on failure, or 0 on success * @return Returns XVID_ERR_xxxx on failure, or 0 on success
*/ */
static int xvid_ff_2pass_after(struct xvid_context *ref, static int xvid_ff_2pass_after(struct xvid_context *ref,
xvid_plg_data_t *param) { xvid_plg_data_t *param)
{
char *log = ref->twopassbuffer; char *log = ref->twopassbuffer;
const char *frame_types = " ipbs"; const char *frame_types = " ipbs";
char frame_type; char frame_type;
...@@ -193,16 +198,16 @@ static int xvid_ff_2pass_after(struct xvid_context *ref, ...@@ -193,16 +198,16 @@ static int xvid_ff_2pass_after(struct xvid_context *ref,
return XVID_ERR_FAIL; return XVID_ERR_FAIL;
/* Convert the type given to us into a character */ /* Convert the type given to us into a character */
if( param->type < 5 && param->type > 0 ) { if (param->type < 5 && param->type > 0)
frame_type = frame_types[param->type]; frame_type = frame_types[param->type];
} else { else
return XVID_ERR_FAIL; return XVID_ERR_FAIL;
}
snprintf(BUFFER_CAT(log), BUFFER_REMAINING(log), snprintf(BUFFER_CAT(log), BUFFER_REMAINING(log),
"%c %d %d %d %d %d %d\n", "%c %d %d %d %d %d %d\n",
frame_type, param->stats.quant, param->stats.kblks, param->stats.mblks, frame_type, param->stats.quant, param->stats.kblks,
param->stats.ublks, param->stats.length, param->stats.hlength); param->stats.mblks, param->stats.ublks,
param->stats.length, param->stats.hlength);
return 0; return 0;
} }
...@@ -220,23 +225,18 @@ static int xvid_ff_2pass_after(struct xvid_context *ref, ...@@ -220,23 +225,18 @@ static int xvid_ff_2pass_after(struct xvid_context *ref,
*/ */
static int xvid_ff_2pass(void *ref, int cmd, void *p1, void *p2) static int xvid_ff_2pass(void *ref, int cmd, void *p1, void *p2)
{ {
switch( cmd ) { switch (cmd) {
case XVID_PLG_INFO: case XVID_PLG_INFO:
case XVID_PLG_FRAME: case XVID_PLG_FRAME:
return 0; return 0;
case XVID_PLG_BEFORE: case XVID_PLG_BEFORE:
return xvid_ff_2pass_before(ref, p1); return xvid_ff_2pass_before(ref, p1);
case XVID_PLG_CREATE: case XVID_PLG_CREATE:
return xvid_ff_2pass_create(p1, p2); return xvid_ff_2pass_create(p1, p2);
case XVID_PLG_AFTER: case XVID_PLG_AFTER:
return xvid_ff_2pass_after(ref, p1); return xvid_ff_2pass_after(ref, p1);
case XVID_PLG_DESTROY: case XVID_PLG_DESTROY:
return xvid_ff_2pass_destroy(ref, p1); return xvid_ff_2pass_destroy(ref, p1);
default: default:
return XVID_ERR_FAIL; return XVID_ERR_FAIL;
} }
...@@ -255,23 +255,23 @@ static int xvid_ff_2pass(void *ref, int cmd, void *p1, void *p2) ...@@ -255,23 +255,23 @@ static int xvid_ff_2pass(void *ref, int cmd, void *p1, void *p2)
* @param frame_len Length of encoded frame data * @param frame_len Length of encoded frame data
* @return Returns new length of frame data * @return Returns new length of frame data
*/ */
static int xvid_strip_vol_header(AVCodecContext *avctx, static int xvid_strip_vol_header(AVCodecContext *avctx, AVPacket *pkt,
AVPacket *pkt,
unsigned int header_len, unsigned int header_len,
unsigned int frame_len) { unsigned int frame_len)
{
int vo_len = 0, i; int vo_len = 0, i;
for( i = 0; i < header_len - 3; i++ ) { for (i = 0; i < header_len - 3; i++) {
if( pkt->data[i] == 0x00 && if (pkt->data[i] == 0x00 &&
pkt->data[i+1] == 0x00 && pkt->data[i + 1] == 0x00 &&
pkt->data[i+2] == 0x01 && pkt->data[i + 2] == 0x01 &&
pkt->data[i+3] == 0xB6 ) { pkt->data[i + 3] == 0xB6) {
vo_len = i; vo_len = i;
break; break;
} }
} }
if( vo_len > 0 ) { if (vo_len > 0) {
/* We need to store the header, so extract it */ /* We need to store the header, so extract it */
if (!avctx->extradata) { if (!avctx->extradata) {
avctx->extradata = av_malloc(vo_len); avctx->extradata = av_malloc(vo_len);
...@@ -279,7 +279,7 @@ static int xvid_strip_vol_header(AVCodecContext *avctx, ...@@ -279,7 +279,7 @@ static int xvid_strip_vol_header(AVCodecContext *avctx,
avctx->extradata_size = vo_len; avctx->extradata_size = vo_len;
} }
/* Less dangerous now, memmove properly copies the two /* Less dangerous now, memmove properly copies the two
chunks of overlapping data */ * chunks of overlapping data */
memmove(pkt->data, &pkt->data[vo_len], frame_len - vo_len); memmove(pkt->data, &pkt->data[vo_len], frame_len - vo_len);
pkt->size = frame_len - vo_len; pkt->size = frame_len - vo_len;
} }
...@@ -306,46 +306,47 @@ static void xvid_correct_framerate(AVCodecContext *avctx) ...@@ -306,46 +306,47 @@ static void xvid_correct_framerate(AVCodecContext *avctx)
fbase = avctx->time_base.num; fbase = avctx->time_base.num;
gcd = av_gcd(frate, fbase); gcd = av_gcd(frate, fbase);
if( gcd > 1 ) { if (gcd > 1) {
frate /= gcd; frate /= gcd;
fbase /= gcd; fbase /= gcd;
} }
if( frate <= 65000 && fbase <= 65000 ) { if (frate <= 65000 && fbase <= 65000) {
avctx->time_base.den = frate; avctx->time_base.den = frate;
avctx->time_base.num = fbase; avctx->time_base.num = fbase;
return; return;
} }
fps = (float)frate / (float)fbase; fps = (float) frate / (float) fbase;
est_fps = roundf(fps * 1000.0) / 1000.0; est_fps = roundf(fps * 1000.0) / 1000.0;
est_frate = (int)est_fps; est_frate = (int) est_fps;
if( est_fps > (int)est_fps ) { if (est_fps > (int) est_fps) {
est_frate = (est_frate + 1) * 1000; est_frate = (est_frate + 1) * 1000;
est_fbase = (int)roundf((float)est_frate / est_fps); est_fbase = (int) roundf((float) est_frate / est_fps);
} else } else
est_fbase = 1; est_fbase = 1;
gcd = av_gcd(est_frate, est_fbase); gcd = av_gcd(est_frate, est_fbase);
if( gcd > 1 ) { if (gcd > 1) {
est_frate /= gcd; est_frate /= gcd;
est_fbase /= gcd; est_fbase /= gcd;
} }
if( fbase > est_fbase ) { if (fbase > est_fbase) {
avctx->time_base.den = est_frate; avctx->time_base.den = est_frate;
avctx->time_base.num = est_fbase; avctx->time_base.num = est_fbase;
av_log(avctx, AV_LOG_DEBUG, 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)); est_fps, (((est_fps - fps) / fps) * 100.0));
} else { } else {
avctx->time_base.den = frate; avctx->time_base.den = frate;
avctx->time_base.num = fbase; avctx->time_base.num = fbase;
} }
} }
static av_cold int xvid_encode_init(AVCodecContext *avctx) { static av_cold int xvid_encode_init(AVCodecContext *avctx)
{
int xerr, i; int xerr, i;
int xvid_flags = avctx->flags; int xvid_flags = avctx->flags;
struct xvid_context *x = avctx->priv_data; struct xvid_context *x = avctx->priv_data;
...@@ -364,34 +365,33 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx) { ...@@ -364,34 +365,33 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx) {
/* Bring in VOP flags from avconv command-line */ /* Bring in VOP flags from avconv command-line */
x->vop_flags = XVID_VOP_HALFPEL; /* Bare minimum quality */ x->vop_flags = XVID_VOP_HALFPEL; /* Bare minimum quality */
if( xvid_flags & CODEC_FLAG_4MV ) if (xvid_flags & CODEC_FLAG_4MV)
x->vop_flags |= XVID_VOP_INTER4V; /* Level 3 */ x->vop_flags |= XVID_VOP_INTER4V; /* Level 3 */
if( avctx->trellis if (avctx->trellis)
)
x->vop_flags |= XVID_VOP_TRELLISQUANT; /* Level 5 */ x->vop_flags |= XVID_VOP_TRELLISQUANT; /* Level 5 */
if( xvid_flags & CODEC_FLAG_AC_PRED ) if (xvid_flags & CODEC_FLAG_AC_PRED)
x->vop_flags |= XVID_VOP_HQACPRED; /* Level 6 */ x->vop_flags |= XVID_VOP_HQACPRED; /* Level 6 */
if( xvid_flags & CODEC_FLAG_GRAY ) if (xvid_flags & CODEC_FLAG_GRAY)
x->vop_flags |= XVID_VOP_GREYSCALE; x->vop_flags |= XVID_VOP_GREYSCALE;
/* Decide which ME quality setting to use */ /* Decide which ME quality setting to use */
x->me_flags = 0; x->me_flags = 0;
switch( avctx->me_method ) { switch (avctx->me_method) {
case ME_FULL: /* Quality 6 */ case ME_FULL: /* Quality 6 */
x->me_flags |= XVID_ME_EXTSEARCH16 x->me_flags |= XVID_ME_EXTSEARCH16 |
| XVID_ME_EXTSEARCH8; XVID_ME_EXTSEARCH8;
case ME_EPZS: /* Quality 4 */ case ME_EPZS: /* Quality 4 */
x->me_flags |= XVID_ME_ADVANCEDDIAMOND8 x->me_flags |= XVID_ME_ADVANCEDDIAMOND8 |
| XVID_ME_HALFPELREFINE8 XVID_ME_HALFPELREFINE8 |
| XVID_ME_CHROMA_PVOP XVID_ME_CHROMA_PVOP |
| XVID_ME_CHROMA_BVOP; XVID_ME_CHROMA_BVOP;
case ME_LOG: /* Quality 2 */ case ME_LOG: /* Quality 2 */
case ME_PHODS: case ME_PHODS:
case ME_X1: case ME_X1:
x->me_flags |= XVID_ME_ADVANCEDDIAMOND16 x->me_flags |= XVID_ME_ADVANCEDDIAMOND16 |
| XVID_ME_HALFPELREFINE16; XVID_ME_HALFPELREFINE16;
case ME_ZERO: /* Quality 0 */ case ME_ZERO: /* Quality 0 */
default: default:
...@@ -399,19 +399,18 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx) { ...@@ -399,19 +399,18 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx) {
} }
/* Decide how we should decide blocks */ /* Decide how we should decide blocks */
switch( avctx->mb_decision ) { switch (avctx->mb_decision) {
case 2: case 2:
x->vop_flags |= XVID_VOP_MODEDECISION_RD; x->vop_flags |= XVID_VOP_MODEDECISION_RD;
x->me_flags |= XVID_ME_HALFPELREFINE8_RD x->me_flags |= XVID_ME_HALFPELREFINE8_RD |
| XVID_ME_QUARTERPELREFINE8_RD XVID_ME_QUARTERPELREFINE8_RD |
| XVID_ME_EXTSEARCH_RD XVID_ME_EXTSEARCH_RD |
| XVID_ME_CHECKPREDICTION_RD; XVID_ME_CHECKPREDICTION_RD;
case 1: case 1:
if( !(x->vop_flags & XVID_VOP_MODEDECISION_RD) ) if (!(x->vop_flags & XVID_VOP_MODEDECISION_RD))
x->vop_flags |= XVID_VOP_FAST_MODEDECISION_RD; x->vop_flags |= XVID_VOP_FAST_MODEDECISION_RD;
x->me_flags |= XVID_ME_HALFPELREFINE16_RD x->me_flags |= XVID_ME_HALFPELREFINE16_RD |
| XVID_ME_QUARTERPELREFINE16_RD; XVID_ME_QUARTERPELREFINE16_RD;
default: default:
break; break;
} }
...@@ -427,10 +426,10 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx) { ...@@ -427,10 +426,10 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx) {
x->vol_flags |= XVID_VOL_GMC; x->vol_flags |= XVID_VOL_GMC;
x->me_flags |= XVID_ME_GME_REFINE; x->me_flags |= XVID_ME_GME_REFINE;
} }
if( xvid_flags & CODEC_FLAG_QPEL ) { if (xvid_flags & CODEC_FLAG_QPEL) {
x->vol_flags |= XVID_VOL_QUARTERPEL; x->vol_flags |= XVID_VOL_QUARTERPEL;
x->me_flags |= XVID_ME_QUARTERPELREFINE16; x->me_flags |= XVID_ME_QUARTERPELREFINE16;
if( x->vop_flags & XVID_VOP_INTER4V ) if (x->vop_flags & XVID_VOP_INTER4V)
x->me_flags |= XVID_ME_QUARTERPELREFINE8; x->me_flags |= XVID_ME_QUARTERPELREFINE8;
} }
...@@ -445,8 +444,10 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx) { ...@@ -445,8 +444,10 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx) {
xvid_enc_create.version = XVID_VERSION; xvid_enc_create.version = XVID_VERSION;
/* Store the desired frame size */ /* Store the desired frame size */
xvid_enc_create.width = x->xsize = avctx->width; xvid_enc_create.width =
xvid_enc_create.height = x->ysize = avctx->height; 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; */ /* xvid_enc_create.profile = XVID_PROFILE_S_L3; */
...@@ -465,7 +466,7 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx) { ...@@ -465,7 +466,7 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx) {
x->old_twopassbuffer = NULL; x->old_twopassbuffer = NULL;
x->twopassfile = NULL; x->twopassfile = NULL;
if( xvid_flags & CODEC_FLAG_PASS1 ) { if (xvid_flags & CODEC_FLAG_PASS1) {
rc2pass1.version = XVID_VERSION; rc2pass1.version = XVID_VERSION;
rc2pass1.context = x; rc2pass1.context = x;
x->twopassbuffer = av_malloc(BUFFER_SIZE); x->twopassbuffer = av_malloc(BUFFER_SIZE);
...@@ -475,19 +476,19 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx) { ...@@ -475,19 +476,19 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx) {
"Xvid: Cannot allocate 2-pass log buffers\n"); "Xvid: Cannot allocate 2-pass log buffers\n");
return -1; return -1;
} }
x->twopassbuffer[0] = x->old_twopassbuffer[0] = 0; x->twopassbuffer[0] =
x->old_twopassbuffer[0] = 0;
plugins[xvid_enc_create.num_plugins].func = xvid_ff_2pass; plugins[xvid_enc_create.num_plugins].func = xvid_ff_2pass;
plugins[xvid_enc_create.num_plugins].param = &rc2pass1; plugins[xvid_enc_create.num_plugins].param = &rc2pass1;
xvid_enc_create.num_plugins++; xvid_enc_create.num_plugins++;
} else if( xvid_flags & CODEC_FLAG_PASS2 ) { } else if (xvid_flags & CODEC_FLAG_PASS2) {
rc2pass2.version = XVID_VERSION; rc2pass2.version = XVID_VERSION;
rc2pass2.bitrate = avctx->bit_rate; rc2pass2.bitrate = avctx->bit_rate;
fd = ff_tempfile("xvidff.", &x->twopassfile); fd = ff_tempfile("xvidff.", &x->twopassfile);
if( fd == -1 ) { if (fd == -1) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR, "Xvid: Cannot write 2-pass pipe\n");
"Xvid: Cannot write 2-pass pipe\n");
return -1; return -1;
} }
...@@ -497,11 +498,10 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx) { ...@@ -497,11 +498,10 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx) {
return -1; return -1;
} }
if( strlen(avctx->stats_in) > if (strlen(avctx->stats_in) >
write(fd, avctx->stats_in, strlen(avctx->stats_in)) ) { write(fd, avctx->stats_in, strlen(avctx->stats_in))) {
close(fd); close(fd);
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR, "Xvid: Cannot write to 2-pass pipe\n");
"Xvid: Cannot write to 2-pass pipe\n");
return -1; return -1;
} }
...@@ -510,7 +510,7 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx) { ...@@ -510,7 +510,7 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx) {
plugins[xvid_enc_create.num_plugins].func = xvid_plugin_2pass2; plugins[xvid_enc_create.num_plugins].func = xvid_plugin_2pass2;
plugins[xvid_enc_create.num_plugins].param = &rc2pass2; plugins[xvid_enc_create.num_plugins].param = &rc2pass2;
xvid_enc_create.num_plugins++; xvid_enc_create.num_plugins++;
} else if( !(xvid_flags & CODEC_FLAG_QSCALE) ) { } else if (!(xvid_flags & CODEC_FLAG_QSCALE)) {
/* Single Pass Bitrate Control! */ /* Single Pass Bitrate Control! */
single.version = XVID_VERSION; single.version = XVID_VERSION;
single.bitrate = avctx->bit_rate; single.bitrate = avctx->bit_rate;
...@@ -536,8 +536,8 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx) { ...@@ -536,8 +536,8 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx) {
/* The old behavior is that when avctx->lumi_masking is specified, /* The old behavior is that when avctx->lumi_masking is specified,
* plugins[...].param = NULL. Trying to keep the old behavior here. */ * plugins[...].param = NULL. Trying to keep the old behavior here. */
plugins[xvid_enc_create.num_plugins].param = avctx->lumi_masking ? NULL plugins[xvid_enc_create.num_plugins].param =
: &masking_l; avctx->lumi_masking ? NULL : &masking_l;
xvid_enc_create.num_plugins++; xvid_enc_create.num_plugins++;
} }
...@@ -564,14 +564,16 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx) { ...@@ -564,14 +564,16 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx) {
xvid_correct_framerate(avctx); xvid_correct_framerate(avctx);
xvid_enc_create.fincr = avctx->time_base.num; xvid_enc_create.fincr = avctx->time_base.num;
xvid_enc_create.fbase = avctx->time_base.den; xvid_enc_create.fbase = avctx->time_base.den;
if( avctx->gop_size > 0 ) if (avctx->gop_size > 0)
xvid_enc_create.max_key_interval = avctx->gop_size; xvid_enc_create.max_key_interval = avctx->gop_size;
else else
xvid_enc_create.max_key_interval = 240; /* Xvid's best default */ xvid_enc_create.max_key_interval = 240; /* Xvid's best default */
/* Quants */ /* Quants */
if( xvid_flags & CODEC_FLAG_QSCALE ) x->qscale = 1; if (xvid_flags & CODEC_FLAG_QSCALE)
else x->qscale = 0; x->qscale = 1;
else
x->qscale = 0;
xvid_enc_create.min_quant[0] = avctx->qmin; xvid_enc_create.min_quant[0] = avctx->qmin;
xvid_enc_create.min_quant[1] = avctx->qmin; xvid_enc_create.min_quant[1] = avctx->qmin;
...@@ -581,48 +583,49 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx) { ...@@ -581,48 +583,49 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx) {
xvid_enc_create.max_quant[2] = avctx->qmax; xvid_enc_create.max_quant[2] = avctx->qmax;
/* Quant Matrices */ /* Quant Matrices */
x->intra_matrix = x->inter_matrix = NULL; x->intra_matrix =
if( avctx->mpeg_quant ) x->inter_matrix = NULL;
if (avctx->mpeg_quant)
x->vol_flags |= XVID_VOL_MPEGQUANT; x->vol_flags |= XVID_VOL_MPEGQUANT;
if( (avctx->intra_matrix || avctx->inter_matrix) ) { if ((avctx->intra_matrix || avctx->inter_matrix)) {
x->vol_flags |= XVID_VOL_MPEGQUANT; x->vol_flags |= XVID_VOL_MPEGQUANT;
if( avctx->intra_matrix ) { if (avctx->intra_matrix) {
intra = avctx->intra_matrix; intra = avctx->intra_matrix;
x->intra_matrix = av_malloc(sizeof(unsigned char) * 64); x->intra_matrix = av_malloc(sizeof(unsigned char) * 64);
} else } else
intra = NULL; intra = NULL;
if( avctx->inter_matrix ) { if (avctx->inter_matrix) {
inter = avctx->inter_matrix; inter = avctx->inter_matrix;
x->inter_matrix = av_malloc(sizeof(unsigned char) * 64); x->inter_matrix = av_malloc(sizeof(unsigned char) * 64);
} else } else
inter = NULL; inter = NULL;
for( i = 0; i < 64; i++ ) { for (i = 0; i < 64; i++) {
if( intra ) if (intra)
x->intra_matrix[i] = (unsigned char)intra[i]; x->intra_matrix[i] = (unsigned char) intra[i];
if( inter ) if (inter)
x->inter_matrix[i] = (unsigned char)inter[i]; x->inter_matrix[i] = (unsigned char) inter[i];
} }
} }
/* Misc Settings */ /* Misc Settings */
xvid_enc_create.frame_drop_ratio = 0; xvid_enc_create.frame_drop_ratio = 0;
xvid_enc_create.global = 0; xvid_enc_create.global = 0;
if( xvid_flags & CODEC_FLAG_CLOSED_GOP ) if (xvid_flags & CODEC_FLAG_CLOSED_GOP)
xvid_enc_create.global |= XVID_GLOBAL_CLOSED_GOP; xvid_enc_create.global |= XVID_GLOBAL_CLOSED_GOP;
/* Determines which codec mode we are operating in */ /* Determines which codec mode we are operating in */
avctx->extradata = NULL; avctx->extradata = NULL;
avctx->extradata_size = 0; avctx->extradata_size = 0;
if( xvid_flags & CODEC_FLAG_GLOBAL_HEADER ) { if (xvid_flags & CODEC_FLAG_GLOBAL_HEADER) {
/* In this case, we are claiming to be MPEG4 */ /* In this case, we are claiming to be MPEG4 */
x->quicktime_format = 1; x->quicktime_format = 1;
avctx->codec_id = AV_CODEC_ID_MPEG4; avctx->codec_id = AV_CODEC_ID_MPEG4;
} else { } else {
/* We are claiming to be Xvid */ /* We are claiming to be Xvid */
x->quicktime_format = 0; x->quicktime_format = 0;
if(!avctx->codec_tag) if (!avctx->codec_tag)
avctx->codec_tag = AV_RL32("xvid"); avctx->codec_tag = AV_RL32("xvid");
} }
...@@ -630,11 +633,12 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx) { ...@@ -630,11 +633,12 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx) {
xvid_enc_create.max_bframes = avctx->max_b_frames; xvid_enc_create.max_bframes = avctx->max_b_frames;
xvid_enc_create.bquant_offset = 100 * avctx->b_quant_offset; xvid_enc_create.bquant_offset = 100 * avctx->b_quant_offset;
xvid_enc_create.bquant_ratio = 100 * avctx->b_quant_factor; 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; if (avctx->max_b_frames > 0 && !x->quicktime_format)
xvid_enc_create.global |= XVID_GLOBAL_PACKED;
/* Create encoder context */ /* Create encoder context */
xerr = xvid_encore(NULL, XVID_ENC_CREATE, &xvid_enc_create, NULL); xerr = xvid_encore(NULL, XVID_ENC_CREATE, &xvid_enc_create, NULL);
if( xerr ) { 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; return -1;
} }
...@@ -651,17 +655,17 @@ static int xvid_encode_frame(AVCodecContext *avctx, AVPacket *pkt, ...@@ -651,17 +655,17 @@ static int xvid_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
const AVFrame *picture, int *got_packet) const AVFrame *picture, int *got_packet)
{ {
int xerr, i, ret, user_packet = !!pkt->data; int xerr, i, ret, user_packet = !!pkt->data;
char *tmp;
struct xvid_context *x = avctx->priv_data; struct xvid_context *x = avctx->priv_data;
AVFrame *p = avctx->coded_frame; AVFrame *p = avctx->coded_frame;
int mb_width = (avctx->width + 15) / 16; int mb_width = (avctx->width + 15) / 16;
int mb_height = (avctx->height + 15) / 16; int mb_height = (avctx->height + 15) / 16;
char *tmp;
xvid_enc_frame_t xvid_enc_frame = { 0 }; xvid_enc_frame_t xvid_enc_frame = { 0 };
xvid_enc_stats_t xvid_enc_stats = { 0 }; xvid_enc_stats_t xvid_enc_stats = { 0 };
if (!user_packet && if (!user_packet &&
(ret = av_new_packet(pkt, mb_width*mb_height*MAX_MB_BYTES + FF_MIN_BUFFER_SIZE)) < 0) { (ret = av_new_packet(pkt, mb_width * mb_height * MAX_MB_BYTES + FF_MIN_BUFFER_SIZE)) < 0) {
av_log(avctx, AV_LOG_ERROR, "Error getting output packet.\n"); av_log(avctx, AV_LOG_ERROR, "Error getting output packet.\n");
return ret; return ret;
} }
...@@ -675,14 +679,15 @@ static int xvid_encode_frame(AVCodecContext *avctx, AVPacket *pkt, ...@@ -675,14 +679,15 @@ static int xvid_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
xvid_enc_frame.length = pkt->size; xvid_enc_frame.length = pkt->size;
/* Initialize input image fields */ /* Initialize input image fields */
if( avctx->pix_fmt != AV_PIX_FMT_YUV420P ) { if (avctx->pix_fmt != AV_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; return -1;
} }
xvid_enc_frame.input.csp = XVID_CSP_PLANAR; /* YUV420P */ xvid_enc_frame.input.csp = XVID_CSP_PLANAR; /* YUV420P */
for( i = 0; i < 4; i++ ) { for (i = 0; i < 4; i++) {
xvid_enc_frame.input.plane[i] = picture->data[i]; xvid_enc_frame.input.plane[i] = picture->data[i];
xvid_enc_frame.input.stride[i] = picture->linesize[i]; xvid_enc_frame.input.stride[i] = picture->linesize[i];
} }
...@@ -709,8 +714,10 @@ static int xvid_encode_frame(AVCodecContext *avctx, AVPacket *pkt, ...@@ -709,8 +714,10 @@ static int xvid_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
xvid_enc_frame.par_height = avctx->sample_aspect_ratio.den; xvid_enc_frame.par_height = avctx->sample_aspect_ratio.den;
/* Quant Setting */ /* Quant Setting */
if( x->qscale ) xvid_enc_frame.quant = picture->quality / FF_QP2LAMBDA; if (x->qscale)
else xvid_enc_frame.quant = 0; xvid_enc_frame.quant = picture->quality / FF_QP2LAMBDA;
else
xvid_enc_frame.quant = 0;
/* Matrices */ /* Matrices */
xvid_enc_frame.quant_intra_matrix = x->intra_matrix; xvid_enc_frame.quant_intra_matrix = x->intra_matrix;
...@@ -722,12 +729,12 @@ static int xvid_encode_frame(AVCodecContext *avctx, AVPacket *pkt, ...@@ -722,12 +729,12 @@ static int xvid_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
/* Two-pass log buffer swapping */ /* Two-pass log buffer swapping */
avctx->stats_out = NULL; avctx->stats_out = NULL;
if( x->twopassbuffer ) { if (x->twopassbuffer) {
tmp = x->old_twopassbuffer; tmp = x->old_twopassbuffer;
x->old_twopassbuffer = x->twopassbuffer; x->old_twopassbuffer = x->twopassbuffer;
x->twopassbuffer = tmp; x->twopassbuffer = tmp;
x->twopassbuffer[0] = 0; x->twopassbuffer[0] = 0;
if( x->old_twopassbuffer[0] != 0 ) { if (x->old_twopassbuffer[0] != 0) {
avctx->stats_out = x->old_twopassbuffer; avctx->stats_out = x->old_twopassbuffer;
} }
} }
...@@ -736,18 +743,18 @@ static int xvid_encode_frame(AVCodecContext *avctx, AVPacket *pkt, ...@@ -736,18 +743,18 @@ static int xvid_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
*got_packet = 1; *got_packet = 1;
p->quality = xvid_enc_stats.quant * FF_QP2LAMBDA; p->quality = xvid_enc_stats.quant * FF_QP2LAMBDA;
if( xvid_enc_stats.type == XVID_TYPE_PVOP ) if (xvid_enc_stats.type == XVID_TYPE_PVOP)
p->pict_type = AV_PICTURE_TYPE_P; p->pict_type = AV_PICTURE_TYPE_P;
else if( xvid_enc_stats.type == XVID_TYPE_BVOP ) else if (xvid_enc_stats.type == XVID_TYPE_BVOP)
p->pict_type = AV_PICTURE_TYPE_B; p->pict_type = AV_PICTURE_TYPE_B;
else if( xvid_enc_stats.type == XVID_TYPE_SVOP ) else if (xvid_enc_stats.type == XVID_TYPE_SVOP)
p->pict_type = AV_PICTURE_TYPE_S; p->pict_type = AV_PICTURE_TYPE_S;
else else
p->pict_type = AV_PICTURE_TYPE_I; p->pict_type = AV_PICTURE_TYPE_I;
if( xvid_enc_frame.out_flags & XVID_KEYFRAME ) { if (xvid_enc_frame.out_flags & XVID_KEYFRAME) {
p->key_frame = 1; p->key_frame = 1;
pkt->flags |= AV_PKT_FLAG_KEY; pkt->flags |= AV_PKT_FLAG_KEY;
if( x->quicktime_format ) if (x->quicktime_format)
return xvid_strip_vol_header(avctx, pkt, return xvid_strip_vol_header(avctx, pkt,
xvid_enc_stats.hlength, xerr); xvid_enc_stats.hlength, xerr);
} else } else
...@@ -761,12 +768,14 @@ static int xvid_encode_frame(AVCodecContext *avctx, AVPacket *pkt, ...@@ -761,12 +768,14 @@ static int xvid_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
av_free_packet(pkt); av_free_packet(pkt);
if (!xerr) if (!xerr)
return 0; return 0;
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; return -1;
} }
} }
static av_cold int xvid_encode_close(AVCodecContext *avctx) { static av_cold int xvid_encode_close(AVCodecContext *avctx)
{
struct xvid_context *x = avctx->priv_data; struct xvid_context *x = avctx->priv_data;
xvid_encore(x->encoder_handle, XVID_ENC_DESTROY, NULL, NULL); xvid_encore(x->encoder_handle, XVID_ENC_DESTROY, NULL, NULL);
...@@ -813,6 +822,6 @@ AVCodec ff_libxvid_encoder = { ...@@ -813,6 +822,6 @@ AVCodec ff_libxvid_encoder = {
.init = xvid_encode_init, .init = xvid_encode_init,
.encode2 = xvid_encode_frame, .encode2 = xvid_encode_frame,
.close = xvid_encode_close, .close = xvid_encode_close,
.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE },
.priv_class = &xvid_class, .priv_class = &xvid_class,
}; };
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
* common functions for use with the Xvid wrappers * common functions for use with the Xvid wrappers
*/ */
int ff_tempfile(const char *prefix, char **filename); int ff_tempfile(const char *prefix, char **filename);
#endif /* AVCODEC_LIBXVID_H */ #endif /* AVCODEC_LIBXVID_H */
...@@ -21,28 +21,28 @@ ...@@ -21,28 +21,28 @@
*/ */
#include "config.h" #include "config.h"
#include <xvid.h>
#include <unistd.h>
#if !HAVE_MKSTEMP #if !HAVE_MKSTEMP
#include <fcntl.h> #include <fcntl.h>
#endif #endif
#include <unistd.h>
#include <xvid.h>
#include "libavutil/attributes.h" #include "libavutil/attributes.h"
#include "libavutil/internal.h" #include "libavutil/internal.h"
#include "avcodec.h" #include "avcodec.h"
#include "libxvid.h" #include "libxvid.h"
#include "mpegvideo.h" #include "mpegvideo.h"
#undef NDEBUG
#include <assert.h>
/* Wrapper to work around the lack of mkstemp() on mingw. /* Wrapper to work around the lack of mkstemp() on mingw.
* Also, tries to create file in /tmp first, if possible. * Also, tries to create file in /tmp first, if possible.
* *prefix can be a character constant; *filename will be allocated internally. * *prefix can be a character constant; *filename will be allocated internally.
* @return file descriptor of opened file (or -1 on error) * @return file descriptor of opened file (or -1 on error)
* and opened file name in **filename. */ * and opened file name in **filename. */
int ff_tempfile(const char *prefix, char **filename) { int ff_tempfile(const char *prefix, char **filename)
int fd=-1; {
int fd = -1;
#if !HAVE_MKSTEMP #if !HAVE_MKSTEMP
*filename = tempnam(".", prefix); *filename = tempnam(".", prefix);
#else #else
...@@ -79,94 +79,105 @@ av_cold int ff_xvid_rate_control_init(MpegEncContext *s) ...@@ -79,94 +79,105 @@ av_cold int ff_xvid_rate_control_init(MpegEncContext *s)
xvid_plg_create_t xvid_plg_create = { 0 }; xvid_plg_create_t xvid_plg_create = { 0 };
xvid_plugin_2pass2_t xvid_2pass2 = { 0 }; xvid_plugin_2pass2_t xvid_2pass2 = { 0 };
fd=ff_tempfile("xvidrc.", &tmp_name); fd = ff_tempfile("xvidrc.", &tmp_name);
if (fd == -1) { if (fd == -1) {
av_log(NULL, AV_LOG_ERROR, "Can't create temporary pass2 file.\n"); av_log(NULL, AV_LOG_ERROR, "Can't create temporary pass2 file.\n");
return -1; return -1;
} }
for(i=0; i<s->rc_context.num_entries; i++){ for (i = 0; i < s->rc_context.num_entries; i++) {
static const char frame_types[] = " ipbs"; static const char frame_types[] = " ipbs";
char tmp[256]; char tmp[256];
RateControlEntry *rce; RateControlEntry *rce;
rce= &s->rc_context.entry[i]; rce = &s->rc_context.entry[i];
snprintf(tmp, sizeof(tmp), "%c %d %d %d %d %d %d\n", 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, frame_types[rce->pict_type],
rce->skip_count, (rce->i_tex_bits + rce->p_tex_bits + rce->misc_bits+7)/8, (rce->header_bits+rce->mv_bits+7)/8); (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);
write(fd, tmp, strlen(tmp)); write(fd, tmp, strlen(tmp));
} }
close(fd); close(fd);
xvid_2pass2.version= XVID_MAKE_VERSION(1,1,0); xvid_2pass2.version = XVID_MAKE_VERSION(1, 1, 0);
xvid_2pass2.filename= tmp_name; xvid_2pass2.filename = tmp_name;
xvid_2pass2.bitrate= s->avctx->bit_rate; xvid_2pass2.bitrate = s->avctx->bit_rate;
xvid_2pass2.vbv_size= s->avctx->rc_buffer_size; xvid_2pass2.vbv_size = s->avctx->rc_buffer_size;
xvid_2pass2.vbv_maxrate= s->avctx->rc_max_rate; xvid_2pass2.vbv_maxrate = s->avctx->rc_max_rate;
xvid_2pass2.vbv_initial= s->avctx->rc_initial_buffer_occupancy; xvid_2pass2.vbv_initial = s->avctx->rc_initial_buffer_occupancy;
xvid_plg_create.version= XVID_MAKE_VERSION(1,1,0); xvid_plg_create.version = XVID_MAKE_VERSION(1, 1, 0);
xvid_plg_create.fbase= s->avctx->time_base.den; xvid_plg_create.fbase = s->avctx->time_base.den;
xvid_plg_create.fincr= s->avctx->time_base.num; xvid_plg_create.fincr = s->avctx->time_base.num;
xvid_plg_create.param= &xvid_2pass2; xvid_plg_create.param = &xvid_2pass2;
if(xvid_plugin_2pass2(NULL, XVID_PLG_CREATE, &xvid_plg_create, &s->rc_context.non_lavc_opaque)<0){ 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"); av_log(NULL, AV_LOG_ERROR, "xvid_plugin_2pass2 failed\n");
return -1; return -1;
} }
return 0; return 0;
} }
float ff_xvid_rate_estimate_qscale(MpegEncContext *s, int dry_run){ float ff_xvid_rate_estimate_qscale(MpegEncContext *s, int dry_run)
{
xvid_plg_data_t xvid_plg_data = { 0 }; xvid_plg_data_t xvid_plg_data = { 0 };
xvid_plg_data.version= XVID_MAKE_VERSION(1,1,0); xvid_plg_data.version = XVID_MAKE_VERSION(1, 1, 0);
xvid_plg_data.width = s->width; xvid_plg_data.width = s->width;
xvid_plg_data.height= s->height; xvid_plg_data.height = s->height;
xvid_plg_data.mb_width = s->mb_width; xvid_plg_data.mb_width = s->mb_width;
xvid_plg_data.mb_height= s->mb_height; xvid_plg_data.mb_height = s->mb_height;
xvid_plg_data.fbase= s->avctx->time_base.den; xvid_plg_data.fbase = s->avctx->time_base.den;
xvid_plg_data.fincr= s->avctx->time_base.num; xvid_plg_data.fincr = s->avctx->time_base.num;
xvid_plg_data.min_quant[0]= s->avctx->qmin; xvid_plg_data.min_quant[0] = s->avctx->qmin;
xvid_plg_data.min_quant[1]= 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.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[0] = s->avctx->qmax;
xvid_plg_data.max_quant[1]= 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.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_offset = 0; // 100 * s->avctx->b_quant_offset;
xvid_plg_data.bquant_ratio = 100; // * s->avctx->b_quant_factor; xvid_plg_data.bquant_ratio = 100; // * s->avctx->b_quant_factor;
if(!s->rc_context.dry_run_qscale){ if (!s->rc_context.dry_run_qscale) {
if(s->picture_number){ if (s->picture_number) {
xvid_plg_data.length= xvid_plg_data.length =
xvid_plg_data.stats.length= (s->frame_bits + 7)/8; xvid_plg_data.stats.length = (s->frame_bits + 7) / 8;
xvid_plg_data.frame_num= s->rc_context.last_picture_number; xvid_plg_data.frame_num = s->rc_context.last_picture_number;
xvid_plg_data.quant= s->qscale; xvid_plg_data.quant = s->qscale;
xvid_plg_data.type = s->last_pict_type;
xvid_plg_data.type= s->last_pict_type; if (xvid_plugin_2pass2(s->rc_context.non_lavc_opaque,
if(xvid_plugin_2pass2(s->rc_context.non_lavc_opaque, XVID_PLG_AFTER, &xvid_plg_data, NULL)){ XVID_PLG_AFTER, &xvid_plg_data, NULL)) {
av_log(s->avctx, AV_LOG_ERROR, "xvid_plugin_2pass2(handle, XVID_PLG_AFTER, ...) FAILED\n"); av_log(s->avctx, AV_LOG_ERROR,
"xvid_plugin_2pass2(handle, XVID_PLG_AFTER, ...) FAILED\n");
return -1; return -1;
} }
} }
s->rc_context.last_picture_number= s->rc_context.last_picture_number =
xvid_plg_data.frame_num= s->picture_number; xvid_plg_data.frame_num = s->picture_number;
xvid_plg_data.quant= 0; xvid_plg_data.quant = 0;
if(xvid_plugin_2pass2(s->rc_context.non_lavc_opaque, XVID_PLG_BEFORE, &xvid_plg_data, NULL)){ if (xvid_plugin_2pass2(s->rc_context.non_lavc_opaque,
av_log(s->avctx, AV_LOG_ERROR, "xvid_plugin_2pass2(handle, XVID_PLG_BEFORE, ...) FAILED\n"); 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; return -1;
} }
s->rc_context.dry_run_qscale= xvid_plg_data.quant; s->rc_context.dry_run_qscale = xvid_plg_data.quant;
} }
xvid_plg_data.quant= s->rc_context.dry_run_qscale; xvid_plg_data.quant = s->rc_context.dry_run_qscale;
if(!dry_run) if (!dry_run)
s->rc_context.dry_run_qscale= 0; s->rc_context.dry_run_qscale = 0;
if(s->pict_type == AV_PICTURE_TYPE_B) //FIXME this is not exactly identical to xvid // 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; if (s->pict_type == AV_PICTURE_TYPE_B)
return xvid_plg_data.quant * FF_QP2LAMBDA * s->avctx->b_quant_factor +
s->avctx->b_quant_offset;
else else
return xvid_plg_data.quant * FF_QP2LAMBDA; return xvid_plg_data.quant * FF_QP2LAMBDA;
} }
...@@ -175,5 +186,6 @@ av_cold void ff_xvid_rate_control_uninit(MpegEncContext *s) ...@@ -175,5 +186,6 @@ av_cold void ff_xvid_rate_control_uninit(MpegEncContext *s)
{ {
xvid_plg_destroy_t xvid_plg_destroy; xvid_plg_destroy_t xvid_plg_destroy;
xvid_plugin_2pass2(s->rc_context.non_lavc_opaque, XVID_PLG_DESTROY, &xvid_plg_destroy, NULL); xvid_plugin_2pass2(s->rc_context.non_lavc_opaque, XVID_PLG_DESTROY,
&xvid_plg_destroy, NULL);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment