From 4744c86519fdf69023d21f47d70722246f72b679 Mon Sep 17 00:00:00 2001 From: Jeremy Lainé Date: Fri, 20 Jul 2012 19:26:25 +0200 Subject: hide QXmppCodec --- src/base/QXmppCodec.cpp | 2 +- src/base/QXmppCodec.h | 213 ------------------------------------------ src/base/QXmppCodec_p.h | 214 +++++++++++++++++++++++++++++++++++++++++++ src/base/QXmppGlobal.h | 6 ++ src/base/QXmppRtpChannel.cpp | 2 +- src/base/QXmppSasl_p.h | 7 +- src/base/base.pri | 5 +- 7 files changed, 229 insertions(+), 220 deletions(-) delete mode 100644 src/base/QXmppCodec.h create mode 100644 src/base/QXmppCodec_p.h (limited to 'src/base') diff --git a/src/base/QXmppCodec.cpp b/src/base/QXmppCodec.cpp index 869406ee..345044b3 100644 --- a/src/base/QXmppCodec.cpp +++ b/src/base/QXmppCodec.cpp @@ -29,7 +29,7 @@ #include #include -#include "QXmppCodec.h" +#include "QXmppCodec_p.h" #include "QXmppRtpChannel.h" #include diff --git a/src/base/QXmppCodec.h b/src/base/QXmppCodec.h deleted file mode 100644 index f536463b..00000000 --- a/src/base/QXmppCodec.h +++ /dev/null @@ -1,213 +0,0 @@ -/* - * Copyright (C) 2008-2012 The QXmpp developers - * - * Author: - * Jeremy Lainé - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - */ - -#ifndef QXMPPCODEC_H -#define QXMPPCODEC_H - -#include - -#include "QXmppGlobal.h" - -class QXmppRtpPacket; -class QXmppVideoFormat; -class QXmppVideoFrame; - -/// \brief The QXmppCodec class is the base class for audio codecs capable of -/// encoding and decoding audio samples. -/// -/// Samples must be 16-bit little endian. - -class QXMPP_EXPORT QXmppCodec -{ -public: - virtual ~QXmppCodec(); - - /// Reads samples from the input stream, encodes them and writes the - /// encoded data to the output stream. - virtual qint64 encode(QDataStream &input, QDataStream &output) = 0; - - /// Reads encoded data from the input stream, decodes it and writes the - /// decoded samples to the output stream. - virtual qint64 decode(QDataStream &input, QDataStream &output) = 0; -}; - -/// \internal -/// -/// The QXmppG711aCodec class represent a G.711 a-law PCM codec. - -class QXmppG711aCodec : public QXmppCodec -{ -public: - QXmppG711aCodec(int clockrate); - - qint64 encode(QDataStream &input, QDataStream &output); - qint64 decode(QDataStream &input, QDataStream &output); - -private: - int m_frequency; -}; - -/// \internal -/// -/// The QXmppG711uCodec class represent a G.711 u-law PCM codec. - -class QXmppG711uCodec : public QXmppCodec -{ -public: - QXmppG711uCodec(int clockrate); - - qint64 encode(QDataStream &input, QDataStream &output); - qint64 decode(QDataStream &input, QDataStream &output); - -private: - int m_frequency; -}; - -#ifdef QXMPP_USE_SPEEX -typedef struct SpeexBits SpeexBits; - -/// \internal -/// -/// The QXmppSpeexCodec class represent a SPEEX codec. - -class QXMPP_EXPORT QXmppSpeexCodec : public QXmppCodec -{ -public: - QXmppSpeexCodec(int clockrate); - ~QXmppSpeexCodec(); - - qint64 encode(QDataStream &input, QDataStream &output); - qint64 decode(QDataStream &input, QDataStream &output); - -private: - SpeexBits *encoder_bits; - void *encoder_state; - SpeexBits *decoder_bits; - void *decoder_state; - int frame_samples; -}; -#endif - -/// \brief The QXmppVideoDecoder class is the base class for video decoders. -/// - -class QXMPP_EXPORT QXmppVideoDecoder -{ -public: - virtual ~QXmppVideoDecoder(); - - /// Returns the format of the video stream. - virtual QXmppVideoFormat format() const = 0; - - /// Handles an RTP \a packet and returns a list of decoded video frames. - virtual QList handlePacket(const QXmppRtpPacket &packet) = 0; - - /// Sets the video stream's \a parameters. - virtual bool setParameters(const QMap ¶meters) = 0; -}; - -/// \brief The QXmppVideoEncoder class is the base class for video encoders. -/// - -class QXMPP_EXPORT QXmppVideoEncoder -{ -public: - virtual ~QXmppVideoEncoder(); - - /// Sets the \a format of the video stream. - virtual bool setFormat(const QXmppVideoFormat &format) = 0; - - /// Handles a video \a frame and returns a list of RTP packet payloads. - virtual QList handleFrame(const QXmppVideoFrame &frame) = 0; - - /// Returns the video stream's parameters. - virtual QMap parameters() const = 0; -}; - -#ifdef QXMPP_USE_THEORA -class QXmppTheoraDecoderPrivate; -class QXmppTheoraEncoderPrivate; - -class QXMPP_EXPORT QXmppTheoraDecoder : public QXmppVideoDecoder -{ -public: - QXmppTheoraDecoder(); - ~QXmppTheoraDecoder(); - - QXmppVideoFormat format() const; - QList handlePacket(const QXmppRtpPacket &packet); - bool setParameters(const QMap ¶meters); - -private: - QXmppTheoraDecoderPrivate *d; -}; - -class QXMPP_EXPORT QXmppTheoraEncoder : public QXmppVideoEncoder -{ -public: - QXmppTheoraEncoder(); - ~QXmppTheoraEncoder(); - - bool setFormat(const QXmppVideoFormat &format); - QList handleFrame(const QXmppVideoFrame &frame); - QMap parameters() const; - -private: - QXmppTheoraEncoderPrivate *d; -}; -#endif - -#ifdef QXMPP_USE_VPX -class QXmppVpxDecoderPrivate; -class QXmppVpxEncoderPrivate; - -class QXMPP_EXPORT QXmppVpxDecoder : public QXmppVideoDecoder -{ -public: - QXmppVpxDecoder(); - ~QXmppVpxDecoder(); - - QXmppVideoFormat format() const; - QList handlePacket(const QXmppRtpPacket &packet); - bool setParameters(const QMap ¶meters); - -private: - QXmppVpxDecoderPrivate *d; -}; - -class QXMPP_EXPORT QXmppVpxEncoder : public QXmppVideoEncoder -{ -public: - QXmppVpxEncoder(); - ~QXmppVpxEncoder(); - - bool setFormat(const QXmppVideoFormat &format); - QList handleFrame(const QXmppVideoFrame &frame); - QMap parameters() const; - -private: - QXmppVpxEncoderPrivate *d; -}; -#endif - -#endif diff --git a/src/base/QXmppCodec_p.h b/src/base/QXmppCodec_p.h new file mode 100644 index 00000000..14928332 --- /dev/null +++ b/src/base/QXmppCodec_p.h @@ -0,0 +1,214 @@ +/* + * Copyright (C) 2008-2012 The QXmpp developers + * + * Author: + * Jeremy Lainé + * + * Source: + * http://code.google.com/p/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + +#ifndef QXMPPCODEC_H +#define QXMPPCODEC_H + +#include +#include + +#include "QXmppGlobal.h" + +class QXmppRtpPacket; +class QXmppVideoFormat; +class QXmppVideoFrame; + +/// \brief The QXmppCodec class is the base class for audio codecs capable of +/// encoding and decoding audio samples. +/// +/// Samples must be 16-bit little endian. + +class QXMPP_AUTOTEST_EXPORT QXmppCodec +{ +public: + virtual ~QXmppCodec(); + + /// Reads samples from the input stream, encodes them and writes the + /// encoded data to the output stream. + virtual qint64 encode(QDataStream &input, QDataStream &output) = 0; + + /// Reads encoded data from the input stream, decodes it and writes the + /// decoded samples to the output stream. + virtual qint64 decode(QDataStream &input, QDataStream &output) = 0; +}; + +/// \internal +/// +/// The QXmppG711aCodec class represent a G.711 a-law PCM codec. + +class QXmppG711aCodec : public QXmppCodec +{ +public: + QXmppG711aCodec(int clockrate); + + qint64 encode(QDataStream &input, QDataStream &output); + qint64 decode(QDataStream &input, QDataStream &output); + +private: + int m_frequency; +}; + +/// \internal +/// +/// The QXmppG711uCodec class represent a G.711 u-law PCM codec. + +class QXmppG711uCodec : public QXmppCodec +{ +public: + QXmppG711uCodec(int clockrate); + + qint64 encode(QDataStream &input, QDataStream &output); + qint64 decode(QDataStream &input, QDataStream &output); + +private: + int m_frequency; +}; + +#ifdef QXMPP_USE_SPEEX +typedef struct SpeexBits SpeexBits; + +/// \internal +/// +/// The QXmppSpeexCodec class represent a SPEEX codec. + +class QXMPP_AUTOTEST_EXPORT QXmppSpeexCodec : public QXmppCodec +{ +public: + QXmppSpeexCodec(int clockrate); + ~QXmppSpeexCodec(); + + qint64 encode(QDataStream &input, QDataStream &output); + qint64 decode(QDataStream &input, QDataStream &output); + +private: + SpeexBits *encoder_bits; + void *encoder_state; + SpeexBits *decoder_bits; + void *decoder_state; + int frame_samples; +}; +#endif + +/// \brief The QXmppVideoDecoder class is the base class for video decoders. +/// + +class QXMPP_AUTOTEST_EXPORT QXmppVideoDecoder +{ +public: + virtual ~QXmppVideoDecoder(); + + /// Returns the format of the video stream. + virtual QXmppVideoFormat format() const = 0; + + /// Handles an RTP \a packet and returns a list of decoded video frames. + virtual QList handlePacket(const QXmppRtpPacket &packet) = 0; + + /// Sets the video stream's \a parameters. + virtual bool setParameters(const QMap ¶meters) = 0; +}; + +/// \brief The QXmppVideoEncoder class is the base class for video encoders. +/// + +class QXMPP_AUTOTEST_EXPORT QXmppVideoEncoder +{ +public: + virtual ~QXmppVideoEncoder(); + + /// Sets the \a format of the video stream. + virtual bool setFormat(const QXmppVideoFormat &format) = 0; + + /// Handles a video \a frame and returns a list of RTP packet payloads. + virtual QList handleFrame(const QXmppVideoFrame &frame) = 0; + + /// Returns the video stream's parameters. + virtual QMap parameters() const = 0; +}; + +#ifdef QXMPP_USE_THEORA +class QXmppTheoraDecoderPrivate; +class QXmppTheoraEncoderPrivate; + +class QXMPP_AUTOTEST_EXPORT QXmppTheoraDecoder : public QXmppVideoDecoder +{ +public: + QXmppTheoraDecoder(); + ~QXmppTheoraDecoder(); + + QXmppVideoFormat format() const; + QList handlePacket(const QXmppRtpPacket &packet); + bool setParameters(const QMap ¶meters); + +private: + QXmppTheoraDecoderPrivate *d; +}; + +class QXMPP_AUTOTEST_EXPORT QXmppTheoraEncoder : public QXmppVideoEncoder +{ +public: + QXmppTheoraEncoder(); + ~QXmppTheoraEncoder(); + + bool setFormat(const QXmppVideoFormat &format); + QList handleFrame(const QXmppVideoFrame &frame); + QMap parameters() const; + +private: + QXmppTheoraEncoderPrivate *d; +}; +#endif + +#ifdef QXMPP_USE_VPX +class QXmppVpxDecoderPrivate; +class QXmppVpxEncoderPrivate; + +class QXMPP_AUTOTEST_EXPORT QXmppVpxDecoder : public QXmppVideoDecoder +{ +public: + QXmppVpxDecoder(); + ~QXmppVpxDecoder(); + + QXmppVideoFormat format() const; + QList handlePacket(const QXmppRtpPacket &packet); + bool setParameters(const QMap ¶meters); + +private: + QXmppVpxDecoderPrivate *d; +}; + +class QXMPP_AUTOTEST_EXPORT QXmppVpxEncoder : public QXmppVideoEncoder +{ +public: + QXmppVpxEncoder(); + ~QXmppVpxEncoder(); + + bool setFormat(const QXmppVideoFormat &format); + QList handleFrame(const QXmppVideoFrame &frame); + QMap parameters() const; + +private: + QXmppVpxEncoderPrivate *d; +}; +#endif + +#endif diff --git a/src/base/QXmppGlobal.h b/src/base/QXmppGlobal.h index d3799d5c..75381e15 100644 --- a/src/base/QXmppGlobal.h +++ b/src/base/QXmppGlobal.h @@ -37,6 +37,12 @@ # endif #endif +#if defined(QXMPP_BUILD_INTERNAL) +# define QXMPP_AUTOTEST_EXPORT QXMPP_EXPORT +#else +# define QXMPP_AUTOTEST_EXPORT +#endif + /// This macro expands a numeric value of the form 0xMMNNPP (MM = /// major, NN = minor, PP = patch) that specifies QXmpp's version /// number. For example, if you compile your application against diff --git a/src/base/QXmppRtpChannel.cpp b/src/base/QXmppRtpChannel.cpp index 5d16fcad..dcea48e2 100644 --- a/src/base/QXmppRtpChannel.cpp +++ b/src/base/QXmppRtpChannel.cpp @@ -27,7 +27,7 @@ #include #include -#include "QXmppCodec.h" +#include "QXmppCodec_p.h" #include "QXmppJingleIq.h" #include "QXmppRtpChannel.h" diff --git a/src/base/QXmppSasl_p.h b/src/base/QXmppSasl_p.h index 636385ef..9713ae1f 100644 --- a/src/base/QXmppSasl_p.h +++ b/src/base/QXmppSasl_p.h @@ -48,7 +48,7 @@ class QXmppSaslServerPrivate; // We mean it. // -class QXmppSaslClient : public QXmppLoggable +class QXMPP_AUTOTEST_EXPORT QXmppSaslClient : public QXmppLoggable { public: QXmppSaslClient(QObject *parent = 0); @@ -79,7 +79,7 @@ private: /// The QXmppServerClient class is the base class for all SASL server /// authentication methods. -class QXmppSaslServer : public QXmppLoggable +class QXMPP_AUTOTEST_EXPORT QXmppSaslServer : public QXmppLoggable { public: enum Response { @@ -113,8 +113,7 @@ private: QXmppSaslServerPrivate *d; }; - -class QXmppSaslDigestMd5 +class QXMPP_AUTOTEST_EXPORT QXmppSaslDigestMd5 { public: static void setNonce(const QByteArray &nonce); diff --git a/src/base/base.pri b/src/base/base.pri index 21c3e138..21785c71 100644 --- a/src/base/base.pri +++ b/src/base/base.pri @@ -6,7 +6,6 @@ INSTALL_HEADERS += \ base/QXmppBindIq.h \ base/QXmppBookmarkSet.h \ base/QXmppByteStreamIq.h \ - base/QXmppCodec.h \ base/QXmppConstants.h \ base/QXmppDataForm.h \ base/QXmppDiscoveryIq.h \ @@ -39,6 +38,10 @@ INSTALL_HEADERS += \ base/QXmppVCardIq.h \ base/QXmppVersionIq.h +HEADERS += \ + base/QXmppCodec_p.h \ + base/QXmppSasl_p.h + # Source files SOURCES += \ base/QXmppArchiveIq.cpp \ -- cgit v1.2.3