Skip to content

mppenc: framerate issue #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gvsyn wants to merge 1 commit into
base: master
Choose a base branch
from
Open

mppenc: framerate issue #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions gst/rockchipmpp/gstmppenc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,8 @@ gst_mpp_enc_set_src_caps (GstVideoEncoder * encoder, GstCaps * caps)

gst_caps_set_simple (caps,
"width", G_TYPE_INT, GST_VIDEO_INFO_WIDTH (info),
"height", G_TYPE_INT, GST_VIDEO_INFO_HEIGHT (info), NULL);
"height", G_TYPE_INT, GST_VIDEO_INFO_HEIGHT (info),
"framerate", GST_TYPE_FRACTION, GST_VIDEO_INFO_FPS_N (info), GST_VIDEO_INFO_FPS_D (info), NULL);

GST_DEBUG_OBJECT (self, "output caps: %" GST_PTR_FORMAT, caps);

Expand All @@ -414,6 +415,9 @@ gst_mpp_enc_set_src_caps (GstVideoEncoder * encoder, GstCaps * caps)

GST_VIDEO_INFO_WIDTH (&output_state->info) = GST_VIDEO_INFO_WIDTH (info);
GST_VIDEO_INFO_HEIGHT (&output_state->info) = GST_VIDEO_INFO_HEIGHT (info);
GST_VIDEO_INFO_FPS_N (&output_state->info) = GST_VIDEO_INFO_FPS_N (info);
GST_VIDEO_INFO_FPS_D (&output_state->info) = GST_VIDEO_INFO_FPS_D (info);

gst_video_codec_state_unref (output_state);

return gst_video_encoder_negotiate (encoder);
Expand Down Expand Up @@ -580,7 +584,7 @@ gst_mpp_enc_set_format (GstVideoEncoder * encoder, GstVideoCodecState * state)
GstMppEnc *self = GST_MPP_ENC (encoder);
GstVideoInfo *info = &self->info;
MppFrameFormat format;
gint width, height;
gint width, height, fps_n, fps_d;
gboolean convert = FALSE;

GST_DEBUG_OBJECT (self, "setting format: %" GST_PTR_FORMAT, state->caps);
Expand All @@ -605,7 +609,8 @@ gst_mpp_enc_set_format (GstVideoEncoder * encoder, GstVideoCodecState * state)
format = gst_mpp_gst_format_to_mpp_format (GST_VIDEO_INFO_FORMAT (info));
width = GST_VIDEO_INFO_WIDTH (info);
height = GST_VIDEO_INFO_HEIGHT (info);

fps_n = GST_VIDEO_INFO_FPS_D (info);
fps_d = GST_VIDEO_INFO_FPS_N (info);
if (self->rotation % 180)
SWAP (width, height);

Expand Down Expand Up @@ -635,6 +640,9 @@ gst_mpp_enc_set_format (GstVideoEncoder * encoder, GstVideoCodecState * state)

gst_video_info_set_format (info, gst_mpp_mpp_format_to_gst_format (format),
width, height);
GST_VIDEO_INFO_FPS_D (info) = fps_n;
GST_VIDEO_INFO_FPS_N (info) = fps_d;


if (!gst_mpp_enc_video_info_align (info))
return FALSE;
Expand Down Expand Up @@ -811,7 +819,7 @@ gst_mpp_enc_convert (GstVideoEncoder * encoder, GstVideoCodecFrame * frame)
if (gst_mpp_use_rga () &&
gst_mpp_rga_convert (inbuf, &src_info, out_mem, dst_info,
self->rotation)) {
GST_DEBUG_OBJECT (self, "using RGA converted buffer");
GST_TRACE_OBJECT (self, "using RGA converted buffer");
return outbuf;
}
#endif
Expand Down Expand Up @@ -947,7 +955,7 @@ gst_mpp_enc_loop (GstVideoEncoder * encoder)
if (self->flushing && !self->draining)
goto drop;

GST_DEBUG_OBJECT (self, "finish frame ts=%" GST_TIME_FORMAT,
GST_TRACE_OBJECT (self, "finish frame ts=%" GST_TIME_FORMAT,
GST_TIME_ARGS (frame->pts));

gst_video_encoder_finish_frame (encoder, frame);
Expand Down Expand Up @@ -986,7 +994,7 @@ gst_mpp_enc_handle_frame (GstVideoEncoder * encoder, GstVideoCodecFrame * frame)
GstBuffer *buffer;
GstFlowReturn ret = GST_FLOW_OK;

GST_DEBUG_OBJECT (self, "handling frame %d", frame->system_frame_number);
GST_TRACE_OBJECT (self, "handling frame %d", frame->system_frame_number);

GST_MPP_ENC_LOCK (encoder);

Expand Down
2 changes: 1 addition & 1 deletion gst/rockchipmpp/gstmpph264enc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ enum
};

#define GST_MPP_H264_ENC_SIZE_CAPS \
"width = (int) [ 96, MAX ], height = (int) [ 64, MAX ]"
"width = (int) [ 96, MAX ], height = (int) [ 64, MAX ], framerate = (fraction) [ 0/1, 2147483647/1 ]"

static GstStaticPadTemplate gst_mpp_h264_enc_src_template =
GST_STATIC_PAD_TEMPLATE ("src",
Expand Down
2 changes: 1 addition & 1 deletion gst/rockchipmpp/gstmpph265enc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ enum
};

#define GST_MPP_H265_ENC_SIZE_CAPS \
"width = (int) [ 96, MAX ], height = (int) [ 64, MAX ]"
"width = (int) [ 96, MAX ], height = (int) [ 64, MAX ], framerate = (fraction) [ 0/1, 2147483647/1 ]"

static GstStaticPadTemplate gst_mpp_h265_enc_src_template =
GST_STATIC_PAD_TEMPLATE ("src",
Expand Down