mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 17:20:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/x264/gstx264enc.c: Construct source caps in more conventional (and correct) manner.

Browse source 
Original commit message from CVS:
* ext/x264/gstx264enc.c: (gst_x264_enc_set_src_caps):
Construct source caps in more conventional (and correct) manner.
This commit is contained in:
Mark Nauwelaerts 2008-11-14 19:52:24 +00:00
parent c363ecdf67
commit 21683124da
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2008-11-14 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
* ext/x264/gstx264enc.c: (gst_x264_enc_set_src_caps):
Construct source caps in more conventional (and correct) manner.
2008-11-14 Christian Schaller <christian.schaller@collabora.co.uk> 2008-11-14 Christian Schaller <christian.schaller@collabora.co.uk>
* configure.ac: remove experimental build check, -bad is experimental * configure.ac: remove experimental build check, -bad is experimental

13
ext/x264/gstx264enc.c
View file

@ -204,7 +204,9 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src", static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC, GST_PAD_SRC,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ("video/x-h264") GST_STATIC_CAPS ("video/x-h264, "
"framerate = (fraction) [0/1, MAX], "
"width = (int) [ 1, MAX ], " "height = (int) [ 1, MAX ]")
); );
static void gst_x264_enc_finalize (GObject * object); static void gst_x264_enc_finalize (GObject * object);
@ -712,15 +714,14 @@ gst_x264_enc_header_buf (GstX264Enc * encoder)
static gboolean static gboolean
gst_x264_enc_set_src_caps (GstX264Enc * encoder, GstPad * pad, GstCaps * caps) gst_x264_enc_set_src_caps (GstX264Enc * encoder, GstPad * pad, GstCaps * caps)
{ {
GstStructure *structure;
GstBuffer *buf; GstBuffer *buf;
GstCaps *outcaps; GstCaps *outcaps;
gboolean res; gboolean res;
structure = gst_caps_get_structure (caps, 0); outcaps = gst_caps_new_simple ("video/x-h264",
structure = gst_structure_copy (structure); "width", G_TYPE_INT, encoder->width,
gst_structure_set_name (structure, "video/x-h264"); "height", G_TYPE_INT, encoder->height,
outcaps = gst_caps_new_full (structure, NULL); "framerate", GST_TYPE_FRACTION, encoder->fps_num, encoder->fps_den, NULL);
if (!encoder->byte_stream) { if (!encoder->byte_stream) {
buf = gst_x264_enc_header_buf (encoder); buf = gst_x264_enc_header_buf (encoder);