RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-20 23:07:02 +00:00
Code Issues Releases Wiki Activity

Grayscale encoding/decoding with FFmpeg is no longer enabled, remove references

Browse Source 
from the documentation and the relevant options from the glue code.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26198 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2008-03-07 21:30:01 +00:00
parent 362446fef8
commit ca1fb12840
4 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog
View File

@ -43,6 +43,8 @@ MPlayer (1.0)
* reworked screensaver disabling support, most users will need to use
-heartbeat-cmd due to screensaver authors being unable to design a
common API
* grayscale decoding/encoding with FFmpeg disabled, it slowed down
the color case
Ports:
* small crash with vo_macosx fixed

9
DOCS/man/en/mplayer.1
View File

@ -3211,7 +3211,6 @@ Will usually only work with "\-fstype \-fullscreen" or "\-fstype none".
.TP
.B \-zrbw (\-vo zr only)
Display in black and white.
For optimal performance, this can be combined with '\-lavdopts gray'.
.
.TP
.B \-zrcrop <[width]x[height]+[x offset]+[y offset]> (\-vo zr only)
@ -4290,7 +4289,7 @@ Separate multiple options with a colon.
.I EXAMPLE:
.PD 0
.RSs
\-lavdopts gray:skiploopfilter=all:skipframe=nonref
\-lavdopts skiploopfilter=all:skipframe=nonref
.RE
.PD 1
.sp 1
@ -4391,8 +4390,6 @@ Enable optimizations which do not comply to the specification and might
potentially cause problems, like simpler dequantization, simpler motion
compensation, assuming use of the default quantization matrix, assuming
YUV 4:2:0 and skipping a few checks to detect damaged bitstreams.
.IPs "gray\ "
grayscale only decoding (a bit faster than with color)
.IPs "idct=<0\-99> (see \-lavcopts)"
For best decoding quality use the same IDCT algorithm for decoding and encoding.
This may come at a price in accuracy, though.
@ -8336,10 +8333,6 @@ good choice
slice structured mode for H.263+
.
.TP
.B "gray\ \ \ "
grayscale only encoding (faster)
.
.TP
.B vfdct=<0\-10>
DCT algorithm
.PD 0

3
libmpcodecs/vd_ffmpeg.c
View File

@ -71,7 +71,6 @@ static void mc_render_slice(struct AVCodecContext *s,
static int lavc_param_workaround_bugs= FF_BUG_AUTODETECT;
static int lavc_param_error_resilience=2;
static int lavc_param_error_concealment=3;
static int lavc_param_gray=0;
static int lavc_param_vstats=0;
static int lavc_param_idct_algo=0;
static int lavc_param_debug=0;
@ -90,7 +89,6 @@ static int lavc_param_bitexact=0;
const m_option_t lavc_decode_opts_conf[]={
{"bug", &lavc_param_workaround_bugs, CONF_TYPE_INT, CONF_RANGE, -1, 999999, NULL},
{"er", &lavc_param_error_resilience, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL},
{"gray", &lavc_param_gray, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART, NULL},
{"idct", &lavc_param_idct_algo, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL},
{"ec", &lavc_param_error_concealment, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL},
{"vstats", &lavc_param_vstats, CONF_TYPE_FLAG, 0, 0, 1, NULL},
@ -288,7 +286,6 @@ static int init(sh_video_t *sh){
avctx->height= sh->disp_h;
avctx->workaround_bugs= lavc_param_workaround_bugs;
avctx->error_resilience= lavc_param_error_resilience;
if(lavc_param_gray) avctx->flags|= CODEC_FLAG_GRAY;
#ifdef CODEC_FLAG2_FAST
avctx->flags2|= lavc_param_fast;
#endif

3
libmpcodecs/ve_lavc.c
View File

@ -67,7 +67,6 @@ static int lavc_param_chroma_elim_threshold = 0;
static int lavc_param_packet_size= 0;
static int lavc_param_strict= -1;
static int lavc_param_data_partitioning= 0;
static int lavc_param_gray=0;
static float lavc_param_rc_qsquish=1.0;
static float lavc_param_rc_qmod_amp=0;
static int lavc_param_rc_qmod_freq=0;
@ -196,7 +195,6 @@ m_option_t lavcopts_conf[]={
{"vstrict", &lavc_param_strict, CONF_TYPE_INT, CONF_RANGE, -99, 99, NULL},
{"vdpart", &lavc_param_data_partitioning, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART, NULL},
{"keyint", &lavc_param_keyint, CONF_TYPE_INT, 0, 0, 0, NULL},
{"gray", &lavc_param_gray, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART, NULL},
{"mpeg_quant", &lavc_param_mpeg_quant, CONF_TYPE_FLAG, 0, 0, 1, NULL},
{"vi_qfactor", &lavc_param_vi_qfactor, CONF_TYPE_FLOAT, CONF_RANGE, -31.0, 31.0, NULL},
{"vi_qoffset", &lavc_param_vi_qoffset, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 31.0, NULL},
@ -556,7 +554,6 @@ static int config(struct vf_instance_s* vf,
#ifdef CODEC_FLAG_CLOSED_GOP
lavc_venc_context->flags|= lavc_param_closed_gop;
#endif
if(lavc_param_gray) lavc_venc_context->flags|= CODEC_FLAG_GRAY;
if(lavc_param_normalize_aqp) lavc_venc_context->flags|= CODEC_FLAG_NORMALIZE_AQP;
if(lavc_param_interlaced_dct) lavc_venc_context->flags|= CODEC_FLAG_INTERLACED_DCT;