virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

ffprobe: rework checking logic in writer_print_time() and writer_print_rational()

Browse Source 
Make writer_print_time() and writer_print_rational() always call
writer_print_int() or writer_print_string(). This way the checks for
determining if the value should be printed or not are consistently
performed in the low level functions.

writer_print_rational() is moved downward in order to avoid a forward
reference.

Simplify/amend the overall logic.
This commit is contained in:
Stefano Sabatini 2012-09-24 18:18:56 +02:00
parent 4390f8c28d
commit 4b370d6126
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ffprobe.c
View File

@ -328,16 +328,6 @@ static inline void writer_print_integer(WriterContext *wctx,
} }
} }
static inline void writer_print_rational(WriterContext *wctx,
const char *key, AVRational q, char sep)
{
AVBPrint buf;
av_bprint_init(&buf, 0, AV_BPRINT_SIZE_AUTOMATIC);
av_bprintf(&buf, "%d%c%d", q.num, sep, q.den);
wctx->writer->print_string(wctx, key, buf.str);
wctx->nb_item++;
}
static inline void writer_print_string(WriterContext *wctx, static inline void writer_print_string(WriterContext *wctx,
const char *key, const char *val, int opt) const char *key, const char *val, int opt)
{ {
@ -349,12 +339,20 @@ static inline void writer_print_string(WriterContext *wctx,
} }
} }
static inline void writer_print_rational(WriterContext *wctx,
const char *key, AVRational q, char sep)
{
AVBPrint buf;
av_bprint_init(&buf, 0, AV_BPRINT_SIZE_AUTOMATIC);
av_bprintf(&buf, "%d%c%d", q.num, sep, q.den);
writer_print_string(wctx, key, buf.str, 0);
}
static void writer_print_time(WriterContext *wctx, const char *key, static void writer_print_time(WriterContext *wctx, const char *key,
int64_t ts, const AVRational *time_base, int is_duration) int64_t ts, const AVRational *time_base, int is_duration)
{ {
char buf[128]; char buf[128];
if (!wctx->is_fmt_chapter || !fmt_entries_to_show || av_dict_get(fmt_entries_to_show, key, NULL, 0)) {
if ((!is_duration && ts == AV_NOPTS_VALUE) || (is_duration && ts == 0)) { if ((!is_duration && ts == AV_NOPTS_VALUE) || (is_duration && ts == 0)) {
writer_print_string(wctx, key, "N/A", 1); writer_print_string(wctx, key, "N/A", 1);
} else { } else {
@ -366,7 +364,6 @@ static void writer_print_time(WriterContext *wctx, const char *key,
writer_print_string(wctx, key, buf, 0); writer_print_string(wctx, key, buf, 0);
} }
} }
}
static void writer_print_ts(WriterContext *wctx, const char *key, int64_t ts, int is_duration) static void writer_print_ts(WriterContext *wctx, const char *key, int64_t ts, int is_duration)
{ {