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

ffmpegenc: If an encoder lists the supported pixfmts use them to create the caps

Browse source 
...instead of creating standard caps with all pixfmts.

Fixes bug #591038.
This commit is contained in:
Sebastian Dröge 2009-08-08 22:43:06 +02:00
parent ea6a66b5b3
commit d181dbd7a0
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ext/ffmpeg/gstffmpegcodecmap.c
View file

@ -1471,7 +1471,7 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
* See below for usefullness * See below for usefullness
*/ */
static GstCaps * GstCaps *
gst_ffmpeg_pixfmt_to_caps (enum PixelFormat pix_fmt, AVCodecContext * context, gst_ffmpeg_pixfmt_to_caps (enum PixelFormat pix_fmt, AVCodecContext * context,
enum CodecID codec_id) enum CodecID codec_id)
{ {

10
ext/ffmpeg/gstffmpegcodecmap.h
View file

@ -101,6 +101,16 @@ gst_ffmpeg_caps_with_codectype (enum CodecType type,
GstCaps * GstCaps *
gst_ffmpeg_formatid_to_caps (const gchar *format_name); gst_ffmpeg_formatid_to_caps (const gchar *format_name);
/* Convert a FFMPEG Pixel Format and optional AVCodecContext
* to a GstCaps. If the context is ommitted, no fixed values
* for video/audio size will be included in the GstCaps
*
* See below for usefullness
*/
GstCaps *
gst_ffmpeg_pixfmt_to_caps (enum PixelFormat pix_fmt, AVCodecContext * context, enum CodecID codec_id);
/* /*
* _formatid_get_codecids () can be used to get the codecIDs * _formatid_get_codecids () can be used to get the codecIDs
* (CODEC_ID_NONE-terminated list) that fit that specific * (CODEC_ID_NONE-terminated list) that fit that specific

4
ext/ffmpeg/gstffmpegenc.c
View file

@ -341,9 +341,7 @@ gst_ffmpegenc_getcaps (GstPad * pad)
} }
GST_DEBUG_OBJECT (ffmpegenc, GST_DEBUG_OBJECT (ffmpegenc,
"Got an official pixfmt [%d], attempting to get caps", pixfmt); "Got an official pixfmt [%d], attempting to get caps", pixfmt);
tmpcaps = tmpcaps = gst_ffmpeg_pixfmt_to_caps (pixfmt, NULL, oclass->in_plugin->id);
gst_ffmpeg_codectype_to_caps (oclass->in_plugin->type, NULL,
oclass->in_plugin->id, TRUE);
if (tmpcaps) { if (tmpcaps) {
GST_DEBUG_OBJECT (ffmpegenc, "Got caps, breaking out"); GST_DEBUG_OBJECT (ffmpegenc, "Got caps, breaking out");
if (!caps) if (!caps)