diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2012-07-30 15:53:14 +0200 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2012-07-31 13:21:29 +0200 |
| commit | c809b89a1272226916890e6bff7d406772c846e1 (patch) | |
| tree | cf764019decad0e5296c61ecc13fe81707e12b24 | |
| parent | 23fc4dd6e7e150ea163a867dfaee2062ade90b74 (diff) | |
| download | ffmpeg-c809b89a1272226916890e6bff7d406772c846e1.tar.gz | |
ffprobe: show audio frame channels and channel_layout
| -rw-r--r-- | doc/ffprobe.xsd | 2 | ||||
| -rw-r--r-- | ffprobe.c | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/doc/ffprobe.xsd b/doc/ffprobe.xsd index 3a4a8cce2b..13c0d02ae3 100644 --- a/doc/ffprobe.xsd +++ b/doc/ffprobe.xsd @@ -62,6 +62,8 @@ <!-- audio attributes --> <xsd:attribute name="sample_fmt" type="xsd:string"/> <xsd:attribute name="nb_samples" type="xsd:long" /> + <xsd:attribute name="channels" type="xsd:int" /> + <xsd:attribute name="channel_layout" type="xsd:string"/> <!-- video attributes --> <xsd:attribute name="width" type="xsd:long" /> @@ -1647,6 +1647,14 @@ static void show_frame(WriterContext *w, AVFrame *frame, AVStream *stream, if (s) print_str ("sample_fmt", s); else print_str_opt("sample_fmt", "unknown"); print_int("nb_samples", frame->nb_samples); + print_int("channels", av_frame_get_channels(frame)); + if (av_frame_get_channel_layout(frame)) { + av_bprint_clear(&pbuf); + av_bprint_channel_layout(&pbuf, av_frame_get_channels(frame), + av_frame_get_channel_layout(frame)); + print_str ("channel_layout", pbuf.str); + } else + print_str_opt("channel_layout", "unknown"); break; } show_tags(av_frame_get_metadata(frame)); |