mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-18 22:36:33 +00:00
[RFC] consistent namespacing for public API functions (#951)
* EbSvtAv1Dec.h: remove prototype for non-existent functions Those functions have apparently never existed in the tree: - eb_peek_sequence_header() - eb_svt_decode_obu() - eb_svt_decode_tu() - eb_dec_flush() - eb_get_stream_info() * EbSvtAv1Dec.h: consistently use the svt_av1_dec_ namespace for public functions * EbSvtAv1Enc.h: consistently use the svt_av1_enc_ namespace for public functions
This commit is contained in:
parent
075d42ef98
commit
9f90c74d3c
1 changed files with 13 additions and 13 deletions
|
@ -312,13 +312,13 @@ gst_svtav1enc_init (GstSvtAv1Enc * svtav1enc)
|
||||||
svtav1enc->dts_offset = 0;
|
svtav1enc->dts_offset = 0;
|
||||||
|
|
||||||
EbErrorType res =
|
EbErrorType res =
|
||||||
eb_init_handle(&svtav1enc->svt_encoder, NULL, svtav1enc->svt_config);
|
svt_av1_enc_init_handle(&svtav1enc->svt_encoder, NULL, svtav1enc->svt_config);
|
||||||
if (res != EB_ErrorNone) {
|
if (res != EB_ErrorNone) {
|
||||||
GST_ERROR_OBJECT (svtav1enc, "eb_init_handle failed with error %d", res);
|
GST_ERROR_OBJECT (svtav1enc, "svt_av1_enc_init_handle failed with error %d", res);
|
||||||
GST_OBJECT_UNLOCK (svtav1enc);
|
GST_OBJECT_UNLOCK (svtav1enc);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
/* setting configuration here since eb_init_handle overrides it */
|
/* setting configuration here since svt_av1_enc_init_handle overrides it */
|
||||||
set_default_svt_configuration (svtav1enc->svt_config);
|
set_default_svt_configuration (svtav1enc->svt_config);
|
||||||
GST_OBJECT_UNLOCK (svtav1enc);
|
GST_OBJECT_UNLOCK (svtav1enc);
|
||||||
}
|
}
|
||||||
|
@ -499,7 +499,7 @@ gst_svtav1enc_finalize (GObject * object)
|
||||||
GST_DEBUG_OBJECT (svtav1enc, "finalizing svtav1enc");
|
GST_DEBUG_OBJECT (svtav1enc, "finalizing svtav1enc");
|
||||||
|
|
||||||
GST_OBJECT_LOCK (svtav1enc);
|
GST_OBJECT_LOCK (svtav1enc);
|
||||||
eb_deinit_handle(svtav1enc->svt_encoder);
|
svt_av1_enc_deinit_handle(svtav1enc->svt_encoder);
|
||||||
svtav1enc->svt_encoder = NULL;
|
svtav1enc->svt_encoder = NULL;
|
||||||
g_free (svtav1enc->svt_config);
|
g_free (svtav1enc->svt_config);
|
||||||
GST_OBJECT_UNLOCK (svtav1enc);
|
GST_OBJECT_UNLOCK (svtav1enc);
|
||||||
|
@ -581,9 +581,9 @@ gst_svtav1enc_configure_svt (GstSvtAv1Enc * svtav1enc)
|
||||||
}
|
}
|
||||||
|
|
||||||
EbErrorType res =
|
EbErrorType res =
|
||||||
eb_svt_enc_set_parameter(svtav1enc->svt_encoder, svtav1enc->svt_config);
|
svt_av1_enc_set_parameter(svtav1enc->svt_encoder, svtav1enc->svt_config);
|
||||||
if (res != EB_ErrorNone) {
|
if (res != EB_ErrorNone) {
|
||||||
GST_ERROR_OBJECT (svtav1enc, "eb_svt_enc_set_parameter failed with error %d", res);
|
GST_ERROR_OBJECT (svtav1enc, "svt_av1_enc_set_parameter failed with error %d", res);
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
@ -593,11 +593,11 @@ gboolean
|
||||||
gst_svtav1enc_start_svt (GstSvtAv1Enc * svtav1enc)
|
gst_svtav1enc_start_svt (GstSvtAv1Enc * svtav1enc)
|
||||||
{
|
{
|
||||||
G_LOCK (init_mutex);
|
G_LOCK (init_mutex);
|
||||||
EbErrorType res = eb_init_encoder(svtav1enc->svt_encoder);
|
EbErrorType res = svt_av1_enc_init(svtav1enc->svt_encoder);
|
||||||
G_UNLOCK (init_mutex);
|
G_UNLOCK (init_mutex);
|
||||||
|
|
||||||
if (res != EB_ErrorNone) {
|
if (res != EB_ErrorNone) {
|
||||||
GST_ERROR_OBJECT (svtav1enc, "eb_init_encoder failed with error %d", res);
|
GST_ERROR_OBJECT (svtav1enc, "svt_av1_enc_init failed with error %d", res);
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
@ -720,7 +720,7 @@ gst_svtav1enc_encode (GstSvtAv1Enc * svtav1enc, GstVideoCodecFrame * frame)
|
||||||
input_buffer->pic_type = EB_AV1_KEY_PICTURE;
|
input_buffer->pic_type = EB_AV1_KEY_PICTURE;
|
||||||
}
|
}
|
||||||
|
|
||||||
res = eb_svt_enc_send_picture(svtav1enc->svt_encoder, input_buffer);
|
res = svt_av1_enc_send_picture(svtav1enc->svt_encoder, input_buffer);
|
||||||
if (res != EB_ErrorNone) {
|
if (res != EB_ErrorNone) {
|
||||||
GST_ERROR_OBJECT (svtav1enc, "Issue %d sending picture to SVT-AV1.", res);
|
GST_ERROR_OBJECT (svtav1enc, "Issue %d sending picture to SVT-AV1.", res);
|
||||||
ret = GST_FLOW_ERROR;
|
ret = GST_FLOW_ERROR;
|
||||||
|
@ -743,7 +743,7 @@ gst_svtav1enc_send_eos (GstSvtAv1Enc * svtav1enc)
|
||||||
input_buffer.flags = EB_BUFFERFLAG_EOS;
|
input_buffer.flags = EB_BUFFERFLAG_EOS;
|
||||||
input_buffer.p_buffer = NULL;
|
input_buffer.p_buffer = NULL;
|
||||||
|
|
||||||
ret = eb_svt_enc_send_picture(svtav1enc->svt_encoder, &input_buffer);
|
ret = svt_av1_enc_send_picture(svtav1enc->svt_encoder, &input_buffer);
|
||||||
|
|
||||||
if (ret != EB_ErrorNone) {
|
if (ret != EB_ErrorNone) {
|
||||||
GST_ERROR_OBJECT (svtav1enc, "couldn't send EOS frame.");
|
GST_ERROR_OBJECT (svtav1enc, "couldn't send EOS frame.");
|
||||||
|
@ -786,7 +786,7 @@ gst_svtav1enc_dequeue_encoded_frames (GstSvtAv1Enc * svtav1enc,
|
||||||
EbBufferHeaderType *output_buf = NULL;
|
EbBufferHeaderType *output_buf = NULL;
|
||||||
|
|
||||||
res =
|
res =
|
||||||
eb_svt_get_packet(svtav1enc->svt_encoder, &output_buf,
|
svt_av1_enc_get_packet(svtav1enc->svt_encoder, &output_buf,
|
||||||
done_sending_pics);
|
done_sending_pics);
|
||||||
|
|
||||||
if (output_buf != NULL)
|
if (output_buf != NULL)
|
||||||
|
@ -849,7 +849,7 @@ gst_svtav1enc_dequeue_encoded_frames (GstSvtAv1Enc * svtav1enc,
|
||||||
G_GINT64_FORMAT " SliceType:%d\n", svtav1enc->frame_count,
|
G_GINT64_FORMAT " SliceType:%d\n", svtav1enc->frame_count,
|
||||||
(frame->dts), (frame->pts), output_buf->pic_type);
|
(frame->dts), (frame->pts), output_buf->pic_type);
|
||||||
|
|
||||||
eb_svt_release_out_buffer(&output_buf);
|
svt_av1_enc_release_out_buffer(&output_buf);
|
||||||
output_buf = NULL;
|
output_buf = NULL;
|
||||||
|
|
||||||
ret = gst_video_encoder_finish_frame (GST_VIDEO_ENCODER (svtav1enc), frame);
|
ret = gst_video_encoder_finish_frame (GST_VIDEO_ENCODER (svtav1enc), frame);
|
||||||
|
@ -923,7 +923,7 @@ gst_svtav1enc_stop (GstVideoEncoder * encoder)
|
||||||
GST_OBJECT_UNLOCK (svtav1enc);
|
GST_OBJECT_UNLOCK (svtav1enc);
|
||||||
|
|
||||||
GST_OBJECT_LOCK (svtav1enc);
|
GST_OBJECT_LOCK (svtav1enc);
|
||||||
eb_deinit_encoder(svtav1enc->svt_encoder);
|
svt_av1_enc_deinit(svtav1enc->svt_encoder);
|
||||||
/* Destruct the buffer memory pool */
|
/* Destruct the buffer memory pool */
|
||||||
gst_svthevenc_deallocate_svt_buffers (svtav1enc);
|
gst_svthevenc_deallocate_svt_buffers (svtav1enc);
|
||||||
GST_OBJECT_UNLOCK (svtav1enc);
|
GST_OBJECT_UNLOCK (svtav1enc);
|
||||||
|
|
Loading…
Reference in a new issue