From d72fcbe18a5931c6dfd1da73231c65fdb1f10737 Mon Sep 17 00:00:00 2001 From: Seungha Yang Date: Sun, 29 Mar 2020 22:35:06 +0900 Subject: [PATCH] codecs: Reorganize the order of vfunc ... to the order in which it is actually called Part-of: --- gst-libs/gst/codecs/gsth264decoder.h | 16 ++++++++-------- gst-libs/gst/codecs/gsth265decoder.h | 16 ++++++++-------- gst-libs/gst/codecs/gstvp9decoder.h | 16 ++++++++-------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/gst-libs/gst/codecs/gsth264decoder.h b/gst-libs/gst/codecs/gsth264decoder.h index 9c213bb8c0..ed22361323 100644 --- a/gst-libs/gst/codecs/gsth264decoder.h +++ b/gst-libs/gst/codecs/gsth264decoder.h @@ -65,11 +65,6 @@ struct _GstH264Decoder * Called whenever new #GstH264Picture is created. * Subclass can set implementation specific user data * on the #GstH264Picture via gst_h264_picture_set_user_data() - * @output_picture: Called with a #GstH264Picture which is required to be outputted. - * Subclass can retrieve parent #GstVideoCodecFrame by using - * gst_video_decoder_get_frame() with system_frame_number - * and the #GstVideoCodecFrame must be consumed by subclass via - * gst_video_decoder_{finish,drop,release}_frame(). * @start_picture: Optional. * Called per one #GstH264Picture to notify subclass to prepare * decoding process for the #GstH264Picture @@ -78,6 +73,11 @@ struct _GstH264Decoder * @end_picture: Optional. * Called per one #GstH264Picture to notify subclass to finish * decoding process for the #GstH264Picture + * @output_picture: Called with a #GstH264Picture which is required to be outputted. + * Subclass can retrieve parent #GstVideoCodecFrame by using + * gst_video_decoder_get_frame() with system_frame_number + * and the #GstVideoCodecFrame must be consumed by subclass via + * gst_video_decoder_{finish,drop,release}_frame(). */ struct _GstH264DecoderClass { @@ -90,9 +90,6 @@ struct _GstH264DecoderClass gboolean (*new_picture) (GstH264Decoder * decoder, GstH264Picture * picture); - GstFlowReturn (*output_picture) (GstH264Decoder * decoder, - GstH264Picture * picture); - gboolean (*start_picture) (GstH264Decoder * decoder, GstH264Picture * picture, GstH264Slice * slice, @@ -105,6 +102,9 @@ struct _GstH264DecoderClass gboolean (*end_picture) (GstH264Decoder * decoder, GstH264Picture * picture); + GstFlowReturn (*output_picture) (GstH264Decoder * decoder, + GstH264Picture * picture); + /*< private >*/ gpointer padding[GST_PADDING_LARGE]; }; diff --git a/gst-libs/gst/codecs/gsth265decoder.h b/gst-libs/gst/codecs/gsth265decoder.h index 82e653bc3f..b688e278d6 100644 --- a/gst-libs/gst/codecs/gsth265decoder.h +++ b/gst-libs/gst/codecs/gsth265decoder.h @@ -78,11 +78,6 @@ struct _GstH265Decoder * Called whenever new #GstH265Picture is created. * Subclass can set implementation specific user data * on the #GstH265Picture via gst_h265_picture_set_user_data() - * @output_picture: Called with a #GstH265Picture which is required to be outputted. - * Subclass can retrieve parent #GstVideoCodecFrame by using - * gst_video_decoder_get_frame() with system_frame_number - * and the #GstVideoCodecFrame must be consumed by subclass via - * gst_video_decoder_{finish,drop,release}_frame(). * @start_picture: Optional. * Called per one #GstH265Picture to notify subclass to prepare * decoding process for the #GstH265Picture @@ -91,6 +86,11 @@ struct _GstH265Decoder * @end_picture: Optional. * Called per one #GstH265Picture to notify subclass to finish * decoding process for the #GstH265Picture + * @output_picture: Called with a #GstH265Picture which is required to be outputted. + * Subclass can retrieve parent #GstVideoCodecFrame by using + * gst_video_decoder_get_frame() with system_frame_number + * and the #GstVideoCodecFrame must be consumed by subclass via + * gst_video_decoder_{finish,drop,release}_frame(). */ struct _GstH265DecoderClass { @@ -103,9 +103,6 @@ struct _GstH265DecoderClass gboolean (*new_picture) (GstH265Decoder * decoder, GstH265Picture * picture); - GstFlowReturn (*output_picture) (GstH265Decoder * decoder, - GstH265Picture * picture); - gboolean (*start_picture) (GstH265Decoder * decoder, GstH265Picture * picture, GstH265Slice * slice, @@ -118,6 +115,9 @@ struct _GstH265DecoderClass gboolean (*end_picture) (GstH265Decoder * decoder, GstH265Picture * picture); + GstFlowReturn (*output_picture) (GstH265Decoder * decoder, + GstH265Picture * picture); + /*< private >*/ gpointer padding[GST_PADDING_LARGE]; }; diff --git a/gst-libs/gst/codecs/gstvp9decoder.h b/gst-libs/gst/codecs/gstvp9decoder.h index d845209cb6..41350b4399 100644 --- a/gst-libs/gst/codecs/gstvp9decoder.h +++ b/gst-libs/gst/codecs/gstvp9decoder.h @@ -66,11 +66,6 @@ struct _GstVp9Decoder * Subclass can set implementation specific user data * on the #GstVp9Picture via gst_h264_picture_set_user_data() * @duplicate_picture: Duplicate the #GstVp9Picture - * @output_picture: Called with a #GstVp9Picture which is required to be outputted. - * Subclass can retrieve parent #GstVideoCodecFrame by using - * gst_video_decoder_get_frame() with system_frame_number - * and the #GstVideoCodecFrame must be consumed by subclass via - * gst_video_decoder_{finish,drop,release}_frame(). * @start_picture: Optional. * Called per one #GstVp9Picture to notify subclass to prepare * decoding process for the #GstVp9Picture @@ -79,6 +74,11 @@ struct _GstVp9Decoder * @end_picture: Optional. * Called per one #GstVp9Picture to notify subclass to finish * decoding process for the #GstVp9Picture + * @output_picture: Called with a #GstVp9Picture which is required to be outputted. + * Subclass can retrieve parent #GstVideoCodecFrame by using + * gst_video_decoder_get_frame() with system_frame_number + * and the #GstVideoCodecFrame must be consumed by subclass via + * gst_video_decoder_{finish,drop,release}_frame(). */ struct _GstVp9DecoderClass { @@ -93,9 +93,6 @@ struct _GstVp9DecoderClass GstVp9Picture * (*duplicate_picture) (GstVp9Decoder * decoder, GstVp9Picture * picture); - GstFlowReturn (*output_picture) (GstVp9Decoder * decoder, - GstVp9Picture * picture); - gboolean (*start_picture) (GstVp9Decoder * decoder, GstVp9Picture * picture); @@ -106,6 +103,9 @@ struct _GstVp9DecoderClass gboolean (*end_picture) (GstVp9Decoder * decoder, GstVp9Picture * picture); + GstFlowReturn (*output_picture) (GstVp9Decoder * decoder, + GstVp9Picture * picture); + /*< private >*/ gpointer padding[GST_PADDING_LARGE]; };