falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

Drop libxvid rate control support for mpegvideo encoding 

The feature has outlived is usefulness and complicates the code.
tags/n3.4
Diego Biurrun 8 years ago
parent
ac648bb835
commit
a6901b9c6b
6 changed files with 30 additions and 255 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +0
    -1
      libavcodec/Makefile
  2. +29
    -2
      libavcodec/libxvid.c
  3. +0
    -38
      libavcodec/libxvid.h
  4. +0
    -181
      libavcodec/libxvid_rc.c
  5. +1
    -3
      libavcodec/mpegvideo.h
  6. +0
    -30
      libavcodec/mpegvideo_enc.c

+ 0
- 1
libavcodec/Makefile View File

@@ -76,7 +76,6 @@ OBJS-$(CONFIG_IMDCT15) += imdct15.o
OBJS-$(CONFIG_INTRAX8) += intrax8.o intrax8dsp.o OBJS-$(CONFIG_INTRAX8) += intrax8.o intrax8dsp.o
OBJS-$(CONFIG_IVIDSP) += ivi_dsp.o OBJS-$(CONFIG_IVIDSP) += ivi_dsp.o
OBJS-$(CONFIG_JPEGTABLES) += jpegtables.o OBJS-$(CONFIG_JPEGTABLES) += jpegtables.o
OBJS-$(CONFIG_LIBXVID) += libxvid_rc.o
OBJS-$(CONFIG_LPC) += lpc.o OBJS-$(CONFIG_LPC) += lpc.o
OBJS-$(CONFIG_LSP) += lsp.o OBJS-$(CONFIG_LSP) += lsp.o
OBJS-$(CONFIG_LZF) += lzf.o OBJS-$(CONFIG_LZF) += lzf.o


+ 29
- 2
libavcodec/libxvid.c View File

@@ -26,6 +26,7 @@
*/ */


#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <xvid.h> #include <xvid.h>
@@ -39,7 +40,6 @@


#include "avcodec.h" #include "avcodec.h"
#include "internal.h" #include "internal.h"
#include "libxvid.h"
#include "mpegutils.h" #include "mpegutils.h"


/** /**
@@ -359,6 +359,33 @@ static void xvid_correct_framerate(AVCodecContext *avctx)
} }
} }


/* Create temporary file using mkstemp(), tries /tmp first, if possible.
* *prefix can be a character constant; *filename will be allocated internally.
* Return file descriptor of opened file (or error code on error)
* and opened file name in **filename. */
static int xvid_tempfile(AVCodecContext *avctx, const char *prefix,
char **filename)
{
int fd = -1;
size_t len = strlen(prefix) + 12; /* room for "/tmp/" and "XXXXXX\0" */
*filename = av_malloc(len);
if (!(*filename)) {
av_log(avctx, AV_LOG_ERROR, "xvid_tempfile: Cannot allocate file name\n");
return AVERROR(ENOMEM);
}
snprintf(*filename, len, "/tmp/%sXXXXXX", prefix);
fd = mkstemp(*filename);
if (fd < 0) {
snprintf(*filename, len, "./%sXXXXXX", prefix);
fd = mkstemp(*filename);
}
if (fd < 0) {
av_log(avctx, AV_LOG_ERROR, "xvid_tempfile: Cannot open temporary file %s\n", *filename);
return AVERROR(EIO);
}
return fd; /* success */
}

static av_cold int xvid_encode_init(AVCodecContext *avctx) static av_cold int xvid_encode_init(AVCodecContext *avctx)
{ {
int xerr, i; int xerr, i;
@@ -519,7 +546,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
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 = xvid_tempfile(avctx, "xvidff.", &x->twopassfile);
if (fd < 0) { if (fd < 0) {
av_log(avctx, AV_LOG_ERROR, "Xvid: Cannot write 2-pass pipe\n"); av_log(avctx, AV_LOG_ERROR, "Xvid: Cannot write 2-pass pipe\n");
return fd; return fd;


+ 0
- 38
libavcodec/libxvid.h View File

@@ -1,38 +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_H
#define AVCODEC_LIBXVID_H

/**
* @file
* common functions for use with the Xvid wrappers
*/

int ff_tempfile(const char *prefix, char **filename);

struct MpegEncContext;

/* rate control */
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_LIBXVID_H */

+ 0
- 181
libavcodec/libxvid_rc.c View File

@@ -1,181 +0,0 @@
/*
* Xvid rate control wrapper for lavc video encoders
*
* Copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
*
* 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 "config.h"

#include <fcntl.h>
#include <unistd.h>
#include <xvid.h>

#include "libavutil/attributes.h"
#include "libavutil/internal.h"

#include "avcodec.h"
#include "libxvid.h"
#include "mpegvideo.h"

/* Create temporary file using mkstemp(), tries /tmp first, if possible.
* *prefix can be a character constant; *filename will be allocated internally.
* Return file descriptor of opened file (or error code on error)
* and opened file name in **filename. */
int ff_tempfile(const char *prefix, char **filename)
{
int fd = -1;
size_t len = strlen(prefix) + 12; /* room for "/tmp/" and "XXXXXX\0" */
*filename = av_malloc(len);
if (!(*filename)) {
av_log(NULL, AV_LOG_ERROR, "ff_tempfile: Cannot allocate file name\n");
return AVERROR(ENOMEM);
}
snprintf(*filename, len, "/tmp/%sXXXXXX", prefix);
fd = mkstemp(*filename);
if (fd < 0) {
snprintf(*filename, len, "./%sXXXXXX", prefix);
fd = mkstemp(*filename);
}
if (fd < 0) {
av_log(NULL, AV_LOG_ERROR, "ff_tempfile: Cannot open temporary file %s\n", *filename);
return AVERROR(EIO);
}
return fd; /* success */
}

av_cold int ff_xvid_rate_control_init(MpegEncContext *s)
{
char *tmp_name;
int fd, i;
xvid_plg_create_t xvid_plg_create = { 0 };
xvid_plugin_2pass2_t xvid_2pass2 = { 0 };

fd = ff_tempfile("xvidrc.", &tmp_name);
if (fd < 0) {
av_log(s, AV_LOG_ERROR, "Cannot create temporary pass2 file.\n");
return fd;
}

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);

if (strlen(tmp) > write(fd, tmp, strlen(tmp))) {
av_log(s, AV_LOG_ERROR, "Cannot write to temporary pass2 file.\n");
return AVERROR(EIO);
}
}

close(fd);

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;

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(s, 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 = { 0 };

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 (!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, 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, 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;

// FIXME this is not exactly identical to Xvid
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
return xvid_plg_data.quant * FF_QP2LAMBDA;
}

av_cold 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);
}

+ 1
- 3
libavcodec/mpegvideo.h View File

@@ -356,7 +356,6 @@ typedef struct MpegEncContext {
int prev_mb_info, last_mb_info; int prev_mb_info, last_mb_info;
uint8_t *mb_info_ptr; uint8_t *mb_info_ptr;
int mb_info_size; int mb_info_size;
int rc_strategy;


/* H.263+ specific */ /* H.263+ specific */
int umvplus; ///< == H.263+ && unrestricted_mv int umvplus; ///< == H.263+ && unrestricted_mv
@@ -602,8 +601,7 @@ FF_MPV_OPT_CMP_FUNC, \
{"lmax", "maximum Lagrange factor (VBR)", FF_MPV_OFFSET(lmax), AV_OPT_TYPE_INT, {.i64 = 31*FF_QP2LAMBDA }, 0, INT_MAX, FF_MPV_OPT_FLAGS }, \ {"lmax", "maximum Lagrange factor (VBR)", FF_MPV_OFFSET(lmax), AV_OPT_TYPE_INT, {.i64 = 31*FF_QP2LAMBDA }, 0, INT_MAX, FF_MPV_OPT_FLAGS }, \
{"ibias", "intra quant bias", FF_MPV_OFFSET(intra_quant_bias), AV_OPT_TYPE_INT, {.i64 = FF_DEFAULT_QUANT_BIAS }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \ {"ibias", "intra quant bias", FF_MPV_OFFSET(intra_quant_bias), AV_OPT_TYPE_INT, {.i64 = FF_DEFAULT_QUANT_BIAS }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \
{"pbias", "inter quant bias", FF_MPV_OFFSET(inter_quant_bias), AV_OPT_TYPE_INT, {.i64 = FF_DEFAULT_QUANT_BIAS }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \ {"pbias", "inter quant bias", FF_MPV_OFFSET(inter_quant_bias), AV_OPT_TYPE_INT, {.i64 = FF_DEFAULT_QUANT_BIAS }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \
{"rc_strategy", "ratecontrol method", FF_MPV_OFFSET(rc_strategy), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 1, FF_MPV_OPT_FLAGS }, \
{"motion_est", "motion estimation algorithm", FF_MPV_OFFSET(motion_est), AV_OPT_TYPE_INT, {.i64 = FF_ME_EPZS }, FF_ME_ZERO, FF_ME_XONE, FF_MPV_OPT_FLAGS, "motion_est" }, \
{"motion_est", "motion estimation algorithm", FF_MPV_OFFSET(motion_est), AV_OPT_TYPE_INT, {.i64 = FF_ME_EPZS }, FF_ME_ZERO, FF_ME_XONE, FF_MPV_OPT_FLAGS, "motion_est" }, \
{ "zero", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_ZERO }, 0, 0, FF_MPV_OPT_FLAGS, "motion_est" }, \ { "zero", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_ZERO }, 0, 0, FF_MPV_OPT_FLAGS, "motion_est" }, \
{ "epzs", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_EPZS }, 0, 0, FF_MPV_OPT_FLAGS, "motion_est" }, \ { "epzs", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_EPZS }, 0, 0, FF_MPV_OPT_FLAGS, "motion_est" }, \
{ "xone", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_XONE }, 0, 0, FF_MPV_OPT_FLAGS, "motion_est" }, \ { "xone", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_XONE }, 0, 0, FF_MPV_OPT_FLAGS, "motion_est" }, \


+ 0
- 30
libavcodec/mpegvideo_enc.c View File

@@ -60,7 +60,6 @@
#include "bytestream.h" #include "bytestream.h"
#include "wmv2.h" #include "wmv2.h"
#include "rv10.h" #include "rv10.h"
#include "libxvid.h"
#include <limits.h> #include <limits.h>


#define QUANT_BIAS_SHIFT 8 #define QUANT_BIAS_SHIFT 8
@@ -872,28 +871,9 @@ FF_ENABLE_DEPRECATION_WARNINGS
31, 0); 31, 0);
} }


#if FF_API_RC_STRATEGY
FF_DISABLE_DEPRECATION_WARNINGS
if (!s->rc_strategy)
s->rc_strategy = s->avctx->rc_strategy;
FF_ENABLE_DEPRECATION_WARNINGS
#endif

if (ff_rate_control_init(s) < 0) if (ff_rate_control_init(s) < 0)
return -1; return -1;


if ((s->avctx->flags & AV_CODEC_FLAG_PASS2) && s->rc_strategy == 1) {
#if CONFIG_LIBXVID
ret = ff_xvid_rate_control_init(s);
#else
ret = AVERROR(ENOSYS);
av_log(s->avctx, AV_LOG_ERROR,
"Xvid ratecontrol requires libavcodec compiled with Xvid support.\n");
#endif
if (ret < 0)
return ret;
}

#if FF_API_ERROR_RATE #if FF_API_ERROR_RATE
FF_DISABLE_DEPRECATION_WARNINGS FF_DISABLE_DEPRECATION_WARNINGS
if (avctx->error_rate) if (avctx->error_rate)
@@ -987,11 +967,6 @@ av_cold int ff_mpv_encode_end(AVCodecContext *avctx)
int i; int i;


ff_rate_control_uninit(s); ff_rate_control_uninit(s);
#if CONFIG_LIBXVID
if ((avctx->flags & AV_CODEC_FLAG_PASS2) && s->rc_strategy == 1)
ff_xvid_rate_control_uninit(s);
#endif

ff_mpv_common_end(s); ff_mpv_common_end(s);
if (CONFIG_MJPEG_ENCODER && if (CONFIG_MJPEG_ENCODER &&
s->out_format == FMT_MJPEG) s->out_format == FMT_MJPEG)
@@ -3438,11 +3413,6 @@ static int estimate_qp(MpegEncContext *s, int dry_run){
if(!dry_run) s->next_lambda= 0; if(!dry_run) s->next_lambda= 0;
} else if (!s->fixed_qscale) { } else if (!s->fixed_qscale) {
int quality; int quality;
#if CONFIG_LIBXVID
if ((s->avctx->flags & AV_CODEC_FLAG_PASS2) && s->rc_strategy == 1)
quality = ff_xvid_rate_estimate_qscale(s, dry_run);
else
#endif
quality = ff_rate_estimate_qscale(s, dry_run); quality = ff_rate_estimate_qscale(s, dry_run);
s->current_picture_ptr->f->quality = s->current_picture_ptr->f->quality =
s->current_picture.f->quality = quality; s->current_picture.f->quality = quality;


Write Preview
Loading…
Cancel
Save