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

26491 Commits

Author SHA1 Message Date
Michael Niedermayer
afc660ab9b Merge commit '5d6a990c115850326711c2f5be4d9fd33f399616' 
* commit '5d6a990c115850326711c2f5be4d9fd33f399616':
  mpegaudioenc: Remove broken integer-only quantization code path

Conflicts:
	libavcodec/mpegaudioenc.c

Mostly not merged, the integer code works fine.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-11 21:46:35 +01:00
Marton Balint
c0479f0f06 libzvbi-teletextdec: propagate errors generated in page handler 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-11-10 20:00:01 +01:00
Marton Balint
4947b0624b libzvbi-teletextdec: dont ignore memory allocation error silently 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-11-10 20:00:01 +01:00
Marton Balint
3c4b5275b6 libzvbi-teletextdec: output ass subtitles instead of plain text 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-11-10 19:59:59 +01:00
Marton Balint
b96325e023 ass: move text_event_to_ass from textdec.c to ass.c and export it 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-11-10 18:57:52 +01:00
Marton Balint
0f0a8d9859 ass: fix error handling in ff_ass_add_subrect 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-11-10 18:57:51 +01:00
Marton Balint
f148954b0a ass: factor out ff_ass_bprint_dialog 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-11-10 18:57:51 +01:00
Marton Balint
65fb59abd2 libzvbi-teletextdec: use AVBPrint for whitespace cleanup 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-11-10 18:57:51 +01:00
Marton Balint
b689b1f6ee libzvbi-teletextdec: use option constants instead of strings 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-11-10 18:57:51 +01:00
Marton Balint
688652e0d6 libzvbi-teletextdec: fix indentation after last commit 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-11-10 18:57:51 +01:00
Marton Balint
a494757b34 libzvbi-teletextdec: support multiple teletext pages in a single packet 
After this patch, if a packet contains multiple teletext pages, the teletext
decoder can return the fist page and store the remaining pages in memory, and
return them to the user on the next calls to avcodec_decode_subtitle2.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-11-10 18:57:51 +01:00
Michael Niedermayer
78e150c5e9 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  hwaccel: Simplify ff_find_hwaccel

Conflicts:
	libavcodec/mpeg12dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-10 17:37:51 +01:00
Diego Biurrun
45ef963908 mpegaudioenc: Move some static tables to MpegAudioContext 
This reduces global state and the amount of globally visible tables.
 2013-11-10 16:07:22 +01:00
Diego Biurrun
5d6a990c11 mpegaudioenc: Remove broken integer-only quantization code path 2013-11-10 16:07:22 +01:00
Luca Barbato
08303d7741 hwaccel: Simplify ff_find_hwaccel 
It is always called by passing fields from an AVCodecContext.
 2013-11-10 13:59:48 +01:00
Michael Niedermayer
1836a42c29 avcodec/vp8: remove unused webp_decode_frame() 
See: libavcodec/webp.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-10 12:27:21 +01:00
Ronald S. Bultje
dd3d0f46bd vp9: fix mvref finding to adhere to bug in libvpx. 
Fixes a particular youtube video that I unfortunately can't share.
 2013-11-09 21:31:06 +01:00
Michael Niedermayer
ac4447b6ec Merge commit '5462dde1947e0ecfcb2db99ae29ce9dee8933b45' 
* commit '5462dde1947e0ecfcb2db99ae29ce9dee8933b45':
  metasound: Fix error message argument

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-08 23:37:14 +01:00
Paul B Mahol
b8f276e645 avcodec/mimic: use av_freep() and reset swap_buf_size 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-08 19:24:17 +00:00
Paul B Mahol
2145e8f193 avcodec/vmdav: use av_freep() and reset unpack_buffer_size 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-08 19:24:17 +00:00
Michael Niedermayer
e93523a06f Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  h263dsp: K&R formatting cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-08 18:02:50 +01:00
Michael Niedermayer
a30f7918b5 Merge commit '0338c396987c82b41d322630ea9712fe5f9561d6' 
* commit '0338c396987c82b41d322630ea9712fe5f9561d6':
  dsputil: Split off H.263 bits into their own H263DSPContext

Conflicts:
	configure
	libavcodec/mpegvideo.h
	libavcodec/mpegvideo_enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-08 17:42:56 +01:00
Kostya Shishkov
5462dde194 metasound: Fix error message argument 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-11-08 16:50:17 +01:00
Diego Biurrun
cb56c3961b h263dsp: K&R formatting cosmetics 
Also remove array element numbering comments.
 2013-11-08 12:41:24 +01:00
Diego Biurrun
0338c39698 dsputil: Split off H.263 bits into their own H263DSPContext 2013-11-08 12:40:47 +01:00
Michael Niedermayer
b7fea3daab libavcodec/dvdsubdec: remove exit() call in debug code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-08 00:42:50 +01:00
Michael Niedermayer
48f37664a8 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Remove #undefs for formerly forbidden system functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-07 23:39:31 +01:00
Paul B Mahol
9521236881 avcodec/libfdk-aacdec: remove redundant log messages 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-07 14:55:35 +00:00
Paul B Mahol
315e3cf047 avcodec/hnm4video: remove redundant log message 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-07 14:04:21 +00:00
Diego Biurrun
86f910806b Remove #undefs for formerly forbidden system functions 
The macros forbidding the system functions no longer exist, obviating
the need for the #undefs.
 2013-11-07 00:26:15 +01:00
Clément Bœsch
87434cf373 avcodec/vp9: add ff_vp9_idct_idct_{4x4,8x8}_ssse3(). 
1789 decicycles in idct_idct_4x4_add_c, 262136 runs, 8 skips
1839 decicycles in idct_idct_4x4_add_c, 524270 runs, 18 skips
1864 decicycles in idct_idct_4x4_add_c, 1048548 runs, 28 skips

529 decicycles in ff_vp9_idct_idct_4x4_add_ssse3, 262138 runs, 6 skips
516 decicycles in ff_vp9_idct_idct_4x4_add_ssse3, 524282 runs, 6 skips
474 decicycles in ff_vp9_idct_idct_4x4_add_ssse3, 1048565 runs, 11 skips

(~3.9x faster)

7726 decicycles in idct_idct_8x8_add_c, 1048433 runs, 143 skips
7732 decicycles in idct_idct_8x8_add_c, 2096882 runs, 270 skips
7731 decicycles in idct_idct_8x8_add_c, 4193772 runs, 532 skips

1145 decicycles in ff_vp9_idct_idct_8x8_add_ssse3, 1048549 runs, 27 skips
1137 decicycles in ff_vp9_idct_idct_8x8_add_ssse3, 2097097 runs, 55 skips
1086 decicycles in ff_vp9_idct_idct_8x8_add_ssse3, 4194188 runs, 116 skips

(~7.1x faster)

Overall decode time before commit:
  16.48s user 0.03s system 99% cpu 16.526 total
  16.54s user 0.01s system 99% cpu 16.566 total
  16.46s user 0.03s system 99% cpu 16.511 total

Overall decode time after commit:
  16.34s user 0.02s system 99% cpu 16.378 total
  16.28s user 0.02s system 99% cpu 16.315 total
  16.32s user 0.03s system 99% cpu 16.366 total

Tested on i7 920 with 40s 1080p footage.
 2013-11-05 19:25:40 +01:00
Paul B Mahol
e3f384b428 avcodec/mss2: use init_get_bits8() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-05 13:19:30 +00:00
Paul B Mahol
82f5c4d737 avcodec/flashsv: use av_freep() for tmpblock 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-05 13:19:30 +00:00
Paul B Mahol
b79f543c58 avcodec/mss1: use init_get_bits8() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-05 13:19:30 +00:00
Paul B Mahol
c3311515d5 avcodec/flashsv: fix typo 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-05 12:44:52 +00:00
Paul B Mahol
ad1dfe04a1 avcodec/tscc2: use init_get_bits8() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-05 12:44:20 +00:00
Paul B Mahol
290be34a74 avcodec/brender_pix: stop calling av_image_check_size() twice 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-05 12:37:52 +00:00
Paul B Mahol
6e094f7026 avcodec/flashsv: stop using deprecated avcodec_set_dimensions 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-05 12:36:24 +00:00
Paul B Mahol
22c00962c2 avcodec/flashsv: use init_get_bits8() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-05 12:31:18 +00:00
Paul B Mahol
1a244c22ea avcodec/brender_pix: stop using deprecated avcodec_set_dimensions 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-05 12:26:58 +00:00
Paul B Mahol
7722ae35eb avcodec/c93: stop using deprecated avcodec_set_dimensions 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-05 12:24:39 +00:00
Michael Niedermayer
e1459f4b0b Merge commit '70cbf33405f50dfaf77e85f382a188acf17dc71a' 
* commit '70cbf33405f50dfaf77e85f382a188acf17dc71a':
  vdpau: Add missing #includes to fix standalone header compilation

Conflicts:
	libavcodec/vdpau_internal.h

Not completely merged as this would break use of vdpau.h from C++

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-05 11:14:29 +01:00
Michael Niedermayer
934e489ee8 Merge commit 'e2b5b097898c9155f4bdff4d83cdc54d5eef6930' 
* commit 'e2b5b097898c9155f4bdff4d83cdc54d5eef6930':
  x86: rv40dsp: Use PAVGB instruction macro where appropriate

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-05 10:26:07 +01:00
Diego Biurrun
70cbf33405 vdpau: Add missing #includes to fix standalone header compilation 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-11-04 22:54:55 +01:00
Michael Niedermayer
2865c1b905 Merge commit '3ef9b7ab95cc703b67a8b658dca45c80df0aaa66' 
* commit '3ef9b7ab95cc703b67a8b658dca45c80df0aaa66':
  hevc_ps: Use AV_PIX_FMT_YUVJ420P if YUV 4:2:0 8-bit full scale

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-04 21:43:27 +01:00
Michael Niedermayer
b906d04881 Merge commit '885ec9242554ad25922258a595ec5e317922a412' 
* commit '885ec9242554ad25922258a595ec5e317922a412':
  hevc: Use parsed VUI colorimetry in avcodec

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-04 21:37:34 +01:00
Michael Niedermayer
be41f21a3d Merge commit 'cd8f772d0678a90957f4dfd5ce51af9d22e3f212' 
* commit 'cd8f772d0678a90957f4dfd5ce51af9d22e3f212':
  lavc: Add colorimetry values for BT.2020, other non-included ones

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-04 21:26:34 +01:00
Diego Biurrun
e2b5b09789 x86: rv40dsp: Use PAVGB instruction macro where appropriate 2013-11-04 21:14:39 +01:00
Yusuke Nakamura
3ef9b7ab95 hevc_ps: Use AV_PIX_FMT_YUVJ420P if YUV 4:2:0 8-bit full scale 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2013-11-04 16:19:53 +01:00
Jan Ekström
885ec92425 hevc: Use parsed VUI colorimetry in avcodec 
Also limit the parsed VUI values to known valid ones.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2013-11-04 16:03:11 +01:00