wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
80533 commits 40 branches 405 tags 230 MiB
Commit graph

35852 commits

Author SHA1 Message Date
Clément Bœsch
5d48e4eafa Merge commit 'a6a750c7ef' 
* commit 'a6a750c7ef':
  tests: Move all test programs to a subdirectory

Merged-by: Clément Bœsch <clement@stupeflix.com>
 2016-06-22 13:44:34 +02:00
Clément Bœsch
5558ff3a9f Merge commit '257f00ec1a' 
* commit '257f00ec1a':
  Split global .gitignore file into per-directory files

Merged-by: Clément Bœsch <clement@stupeflix.com>
 2016-06-22 11:28:51 +02:00
Clément Bœsch
85185578ce lavc/qtrleenc: simplify FF_API_CODED_FRAME deprecation guard 2016-06-22 11:09:19 +02:00
Clément Bœsch
0491d6993a lavc/error_resilience: remove unused skip_last_mv label 
Unused since a7b8a6e704
 2016-06-22 11:07:54 +02:00
Clément Bœsch
e6247a22c0 Merge commit '763d69bfb2' 
* commit '763d69bfb2':
  Add some more deprecation guards

- psnr() deprecation is not merged within ffmpeg.c as we still use it in
  non-deprecated code

- the XVMC chunk is not merged as we still apparently maintain it

- The guarding in lavc/qtrleenc.c could be simplified but merged anyway.

Merged-by: Clément Bœsch <clement@stupeflix.com>
 2016-06-22 11:06:04 +02:00
Matthieu Bouron
df3484f87c lavc/videotoolbox: fix avcC extradata creation 
Fixes properly ticket #5638.

Since 772ad7142d PPS and SPS contain the
nal type byte.

This reverts commit b8d754c5d0.
This reverts commit 8e47a99f57.
 2016-06-22 10:03:45 +02:00
Clément Bœsch
a4403e49b9 Merge commit 'b7e64fba7f' 
* commit 'b7e64fba7f':
  Reduce the scope of some variables

Merged-by: Clément Bœsch <u@pkh.me>
 2016-06-21 22:40:56 +02:00
Clément Bœsch
475a686a01 Merge commit '885a9d6087' 
* commit '885a9d6087':
  pgssub: Fix subpicture colorspace and range

See 9779b62624

Merged-by: Clément Bœsch <u@pkh.me>
 2016-06-21 22:20:49 +02:00
Clément Bœsch
363d4a0e65 Merge commit '283226e11c' 
* commit '283226e11c':
  simple_idct_template: Fix strict aliasing violation

See 5df703aa1b

Merged-by: Clément Bœsch <u@pkh.me>
 2016-06-21 22:12:36 +02:00
Clément Bœsch
8df1dbd798 Merge commit '5afb94c817' 
* commit '5afb94c817':
  Mark read-only tables as static

Merged-by: Clément Bœsch <u@pkh.me>
 2016-06-21 22:09:35 +02:00
Clément Bœsch
8ef57a0d61 Merge commit '41ed7ab45f' 
* commit '41ed7ab45f':
  cosmetics: Fix spelling mistakes

Merged-by: Clément Bœsch <u@pkh.me>
 2016-06-21 21:55:34 +02:00
Clément Bœsch
9204a84998 Merge commit '5c31eaa999' 
* commit '5c31eaa999':
  Remove unnecessary get_bits.h #includes and add missing headers where needed.

Merged-by: Clément Bœsch <clement@stupeflix.com>
 2016-06-21 15:42:49 +02:00
Clément Bœsch
d12cce3fb2 Merge commit '5f1c3cbd52' 
* commit '5f1c3cbd52':
  vaapi: Drop pointless debug output

Merged-by: Clément Bœsch <clement@stupeflix.com>
 2016-06-21 15:36:43 +02:00
Clément Bœsch
14762dd3f3 Merge commit '015c2d9239' 
* commit '015c2d9239':
  libopencore-amr: Fix ff_dlog()/av_log() invocations

The log changed in our tree in 4a28962454
is kept as is since it's the correct thing to do (the log mentions what
the first byte *was*, so it's refering to the source packet, not the
encoded bitstream).

Merged-by: Clément Bœsch <clement@stupeflix.com>
 2016-06-21 15:30:16 +02:00
Clément Bœsch
c01f1157ac Merge commit '0f40c90984' 
* commit '0f40c90984':
  Drop pointless assert.h #includes

Merged-by: Clément Bœsch <clement@stupeflix.com>
 2016-06-21 15:26:20 +02:00
Matthieu Bouron
0cd5e281df lavc/mediacodecdec_h264: use ff_h264_decode_extradata to extract PPS/SPS 
Fixes playback of HLS streams on MediaTek devices which requires PPS/SPS
to be set in their respective csd-{0,1} buffers.
 2016-06-21 14:20:57 +02:00
Clément Bœsch
d16aefee5c lavc/mmaldec: reduce some diffs with Libav missed in previous skipped merges 2016-06-21 13:35:36 +02:00
Clément Bœsch
ba5100ce84 Merge commit '74beead9bd' 
* commit '74beead9bd':
  mmaldec: limit internal buffering

See 14a90c9ef0

The introduction of the MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS check is
merged.

Merged-by: Clément Bœsch <clement@stupeflix.com>
 2016-06-21 13:32:57 +02:00
Clément Bœsch
f36fcf7b6c Merge commit '4b2e69397b' 
* commit '4b2e69397b':
  dds: Add support for monochrome images

Merged-by: Clément Bœsch <clement@stupeflix.com>
 2016-06-21 12:29:46 +02:00
Clément Bœsch
dea0a2b69a Merge commit 'e3c9041cfe' 
* commit 'e3c9041cfe':
  h264: allocate some tables per slice contexts, not threads

Merged-by: Clément Bœsch <clement@stupeflix.com>
 2016-06-21 10:28:14 +02:00
Clément Bœsch
04aefe205b Merge commit 'e065279529' 
* commit 'e065279529':
  h264: remove an artificial restriction on the number of slice threads

Tested with multiple runs of fate-h264 THREADS=50 THREAD_TYPE=slice

Merged-by: Clément Bœsch <clement@stupeflix.com>
 2016-06-21 10:24:31 +02:00
Clément Bœsch
26cfafa52d lavc/h264_slice: mark ref2frm as const pointers 2016-06-21 10:09:19 +02:00
Matthieu Bouron
0ea58059d6 lavc/h264_ps: add ff_h264_ps_uninit and use it 2016-06-20 16:09:09 +02:00
Clément Bœsch
0528410e04 Merge commit '4fd34e639d' 
* commit '4fd34e639d':
  h264: remove pointless setting of some variables in loop_filter

Merged-by: Clément Bœsch <clement@stupeflix.com>
 2016-06-20 15:38:11 +02:00
Clément Bœsch
fabdb7505a Merge commit '9c858ce33f' 
* commit '9c858ce33f':
  h264: remove a pointless comment

Merged-by: Clément Bœsch <clement@stupeflix.com>
 2016-06-20 15:36:44 +02:00
Clément Bœsch
4053989890 Merge commit 'b77fffa127' 
* commit 'b77fffa127':
  h264: make slice threading work with deblocking_filter=1

again label, and SLICE_SINGLETHREAD error handling are preserved as that
SLICE_SINGLETHREAD can be raised on a remaining case.

slice_context_count is also kept since it's still in use.

Merged-by: Clément Bœsch <clement@stupeflix.com>
 2016-06-20 15:34:26 +02:00
Clément Bœsch
c8f7a23319 Merge commit '370ddc7b38' 
* commit '370ddc7b38':
  h264: remove H264Context.pict_type

Merged-by: Clément Bœsch <clement@stupeflix.com>
 2016-06-20 12:48:49 +02:00
Clément Bœsch
0ab1816315 Merge commit '56087ec0a2' 
* commit '56087ec0a2':
  h264: drop a pointless indirection

Merged-by: Clément Bœsch <clement@stupeflix.com>
 2016-06-20 12:31:29 +02:00
Carl Eugen Hoyos
dcdf69561f lavc/audiotoolboxdec: Forward extradata for QDMC and QDM2. 
Fixes audiotoolbox decoding of QDMC and QDM2.
 2016-06-20 12:23:59 +02:00
Clément Bœsch
cbe2dc7275 Merge commit '0e7772c5e4' 
* commit '0e7772c5e4':
  h264: remove unused H264SliceContext.rbsp_buffer

Merged-by: Clément Bœsch <clement@stupeflix.com>
 2016-06-20 12:07:10 +02:00
Clément Bœsch
c957909a9f Merge commit '7f045c4429' 
* commit '7f045c4429':
  h264: merge ff_h264_free_context() into h264_decode_end()

Merged-by: Clément Bœsch <clement@stupeflix.com>
 2016-06-20 12:03:21 +02:00
Clément Bœsch
d98ca4b14c Merge commit '99c554efc8' 
* commit '99c554efc8':
  h264: eliminate low_delay

ff_print_debug_info2() is adjusted to allow a NULL pointer as low_delay.
It's only useful for MPEG codecs with the exception of H264.

Merged-by: Clément Bœsch <clement@stupeflix.com>
 2016-06-20 11:47:40 +02:00
Clément Bœsch
38a2d9aeec lavc/h264_parser: replace AVCodecContext with logging ctx in scan_mmco_reset() 2016-06-20 10:36:16 +02:00
Clément Bœsch
4fdea02d68 lavc/h264: add a logging ctx to ff_h264_pred_weight_table() 2016-06-20 10:36:16 +02:00
Matthieu Bouron
432891a96e lavc/mediacodecdec{,_h264}: set FF_CODEC_CAP_SETS_PKT_DTS capability 
And sets frames pkt_dts to AV_NOPTS_VALUE as we do not want lavc/utils
to overwrite the field with incorrect values as the decoder is
asynchronous.
 2016-06-20 10:07:41 +02:00
Dan Dennedy
b8d754c5d0 lavc/videotoolbox: Fix videotoolbox compile error on OS X 10.8. 
Fixes error:
libavcodec/videotoolbox.c:511:18: error: implicit declaration of function
'CMVideoFormatDescriptionCreateFromH264ParameterSets' is invalid in C99

This was added in 10.9:
https://developer.apple.com/reference/coremedia/1489818-cmvideoformatdescriptioncreatefr?language=objc
 2016-06-19 21:52:56 -04:00
Clément Bœsch
fd1d84bcf6 lavc/magicyuv: fix undefined behaviour introduced in 8a135a55b 
Order of evaluation of parameters in C is not defined.
 2016-06-19 19:01:14 +02:00
James Almer
5f5a97dc3d avcodec/qsvenc_h264: declare the QSVEncContext variable before using it 
Should fix compilation.

Regression introduced by commit 63adb3602d

Signed-off-by: James Almer <jamrial@gmail.com>
 2016-06-19 12:04:03 -03:00
Clément Bœsch
c3afe64d0c Merge commit '5b35b290dd' 
* commit '5b35b290dd':
  h264: remove a stale comment

Merged-by: Clément Bœsch <u@pkh.me>
 2016-06-19 13:48:09 +02:00
Clément Bœsch
d5cfe23324 Merge commit '89ae244e78' 
* commit '89ae244e78':
  h264_refs: remove an unused parameter from ff_h264_fill_mbaff_ref_list()

Merged-by: Clément Bœsch <u@pkh.me>
 2016-06-19 13:45:59 +02:00
Clément Bœsch
222e7d23d0 Merge commit '755f79f84c' 
* commit '755f79f84c':
  h264_refs: make the H264Context const where possible

ff_h264_decode_ref_pic_list_reordering() and h264_initialise_ref_list()
do not have a const H264Context * as they modify the default_ref inside
that context.

Merged-by: Clément Bœsch <u@pkh.me>
 2016-06-19 13:36:33 +02:00
Clément Bœsch
902862bb4b Merge commit 'a2fd547839' 
* commit 'a2fd547839':
  h264_refs: reorder functions to avoid forward declarations

Merged-by: Clément Bœsch <u@pkh.me>
 2016-06-19 13:04:17 +02:00
Clément Bœsch
98456d4d69 Merge commit '0ba471d7d8' 
* commit '0ba471d7d8':
  h264: eliminate copy_fields

Added a copy of default_ref which isn't present in Libav.

Merged-by: Clément Bœsch <u@pkh.me>
 2016-06-19 13:00:28 +02:00
Clément Bœsch
0ed14bba12 Merge commit '72da8d9bb2' 
* commit '72da8d9bb2':
  h264_parser: remove the remaining dependencies on the h264 decoder

Merged-by: Clément Bœsch <u@pkh.me>
 2016-06-19 12:50:24 +02:00
Clément Bœsch
34ec084b84 lavc/h264: move history parsing variable to H264ParseContext 
This makes h264_find_frame_end() not depend on H264Context anymore.
 2016-06-19 12:38:28 +02:00
Clément Bœsch
48ea5433c8 lavc/h264_parser: pass logctx to h264_find_frame_end() 
This helps removing the H264Context from the H264ParseContext.
 2016-06-19 12:34:38 +02:00
Clément Bœsch
0bf5fd2e19 Merge commit '98c97994c5' 
* commit '98c97994c5':
  h264: decouple extradata parsing from the decoder

Main changes:

- move get_avc_nalsize() inside h264_parser.c and make it use
  H264ParseContext instead of H264Context. This helps fixing
  fate-flv-demux.

- Also use is_avc/nal_length_size from the H264ParseContext in various
  places instead of the H264Context one as that's the fields now filled
  by ff_h264_decode_extradata()

- h264_parse: dont fail decode_extradata_ps() due to nal split failure.
  Change by Michael to fix decoding of h264/ref_10.avi.

Merged-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-06-19 12:17:41 +02:00
Paul B Mahol
8a135a55b3 avcodec/magicyuv: check dimensions 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-06-19 09:45:29 +02:00
Andrey Turkin
63adb3602d libavcodec: factor out SEI generation for A53 captions 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-06-19 02:11:20 +02:00
Clément Bœsch
b51d5c99b8 lavc/h264_parse: remove tabs introduced in a2922b5d 2016-06-18 14:10:00 +02:00