← Back to branch summary

~ubuntu-branches/ubuntu/quantal/gst-plugins-bad0.10/quantal-proposed

« back to all changes in this revision

Viewing changes to sys/vdpau/mpeg/gstvdpmpegdec.c

  • Committer: Bazaar Package Importer
  • Author(s): Ken VanDine
  • Date: 2011-07-19 14:32:43 UTC
  • mfrom: (18.4.21 sid)
  • Revision ID: james.westby@ubuntu.com-20110719143243-p7pnkh45akfp0ihk
Tags: 0.10.22-2ubuntu1
* Rebased on debian unstable, remaining changes:
  - debian/gstreamer-plugins-bad.install
    * don't include dtmf, liveadder, rtpmux, autoconvert and shm, we include 
      them in -good

Show diffs side-by-side

added added

removed removed

Lines of Context:
sys/vdpau/mpeg/gstvdpmpegdec.c
290
290
  VdpPictureInfoMPEG1Or2 *info;
291
291
  GstVdpMpegFrame *mpeg_frame;
292
292
 
293
 
  GstFlowReturn ret;
 
293
  GstFlowReturn ret = GST_FLOW_OK;
294
294
  VdpBitstreamBuffer vbit[1];
295
295
  GstVdpVideoBuffer *outbuf;
296
296
 
356
356
 
357
357
  if (info->picture_coding_type != B_FRAME) {
358
358
    if (info->backward_reference != VDP_INVALID_HANDLE) {
359
 
      gst_base_video_decoder_finish_frame (base_video_decoder,
 
359
      ret = gst_base_video_decoder_finish_frame (base_video_decoder,
360
360
          mpeg_dec->b_frame);
361
361
    }
362
362
 
371
371
    info->backward_reference = VDP_INVALID_HANDLE;
372
372
  }
373
373
 
 
374
  if (ret != GST_FLOW_OK) {
 
375
    gst_base_video_decoder_skip_frame (base_video_decoder, frame);
 
376
    return ret;
 
377
  }
 
378
 
374
379
  /* decode */
375
380
  vbit[0].struct_version = VDP_BITSTREAM_BUFFER_VERSION;
376
381
  vbit[0].bitstream = GST_BUFFER_DATA (mpeg_frame->slices);
384
389
  frame->src_buffer = GST_BUFFER_CAST (outbuf);
385
390
 
386
391
  if (info->picture_coding_type == B_FRAME) {
387
 
    gst_base_video_decoder_finish_frame (base_video_decoder, frame);
 
392
    ret = gst_base_video_decoder_finish_frame (base_video_decoder, frame);
388
393
  } else {
389
394
    info->backward_reference = GST_VDP_VIDEO_BUFFER (outbuf)->surface;
390
395
    mpeg_dec->b_frame = gst_video_frame_ref (frame);
391
396
  }
392
397
 
393
 
  return GST_FLOW_OK;
 
398
  return ret;
394
399
}
395
400
 
396
401
static GstVideoFrame *