← Back to branch summary

~medibuntu-maintainers/mplayer/medibuntu.precise

« back to all changes in this revision

Viewing changes to ffmpeg/libavcodec/dxva2_vc1.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2012-01-12 22:23:28 UTC
  • mfrom: (0.4.7 sid)
  • mto: This revision was merged to the branch mainline in revision 76.
  • Revision ID: package-import@ubuntu.com-20120112222328-8jqdyodym3p84ygu
Tags: 2:1.0~rc4.dfsg1+svn34540-1
* New upstream snapshot
* upload to unstable

Show diffs side-by-side

added added

removed removed

Lines of Context:
ffmpeg/libavcodec/dxva2_vc1.c
68
68
        pp->bPicStructure      |= 0x01;
69
69
    if (s->picture_structure & PICT_BOTTOM_FIELD)
70
70
        pp->bPicStructure      |= 0x02;
71
 
    pp->bSecondField            = v->interlace && v->fcm != 0x03 && !s->first_field;
 
71
    pp->bSecondField            = v->interlace && v->fcm != ILACE_FIELD && !s->first_field;
72
72
    pp->bPicIntra               = s->pict_type == AV_PICTURE_TYPE_I;
73
73
    pp->bPicBackwardPrediction  = s->pict_type == AV_PICTURE_TYPE_B;
74
74
    pp->bBidirectionalAveragingMode = (1                                           << 7) |
100
100
                                  (s->resync_marker  << 4) |
101
101
                                  (v->rangered       << 3) |
102
102
                                  (s->max_b_frames       );
103
 
    pp->bPicExtrapolation       = (!v->interlace || v->fcm == 0x00) ? 1 : 2;
 
103
    pp->bPicExtrapolation       = (!v->interlace || v->fcm == PROGRESSIVE) ? 1 : 2;
104
104
    pp->bPicDeblocked           = ((v->profile != PROFILE_ADVANCED && v->rangeredfrm) << 5) |
105
105
                                  (s->loop_filter                                     << 1);
106
106
    pp->bPicDeblockConfined     = (v->postprocflag             << 7) |
161
161
    const VC1Context *v = avctx->priv_data;
162
162
    struct dxva_context *ctx = avctx->hwaccel_context;
163
163
    const MpegEncContext *s = &v->s;
164
 
    struct dxva2_picture_context *ctx_pic = s->current_picture_ptr->hwaccel_picture_private;
 
164
    struct dxva2_picture_context *ctx_pic = s->current_picture_ptr->f.hwaccel_picture_private;
165
165
 
166
166
    DXVA_SliceInfo *slice = &ctx_pic->si;
167
167
 
213
213
{
214
214
    const VC1Context *v = avctx->priv_data;
215
215
    struct dxva_context *ctx = avctx->hwaccel_context;
216
 
    struct dxva2_picture_context *ctx_pic = v->s.current_picture_ptr->hwaccel_picture_private;
 
216
    struct dxva2_picture_context *ctx_pic = v->s.current_picture_ptr->f.hwaccel_picture_private;
217
217
 
218
218
    if (!ctx->decoder || !ctx->cfg || ctx->surface_count <= 0)
219
219
        return -1;
231
231
{
232
232
    const VC1Context *v = avctx->priv_data;
233
233
    const Picture *current_picture = v->s.current_picture_ptr;
234
 
    struct dxva2_picture_context *ctx_pic = current_picture->hwaccel_picture_private;
 
234
    struct dxva2_picture_context *ctx_pic = current_picture->f.hwaccel_picture_private;
235
235
 
236
236
    if (ctx_pic->bitstream_size > 0)
237
237
        return -1;
252
252
static int end_frame(AVCodecContext *avctx)
253
253
{
254
254
    VC1Context *v = avctx->priv_data;
255
 
    struct dxva2_picture_context *ctx_pic = v->s.current_picture_ptr->hwaccel_picture_private;
 
255
    struct dxva2_picture_context *ctx_pic = v->s.current_picture_ptr->f.hwaccel_picture_private;
256
256
 
257
257
    if (ctx_pic->bitstream_size <= 0)
258
258
        return -1;
269
269
    .type           = AVMEDIA_TYPE_VIDEO,
270
270
    .id             = CODEC_ID_WMV3,
271
271
    .pix_fmt        = PIX_FMT_DXVA2_VLD,
272
 
    .capabilities   = 0,
273
272
    .start_frame    = start_frame,
274
273
    .decode_slice   = decode_slice,
275
274
    .end_frame      = end_frame,
282
281
    .type           = AVMEDIA_TYPE_VIDEO,
283
282
    .id             = CODEC_ID_VC1,
284
283
    .pix_fmt        = PIX_FMT_DXVA2_VLD,
285
 
    .capabilities   = 0,
286
284
    .start_frame    = start_frame,
287
285
    .decode_slice   = decode_slice,
288
286
    .end_frame      = end_frame,