From 2229a6dfe66fd73126082bdf83c388ee4ea2c879 Mon Sep 17 00:00:00 2001 From: Andrey Utkin Date: Thu, 3 Jul 2014 14:37:09 +0300 Subject: avdevice/lavfi: allow non-mmappable files for graph_file Use av_bprint_fd_contents() instead of av_file_map() Signed-off-by: Michael Niedermayer --- libavdevice/lavfi.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) (limited to 'libavdevice/lavfi.c') diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c index d1904dd70b..9be2d0e724 100644 --- a/libavdevice/lavfi.c +++ b/libavdevice/lavfi.c @@ -26,6 +26,8 @@ /* #define DEBUG */ #include /* DBL_MIN, DBL_MAX */ +#include /* O_RDONLY */ +#include /* close() */ #include "libavutil/bprint.h" #include "libavutil/channel_layout.h" @@ -115,23 +117,22 @@ av_cold static int lavfi_read_header(AVFormatContext *avctx) } if (lavfi->graph_filename) { - uint8_t *file_buf, *graph_buf; - size_t file_bufsize; - ret = av_file_map(lavfi->graph_filename, - &file_buf, &file_bufsize, 0, avctx); - if (ret < 0) - goto end; - - /* create a 0-terminated string based on the read file */ - graph_buf = av_malloc(file_bufsize + 1); - if (!graph_buf) { - av_file_unmap(file_buf, file_bufsize); - FAIL(AVERROR(ENOMEM)); + AVBPrint graph_file_pb; + int fd = avpriv_open(lavfi->graph_filename, O_RDONLY); + if (fd == -1) + FAIL(AVERROR(EINVAL)); + av_bprint_init(&graph_file_pb, 0, AV_BPRINT_SIZE_UNLIMITED); + ret = av_bprint_fd_contents(&graph_file_pb, fd); + av_bprint_chars(&graph_file_pb, '\0', 1); + close(fd); + if (!ret && !av_bprint_is_complete(&graph_file_pb)) + ret = AVERROR(ENOMEM); + if (ret) { + av_bprint_finalize(&graph_file_pb, NULL); + FAIL(ret); } - memcpy(graph_buf, file_buf, file_bufsize); - graph_buf[file_bufsize] = 0; - av_file_unmap(file_buf, file_bufsize); - lavfi->graph_str = graph_buf; + if ((ret = av_bprint_finalize(&graph_file_pb, &lavfi->graph_str))) + FAIL(ret); } if (!lavfi->graph_str) -- cgit v1.2.3