mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-24 10:41:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

basevideoencoder: invoke subclass start method at state change

Browse source 
While this changes order w.r.t. set_format, which is OK for unstable API,
it has following merits:
* symmetric w.r.t. stop at state change
* in line with other base class practice
* little benefit in invoking 2 subclass virtual methods (set_format and start)
  in immediate succession; all actions in the second could be done in the first
  whereas subclass has no chance to do anything 'global' at activation time
Moreover, current -bad subclass relevant methods either trivially commute
or are either trivially adjusted accordingly.
This commit is contained in:
Mark Nauwelaerts 2011-03-24 09:21:04 +01:00
parent d567fa2834
commit 4b5623d687
3 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ext/dirac/gstdiracenc.cc
View file

@ -421,6 +421,10 @@ gst_dirac_enc_set_format (GstBaseVideoEncoder * base_video_encoder,
dirac_enc->enc_ctx.decode_flag = 0; dirac_enc->enc_ctx.decode_flag = 0;
dirac_enc->enc_ctx.instr_flag = 0; dirac_enc->enc_ctx.instr_flag = 0;
dirac_enc->granule_offset = ~0;
dirac_enc->encoder = dirac_encoder_init (&dirac_enc->enc_ctx, FALSE);
return TRUE; return TRUE;
} }
@ -821,12 +825,6 @@ error:
static gboolean static gboolean
gst_dirac_enc_start (GstBaseVideoEncoder * base_video_encoder) gst_dirac_enc_start (GstBaseVideoEncoder * base_video_encoder)
{ {
GstDiracEnc *dirac_enc = GST_DIRAC_ENC (base_video_encoder);
dirac_enc->granule_offset = ~0;
dirac_enc->encoder = dirac_encoder_init (&dirac_enc->enc_ctx, FALSE);
return TRUE; return TRUE;
} }

6
ext/schroedinger/gstschroenc.c
View file

@ -338,6 +338,8 @@ gst_schro_enc_set_format (GstBaseVideoEncoder * base_video_encoder,
gst_schro_wrap_schro_buffer (schro_encoder_encode_sequence_header gst_schro_wrap_schro_buffer (schro_encoder_encode_sequence_header
(schro_enc->encoder)); (schro_enc->encoder));
schro_enc->granule_offset = ~0;
return TRUE; return TRUE;
} }
@ -413,10 +415,6 @@ gst_schro_enc_get_property (GObject * object, guint prop_id, GValue * value,
static gboolean static gboolean
gst_schro_enc_start (GstBaseVideoEncoder * base_video_encoder) gst_schro_enc_start (GstBaseVideoEncoder * base_video_encoder)
{ {
GstSchroEnc *schro_enc = GST_SCHRO_ENC (base_video_encoder);
schro_enc->granule_offset = ~0;
return TRUE; return TRUE;
} }

7
gst-libs/gst/video/gstbasevideoencoder.c
View file

@ -164,9 +164,6 @@ gst_base_video_encoder_sink_setcaps (GstPad * pad, GstCaps * caps)
ret = base_video_encoder_class->set_format (base_video_encoder, ret = base_video_encoder_class->set_format (base_video_encoder,
&GST_BASE_VIDEO_CODEC (base_video_encoder)->state); &GST_BASE_VIDEO_CODEC (base_video_encoder)->state);
if (ret) {
ret = base_video_encoder_class->start (base_video_encoder);
}
g_object_unref (base_video_encoder); g_object_unref (base_video_encoder);
@ -489,6 +486,10 @@ gst_base_video_encoder_change_state (GstElement * element,
switch (transition) { switch (transition) {
case GST_STATE_CHANGE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
gst_base_video_encoder_reset (base_video_encoder); gst_base_video_encoder_reset (base_video_encoder);
gst_base_video_encoder_reset (base_video_encoder);
if (base_video_encoder_class->start) {
base_video_encoder_class->start (base_video_encoder);
}
break; break;
default: default:
break; break;