Commit Graph

58441 Commits

Author SHA1 Message Date
Michael Niedermayer
1b3d3a9c87 Merge remote-tracking branch 'cus/stable'
* cus/stable:
  ffplay: add smarter method for determining video picture duration
  ffplay: add frame duration estimated from frame rate to VideoPicture
  ffplay: avoid code duplication in AVFILTER enabled and disabled case

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-06 10:59:03 +01:00
Michael Niedermayer
66872161cb avutil/common: error out with clear message if __STDC_CONSTANT_MACROS is not defined with c++
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-05 22:10:02 +01:00
Michael Niedermayer
6cfaf9cde8 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  configure: Move -Wno-maybe-uninitialized check into gcc section

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-05 21:58:44 +01:00
Marton Balint
5ecfcc7dff ffplay: add smarter method for determining video picture duration
- consider it an invalid PTS when the next PTS value is the same as the current one
- in case of invalid or unknown PTS, return vp->duration

This fixes ffplay part of ticket #3005.

Signed-off-by: Marton Balint <cus@passwd.hu>
2013-11-05 21:27:07 +01:00
Marton Balint
61dd319770 ffplay: add frame duration estimated from frame rate to VideoPicture
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-11-05 21:27:07 +01:00
Marton Balint
105d4748cf ffplay: avoid code duplication in AVFILTER enabled and disabled case
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-11-05 21:27:06 +01:00
Clément Bœsch
87434cf373 avcodec/vp9: add ff_vp9_idct_idct_{4x4,8x8}_ssse3().
1789 decicycles in idct_idct_4x4_add_c, 262136 runs, 8 skips
1839 decicycles in idct_idct_4x4_add_c, 524270 runs, 18 skips
1864 decicycles in idct_idct_4x4_add_c, 1048548 runs, 28 skips

529 decicycles in ff_vp9_idct_idct_4x4_add_ssse3, 262138 runs, 6 skips
516 decicycles in ff_vp9_idct_idct_4x4_add_ssse3, 524282 runs, 6 skips
474 decicycles in ff_vp9_idct_idct_4x4_add_ssse3, 1048565 runs, 11 skips

(~3.9x faster)

7726 decicycles in idct_idct_8x8_add_c, 1048433 runs, 143 skips
7732 decicycles in idct_idct_8x8_add_c, 2096882 runs, 270 skips
7731 decicycles in idct_idct_8x8_add_c, 4193772 runs, 532 skips

1145 decicycles in ff_vp9_idct_idct_8x8_add_ssse3, 1048549 runs, 27 skips
1137 decicycles in ff_vp9_idct_idct_8x8_add_ssse3, 2097097 runs, 55 skips
1086 decicycles in ff_vp9_idct_idct_8x8_add_ssse3, 4194188 runs, 116 skips

(~7.1x faster)

Overall decode time before commit:
  16.48s user 0.03s system 99% cpu 16.526 total
  16.54s user 0.01s system 99% cpu 16.566 total
  16.46s user 0.03s system 99% cpu 16.511 total

Overall decode time after commit:
  16.34s user 0.02s system 99% cpu 16.378 total
  16.28s user 0.02s system 99% cpu 16.315 total
  16.32s user 0.03s system 99% cpu 16.366 total

Tested on i7 920 with 40s 1080p footage.
2013-11-05 19:25:40 +01:00
Lenny Wang
89a3be8921 avfilter/opencl: compile kernels separately
Reviewed-by: Wei Gao <highgod0401@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-05 14:29:55 +01:00
Lenny Wang
6682554790 avutil/opencl: compile kernels separately
Reviewed-by: Wei Gao <highgod0401@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-05 14:29:55 +01:00
Paul B Mahol
e3f384b428 avcodec/mss2: use init_get_bits8()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-11-05 13:19:30 +00:00
Paul B Mahol
82f5c4d737 avcodec/flashsv: use av_freep() for tmpblock
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-11-05 13:19:30 +00:00
Paul B Mahol
b79f543c58 avcodec/mss1: use init_get_bits8()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-11-05 13:19:30 +00:00
Stefano Sabatini
2a6c95d85f lsws/utils: introduce scale_algorithms array
Allow some dumb factorizations, slightly decrease spaghetti factor.
2013-11-05 14:01:53 +01:00
Paul B Mahol
c3311515d5 avcodec/flashsv: fix typo
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-11-05 12:44:52 +00:00
Paul B Mahol
ad1dfe04a1 avcodec/tscc2: use init_get_bits8()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-11-05 12:44:20 +00:00
Paul B Mahol
290be34a74 avcodec/brender_pix: stop calling av_image_check_size() twice
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-11-05 12:37:52 +00:00
Paul B Mahol
6e094f7026 avcodec/flashsv: stop using deprecated avcodec_set_dimensions
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-11-05 12:36:24 +00:00
Paul B Mahol
22c00962c2 avcodec/flashsv: use init_get_bits8()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-11-05 12:31:18 +00:00
Paul B Mahol
1a244c22ea avcodec/brender_pix: stop using deprecated avcodec_set_dimensions
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-11-05 12:26:58 +00:00
Paul B Mahol
7722ae35eb avcodec/c93: stop using deprecated avcodec_set_dimensions
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-11-05 12:24:39 +00:00
Diego Biurrun
92352a94c1 configure: Move -Wno-maybe-uninitialized check into gcc section
As another example of bizarre compiler behavior clang groks the
-Wmaybe-uninitialized option, but not -Wno-maybe-uninitialized
and spews a warning for every file that gets compiled.
2013-11-05 12:22:48 +01:00
Michael Niedermayer
be74cb5159 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  avfilter/buffer: Suppress deprecation warning for avfilter_unref_buffer

Conflicts:
	libavfilter/buffer.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-05 12:17:35 +01:00
Michael Niedermayer
6a7de2361b Merge commit '82c86d0b1839b01b3cd0dd848fb6416ff21506dd'
* commit '82c86d0b1839b01b3cd0dd848fb6416ff21506dd':
  graph2dot: Add missing #include for av_get_channel_layout_string()

See: 1acd2f6ba7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-05 12:15:44 +01:00
Michael Niedermayer
de970d49fe Merge commit '48715285f69d70879353737d7bed049f89f58096'
* commit '48715285f69d70879353737d7bed049f89f58096':
  graph2dot: Fix use of deprecated API

See: 59360cd456
See: ecade984ac
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-05 12:07:32 +01:00
Michael Niedermayer
e1459f4b0b Merge commit '70cbf33405f50dfaf77e85f382a188acf17dc71a'
* commit '70cbf33405f50dfaf77e85f382a188acf17dc71a':
  vdpau: Add missing #includes to fix standalone header compilation

Conflicts:
	libavcodec/vdpau_internal.h

Not completely merged as this would break use of vdpau.h from C++

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-05 11:14:29 +01:00
Michael Niedermayer
934e489ee8 Merge commit 'e2b5b097898c9155f4bdff4d83cdc54d5eef6930'
* commit 'e2b5b097898c9155f4bdff4d83cdc54d5eef6930':
  x86: rv40dsp: Use PAVGB instruction macro where appropriate

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-05 10:26:07 +01:00
Michael Niedermayer
04047b6166 avformat/http: print http headers at AV_LOG_DEBUG level
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-05 01:38:08 +01:00
Stefano Sabatini
246e323de8 lsws/utils: fix typo 2013-11-05 00:04:17 +01:00
Stefano Sabatini
988e2e7c1c lavfi/ladspa: cast return value of av_x_if_null to char*, fix warnings 2013-11-05 00:04:17 +01:00
Diego Biurrun
7d1a68e95b avfilter/buffer: Suppress deprecation warning for avfilter_unref_buffer
The function is used in a block of code that is deprecated anyway.
2013-11-04 23:04:10 +01:00
Diego Biurrun
82c86d0b18 graph2dot: Add missing #include for av_get_channel_layout_string() 2013-11-04 23:04:10 +01:00
Diego Biurrun
48715285f6 graph2dot: Fix use of deprecated API 2013-11-04 23:04:10 +01:00
Diego Biurrun
70cbf33405 vdpau: Add missing #includes to fix standalone header compilation
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-11-04 22:54:55 +01:00
Michael Niedermayer
bd75651378 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  omadec: loosen format probing constraints

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-04 22:46:22 +01:00
Michael Niedermayer
aeaca3816c Merge commit '1c736bedd9891501960ebac0f7c05eb60225e947'
* commit '1c736bedd9891501960ebac0f7c05eb60225e947':
  omadec: check GEOB sizes against buffer size

Conflicts:
	libavformat/omadec.c

See: e74fa25cb9
See: 91e72e3514
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-04 22:08:59 +01:00
Michael Niedermayer
b1f213a83a Merge commit '97f50e92b5cf3b47a76f75d76ed4340e822030db'
* commit '97f50e92b5cf3b47a76f75d76ed4340e822030db':
  omadec: Fix wrong number of array elements

See: 4f5d1468f5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-04 21:59:55 +01:00
Michael Niedermayer
4b4a7fcb07 Merge commit 'e73996954d8e00117056dcefb38ef3d4d2f37967'
* commit 'e73996954d8e00117056dcefb38ef3d4d2f37967':
  filtfmts-test: Fix use of deprecated API

Conflicts:
	libavfilter/filtfmts.c

See: f12174c8ce
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-04 21:52:46 +01:00
Michael Niedermayer
2865c1b905 Merge commit '3ef9b7ab95cc703b67a8b658dca45c80df0aaa66'
* commit '3ef9b7ab95cc703b67a8b658dca45c80df0aaa66':
  hevc_ps: Use AV_PIX_FMT_YUVJ420P if YUV 4:2:0 8-bit full scale

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-04 21:43:27 +01:00
Michael Niedermayer
b906d04881 Merge commit '885ec9242554ad25922258a595ec5e317922a412'
* commit '885ec9242554ad25922258a595ec5e317922a412':
  hevc: Use parsed VUI colorimetry in avcodec

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-04 21:37:34 +01:00
Michael Niedermayer
be41f21a3d Merge commit 'cd8f772d0678a90957f4dfd5ce51af9d22e3f212'
* commit 'cd8f772d0678a90957f4dfd5ce51af9d22e3f212':
  lavc: Add colorimetry values for BT.2020, other non-included ones

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-04 21:26:34 +01:00
Michael Niedermayer
b84cd22a66 Merge commit '446e37dc97e533e37f6aa0a11355124207e3a7f7'
* commit '446e37dc97e533e37f6aa0a11355124207e3a7f7':
  vf_fieldorder: remove superfluous get_video_buffer

Conflicts:
	libavfilter/vf_fieldorder.c

See: 9b35bee696
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-04 21:19:25 +01:00
Diego Biurrun
e2b5b09789 x86: rv40dsp: Use PAVGB instruction macro where appropriate 2013-11-04 21:14:39 +01:00
David Goldwich
0a7fef39fc omadec: loosen format probing constraints
Imporoves detection of some files in the wild:

- ID3v2 a.k.a. "ea3" header is optional.
- Version and flags in ID3v2 header are unspecified.

Signed-off-by: David Goldwich <david.goldwich@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-11-04 18:43:18 +01:00
Michael Niedermayer
1c736bedd9 omadec: check GEOB sizes against buffer size
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: David Goldwich <david.goldwich@gmail.com>
CC:libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-11-04 18:43:03 +01:00
Michael Niedermayer
97f50e92b5 omadec: Fix wrong number of array elements
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: David Goldwich <david.goldwich@gmail.com>
CC:libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-11-04 18:38:01 +01:00
Diego Biurrun
e73996954d filtfmts-test: Fix use of deprecated API
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2013-11-04 16:20:44 +01:00
Yusuke Nakamura
3ef9b7ab95 hevc_ps: Use AV_PIX_FMT_YUVJ420P if YUV 4:2:0 8-bit full scale
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2013-11-04 16:19:53 +01:00
Jan Ekström
885ec92425 hevc: Use parsed VUI colorimetry in avcodec
Also limit the parsed VUI values to known valid ones.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2013-11-04 16:03:11 +01:00
Jan Ekström
cd8f772d06 lavc: Add colorimetry values for BT.2020, other non-included ones
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2013-11-04 15:39:33 +01:00
Michael Niedermayer
85cabf1ca9 avutil: add av_fopen_utf8()
fopen() on windows uses UTF-16, we use UTF-8 everywhere, this
function bridges the gap by using avpriv_open()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-04 15:38:52 +01:00