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

70468 Commits

Author SHA1 Message Date
Martin Storsjö c82bf15dca rtpenc: Merge the h264 and hevc packetizers 
They share a great deal of common structure; only a few minor
bits in the headers differ.

This also fixes an off-by-one in sending of the last fragment
of large HEVC nals (where it previously sent len+2 bytes, even
if it should have been len+RTP_HEVC_HEADERS_SIZE aka len+3).

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-02-24 16:25:43 +02:00
Martin Storsjö 3567b91e49 rtpdec_hevc: Share the implementation of fragmented packets with h264 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-02-24 16:25:28 +02:00
Martin Storsjö f3449062a8 rtpdec_hevc: Reduce indentation level by returning early on errors 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-02-24 16:25:21 +02:00
Martin Storsjö 8633fb47db rtpdec_hevc: Share the implementation of parsing a=framesize with h264 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-02-24 16:24:36 +02:00
Martin Storsjö 5956f489d0 rtpdec_hevc: Add asterisks at the start of each long comment line 
This is the common style for such comments.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-02-24 16:24:27 +02:00
Martin Storsjö 5d8cae4573 rtpdec: Get rid of all trivial .alloc/.free functions 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-02-24 16:24:19 +02:00
Martin Storsjö e72605f80b rtpdec: Allow allocating and freeing the private data without explicit functions 
This can reduce the amount of boilerplate in simple depacketizers.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-02-24 16:23:37 +02:00
Martin Storsjö 2b982e92f4 rtpdec: Set need_parsing via a handler field 
This avoids implementing a full function just to set this one
field.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-02-24 16:22:41 +02:00
Martin Storsjö b7a4c319fd rtpdec: Allow setting the need_parsing field in RTPDynamicProtocolHandler 
This allows getting rid of quite a bit of boilerplate in depacketizers.

The default value (initializing need_parsing to 0, aka
AVSTREAM_PARSE_NONE) is the same as it is initialized to by default
in AVStream.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-02-24 16:22:21 +02:00
Martin Storsjö b651c9139e rtpdec_mpa_robust: Move .enc_name to the start of the struct 
This makes it match the other depacketizers.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-02-24 16:22:04 +02:00
Martin Storsjö db158f0dd2 rtpdec: Remove unnecessary _if_needed suffixes on functions 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-02-24 16:21:54 +02:00
Martin Storsjö 353b492d0f rtpdec: Change enc_name to a pointer instead of a fixed-size buffer 
This avoids allocating space for a too large buffer for all the
name strings.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-02-24 16:21:18 +02:00
Martin Storsjö 0752f700d6 rtpdec_h264: Remove an unnecessary include 
Nothing in this file use any network functions.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-02-24 16:20:54 +02:00
Martin Storsjö 247764a592 rtpdec_h264: Remove unnecessary struct padding 
There's no point in adding padding in the allocation of a depacketizer
specific context struct.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-02-24 16:20:44 +02:00
Martin Storsjö fe414059ec rtpdec_amr: Use the common indentation style 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-02-24 16:20:23 +02:00
Martin Storsjö 74d318f138 rtsp: Fix the indentation of a linewrapped statement 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-02-24 16:20:10 +02:00
Martin Storsjö 3cd5828fc0 rtpdec: Add missing trailing commas 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-02-24 16:20:02 +02:00
Gilles Chanteperdrix 04a1be8e28 libavformat: add T.140 RTP depacketization (RFC 4103) 
Map this to AV_CODEC_ID_TEXT.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-02-24 16:19:44 +02:00
Martin Storsjö 26524e3581 rtsp: Interpret the text media type as AVMEDIA_TYPE_DATA 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-02-24 16:19:37 +02:00
Paul B Mahol 418be7ceb4 avcodec/mss4: check return value of init_get_bits8() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-02-24 13:17:34 +00:00
Christophe Gisquet e87e20613b lavc/pthread_slice: release entries 
When calling ff_alloc_entries, a number of entries are created.
They are never freed, as running fate with slice threading and
several frames on e.g. fate-hevc-conformance-ENTP_A_Qualcomm_1
would show.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-24 12:07:20 +01:00
Clément Bœsch cc69ccb6d4 avformat/nutdec: fix isom and mpa build deps 
Fixes the following link error:
  nutdec.c:(.text+0x2d47): undefined reference to `ff_codec_movvideo_tags'
  isom.c:(.text+0x332): undefined reference to `avpriv_mpeg4audio_get_config'
  isom.c:(.text+0x39e): undefined reference to `avpriv_mpa_freq_tab'
 2015-02-24 11:22:47 +01:00
Michael Niedermayer 721c916dd5 avcodec/snow: Free all planes and bands independent of the last count 
Fixes memleak
Fixes: signal_sigsegv_24169e6_3445_cov_3778346427_snow_chroma_bug.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-24 03:22:20 +01:00
Michael Niedermayer 8f4cbf9402 avcodec/snowdec: Fix ref value check 
Fixes integer overflow and out of array read.
Fixes: signal_sigsegv_24169e6_3445_cov_3778346427_snow_chroma_bug.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-24 03:15:42 +01:00
Michael Niedermayer fb8e5044b4 swscale/utils: add asserts to check filterpos 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-24 01:00:24 +01:00
Michael Niedermayer 1895d414aa swscale/utils: More carefully merge and clear coefficients outside the input 
Fixes out of array read
Fixes: asan_heap-oob_35ca682_1474_cov_3230122439_aletrek_tga_16bit.mov

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-24 01:00:24 +01:00
Michael Niedermayer 4d1b017c38 avformat/mov: Check av_add_index_entry() return value 
Fixes NULL pointer dereference
Fixes: signal_sigsegv_b060e0_3794_cov_1293954059_vc1-wmapro.ism

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-23 22:48:35 +01:00
James Almer 03616af2c9 Revert "takdec: pad filter coeff buffer for DSP functions" 
This reverts commit e0c7ba40cf.

Valgrind complains about invalid reads, which generate segfaults in some
systems.
 2015-02-23 18:22:37 -03:00
Michael Niedermayer 8f140a8ec3 Merge commit 'ce52869c22738ad584995d48103ce3aa2301736b' 
* commit 'ce52869c22738ad584995d48103ce3aa2301736b':
  fate: Rename fate-dts test to fate-dca-core

Conflicts:
	tests/fate/audio.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-23 21:59:34 +01:00
Michael Niedermayer 9ad8f55eda Merge commit 'cb4cb7b0ea12b791dde587b1acd504dbb4ec8f41' 
* commit 'cb4cb7b0ea12b791dde587b1acd504dbb4ec8f41':
  qsv: Skip qsv.h compilation if qsv is not enabled

Conflicts:
	libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-23 21:49:51 +01:00
Michael Niedermayer 83f18410bd Merge commit 'cdcc370293a159c321e41af7f0eef141c62d698d' 
* commit 'cdcc370293a159c321e41af7f0eef141c62d698d':
  rtsp: punch holes again after pause

See: 22bb5bd7a3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-23 21:43:18 +01:00
Michael Niedermayer cce8f750d9 Merge commit '061c489895d29049a88dc6118e4b639a273b31d6' 
* commit '061c489895d29049a88dc6118e4b639a273b31d6':
  eamad: check for out of bounds read

Conflicts:
	libavcodec/eamad.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-23 21:29:35 +01:00
Michael Niedermayer 92ec34707f Merge commit '161442ff2c4b0dd8a5072c6bbe6bf55303fffccf' 
* commit '161442ff2c4b0dd8a5072c6bbe6bf55303fffccf':
  mdec: check for out of bounds read

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-23 21:19:00 +01:00
Michael Niedermayer 596f81c75b Merge commit 'fe208ca54b0d3b6bbe1c660d371bb2cc6cf40ffc' 
* commit 'fe208ca54b0d3b6bbe1c660d371bb2cc6cf40ffc':
  rtpdec_hevc: Skip 1 byte (DOND) instead of 2 (DONL) between aggregation units

Conflicts:
	libavformat/rtpdec_hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-23 21:01:44 +01:00
Michael Niedermayer 34a8de866f avcodec/snowenc: Allocate and reference coded_frame correctly 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-23 19:47:04 +01:00
Michael Niedermayer 96e7c9cbfc avcodec/roqvideoenc: Allocate and reference coded_frame correctly 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-23 19:45:23 +01:00
Michael Niedermayer 6c9537b807 avformat/hlsenc: Warn if a non file protocol is used 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-23 16:53:36 +01:00
Diego Biurrun ce52869c22 fate: Rename fate-dts test to fate-dca-core 
The codec is referred to as DCA in other parts of libav.
 2015-02-23 16:26:32 +01:00
Diego Biurrun cb4cb7b0ea qsv: Skip qsv.h compilation if qsv is not enabled 2015-02-23 16:26:32 +01:00
Paul B Mahol 665916ffa2 avcodec/hqx: remove superfluous log message 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-02-23 15:04:15 +00:00
Gilles Chanteperdrix cdcc370293 rtsp: punch holes again after pause 
When a client behind a NAT issues a pause command, and stay paused for a
long time, the router may stop the RTP/RTCP port redirection. Resend the
hole punching packets before each PLAY command to cause the router to
restart the port redirection in that case.

Move the existing code for sending the packets from the SETUP phase
to the PLAY phase.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-02-23 16:55:56 +02:00
Federico Tomassetti 061c489895 eamad: check for out of bounds read 
Bug-Id: CID 1257500
CC: libav-stable@libav.org

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-02-23 15:06:18 +01:00
Federico Tomassetti 161442ff2c mdec: check for out of bounds read 
Bug-Id: CID 1257501
CC: libav-stable@libav.org

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-02-23 15:06:18 +01:00
Martin Storsjö fe208ca54b rtpdec_hevc: Skip 1 byte (DOND) instead of 2 (DONL) between aggregation units 
Only the first aggregation unit has 2 bytes (DONL) prepended, if
such a field is in use.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-02-23 15:33:20 +02:00
Clément Bœsch c3d40e305c avfilter/palette{gen,use}: add Copyright 2015-02-23 14:00:13 +01:00
Michael Niedermayer 2cf521718d Merge commit '35c6ce76b107225a19eb33aea38857d2405882af' 
* commit '35c6ce76b107225a19eb33aea38857d2405882af':
  Canopus HQX decoder

Conflicts:
	Changelog
	libavcodec/avcodec.h
	libavcodec/version.h
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-23 12:19:26 +01:00
Michael Niedermayer c0f02b2201 Merge commit '36a6fb989b017898041703025ef20028146675a8' 
* commit '36a6fb989b017898041703025ef20028146675a8':
  hevc_deblock: Fix compilation with nasm

See: c75fdee747
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-23 11:53:51 +01:00
Michael Niedermayer 96b495f443 Merge commit 'e570f895cdccf2535a71fec1c607751ddb94fd5a' 
* commit 'e570f895cdccf2535a71fec1c607751ddb94fd5a':
  libschroedinger: Check memory allocations

Conflicts:
	libavcodec/libschroedinger.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-23 11:42:16 +01:00
Michael Niedermayer 0425e16d96 Merge commit '521979e6b1e7a89751aebc285a40d6508f8af48f' 
* commit '521979e6b1e7a89751aebc285a40d6508f8af48f':
  configure: Properly fail when libcdio/cdparanoia is not found

Conflicts:
	configure

See: f514b5dff7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-23 11:26:49 +01:00
Michael Niedermayer 69c32456a0 Merge commit 'f7cc6627c01ad3f5bc6ea2d0e6f8adb3a0b490d7' 
* commit 'f7cc6627c01ad3f5bc6ea2d0e6f8adb3a0b490d7':
  configure: Use pkg-config for libdc1394 discovery

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-23 11:10:56 +01:00