virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity

Merge commit 'c2f7417eeb9cc31f75e71f7be2780f90f1628d7e'

Browse Source 
* commit 'c2f7417eeb9cc31f75e71f7be2780f90f1628d7e':
  vc1: move MpegEncContext.resync_marker into VC1Context.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-30 00:48:01 +01:00
commit 2d614e9be1
6 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/dxva2_vc1.c
View File

@ -97,7 +97,7 @@ static void fill_picture_parameters(AVCodecContext *avctx,
(v->vstransform );
pp->bPicOverflowBlocks = (v->quantizer_mode << 6) |
(v->multires << 5) |
(s->resync_marker << 4) |
(v->resync_marker << 4) |
(v->rangered << 3) |
(s->max_b_frames );
pp->bPicExtrapolation = (!v->interlace || v->fcm == PROGRESSIVE) ? 1 : 2;

2
libavcodec/mss2.c
View File

@ -778,7 +778,7 @@ static av_cold int wmv9_init(AVCodecContext *avctx)
v->overlap = 0;
v->s.resync_marker = 0;
v->resync_marker = 0;
v->rangered = 0;
v->s.max_b_frames = avctx->max_b_frames = 0;

2
libavcodec/vaapi_vc1.c
View File

@ -169,7 +169,7 @@ static int vaapi_vc1_start_frame(AVCodecContext *avctx, av_unused const uint8_t
pic_param->sequence_fields.bits.psf = v->psf;
pic_param->sequence_fields.bits.multires = v->multires;
pic_param->sequence_fields.bits.overlap = v->overlap;
pic_param->sequence_fields.bits.syncmarker = s->resync_marker;
pic_param->sequence_fields.bits.syncmarker = v->resync_marker;
pic_param->sequence_fields.bits.rangered = v->rangered;
pic_param->sequence_fields.bits.max_b_frames = s->avctx->max_b_frames;
#if VA_CHECK_VERSION(0,32,0)

4
libavcodec/vc1.c
View File

@ -367,7 +367,7 @@ int ff_vc1_decode_sequence_header(AVCodecContext *avctx, VC1Context *v, GetBitCo
v->overlap = get_bits1(gb); //common
v->s.resync_marker = get_bits1(gb);
v->resync_marker = get_bits1(gb);
v->rangered = get_bits1(gb);
if (v->rangered && v->profile == PROFILE_SIMPLE) {
av_log(avctx, AV_LOG_INFO,
@ -409,7 +409,7 @@ int ff_vc1_decode_sequence_header(AVCodecContext *avctx, VC1Context *v, GetBitCo
"DQuant=%i, Quantizer mode=%i, Max B frames=%i\n",
v->profile, v->frmrtq_postproc, v->bitrtq_postproc,
v->s.loop_filter, v->multires, v->fastuvmc, v->extended_mv,
v->rangered, v->vstransform, v->overlap, v->s.resync_marker,
v->rangered, v->vstransform, v->overlap, v->resync_marker,
v->dquant, v->quantizer_mode, avctx->max_b_frames);
return 0;
}

1
libavcodec/vc1.h
View File

@ -399,6 +399,7 @@ typedef struct VC1Context{
int end_mb_x; ///< Horizontal macroblock limit (used only by mss2)
int parse_only; ///< Context is used within parser
int resync_marker; ///< could this stream contain resync markers
} VC1Context;
/** Find VC-1 marker in buffer

2
libavcodec/vdpau_vc1.c
View File

@ -87,7 +87,7 @@ static int vdpau_vc1_start_frame(AVCodecContext *avctx,
info->range_mapuv = v->range_mapuv;
/* Specific to simple/main profile only */
info->multires = v->multires;
info->syncmarker = v->s.resync_marker;
info->syncmarker = v->resync_marker;
info->rangered = v->rangered | (v->rangeredfrm << 1);
info->maxbframes = v->s.max_b_frames;
info->deblockEnable = v->postprocflag & 1;