[FFmpeg-cvslog] examples/decode_audio: handle planar audio now produced by the MP2 decoder

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Wed Oct 19 21:56:22 2016 +0200| [45a1ce2ff7688656aacd53c27de5815a7ec13afe] | committer: Anton Khirnov

examples/decode_audio: handle planar audio now produced by the MP2 decoder

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

 doc/examples/decode_audio.c | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/doc/examples/decode_audio.c b/doc/examples/decode_audio.c
index 5e128f8..c00d488 100644
--- a/doc/examples/decode_audio.c
+++ b/doc/examples/decode_audio.c
@@ -29,6 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "libavutil/channel_layout.h"
 #include "libavutil/frame.h"
 #include "libavutil/mem.h"
 
@@ -40,7 +41,8 @@
 static void decode(AVCodecContext *dec_ctx, AVPacket *pkt, AVFrame *frame,
                    FILE *outfile)
 {
-    int ret, data_size;
+    int16_t *interleave_buf;
+    int ret, data_size, i;
 
     /* send the packet with the compressed data to the decoder */
     ret = avcodec_send_packet(dec_ctx, pkt);
@@ -59,10 +61,28 @@ static void decode(AVCodecContext *dec_ctx, AVPacket *pkt, AVFrame *frame,
             exit(1);
         }
 
-        data_size = av_samples_get_buffer_size(NULL, dec_ctx->channels,
-                                               frame->nb_samples,
-                                               dec_ctx->sample_fmt, 1);
-        fwrite(frame->data[0], 1, data_size, outfile);
+        /* the stream parameters may change at any time, check that they are
+         * what we expect */
+        if (av_get_channel_layout_nb_channels(frame->channel_layout) != 2 ||
+            frame->format != AV_SAMPLE_FMT_S16P) {
+            fprintf(stderr, "Unsupported frame parameters\n");
+            exit(1);
+        }
+
+        /* The decoded data is signed 16-bit planar -- each channel in its own
+         * buffer. We interleave the two channels manually here, but using
+         * libavresample is recommended instead. */
+        data_size = sizeof(*interleave_buf) * 2 * frame->nb_samples;
+        interleave_buf = av_malloc(data_size);
+        if (!interleave_buf)
+            exit(1);
+
+        for (i = 0; i < frame->nb_samples; i++) {
+            interleave_buf[2 * i]     = ((int16_t*)frame->data[0])[i];
+            interleave_buf[2 * i + 1] = ((int16_t*)frame->data[1])[i];
+        }
+        fwrite(interleave_buf, 1, data_size, outfile);
+        av_freep(&interleave_buf);
     }
 }