Re: [FFmpeg-devel] [PATCH] avformat/mpegenc - reject unsupported audio streams
> Am 19.07.2019 um 12:44 schrieb Gyan : > > > >> On 17-07-2019 02:23 PM, Carl Eugen Hoyos wrote: >> >> >>> Am 08.07.2019 um 14:05 schrieb Gyan : >>> >>> >>> On 25-04-2019 01:48 PM, Gyan wrote: > On 25-04-2019 01:23 PM, Ali KIZIL wrote: > > There are also Dolby Codecs (ac3 & eac3). Will it also throw error for > these codecs ? AC3 is supported before and after this patch. EAC3 is unsupported before and after this patch. But it's sent to the same decoder, so support could be added. I'll check. >>> Attached patch allows muxing EAC3 in MPEG-PS. Stock ffmpeg can demux and >>> decode such streams fine. >> Which descriptor is used for eac3? >> Please do not commit just because decoding works with FFmpeg, at least try >> to find some specification. > > The PS muxer appears to use System A and this is what the ATSC A/52 (2012) > standard says, > > "For System A, this section extends the use ofthe AC-3 Registration > Descriptor defined in Section A3 in combination with the E-AC-3 stream_type > value defined below." > > and > > "E-AC-3 bit streams shall be identified with a stream_typevalue of 0x87 when > transmitted as PES streams conforming to ATSC-published standards." > > Note that the stream_type value of AC-3 is 0x81 yet our id sequence starts > from 0x80. This patch uses the same descriptor series as AC-3, however if I > switch to 0x87, only one such stream may be muxed as 0x88 was assigned (by > you) to DTS. Also, our demuxer sets the codec_id to DTS for 0x88 to 0x8f. > > Both stock ffmpeg and VlC 4.0 nightly play files using the current patch. > Mediainfo also identifies the codec correctly. > > Comments? Did you test with WMP or QT? Carl Eugen ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH] avformat/mpegenc - reject unsupported audio streams
On 19-07-2019 04:14 PM, Gyan wrote: On 17-07-2019 02:23 PM, Carl Eugen Hoyos wrote: Am 08.07.2019 um 14:05 schrieb Gyan : On 25-04-2019 01:48 PM, Gyan wrote: On 25-04-2019 01:23 PM, Ali KIZIL wrote: There are also Dolby Codecs (ac3 & eac3). Will it also throw error for these codecs ? AC3 is supported before and after this patch. EAC3 is unsupported before and after this patch. But it's sent to the same decoder, so support could be added. I'll check. Attached patch allows muxing EAC3 in MPEG-PS. Stock ffmpeg can demux and decode such streams fine. Which descriptor is used for eac3? Please do not commit just because decoding works with FFmpeg, at least try to find some specification. The PS muxer appears to use System A and this is what the ATSC A/52 (2012) standard says, "For System A, this section extends the use ofthe AC-3 Registration Descriptor defined in Section A3 in combination with the E-AC-3 stream_type value defined below." and "E-AC-3 bit streams shall be identified with a stream_typevalue of 0x87 when transmitted as PES streams conforming to ATSC-published standards." Note that the stream_type value of AC-3 is 0x81 yet our id sequence starts from 0x80. This patch uses the same descriptor series as AC-3, however if I switch to 0x87, only one such stream may be muxed as 0x88 was assigned (by you) to DTS. Also, our demuxer sets the codec_id to DTS for 0x88 to 0x8f. Both stock ffmpeg and VlC 4.0 nightly play files using the current patch. Mediainfo also identifies the codec correctly. Comments? Carl, ping. Gyan ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH] avformat/mpegenc - reject unsupported audio streams
On 17-07-2019 02:23 PM, Carl Eugen Hoyos wrote: Am 08.07.2019 um 14:05 schrieb Gyan : On 25-04-2019 01:48 PM, Gyan wrote: On 25-04-2019 01:23 PM, Ali KIZIL wrote: There are also Dolby Codecs (ac3 & eac3). Will it also throw error for these codecs ? AC3 is supported before and after this patch. EAC3 is unsupported before and after this patch. But it's sent to the same decoder, so support could be added. I'll check. Attached patch allows muxing EAC3 in MPEG-PS. Stock ffmpeg can demux and decode such streams fine. Which descriptor is used for eac3? Please do not commit just because decoding works with FFmpeg, at least try to find some specification. The PS muxer appears to use System A and this is what the ATSC A/52 (2012) standard says, "For System A, this section extends the use ofthe AC-3 Registration Descriptor defined in Section A3 in combination with the E-AC-3 stream_type value defined below." and "E-AC-3 bit streams shall be identified with a stream_typevalue of 0x87 when transmitted as PES streams conforming to ATSC-published standards." Note that the stream_type value of AC-3 is 0x81 yet our id sequence starts from 0x80. This patch uses the same descriptor series as AC-3, however if I switch to 0x87, only one such stream may be muxed as 0x88 was assigned (by you) to DTS. Also, our demuxer sets the codec_id to DTS for 0x88 to 0x8f. Both stock ffmpeg and VlC 4.0 nightly play files using the current patch. Mediainfo also identifies the codec correctly. Comments? Gyan ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH] avformat/mpegenc - reject unsupported audio streams
> Am 08.07.2019 um 14:05 schrieb Gyan : > > > >> On 25-04-2019 01:48 PM, Gyan wrote: >> >> >>> On 25-04-2019 01:23 PM, Ali KIZIL wrote: >>> >>> There are also Dolby Codecs (ac3 & eac3). Will it also throw error for >>> these codecs ? >> >> AC3 is supported before and after this patch. >> EAC3 is unsupported before and after this patch. >> >> But it's sent to the same decoder, so support could be added. I'll check. > > Attached patch allows muxing EAC3 in MPEG-PS. Stock ffmpeg can demux and > decode such streams fine. Which descriptor is used for eac3? Please do not commit just because decoding works with FFmpeg, at least try to find some specification. Carl Eugen ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH] avformat/mpegenc - reject unsupported audio streams
On 08-07-2019 05:35 PM, Gyan wrote: On 25-04-2019 01:48 PM, Gyan wrote: On 25-04-2019 01:23 PM, Ali KIZIL wrote: There are also Dolby Codecs (ac3 & eac3). Will it also throw error for these codecs ? AC3 is supported before and after this patch. EAC3 is unsupported before and after this patch. But it's sent to the same decoder, so support could be added. I'll check. Attached patch allows muxing EAC3 in MPEG-PS. Stock ffmpeg can demux and decode such streams fine. Will push tonight. Gyan ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH] avformat/mpegenc - reject unsupported audio streams
On 25-04-2019 01:48 PM, Gyan wrote:
On 25-04-2019 01:23 PM, Ali KIZIL wrote:
There are also Dolby Codecs (ac3 & eac3). Will it also throw error for
these codecs ?
AC3 is supported before and after this patch.
EAC3 is unsupported before and after this patch.
But it's sent to the same decoder, so support could be added. I'll check.
Attached patch allows muxing EAC3 in MPEG-PS. Stock ffmpeg can demux
and decode such streams fine.
Gyan
From 4558eab851efc252fc6cac4aff4f557b5768004a Mon Sep 17 00:00:00 2001
From: Gyan Doshi
Date: Mon, 8 Jul 2019 17:04:21 +0530
Subject: [PATCH] avformat/mpegenc: allow muxing eac3 streams
---
libavformat/mpegenc.c | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c
index 43ebc46e0e..15b191bc9d 100644
--- a/libavformat/mpegenc.c
+++ b/libavformat/mpegenc.c
@@ -352,6 +352,7 @@ static av_cold int mpeg_mux_init(AVFormatContext *ctx)
case AVMEDIA_TYPE_AUDIO:
if (!s->is_mpeg2 &&
(st->codecpar->codec_id == AV_CODEC_ID_AC3 ||
+ st->codecpar->codec_id == AV_CODEC_ID_EAC3 ||
st->codecpar->codec_id == AV_CODEC_ID_DTS ||
st->codecpar->codec_id == AV_CODEC_ID_PCM_S16BE ||
st->codecpar->codec_id == AV_CODEC_ID_PCM_DVD))
@@ -360,7 +361,8 @@ static av_cold int mpeg_mux_init(AVFormatContext *ctx)
"consider using the vob or the dvd muxer "
"to force a MPEG-2 program stream.\n",
avcodec_get_name(st->codecpar->codec_id));
-if (st->codecpar->codec_id == AV_CODEC_ID_AC3) {
+if (st->codecpar->codec_id == AV_CODEC_ID_AC3 ||
+st->codecpar->codec_id == AV_CODEC_ID_EAC3) {
stream->id = ac3_id++;
} else if (st->codecpar->codec_id == AV_CODEC_ID_DTS) {
stream->id = dts_id++;
@@ -415,7 +417,7 @@ static av_cold int mpeg_mux_init(AVFormatContext *ctx)
} 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");
+ av_log(ctx, AV_LOG_ERROR, "Unsupported audio codec.
Must be one of mp1, mp2, mp3, 16-bit pcm_dvd, pcm_s16be, ac3, eac3 or dts.\n");
goto fail;
} else {
stream->id = mpa_id++;
--
2.22.0___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH] avformat/mpegenc - reject unsupported audio streams
On 25-04-2019 01:23 PM, Ali KIZIL wrote: There are also Dolby Codecs (ac3 & eac3). Will it also throw error for these codecs ? AC3 is supported before and after this patch. EAC3 is unsupported before and after this patch. But it's sent to the same decoder, so support could be added. I'll check. Gyan ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH] avformat/mpegenc - reject unsupported audio streams
Gyan , 24 Nis 2019 Çar, 07:30 tarihinde şunu yazdı: > > > On 24-04-2019 03:30 AM, Carl Eugen Hoyos wrote: > > 2019-04-22 13:00 GMT+02:00, 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 : > > > > > > 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. > > Wasn't the argument that this is possible with codec_tag? > > Not in the present state. If you want to add a codec_tag, that's a > separate patch. > > >> Revised. > > What about aac? > > There's no provision to mux AAC, at present. On demux, the stream is > detected as mp2. > > > And can't you wait more than a few hours for a review? > This patch is 14 months old, except for the one change you requested. > And all the patch does is enforce the existing limitations. > > Gyan > ___ > There are also Dolby Codecs (ac3 & eac3). Will it also throw error for these codecs ? ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH] avformat/mpegenc - reject unsupported audio streams
On 24-04-2019 03:30 AM, Carl Eugen Hoyos wrote: 2019-04-22 13:00 GMT+02:00, 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 : 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. Wasn't the argument that this is possible with codec_tag? Not in the present state. If you want to add a codec_tag, that's a separate patch. Revised. What about aac? There's no provision to mux AAC, at present. On demux, the stream is detected as mp2. And can't you wait more than a few hours for a review? This patch is 14 months old, except for the one change you requested. And all the patch does is enforce the existing limitations. Gyan ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH] avformat/mpegenc - reject unsupported audio streams
2019-04-22 13:00 GMT+02:00, 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 : 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. Wasn't the argument that this is possible with codec_tag? > Revised. What about aac? And can't you wait more than a few hours for a review? Carl Eugen ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH] avformat/mpegenc - reject unsupported audio streams
On 22-04-2019 04:30 PM, Gyan wrote: 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 : 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. Pushed as 6829c3cbe480501725250c62cd1b920a75a44ec7 Gyan ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH] avformat/mpegenc - reject unsupported audio streams
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 :
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
From 608bf79e2aed04cd34dca733c778b7e630f31a46 Mon Sep 17 00:00:00 2001
From: Gyan Doshi
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___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH] avformat/mpegenc - reject unsupported audio streams
On 22-04-2019 12:30 PM, Carl Eugen Hoyos wrote: Am 20.04.2019 um 11:31 schrieb Gyan : 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. Gyan ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH] avformat/mpegenc - reject unsupported audio streams
> Am 20.04.2019 um 11:31 schrieb Gyan : > > > Old patch that was never applied. Rebased. Please return patch_welcome for mlp and truehd. Wasn’t there another comment (not by me): “Why can’t .codec_tag be used?” Carl Eugen ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH] avformat/mpegenc - reject unsupported audio streams
On 20-04-2019 03:01 PM, Gyan wrote: Old patch that was never applied. Rebased. Plan to push tonight if no changes. Thanks, Gyan ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-devel] [PATCH] avformat/mpegenc - reject unsupported audio streams
Old patch that was never applied. Rebased.
Gyan
From 80c0524adf53c95801afcf9b92b0baa519bf983e Mon Sep 17 00:00:00 2001
From: Gyan Doshi
Date: Tue, 20 Feb 2018 20:42:21 +0530
Subject: [PATCH] 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 | 5 +
1 file changed, 5 insertions(+)
diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c
index 1389288b7f..ed54a4f79b 100644
--- a/libavformat/mpegenc.c
+++ b/libavformat/mpegenc.c
@@ -407,6 +407,11 @@ 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_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___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
