diff options
| author | Gwenole Beauchesne <gwenole.beauchesne@intel.com> | 2013-04-16 13:23:41 +0200 |
|---|---|---|
| committer | Gwenole Beauchesne <gwenole.beauchesne@intel.com> | 2013-04-16 19:11:02 +0200 |
| commit | a24e2164660b909b43d2c916d6651514603e6c07 (patch) | |
| tree | 0974a97c64dfde3a5b2167633dcf8956f046ef5a /gst-libs/gst/vaapi/gstvaapidecoder.c | |
| parent | 2ac474b207e0848367661fc4769f72da50779d92 (diff) | |
| download | gst-vaapi-a24e2164660b909b43d2c916d6651514603e6c07.tar.gz | |
decoder: rename GstVaapiDecoderFrame to GstVaapiParserFrame.
Rename GstVaapiDecoderFrame to GstVaapiParserFrame because this data
structure was only useful to parsing and a proper GstvaapiDecoderFrame
instance will be created instead.
Diffstat (limited to 'gst-libs/gst/vaapi/gstvaapidecoder.c')
| -rw-r--r-- | gst-libs/gst/vaapi/gstvaapidecoder.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/gst-libs/gst/vaapi/gstvaapidecoder.c b/gst-libs/gst/vaapi/gstvaapidecoder.c index 1d3eb108..2a3dd76a 100644 --- a/gst-libs/gst/vaapi/gstvaapidecoder.c +++ b/gst-libs/gst/vaapi/gstvaapidecoder.c @@ -29,6 +29,7 @@ #include "gstvaapicompat.h" #include "gstvaapidecoder.h" #include "gstvaapidecoder_priv.h" +#include "gstvaapiparser_frame.h" #include "gstvaapisurfaceproxy_priv.h" #include "gstvaapiutils.h" #include "gstvaapi_priv.h" @@ -141,7 +142,7 @@ do_parse(GstVaapiDecoder *decoder, { GstVaapiDecoderPrivate * const priv = decoder->priv; GstVaapiParserState * const ps = &priv->parser_state; - GstVaapiDecoderFrame *frame; + GstVaapiParserFrame *frame; GstVaapiDecoderUnit *unit; GstVaapiDecoderStatus status; @@ -151,7 +152,7 @@ do_parse(GstVaapiDecoder *decoder, frame = gst_video_codec_frame_get_user_data(base_frame); if (!frame) { GstVideoCodecState * const codec_state = priv->codec_state; - frame = gst_vaapi_decoder_frame_new(codec_state->info.width, + frame = gst_vaapi_parser_frame_new(codec_state->info.width, codec_state->info.height); if (!frame) return GST_VAAPI_DECODER_STATUS_ERROR_ALLOCATION_FAILED; @@ -188,7 +189,7 @@ do_parse(GstVaapiDecoder *decoder, } got_unit: - gst_vaapi_decoder_frame_append_unit(frame, unit); + gst_vaapi_parser_frame_append_unit(frame, unit); *got_unit_size_ptr = unit->size; *got_frame_ptr = GST_VAAPI_DECODER_UNIT_IS_FRAME_END(unit); return GST_VAAPI_DECODER_STATUS_SUCCESS; @@ -214,7 +215,7 @@ do_decode_units(GstVaapiDecoder *decoder, GArray *units) } static GstVaapiDecoderStatus -do_decode_1(GstVaapiDecoder *decoder, GstVaapiDecoderFrame *frame) +do_decode_1(GstVaapiDecoder *decoder, GstVaapiParserFrame *frame) { GstVaapiDecoderClass * const klass = GST_VAAPI_DECODER_GET_CLASS(decoder); GstVaapiDecoderStatus status; @@ -261,14 +262,14 @@ static inline GstVaapiDecoderStatus do_decode(GstVaapiDecoder *decoder, GstVideoCodecFrame *base_frame) { GstVaapiParserState * const ps = &decoder->priv->parser_state; - GstVaapiDecoderFrame * const frame = base_frame->user_data; + GstVaapiParserFrame * const frame = base_frame->user_data; GstVaapiDecoderStatus status; ps->current_frame = base_frame; - gst_vaapi_decoder_frame_ref(frame); + gst_vaapi_parser_frame_ref(frame); status = do_decode_1(decoder, frame); - gst_vaapi_decoder_frame_unref(frame); + gst_vaapi_parser_frame_unref(frame); switch ((guint)status) { case GST_VAAPI_DECODER_STATUS_DROP_FRAME: |