September 2016 - ffmpeg-cvslog

avformat/hlsenc: support mkdir_p for use_localtime_mkdir
by git＠videolan.org 01 Oct '16

01 Oct '16

ffmpeg | branch: master | Steven Liu <lingjiujianke(a)gmail.com> | Wed Sep 28 16:09:05 2016 +0800| [0d2dd5d96d0dc8218192820dd4a34d5f7770148a] | committer: Steven Liu avformat/hlsenc: support mkdir_p for use_localtime_mkdir when use use_localtime_mkdir to create multi level dir, ffmpeg give error message: ffmpeg -re -i ~/Movies/objectC/facebook.mp4 -c copy -use_localtime 1 -use_localtime_mkdir 1 -hls_segment_filename '%Y%m%d/file-%Y%m%d/%s.ts' out.m3u8 error message: Could not create directory 20160926/file-20160926 with use_localtime_mkdir add mkdir_p for support the multi level dir Reviewed-by: Michael Niedermayer <michael(a)niedermayer.cc> Tested-by: Zuo Genyu <1515161258(a)qq.com> (Windows) Signed-off-by: Steven Liu <lingjiujianke(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0d2dd5d96d0dc8218… --- libavformat/hlsenc.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 428bae4..c161937 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -133,6 +133,39 @@ typedef struct HLSContext { double initial_prog_date_time; } HLSContext; +static int mkdir_p(const char *path) { + int ret = 0; + char *temp = av_strdup(path); + char *pos = temp; + char tmp_ch = '\0'; + + if (!path || !temp) { + return -1; + } + + if (!strncmp(temp, "/", 1) || !strncmp(temp, "\\", 1)) { + pos++; + } else if (!strncmp(temp, "./", 2) || !strncmp(temp, ".\\", 2)) { + pos += 2; + } + + for ( ; *pos != '\0'; ++pos) { + if (*pos == '/' || *pos == '\\') { + tmp_ch = *pos; + *pos = '\0'; + ret = mkdir(temp, 0755); + *pos = tmp_ch; + } + } + + if ((*(pos - 1) != '/') || (*(pos - 1) != '\\')) { + ret = mkdir(temp, 0755); + } + + av_free(temp); + return ret; +} + static int hls_delete_old_segments(HLSContext *hls) { HLSSegment *segment, *previous_segment = NULL; @@ -656,7 +689,7 @@ static int hls_start(AVFormatContext *s) return AVERROR(ENOMEM); } dir = av_dirname(fn_copy); - if (mkdir(dir, 0777) == -1 && errno != EEXIST) { + if (mkdir_p(dir) == -1 && errno != EEXIST) { av_log(oc, AV_LOG_ERROR, "Could not create directory %s with use_localtime_mkdir\n", dir); av_free(fn_copy); return AVERROR(errno);

1 0

doc/examples/gitignore: add forgotten qsvdec entry
by git＠videolan.org 30 Sep '16

30 Sep '16

ffmpeg | branch: master | Clément Bœsch <u(a)pkh.me> | Fri Sep 30 19:35:07 2016 +0200| [1e647d200fae24853b5276d48dc14b55f26fd5b7] | committer: Clément Bœsch doc/examples/gitignore: add forgotten qsvdec entry > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1e647d200fae24853… --- doc/examples/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/examples/.gitignore b/doc/examples/.gitignore index 2fe81f6..d5901fb 100644 --- a/doc/examples/.gitignore +++ b/doc/examples/.gitignore @@ -9,6 +9,7 @@ /metadata /muxing /pc-uninstalled +/qsvdec /remuxing /resampling_audio /scaling_video

1 0

doc/examples: build http_multiclient example
by git＠videolan.org 30 Sep '16

30 Sep '16

ffmpeg | branch: master | Clément Bœsch <u(a)pkh.me> | Fri Sep 30 19:35:28 2016 +0200| [1a9b4bc4c7b6064761cf02662d18f833e16dff26] | committer: Clément Bœsch doc/examples: build http_multiclient example > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1a9b4bc4c7b606476… --- configure | 2 ++ doc/Makefile | 1 + doc/examples/.gitignore | 1 + 3 files changed, 4 insertions(+) diff --git a/configure b/configure index 014fa85..74db9b5 100755 --- a/configure +++ b/configure @@ -1456,6 +1456,7 @@ EXAMPLE_LIST=" filter_audio_example filtering_audio_example filtering_video_example + http_multiclient_example metadata_example muxing_example qsvdec_example @@ -3113,6 +3114,7 @@ extract_mvs_example_deps="avcodec avformat avutil" filter_audio_example_deps="avfilter avutil" filtering_audio_example_deps="avfilter avcodec avformat avutil" filtering_video_example_deps="avfilter avcodec avformat avutil" +http_multiclient_example_deps="avformat avutil" metadata_example_deps="avformat avutil" muxing_example_deps="avcodec avformat avutil swscale" qsvdec_example_deps="avcodec avutil libmfx h264_qsv_decoder vaapi_x11" diff --git a/doc/Makefile b/doc/Makefile index a15b316..a180fbe 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -44,6 +44,7 @@ DOC_EXAMPLES-$(CONFIG_EXTRACT_MVS_EXAMPLE) += extract_mvs DOC_EXAMPLES-$(CONFIG_FILTER_AUDIO_EXAMPLE) += filter_audio DOC_EXAMPLES-$(CONFIG_FILTERING_AUDIO_EXAMPLE) += filtering_audio DOC_EXAMPLES-$(CONFIG_FILTERING_VIDEO_EXAMPLE) += filtering_video +DOC_EXAMPLES-$(CONFIG_HTTP_MULTICLIENT_EXAMPLE) += http_multiclient DOC_EXAMPLES-$(CONFIG_METADATA_EXAMPLE) += metadata DOC_EXAMPLES-$(CONFIG_MUXING_EXAMPLE) += muxing DOC_EXAMPLES-$(CONFIG_QSVDEC_EXAMPLE) += qsvdec diff --git a/doc/examples/.gitignore b/doc/examples/.gitignore index d5901fb..430d3bf 100644 --- a/doc/examples/.gitignore +++ b/doc/examples/.gitignore @@ -6,6 +6,7 @@ /filter_audio /filtering_audio /filtering_video +/http_multiclient /metadata /muxing /pc-uninstalled

1 0

build: remove references to inexistant avcodec example
by git＠videolan.org 30 Sep '16

30 Sep '16

ffmpeg | branch: master | Clément Bœsch <u(a)pkh.me> | Fri Sep 30 19:34:35 2016 +0200| [3d064b7802fd6bf0cc06610acebf15a502f5c975] | committer: Clément Bœsch build: remove references to inexistant avcodec example > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3d064b7802fd6bf0c… --- configure | 1 - doc/Makefile | 1 - 2 files changed, 2 deletions(-) diff --git a/configure b/configure index d8f281b..014fa85 100755 --- a/configure +++ b/configure @@ -3105,7 +3105,6 @@ zscale_filter_deps="libzimg" scale_vaapi_filter_deps="vaapi VAProcPipelineParameterBuffer" # examples -avcodec_example_deps="avcodec avutil" avio_dir_cmd_deps="avformat avutil" avio_reading_deps="avformat avcodec avutil" decoding_encoding_example_deps="avcodec avformat avutil" diff --git a/doc/Makefile b/doc/Makefile index c90cb1a..a15b316 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -38,7 +38,6 @@ DOCS = $(DOCS-yes) DOC_EXAMPLES-$(CONFIG_AVIO_DIR_CMD_EXAMPLE) += avio_dir_cmd DOC_EXAMPLES-$(CONFIG_AVIO_READING_EXAMPLE) += avio_reading -DOC_EXAMPLES-$(CONFIG_AVCODEC_EXAMPLE) += avcodec DOC_EXAMPLES-$(CONFIG_DECODING_ENCODING_EXAMPLE) += decoding_encoding DOC_EXAMPLES-$(CONFIG_DEMUXING_DECODING_EXAMPLE) += demuxing_decoding DOC_EXAMPLES-$(CONFIG_EXTRACT_MVS_EXAMPLE) += extract_mvs

1 0

doc/examples/http_multiclient: fix mixed declarations and code
by git＠videolan.org 30 Sep '16

30 Sep '16

ffmpeg | branch: master | Clément Bœsch <u(a)pkh.me> | Fri Sep 30 19:33:35 2016 +0200| [f2579f7ee232aaf7f4530e4b786fd0c33b6f4f8d] | committer: Clément Bœsch doc/examples/http_multiclient: fix mixed declarations and code > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f2579f7ee232aaf7f… --- doc/examples/http_multiclient.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/examples/http_multiclient.c b/doc/examples/http_multiclient.c index a48d36f..dde39f0 100644 --- a/doc/examples/http_multiclient.c +++ b/doc/examples/http_multiclient.c @@ -97,11 +97,11 @@ end: int main(int argc, char **argv) { - av_log_set_level(AV_LOG_TRACE); AVDictionary *options = NULL; AVIOContext *client = NULL, *server = NULL; const char *in_uri, *out_uri; int ret, pid; + av_log_set_level(AV_LOG_TRACE); if (argc < 3) { printf("usage: %s input http://hostname[:port]\n" "API example program to serve http to multiple clients.\n"

1 0

doc/examples/http_multiclient: fix compilation
by git＠videolan.org 30 Sep '16

30 Sep '16

ffmpeg | branch: master | Clément Bœsch <u(a)pkh.me> | Fri Sep 30 19:33:03 2016 +0200| [fb5e58cd773e1b8a897b689fc048efc4eca5cde9] | committer: Clément Bœsch doc/examples/http_multiclient: fix compilation Fixes error: no previous prototype for ‘process_client’ [-Werror=missing-prototypes] > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fb5e58cd773e1b8a8… --- doc/examples/http_multiclient.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/examples/http_multiclient.c b/doc/examples/http_multiclient.c index b9a306d..a48d36f 100644 --- a/doc/examples/http_multiclient.c +++ b/doc/examples/http_multiclient.c @@ -33,7 +33,7 @@ #include <libavutil/opt.h> #include <unistd.h> -void process_client(AVIOContext *client, const char *in_uri) +static void process_client(AVIOContext *client, const char *in_uri) { AVIOContext *input = NULL; uint8_t buf[1024];

1 0

build: sort EXAMPLE_LIST
by git＠videolan.org 30 Sep '16

30 Sep '16

ffmpeg | branch: master | Clément Bœsch <u(a)pkh.me> | Fri Sep 30 19:31:30 2016 +0200| [44103c60016743ffe425dfbf903cf455ea32a9a8] | committer: Clément Bœsch build: sort EXAMPLE_LIST > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=44103c60016743ffe… --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 899057d..bb3764b 100755 --- a/configure +++ b/configure @@ -1448,8 +1448,8 @@ COMPONENT_LIST=" " EXAMPLE_LIST=" - avio_reading_example avio_dir_cmd_example + avio_reading_example decoding_encoding_example demuxing_decoding_example extract_mvs_example

1 0

build: fix avio_dir_cmd and avio_reading example dependencies
by git＠videolan.org 30 Sep '16

30 Sep '16

ffmpeg | branch: master | Clément Bœsch <u(a)pkh.me> | Fri Sep 30 19:32:13 2016 +0200| [352ca77f8ab5d64960f093a7b1693072ddeaca2e] | committer: Clément Bœsch build: fix avio_dir_cmd and avio_reading example dependencies > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=352ca77f8ab5d6496… --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index bb3764b..d8f281b 100755 --- a/configure +++ b/configure @@ -3106,8 +3106,8 @@ scale_vaapi_filter_deps="vaapi VAProcPipelineParameterBuffer" # examples avcodec_example_deps="avcodec avutil" -avio_dir_cmd="avformat avutil" -avio_reading="avformat avcodec avutil" +avio_dir_cmd_deps="avformat avutil" +avio_reading_deps="avformat avcodec avutil" decoding_encoding_example_deps="avcodec avformat avutil" demuxing_decoding_example_deps="avcodec avformat avutil" extract_mvs_example_deps="avcodec avformat avutil"

1 0

lavf/mov: Read display aspect ratio from ares atom also for dnxhd.
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:29:03 2016 +0200| [fcce25ee5d2f3fbe4848dee4c3d11b195d2d8126] | committer: Carl Eugen Hoyos lavf/mov: Read display aspect ratio from ares atom also for dnxhd. Fixes aspect ratio of sample in ticket #2125. Fixes aspect ratio of sample in ticket #5325. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fcce25ee5d2f3fbe4… --- libavformat/mov.c | 3 ++- libavformat/version.h | 2 +- tests/ref/fate/dnxhd-mbaff | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 8b7bbf1..a15c8d1 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1487,7 +1487,8 @@ static int mov_read_ares(MOVContext *c, AVIOContext *pb, MOVAtom atom) if (cid == 0xd4d || cid == 0xd4e) par->width = 1440; return 0; - } else if (par->codec_tag == MKTAG('A', 'V', 'd', '1') && + } else if ((par->codec_tag == MKTAG('A', 'V', 'd', '1') || + par->codec_tag == MKTAG('A', 'V', 'd', 'n')) && atom.size >= 24) { int num, den; avio_skip(pb, 12); diff --git a/libavformat/version.h b/libavformat/version.h index b0b5593..848403e 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 100 +#define LIBAVFORMAT_VERSION_MICRO 101 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ diff --git a/tests/ref/fate/dnxhd-mbaff b/tests/ref/fate/dnxhd-mbaff index d694cfe..8e95227 100644 --- a/tests/ref/fate/dnxhd-mbaff +++ b/tests/ref/fate/dnxhd-mbaff @@ -2,5 +2,5 @@ #media_type 0: video #codec_id 0: rawvideo #dimensions 0: 1440x1080 -#sar 0: 4/3 +#sar 0: 1/1 0, 0, 0, 1, 6220800, 0xe78198c0

3 2

avutil/hwcontext_cuda: use proper synchronization flag
by git＠videolan.org 29 Sep '16

29 Sep '16

ffmpeg | branch: master | Timo Rothenpieler <timo(a)rothenpieler.org> | Thu Sep 29 20:40:23 2016 +0200| [97e7f03d356b26b01e440e817c21f157f99e0842] | committer: Timo Rothenpieler avutil/hwcontext_cuda: use proper synchronization flag > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=97e7f03d356b26b01… --- libavutil/hwcontext_cuda.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/hwcontext_cuda.c b/libavutil/hwcontext_cuda.c index fa24c5d..40d2971 100644 --- a/libavutil/hwcontext_cuda.c +++ b/libavutil/hwcontext_cuda.c @@ -283,7 +283,7 @@ static int cuda_device_create(AVHWDeviceContext *ctx, const char *device, return AVERROR_UNKNOWN; } - err = cuCtxCreate(&hwctx->cuda_ctx, 0, cu_device); + err = cuCtxCreate(&hwctx->cuda_ctx, CU_CTX_SCHED_BLOCKING_SYNC, cu_device); if (err != CUDA_SUCCESS) { av_log(ctx, AV_LOG_ERROR, "Error creating a CUDA context\n"); return AVERROR_UNKNOWN;

1 0