Move frame_size from AudioEncoderFFmpegPrivate to AudioEncoderPrivate…

… and make it accessible via getter
MyNftShop · Oct 13, 2017 · ed1ac96 · ed1ac96
1 parent 4959f40
commit ed1ac96
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/src/QtAV/AudioEncoder.h b/src/QtAV/AudioEncoder.h
@@ -64,6 +64,8 @@ class Q_AV_EXPORT AudioEncoder : public AVEncoder
      */
     const AudioFormat& audioFormat() const;
     void setAudioFormat(const AudioFormat& format);
+
+    int frameSize() const;
 Q_SIGNALS:
     void audioFormatChanged();
 public:

diff --git a/src/QtAV/private/AVEncoder_p.h b/src/QtAV/private/AVEncoder_p.h
@@ -71,6 +71,7 @@ class AudioEncoderPrivate : public AVEncoderPrivate
 public:
     AudioEncoderPrivate()
         : AVEncoderPrivate()
+        , frame_size(0)
     {
         bit_rate = 64000;
     }
@@ -79,6 +80,8 @@ class AudioEncoderPrivate : public AVEncoderPrivate
 
     AudioResampler *resampler;
     AudioFormat format, format_used;
+
+    int frame_size; // used if avctx->frame_size == 0
 };
 
 class Q_AV_PRIVATE_EXPORT VideoEncoderPrivate : public AVEncoderPrivate

diff --git a/src/codec/audio/AudioEncoder.cpp b/src/codec/audio/AudioEncoder.cpp
@@ -80,4 +80,8 @@ const AudioFormat& AudioEncoder::audioFormat() const
     return d_func().format_used;
 }
 
+int AudioEncoder::frameSize() const
+{
+    return d_func().frame_size;
+}
 } //namespace QtAV
diff --git a/src/codec/audio/AudioEncoderFFmpeg.cpp b/src/codec/audio/AudioEncoderFFmpeg.cpp
@@ -53,7 +53,6 @@ class AudioEncoderFFmpegPrivate Q_DECL_FINAL: public AudioEncoderPrivate
 public:
     AudioEncoderFFmpegPrivate()
         : AudioEncoderPrivate()
-        , frame_size(0)
     {
         avcodec_register_all();
         // NULL: codec-specific defaults won't be initialized, which may result in suboptimal default settings (this is important mainly for encoders, e.g. libx264).
@@ -62,7 +61,6 @@ class AudioEncoderFFmpegPrivate Q_DECL_FINAL: public AudioEncoderPrivate
     bool open() Q_DECL_OVERRIDE;
     bool close() Q_DECL_OVERRIDE;
 
-    int frame_size; // used if avctx->frame_size == 0
     QByteArray buffer;
 };