generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
73,814 Commits 24 Branches 241 Tags
Commit Graph

73814 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
ba05166174 configure: Fix build with --disable-decoders --enable-parser=hevc 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-13 17:43:05 +02:00
Michael Niedermayer
da10aaf238 Merge commit '1b9a8e5f1d007ea19f04032490d681becd0d4e6a' 
* commit '1b9a8e5f1d007ea19f04032490d681becd0d4e6a':
  dxva2_hevc: unbreak compilation after recent sps/pps changes

See: 1aab5d8ab1e27449a2d58d6f001bb34784f402bf
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-13 17:12:00 +02:00
Michael Niedermayer
5be07d0206 Merge commit 'a062a55d37720abc8c704aa0e8682efd3cdc9c9b' 
* commit 'a062a55d37720abc8c704aa0e8682efd3cdc9c9b':
  hevc_parser: fix standalone build with the hevc decoder disabled

Conflicts:
	libavcodec/Makefile
	libavcodec/hevc.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-13 17:04:13 +02:00
Michael Niedermayer
1127b35ff1 Merge commit 'b9f76d19d81fbc7f088536f966c2d3dc23c34ddc' 
* commit 'b9f76d19d81fbc7f088536f966c2d3dc23c34ddc':
  hevc_ps: make sure failing to decode an SPS always returns an error

Conflicts:
	libavcodec/hevc_ps.c

See: 15893adbdb6a7000f59207bcb88def6e7b4812b9
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-13 16:50:06 +02:00
Michael Niedermayer
afa97144cf Merge commit '077b55943330150db0eafd36bbee614697cabd98' 
* commit '077b55943330150db0eafd36bbee614697cabd98':
  hevc: handle a NULL sps in set_sps() properly

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-13 16:41:09 +02:00
Michael Niedermayer
d13fc98247 Merge commit '18156b53f9b642b71c182c5c9818175a61572d2b' 
* commit '18156b53f9b642b71c182c5c9818175a61572d2b':
  hevc: do not pass an entire HEVCContext into export_stream_params()

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-13 16:31:10 +02:00
Michael Niedermayer
39bbdebb1e avcodec/sanm: Reset sizes in destroy_buffers() 
Fixes crash in 1288a2fe8e9ae6b00ca40e089d08ca65_signal_sigsegv_7ffff71426a7_354_accident.san with allocation limit 65536

Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-13 16:06:37 +02:00
Michael Niedermayer
f7068bf277 avcodec/alac: Clear pointers in allocate_buffers() 
Fixes: 06a4edb39ad8a9883175f9bd428334a2_signal_sigsegv_7ffff713351a_706_mov__alac__ALAC_6ch.mov

Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-13 15:47:49 +02:00
Michael Niedermayer
b513661251 avformat/utils: Skip ff_configure_buffers_for_index() for local files 
Theres no known case where its use on local files improves performance
if you know of such a case, please contact us

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-13 14:27:02 +02:00
Zhang Rui
f5c281daa8 configure: clean whitespace with [:space:] 
https://en.wikibooks.org/wiki/Regular_Expressions/POSIX_Basic_Regular_Expressions

Fixes NDKr10e on Cygwin,
CC_IDENT for it is defined as

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-13 13:38:29 +02:00
Michael Niedermayer
488cc05192 avformat/mov: Use ff_configure_buffers_for_index() 
Fixes Ticket2513
Fixes Ticket4432

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-13 12:38:21 +02:00
Michael Niedermayer
b183fb4767 avformat: Add ff_configure_buffers_for_index() 
This allows configuring the io buffer in such way that few seeks are needed for playback

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-13 12:38:21 +02:00
James Almer
1b9a8e5f1d dxva2_hevc: unbreak compilation after recent sps/pps changes 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-13 09:00:37 +02:00
Anton Khirnov
a062a55d37 hevc_parser: fix standalone build with the hevc decoder disabled 
The parser depends on hevc_ps, which in turn needs some data tables.

Found-by: James Almer <jamrial@gmail.com>
 2015-07-13 08:58:21 +02:00
Anton Khirnov
b9f76d19d8 hevc_ps: make sure failing to decode an SPS always returns an error 
Some of the goto err clauses do not set the error code. It seems better
to fall back on INVALIDDATA instead of adding it everywhere explicitly.
 2015-07-13 07:49:03 +02:00
James Almer
1aab5d8ab1 avcodec/dxva2_hevc: unbreak compilation after recent sps/pps changes 
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-07-13 00:06:02 -03:00
Philip Langdale
b11c3fce38 avcodec/vdpau_hevc: unbreak compilation after sps/pps changes 
There was some reorganisation in the HEVC headers so the sps and pps
now live in a different place.
 2015-07-12 19:56:54 -07:00
Michael Niedermayer
10d7d0880c avcodec/utils: Check that the sample rate is not negative when opening an encoder 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-13 03:51:33 +02:00
Michael Niedermayer
7c944b0a36 tests/checkasm/x86/Makefile: Use ASMSTRIPFLAGS for asm 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-13 03:15:44 +02:00
Michael Niedermayer
d6ff68ad85 Factor duplicated ff_fast_malloc() out into mem_internal.h 
internal.h is difficult to use due to circular dependancies
mem.h is a public header ff_* is not public
Alternative solutions probably are possible too

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-13 02:41:43 +02:00
Ronald S. Bultje
03931ecf71 vf_ssim: remove another obscure double loop. 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-13 02:39:51 +02:00
Ronald S. Bultje
a1f4848049 ssim: refactor a weird double loop. 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-13 02:23:30 +02:00
Michael Niedermayer
4496ccc724 avcodec/hevc_parser: Reenable the old parser under ADVANCED_PARSER define 
Feel free to use either, they both work but the old one provides
more information but needs the hevc decoder

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-13 02:14:58 +02:00
Michael Niedermayer
9e810a98a2 Merge commit '650060dfb665552442ec11b456660e3e9a9d9016' 
* commit '650060dfb665552442ec11b456660e3e9a9d9016':
  hevc_parser: parse and export some stream parameters

Conflicts:
	configure
	libavcodec/hevc_parser.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-13 01:28:57 +02:00
Michael Niedermayer
99558270ed avcodec/hevc: Simplify skipped_bytes_pos code further 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-13 01:09:21 +02:00
Michael Niedermayer
ad92410d90 avcodec/hevc: Move skipped_bytes_pos_nal to HEVCNAL, simplify code 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-13 00:43:25 +02:00
Michael Niedermayer
bcc6c7bb65 avcodec/hevc: Move skipped_bytes_pos_size_nal into HAVCNAL 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-13 00:38:15 +02:00
Michael Niedermayer
5620ed3557 avcodec/hevc: Remove skipped_bytes_nal, simplify code 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-13 00:03:45 +02:00
Michael Niedermayer
93aa84c1ea Merge commit '7f78155dc6b65be55efb5309b6dd2bb33925a8c4' 
* commit '7f78155dc6b65be55efb5309b6dd2bb33925a8c4':
  hevc: improve a comment

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 23:45:56 +02:00
Michael Niedermayer
4690a63632 Merge commit 'd82e1adc2019135a2fc45372e0ed0b5ef107cdd0' 
* commit 'd82e1adc2019135a2fc45372e0ed0b5ef107cdd0':
  hevc: move splitting the packet into NALUs into a separate function

Conflicts:
	libavcodec/hevc.c
	libavcodec/hevc.h
	libavcodec/hevc_parse.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 23:44:24 +02:00
Michael Niedermayer
4c42c66935 Merge commit 'ae05b4865514fd71b5e9431e93aa0d03d7ba7751' 
* commit 'ae05b4865514fd71b5e9431e93aa0d03d7ba7751':
  hevc: eliminate the second call to hls_nal_unit()

Conflicts:
	libavcodec/hevc.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 22:55:47 +02:00
Michael Niedermayer
760304e4c3 Merge commit 'd7bebe4805193783f0b6f292f9127a75709fb7d9' 
* commit 'd7bebe4805193783f0b6f292f9127a75709fb7d9':
  hevc: skip invalid/ignored NALUs when splitting the packet

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 22:46:06 +02:00
Michael Niedermayer
d5fcca83b9 Merge commit 'b11acd57326db6c2cc1475dd0bea2a06fbc85aa2' 
* commit 'b11acd57326db6c2cc1475dd0bea2a06fbc85aa2':
  hevc: remove HEVCContext usage from hevc_ps

Conflicts:
	libavcodec/hevc.c
	libavcodec/hevc_cabac.c
	libavcodec/hevc_filter.c
	libavcodec/hevc_mvs.c
	libavcodec/hevc_ps.c
	libavcodec/hevc_refs.c
	libavcodec/hevcpred_template.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 22:28:54 +02:00
Paul B Mahol
885afff01c avfilter/vf_w3fdif: implement slice threading 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-12 20:06:03 +00:00
Paul B Mahol
7b07e72abc avfilter/vf_stereo3d: implement slice threading for anaglyph output 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-12 20:05:56 +00:00
Paul B Mahol
c02ee69be9 fate: add tests for stereo3d anaglyph modes 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-12 20:05:56 +00:00
Michael Niedermayer
ddd86e4747 Merge commit 'ab05ed4c322ed0488ac9b5d2ef5d4ffa55a946a7' 
* commit 'ab05ed4c322ed0488ac9b5d2ef5d4ffa55a946a7':
  mpegvideo_parser: export pixel format and dimensions

Conflicts:
	libavcodec/mpegvideo_parser.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 21:34:59 +02:00
Michael Niedermayer
547848f711 Merge commit '9f4c7397a296e6d11b3c6c121a6896163577dc7c' 
* commit '9f4c7397a296e6d11b3c6c121a6896163577dc7c':
  hevc: check slice address length

See: 05cc8c8e4b7008ff3be8ec477c901b2ceca4b16b
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 21:31:53 +02:00
Michael Niedermayer
6727380d05 Merge commit 'a9a2f3613040c4f90bf15cbd76f8671252ecc043' 
* commit 'a9a2f3613040c4f90bf15cbd76f8671252ecc043':
  doc: add a section about building with libmfx

Conflicts:
	doc/general.texi

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 21:23:16 +02:00
Michael Niedermayer
98c7f9741e Merge commit '86eee85daddb682fa072c2e2657c90a514b855e3' 
* commit '86eee85daddb682fa072c2e2657c90a514b855e3':
  bytestream2: set the reader to the end when reading more than available

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 21:13:07 +02:00
Michael Niedermayer
f14fc55969 Merge commit '8bc67ec2c0d2b5444d51a1bed1d50f0e10d92717' 
* commit '8bc67ec2c0d2b5444d51a1bed1d50f0e10d92717':
  Checkasm: assembly testing and benchmarking tool

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 21:03:06 +02:00
Ganesh Ajjanagadde
4547cf68a0 avformat/isom: utilize bitrate hints 
Fixes Ticket4546

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 20:23:58 +02:00
Niklesh
774ceee17e movtextdec.c: Add support for highlight and hilightcolor box 
Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
 2015-07-12 10:24:17 -07:00
Anton Khirnov
077b559433 hevc: handle a NULL sps in set_sps() properly 
This can happen in update_thread_context(), when the previous frame was
corrupted.
 2015-07-12 18:57:10 +02:00
Anton Khirnov
18156b53f9 hevc: do not pass an entire HEVCContext into export_stream_params() 
It only needs the parameter sets.
 2015-07-12 18:52:02 +02:00
James Almer
a3b721d10d avcodec/dcadec: silence request_channels deprecation warnings 
This also prevents an eventual compilation failure once request_channels
is removed.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-07-12 13:32:22 -03:00
Anton Khirnov
650060dfb6 hevc_parser: parse and export some stream parameters 
Particularly those that will be needed by the QSV decoder.
More can be added later as necessary.
 2015-07-12 18:15:40 +02:00
Anton Khirnov
7f78155dc6 hevc: improve a comment 
That loop does the actual full decoding, so 'parse' can be misleading.
 2015-07-12 18:15:40 +02:00
Anton Khirnov
d82e1adc20 hevc: move splitting the packet into NALUs into a separate function 
This function is independent of the decoding context, so we'll be able
to use it in the parser.
 2015-07-12 18:15:39 +02:00
Anton Khirnov
ae05b48655 hevc: eliminate the second call to hls_nal_unit() 
Also, make hls_nal_unit() work only on the provided NAL unit, without
requiring a whole decoding context.

This will allow splitting this code for reuse by the parser.
 2015-07-12 18:15:39 +02:00