August 2016 - ffmpeg-cvslog - lists.ffmpeg.org

avformat/hlsenc: add option hls_init_time to set init hls window segment duration
by git＠videolan.org 29 Aug '16

29 Aug '16

ffmpeg | branch: master | Steven Liu <lingjiujianke(a)gmail.com> | Sat Aug 27 19:11:14 2016 +0800| [557ad3a4745cbd894490fa82daf50c2a74579b11] | committer: Michael Niedermayer avformat/hlsenc: add option hls_init_time to set init hls window segment duration recover segments duration time by hls_time after init hls window. This is reuqested by Ibrahim Tachijian Reviewed-by: Michael Niedermayer <michael(a)niedermayer.cc> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=557ad3a4745cbd894… --- libavformat/hlsenc.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index e65f002..ab4a9bf 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -85,6 +85,7 @@ typedef struct HLSContext { AVFormatContext *vtt_avf; float time; // Set by a private option. + float init_time; // Set by a private option. int max_nb_segments; // Set by a private option. int wrap; // Set by a private option. uint32_t flags; // enum HLSFlags @@ -706,7 +707,7 @@ static int hls_write_header(AVFormatContext *s) int vtt_basename_size; hls->sequence = hls->start_sequence; - hls->recording_time = hls->time * AV_TIME_BASE; + hls->recording_time = (hls->init_time ? hls->init_time : hls->time) * AV_TIME_BASE; hls->start_pts = AV_NOPTS_VALUE; if (hls->format_options_str) { @@ -863,6 +864,14 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) int ret, can_split = 1; int stream_index = 0; + if (hls->sequence - hls->nb_entries > hls->start_sequence && hls->init_time > 0) { + /* reset end_pts, hls->recording_time at end of the init hls list */ + int init_list_dur = hls->init_time * hls->nb_entries * AV_TIME_BASE; + int after_init_list_dur = (hls->sequence - hls->nb_entries ) * hls->time * AV_TIME_BASE; + hls->recording_time = hls->time * AV_TIME_BASE; + end_pts = init_list_dur + after_init_list_dur ; + } + if( st->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE ) { oc = hls->vtt_avf; stream_index = 0; @@ -972,6 +981,7 @@ static int hls_write_trailer(struct AVFormatContext *s) static const AVOption options[] = { {"start_number", "set first number in the sequence", OFFSET(start_sequence),AV_OPT_TYPE_INT64, {.i64 = 0}, 0, INT64_MAX, E}, {"hls_time", "set segment length in seconds", OFFSET(time), AV_OPT_TYPE_FLOAT, {.dbl = 2}, 0, FLT_MAX, E}, + {"hls_init_time", "set segment length in seconds at init list", OFFSET(init_time), AV_OPT_TYPE_FLOAT, {.dbl = 0}, 0, FLT_MAX, E}, {"hls_list_size", "set maximum number of playlist entries", OFFSET(max_nb_segments), AV_OPT_TYPE_INT, {.i64 = 5}, 0, INT_MAX, E}, {"hls_ts_options","set hls mpegts list of options for the container format used for hls", OFFSET(format_options_str), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E}, {"hls_vtt_options","set hls vtt list of options for the container format used for hls", OFFSET(vtt_format_options_str), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E},

1 0

doc/muxers: add option hls_init_time document
by git＠videolan.org 29 Aug '16

29 Aug '16

ffmpeg | branch: master | Steven Liu <lingjiujianke(a)gmail.com> | Sat Aug 27 07:35:54 2016 +0800| [7ba98824a948f8ab7c4ad52b5b8a470a741a2d41] | committer: Michael Niedermayer doc/muxers: add option hls_init_time document Reviewed-by: Ibrahim Tachijian <barhom(a)netsat.se> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7ba98824a948f8ab7… --- doc/muxers.texi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/muxers.texi b/doc/muxers.texi index 2548aeb..c39a6a0 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -357,6 +357,12 @@ segmentation. This muxer supports the following options: @table @option +@item hls_init_time @var{seconds} +Set the initial target segment length in seconds. Default value is @var{0}. +Segment will be cut on the next key frame after this time has passed on the first m3u8 list. +After the initial playlist is filled @command{ffmpeg} will cut segments +at duration equal to @code{hls_time} + @item hls_time @var{seconds} Set the target segment length in seconds. Default value is 2. Segment will be cut on the next key frame after this time has passed.

1 0

avformat/mov: aax: pass proper AVClass to av_log()
by git＠videolan.org 28 Aug '16

28 Aug '16

ffmpeg | branch: master | Thomas Hebb <tommyhebb(a)gmail.com> | Sun Aug 28 12:24:55 2016 -0400| [a37e6dd2ba85a44fc283d24f3ee3bdd8abad5b9b] | committer: Michael Niedermayer avformat/mov: aax: pass proper AVClass to av_log() av_log() expects its first parameter to be a pointer to a struct whose first element is a pointer to an AVClass. In what I can only imagine is a typo, one call to av_log() in the AAX decryption code instead passes a pointer to an AVSHA struct, which doesn't even contain a pointer as its first element, much less a pointer to an AVClass. Change the call to pass the current MOVContext, as surrounding calls do. The incorrect AVClass was causing mpv to emit the warning "av_log callback called with bad parameters" when playing an .aax file. Signed-off-by: Thomas Hebb <tommyhebb(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a37e6dd2ba85a44fc… --- libavformat/mov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 6282d8f..f499906 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -997,7 +997,7 @@ static int mov_read_adrm(MOVContext *c, AVIOContext *pb, MOVAtom atom) av_log(c->fc, AV_LOG_INFO, "[aax] file checksum == "); // required by external tools for (i = 0; i < 20; i++) - av_log(sha, AV_LOG_INFO, "%02x", file_checksum[i]); + av_log(c->fc, AV_LOG_INFO, "%02x", file_checksum[i]); av_log(c->fc, AV_LOG_INFO, "\n"); /* verify activation data */

1 0

avcodec/nvenc: update license header
by git＠videolan.org 28 Aug '16

28 Aug '16

ffmpeg | branch: master | Timo Rothenpieler <timo(a)rothenpieler.org> | Sun Aug 28 19:51:22 2016 +0200| [cac2df230e730906bd1ec6cbd18670214fbf92bb] | committer: Timo Rothenpieler avcodec/nvenc: update license header > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cac2df230e730906b… --- libavcodec/nvenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index e22df52..283f29f 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -1,6 +1,6 @@ /* - * H.264 hardware encoding using nvidia nvenc - * Copyright (c) 2014 Timo Rothenpieler <timo(a)rothenpieler.org> + * H.264/HEVC hardware encoding using nvidia nvenc + * Copyright (c) 2016 Timo Rothenpieler <timo(a)rothenpieler.org> * * This file is part of FFmpeg. *

1 0

avcodec/nvenc: check maximum driver API version
by git＠videolan.org 28 Aug '16

28 Aug '16

ffmpeg | branch: master | Timo Rothenpieler <timo(a)rothenpieler.org> | Sun Aug 28 19:46:44 2016 +0200| [df615efcf275d87ec6e19be1c1b2f16e9b5d4e72] | committer: Timo Rothenpieler avcodec/nvenc: check maximum driver API version > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=df615efcf275d87ec… --- libavcodec/nvenc.c | 18 ++++++++++++++++++ libavcodec/nvenc.h | 1 + 2 files changed, 19 insertions(+) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 8994af1..553f223 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -155,8 +155,10 @@ static av_cold int nvenc_load_libraries(AVCodecContext *avctx) { NvencContext *ctx = avctx->priv_data; NvencDynLoadFunctions *dl_fn = &ctx->nvenc_dload_funcs; + PNVENCODEAPIGETMAXSUPPORTEDVERSION nvenc_get_max_ver; PNVENCODEAPICREATEINSTANCE nvenc_create_instance; NVENCSTATUS err; + uint32_t nvenc_max_ver; #if CONFIG_CUDA dl_fn->cu_init = cuInit; @@ -183,9 +185,25 @@ static av_cold int nvenc_load_libraries(AVCodecContext *avctx) LOAD_LIBRARY(dl_fn->nvenc, NVENC_LIBNAME); + LOAD_SYMBOL(nvenc_get_max_ver, dl_fn->nvenc, + "NvEncodeAPIGetMaxSupportedVersion"); LOAD_SYMBOL(nvenc_create_instance, dl_fn->nvenc, "NvEncodeAPICreateInstance"); + err = nvenc_get_max_ver(&nvenc_max_ver); + if (err != NV_ENC_SUCCESS) + return nvenc_print_error(avctx, err, "Failed to query nvenc max version"); + + av_log(avctx, AV_LOG_VERBOSE, "Loaded Nvenc version %d.%d\n", nvenc_max_ver >> 4, nvenc_max_ver & 0xf); + + if ((NVENCAPI_MAJOR_VERSION << 4 | NVENCAPI_MINOR_VERSION) > nvenc_max_ver) { + av_log(avctx, AV_LOG_ERROR, "Driver does not support the required nvenc API version. " + "Required: %d.%d Found: %d.%d\n", + NVENCAPI_MAJOR_VERSION, NVENCAPI_MINOR_VERSION, + nvenc_max_ver >> 4, nvenc_max_ver & 0xf); + return AVERROR(ENOSYS); + } + dl_fn->nvenc_funcs.version = NV_ENCODE_API_FUNCTION_LIST_VER; err = nvenc_create_instance(&dl_fn->nvenc_funcs); diff --git a/libavcodec/nvenc.h b/libavcodec/nvenc.h index cd86c47..c57f1ae 100644 --- a/libavcodec/nvenc.h +++ b/libavcodec/nvenc.h @@ -72,6 +72,7 @@ typedef CUresult(CUDAAPI *PCUCTXCREATE)(CUcontext *pctx, unsigned int flags, CUd typedef CUresult(CUDAAPI *PCUCTXPOPCURRENT)(CUcontext *pctx); typedef CUresult(CUDAAPI *PCUCTXDESTROY)(CUcontext ctx); +typedef NVENCSTATUS (NVENCAPI *PNVENCODEAPIGETMAXSUPPORTEDVERSION)(uint32_t* version); typedef NVENCSTATUS (NVENCAPI *PNVENCODEAPICREATEINSTANCE)(NV_ENCODE_API_FUNCTION_LIST *functionList); typedef struct NvencDynLoadFunctions

1 0

avcodec/nvenc: use proper soname for cuda/nvenc libraries
by git＠videolan.org 28 Aug '16

28 Aug '16

ffmpeg | branch: master | Timo Rothenpieler <timo(a)rothenpieler.org> | Sun Aug 28 19:49:56 2016 +0200| [26a5cbd7811e2b8b497a9577a69588024070c093] | committer: Timo Rothenpieler avcodec/nvenc: use proper soname for cuda/nvenc libraries > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=26a5cbd7811e2b8b4… --- libavcodec/nvenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 553f223..e22df52 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -29,8 +29,8 @@ # define NVENC_LIBNAME "nvEncodeAPI.dll" # endif #else -# define CUDA_LIBNAME "libcuda.so" -# define NVENC_LIBNAME "libnvidia-encode.so" +# define CUDA_LIBNAME "libcuda.so.1" +# define NVENC_LIBNAME "libnvidia-encode.so.1" #endif #if defined(_WIN32)

1 0

avcodec/nvenc: fix potantially uninitialized free
by git＠videolan.org 28 Aug '16

28 Aug '16

ffmpeg | branch: master | Timo Rothenpieler <timo(a)rothenpieler.org> | Sun Aug 28 18:19:21 2016 +0200| [a19989cae581817e8857623d3afc447372b1c0e3] | committer: Timo Rothenpieler avcodec/nvenc: fix potantially uninitialized free > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a19989cae581817e8… --- libavcodec/nvenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index c92df53..8994af1 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -1536,7 +1536,7 @@ static int process_output_surface(AVCodecContext *avctx, AVPacket *pkt, NvencSur NV_ENCODE_API_FUNCTION_LIST *p_nvenc = &dl_fn->nvenc_funcs; uint32_t slice_mode_data; - uint32_t *slice_offsets; + uint32_t *slice_offsets = NULL; NV_ENC_LOCK_BITSTREAM lock_params = { 0 }; NVENCSTATUS nv_status; int res = 0;

1 0

avcodec/nvenc: fix library names on cygwin
by git＠videolan.org 28 Aug '16

28 Aug '16

ffmpeg | branch: master | Timo Rothenpieler <timo(a)rothenpieler.org> | Sun Aug 28 17:54:29 2016 +0200| [19e75fd8838df668fb4b9af95b3a57874b1af32a] | committer: Timo Rothenpieler avcodec/nvenc: fix library names on cygwin > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=19e75fd8838df668f… --- libavcodec/nvenc.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index d1c7d93..c92df53 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -21,24 +21,26 @@ #include "config.h" -#if defined(_WIN32) -#include <windows.h> - -#define CUDA_LIBNAME TEXT("nvcuda.dll") -#if ARCH_X86_64 -#define NVENC_LIBNAME TEXT("nvEncodeAPI64.dll") +#if defined(_WIN32) || defined(__CYGWIN__) +# define CUDA_LIBNAME "nvcuda.dll" +# if ARCH_X86_64 +# define NVENC_LIBNAME "nvEncodeAPI64.dll" +# else +# define NVENC_LIBNAME "nvEncodeAPI.dll" +# endif #else -#define NVENC_LIBNAME TEXT("nvEncodeAPI.dll") +# define CUDA_LIBNAME "libcuda.so" +# define NVENC_LIBNAME "libnvidia-encode.so" #endif -#define dlopen(filename, flags) LoadLibrary((filename)) +#if defined(_WIN32) +#include <windows.h> + +#define dlopen(filename, flags) LoadLibrary(TEXT(filename)) #define dlsym(handle, symbol) GetProcAddress(handle, symbol) #define dlclose(handle) FreeLibrary(handle) #else #include <dlfcn.h> - -#define CUDA_LIBNAME "libcuda.so" -#define NVENC_LIBNAME "libnvidia-encode.so" #endif #include "libavutil/hwcontext.h"

1 0

ffmpeg: fix -stream_loop with -re
by git＠videolan.org 28 Aug '16

28 Aug '16

ffmpeg | branch: master | Marton Balint <cus(a)passwd.hu> | Fri Jul 1 01:12:25 2016 +0200| [2ee8a4f8873b9f7bb8ae7ed0ba40b45f27f634d4] | committer: Marton Balint ffmpeg: fix -stream_loop with -re Otherwise the stream failed with EAGAIN. Reviewed-by: Michael Niedermayer <michael(a)niedermayer.cc> Signed-off-by: Marton Balint <cus(a)passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2ee8a4f8873b9f7bb… --- ffmpeg.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ffmpeg.c b/ffmpeg.c index bad311d..3229823 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -3801,6 +3801,10 @@ static int process_input(int file_index) if ((ret = seek_to_start(ifile, is)) < 0) return ret; ret = get_input_packet(ifile, &pkt); + if (ret == AVERROR(EAGAIN)) { + ifile->eagain = 1; + return ret; + } } if (ret < 0) { if (ret != AVERROR_EOF) {

1 0

avcodec/nvenc: added support for rate control lookahead
by git＠videolan.org 28 Aug '16

28 Aug '16

ffmpeg | branch: master | Oliver Collyer <ovcollyer(a)mac.com> | Thu Aug 25 16:20:03 2016 +0100| [a81b398e869ed2f7f972f797f8992ad32bfb8ba1] | committer: Timo Rothenpieler avcodec/nvenc: added support for rate control lookahead Signed-off-by: Timo Rothenpieler <timo(a)rothenpieler.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a81b398e869ed2f7f… --- libavcodec/nvenc.c | 11 +++++++++++ libavcodec/nvenc.h | 1 + libavcodec/nvenc_h264.c | 1 + libavcodec/nvenc_hevc.c | 1 + 4 files changed, 14 insertions(+) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 5706590..d1c7d93 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -328,6 +328,12 @@ static int nvenc_check_capabilities(AVCodecContext *avctx) return AVERROR(ENOSYS); } + ret = nvenc_check_cap(avctx, NV_ENC_CAPS_SUPPORT_LOOKAHEAD); + if (ctx->rc_lookahead > 0 && ret <= 0) { + av_log(avctx, AV_LOG_VERBOSE, "RC lookahead not supported\n"); + return AVERROR(ENOSYS); + } + return 0; } @@ -687,6 +693,11 @@ static av_cold void nvenc_setup_rate_control(AVCodecContext *avctx) } else if (ctx->encode_config.rcParams.averageBitRate > 0) { ctx->encode_config.rcParams.vbvBufferSize = 2 * ctx->encode_config.rcParams.averageBitRate; } + + if (ctx->rc_lookahead > 0) { + ctx->encode_config.rcParams.enableLookahead = 1; + ctx->encode_config.rcParams.lookaheadDepth = FFMIN(ctx->rc_lookahead, 32); + } } static av_cold int nvenc_setup_h264_config(AVCodecContext *avctx) diff --git a/libavcodec/nvenc.h b/libavcodec/nvenc.h index 37d41ea..cd86c47 100644 --- a/libavcodec/nvenc.h +++ b/libavcodec/nvenc.h @@ -179,6 +179,7 @@ typedef struct NvencContext int device; int flags; int async_depth; + int rc_lookahead; } NvencContext; int ff_nvenc_encode_init(AVCodecContext *avctx); diff --git a/libavcodec/nvenc_h264.c b/libavcodec/nvenc_h264.c index b576f15..4ef9836 100644 --- a/libavcodec/nvenc_h264.c +++ b/libavcodec/nvenc_h264.c @@ -76,6 +76,7 @@ static const AVOption options[] = { { "ll_2pass_quality", "Multi-pass optimized for image quality (only for low-latency presets)", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_PARAMS_RC_2_PASS_QUALITY }, 0, 0, VE, "rc" }, { "ll_2pass_size", "Multi-pass optimized for constant frame size (only for low-latency presets)", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_PARAMS_RC_2_PASS_FRAMESIZE_CAP }, 0, 0, VE, "rc" }, { "vbr_2pass", "Multi-pass variable bitrate mode", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_PARAMS_RC_2_PASS_VBR }, 0, 0, VE, "rc" }, + { "rc-lookahead", "Number of frames to look ahead for rate-control", OFFSET(rc_lookahead), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, VE }, { "surfaces", "Number of concurrent surfaces", OFFSET(nb_surfaces), AV_OPT_TYPE_INT, { .i64 = 32 }, 0, INT_MAX, VE }, { "cbr", "Use cbr encoding mode", OFFSET(cbr), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { "2pass", "Use 2pass encoding mode", OFFSET(twopass), AV_OPT_TYPE_BOOL, { .i64 = -1 }, -1, 1, VE }, diff --git a/libavcodec/nvenc_hevc.c b/libavcodec/nvenc_hevc.c index d9a4bf6..e875772 100644 --- a/libavcodec/nvenc_hevc.c +++ b/libavcodec/nvenc_hevc.c @@ -74,6 +74,7 @@ static const AVOption options[] = { { "ll_2pass_quality", "Multi-pass optimized for image quality (only for low-latency presets)", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_PARAMS_RC_2_PASS_QUALITY }, 0, 0, VE, "rc" }, { "ll_2pass_size", "Multi-pass optimized for constant frame size (only for low-latency presets)", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_PARAMS_RC_2_PASS_FRAMESIZE_CAP }, 0, 0, VE, "rc" }, { "vbr_2pass", "Multi-pass variable bitrate mode", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_PARAMS_RC_2_PASS_VBR }, 0, 0, VE, "rc" }, + { "rc-lookahead", "Number of frames to look ahead for rate-control", OFFSET(rc_lookahead), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, VE }, { "surfaces", "Number of concurrent surfaces", OFFSET(nb_surfaces), AV_OPT_TYPE_INT, { .i64 = 32 }, 0, INT_MAX, VE }, { "cbr", "Use cbr encoding mode", OFFSET(cbr), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { "2pass", "Use 2pass encoding mode", OFFSET(twopass), AV_OPT_TYPE_BOOL, { .i64 = -1 }, -1, 1, VE },

1 0