[FFmpeg-cvslog] avcodec/vorbisenc: Include bufqueue and afqueue

Tyler Jones git at videolan.org
Mon Jun 5 19:08:58 EEST 2017


ffmpeg | branch: master | Tyler Jones <tdjones879 at gmail.com> | Tue May 30 11:28:04 2017 -0600| [25260b5161af064b95a258e4a5805b16946d0575] | committer: Rostislav Pehlivanov

avcodec/vorbisenc: Include bufqueue and afqueue

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=25260b5161af064b95a258e4a5805b16946d0575
---

 libavcodec/vorbisenc.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/libavcodec/vorbisenc.c b/libavcodec/vorbisenc.c
index 1777a493dd..f196d79d84 100644
--- a/libavcodec/vorbisenc.c
+++ b/libavcodec/vorbisenc.c
@@ -34,6 +34,9 @@
 #include "vorbis.h"
 #include "vorbis_enc_data.h"
 
+#include "audio_frame_queue.h"
+#include "libavfilter/bufferqueue.h"
+
 #define BITSTREAM_WRITER_LE
 #include "put_bits.h"
 
@@ -111,6 +114,9 @@ typedef struct vorbis_enc_context {
     float *coeffs; // also used for residue after floor
     float quality;
 
+    AudioFrameQueue afq;
+    struct FFBufQueue bufqueue;
+
     int ncodebooks;
     vorbis_enc_codebook *codebooks;
 
@@ -1179,6 +1185,8 @@ static av_cold int vorbis_encode_close(AVCodecContext *avctx)
 
     ff_mdct_end(&venc->mdct[0]);
     ff_mdct_end(&venc->mdct[1]);
+    ff_af_queue_close(&venc->afq);
+    ff_bufqueue_discard_all(&venc->bufqueue);
 
     av_freep(&avctx->extradata);
 
@@ -1211,6 +1219,8 @@ static av_cold int vorbis_encode_init(AVCodecContext *avctx)
 
     avctx->frame_size = 1 << (venc->log2_blocksize[0] - 1);
 
+    ff_af_queue_init(avctx, &venc->afq);
+
     return 0;
 error:
     vorbis_encode_close(avctx);



More information about the ffmpeg-cvslog mailing list