Add all of the necessary methods to codec and modem. The program won't compile

until I fill them in.

git-svn-id: https://svn.code.sf.net/p/freetel/code@1385 01035d8c-6547-0410-b346-abe4f91aad63

diff --git a/freedv-server/source/drivers.h b/freedv-server/source/drivers.h
index 65a0a57d8a6f6f6b2896b2dca810e989f8cc7ed1..407258767b0a346827db191ed679719a27128af6 100644 (file)
--- a/freedv-server/source/drivers.h
+++ b/freedv-server/source/drivers.h
@@ -187,9 +187,19 @@ namespace FreeDV {
     /// Destroy a codec instance.
     virtual            ~Codec() = 0;
 
+    /// Decode from an array of the unsigned 8-bit integer type to an
+    /// array of the signed 16-bit integer type.
+    /// \param i The encoded data, in an array of unsigned 8-bit integers.
+    /// \param o The array of audio samples after decoding, in an array
+    /// of signed 16-bit integers.
+    /// \param length The number of bytes of data to be decoded.
+    /// \return The number of int16_t elements in the decoded array.
+    virtual std::size_t
+                       decode16(const uint8_t * i, int16_t * o, \
+                        std::size_t length) = 0;
+
     /// Encode from an array of the signed 16-bit integer type to an
-    /// array of the unsigned 8-bit integer type (this is usually
-    /// implemented as unsigned char).
+    /// array of the unsigned 8-bit integer type.
     /// \param i The array of audio samples to be encoded, in an array
     /// of signed 16-bit integers.
     /// \param o The encoded data, in an array of unsigned 8-bit integers.
@@ -200,7 +210,7 @@ namespace FreeDV {
                         std::size_t length) = 0;
 
     /// Return the size of uint8_t array necessary to encode the given
-    /// number of audio samples. Sample rate is 8K samples/second.
+    /// number of audio samples at SampleRate.
     /// The result is invariant for a given input.
     /// \param sample_count The number of audio samples to encode.
     /// Must be a multiple of frame_size().
@@ -215,7 +225,7 @@ namespace FreeDV {
                        frame_duration() const = 0;
 
     /// Return the number of audio samples necessary to decode the given
-    /// encoded buffer size. Sample rate is 8K samples/second.
+    /// encoded buffer size at SampleRate.
     /// \param buffer_size is the size of the encoded buffer. It must
     ///  encode a multiple of frame_size() audio samples.
     /// \return The number of audio samples necessary to decode the given
@@ -224,8 +234,8 @@ namespace FreeDV {
                        samples_per_buffer(std::size_t buffer_size) const = 0;
 
     /// Return the number of audio samples expected to create a codec
-    /// frame. Samples provided to encode_buffer_size must be a multiple
-    /// of this value. Sample rate is 8K samples/second.
+    /// frame at SampleRate. Samples provided to encode_buffer_size
+    /// must be a multiple of this value.
     /// The result for a particular input is invariant.
     /// \return The number of audio samples expected to create a codec
     /// frame.
@@ -350,6 +360,61 @@ namespace FreeDV {
 
   public:
     virtual            ~Modem() = 0;
+
+    /// Decode from an array of the signed 16-bit integer type to an
+    /// array of the unsigned 8-bit integer type.
+    /// \param i The array of audio samples to be decoded, in an array
+    /// of signed 16-bit integers.
+    /// \param o The decoded data, in an array of unsigned 8-bit integers.
+    /// \param length The number of audio samples to be decoded.
+    /// \return The number of uint8_t elements in the decoded array.
+    virtual std::size_t
+                       decode16(const int16_t * i, uint8_t * o, \
+                        std::size_t length) = 0;
+
+    /// Encode from an array of the unsigned 8-bit integer type to an
+    /// array of the signed 16-bit integer type.
+    /// \param i The data, in an array of unsigned 8-bit integers.
+    /// \param o The array of audio samples after encoding, in an array
+    /// of signed 16-bit integers.
+    /// \param length The number of bytes of data to be encoded.
+    /// \return The number of int16_t elements in the encoded array.
+    virtual std::size_t
+                       encode16(const uint8_t * i, int16_t * o, \
+                        std::size_t length) = 0;
+
+    /// Return the size of uint8_t array necessary to encode the given
+    /// number of audio samples at SampleRate.
+    /// The result is invariant for a given input.
+    /// \param sample_count The number of audio samples to encode.
+    /// Must be a multiple of frame_size().
+    /// \return The size of uint8_t array necessary to encode the given
+    /// number of audio samples.
+    virtual std::size_t const  
+                       encoded_buffer_size(std::size_t sample_count) const = 0;
+
+    /// Return the duration of a frame in milliseconds.
+    /// \return The duration of a frame in milliseconds.
+    virtual int const
+                       frame_duration() const = 0;
+
+    /// Return the number of audio samples necessary to decode the given
+    /// encoded buffer size at SampleRate.
+    /// \param buffer_size is the size of the encoded buffer. It must
+    ///  encode a multiple of frame_size() audio samples.
+    /// \return The number of audio samples necessary to decode the given
+    /// encoded buffer size. The result is invariant for a given input.
+    virtual std::size_t const  
+                       samples_per_buffer(std::size_t buffer_size) const = 0;
+
+    /// Return the number of audio samples expected to create a codec
+    /// frame at SampleRate. Samples provided to encode_buffer_size
+    /// must be a multiple of this value.
+    /// The result for a particular input is invariant.
+    /// \return The number of audio samples expected to create a codec
+    /// frame.
+    virtual std::size_t const
+                       samples_per_frame() const = 0;
   };
 
   /// Push-to-talk input driver.

diff --git a/freedv-server/source/platform/linux/scheduler.cpp b/freedv-server/source/platform/linux/scheduler.cpp
index cd01dc49e325f40d8b3c7a029e44797f3d7b4c4b..023c7b291b746bbf54af1cc8d7074ee0f3b5ae43 100644 (file)
--- a/freedv-server/source/platform/linux/scheduler.cpp
+++ b/freedv-server/source/platform/linux/scheduler.cpp
@@ -7,6 +7,21 @@
 #endif
 #include "drivers.h"
 
+static const char insufficient_privilege_message[] =
+"Warning: Insufficient privilege to set real-time priority.\n"
+"This could cause audio to be interrupted as other programs run.\n" 
+"To fix: As root, run\n"
+"\n"
+"\tsetcap cap_sys_nice+ep filename\n"
+"\n"
+"where filename is the executable file for this program. That will\n"
+"allow you to use real-time priority while running as any user.\n"
+"Alternatively, you can execute this program as root.\n\n";
+
+static const char old_kernel_message[] =
+"This kernel doesn't seem to have real-time facilities.\n"
+"If audio is sometimes interrupted, try a newer kernel.\n\n";
+
 namespace FreeDV {
   void
   set_scheduler()
@@ -18,14 +33,10 @@ namespace FreeDV {
     p.sched_priority = sched_get_priority_min(policy);
     const int result = sched_setscheduler(0, policy, &p);
     if ( result < 0 ) {
-      if ( errno == EPERM ) {
-        std::cerr << "Insufficient privilege to set real-time priority. "
-        "Try runing as root." << std::endl;
-      }
-      else if ( errno == EINVAL ) {
-        std::cerr << "This kernel doesn't seem to have real-time facilities. "
-         "If audio is sometimes interrupted, try a newer kernel." << std::endl;
-      }
+      if ( errno == EPERM )
+         std::cerr << insufficient_privilege_message << std::flush;
+      else if ( errno == EINVAL )
+         std::cerr << old_kernel_message << std::flush;
       else {
         std::cerr << "sched_setscheduler: " << strerror(errno) << std::endl;
       }

diff --git a/freedv-server/source/run.cpp b/freedv-server/source/run.cpp
index d2dac05ecf91145cff871eaf0349282df6c46711..48de7bfb276510a6e6aba58438efab99e161eda3 100644 (file)
--- a/freedv-server/source/run.cpp
+++ b/freedv-server/source/run.cpp
@@ -99,6 +99,9 @@ namespace FreeDV {
   static void
   receive(Interfaces * i)
   {
+    const size_t       samples_to_decode = i->receiver->ready()
+                        % i->codec_frame_size();
+    const size_t       
   }
   
   static void