mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-11 09:57:54 +02:00
Merge remote-tracking branch 'qatar/master'
* qatar/master: libx264: add 'cplxblur' private option libx264: add 'deblock' private option libx264: add 'b-bias' private option libx264: fix setting some options. libx264: remove useless assignment ac3dec: avoid pointless alloc and indirection for input_buffer mpeg12: cosmetics: reformat as K&R Conflicts: libavcodec/libx264.c libavcodec/mpeg12.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
commit
2fd4901921
@ -2481,12 +2481,14 @@ typedef struct AVCodecContext {
|
||||
*/
|
||||
int chromaoffset;
|
||||
|
||||
#if FF_API_X264_GLOBAL_OPTS
|
||||
/**
|
||||
* Influences how often B-frames are used.
|
||||
* - encoding: Set by user.
|
||||
* - decoding: unused
|
||||
*/
|
||||
int bframebias;
|
||||
attribute_deprecated int bframebias;
|
||||
#endif
|
||||
|
||||
/**
|
||||
* trellis RD quantization
|
||||
@ -2495,12 +2497,13 @@ typedef struct AVCodecContext {
|
||||
*/
|
||||
int trellis;
|
||||
|
||||
#if FF_API_X264_GLOBAL_OPTS
|
||||
/**
|
||||
* Reduce fluctuations in qp (before curve compression).
|
||||
* - encoding: Set by user.
|
||||
* - decoding: unused
|
||||
*/
|
||||
float complexityblur;
|
||||
attribute_deprecated float complexityblur;
|
||||
|
||||
/**
|
||||
* in-loop deblocking filter alphac0 parameter
|
||||
@ -2508,7 +2511,7 @@ typedef struct AVCodecContext {
|
||||
* - encoding: Set by user.
|
||||
* - decoding: unused
|
||||
*/
|
||||
int deblockalpha;
|
||||
attribute_deprecated int deblockalpha;
|
||||
|
||||
/**
|
||||
* in-loop deblocking filter beta parameter
|
||||
@ -2516,7 +2519,8 @@ typedef struct AVCodecContext {
|
||||
* - encoding: Set by user.
|
||||
* - decoding: unused
|
||||
*/
|
||||
int deblockbeta;
|
||||
attribute_deprecated int deblockbeta;
|
||||
#endif
|
||||
|
||||
/**
|
||||
* macroblock subpartition sizes to consider - p8x8, p4x4, b8x8, i8x8, i4x4
|
||||
|
||||
@ -57,12 +57,15 @@ typedef struct X264Context {
|
||||
int weightb;
|
||||
int ssim;
|
||||
int intra_refresh;
|
||||
int b_bias;
|
||||
int b_pyramid;
|
||||
int mixed_refs;
|
||||
int dct8x8;
|
||||
int fast_pskip;
|
||||
int aud;
|
||||
int mbtree;
|
||||
char *deblock;
|
||||
float cplxblur;
|
||||
} X264Context;
|
||||
|
||||
static void X264_log(void *p, int level, const char *fmt, va_list args)
|
||||
@ -232,39 +235,26 @@ static void check_default_settings(AVCodecContext *avctx)
|
||||
} \
|
||||
} while (0);
|
||||
|
||||
#define PARSE_X264_OPT(name, var)\
|
||||
if (x4->var && x264_param_parse(&x4->params, name, x4->var) < 0) {\
|
||||
av_log(avctx, AV_LOG_ERROR, "Error parsing option '%s' with value '%s'.\n", name, x4->var);\
|
||||
return AVERROR(EINVAL);\
|
||||
}
|
||||
|
||||
static av_cold int X264_init(AVCodecContext *avctx)
|
||||
{
|
||||
X264Context *x4 = avctx->priv_data;
|
||||
|
||||
x4->sei_size = 0;
|
||||
x264_param_default(&x4->params);
|
||||
|
||||
x4->params.i_keyint_max = avctx->gop_size;
|
||||
|
||||
x4->params.i_bframe = avctx->max_b_frames;
|
||||
x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC;
|
||||
x4->params.i_bframe_adaptive = avctx->b_frame_strategy;
|
||||
x4->params.i_bframe_bias = avctx->bframebias;
|
||||
|
||||
x4->params.i_keyint_min = avctx->keyint_min;
|
||||
if (x4->params.i_keyint_min > x4->params.i_keyint_max)
|
||||
x4->params.i_keyint_min = x4->params.i_keyint_max;
|
||||
|
||||
x4->params.i_scenecut_threshold = avctx->scenechange_threshold;
|
||||
|
||||
x4->params.b_deblocking_filter = avctx->flags & CODEC_FLAG_LOOP_FILTER;
|
||||
x4->params.i_deblocking_filter_alphac0 = avctx->deblockalpha;
|
||||
x4->params.i_deblocking_filter_beta = avctx->deblockbeta;
|
||||
|
||||
x4->params.rc.i_qp_min = avctx->qmin;
|
||||
x4->params.rc.i_qp_max = avctx->qmax;
|
||||
x4->params.rc.i_qp_step = avctx->max_qdiff;
|
||||
|
||||
x4->params.rc.f_qcompress = avctx->qcompress; /* 0.0 => cbr, 1.0 => constant qp */
|
||||
x4->params.rc.f_qblur = avctx->qblur; /* temporally blur quants */
|
||||
x4->params.rc.f_complexity_blur = avctx->complexityblur;
|
||||
|
||||
x4->params.i_frame_reference = avctx->refs;
|
||||
|
||||
x4->params.analyse.inter = 0;
|
||||
if (avctx->partitions) {
|
||||
@ -389,6 +379,14 @@ static av_cold int X264_init(AVCodecContext *avctx)
|
||||
x4->params.rc.i_lookahead = avctx->rc_lookahead;
|
||||
if (avctx->weighted_p_pred >= 0)
|
||||
x4->params.analyse.i_weighted_pred = avctx->weighted_p_pred;
|
||||
if (avctx->bframebias)
|
||||
x4->params.i_bframe_bias = avctx->bframebias;
|
||||
if (avctx->deblockalpha)
|
||||
x4->params.i_deblocking_filter_alphac0 = avctx->deblockalpha;
|
||||
if (avctx->deblockbeta)
|
||||
x4->params.i_deblocking_filter_beta = avctx->deblockbeta;
|
||||
if (avctx->complexityblur >= 0)
|
||||
x4->params.rc.f_complexity_blur = avctx->complexityblur;
|
||||
x4->params.analyse.b_ssim = avctx->flags2 & CODEC_FLAG2_SSIM;
|
||||
x4->params.b_intra_refresh = avctx->flags2 & CODEC_FLAG2_INTRA_REFRESH;
|
||||
x4->params.i_bframe_pyramid = avctx->flags2 & CODEC_FLAG2_BPYRAMID ? X264_B_PYRAMID_NORMAL : X264_B_PYRAMID_NONE;
|
||||
@ -401,14 +399,31 @@ static av_cold int X264_init(AVCodecContext *avctx)
|
||||
x4->params.rc.b_mb_tree = !!(avctx->flags2 & CODEC_FLAG2_MBTREE);
|
||||
#endif
|
||||
|
||||
if (avctx->gop_size >= 0)
|
||||
x4->params.i_keyint_max = avctx->gop_size;
|
||||
if (avctx->max_b_frames >= 0)
|
||||
x4->params.i_bframe = avctx->max_b_frames;
|
||||
if (avctx->scenechange_threshold >= 0)
|
||||
x4->params.i_scenecut_threshold = avctx->scenechange_threshold;
|
||||
if (avctx->qmin >= 0)
|
||||
x4->params.rc.i_qp_min = avctx->qmin;
|
||||
if (avctx->qmax >= 0)
|
||||
x4->params.rc.i_qp_max = avctx->qmax;
|
||||
if (avctx->max_qdiff >= 0)
|
||||
x4->params.rc.i_qp_step = avctx->max_qdiff;
|
||||
if (avctx->qblur >= 0)
|
||||
x4->params.rc.f_qblur = avctx->qblur; /* temporally blur quants */
|
||||
if (avctx->qcompress >= 0)
|
||||
x4->params.rc.f_qcompress = avctx->qcompress; /* 0.0 => cbr, 1.0 => constant qp */
|
||||
if (avctx->refs >= 0)
|
||||
x4->params.i_frame_reference = avctx->refs;
|
||||
|
||||
if (x4->aq_mode >= 0)
|
||||
x4->params.rc.i_aq_mode = x4->aq_mode;
|
||||
if (x4->aq_strength >= 0)
|
||||
x4->params.rc.f_aq_strength = x4->aq_strength;
|
||||
if (x4->psy_rd && x264_param_parse(&x4->params, "psy-rd", x4->psy_rd) < 0) {
|
||||
av_log(avctx, AV_LOG_ERROR, "Error parsing option 'psy-rd' with value '%s'.\n", x4->psy_rd);
|
||||
return AVERROR(EINVAL);
|
||||
}
|
||||
PARSE_X264_OPT("psy-rd", psy_rd);
|
||||
PARSE_X264_OPT("deblock", deblock);
|
||||
if (x4->psy >= 0)
|
||||
x4->params.analyse.b_psy = x4->psy;
|
||||
if (x4->rc_lookahead >= 0)
|
||||
@ -417,11 +432,15 @@ static av_cold int X264_init(AVCodecContext *avctx)
|
||||
x4->params.analyse.i_weighted_pred = x4->weightp;
|
||||
if (x4->weightb >= 0)
|
||||
x4->params.analyse.b_weighted_bipred = x4->weightb;
|
||||
if (x4->cplxblur >= 0)
|
||||
x4->params.rc.f_complexity_blur = x4->cplxblur;
|
||||
|
||||
if (x4->ssim >= 0)
|
||||
x4->params.analyse.b_ssim = x4->ssim;
|
||||
if (x4->intra_refresh >= 0)
|
||||
x4->params.b_intra_refresh = x4->intra_refresh;
|
||||
if (x4->b_bias != INT_MIN)
|
||||
x4->params.i_bframe_bias = x4->b_bias;
|
||||
if (x4->b_pyramid >= 0)
|
||||
x4->params.i_bframe_pyramid = x4->b_pyramid;
|
||||
if (x4->mixed_refs >= 0)
|
||||
@ -527,6 +546,7 @@ static const AVOption options[] = {
|
||||
{ "smart", NULL, 0, FF_OPT_TYPE_CONST, {X264_WEIGHTP_SMART}, INT_MIN, INT_MAX, VE, "weightp" },
|
||||
{ "ssim", "Calculate and print SSIM stats.", OFFSET(ssim), FF_OPT_TYPE_INT, {-1 }, -1, 1, VE },
|
||||
{ "intra-refresh", "Use Periodic Intra Refresh instead of IDR frames.",OFFSET(intra_refresh),FF_OPT_TYPE_INT, {-1 }, -1, 1, VE },
|
||||
{ "b-bias", "Influences how often B-frames are used", OFFSET(b_bias), FF_OPT_TYPE_INT, {INT_MIN}, INT_MIN, INT_MAX, VE },
|
||||
{ "b-pyramid", "Keep some B-frames as references.", OFFSET(b_pyramid), FF_OPT_TYPE_INT, {-1 }, -1, INT_MAX, VE, "b_pyramid" },
|
||||
{ "none", NULL, 0, FF_OPT_TYPE_CONST, {X264_B_PYRAMID_NONE}, INT_MIN, INT_MAX, VE, "b_pyramid" },
|
||||
{ "strict", "Strictly hierarchical pyramid", 0, FF_OPT_TYPE_CONST, {X264_B_PYRAMID_STRICT}, INT_MIN, INT_MAX, VE, "b_pyramid" },
|
||||
@ -536,6 +556,8 @@ static const AVOption options[] = {
|
||||
{ "fast-pskip", NULL, OFFSET(fast_pskip), FF_OPT_TYPE_INT, {-1 }, -1, 1, VE},
|
||||
{ "aud", "Use access unit delimiters.", OFFSET(aud), FF_OPT_TYPE_INT, {-1 }, -1, 1, VE},
|
||||
{ "mbtree", "Use macroblock tree ratecontrol.", OFFSET(mbtree), FF_OPT_TYPE_INT, {-1 }, -1, 1, VE},
|
||||
{ "deblock", "Loop filter parameters, in <alpha:beta> form.", OFFSET(deblock), FF_OPT_TYPE_STRING, { 0 }, 0, 0, VE},
|
||||
{ "cplxblur", "Reduce fluctuations in QP (before curve compression)", OFFSET(cplxblur), FF_OPT_TYPE_FLOAT, {-1 }, -1, FLT_MAX, VE},
|
||||
{ NULL },
|
||||
};
|
||||
|
||||
@ -548,6 +570,15 @@ static const AVClass class = {
|
||||
|
||||
static const AVCodecDefault x264_defaults[] = {
|
||||
{ "b", "0" },
|
||||
{ "bf", "-1" },
|
||||
{ "g", "-1" },
|
||||
{ "qmin", "-1" },
|
||||
{ "qmax", "-1" },
|
||||
{ "qdiff", "-1" },
|
||||
{ "qblur", "-1" },
|
||||
{ "qcomp", "-1" },
|
||||
{ "refs", "-1" },
|
||||
{ "sc_threshold", "-1" },
|
||||
{ "threads", AV_STRINGIFY(X264_THREADS_AUTO) },
|
||||
{ NULL },
|
||||
};
|
||||
|
||||
1477
libavcodec/mpeg12.c
1477
libavcodec/mpeg12.c
File diff suppressed because it is too large
Load Diff
@ -147,11 +147,11 @@ static const AVOption options[]={
|
||||
{"frame_number", NULL, OFFSET(frame_number), FF_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX},
|
||||
{"delay", NULL, OFFSET(delay), FF_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX},
|
||||
{"qcomp", "video quantizer scale compression (VBR)", OFFSET(qcompress), FF_OPT_TYPE_FLOAT, {.dbl = 0.5 }, -FLT_MAX, FLT_MAX, V|E},
|
||||
{"qblur", "video quantizer scale blur (VBR)", OFFSET(qblur), FF_OPT_TYPE_FLOAT, {.dbl = 0.5 }, 0, FLT_MAX, V|E},
|
||||
{"qmin", "min video quantizer scale (VBR)", OFFSET(qmin), FF_OPT_TYPE_INT, {.dbl = 2 }, 0, 69, V|E},
|
||||
{"qmax", "max video quantizer scale (VBR)", OFFSET(qmax), FF_OPT_TYPE_INT, {.dbl = 31 }, 0, 69, V|E},
|
||||
{"qblur", "video quantizer scale blur (VBR)", OFFSET(qblur), FF_OPT_TYPE_FLOAT, {.dbl = 0.5 }, -1, FLT_MAX, V|E},
|
||||
{"qmin", "min video quantizer scale (VBR)", OFFSET(qmin), FF_OPT_TYPE_INT, {.dbl = 2 }, -1, 69, V|E},
|
||||
{"qmax", "max video quantizer scale (VBR)", OFFSET(qmax), FF_OPT_TYPE_INT, {.dbl = 31 }, -1, 69, V|E},
|
||||
{"qdiff", "max difference between the quantizer scale (VBR)", OFFSET(max_qdiff), FF_OPT_TYPE_INT, {.dbl = 3 }, INT_MIN, INT_MAX, V|E},
|
||||
{"bf", "use 'frames' B frames", OFFSET(max_b_frames), FF_OPT_TYPE_INT, {.dbl = DEFAULT }, 0, FF_MAX_B_FRAMES, V|E},
|
||||
{"bf", "use 'frames' B frames", OFFSET(max_b_frames), FF_OPT_TYPE_INT, {.dbl = DEFAULT }, -1, FF_MAX_B_FRAMES, V|E},
|
||||
{"b_qfactor", "qp factor between p and b frames", OFFSET(b_quant_factor), FF_OPT_TYPE_FLOAT, {.dbl = 1.25 }, -FLT_MAX, FLT_MAX, V|E},
|
||||
{"rc_strategy", "ratecontrol method", OFFSET(rc_strategy), FF_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E},
|
||||
{"b_strategy", "strategy to choose between I/P/B-frames", OFFSET(b_frame_strategy), FF_OPT_TYPE_INT, {.dbl = 0 }, INT_MIN, INT_MAX, V|E},
|
||||
@ -398,7 +398,9 @@ static const AVOption options[]={
|
||||
{"keyint_min", "minimum interval between IDR-frames", OFFSET(keyint_min), FF_OPT_TYPE_INT, {.dbl = 25 }, INT_MIN, INT_MAX, V|E},
|
||||
{"refs", "reference frames to consider for motion compensation", OFFSET(refs), FF_OPT_TYPE_INT, {.dbl = 1 }, INT_MIN, INT_MAX, V|E},
|
||||
{"chromaoffset", "chroma qp offset from luma", OFFSET(chromaoffset), FF_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E},
|
||||
#if FF_API_X264_GLOBAL_OPTS
|
||||
{"bframebias", "influences how often B-frames are used", OFFSET(bframebias), FF_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E},
|
||||
#endif
|
||||
{"trellis", "rate-distortion optimal quantization", OFFSET(trellis), FF_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|A|E},
|
||||
{"directpred", "direct mv prediction mode - 0 (none), 1 (spatial), 2 (temporal), 3 (auto)", OFFSET(directpred), FF_OPT_TYPE_INT, {.dbl = 2 }, INT_MIN, INT_MAX, V|E},
|
||||
#if FF_API_X264_GLOBAL_OPTS
|
||||
@ -410,9 +412,11 @@ static const AVOption options[]={
|
||||
{"aud", "access unit delimiters (H.264)", 0, FF_OPT_TYPE_CONST, {.dbl = CODEC_FLAG2_AUD }, INT_MIN, INT_MAX, V|E, "flags2"},
|
||||
#endif
|
||||
{"skiprd", "RD optimal MB level residual skipping", 0, FF_OPT_TYPE_CONST, {.dbl = CODEC_FLAG2_SKIP_RD }, INT_MIN, INT_MAX, V|E, "flags2"},
|
||||
{"complexityblur", "reduce fluctuations in qp (before curve compression)", OFFSET(complexityblur), FF_OPT_TYPE_FLOAT, {.dbl = 20.0 }, FLT_MIN, FLT_MAX, V|E},
|
||||
#if FF_API_X264_GLOBAL_OPTS
|
||||
{"complexityblur", "reduce fluctuations in qp (before curve compression)", OFFSET(complexityblur), FF_OPT_TYPE_FLOAT, {.dbl = -1 }, -1, FLT_MAX, V|E},
|
||||
{"deblockalpha", "in-loop deblocking filter alphac0 parameter", OFFSET(deblockalpha), FF_OPT_TYPE_INT, {.dbl = DEFAULT }, -6, 6, V|E},
|
||||
{"deblockbeta", "in-loop deblocking filter beta parameter", OFFSET(deblockbeta), FF_OPT_TYPE_INT, {.dbl = DEFAULT }, -6, 6, V|E},
|
||||
#endif
|
||||
{"partitions", "macroblock subpartition sizes to consider", OFFSET(partitions), FF_OPT_TYPE_FLAGS, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E, "partitions"},
|
||||
{"parti4x4", NULL, 0, FF_OPT_TYPE_CONST, {.dbl = X264_PART_I4X4 }, INT_MIN, INT_MAX, V|E, "partitions"},
|
||||
{"parti8x8", NULL, 0, FF_OPT_TYPE_CONST, {.dbl = X264_PART_I8X8 }, INT_MIN, INT_MAX, V|E, "partitions"},
|
||||
|
||||
Loading…
Reference in New Issue
Block a user