RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
69,036 Commits 36 Branches 398 Tags 232 MiB
Commit Graph

196 Commits

Author SHA1 Message Date
Michael Niedermayer 99f8c9e4d1 avcodec/hevc: move qp_block_mask to where its used 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-18 01:55:02 +01:00
Michael Niedermayer 8aa8d12554 avcodec/hevc: clear filter_slice_edges() on allocation 
This avoids use of uninitialized memory
Fixes: asan_static-oob_17aa046_582_cov_212287884_DBLK_G_VIXS_1.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-17 19:43:58 +01:00
Michael Niedermayer b799ec7e0b avcodec/hevc: Print an error if luma_log2_weight_denom is out of range 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-15 21:12:46 +01:00
Michael Niedermayer 241943d3a2 Merge commit 'b2bece5e9a4dd96142962c6798e187c77b88bbfa' 
* commit 'b2bece5e9a4dd96142962c6798e187c77b88bbfa':
  hevc: always clip luma_log2_weight_denom

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-15 21:06:20 +01:00
Vittorio Giovara b2bece5e9a hevc: always clip luma_log2_weight_denom 
Its value shall be between 0 and 7 according to the specifications.

CC: libav-stable@libav.org
Bug-Id: CID 1257502
 2014-12-15 15:46:34 +01:00
Michael Niedermayer ef23bd939d avcodec/hevc: Silence "warning: ref0/1 may be used uninitialized in this function" 
Also make code more robust by initializing the pointers to NULL

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-11 04:17:43 +01:00
Michael Niedermayer 148506c965 Merge commit 'cd975d5658a1cbe99939df75db59d5ae9fbcb4e0' 
* commit 'cd975d5658a1cbe99939df75db59d5ae9fbcb4e0':
  hevc: Spin the mv_mpv_mode calls in a stand alone function

Conflicts:
	libavcodec/hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-22 01:32:55 +01:00
Luca Barbato cd975d5658 hevc: Spin the mv_mpv_mode calls in a stand alone function 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-11-21 23:17:37 +01:00
Michael Niedermayer 91a9ae5b6b Merge commit 'eac3ac1fe0774b65316852616b2672702dbc3f31' 
* commit 'eac3ac1fe0774b65316852616b2672702dbc3f31':
  hevc: eliminate an unneeded intermediate variable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-17 12:13:09 +01:00
Michael Niedermayer 0d5af820f7 Merge commit 'eb335f3c5ce37f2b93c993e28404d113bee843bc' 
* commit 'eb335f3c5ce37f2b93c993e28404d113bee843bc':
  hevc: reduce variable scope

Conflicts:
	libavcodec/hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-17 12:07:49 +01:00
Michael Niedermayer c23d7de22e Merge commit '84c0ece5fd9569c0f31804f02a199ecd0e7d13d8' 
* commit '84c0ece5fd9569c0f31804f02a199ecd0e7d13d8':
  hevc: further reduce code duplication in hls_prediction_unit()

Conflicts:
	libavcodec/hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-17 12:01:47 +01:00
Michael Niedermayer e078549421 Merge commit 'a7b365ae191f45a0d7ed7b34033d5d0cbdd47139' 
* commit 'a7b365ae191f45a0d7ed7b34033d5d0cbdd47139':
  hevc: reduce code duplication in hls_prediction_unit()

Conflicts:
	libavcodec/hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-17 11:54:41 +01:00
Michael Niedermayer c192be1968 Merge commit '16c01fb4347312b6d29a6498dad627665b96a20e' 
* commit '16c01fb4347312b6d29a6498dad627665b96a20e':
  hevc: remove an unused function parameter

Conflicts:
	libavcodec/hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-17 11:30:41 +01:00
Michael Niedermayer f1b20930f2 Merge commit '2c6a7f9348378f887066fb1669c46b9485e8ef3e' 
* commit '2c6a7f9348378f887066fb1669c46b9485e8ef3e':
  hevc: do not store rqt_root_cbf in the context

Conflicts:
	libavcodec/hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-17 11:20:32 +01:00
Michael Niedermayer 7cbe1e0447 Merge commit '920bca3e2332dced9c78bd14cfc2ff138188bd57' 
* commit '920bca3e2332dced9c78bd14cfc2ff138188bd57':
  hevc: do not store pcm_flag in the context

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-17 11:06:13 +01:00
Anton Khirnov eac3ac1fe0 hevc: eliminate an unneeded intermediate variable 2014-11-17 09:26:45 +01:00
Anton Khirnov eb335f3c5c hevc: reduce variable scope 
Also, collapse the array into a scalar, since only one value is needed
at a time.
 2014-11-17 09:26:45 +01:00
Anton Khirnov 8b573ddda7 hevc: remove superfluous assignments and checks 2014-11-17 09:26:45 +01:00
Anton Khirnov 84c0ece5fd hevc: further reduce code duplication in hls_prediction_unit() 2014-11-17 09:25:15 +01:00
Anton Khirnov a7b365ae19 hevc: reduce code duplication in hls_prediction_unit() 2014-11-17 09:25:12 +01:00
Anton Khirnov 16c01fb434 hevc: remove an unused function parameter 2014-11-17 09:25:12 +01:00
Anton Khirnov 2c6a7f9348 hevc: do not store rqt_root_cbf in the context 
It does not need to be accessed outside of hls_coding_unit().
 2014-11-17 09:25:12 +01:00
Anton Khirnov 920bca3e23 hevc: do not store pcm_flag in the context 
It does not need to be accessed outside of hls_coding_unit().
 2014-11-17 09:25:12 +01:00
Anton Khirnov 84b9463984 hevc: remove a redundant line 
pred_mode is overwritten a few lines immediately below.
 2014-11-17 09:25:12 +01:00
Michael Niedermayer 76fa78911f Merge commit 'b1b1a7370e141c912e3d0bbaa668dcee05c3ad67' 
* commit 'b1b1a7370e141c912e3d0bbaa668dcee05c3ad67':
  display: fix order of operands

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-13 12:53:31 +01:00
Vittorio Giovara b1b1a7370e display: fix order of operands 
CC: libav-stable@libav.org
Bug-Id: CID 1238828 / CID 1238832
 2014-11-13 01:41:25 +01:00
Changjiang Wei 6f2068e626 avcodec/hevc.c: for big negative mvy value, should wait line 0 of ref frame due to edge extending 
Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-11 11:45:20 +01:00
Michael Niedermayer 17085a0251 Merge commit '7ea1b3472a61de4aa4d41b571e99418e4997ad41' 
* commit '7ea1b3472a61de4aa4d41b571e99418e4997ad41':
  lavc: deprecate the use of AVCodecContext.time_base for decoding

Conflicts:
	libavcodec/avcodec.h
	libavcodec/h264.c
	libavcodec/mpegvideo_parser.c
	libavcodec/utils.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-15 15:49:31 +02:00
Anton Khirnov 7ea1b3472a lavc: deprecate the use of AVCodecContext.time_base for decoding 
When decoding, this field holds the inverse of the framerate that can be
written in the headers for some codecs. Using a field called 'time_base'
for this is very misleading, as there are no timestamps associated with
it. Furthermore, this field is used for a very different purpose during
encoding.

Add a new field, called 'framerate', to replace the use of time_base for
decoding.
 2014-10-15 06:37:43 +00:00
Michael Niedermayer df8394c693 avcodec/hevc: fix chroma transform_add size 
Fixes accessing misaligned address
Fixes: signal_sigsegv_1feb99c_10_signal_sigsegv_2d1d35c_79_cov_691940146_EXT_A_ericsson_3.bit

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-04 17:51:52 +02:00
Christophe Gisquet 9a3653c9ec hevc: reuse edge emu buffer for coefficients 
Kind of hackish but...

Reviewed-by: Mickael Raulet <Mickael.Raulet@insa-rennes.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-01 12:12:28 +02:00
Christophe Gisquet f183febcda hevc: remove CodingTree 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-27 11:50:41 +02:00
Christophe Gisquet 3fe962940f hevc: move intermediate bidir buffer 
Other buffers are already there.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-24 01:26:12 +02:00
Mickaël Raulet 684d0a0b23 avcodec/hevc: fix dead code 
fix CID 1231985

cherry picked from commit 745a35a777eaa5f77b8660b44098110a29916aae
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-06 20:36:27 +02:00
Christophe Gisquet dad7f15567 hevcdsp: remove more instances of compile-time-fixed parameters 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-22 15:22:42 +02:00
Christophe Gisquet d4f44b66d3 hevcdsp: remove compilation-time-fixed parameter 
The dststride parameter is always MAX_PB_SIZE.

Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-22 14:57:37 +02:00
Michael Niedermayer 2278146a0c Merge commit 'd1b1c3bb5ef1bee409c06c3bcacfb8674e1cb574' 
* commit 'd1b1c3bb5ef1bee409c06c3bcacfb8674e1cb574':
  hevc: reorder loops

Conflicts:
	libavcodec/hevc.c

See: eca1957c4c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-12 15:59:33 +02:00
Christophe Gisquet cf6090dc62 hevc: use intreadwrite 
When dealing with MVs, both components may be processed at a time.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-08-12 10:03:20 +00:00
Christophe Gisquet d1b1c3bb5e hevc: reorder loops 
iterate over memory in a more continuous order

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-08-12 09:57:05 +00:00
Christophe Gisquet 5ec85c9750 hevc: do generic validation of bitstream 
After finishing parsing VPS/SPS/PPS/slice header, check remaining bits,
and if an overconsumption occurred, report invalid data.

Liked-by: BBB
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-11 02:47:05 +02:00
Ronald S. Bultje bfffce4d08 hevc: add missing comma in log message. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-11 02:27:27 +02:00
Christophe Gisquet 7117547298 hevc: fix incorrect sao buffer size 
It previously used the output, cropped size, causing overreads/writes.

Fixes ticket #3839.

This issue was introduced by d249e682, which is not part of any release

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 12:34:57 +02:00
Michael Niedermayer 3f2495d98c Merge commit '70211539a39ca3854f8a9e97d51dc27caa079943' 
* commit '70211539a39ca3854f8a9e97d51dc27caa079943':
  hevc: deobfuscate slice/tile boundary handling for DBF

Conflicts:
	libavcodec/hevc.c
	libavcodec/hevc_filter.c

See: a5c621aa85
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-09 21:01:55 +02:00
Anton Khirnov 70211539a3 hevc: deobfuscate slice/tile boundary handling for DBF 
Use named constants instead of magic numbers, avoid using variables with
inverse meaning from what their name implies.
 2014-08-09 16:13:48 +00:00
Anton Khirnov 4d1ff2a489 hevc: calculate the dbf strength in hls_pcm_sample() only if dbf is enabled 2014-08-09 16:13:11 +00:00
Michael Niedermayer 3fa9692ae2 avcodec/hevc: move HEVCLocalContext declaration into loop 
Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-02 05:15:57 +02:00
Michael Niedermayer 243236a6f5 avcodec/hevc: fix "discards const qualifier from pointer target type" warning 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-28 14:34:47 +02:00
Michael Niedermayer 772dfd5f6e avcodec/hevc: add some const to cbf arrays 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-28 14:28:56 +02:00
Mickaël Raulet 42ffa226f9 hevc: clean up non relevant TODO 
cherry picked from commit a2ef95f043d89d05482af19460c9e9afdadec685

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-28 14:27:04 +02:00
Anton Khirnov a5c621aa85 hevc: rename variable in boundary strength to b more explicit 
Signed-off-by: Mickaël Raulet <mraulet@insa-rennes.fr>

cherry picked from commit 348bebedc0012aae201419669fca1eb61ec93ca6
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-28 14:20:19 +02:00