1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00

87675 Commits

Author SHA1 Message Date
Karthick J
b6cf66ae1c avdevice/decklink_dec: Added Closed caption decode from VANC
Signed-off-by: Karthick J <kjeyapal@akamai.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
2017-09-28 21:06:12 +02:00
Karthick J
a8755785d7 avdevice/decklink_dec: Extraction of luma from V210 VANC modularized
In preparation to support multiple VANC data decode

Signed-off-by: Karthick J <kjeyapal@akamai.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
2017-09-28 21:06:03 +02:00
Karthick J
e6cdf30fb4 avdevice/decklink_dec: Added VANC search for all resolutions
In preparation to make VANC decode modular, to support multiple other VANC data.

Signed-off-by: Karthick J <kjeyapal@akamai.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
2017-09-28 21:06:03 +02:00
Gildas Fargeas
cb8b729180 avdevice/decklink_dec: add support for more pixel formats
The decklink input pixel format can now be specified with the 'raw_format'
option. The -bm_v210 option is now deprecated.

Signed-off-by: Marton Balint <cus@passwd.hu>
2017-09-28 21:06:03 +02:00
James Almer
00a61f30a0 Merge commit '54e39b102e29adcc2f59f1eca85be5f86c89454b'
* commit '54e39b102e29adcc2f59f1eca85be5f86c89454b':
  configure: Explicitly spell out first require_pkg_config() parameter

Merged-by: James Almer <jamrial@gmail.com>
2017-09-28 13:46:31 -03:00
James Almer
1a4d2e8b4d Merge commit '00b160af117b782292619c98effce6c8273792e5'
* commit '00b160af117b782292619c98effce6c8273792e5':
  nvenc: Fix nvec vs. nvenc typo

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>
2017-09-28 13:42:20 -03:00
James Almer
6c9f44a3c2 Merge commit '42cf7f91f1e9dabf494ff469d8f67ac8b33b0f63'
* commit '42cf7f91f1e9dabf494ff469d8f67ac8b33b0f63':
  dv: Don't return EIO upon EOF

This commit is a noop, see 3eae98c1ac705d3f820a1800e81960146a80c61c

Merged-by: James Almer <jamrial@gmail.com>
2017-09-28 13:25:54 -03:00
James Almer
983705cf13 Merge commit '7cb9296db872c4221453e5411f242ebcfca62664'
* commit '7cb9296db872c4221453e5411f242ebcfca62664':
  webp: Fix alpha decoding

This commit is a noop.

[13:09:40] <jamrial> jkqxz: do we need 7cb9296db8 from libav?
[13:11:20] <+wm4> we had vaapi vp8 for a while in ffmpeg, so I guess not
[13:11:58] <@jkqxz> It's more fallout from the VP8 hwaccel which never got merged. Some people hated on that part of the patch and I wasn't really interested in pursuing it further.
[13:13:02] <jamrial> it wasn't merged?
[13:13:21] <@jkqxz> wm4:  There is no VP8 decode hwaccel in ffmpeg (there is encode).
[13:13:25] <+wm4> ah
[13:14:00] <jamrial> what do i do then? and shouldn't that be merged at some point?
[13:14:37] <@jkqxz> It should.
[13:14:53] <@jkqxz> Skip the patch now, though.
[13:16:30] <jamrial> ok, thanks

Merged-by: James Almer <jamrial@gmail.com>
2017-09-28 13:21:34 -03:00
Martin Storsjö
5455a44aa5 movenc-test: Add tests for negative cts offsets
Signed-off-by: Martin Storsjö <martin@martin.st>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-09-28 18:15:45 +02:00
Martin Storsjö
07e4be7ec9 movenc: Add an option for enabling negative CTS offsets
This reduces the need for an edit list; streams that start with
e.g. dts=-1, pts=0 can be encoded as dts=0, pts=0 (which is valid
in mov/mp4) by shifting the dts values of all packets forward.
This avoids the need for edit lists for such streams (while they
still are needed for audio streams with encoder delay).

This eases conformance with the DASH-IF interoperability guidelines.

Signed-off-by: Martin Storsjö <martin@martin.st>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-09-28 18:15:45 +02:00
James Almer
bf209013bf Merge commit '2d518aec4c781316092be65893b47922c8f71b67'
* commit '2d518aec4c781316092be65893b47922c8f71b67':
  vf_deinterlace_vaapi: Create filter buffer after context
  vaapi_encode: Discard output buffer if picture submission fails

This commit is a noop, see
92bd08974541611731b2d58723826ea26ecbe47d
359586f14f46bf3f9c1ae3375d80e8c0fc377bef

Merged-by: James Almer <jamrial@gmail.com>
2017-09-28 13:03:58 -03:00
James Almer
e63e0b6544 Merge commit '8f5de34c8fb18fa1416e77d2cb998773a49ddb3d'
* commit '8f5de34c8fb18fa1416e77d2cb998773a49ddb3d':
  vf_fade: Make sure to not miss the last lines of a frame

This commit is a noop.

[11:00:43] <jamrial> michaelni: what do you think of 8f5de34c8f? does it apply to us?
[11:01:50] <jamrial> our code started to deviate with your commit bca59d7745e, followed by the merge commit aa40df483b2
[11:33:51] <michaelni> jamrial, the fade commits are from 2013, but i think our fixes where complete and the problematic slice_h FFALIGN is also removed

Merged-by: James Almer <jamrial@gmail.com>
2017-09-28 12:53:42 -03:00
James Almer
47d6b02f6c Merge commit 'd00a0d8e84fef1b9124bfaf71cc17df79ca464a6'
* commit 'd00a0d8e84fef1b9124bfaf71cc17df79ca464a6':
  configure: Handle SDL version check through pkg-config

Merged-by: James Almer <jamrial@gmail.com>
2017-09-28 01:04:46 -03:00
James Almer
d2ec2e27f8 Merge commit '8847eeaa141898850381400000fb2b8a7adc7100'
* commit '8847eeaa141898850381400000fb2b8a7adc7100':
  aarch64: Add parentheses around the offset parameter in movrel

This commit is a noop, see dda45c087b2c09ba9e485c51ff9c8f2aaca709a9

Merged-by: James Almer <jamrial@gmail.com>
2017-09-28 00:53:40 -03:00
James Almer
e862a433d8 Merge commit '82989bd98c7f4e87f59af2147b645b8fd8f31c53'
* commit '82989bd98c7f4e87f59af2147b645b8fd8f31c53':
  avconv: Move rescale to stream timebase before monotonisation

This commit is a noop, see 4ee5aed122ba7d289c1686eca6eba161d5d62304

Merged-by: James Almer <jamrial@gmail.com>
2017-09-28 00:52:02 -03:00
James Almer
93dfc4f174 avcodec/libopenh264dec: check for ff_set_dimensions() return value
Was removed by accident in e9b6212de29a966f200833220ed35f51852f05f6.

Signed-off-by: James Almer <jamrial@gmail.com>
2017-09-28 00:49:05 -03:00
James Almer
e9b6212de2 Merge commit '030de53e9cc225dc767458aedcc87efd457b4f3b'
* commit '030de53e9cc225dc767458aedcc87efd457b4f3b':
  libopenh264dec: Let the framework use the h264_mp4toannexb bitstream filter

Merged-by: James Almer <jamrial@gmail.com>
2017-09-28 00:44:11 -03:00
James Almer
42f27d1b8e Merge commit '0539d84d985e811e5989ef27c13f7e2dda0f9b89'
* commit '0539d84d985e811e5989ef27c13f7e2dda0f9b89':
  asfdec: Account for different Format Data sizes

See 76853a3e0ce4d4ef09ffcca7307991b8db832cd4

Merged-by: James Almer <jamrial@gmail.com>
2017-09-28 00:28:38 -03:00
James Almer
e2a5fa11b2 Merge commit '871b4f3654636ed64560e86b9faa33828d195ceb'
* commit '871b4f3654636ed64560e86b9faa33828d195ceb':
  configure: Check for xcb as well as xcb-shape before enabling libxcb

This commit is a noop. We already check for libxcb_shape.

Merged-by: James Almer <jamrial@gmail.com>
2017-09-28 00:13:10 -03:00
James Almer
d99c3af707 Merge commit 'b446f0e98f85e2e931b476e52b319f1c49244660'
* commit 'b446f0e98f85e2e931b476e52b319f1c49244660':
  mov: Do not try to parse multiple stsd for the same track

See 8b43ee4054af799e388d380b379a13a60849c1b5

Merged-by: James Almer <jamrial@gmail.com>
2017-09-28 00:10:42 -03:00
James Almer
2838ab65cc Merge commit 'e791b915c774408fbc0ec9e7270b021899e08ccc'
* commit 'e791b915c774408fbc0ec9e7270b021899e08ccc':
  hwcontext_vaapi: Try to support the VDPAU wrapper

This commit is a noop, see f2e4fb61af4b47c329fbf2b9a245594957d7bbab

Merged-by: James Almer <jamrial@gmail.com>
2017-09-28 00:06:42 -03:00
James Almer
752bc6b402 Merge commit '5dd9a4b88b287bf8c93520afda7becb1ad0d1894'
* commit '5dd9a4b88b287bf8c93520afda7becb1ad0d1894':
  vaapi: Implement device-only setup

This commit is a noop, see 81b7deab8296f8446a64e20b9fcaf8eba88b9e29

Merged-by: James Almer <jamrial@gmail.com>
2017-09-28 00:05:24 -03:00
James Almer
d7458ca8d7 Merge commit '44f2eda39ff55c69d4d739fb12a42a10b7ce581c'
* commit '44f2eda39ff55c69d4d739fb12a42a10b7ce581c':
  lavc: Add device context field to AVCodecContext

This commit is a noop, see c1a5fca06f75cc0e7b9b2808fecaa0c1b424da50

Merged-by: James Almer <jamrial@gmail.com>
2017-09-28 00:02:15 -03:00
James Almer
d987f9cfe3 Merge commit '07b5136c481d394992c7e951967df0cfbb346c0b'
* commit '07b5136c481d394992c7e951967df0cfbb346c0b':
  aarch64: vp9lpf: Fix broken indentation/vertical alignment
  aarch64: vp9lpf: Interleave the start of flat8in into the calculation above
  arm: vp9lpf: Interleave the start of flat8in into the calculation above

This commit is a noop, see
83399cf569c9f78e0c72e21aa67184c222bb2d59
9f3a8863648ed19ea69ca5ddfcfa3c80e0df15b0
c8d6eec85d6a87c9075c87d5eb75af47c964fff8

Merged-by: James Almer <jamrial@gmail.com>
2017-09-28 00:00:23 -03:00
James Almer
774295a3e0 doc/libav-merge: mention skipped or incomplete runtime alignment commits
Signed-off-by: James Almer <jamrial@gmail.com>
2017-09-27 23:58:20 -03:00
James Almer
a1dcb057e3 Merge commit '9c2d36fcaf8748b9baa9aba9264abefce711d67b'
* commit '9c2d36fcaf8748b9baa9aba9264abefce711d67b':
  dv: Convert to the new bitstream reader

This commit is a noop, see
http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html

Merged-by: James Almer <jamrial@gmail.com>
2017-09-27 23:52:22 -03:00
James Almer
e9a3880613 Merge commit 'ba30b74686f0cb6c9dd465ac4820059c48bf9d08'
* commit 'ba30b74686f0cb6c9dd465ac4820059c48bf9d08':
  aac: Validate the sbr sample rate before using the value

See cf5f4c5169639349262aa221ae485a0de188afb1

Merged-by: James Almer <jamrial@gmail.com>
2017-09-27 23:49:06 -03:00
James Almer
b02b43a823 Merge commit '0ee78020cd41d81eec651acd7fc65906207796f3'
* commit '0ee78020cd41d81eec651acd7fc65906207796f3':
  configure: Move up the avbuild directory creation

This commit is a noop, see 19bf50406ebf8bff1be7388da2ed7a85738d055f

Merged-by: James Almer <jamrial@gmail.com>
2017-09-27 23:41:24 -03:00
James Almer
596a4cbd0a Merge commit 'c2f97f050870897575570708ac48c5c15e6a0dd8'
* commit 'c2f97f050870897575570708ac48c5c15e6a0dd8':
  hwcontext_dxva2: support D3D9Ex

This commit is a noop, see 50708f4aa40ce96122cf93d9e36cca8024baf025

Merged-by: James Almer <jamrial@gmail.com>
2017-09-27 23:37:43 -03:00
James Almer
11f3a7ae10 Merge commit '04f3bd349651694f30feeb8c4ed9bc58106fca54'
* commit '04f3bd349651694f30feeb8c4ed9bc58106fca54':
  AVFrame: add an opaque_ref field

This commit is a noop, see e3af49b14bf371e18fab1c12cba0239e6658672c

Merged-by: James Almer <jamrial@gmail.com>
2017-09-27 23:35:59 -03:00
James Almer
7aa6b8a68f Merge commit '4de220d2e3751c459f8739a08ac6ca52e63eba30'
* commit '4de220d2e3751c459f8739a08ac6ca52e63eba30':
  frame: allow align=0 (meaning automatic) for av_frame_get_buffer()

See https://ffmpeg.org/pipermail/ffmpeg-devel/2017-September/215834.html

Merged-by: James Almer <jamrial@gmail.com>
2017-09-27 23:31:53 -03:00
James Almer
24ee1b8c63 Merge commit 'f44ec22e095c5ba00ffeadd891655c456e3dd014'
* commit 'f44ec22e095c5ba00ffeadd891655c456e3dd014':
  lavc: use av_cpu_max_align() instead of hardcoding alignment requirements

This commit is a noop, see
https://ffmpeg.org/pipermail/ffmpeg-devel/2017-September/215834.html

Merged-by: James Almer <jamrial@gmail.com>
2017-09-27 23:16:43 -03:00
James Almer
3b345d389b avutil/cpu: split flag checks per arch in av_cpu_max_align()
Signed-off-by: James Almer <jamrial@gmail.com>
2017-09-27 23:10:09 -03:00
James Almer
522f877086 Merge commit 'e6bff23f1e11aefb16a2b5d6ee72bf7469c5a66e'
* commit 'e6bff23f1e11aefb16a2b5d6ee72bf7469c5a66e':
  cpu: add a function for querying maximum required data alignment

Adapted to work with the arbitrary runtime cpuflag changes av_force_cpu_flags()
can generate.

Merged-by: James Almer <jamrial@gmail.com>
2017-09-27 23:03:57 -03:00
James Almer
5256a86da0 Merge commit '5c8a5765dc5f4e29afb85b95be393c30f45412a8'
* commit '5c8a5765dc5f4e29afb85b95be393c30f45412a8':
  scale_npp: explicitly set the output frames context for passthrough mode

See 62b75537db15816fde8b8a33976ffc4a8277f1fc

Merged-by: James Almer <jamrial@gmail.com>
2017-09-27 20:59:14 -03:00
James Almer
4ad0264ab3 Merge commit '6f554521afdf7ab4edbfaa9536660a1dca946b19'
* commit '6f554521afdf7ab4edbfaa9536660a1dca946b19':
  Use the new AVIOContext destructor.
  avio: add a destructor for AVIOContext

This commit is a noop, see
b12e4d3bb8df994f042ff1216fb8de2b967aab9e
78a7af823b7c2a1e3184e6680f2b49bf67101e5c

Merged-by: James Almer <jamrial@gmail.com>
2017-09-27 20:55:46 -03:00
James Almer
7f89e9621b Merge commit '435cd7bc99671bf561193421a50ac6e9d63c4266'
* commit '435cd7bc99671bf561193421a50ac6e9d63c4266':
  arm: vp9lpf: Use orrs instead of orr+cmp
  arm/aarch64: vp9lpf: Calculate !hev directly
  aarch64: vp9itxfm: Optimize 16x16 and 32x32 idct dc by unrolling
  arm: vp9itxfm: Optimize 16x16 and 32x32 idct dc by unrolling
  aarch64: vp9mc: Calculate less unused data in the 4 pixel wide horizontal filter
  arm: vp9mc: Calculate less unused data in the 4 pixel wide horizontal filter
  aarch64: vp9mc: Simplify the extmla macro parameters

This commit is a noop, see
ac6cb8ae5b1c56c4a3fceb635c60d05e447c4365
bff07715904cc02f04eb5c5e171b431eb00f0c3b
045e33ae3fee74e39b1321dddf727eacb1ecf541
758302e4bc14e93989e7feb1135ec3f807c3310d
148cc0bb890839bc2a9cda514c5e71acc39eb374
f0ecbb13cf1cf706a1350dad657219dc7b3c131e
92ab8374b1051dd632c3ccc326b6cb1d564f293f

Merged-by: James Almer <jamrial@gmail.com>
2017-09-27 20:51:29 -03:00
James Almer
b35f6d3aa3 Merge commit '53ea595eec984e3109310e8bb7ff4b5786d91057'
* commit '53ea595eec984e3109310e8bb7ff4b5786d91057':
  mov: Rework stsc index validation

See e26e6240b6700c5e8c16d0f092f1ad46805a723c.

Merged-by: James Almer <jamrial@gmail.com>
2017-09-27 20:43:17 -03:00
James Almer
1a115a31d4 Merge commit 'ce6d72d10776b03c6780d4aa676414ce002285d4'
* commit 'ce6d72d10776b03c6780d4aa676414ce002285d4':
  imgutils: Document av_image_get_buffer_size()

Merged-by: James Almer <jamrial@gmail.com>
2017-09-27 20:35:04 -03:00
James Almer
9cf1376aad Merge commit 'b6093e8c72a80710f086c678ab0730cf30953b5c'
* commit 'b6093e8c72a80710f086c678ab0730cf30953b5c':
  hlsenc: Correctly write down all 16 bytes in hex

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>
2017-09-27 20:33:41 -03:00
James Almer
09b1a9d740 Merge commit 'bc2589763042dc2384b724b203ec778f35bcebad'
* commit 'bc2589763042dc2384b724b203ec778f35bcebad':
  utvideodec: Add a missing include

This commit is a noop, see 91ed4e71967f19824237de4c374f038b543c7555

Merged-by: James Almer <jamrial@gmail.com>
2017-09-27 20:31:12 -03:00
James Almer
91feb62b3d Merge commit 'a52976c0feab6e86138983c248bd01fa45cdda69'
* commit 'a52976c0feab6e86138983c248bd01fa45cdda69':
  nvenc: make gpu indices independent of supported capabilities

This commit is a noop, see 5403d90f32656719a766254d77bbe4411e473eed

Merged-by: James Almer <jamrial@gmail.com>
2017-09-27 20:29:20 -03:00
James Almer
d96363cc84 Merge commit '77c23704c769168e4210956314775a1931f6aa0b'
* commit '77c23704c769168e4210956314775a1931f6aa0b':
  avcodec: Mark some codecs with threadsafe init as such

This commit is a noop, see 91ed4e71967f19824237de4c374f038b543c7555

Merged-by: James Almer <jamrial@gmail.com>
2017-09-27 20:26:57 -03:00
Mark Thompson
c1f22c2959 lavc: Move V4L2 encoders lower in the list
Their previous positioning would cause them to chosen before software
encoders like libx264 or libvpx.
2017-09-27 23:47:32 +01:00
James Almer
276f035a4d Merge commit '0c0b87f12d48d4e7f0d3d13f9345e828a3a5ea32'
* commit '0c0b87f12d48d4e7f0d3d13f9345e828a3a5ea32':
  aarch64: vp9itxfm: Fix incorrect vertical alignment
  aarch64: vp9itxfm: Update a comment to refer to a register with a different name
  aarch64: vp9itxfm: Use the right lane sizes in 8x8 for improved readability
  aarch64: vp9itxfm: Use a single lane ld1 instead of ld1r where possible
  aarch64: vp9itxfm: Share instructions for loading idct coeffs in the 8x8 function
  arm: vp9itxfm: Share instructions for loading idct coeffs in the 8x8 function
  aarch64: vp9itxfm: Do separate functions for half/quarter idct16 and idct32
  arm: vp9itxfm: Do a simpler half/quarter idct16/idct32 when possible
  aarch64: vp9itxfm: Move the load_add_store macro out from the itxfm16 pass2 function
  arm: vp9itxfm: Move the load_add_store macro out from the itxfm16 pass2 function
  aarch64: vp9itxfm: Make the larger core transforms standalone functions
  arm: vp9itxfm: Make the larger core transforms standalone functions

This commit is a noop, see
f8fcee0daf42d16581ec581bd5ff6373c3a76103
dc47bf3872fde18f6aea33f015a95b70e24dff19
3bd9b39108076e1fca8cd26970cb946fce66523a
a681c793a30386d01d273ce86b3368311cffb511
824589556cb7c4bfafb8a0190e71a10c628f5339
9532a7d4d060f2a2741225a76945daed52dbc478
1d8ab576a7e40ea6209dd753929f26dcb37e1444
3006e5253afc6a0ee001916806aae80f157d7043
19a0f9529ccdb48696f0caa251fe36b1d30df739
6752318c737663f0ac019de3acd63e3cea706864
d0fbf7f34e7243f6a4cbde9925f34d924e6d93f7
16ef000799b227d0226b7a678d28c34ff1d09410

Merged-by: James Almer <jamrial@gmail.com>
2017-09-27 19:37:15 -03:00
Mark Thompson
da53c424b9 lavc/v4l2: Add missing header include
Fixes checkheaders.
2017-09-27 23:10:03 +01:00
James Almer
57db1faf7a Merge commit 'c546147db07d16a76c2fb698d2e8a3057f393475'
* commit 'c546147db07d16a76c2fb698d2e8a3057f393475':
  configure: Correctly recurse in do_check_deps()

See 7659f35638e2ca7a8b202cb3007ca5473b108fa4.

Merged-by: James Almer <jamrial@gmail.com>
2017-09-27 19:08:19 -03:00
James Almer
f1cdfd2959 Merge commit '57ec83e4246b21c2f0c068b9151d806737d4497f'
* commit '57ec83e4246b21c2f0c068b9151d806737d4497f':
  omx: Use the EOS flag to handle flushing at the end

Merged-by: James Almer <jamrial@gmail.com>
2017-09-27 19:06:12 -03:00
James Almer
7659f35638 Merge commit 'dad7a9c7c0ae8ebc56f2e3a24e6fa4da5c2cd491'
* commit 'dad7a9c7c0ae8ebc56f2e3a24e6fa4da5c2cd491':
  configure: Rework dependency handling for conflicting components

Includes an important fix made by c546147db07d16a76c2fb698d2e8a3057f393475
as well.

Merged-by: James Almer <jamrial@gmail.com>
2017-09-27 19:00:50 -03:00
Lionel CHAZALLON
f3aefb3e1c lavc: Add support for RockChip Media Process Platform
This adds hardware decoding for H.264 / HEVC / VP8 / VP9 using the MPP
Rockchip API.  It returns frames holding an AVDRMFrameDescriptor struct
in buf[0] that allows drm / dmabuf usage.  Tested on RK3288 (TinkerBoard)
and RK3328.

Signed-off-by: Mark Thompson <sw@jkqxz.net>
2017-09-27 22:43:58 +01:00