[FFmpeg-devel] [PATCH] avformat/mpegenc - reject unsupported audio streams

[Gyan]

On 22-04-2019 01:15 PM, Gyan wrote:
>
>
> On 22-04-2019 12:30 PM, Carl Eugen Hoyos wrote:
>>
>>> Am 20.04.2019 um 11:31 schrieb Gyan <ffmpeg at gyani.pro>:
>>>
>>>
>>> Old patch that was never applied. Rebased.
>> Please return patch_welcome for mlp and truehd.
> Will do.
>> Wasn’t there another comment (not by me): “Why can’t .codec_tag be 
>> used?”
>
> There's no codec_tag member set. This patch is just to disallow an 
> invalid muxing to proceed.

Revised.

Gyan
-------------- next part --------------
From 608bf79e2aed04cd34dca733c778b7e630f31a46 Mon Sep 17 00:00:00 2001
From: Gyan Doshi <gyandoshi at gmail.com>
Date: Tue, 20 Feb 2018 20:42:21 +0530
Subject: [PATCH v2] avformat/mpegenc - reject unsupported audio streams

Only MP1, MP2, MP3, 16-bit PCM_DVD, PCM S16BE,
AC3 and DTS audio codecs are supported by the muxer.
---
 libavformat/mpegenc.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c
index 1389288b7f..43ebc46e0e 100644
--- a/libavformat/mpegenc.c
+++ b/libavformat/mpegenc.c
@@ -407,6 +407,16 @@ static av_cold int mpeg_mux_init(AVFormatContext *ctx)
                 stream->lpcm_header[2] = 0x80;
                 stream->id = lpcm_id++;
                 stream->lpcm_align = st->codecpar->channels * st->codecpar->bits_per_coded_sample / 8;
+            } else if (st->codecpar->codec_id == AV_CODEC_ID_MLP ||
+                       st->codecpar->codec_id == AV_CODEC_ID_TRUEHD) {
+                       av_log(ctx, AV_LOG_ERROR, "Support for muxing audio codec %s not implemented.\n",
+                              avcodec_get_name(st->codecpar->codec_id));
+                       return AVERROR_PATCHWELCOME;
+            } else if (st->codecpar->codec_id != AV_CODEC_ID_MP1 &&
+                       st->codecpar->codec_id != AV_CODEC_ID_MP2 &&
+                       st->codecpar->codec_id != AV_CODEC_ID_MP3) {
+                       av_log(ctx, AV_LOG_ERROR, "Unsupported audio codec. Must be one of mp1, mp2, mp3, 16-bit pcm_dvd, pcm_s16be, ac3 or dts.\n");
+                       goto fail;
             } else {
                 stream->id = mpa_id++;
             }
-- 
2.21.0