FaSTTUBe/GST-Tensordecoder-ov_ep
35
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

audioencoder: also consider filter caps in getcaps

Browse Source
This commit is contained in:
Mark Nauwelaerts 2012-07-25 14:56:20 +02:00
parent 88e73f8515
commit 1f962bc108
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gst-libs/gst/audio/gstaudioencoder.c
View File

@ -1311,6 +1311,7 @@ refuse_caps:
* gst_audio_encoder_proxy_getcaps: * gst_audio_encoder_proxy_getcaps:
* @enc: a #GstAudioEncoder * @enc: a #GstAudioEncoder
* @caps: initial caps * @caps: initial caps
* @filter: filter caps
* *
* Returns caps that express @caps (or sink template caps if @caps == NULL) * Returns caps that express @caps (or sink template caps if @caps == NULL)
* restricted to channel/rate combinations supported by downstream elements * restricted to channel/rate combinations supported by downstream elements
@ -1319,7 +1320,8 @@ refuse_caps:
* Returns: a #GstCaps owned by caller * Returns: a #GstCaps owned by caller
*/ */
GstCaps * GstCaps *
gst_audio_encoder_proxy_getcaps (GstAudioEncoder * enc, GstCaps * caps) gst_audio_encoder_proxy_getcaps (GstAudioEncoder * enc, GstCaps * caps,
GstCaps * filter)
{ {
GstCaps *templ_caps = NULL; GstCaps *templ_caps = NULL;
GstCaps *allowed = NULL; GstCaps *allowed = NULL;
@ -1371,6 +1373,14 @@ gst_audio_encoder_proxy_getcaps (GstAudioEncoder * enc, GstCaps * caps)
gst_caps_unref (filter_caps); gst_caps_unref (filter_caps);
gst_caps_unref (templ_caps); gst_caps_unref (templ_caps);
if (filter) {
GST_LOG_OBJECT (enc, "intersecting with %" GST_PTR_FORMAT, filter);
filter_caps = gst_caps_intersect_full (filter, fcaps,
GST_CAPS_INTERSECT_FIRST);
gst_caps_unref (fcaps);
fcaps = filter_caps;
}
done: done:
gst_caps_replace (&allowed, NULL); gst_caps_replace (&allowed, NULL);
@ -1384,7 +1394,7 @@ gst_audio_encoder_getcaps_default (GstAudioEncoder * enc, GstCaps * filter)
{ {
GstCaps *caps; GstCaps *caps;
caps = gst_audio_encoder_proxy_getcaps (enc, NULL); caps = gst_audio_encoder_proxy_getcaps (enc, NULL, filter);
GST_LOG_OBJECT (enc, "returning caps %" GST_PTR_FORMAT, caps); GST_LOG_OBJECT (enc, "returning caps %" GST_PTR_FORMAT, caps);
return caps; return caps;

3
gst-libs/gst/audio/gstaudioencoder.h
View File

@ -216,7 +216,8 @@ GstFlowReturn gst_audio_encoder_finish_frame (GstAudioEncoder * enc,
gint samples); gint samples);
GstCaps * gst_audio_encoder_proxy_getcaps (GstAudioEncoder * enc, GstCaps * gst_audio_encoder_proxy_getcaps (GstAudioEncoder * enc,
GstCaps * caps); GstCaps * caps,
GstCaps * filter);
gboolean gst_audio_encoder_set_output_format (GstAudioEncoder * enc, gboolean gst_audio_encoder_set_output_format (GstAudioEncoder * enc,
GstCaps * caps); GstCaps * caps);