Just wanted to ask if there is any further information needed regarding my
patch.
> Gesendet: Sonntag, 13. Dezember 2015 um 11:54 Uhr
> Von: "Stefan Pöschel" <basic.mas...@gmx.de>
> An: ffmpeg-devel@ffmpeg.org
> Betreff: [FFmpeg-devel] [PATCH] avformat/mpegtsenc: add flag to embed an
> AC-3/E-AC-3 ES the DVB way
>
> So far an AC-3 elementary stream is refered to in the PMT according to
> System A (ATSC). An E-AC-3 ES in contrast is embedded the System B (DVB) way.
> To fix this inconsistency, this commit changes the default E-AC-3 behaviour to
> use the ATSC way, too. Furthermore a new flag is added to optionally select
> the
> DVB way (regarding both codecs and possible further differences in the
> future).
> ---
> libavformat/mpegts.h | 1 +
> libavformat/mpegtsenc.c | 20 ++++++++++++++++++--
> 2 files changed, 19 insertions(+), 2 deletions(-)
>
> diff --git a/libavformat/mpegts.h b/libavformat/mpegts.h
> index 84f3098..0cdbc76 100644
> --- a/libavformat/mpegts.h
> +++ b/libavformat/mpegts.h
> @@ -60,6 +60,7 @@
> #define STREAM_TYPE_AUDIO_AC3 0x81
> #define STREAM_TYPE_AUDIO_DTS 0x82
> #define STREAM_TYPE_AUDIO_TRUEHD 0x83
> +#define STREAM_TYPE_AUDIO_EAC3 0x87
>
> typedef struct MpegTSContext MpegTSContext;
>
> diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
> index 19032f3..cb11c31 100644
> --- a/libavformat/mpegtsenc.c
> +++ b/libavformat/mpegtsenc.c
> @@ -99,6 +99,7 @@ typedef struct MpegTSWrite {
> #define MPEGTS_FLAG_REEMIT_PAT_PMT 0x01
> #define MPEGTS_FLAG_AAC_LATM 0x02
> #define MPEGTS_FLAG_PAT_PMT_AT_FRAMES 0x04
> +#define MPEGTS_FLAG_SYSTEM_B 0x08
> int flags;
> int copyts;
> int tables_version;
> @@ -319,7 +320,14 @@ static int mpegts_write_pmt(AVFormatContext *s,
> MpegTSService *service)
> stream_type = STREAM_TYPE_AUDIO_AAC_LATM;
> break;
> case AV_CODEC_ID_AC3:
> - stream_type = STREAM_TYPE_AUDIO_AC3;
> + stream_type = (ts->flags & MPEGTS_FLAG_SYSTEM_B)
> + ? STREAM_TYPE_PRIVATE_DATA
> + : STREAM_TYPE_AUDIO_AC3;
> + break;
> + case AV_CODEC_ID_EAC3:
> + stream_type = (ts->flags & MPEGTS_FLAG_SYSTEM_B)
> + ? STREAM_TYPE_PRIVATE_DATA
> + : STREAM_TYPE_AUDIO_EAC3;
> break;
> case AV_CODEC_ID_DTS:
> stream_type = STREAM_TYPE_AUDIO_DTS;
> @@ -343,7 +351,12 @@ static int mpegts_write_pmt(AVFormatContext *s,
> MpegTSService *service)
> /* write optional descriptors here */
> switch (st->codec->codec_type) {
> case AVMEDIA_TYPE_AUDIO:
> - if (st->codec->codec_id==AV_CODEC_ID_EAC3) {
> + if (st->codec->codec_id==AV_CODEC_ID_AC3 && (ts->flags &
> MPEGTS_FLAG_SYSTEM_B)) {
> + *q++=0x6a; // AC3 descriptor see A038 DVB SI
> + *q++=1; // 1 byte, all flags sets to 0
> + *q++=0; // omit all fields...
> + }
> + if (st->codec->codec_id==AV_CODEC_ID_EAC3 && (ts->flags &
> MPEGTS_FLAG_SYSTEM_B)) {
> *q++=0x7a; // EAC3 descriptor see A038 DVB SI
> *q++=1; // 1 byte, all flags sets to 0
> *q++=0; // omit all fields...
> @@ -1790,6 +1803,9 @@ static const AVOption options[] = {
> { "pat_pmt_at_frames", "Reemit PAT and PMT at each video frame",
> 0, AV_OPT_TYPE_CONST, { .i64 = MPEGTS_FLAG_PAT_PMT_AT_FRAMES}, 0,
> INT_MAX,
> AV_OPT_FLAG_ENCODING_PARAM, "mpegts_flags" },
> + { "system_b", "Conform to System B (DVB) instead of System A (ATSC)",
> + 0, AV_OPT_TYPE_CONST, { .i64 = MPEGTS_FLAG_SYSTEM_B }, 0, INT_MAX,
> + AV_OPT_FLAG_ENCODING_PARAM, "mpegts_flags" },
> // backward compatibility
> { "resend_headers", "Reemit PAT/PMT before writing the next packet",
> offsetof(MpegTSWrite, reemit_pat_pmt), AV_OPT_TYPE_INT,
> --
> 2.6.4
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
