generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make B-frame reduction sensitivity by b_strategy/vb_strategy = 1

Browse Source 
user-tunable.

Originally committed as revision 5450 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Corey Hickey
2006-06-03 06:26:04 +00:00
parent 7e5370516b
commit f9243d34f1
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/avcodec.h
View File

@@ -1977,6 +1977,13 @@ typedef struct AVCodecContext {
* - decoding: unused * - decoding: unused
*/ */
int mv0_threshold; int mv0_threshold;
/**
* adjusts sensitivity of b_frame_strategy 1
* - encoding: set by user.
* - decoding: unused
*/
int b_sensitivity;
} AVCodecContext; } AVCodecContext;
/** /**

2
libavcodec/mpegvideo.c
View File

@@ -2375,7 +2375,7 @@ static void select_input_picture(MpegEncContext *s){
} }
} }
for(i=0; i<s->max_b_frames+1; i++){ for(i=0; i<s->max_b_frames+1; i++){
if(s->input_picture[i]==NULL || s->input_picture[i]->b_frame_score - 1 > s->mb_num/40) break; if(s->input_picture[i]==NULL || s->input_picture[i]->b_frame_score - 1 > s->mb_num/s->avctx->b_sensitivity) break;
} }
b_frames= FFMAX(0, i-1); b_frames= FFMAX(0, i-1);

2
libavcodec/utils.c
View File

@@ -741,6 +741,7 @@ static AVOption options[]={
{"sc_factor", NULL, OFFSET(scenechange_factor), FF_OPT_TYPE_INT, 6, 0, INT_MAX, V|E}, {"sc_factor", NULL, OFFSET(scenechange_factor), FF_OPT_TYPE_INT, 6, 0, INT_MAX, V|E},
{"mv0_threshold", NULL, OFFSET(mv0_threshold), FF_OPT_TYPE_INT, 256, 0, INT_MAX, V|E}, {"mv0_threshold", NULL, OFFSET(mv0_threshold), FF_OPT_TYPE_INT, 256, 0, INT_MAX, V|E},
{"ivlc", "intra vlc table", 0, FF_OPT_TYPE_CONST, CODEC_FLAG2_INTRA_VLC, INT_MIN, INT_MAX, V|E, "flags2"}, {"ivlc", "intra vlc table", 0, FF_OPT_TYPE_CONST, CODEC_FLAG2_INTRA_VLC, INT_MIN, INT_MAX, V|E, "flags2"},
{"b_sensitivity", NULL, OFFSET(b_sensitivity), FF_OPT_TYPE_INT, 40, 1, INT_MAX, V|E},
{NULL}, {NULL},
}; };
@@ -796,6 +797,7 @@ void avcodec_get_context_defaults(AVCodecContext *s){
s->nsse_weight= 8; s->nsse_weight= 8;
s->sample_fmt= SAMPLE_FMT_S16; // FIXME: set to NONE s->sample_fmt= SAMPLE_FMT_S16; // FIXME: set to NONE
s->mv0_threshold= 256; s->mv0_threshold= 256;
s->b_sensitivity= 40;
s->intra_quant_bias= FF_DEFAULT_QUANT_BIAS; s->intra_quant_bias= FF_DEFAULT_QUANT_BIAS;
s->inter_quant_bias= FF_DEFAULT_QUANT_BIAS; s->inter_quant_bias= FF_DEFAULT_QUANT_BIAS;