Ticket #13186: 003_avcodec_encode_audio2.patch

mythtv/libs/libmyth/audio/audiooutputdigitalencoder.cpp

@@ -239 +239 @@
         av_init_packet(&pkt);
         pkt.data          = NULL;
         pkt.size          = 0;
-        int got_packet    = 0;
+        bool got_packet   = false;
 
         AudioOutputUtil::DeinterleaveSamples(
             FORMAT_S16, channels,
@@ -247 +247 @@
             (uint8_t*)(in + i * samples_per_frame),
             size_channel * channels);
 
-        int ret           = avcodec_encode_audio2(av_context, &pkt, m_frame,
-                                                  &got_packet);
+        //  SUGGESTION
+        //  Now that avcodec_encode_audio2 is deprecated and replaced
+        //  by 2 calls, this could be optimized
+        //  into separate routines or separate threads.
+        int ret = avcodec_receive_packet(av_context, &pkt);
+        if (ret == 0)
+            got_packet = true;
+        if (ret == AVERROR(EAGAIN))
+            ret = 0;
+        if (ret == 0)
+            ret = avcodec_send_frame(av_context, m_frame);
+        // if ret from avcodec_send_frame is AVERROR(EAGAIN) then
+        // there are 2 packets to be received while only 1 frame to be
+        // sent. The code does not cater for this. Hopefully it will not happen.
 
         if (ret < 0)
         {
-            LOG(VB_AUDIO, LOG_ERR, LOC + "AC-3 encode error");
+            char error[AV_ERROR_MAX_STRING_SIZE];
+            LOG(VB_GENERAL, LOG_ERR, LOC +
+                QString("audio encode error: %1 (%2)")
+                .arg(av_make_error_string(error, sizeof(error), ret))
+                .arg(got_packet));
             return ret;
         }
         i++;

mythtv/libs/libmythtv/avformatwriter.cpp

@@ -323 +323 @@
     bswap_16_buf((short int*) buf, m_audioFrameSize, m_audioChannels);
 #endif
 
-    int got_packet = 0;
+    bool got_packet = false;
     int ret = 0;
     int samples_per_avframe  = m_audioFrameSize * m_audioChannels;
     int sampleSizeIn   = AudioOutputSettings::SampleSize(FORMAT_S16);
@@ -370 +370 @@
 
     {
         QMutexLocker locker(avcodeclock);
-        ret = avcodec_encode_audio2(m_audioStream->codec, &pkt,
-                                    m_audPicture, &got_packet);
+        //  SUGGESTION
+        //  Now that avcodec_encode_audio2 is deprecated and replaced
+        //  by 2 calls, this could be optimized
+        //  into separate routines or separate threads.
+        got_packet = false;
+        ret = avcodec_receive_packet(m_audioStream->codec, &pkt);
+        if (ret == 0)
+            got_packet = true;
+        if (ret == AVERROR(EAGAIN))
+            ret = 0;
+        if (ret == 0)
+            ret = avcodec_send_frame(m_audioStream->codec, m_audPicture);
+        // if ret from avcodec_send_frame is AVERROR(EAGAIN) then
+        // there are 2 packets to be received while only 1 frame to be
+        // sent. The code does not cater for this. Hopefully it will not happen.
     }
 
     if (ret < 0)
     {
-        LOG(VB_RECORD, LOG_ERR, "avcodec_encode_audio2() failed");
+        char error[AV_ERROR_MAX_STRING_SIZE];
+        LOG(VB_GENERAL, LOG_ERR, LOC +
+            QString("audio encode error: %1 (%2)")
+            .arg(av_make_error_string(error, sizeof(error), ret))
+            .arg(got_packet));
         return ret;
     }
 

mythtv/programs/mythtranscode/external/replex/replex.c

@@ -88 +88 @@
 {
     AVPacket pkt;
     AVFrame *frame;
-    int ret, samples_size, got_packet;
+    int ret, samples_size;
 
     av_init_packet(&pkt);
     pkt.data = buf;
@@ -139 +139 @@
         frame = NULL;
     }
 
-    got_packet = 0;
-    ret = avcodec_encode_audio2(avctx, &pkt, frame, &got_packet);
+    //  SUGGESTION
+    //  Now that avcodec_encode_audio2 is deprecated and replaced
+    //  by 2 calls, this could be optimized
+    //  into separate routines or separate threads.
+    ret = avcodec_receive_packet(avctx, &pkt);
+    if (ret != 0)
+        pkt.size=0;
+    if (ret == AVERROR(EAGAIN))
+        ret = 0;
+    if (ret == 0)
+        ret = avcodec_send_frame(avctx, frame);
+
+    if (ret < 0)
+    {
+        char error[AV_ERROR_MAX_STRING_SIZE+25];
+                strcpy(error,"audio encode error: ");
+                strcat(error, av_make_error_string(error, sizeof(error), ret));
+        LOG(VB_GENERAL, LOG_ERR, error);
+    }
 
     /* free any side data since we cannot return it */
     av_packet_free_side_data(&pkt);