Somebody changed AUD to active in NVENC by default, which is not very
clever, libx264 also has this future disabled, so we should stay in sync
with libx264 behavior.
Enabled AUD will work only without B-frames. There is BUG in Nvidia
NVENC when you use AUD for H264 with B-frames, it will return corrupted
stream, because NVIDIA is inserting AUD type 0 (I-frame) before B-frames
instead of AUD type 7 (any-frame).
H264 encoded with B-frames and AUD active will not play for example on
Panasonic TX-AS640E, other decoders just ignore wrong AUD type.
--
Miroslav Slugeň
>From 8205523dfa477eaaeda3e10d59a42e024dafbfdb Mon Sep 17 00:00:00 2001
From: Miroslav Slugen <thunde...@email.cz>
Date: Thu, 29 Dec 2016 21:50:13 +0100
Subject: [PATCH 1/1] NVENC: Make AUD optional
---
libavcodec/nvenc.c | 4 ++--
libavcodec/nvenc.h | 1 +
libavcodec/nvenc_h264.c | 1 +
libavcodec/nvenc_hevc.c | 1 +
4 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c
index f64fd8a..d57a90c 100644
--- a/libavcodec/nvenc.c
+++ b/libavcodec/nvenc.c
@@ -756,7 +756,7 @@ static av_cold int nvenc_setup_h264_config(AVCodecContext *avctx)
h264->disableSPSPPS = (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) ? 1 : 0;
h264->repeatSPSPPS = (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) ? 0 : 1;
- h264->outputAUD = 1;
+ h264->outputAUD = (ctx->aud == 1) ? 1 : 0;
if (avctx->refs >= 0) {
/* 0 means "let the hardware decide" */
@@ -840,7 +840,7 @@ static av_cold int nvenc_setup_hevc_config(AVCodecContext *avctx)
hevc->disableSPSPPS = (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) ? 1 : 0;
hevc->repeatSPSPPS = (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) ? 0 : 1;
- hevc->outputAUD = 1;
+ hevc->outputAUD = (ctx->aud == 1) ? 1 : 0;
if (avctx->refs >= 0) {
/* 0 means "let the hardware decide" */
diff --git a/libavcodec/nvenc.h b/libavcodec/nvenc.h
index 5bc0cba..c435e05 100644
--- a/libavcodec/nvenc.h
+++ b/libavcodec/nvenc.h
@@ -153,6 +153,7 @@ typedef struct NvencContext
int strict_gop;
int aq_strength;
int quality;
+ int aud;
} NvencContext;
int ff_nvenc_encode_init(AVCodecContext *avctx);
diff --git a/libavcodec/nvenc_h264.c b/libavcodec/nvenc_h264.c
index 71e27fd..cae27aa 100644
--- a/libavcodec/nvenc_h264.c
+++ b/libavcodec/nvenc_h264.c
@@ -107,6 +107,7 @@ static const AVOption options[] = {
OFFSET(aq_strength), AV_OPT_TYPE_INT, { .i64 = 8 }, 1, 15, VE },
{ "cq", "Set target quality level (0 to 51, 0 means automatic) for constant quality mode in VBR rate control",
OFFSET(quality), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 51, VE },
+ { "aud", "Use access unit delimiters", OFFSET(aud), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE },
{ NULL }
};
diff --git a/libavcodec/nvenc_hevc.c b/libavcodec/nvenc_hevc.c
index ef739b6..e44ca7e 100644
--- a/libavcodec/nvenc_hevc.c
+++ b/libavcodec/nvenc_hevc.c
@@ -104,6 +104,7 @@ static const AVOption options[] = {
OFFSET(aq_strength), AV_OPT_TYPE_INT, { .i64 = 8 }, 1, 15, VE },
{ "cq", "Set target quality level (0 to 51, 0 means automatic) for constant quality mode in VBR rate control",
OFFSET(quality), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 51, VE },
+ { "aud", "Use access unit delimiters", OFFSET(aud), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE },
{ NULL }
};
--
2.1.4
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
