summaryrefslogtreecommitdiff
path: root/ffprobe.c
Commit message (Collapse)AuthorAgeFilesLines
* ffprobe: use more meaningful names for writer chapter/section header/footer ↵Stefano Sabatini2012-01-081-8/+8
| | | | | | | function The passed argument is supposed to be the chapter/section name, rather than the header/footer. Less confusing.
* ffprobe: use "%*" printf syntax in XML_INDENT() in place of a loopStefano Sabatini2012-01-081-1/+1
| | | | | | Possibly faster/cleaner. Suggested-By: Clément Bœsch <ubitux@gmail.com>
* ffprobe: add support to video frame information printingStefano Sabatini2012-01-071-8/+114
| | | | | | | | | | Add -show_frames option to ffprobe. Partially based on the work of Thomas Kuehnel <kuehnelth@googlemail.com> for SOCIS 2011. The wicked idea of creating a special "packets_and_frames" container for structured formats (JSON and XML) comes from Clément.
* ffprobe: move header and trailer print from probe_file() to main()Stefano Sabatini2012-01-071-5/+7
| | | | | Simplify printing from the main() context, in case probe_file() is not called, as required by the pending -show_version option.
* ffprobe: move writer context registration and initialization in main()Stefano Sabatini2012-01-071-32/+30
| | | | | Simplify pending changes, as the writer context will be used in the main() routine.
* cmdutils: make show_usage() use av_log()Stefano Sabatini2012-01-071-3/+3
| | | | Avoid printing on stdout when show_usage is used in an error message.
* ffprobe: exit in case generic options are incompatible with strict XML outputStefano Sabatini2012-01-061-0/+1
|
* ffprobe: fix NULL pointer dereference in writer_close()Stefano Sabatini2012-01-061-2/+4
| | | | Fix crash.
* ffprobe: add support to option -show_errorStefano Sabatini2012-01-041-0/+20
|
* ffprobe: remove unused variable in show_format()Stefano Sabatini2012-01-041-2/+0
|
* ffprobe: reindent after the last commitStefano Sabatini2012-01-041-4/+4
|
* ffprobe: change order of operations in probe_file()Stefano Sabatini2012-01-041-4/+4
| | | | | This is required by a pending patch, also fixes a memleak due to the writer context not being closed in case of open_input_file() failure.
* ffprobe: prefer av_log to fprintf(stderr)Stefano Sabatini2012-01-041-9/+9
|
* ffprobe: add XML writerStefano Sabatini2011-12-271-1/+244
|
* ffprobe: add show_private_data optionStefano Sabatini2011-12-271-1/+4
|
* ff* tools: move descriptions from copyright header to @file doxyStefano Sabatini2011-12-271-1/+5
|
* ff*: Fix duplicatedly printed version info with -versionMichael Niedermayer2011-12-201-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-131-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: doxygen: misc consistency, spelling and wording fixes vcr1: drop unnecessary emms_c() calls without MMX code Replace all uses of av_close_input_file() with avformat_close_input(). lavf: add avformat_close_input(). lavf: deprecate av_close_input_stream(). lavf doxy: add some basic demuxing documentation. lavf doxy: add some general lavf information. lavf doxy: add misc utility functions to a group. lavf doxy: add av_guess_codec/format to the encoding group. lavf doxy: add core functions to a doxy group. Add basic libavdevice documentation. lavc: convert error_recognition to err_recognition. avconv: update -map option help text x86: Require 7 registers for the cabac asm x86: bswap: remove test for bswap instruction bswap: make generic implementation more compiler-friendly h264: remove useless cast proresdec: fix decode_slice() prototype Conflicts: configure doc/APIchanges ffprobe.c libavcodec/avcodec.h libavcodec/celp_math.h libavcodec/h264.c libavfilter/src_movie.c libavformat/anm.c libavformat/avformat.h libavformat/version.h libavutil/avstring.h libavutil/bswap.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffprobe: print codec timecode if available.Clément Bœsch2011-11-281-0/+11
| |
* | ffprobe: always print int values with print_val()Stefano Sabatini2011-11-251-1/+1
| | | | | | | | | | In particular, make the json writer write size values, fix regression introduced with the addition of the print_val() macro.
* | ffprobe: make writer_print_integer support long long int valuesStefano Sabatini2011-11-181-12/+9
| | | | | | | | | | This makes possible to use writer_print_integer for printing int64_t values.
* | ffprobe: small align cosmetic in json writer struct init.Clément Bœsch2011-11-161-3/+2
| |
* | ffprobe: make Writers constant.Clément Bœsch2011-11-161-8/+8
| |
* | ffprobe: apply misc cosmetics to compact writer definitionStefano Sabatini2011-11-161-11/+10
| |
* | ffprobe: add csv writerStefano Sabatini2011-11-161-1/+23
| |
* | ffprobe: add compact writerStefano Sabatini2011-11-161-1/+228
| |
* | ffprobe: force display of missing fields, depending on writer.flagsStefano Sabatini2011-11-161-48/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add flags field to Writer, and define the WRITER_FLAG_DISPLAY_OPTIONAL_FIELDS flag which forces the display of optional fields, for example non-available or invalid fields. Also set the flag in the default writer. This change is required as for some writers it is preferable to show all fields (for example for avoiding a variable number of fields in CSV output), while for other formats (e.g. JSON, XML) it is better to leave invalid/unavailable fields unspecified and thus simplify the parsing stage on the deserializer side.
* | ffprobe: use av_noreturnMichael Niedermayer2011-11-111-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffprobe: refactor value_string() to accept an unit_value structStefano Sabatini2011-11-071-15/+38
| | | | | | | | | | | | | | | | The new design allows to specialize the format for continuos time values and discrete values. In particular, allows to print integer values like "12" rather than "12.000". Prettify, simplify parsing for integer values.
* | ffprobe: introduce print_val() macro, ease readabilityStefano Sabatini2011-11-071-4/+5
| |
* | ffprobe: implement and use print_time and print_ts macrosStefano Sabatini2011-11-071-10/+12
| | | | | | | | Help readability.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-071-0/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (23 commits) x86inc: use sse versions of common macros instead of sse2 when applicable doc/APIchanges: add missing dates and hashes lavf: don't return from void av_update_cur_dts() Changelog: add more entries. Changelog: update ffmpeg/avconv incompatibility list. avconv: remove some redundant temporary variables. avconv: fix broken indentation avconv: move copy_initial_nonkeyframes to the options context. avconv: use file:stream instead of file.stream in log messages. doc/avconv: elaborate on basic functionality. doc/avconv: -sample_fmts, not -help sample_fmts prints the sample formats openssl: Only use CRYPTO_set_id_callback on OpenSSL < 1.0.0 Call avformat_network_init/deinit in the programs Remove leftover includes of strings.h avutil: Don't allow using strcasecmp/strncasecmp Replace all usage of strcasecmp/strncasecmp avstring: Add locale independent implementations of strcasecmp/strncasecmp avstring: Add locale independent implementations of toupper/tolower cosmetics: insert some spaces in explicit enum value assignments move 8SVX audio codecs to the audio codec list part on the next bump ... Conflicts: avprobe.c doc/APIchanges ffplay.c ffserver.c libavcodec/avcodec.h libavdevice/bktr.c libavdevice/v4l.c libavdevice/v4l2.c libavformat/matroskaenc.c libavformat/wtv.c libavutil/avstring.c libavutil/avstring.h libavutil/avutil.h libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffprobe: use avio_size() instead of deprecated file_size attribute.Clément Bœsch2011-11-051-1/+3
| |
* | ffprobe: fix const compiler warning.Clément Bœsch2011-11-051-1/+1
| |
* | ffprobe: Print format specific variables of codecs.Michael Niedermayer2011-11-041-0/+11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffprobe: prefer av_freep() over av_free() for global print_format option.Clément Bœsch2011-10-181-1/+1
| | | | | | | | | | It could be re-used for instance in case ffprobe would support multiple input files.
* | ffprobe: fix weird alignStefano Sabatini2011-10-181-1/+1
| |
* | ffprobe: prefer av_strtok() over av_get_token() for parsing print_format stringStefano Sabatini2011-10-181-16/+9
| | | | | | | | Simplify, and avoid the need for multiple escaping levels.
* | ffprobe: move up ESCAPE_CHECK_SIZE and ESCAPE_REALLOC_BUF macrosStefano Sabatini2011-10-181-25/+25
| | | | | | | | So they can be used by other escaping routines.
* | ffprobe: redesign json_escape_str(), to make use of a global bufferStefano Sabatini2011-10-181-36/+77
| | | | | | | | | | | | | | | | The new code avoids to call av_malloc/av_free when escaping is needed (possibly faster), avoids an integer overflow in case of a huge string, and provides feedback when a string cannot be escaped. When a string cannot be escaped, a special string is printed instead.
* | ffprobe: add AVClass to writersStefano Sabatini2011-10-151-0/+14
| | | | | | | | It is useful for logging messages from a writer context.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-131-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (31 commits) tiffenc: initialize forgotten avctx. avplay: free the active audio packet at exit. avplay: free rdft data used for spectrogram analysis. log.h: make AVClass a named struct fix ac3 encoder documentation vc1: more prettyprinting cosmetics vc1: prettyprint some tables vc1: K&R formatting cosmetics AVOptions: bump minor and add APIchanges entry. cmdutils/avtools: simplify show_help() by using av_opt_child_class_next() AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_* Remove all uses of deprecated AVOptions API. AVOptions: add av_opt_next, deprecate av_next_option. AVOptions: add functions for evaluating option strings. AVOptions: split get_number(). AVOptions: add av_opt_get*, deprecate av_get*. AVOptions: add av_opt_set*(). AVOptions: add new API for enumerating children. rv34: move inverse transform functions to DSP context flvenc: Write the right metadata entry count ... Conflicts: avconv.c cmdutils.c doc/APIchanges ffplay.c ffprobe.c libavcodec/ac3dec.c libavcodec/h264.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/mpeg12enc.c libavcodec/options.c libavdevice/libdc1394.c libavdevice/v4l2.c libavfilter/vf_drawtext.c libavformat/flvdec.c libavformat/mpegtsenc.c libavformat/options.c libavutil/avutil.h libavutil/opt.c libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffprobe: show sample_fmt in the stream sectionStefano Sabatini2011-10-121-0/+2
| |
* | ffprobe: prefer lowercase section names over uppercase onesStefano Sabatini2011-10-111-8/+22
| | | | | | | | | | This is consistent with chapter names. The default writer section names are converted to uppercase for keeping backward compatibility.
* | ffprobe: parse arguments for -print_format writerStefano Sabatini2011-10-091-10/+26
| | | | | | | | | | This allows -print_format to accept string of the form WRITER=OPTIONS, as required by the pending compact writer patch.
* | ffprobe: extend writers API, and move the writers up in the fileStefano Sabatini2011-10-091-205/+377
| | | | | | | | | | The new provided API is more flexible and is decoupled from the application level code, so it is easier to maintain.
* | ffprobe: fix trailing '=' in stream id.Clément Bœsch2011-09-281-1/+1
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-271-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (21 commits) fate: allow testing with libavfilter disabled x86: XOP/FMA4 CPU detection support ws_snd: misc cosmetic clean-ups ws_snd: remove the 2-bit ADPCM table and just subtract 2 instead. ws_snd: use memcpy() and memset() instead of loops ws_snd: use samples pointer for loop termination instead of a separate iterator variable. ws_snd: make sure number of channels is 1 ws_snd: add some checks to prevent buffer overread or overwrite. ws_snd: decode to AV_SAMPLE_FMT_U8 instead of S16. flacdec: fix buffer size checking in get_metadata_size() rtp: Simplify ff_rtp_get_payload_type rtpenc: Add a payload type private option rtp: Correct ff_rtp_get_payload_type documentation avconv: replace all fprintf() by av_log(). avconv: change av_log verbosity from ERROR to FATAL for fatal errors. cmdutils: replace fprintf() by av_log() avtools: parse loglevel before all the other options. oggdec: add support for Xiph's CELT codec sol: return error if av_get_packet() fails. cosmetics: reindent and pretty-print ... Conflicts: avconv.c cmdutils.c libavcodec/avcodec.h libavcodec/version.h libavformat/oggparsecelt.c libavformat/utils.c libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffprobe: remove misplaced and pointless comment.Clément Bœsch2011-09-221-1/+0
| |
* | ffprobe: use av_get_pix_fmt_name() instead of accessing av_pix_fmt_descriptors.Clément Bœsch2011-09-221-1/+1
| |