[libav-devel] [PATCH 2/2] matroskaenc: refuse to write AAC without valid extradata by default

[Anton Khirnov]

We should not create invalid files unless the user really wants them.
---
 libavformat/matroskaenc.c | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 1d55b66..38f0863 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -520,8 +520,8 @@ static int put_flac_codecpriv(AVFormatContext *s,
     return 0;
 }
 
-static void get_aac_sample_rates(AVFormatContext *s, AVCodecContext *codec,
-                                 int *sample_rate, int *output_sample_rate)
+static int get_aac_sample_rates(AVFormatContext *s, AVCodecContext *codec,
+                                int *sample_rate, int *output_sample_rate)
 {
     MPEG4AudioConfig mp4ac;
 
@@ -529,11 +529,18 @@ static void get_aac_sample_rates(AVFormatContext *s, 
AVCodecContext *codec,
                                      codec->extradata_size * 8, 1) < 0) {
         av_log(s, AV_LOG_WARNING,
                "Error parsing AAC extradata, unable to determine 
samplerate.\n");
-        return;
+        if (s->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL) {
+            av_log(s, AV_LOG_ERROR,
+                   "Use a strict_std_compliance setting of 'unofficial' or "
+                   "smaller to force muxing anyway.\n");
+            return AVERROR(EINVAL);
+        }
+        return 0;
     }
 
     *sample_rate        = mp4ac.sample_rate;
     *output_sample_rate = mp4ac.ext_sample_rate;
+    return 0;
 }
 
 static int mkv_write_native_codecprivate(AVFormatContext *s,
@@ -748,8 +755,11 @@ static int mkv_write_track(AVFormatContext *s, 
MatroskaMuxContext *mkv,
     if (!bit_depth)
         bit_depth = av_get_bytes_per_sample(codec->sample_fmt) << 3;
 
-    if (codec->codec_id == AV_CODEC_ID_AAC)
-        get_aac_sample_rates(s, codec, &sample_rate, &output_sample_rate);
+    if (codec->codec_id == AV_CODEC_ID_AAC) {
+        ret = get_aac_sample_rates(s, codec, &sample_rate, 
&output_sample_rate);
+        if (ret < 0)
+            return ret;
+    }
 
     track = start_ebml_master(pb, MATROSKA_ID_TRACKENTRY, 0);
     put_ebml_uint (pb, MATROSKA_ID_TRACKNUMBER     , i + 1);
-- 
2.0.0

_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel