summaryrefslogtreecommitdiff
path: root/gst
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.com>2014-05-09 17:47:04 -0400
committerNicolas Dufresne <nicolas.dufresne@collabora.co.uk>2014-09-18 13:38:00 -0400
commitaaf96cc1715fddcee6e4a6a99f37e6961d182d74 (patch)
tree15085fb388c33ca9cc9c840e65b313bcfec44453 /gst
parente9ac7697589d6c9fb493ed489a8c33efa7d17b79 (diff)
downloadfarstream-aaf96cc1715fddcee6e4a6a99f37e6961d182d74.tar.gz
rtpbitrateadapter: Remove unused caps
Diffstat (limited to 'gst')
-rw-r--r--gst/fsrtpconference/fs-rtp-bitrate-adapter.c7
-rw-r--r--gst/fsrtpconference/fs-rtp-bitrate-adapter.h2
2 files changed, 1 insertions, 8 deletions
diff --git a/gst/fsrtpconference/fs-rtp-bitrate-adapter.c b/gst/fsrtpconference/fs-rtp-bitrate-adapter.c
index 0ceaa1ef..b0ae9cef 100644
--- a/gst/fsrtpconference/fs-rtp-bitrate-adapter.c
+++ b/gst/fsrtpconference/fs-rtp-bitrate-adapter.c
@@ -30,6 +30,7 @@
#include <math.h>
/* This is a magical value that smarter people discovered */
+/* This is H.264... other codecs (H.265 / VP9 ) will have different numbers */
#define H264_MAX_PIXELS_PER_BIT 25
GST_DEBUG_CATEGORY_STATIC (fs_rtp_bitrate_adapter_debug);
@@ -168,9 +169,6 @@ fs_rtp_bitrate_adapter_finalize (GObject *object)
{
FsRtpBitrateAdapter *self = FS_RTP_BITRATE_ADAPTER (object);
- if (self->caps)
- gst_caps_unref (self->caps);
-
if (self->system_clock)
gst_object_unref (self->system_clock);
@@ -467,9 +465,6 @@ fs_rtp_bitrate_adapter_updated_unlock (FsRtpBitrateAdapter *self)
if (bitrate > self->last_bitrate * 1.1 ||
bitrate < self->last_bitrate * 0.9)
{
- if (self->caps)
- gst_caps_unref (self->caps);
- self->caps = caps_from_bitrate ("video/x-raw", bitrate);
self->last_bitrate = bitrate;
changed = TRUE;
}
diff --git a/gst/fsrtpconference/fs-rtp-bitrate-adapter.h b/gst/fsrtpconference/fs-rtp-bitrate-adapter.h
index 77f0f3ae..8d03b072 100644
--- a/gst/fsrtpconference/fs-rtp-bitrate-adapter.h
+++ b/gst/fsrtpconference/fs-rtp-bitrate-adapter.h
@@ -52,8 +52,6 @@ struct _FsRtpBitrateAdapter
GstPad *srcpad;
GstPad *sinkpad;
- GstCaps *caps;
-
GstClock *system_clock;
GstClockTime interval;
GQueue bitrate_history;