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

35675 Commits

Author SHA1 Message Date
Derek Buitenhuis
7966ddfc0b Merge commit 'a7829a2a3f8e6ec0b9f2673c11f56916800aeb33' 
* commit 'a7829a2a3f8e6ec0b9f2673c11f56916800aeb33':
  h264: reimplement 3aa661ec5 in a more explicit way

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-03 13:42:38 +01:00
Derek Buitenhuis
a454ad670c Merge commit 'add1467e5e447b79e8743a0b05c54dcf58c61dfe' 
* commit 'add1467e5e447b79e8743a0b05c54dcf58c61dfe':
  svq3: drop the build dependency on the h264 decoder

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-03 10:57:36 +01:00
Derek Buitenhuis
43b7e5aa32 Merge commit 'a4d126dc59c39bb03e5e444432d1b27af26a45b4' 
* commit 'a4d126dc59c39bb03e5e444432d1b27af26a45b4':
  svq3: eliminate remaining H264Context usage.

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-03 10:52:14 +01:00
Derek Buitenhuis
2a018be10f Merge commit '7bbdae81e895a49125dba58bad01b98389966c39' 
* commit '7bbdae81e895a49125dba58bad01b98389966c39':
  svq3: move block_offset to SVQ3Context

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-03 10:27:55 +01:00
Derek Buitenhuis
f32a23c849 Merge commit '1848a154a49d18c1f31f54ee75c7445dc49a7ecc' 
* commit '1848a154a49d18c1f31f54ee75c7445dc49a7ecc':
  svq3: stop using H264Context.gb

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-03 10:27:24 +01:00
Derek Buitenhuis
8bba752ae9 Merge commit 'ea6ab02a174bcc11f3eaa1b840c9a4c895968690' 
* commit 'ea6ab02a174bcc11f3eaa1b840c9a4c895968690':
  svq3: move the frame num variables to the SVQ3Context

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-03 10:24:33 +01:00
Derek Buitenhuis
014fb816d1 Merge commit '21b746932241246be846a133abb3c5f91b1cab85' 
* commit '21b746932241246be846a133abb3c5f91b1cab85':
  svq3: eliminate H264Context.cur_pic usage

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-03 10:24:08 +01:00
Derek Buitenhuis
2d3cc682c4 Merge commit '939b388383db8d0db5b2ff483e3a197c27b79791' 
* commit '939b388383db8d0db5b2ff483e3a197c27b79791':
  svq3: eliminate remaining H264SliceContext usage

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-03 10:23:23 +01:00
Derek Buitenhuis
5db920bcb6 Merge commit '5a5db90edf71ef4c60db8ad7b0ebaa9a810c2d9e' 
* commit '5a5db90edf71ef4c60db8ad7b0ebaa9a810c2d9e':
  svq3: move pict_type to the SVQ3Context

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-03 10:17:34 +01:00
Derek Buitenhuis
1bfbdb8f0b Merge commit '12f13ecb2dcddfa3ee930167395370d3c6fff90c' 
* commit '12f13ecb2dcddfa3ee930167395370d3c6fff90c':
  svq3: move mb strides/sizes to the SVQ3Context

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-03 10:15:54 +01:00
Derek Buitenhuis
297e2768da Merge commit 'ad9d3384de08f02967d6eb11196ee8c78e8b2dba' 
* commit 'ad9d3384de08f02967d6eb11196ee8c78e8b2dba':
  svq3: move the dequant buffer to SVQ3Context

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-03 10:15:22 +01:00
Christophe Gisquet
7d453aaf65 wmalossless: allow calling madd_int16 
This is done by actually handling the "prev_values" in the cascaded LMS data
as if it were int16_t, thus requiring switching at various locations the
computations.
 2016-05-03 09:18:54 +02:00
Michael Niedermayer
df820af2c5 avcodec/error_resilience: Improve missing slice handling for mpeg2 
Fixes: m702_2.avi

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-05-03 01:07:24 +02:00
foo86
ce2f9fdb0a avcodec/dca: fix sync word search error condition 
This didn't actually check if sync word was found and always errored out
with "-err_detect explode" option enabled.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-05-02 23:26:44 +02:00
Michael Niedermayer
9fcb59c9bc avcodec/options_table: fix strict compliance constant flags to match the strict field 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-05-02 22:16:57 +02:00
Michael Niedermayer
deaf58abf2 avcodec/mjpegdec: Do not try to detect last scan but apply idct after all scans for progressive jpeg 
Fixes: IMG-20160418-WA0002.jpg

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-05-02 12:45:14 +02:00
Jan Sebechlebsky
0ff3489534 avcodec/mjpeg2jpeg_bsf: Check ff_bsf_get_packet success 
This fixes ticket #5487 - mjpeg2jpeg bitstream filter causes
segmentation fault with header-less mjpeg.

Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-05-02 04:10:03 +02:00
foo86
1fee770a1c avcodec/dca: move channel counter utility into dca.h 
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-05-01 16:50:32 -03:00
foo86
2df7d4fa45 avcodec/dca: move huffman data into separate object file 
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-05-01 16:50:29 -03:00
Paul B Mahol
bc2fe36228 avcodec/noise_bsf: set correct size of .priv_data_size field 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-05-01 22:23:48 +02:00
Michael Niedermayer
3187277ebb avcodec/wmalosslessdec: Fix memset sizeof 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-05-01 18:44:06 +02:00
Michael Niedermayer
52623ef785 avcodec/smc: Mark pixel pointer as const 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-05-01 17:47:55 +02:00
Carl Eugen Hoyos
00ffbdfb68 lavc/fic: Do not warn about empty cursor. 
Fixes ticket #5174.
 2016-05-01 15:30:22 +02:00
Carl Eugen Hoyos
47a11ff457 lavc/fic: Be less verbose for invisible cursor outside of video. 2016-05-01 15:28:59 +02:00
Clément Bœsch
9f3dd53050 lavc/srtenc: do not emit any subrip tags with text codec 
Fixes presence of opening tags when running
  ffmpeg -i x.ass -c text x.srt

Reported-by: Jean First <jeanfirst@gmail.com>
 2016-05-01 15:16:50 +02:00
Clément Bœsch
bbf02f7d28 lavc: override decode return value only in case of error 
Fixes Ticket #5350

Regression since 29412821241050c846dbceaad4b9752857659977.
 2016-05-01 14:53:53 +02:00
Christophe Gisquet
532e937083 avcodec/wmalosslessdec: silence a sample request 
16bits samples with CDLMS orders of 8 are currently unsupported, but have never
been encountered before.

However, 8 seems to be the most frequent, if not the only order used for 24bits.
In that case, the dsp functions are fine with handling order that are multiples
of 8, so silence the warning.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-05-01 11:18:09 +02:00
Paul B Mahol
8f4358888f avcodec/wmalosslessdec: fix type for coeffs and lms_updates in cdlms struct 
They should really be int16_t.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-05-01 10:49:12 +02:00
foo86
b286ff69c0 avcodec/dcaenc: move channel reordering tables to dcaenc.h 
DCA core decoder no longer uses fixed tables for channel reordering.
Move them into private encoder header (and drop ff_dca_ prefix).

Signed-off-by: James Almer <jamrial@gmail.com>
 2016-05-01 00:13:41 -03:00
foo86
de28e73cce avcodec/dcaenc: reuse shared quant levels table 
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-05-01 00:13:37 -03:00
Michael Niedermayer
cb84c12fa2 avcodec/mpeg12dec: Print position in end mismatch error 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-05-01 01:43:06 +02:00
Michael Niedermayer
390703fcf5 avcodec/mpeg12dec: Do not choke on extra m704 alpha data 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-05-01 01:43:06 +02:00
Paul B Mahol
a67816bcce avcodec/wmalosslessdec: fix decoding of raw pcm tiles 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-04-30 19:56:53 +02:00
wm4
66dd21d50b avcodec/utils: split side-data in new decode API too 
The deprecated avcodec_decode_video2() and avcodec_decode_audio4()
functions called av_packet_split_side_data() on the input packets. This
is required for packets produced by libavformat with the
AVFMT_FLAG_KEEP_SIDE_DATA flag unset (which is unfortunately the
default).

The new API didn't do this yet, although it didn't matter as no decoder
supports the new API yet. The emulation layer for the old API calls the
old API functions, which took care of the splitting. Add this code to
the new API codec entrypoints too, because we shouldn't send essentially
corrupted data to decoders.
 2016-04-29 10:35:00 +02:00
Kieran Kunhya
e9a9ca1936 avcodec/cfhd: Don't decode coefficients if no end of header tag found. Fixes fuzzed files such as the one in in ticket #5383 2016-04-28 21:33:08 +01:00
Timo Rothenpieler
c4312b1cf4 avcodec/nvenc: Add missing lossless presets to doc string 2016-04-27 22:22:29 +02:00
Derek Buitenhuis
6f784c158b Merge commit '549fc77273636d0d02175362af5dcd60c79f7633' 
* commit '549fc77273636d0d02175362af5dcd60c79f7633':
  svq3: move mb2br_xy to the SVQ3Context

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-27 16:52:02 +01:00
Derek Buitenhuis
f09fd96cee Merge commit '99dde60391cade40ae026b9e385a5280be6b9882' 
* commit '99dde60391cade40ae026b9e385a5280be6b9882':
  svq3: move {ref,mv}_cache to the SVQ3Context

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-27 16:49:19 +01:00
Derek Buitenhuis
c0b51aa2d2 Merge commit '89a13998a1b5074411dff5a461dce3837057b0b8' 
* commit '89a13998a1b5074411dff5a461dce3837057b0b8':
  svq3: rip out the svq3-relevant parts of pred_motion() out of h264

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-27 16:48:30 +01:00
Derek Buitenhuis
fed686af23 Merge commit '8eecae77ff6e2923de57dd883421d24fd53ca61f' 
* commit '8eecae77ff6e2923de57dd883421d24fd53ca61f':
  svq3: move edge_emu_buffer to the SVQ3Context

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-27 16:47:52 +01:00
Derek Buitenhuis
463de5625b Merge commit '527bf5f7c6890664b0f1dccd42397f4d204659fe' 
* commit '527bf5f7c6890664b0f1dccd42397f4d204659fe':
  svq3: move the pred mode variables to SVQ3Context

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-27 16:46:54 +01:00
Derek Buitenhuis
a2922b5d61 Merge commit 'ecc31f6b086453ab9811dce2ae5ceb6a7c19e4ad' 
* commit 'ecc31f6b086453ab9811dce2ae5ceb6a7c19e4ad':
  h264: move ff_h264_check_intra[4x4]_pred_mode() to h264_parse

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-27 16:34:40 +01:00
Derek Buitenhuis
c18535399d Merge commit '1877712c586df2261f2806f45388c77592b89d1e' 
* commit '1877712c586df2261f2806f45388c77592b89d1e':
  svq3: move mb_{x,y,xy} to SVQ3Context

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-27 16:07:47 +01:00
Derek Buitenhuis
7dca134285 Merge commit 'c2a4ca944d9029a3c162f8f3ddd317b83a7bd600' 
* commit 'c2a4ca944d9029a3c162f8f3ddd317b83a7bd600':
  svq3: eliminate write_back_intra_pred_mode() usage

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-27 16:07:19 +01:00
Derek Buitenhuis
47bb289170 Merge commit 'c73fb9efb22c8d66d24de2716f7f9970f234c3c3' 
* commit 'c73fb9efb22c8d66d24de2716f7f9970f234c3c3':
  svq3: add all the required dsp contexts into SVQ3Context

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-27 16:06:42 +01:00
Derek Buitenhuis
656b071a8f Merge commit '15b0517da986b312fc2fcb364a92db328380b15b' 
* commit '15b0517da986b312fc2fcb364a92db328380b15b':
  svq3: make the dsp functions static

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-27 16:06:12 +01:00
Derek Buitenhuis
d6f01c61ed Merge commit '9b30f8dd8fa5bef5f16904cb98745b4a58f8f776' 
* commit '9b30f8dd8fa5bef5f16904cb98745b4a58f8f776':
  h264: remove the svq3-specific code

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-27 15:48:00 +01:00
Ivan Uskov
b577a54a7c qsv: Fix wrong ticks_per_frame for H.264 
For H.264 stream ticks_per_frame should be 2, as per the docs.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-27 15:33:53 +01:00
Umair Khan
a2ba50b03a avcodec/alsdec: Fix bitstream reading 
Signed-off-by: Umair Khan <omerjerk@gmail.com>
Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-27 13:15:12 +02:00
Paul B Mahol
1f62a6e780 avcodec/shorten: make max frame size bigger if custom block size was used 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-04-27 09:08:45 +02:00