diff options
author | Thomas Vander Stichele <thomas@apestaart.org> | 2006-04-13 09:15:31 +0000 |
---|---|---|
committer | Thomas Vander Stichele <thomas@apestaart.org> | 2006-04-13 09:15:31 +0000 |
commit | cafd99311b7928e1cd3f0b005d2e2e59179e8fd4 (patch) | |
tree | c56ceb24f1218d7b80a2024064c3273c2089e708 /gst/rtp/gstrtppcmapay.h | |
parent | 9e8bbf41f76083b1fdf090217382c96f695d81e4 (diff) |
reverting rtp patches to fix freeze break on -base as explained on the list
Original commit message from CVS:
reverting rtp patches to fix freeze break on -base as explained on the list
Diffstat (limited to 'gst/rtp/gstrtppcmapay.h')
-rw-r--r-- | gst/rtp/gstrtppcmapay.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/gst/rtp/gstrtppcmapay.h b/gst/rtp/gstrtppcmapay.h index f5cf800d..0d498544 100644 --- a/gst/rtp/gstrtppcmapay.h +++ b/gst/rtp/gstrtppcmapay.h @@ -17,7 +17,8 @@ #define __GST_RTP_PCMA_PAY_H__ #include <gst/gst.h> -#include <gst/rtp/gstbasertpaudiopayload.h> +#include <gst/rtp/gstbasertppayload.h> +#include <gst/base/gstadapter.h> G_BEGIN_DECLS @@ -29,20 +30,24 @@ typedef struct _GstRtpPmcaPayClass GstRtpPmcaPayClass; #define GST_RTP_PCMA_PAY(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_RTP_PCMA_PAY,GstRtpPmcaPay)) #define GST_RTP_PCMA_PAY_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_RTP_PCMA_PAY,GstRtpPmcaPayClass)) + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_RTP_PCMA_PAY,GstRtpPmcaPay)) #define GST_IS_RTP_PCMA_PAY(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_RTP_PCMA_PAY)) -#define GST_IS_RTP_PCMA_PAY_CLASS(klass) \ +#define GST_IS_RTP_PCMA_PAY_CLASS(obj) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_RTP_PCMA_PAY)) struct _GstRtpPmcaPay { - GstBaseRTPAudioPayload audiopayload; + GstBaseRTPPayload payload; + GstAdapter *adapter; + + GstClockTime first_ts; + GstClockTime duration; }; struct _GstRtpPmcaPayClass { - GstBaseRTPAudioPayloadClass parent_class; + GstBaseRTPPayloadClass parent_class; }; gboolean gst_rtp_pcma_pay_plugin_init (GstPlugin * plugin); |