diff options
author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-04-01 22:34:22 +0000 |
---|---|---|
committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-04-01 22:34:22 +0000 |
commit | 458b062d61a92d725cde9363941747a1c6d1e575 (patch) | |
tree | ee10867788ffec5cb35c5bcc4a52b29e182a3005 | |
parent | 339f5f39573dcdcb16f2dba563f784340a61b189 (diff) | |
download | ffmpeg-458b062d61a92d725cde9363941747a1c6d1e575.tar.gz |
Implement cmdutils.c:read_file(), and use it in ffmpeg.c for reading
the second pass encoding log file.
Originally committed as revision 22769 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r-- | cmdutils.c | 24 | ||||
-rw-r--r-- | cmdutils.h | 11 | ||||
-rw-r--r-- | ffmpeg.c | 21 |
3 files changed, 39 insertions, 17 deletions
diff --git a/cmdutils.c b/cmdutils.c index c2c44c67ff..7e652a1e7f 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -639,3 +639,27 @@ int read_yesno(void) return yesno; } + +int read_file(const char *filename, char **bufptr, size_t *size) +{ + FILE *f = fopen(filename, "r"); + + if (!f) { + fprintf(stderr, "Cannot read file '%s': %s\n", filename, strerror(errno)); + return AVERROR(errno); + } + fseek(f, 0, SEEK_END); + *size = ftell(f); + fseek(f, 0, SEEK_SET); + *bufptr = av_malloc(*size + 1); + if (!*bufptr) { + fprintf(stderr, "Could not allocate file buffer\n"); + fclose(f); + return AVERROR(ENOMEM); + } + fread(*bufptr, 1, *size, f); + (*bufptr)[*size++] = '\0'; + + fclose(f); + return 0; +} diff --git a/cmdutils.h b/cmdutils.h index 549ade8767..ad8cefdeee 100644 --- a/cmdutils.h +++ b/cmdutils.h @@ -200,4 +200,15 @@ void show_pix_fmts(void); */ int read_yesno(void); +/** + * Reads the file with name filename, and puts its content in a newly + * allocated 0-terminated buffer. + * + * @param bufptr puts here the pointer to the newly allocated buffer + * @param size puts here the size of the newly allocated buffer + * @return 0 in case of success, a negative value corresponding to an + * AVERROR error code in case of failure. + */ +int read_file(const char *filename, char **bufptr, size_t *size); + #endif /* FFMPEG_CMDUTILS_H */ @@ -2072,8 +2072,6 @@ static int av_encode(AVFormatContext **output_files, (codec->flags & (CODEC_FLAG_PASS1 | CODEC_FLAG_PASS2))) { char logfilename[1024]; FILE *f; - int size; - char *logbuffer; snprintf(logfilename, sizeof(logfilename), "%s-%d.log", pass_logfilename_prefix ? pass_logfilename_prefix : DEFAULT_PASS_LOGFILENAME_PREFIX, @@ -2086,23 +2084,12 @@ static int av_encode(AVFormatContext **output_files, } ost->logfile = f; } else { - /* read the log file */ - f = fopen(logfilename, "r"); - if (!f) { - fprintf(stderr, "Cannot read log file '%s' for pass-2 encoding: %s\n", logfilename, strerror(errno)); - av_exit(1); - } - fseek(f, 0, SEEK_END); - size = ftell(f); - fseek(f, 0, SEEK_SET); - logbuffer = av_malloc(size + 1); - if (!logbuffer) { - fprintf(stderr, "Could not allocate log buffer\n"); + char *logbuffer; + size_t logbuffer_size; + if (read_file(logfilename, &logbuffer, &logbuffer_size) < 0) { + fprintf(stderr, "Error reading log file '%s' for pass-2 encoding\n", logfilename); av_exit(1); } - size = fread(logbuffer, 1, size, f); - fclose(f); - logbuffer[size] = '\0'; codec->stats_in = logbuffer; } } |