September 2016 - ffmpeg-cvslog

avcodec/cuvid: make use of new av_hwdevice_ctx_create api
by git＠videolan.org 29 Sep '16

29 Sep '16

ffmpeg | branch: master | Timo Rothenpieler <timo(a)rothenpieler.org> | Thu Sep 29 19:40:42 2016 +0200| [ba0e5165331d20fb5c37464460f20b7cc1571591] | committer: Timo Rothenpieler avcodec/cuvid: make use of new av_hwdevice_ctx_create api > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ba0e5165331d20fb5… --- libavcodec/cuvid.c | 53 ++++++++++------------------------------------------ libavcodec/version.h | 2 +- 2 files changed, 11 insertions(+), 44 deletions(-) diff --git a/libavcodec/cuvid.c b/libavcodec/cuvid.c index ffe449f..e9a1dd7 100644 --- a/libavcodec/cuvid.c +++ b/libavcodec/cuvid.c @@ -41,6 +41,8 @@ typedef struct CuvidContext CUvideodecoder cudecoder; CUvideoparser cuparser; + char *cu_gpu; + AVBufferRef *hwdevice; AVBufferRef *hwframe; @@ -546,12 +548,6 @@ static av_cold int cuvid_decode_end(AVCodecContext *avctx) return 0; } -static void cuvid_ctx_free(AVHWDeviceContext *ctx) -{ - AVCUDADeviceContext *hwctx = ctx->hwctx; - cuCtxDestroy(hwctx->cuda_ctx); -} - static int cuvid_test_dummy_decoder(AVCodecContext *avctx, CUVIDPARSERPARAMS *cuparseinfo) { CUVIDDECODECREATEINFO cuinfo; @@ -599,7 +595,6 @@ static av_cold int cuvid_decode_init(AVCodecContext *avctx) AVHWDeviceContext *device_ctx; AVHWFramesContext *hwframe_ctx; CUVIDSOURCEDATAPACKET seq_pkt; - CUdevice device; CUcontext cuda_ctx = NULL; CUcontext dummy; const AVBitStreamFilter *bsf; @@ -637,54 +632,25 @@ static av_cold int cuvid_decode_init(AVCodecContext *avctx) ret = AVERROR(ENOMEM); goto error; } - - device_ctx = hwframe_ctx->device_ctx; - device_hwctx = device_ctx->hwctx; - cuda_ctx = device_hwctx->cuda_ctx; } else { - ctx->hwdevice = av_hwdevice_ctx_alloc(AV_HWDEVICE_TYPE_CUDA); - if (!ctx->hwdevice) { - av_log(avctx, AV_LOG_ERROR, "Error allocating hwdevice\n"); - ret = AVERROR(ENOMEM); - goto error; - } - - ret = CHECK_CU(cuInit(0)); + ret = av_hwdevice_ctx_create(&ctx->hwdevice, AV_HWDEVICE_TYPE_CUDA, ctx->cu_gpu, NULL, 0); if (ret < 0) goto error; - ret = CHECK_CU(cuDeviceGet(&device, 0)); - if (ret < 0) - goto error; - - ret = CHECK_CU(cuCtxCreate(&cuda_ctx, CU_CTX_SCHED_BLOCKING_SYNC, device)); - if (ret < 0) - goto error; - - device_ctx = (AVHWDeviceContext*)ctx->hwdevice->data; - device_ctx->free = cuvid_ctx_free; - - device_hwctx = device_ctx->hwctx; - device_hwctx->cuda_ctx = cuda_ctx; - - ret = CHECK_CU(cuCtxPopCurrent(&dummy)); - if (ret < 0) - goto error; - - ret = av_hwdevice_ctx_init(ctx->hwdevice); - if (ret < 0) { - av_log(avctx, AV_LOG_ERROR, "av_hwdevice_ctx_init failed\n"); - goto error; - } - ctx->hwframe = av_hwframe_ctx_alloc(ctx->hwdevice); if (!ctx->hwframe) { av_log(avctx, AV_LOG_ERROR, "av_hwframe_ctx_alloc failed\n"); ret = AVERROR(ENOMEM); goto error; } + + hwframe_ctx = (AVHWFramesContext*)ctx->hwframe->data; } + device_ctx = hwframe_ctx->device_ctx; + device_hwctx = device_ctx->hwctx; + cuda_ctx = device_hwctx->cuda_ctx; + memset(&ctx->cuparseinfo, 0, sizeof(ctx->cuparseinfo)); memset(&ctx->cuparse_ext, 0, sizeof(ctx->cuparse_ext)); memset(&seq_pkt, 0, sizeof(seq_pkt)); @@ -883,6 +849,7 @@ static const AVOption options[] = { { "weave", "Weave deinterlacing (do nothing)", 0, AV_OPT_TYPE_CONST, { .i64 = cudaVideoDeinterlaceMode_Weave }, 0, 0, VD, "deint" }, { "bob", "Bob deinterlacing", 0, AV_OPT_TYPE_CONST, { .i64 = cudaVideoDeinterlaceMode_Bob }, 0, 0, VD, "deint" }, { "adaptive", "Adaptive deinterlacing", 0, AV_OPT_TYPE_CONST, { .i64 = cudaVideoDeinterlaceMode_Adaptive }, 0, 0, VD, "deint" }, + { "gpu", "GPU to be used for decoding", OFFSET(cu_gpu), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, VD }, { NULL } }; diff --git a/libavcodec/version.h b/libavcodec/version.h index 91abd31..de7280f 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 57 #define LIBAVCODEC_VERSION_MINOR 60 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \

1 0

avcodec/cuvid: support a pre-initialized hw_frames_ctx
by git＠videolan.org 29 Sep '16

29 Sep '16

ffmpeg | branch: master | Timo Rothenpieler <timo(a)rothenpieler.org> | Thu Sep 29 18:58:49 2016 +0200| [49511501aa06ac98e41f0aa30c75ec2868a7dbd2] | committer: Timo Rothenpieler avcodec/cuvid: support a pre-initialized hw_frames_ctx > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=49511501aa06ac98e… --- libavcodec/cuvid.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/libavcodec/cuvid.c b/libavcodec/cuvid.c index faef711..ffe449f 100644 --- a/libavcodec/cuvid.c +++ b/libavcodec/cuvid.c @@ -52,7 +52,6 @@ typedef struct CuvidContext int64_t prev_pts; int internal_error; - int ever_flushed; int decoder_flushing; cudaVideoCodec codec_type; @@ -145,8 +144,12 @@ static int CUDAAPI cuvid_handle_video_sequence(void *opaque, CUVIDEOFORMAT* form return 0; } - if (hwframe_ctx->pool && !ctx->ever_flushed) { - av_log(avctx, AV_LOG_ERROR, "AVHWFramesContext is already initialized\n"); + if (hwframe_ctx->pool && ( + hwframe_ctx->width < avctx->width || + hwframe_ctx->height < avctx->height || + hwframe_ctx->format != AV_PIX_FMT_CUDA || + hwframe_ctx->sw_format != AV_PIX_FMT_NV12)) { + av_log(avctx, AV_LOG_ERROR, "AVHWFramesContext is already initialized with incompatible parameters\n"); ctx->internal_error = AVERROR(EINVAL); return 0; } @@ -805,8 +808,6 @@ static av_cold int cuvid_decode_init(AVCodecContext *avctx) if (ret < 0) goto error; - ctx->ever_flushed = 0; - ctx->prev_pts = INT64_MIN; if (!avctx->pkt_timebase.num || !avctx->pkt_timebase.den) @@ -828,8 +829,6 @@ static void cuvid_flush(AVCodecContext *avctx) CUVIDSOURCEDATAPACKET seq_pkt = { 0 }; int ret; - ctx->ever_flushed = 1; - ret = CHECK_CU(cuCtxPushCurrent(cuda_ctx)); if (ret < 0) goto error;

1 0

avcodec/cuvid: use actual frame size for buffer allocation
by git＠videolan.org 29 Sep '16

29 Sep '16

ffmpeg | branch: master | Timo Rothenpieler <timo(a)rothenpieler.org> | Thu Sep 29 18:56:39 2016 +0200| [f0ea96d8a2c902455bf0df1aa02deecceccfe930] | committer: Timo Rothenpieler avcodec/cuvid: use actual frame size for buffer allocation > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f0ea96d8a2c902455… --- libavcodec/cuvid.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/cuvid.c b/libavcodec/cuvid.c index bd66f9e..faef711 100644 --- a/libavcodec/cuvid.c +++ b/libavcodec/cuvid.c @@ -199,8 +199,8 @@ static int CUDAAPI cuvid_handle_video_sequence(void *opaque, CUVIDEOFORMAT* form if (!hwframe_ctx->pool) { hwframe_ctx->format = AV_PIX_FMT_CUDA; hwframe_ctx->sw_format = AV_PIX_FMT_NV12; - hwframe_ctx->width = FFALIGN(avctx->coded_width, 32); - hwframe_ctx->height = FFALIGN(avctx->coded_height, 32); + hwframe_ctx->width = FFALIGN(avctx->width, 32); + hwframe_ctx->height = FFALIGN(avctx->height, 32); if ((ctx->internal_error = av_hwframe_ctx_init(ctx->hwframe)) < 0) { av_log(avctx, AV_LOG_ERROR, "av_hwframe_ctx_init failed\n"); @@ -397,7 +397,7 @@ static int cuvid_output_frame(AVCodecContext *avctx, AVFrame *frame) .dstPitch = frame->linesize[i], .srcY = offset, .WidthInBytes = FFMIN(pitch, frame->linesize[i]), - .Height = avctx->coded_height >> (i ? 1 : 0), + .Height = avctx->height >> (i ? 1 : 0), }; ret = CHECK_CU(cuMemcpy2D(&cpy));

1 0

avformat/tee: Copy interrupt callback and flags to slave
by git＠videolan.org 29 Sep '16

29 Sep '16

ffmpeg | branch: master | Jan Sebechlebsky <sebechlebskyjan(a)gmail.com> | Fri Aug 12 22:30:03 2016 +0200| [81bab1074ff9071ea0c5ed91ae10e9e1b6e9ad30] | committer: Jan Sebechlebsky avformat/tee: Copy interrupt callback and flags to slave Copy interrupt callback to slave format context to allow user to interrupt IO. Copy format flags as well. Signed-off-by: Jan Sebechlebsky <sebechlebskyjan(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=81bab1074ff9071ea… --- libavformat/tee.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/tee.c b/libavformat/tee.c index 518af4a..d59ad4d 100644 --- a/libavformat/tee.c +++ b/libavformat/tee.c @@ -161,6 +161,8 @@ static int open_slave(AVFormatContext *avf, char *slave, TeeSlave *tee_slave) avf2->opaque = avf->opaque; avf2->io_open = avf->io_open; avf2->io_close = avf->io_close; + avf2->interrupt_callback = avf->interrupt_callback; + avf2->flags = avf->flags; tee_slave->stream_map = av_calloc(avf->nb_streams, sizeof(*tee_slave->stream_map)); if (!tee_slave->stream_map) {

1 0

ffmpeg_cuvid: make use of new av_hwdevice_ctx_create api
by git＠videolan.org 29 Sep '16

29 Sep '16

ffmpeg | branch: master | Timo Rothenpieler <timo(a)rothenpieler.org> | Thu Sep 29 11:11:24 2016 +0200| [856e1eacf7f3c0b5607aae7902d1498c2218f92e] | committer: Timo Rothenpieler ffmpeg_cuvid: make use of new av_hwdevice_ctx_create api > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=856e1eacf7f3c0b56… --- ffmpeg_cuvid.c | 125 ++++++++++----------------------------------------------- 1 file changed, 22 insertions(+), 103 deletions(-) diff --git a/ffmpeg_cuvid.c b/ffmpeg_cuvid.c index 866f43b..bd2d975 100644 --- a/ffmpeg_cuvid.c +++ b/ffmpeg_cuvid.c @@ -17,12 +17,9 @@ */ #include "libavutil/hwcontext.h" -#include "libavutil/hwcontext_cuda.h" #include "ffmpeg.h" -#include <cuda.h> - typedef struct CUVIDContext { AVBufferRef *hw_frames_ctx; } CUVIDContext; @@ -60,24 +57,13 @@ int cuvid_init(AVCodecContext *avctx) return 0; } -static void cuvid_ctx_free(AVHWDeviceContext *ctx) -{ - AVCUDADeviceContext *hwctx = ctx->hwctx; - cuCtxDestroy(hwctx->cuda_ctx); -} - int cuvid_transcode_init(OutputStream *ost) { InputStream *ist; const enum AVPixelFormat *pix_fmt; - AVCUDADeviceContext *device_hwctx; - AVHWDeviceContext *device_ctx; AVHWFramesContext *hwframe_ctx; + AVBufferRef *device_ref = NULL; CUVIDContext *ctx = NULL; - CUdevice device; - CUcontext cuda_ctx = NULL; - CUcontext dummy; - CUresult err; int ret = 0; av_log(NULL, AV_LOG_TRACE, "Initializing cuvid transcoding\n"); @@ -117,113 +103,46 @@ int cuvid_transcode_init(OutputStream *ost) } } - if (!hw_device_ctx) { - hw_device_ctx = av_hwdevice_ctx_alloc(AV_HWDEVICE_TYPE_CUDA); - if (!hw_device_ctx) { - av_log(NULL, AV_LOG_ERROR, "av_hwdevice_ctx_alloc(AV_HWDEVICE_TYPE_CUDA) failed\n"); - ret = AVERROR(ENOMEM); - goto error; - } - - err = cuInit(0); - if (err != CUDA_SUCCESS) { - av_log(NULL, AV_LOG_ERROR, "Could not initialize the CUDA driver API\n"); - ret = AVERROR_UNKNOWN; - goto error; - } - - err = cuDeviceGet(&device, 0); ///TODO: Make device index configurable - if (err != CUDA_SUCCESS) { - av_log(NULL, AV_LOG_ERROR, "Could not get the device number %d\n", 0); - ret = AVERROR_UNKNOWN; - goto error; - } - - err = cuCtxCreate(&cuda_ctx, CU_CTX_SCHED_BLOCKING_SYNC, device); - if (err != CUDA_SUCCESS) { - av_log(NULL, AV_LOG_ERROR, "Error creating a CUDA context\n"); - ret = AVERROR_UNKNOWN; - goto error; - } - - device_ctx = (AVHWDeviceContext*)hw_device_ctx->data; - device_ctx->free = cuvid_ctx_free; - - device_hwctx = device_ctx->hwctx; - device_hwctx->cuda_ctx = cuda_ctx; - - err = cuCtxPopCurrent(&dummy); - if (err != CUDA_SUCCESS) { - av_log(NULL, AV_LOG_ERROR, "cuCtxPopCurrent failed\n"); - ret = AVERROR_UNKNOWN; - goto error; - } - - ret = av_hwdevice_ctx_init(hw_device_ctx); - if (ret < 0) { - av_log(NULL, AV_LOG_ERROR, "av_hwdevice_ctx_init failed\n"); + if (!ctx->hw_frames_ctx) { + ret = av_hwdevice_ctx_create(&device_ref, AV_HWDEVICE_TYPE_CUDA, + ist->hwaccel_device, NULL, 0); + if (ret < 0) goto error; - } - } else { - device_ctx = (AVHWDeviceContext*)hw_device_ctx->data; - device_hwctx = device_ctx->hwctx; - cuda_ctx = device_hwctx->cuda_ctx; - } - if (device_ctx->type != AV_HWDEVICE_TYPE_CUDA) { - av_log(NULL, AV_LOG_ERROR, "Hardware device context is already initialized for a diffrent hwaccel.\n"); - ret = AVERROR(EINVAL); - goto error; - } - - if (!ctx->hw_frames_ctx) { - ctx->hw_frames_ctx = av_hwframe_ctx_alloc(hw_device_ctx); + ctx->hw_frames_ctx = av_hwframe_ctx_alloc(device_ref); if (!ctx->hw_frames_ctx) { av_log(NULL, AV_LOG_ERROR, "av_hwframe_ctx_alloc failed\n"); ret = AVERROR(ENOMEM); goto error; } - } - - /* This is a bit hacky, av_hwframe_ctx_init is called by the cuvid decoder - * once it has probed the neccesary format information. But as filters/nvenc - * need to know the format/sw_format, set them here so they are happy. - * This is fine as long as CUVID doesn't add another supported pix_fmt. - */ - hwframe_ctx = (AVHWFramesContext*)ctx->hw_frames_ctx->data; - hwframe_ctx->format = AV_PIX_FMT_CUDA; - hwframe_ctx->sw_format = AV_PIX_FMT_NV12; - - ost->hwaccel_ctx = ctx; - ost->enc_ctx->hw_frames_ctx = av_buffer_ref(ctx->hw_frames_ctx); - ost->enc_ctx->pix_fmt = AV_PIX_FMT_CUDA; - - if (!ost->enc_ctx->hw_frames_ctx) { - av_log(NULL, AV_LOG_ERROR, "av_buffer_ref failed\n"); - ret = AVERROR(ENOMEM); - goto error; - } + av_buffer_unref(&device_ref); - if (!ist->hwaccel_ctx) { - ist->hwaccel_ctx = ctx; ist->hw_frames_ctx = av_buffer_ref(ctx->hw_frames_ctx); - ist->dec_ctx->hw_frames_ctx = av_buffer_ref(ctx->hw_frames_ctx); - ist->dec_ctx->pix_fmt = AV_PIX_FMT_CUDA; - ist->resample_pix_fmt = AV_PIX_FMT_CUDA; - - ist->hwaccel_uninit = cuvid_uninit; - - if (!ist->hw_frames_ctx || !ist->dec_ctx->hw_frames_ctx) { + if (!ist->hw_frames_ctx) { av_log(NULL, AV_LOG_ERROR, "av_buffer_ref failed\n"); ret = AVERROR(ENOMEM); goto error; } + + ist->hwaccel_ctx = ctx; + ist->resample_pix_fmt = AV_PIX_FMT_CUDA; + ist->hwaccel_uninit = cuvid_uninit; + + /* This is a bit hacky, av_hwframe_ctx_init is called by the cuvid decoder + * once it has probed the neccesary format information. But as filters/nvenc + * need to know the format/sw_format, set them here so they are happy. + * This is fine as long as CUVID doesn't add another supported pix_fmt. + */ + hwframe_ctx = (AVHWFramesContext*)ctx->hw_frames_ctx->data; + hwframe_ctx->format = AV_PIX_FMT_CUDA; + hwframe_ctx->sw_format = AV_PIX_FMT_NV12; } return 0; error: av_freep(&ctx); + av_buffer_unref(&device_ref); return ret; cancel:

1 0

ffmpeg: pass the hwaccel frames context to the decoder
by git＠videolan.org 29 Sep '16

29 Sep '16

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Thu Sep 29 10:29:10 2016 +0200| [bfbf86ef18f756c4e27ab569309ef8bc7a5531ac] | committer: Timo Rothenpieler ffmpeg: pass the hwaccel frames context to the decoder > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bfbf86ef18f756c4e… --- ffmpeg.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ffmpeg.c b/ffmpeg.c index d0f247e..9a8e65a 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -2547,6 +2547,13 @@ static enum AVPixelFormat get_format(AVCodecContext *s, const enum AVPixelFormat } continue; } + + if (ist->hw_frames_ctx) { + s->hw_frames_ctx = av_buffer_ref(ist->hw_frames_ctx); + if (!s->hw_frames_ctx) + return AV_PIX_FMT_NONE; + } + ist->active_hwaccel_id = hwaccel->id; ist->hwaccel_pix_fmt = *p; break;

1 0

lavf/movenc: Put correct display aspect ratio in ARES atom.
by git＠videolan.org 29 Sep '16

29 Sep '16

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Thu Sep 29 15:41:17 2016 +0200| [e84eeca5779b894ea1739296e17c4361d4638de7] | committer: Carl Eugen Hoyos lavf/movenc: Put correct display aspect ratio in ARES atom. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e84eeca5779b894ea… --- libavformat/movenc.c | 6 +++++- libavformat/version.h | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 7de4580..8b4aa5f 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1071,6 +1071,7 @@ static int mov_write_avid_tag(AVIOContext *pb, MOVTrack *track) int i; int interlaced; int cid; + int display_width = track->par->width; if (track->vos_data && track->vos_len > 0x29) { if (ff_dnxhd_parse_header_prefix(track->vos_data) != 0) { @@ -1122,7 +1123,10 @@ static int mov_write_avid_tag(AVIOContext *pb, MOVTrack *track) ffio_wfourcc(pb, "ARES"); ffio_wfourcc(pb, "0001"); avio_wb32(pb, cid); /* dnxhd cid, some id ? */ - avio_wb32(pb, track->par->width); + if ( track->par->sample_aspect_ratio.num > 0 + && track->par->sample_aspect_ratio.den > 0) + display_width = display_width * track->par->sample_aspect_ratio.num / track->par->sample_aspect_ratio.den; + avio_wb32(pb, display_width); /* values below are based on samples created with quicktime and avid codecs */ if (interlaced) { avio_wb32(pb, track->par->height / 2); diff --git a/libavformat/version.h b/libavformat/version.h index 848403e..5e7448a 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -33,7 +33,7 @@ // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 57 #define LIBAVFORMAT_VERSION_MINOR 51 -#define LIBAVFORMAT_VERSION_MICRO 101 +#define LIBAVFORMAT_VERSION_MICRO 102 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \

1 0

Changelog: Mention edts support.
by git＠videolan.org 29 Sep '16

29 Sep '16

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Thu Sep 29 14:44:08 2016 +0200| [29a76ff525e34e5f5e27c5db86c281f4502435cf] | committer: Carl Eugen Hoyos Changelog: Mention edts support. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=29a76ff525e34e5f5… --- Changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/Changelog b/Changelog index 4e4b4bf..d7f5dc9 100644 --- a/Changelog +++ b/Changelog @@ -35,6 +35,7 @@ version <next>: - sdl2 output device - sdl2 support for ffplay - sdl1 output device and sdl1 support removed +- extended mov edit list support version 3.1:

1 0

movenc: Add support for writing language codes into ISML manifests
by git＠videolan.org 29 Sep '16

29 Sep '16

ffmpeg | branch: master | Jan Ekström <jeebjp(a)gmail.com> | Tue Sep 27 01:10:22 2016 +0300| [cc725ebe484c7e0d8de44e5c3c2050dc894e5a4b] | committer: Josh de Kock movenc: Add support for writing language codes into ISML manifests Streaming servers appear to ignore all other language metadata. Signed-off-by: Jan Ekström <jeebjp(a)gmail.com> Signed-off-by: Josh de Kock <josh(a)itanimul.li> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cc725ebe484c7e0d8… --- libavformat/movenc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 8992782..7de4580 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -3611,6 +3611,9 @@ static int mov_write_isml_manifest(AVIOContext *pb, MOVMuxContext *mov, AVFormat const char *type; int track_id = track->track_id; + AVStream *st = track->st; + AVDictionaryEntry *lang = av_dict_get(st->metadata, "language", NULL,0); + if (track->par->codec_type == AVMEDIA_TYPE_VIDEO) { type = "video"; } else if (track->par->codec_type == AVMEDIA_TYPE_AUDIO) { @@ -3631,6 +3634,7 @@ static int mov_write_isml_manifest(AVIOContext *pb, MOVMuxContext *mov, AVFormat manifest_bit_rate); param_write_int(pb, "systemBitrate", manifest_bit_rate); param_write_int(pb, "trackID", track_id); + param_write_string(pb, "systemLanguage", lang ? lang->value : "und"); if (track->par->codec_type == AVMEDIA_TYPE_VIDEO) { if (track->par->codec_id == AV_CODEC_ID_H264) { uint8_t *ptr;

1 0

lavf/mov.c: Make audio timestamps strictly monotonically increasing inside an edit list.
by git＠videolan.org 29 Sep '16

29 Sep '16

ffmpeg | branch: master | Sasi Inguva <isasi(a)google.com> | Mon Sep 26 09:56:26 2016 -0700| [dba2db6c0e4a18b9b69b846650401bf3a1d5a019] | committer: Michael Niedermayer lavf/mov.c: Make audio timestamps strictly monotonically increasing inside an edit list. Fixes gapless decoding. Adjust skip_samples field correctly in case of DISCARDed audio frames. Signed-off-by: Sasi Inguva <isasi(a)google.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dba2db6c0e4a18b9b… --- libavformat/mov.c | 80 ++++++++++++++++++++++++---- tests/ref/fate/gaplessenc-itunes-to-ipod-aac | 2 +- tests/ref/fate/gaplessenc-pcm-to-mov-aac | 2 +- 3 files changed, 71 insertions(+), 13 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index b84d9c0..8b7bbf1 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2856,6 +2856,21 @@ static int64_t add_index_entry(AVStream *st, int64_t pos, int64_t timestamp, } /** + * Rewrite timestamps of index entries in the range [end_index - frame_duration_buffer_size, end_index) + * by subtracting end_ts successively by the amounts given in frame_duration_buffer. + */ +static void fix_index_entry_timestamps(AVStream* st, int end_index, int64_t end_ts, + int64_t* frame_duration_buffer, + int frame_duration_buffer_size) { + int i = 0; + av_assert0(end_index >= 0 && end_index <= st->nb_index_entries); + for (i = 0; i < frame_duration_buffer_size; i++) { + end_ts -= frame_duration_buffer[frame_duration_buffer_size - 1 - i]; + st->index_entries[end_index - 1 - i].timestamp = end_ts; + } +} + +/** * Append a new ctts entry to ctts_data. * Returns the new ctts_count if successful, else returns -1. */ @@ -2919,7 +2934,10 @@ static void mov_fix_index(MOVContext *mov, AVStream *st) int64_t edit_list_media_time_dts = 0; int64_t edit_list_start_encountered = 0; int64_t search_timestamp = 0; - + int64_t* frame_duration_buffer = NULL; + int num_discarded_begin = 0; + int first_non_zero_audio_edit = -1; + int packet_skip_samples = 0; if (!msc->elst_data || msc->elst_count <= 0) { return; @@ -2955,6 +2973,7 @@ static void mov_fix_index(MOVContext *mov, AVStream *st) edit_list_index++; edit_list_dts_counter = edit_list_dts_entry_end; edit_list_dts_entry_end += edit_list_duration; + num_discarded_begin = 0; if (edit_list_media_time == -1) { continue; } @@ -2962,7 +2981,14 @@ static void mov_fix_index(MOVContext *mov, AVStream *st) // If we encounter a non-negative edit list reset the skip_samples/start_pad fields and set them // according to the edit list below. if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) { - st->skip_samples = msc->start_pad = 0; + if (first_non_zero_audio_edit < 0) { + first_non_zero_audio_edit = 1; + } else { + first_non_zero_audio_edit = 0; + } + + if (first_non_zero_audio_edit > 0) + st->skip_samples = msc->start_pad = 0; } //find closest previous key frame @@ -3041,24 +3067,56 @@ static void mov_fix_index(MOVContext *mov, AVStream *st) } if (curr_cts < edit_list_media_time || curr_cts >= (edit_list_duration + edit_list_media_time)) { - if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO && curr_cts < edit_list_media_time && - curr_cts + frame_duration > edit_list_media_time && - st->skip_samples == 0 && msc->start_pad == 0) { - st->skip_samples = msc->start_pad = edit_list_media_time - curr_cts; - - // Shift the index entry timestamp by skip_samples to be correct. - edit_list_dts_counter -= st->skip_samples; + if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO && st->codecpar->codec_id != AV_CODEC_ID_VORBIS && + curr_cts < edit_list_media_time && curr_cts + frame_duration > edit_list_media_time && + first_non_zero_audio_edit > 0) { + packet_skip_samples = edit_list_media_time - curr_cts; + st->skip_samples += packet_skip_samples; + + // Shift the index entry timestamp by packet_skip_samples to be correct. + edit_list_dts_counter -= packet_skip_samples; if (edit_list_start_encountered == 0) { - edit_list_start_encountered = 1; + edit_list_start_encountered = 1; + // Make timestamps strictly monotonically increasing for audio, by rewriting timestamps for + // discarded packets. + if (frame_duration_buffer) { + fix_index_entry_timestamps(st, st->nb_index_entries, edit_list_dts_counter, + frame_duration_buffer, num_discarded_begin); + av_freep(&frame_duration_buffer); + } } - av_log(mov->fc, AV_LOG_DEBUG, "skip %d audio samples from curr_cts: %"PRId64"\n", st->skip_samples, curr_cts); + av_log(mov->fc, AV_LOG_DEBUG, "skip %d audio samples from curr_cts: %"PRId64"\n", packet_skip_samples, curr_cts); } else { flags |= AVINDEX_DISCARD_FRAME; av_log(mov->fc, AV_LOG_DEBUG, "drop a frame at curr_cts: %"PRId64" @ %"PRId64"\n", curr_cts, index); + + if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO && edit_list_start_encountered == 0) { + num_discarded_begin++; + frame_duration_buffer = av_realloc(frame_duration_buffer, + num_discarded_begin * sizeof(int64_t)); + if (!frame_duration_buffer) { + av_log(mov->fc, AV_LOG_ERROR, "Cannot reallocate frame duration buffer\n"); + break; + } + frame_duration_buffer[num_discarded_begin - 1] = frame_duration; + + // Increment skip_samples for the first non-zero audio edit list + if (first_non_zero_audio_edit > 0 && st->codecpar->codec_id != AV_CODEC_ID_VORBIS) { + st->skip_samples += frame_duration; + msc->start_pad = st->skip_samples; + } + } } } else if (edit_list_start_encountered == 0) { edit_list_start_encountered = 1; + // Make timestamps strictly monotonically increasing for audio, by rewriting timestamps for + // discarded packets. + if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO && frame_duration_buffer) { + fix_index_entry_timestamps(st, st->nb_index_entries, edit_list_dts_counter, + frame_duration_buffer, num_discarded_begin); + av_freep(&frame_duration_buffer); + } } if (add_index_entry(st, current->pos, edit_list_dts_counter, current->size, diff --git a/tests/ref/fate/gaplessenc-itunes-to-ipod-aac b/tests/ref/fate/gaplessenc-itunes-to-ipod-aac index 043c085..789681f 100644 --- a/tests/ref/fate/gaplessenc-itunes-to-ipod-aac +++ b/tests/ref/fate/gaplessenc-itunes-to-ipod-aac @@ -7,7 +7,7 @@ duration_ts=103326 start_time=0.000000 duration=2.367000 [/FORMAT] -packet|pts=0|dts=0|duration=N/A +packet|pts=-1024|dts=-1024|duration=1024 packet|pts=0|dts=0|duration=1024 packet|pts=1024|dts=1024|duration=1024 packet|pts=2048|dts=2048|duration=1024 diff --git a/tests/ref/fate/gaplessenc-pcm-to-mov-aac b/tests/ref/fate/gaplessenc-pcm-to-mov-aac index 8b7e3f6..8702611 100644 --- a/tests/ref/fate/gaplessenc-pcm-to-mov-aac +++ b/tests/ref/fate/gaplessenc-pcm-to-mov-aac @@ -7,7 +7,7 @@ duration_ts=529200 start_time=0.000000 duration=12.024000 [/FORMAT] -packet|pts=0|dts=0|duration=N/A +packet|pts=-1024|dts=-1024|duration=1024 packet|pts=0|dts=0|duration=1024 packet|pts=1024|dts=1024|duration=1024 packet|pts=2048|dts=2048|duration=1024

1 0