Fix AC3 encoder and SPDIF muxer following FFmpeg resync

Fixes #10709
MythTV · May 10, 2012 · 97bbc95 · 97bbc95
1 parent 4b72e8f
commit 97bbc95
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 30 deletions.
diff --git a/mythtv/libs/libmyth/audio/audiooutputdigitalencoder.cpp b/mythtv/libs/libmyth/audio/audiooutputdigitalencoder.cpp
@@ -3,6 +3,7 @@
 #include <unistd.h>
 #include <string.h>
 
+#include "mythcorecontext.h"
 #include "config.h"
 
 // libav headers
@@ -98,12 +99,10 @@ bool AudioOutputDigitalEncoder::Init(
             .arg(samplerate) .arg(channels));
 
     // We need to do this when called from mythmusic
+    avcodeclock->lock();
     avcodec_register_all();
-#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT( 52, 113, 0 )
+    avcodeclock->unlock();
     codec = avcodec_find_encoder_by_name("ac3_fixed");
-#else
-    codec = avcodec_find_encoder(CODEC_ID_AC3);
-#endif
     if (!codec)
     {
         LOG(VB_GENERAL, LOG_ERR, LOC + "Could not find codec");
@@ -209,30 +208,31 @@ size_t AudioOutputDigitalEncoder::Encode(void *buf, int len, AudioFormat format)
 
     int frames = inlen / sizeof(inbuf_t) / samples_per_frame;
     int i = 0;
-
-    AVFrame  *frame  = avcodec_alloc_frame();
+    AVFrame *frame = avcodec_alloc_frame();
 
     while (i < frames)
     {
-        AVPacket packet;
-        packet.data = (uint8_t *)m_encodebuffer;
-        packet.size = sizeof(m_encodebuffer);
-
-	frame->data[0]     = (uint8_t *)&in[i * samples_per_frame];
-        frame->linesize[0] = inlen;
-	frame->nb_samples  = frames - i;
-        frame->format      = AV_SAMPLE_FMT_S16;
-
-	int got_packet = 0;
-
-        int outsize = avcodec_encode_audio2(av_context, &packet, frame,
-                                            &got_packet);
-
-        if (outsize < 0 || !got_packet)
+        AVPacket pkt;
+        av_init_packet(&pkt);
+        pkt.data          = (uint8_t *)m_encodebuffer;
+        pkt.size          = sizeof(m_encodebuffer);
+        frame->nb_samples = av_context->frame_size;
+        frame->data[0]    = (uint8_t *)(in + i * samples_per_frame);
+        frame->pts        = AV_NOPTS_VALUE;
+        int got_packet    = 0;
+        int ret           = avcodec_encode_audio2(av_context, &pkt, frame,
+                                                  &got_packet);
+        int outsize       = pkt.size;
+
+        if (ret < 0)
         {
             LOG(VB_AUDIO, LOG_ERR, LOC + "AC-3 encode error");
-            return outlen;
+            return ret;
         }
+        av_free_packet(&pkt);
+        i++;
+        if (!got_packet)
+            continue;
 
         if (!m_spdifenc)
         {
@@ -265,9 +265,7 @@ size_t AudioOutputDigitalEncoder::Encode(void *buf, int len, AudioFormat format)
         m_spdifenc->GetData((uint8_t *)out + outlen, data_size);
         outlen += data_size;
         inlen  -= samples_per_frame * sizeof(inbuf_t);
-        i++;
     }
-
     av_free(frame);
 
     memmove(in, in + i * samples_per_frame, inlen);

diff --git a/mythtv/libs/libmyth/audio/spdifencoder.cpp b/mythtv/libs/libmyth/audio/spdifencoder.cpp
@@ -55,8 +55,8 @@ SPDIFEncoder::SPDIFEncoder(QString muxer, int codec_id)
         return;
     }
 
-    m_oc->pb->seekable = 0;
-    m_oc->flags             |= AVFMT_NOFILE | AVFMT_FLAG_IGNIDX;
+    m_oc->pb->seekable    = 0;
+    m_oc->flags          |= AVFMT_NOFILE | AVFMT_FLAG_IGNIDX;
 
     m_stream = avformat_new_stream(m_oc, NULL);
     if (!m_stream)
@@ -66,7 +66,7 @@ SPDIFEncoder::SPDIFEncoder(QString muxer, int codec_id)
         return;
     }
 
-    m_stream->id = 1;
+    m_stream->id          = 1;
 
     AVCodecContext *codec = m_stream->codec;
 
@@ -92,10 +92,11 @@ SPDIFEncoder::~SPDIFEncoder(void)
 void SPDIFEncoder::WriteFrame(unsigned char *data, int size)
 {
     AVPacket packet;
-
     av_init_packet(&packet);
-    packet.data = data;
-    packet.size = size;
+    static int pts = 1; // to avoid warning "Encoder did not produce proper pts"
+    packet.pts  = pts++; 
+    packet.data    = data;
+    packet.size    = size;
 
     if (av_write_frame(m_oc, &packet) < 0)
     {