diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 19:40:35 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 19:40:35 +0400 |
commit | 1046cd60d4b19d6376dd18164959c3ea30477855 (patch) | |
tree | c1f2921d1f0e50bbaeb0a0868e8a1ec88c80dddb /ffmpeg.h | |
parent | afa442c198fcbfe587887a4318d61e19539afc2d (diff) | |
parent | 4754345027eb85cfa51aeb88beec68d7b036c11e (diff) |
Merge commit '4754345027eb85cfa51aeb88beec68d7b036c11e'
* commit '4754345027eb85cfa51aeb88beec68d7b036c11e':
avconv: print verbose per-stream transcoding statistics
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.h')
-rw-r--r-- | ffmpeg.h | 17 |
1 files changed, 14 insertions, 3 deletions
@@ -262,9 +262,6 @@ typedef struct InputStream { int top_field_first; int guess_layout_max; - /* number of packets successfully read for this stream */ - uint64_t nb_packets; - int resample_height; int resample_width; int resample_pix_fmt; @@ -309,6 +306,15 @@ typedef struct InputStream { int (*hwaccel_retrieve_data)(AVCodecContext *s, AVFrame *frame); enum AVPixelFormat hwaccel_pix_fmt; enum AVPixelFormat hwaccel_retrieved_pix_fmt; + + /* stats */ + // combined size of all the packets read + uint64_t data_size; + /* number of packets successfully read for this stream */ + uint64_t nb_packets; + // number of frames/samples retrieved from the decoder + uint64_t frames_decoded; + uint64_t samples_decoded; } InputStream; typedef struct InputFile { @@ -421,6 +427,11 @@ typedef struct OutputStream { /* stats */ // combined size of all the packets written uint64_t data_size; + // number of packets send to the muxer + uint64_t packets_written; + // number of frames/samples sent to the encoder + uint64_t frames_encoded; + uint64_t samples_encoded; } OutputStream; typedef struct OutputFile { |