virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
85,610 Commits 37 Branches 400 Tags 460 MiB
1fd7627770
Commit Graph

351 Commits

Author SHA1 Message Date
Marton Balint
1f94197536 ffprobe: only use custom logging callback if -show_log is set 
The custom callback can cause significant CPU usage on Windows for some large
files with many index entries for some reason.

v2: Move check after parsing options.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2017-04-12 20:21:11 +02:00
wm4
2a88ebd096 ffprobe: port to new decode API 
Not sure if it behaves ideally in presence of decoding errors.
 2017-04-04 07:47:28 +02:00
James Almer
2a2854f578 ffprobe: use av_spherical_projection_name() to print spherical projection names 
Reviewed-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
 2017-03-31 13:27:09 -03:00
James Almer
c14b3ea93c ffprobe: fix printing packet side data information 
Signed-off-by: James Almer <jamrial@gmail.com>
 2017-03-29 21:20:06 -03:00
Clément Bœsch
549045254c Fix all -Wformat warnings raised by DJGPP 2017-03-29 14:49:29 +02:00
Clément Bœsch
fa0a8faaa4 ffprobe: fix usage of av_get_codec_tag_string() 2017-03-29 14:49:29 +02:00
James Almer
b613245c97 ffprobe: free log buffer's parent_name during cleanup 
Fixes memleak.
 2017-03-27 20:37:29 -03:00
Michael Niedermayer
bcd7153df3 ffprobe: Support adding av_log output to frames 
adding demuxer and other logs should be easy
This forces single threaded decoding for simplicity
It also requires pthreads, this could be avoided either with
some lockless tricks or simply by assuming av_log would never be called from
another thread.

Fixes Ticket5521

Previous version reviewed by Stefano
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-03-28 00:13:47 +02:00
James Almer
a044f8df6a ffprobe: support skip_samples packet side data information 
Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
 2017-03-25 22:42:57 -03:00
Vittorio Giovara
21a8e751ad fate: Do not report side data size 
This field is of little value, and interferes with testing side data,
since sizes can be different on multiple architectures.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2017-03-17 13:12:25 -04:00
wm4
55eab1733b ffmpeg, ffprobe: don't "merge" side data into packet data by default 
Preparation for potentially disabling merged side data by default in the
libs. Do this in particular because it affects fate tests.

The changed tests either reflect added packet side data, or the changed
packet size due to merged side data removal reducing the packet size.
 2017-03-14 23:37:28 +01:00
Steven Liu
51e3501993 ffprobe: add AVCodecContext help message into ffprobe 
because the ffprobe can use AVCodecContext parameters

Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
 2017-03-11 11:12:23 +08:00
Vittorio Giovara
1b7ffddb3a spherical: Add tiled equirectangular type and projection-specific properties 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2017-03-07 11:19:37 -05:00
Vittorio Giovara
e7a6f8c972 lavc: Add spherical packet side data API 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2016-12-07 14:40:06 -05:00
Vittorio Giovara
33f7f636ff ffprobe: Fix displaying side data list only 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2016-11-30 12:19:14 -05:00
Stefano Sabatini
427a47abcd ffprobe: fix crash in case -of is specified with an empty string 
Fix trac issue #5957.
 2016-11-17 20:28:45 +01:00
Rodger Combs
73ead477dd
lavf: add AV_DISPOSITION_TIMED_THUMBNAILS 
Reviewed-By: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-24 05:47:05 -05:00
Rodger Combs
54350f06e1
ffprobe: report field order for video streams 2016-10-24 01:24:23 -05:00
Hendrik Leppkes
6f74e3cde6 Merge commit 'beb62dac629603eb074a44c44389c230b5caac7c' 
* commit 'beb62dac629603eb074a44c44389c230b5caac7c':
  Use AVFrame.pts instead of deprecated pkt_pts.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2016-10-07 13:16:36 +02:00
James Almer
92de2c23a6 ffprobe: don't use AVStream.codec to set decoder framerate 
Also don't set time_base. It's deprecated for decoding and avcodec_open2()
will overwrite it

Reviewed-by: Josh de Kock <josh@itanimul.li>
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-09-27 21:21:42 -03:00
James Almer
64545dd600 ffprobe: don't access AVCodecContext.pkt_timebase directly 
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-09-26 22:45:39 -03:00
Sasi Inguva
6a2cbf9014 ffprobe.c: Indicate decode-but-discard packets when doing -show_packets. 
Signed-off-by: Sasi Inguva <isasi@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-09-23 23:09:23 +02:00
Hendrik Leppkes
3bf142c773 cmdutils: remove the current working directory from the DLL search path on win32 
Reviewed-by: Matt Oliver <protogonoi@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-08-08 18:36:55 +02:00
Dmitry Vagin
dc151d138c ffprobe: add missing PROGRAM_STREAM_TAGS case 
ffprobe did not show tags with only '-show_entries programs'

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-07-26 19:22:47 +02:00
Clément Bœsch
c8550e8244 ffprobe: print stereo3d information 
Based on 8e757716c6

See https://github.com/mpv-player/mpv/issues/1045 for mk3d
elektranox.org samples.
 2016-06-23 13:48:14 +02:00
Clément Bœsch
ccf942a0c2 ffprobe: refactor pkt side data printing 2016-06-23 13:48:14 +02:00
Derek Buitenhuis
e8373143e1 ffprobe: Don't try and decode things that have no dec_ctx 
The last instance of a missing dec_ctx check from the merge.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-12 17:24:07 +01:00
Derek Buitenhuis
9cb1ed5735 ffprobe: Fix missing dec_ctx check 
Missed it during the merge of ffprobe codecpar conversion.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-12 16:50:01 +01:00
Derek Buitenhuis
9080dc7f07 Merge commit 'ba357e98691ee4fe1a503b8830c0050be4127475' 
* commit 'ba357e98691ee4fe1a503b8830c0050be4127475':
  avprobe: switch to codecpar

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-12 15:38:03 +01:00
Derek Buitenhuis
48fb5294d0 Merge commit '567d6d5f9d1400f00445183b3477391f58979aa3' 
* commit '567d6d5f9d1400f00445183b3477391f58979aa3':
  avprobe: add local per-stream state

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-11 16:46:30 +01:00
Derek Buitenhuis
9d48aa6d7d Merge commit 'c9478410c68c04261f9cfcd80474607e50bd1852' 
* commit 'c9478410c68c04261f9cfcd80474607e50bd1852':
  avprobe: add local per-file state

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-11 16:33:13 +01:00
Derek Buitenhuis
6614214ece Merge commit '168a443d43b10ef6a3545d64b2f8bc90144ce4b7' 
* commit '168a443d43b10ef6a3545d64b2f8bc90144ce4b7':
  avprobe: print information from the codec descriptor

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-11 16:01:22 +01:00
Derek Buitenhuis
80195236c8 Merge commit 'e7188a1a84817b8d4337340c21c552ad0b6cb2fd' 
* commit 'e7188a1a84817b8d4337340c21c552ad0b6cb2fd':
  avprobe: remove a pointless condition and a dead branch

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-11 15:30:55 +01:00
Derek Buitenhuis
b62825a480 ffprobe: Deprecate stream timecode field and add frame side data timecode field 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-01 18:19:30 +00:00
Ganesh Ajjanagadde
4a44bc5588 ffprobe: avoid unnecessary pow and exp2 calls 
These are just for prefixes and may be hardcoded easily; see lavu/eval
for this approach.

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
 2015-12-29 08:59:16 -08:00
Stefano Sabatini
91c2a33d01 ffprobe: use print_val to print the frame pkt_size value 
This allows to honour formatting options.
 2015-12-16 18:59:23 +01:00
Timothy Gu
9670165cc2 ffprobe: Do not print profile names in -bitexact 
Instead, print "unknown" if it's unknown, or their numerical values if
they are known.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-12-06 14:37:40 +01:00
Marton Balint
d9611864c2 ffprobe: add support for printing packet strings metadata as packet tags 
ffprobe.xsd already contains the tag element.

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2015-10-30 20:47:43 +01:00
Michael Niedermayer
057ce755b9 ffprobe: Remove abort() 
Found-by: Ganesh Ajjanagadde and wm4
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-10-28 10:12:15 +01:00
Hendrik Leppkes
fe3c22e0c0 Merge commit 'f0ca6ffa0ae5d5564516ee7a18aa1e234751444a' 
* commit 'f0ca6ffa0ae5d5564516ee7a18aa1e234751444a':
  avprobe: Unref the packet once it is used

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-10-27 14:10:04 +01:00
Ganesh Ajjanagadde
38f4e973ef all: fix -Wextra-semi reported on clang 
This fixes extra semicolons that clang 3.7 on GNU/Linux warns about.
These were trigggered when built under -Wpedantic, which essentially
checks for strict ISO compliance in numerous ways.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
 2015-10-24 17:58:17 -04:00
Clément Bœsch
306ff40988 ffprobe: use AV_OPT_TYPE_BOOL for writers options 2015-09-12 17:50:22 +02:00
Hendrik Leppkes
5d8e836d0e Replace all remaining occurances of step/depth_minus1 and offset_plus1 2015-09-08 17:10:48 +02:00
Michael Niedermayer
a75d22445e ffprobe: check av_asprintf() for failure 
Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-13 01:45:27 +02:00
Dave Rice
09ec31ce3a ffprobe: print stream_index with frame data 
This makes it easier to relate frame data to its associated stream.
 2015-05-27 11:19:19 +02:00
Michael Niedermayer
5f0ebe865c ffprobe: Use av_packet_side_data_name() to find the side data name 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-07 21:20:26 +02:00
Michael Niedermayer
a72b61a317 ffprobe: support printing AVStream and AVPacket side data 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-03 00:53:19 +02:00
Michael Niedermayer
08152f2df2 ffprobe: Add Support to print information about AV_FRAME_DATA_DISPLAYMATRIX 
Idea from 709e1c91ea by Martin Storsjö
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-03 00:39:47 +02:00
Michael Niedermayer
2a3270b66c ffprobe: add writer_print_integers() to allow printing formated 1d and 2d arrays of integers 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-03 00:38:52 +02:00
Michael Niedermayer
fa14685a57 Merge commit '7b9cb7b36543c2a0e46d99b0e41824b9e7dd0c8f' 
* commit '7b9cb7b36543c2a0e46d99b0e41824b9e7dd0c8f':
  avprobe: Export coded_{width,height} in -show_streams

Conflicts:
	avprobe.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-08 23:58:18 +01:00