generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
72,047 Commits 24 Branches 241 Tags
40a7700b82aec0036622f8673ce64e070a520891
Commit Graph

32079 Commits

Author SHA1 Message Date
Michael Niedermayer
f230451b7a Merge commit 'b9f7a677083647d85e583d6d7384938766a293d7' 
* commit 'b9f7a677083647d85e583d6d7384938766a293d7':
  png: Set the color range as full range

Conflicts:
	libavcodec/pngdec.c

See: 72e7553125
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-10 22:42:56 +02:00
Michael Niedermayer
ce1c0e99e9 Merge commit '243e8443cd9e83c887e3f5edf09a169e7783d14e' 
* commit '243e8443cd9e83c887e3f5edf09a169e7783d14e':
  alac: Reject rice_limit 0 if compression is used

Conflicts:
	libavcodec/alac.c

See: 4b657a1b1e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-10 22:00:40 +02:00
Michael Niedermayer
d0b294286c avcodec/ppc/h264qpel_template: Fix alignment assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-10 18:09:39 +02:00
Michael Niedermayer
729108515d avcodec/snowenc: set dia_size for the first pass of motion estimation too 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-10 14:19:56 +02:00
Michael Niedermayer
58201c6e9e avcodec/snowenc: correct fullpel search pattern 
No real difference in quality, its a bit slower for the same dia_size as more
vectors are searched for the same dia_size

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-10 02:38:05 +02:00
Michael Niedermayer
db6d0a5bd2 avcodec/snowenc: Fix used reference MV in fullpel iterative ME 
This very very slightly improves quality, no measurable speed change

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-10 01:05:42 +02:00
Michael Niedermayer
f349703e1d avcodec/snowenc: change log level for iterative ME information to debug level 
The printed stuff should be useless to the average user and its certainly
not an error.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-10 00:46:02 +02:00
Michael Niedermayer
b62297805b avcodec/snowenc: add intra_penalty AVOption 
This allows favoring intra or inter blocks by a user specified amount.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-09 23:52:36 +02:00
Michael Niedermayer
cf31e2df08 avcodec/mpegvideo: Fix null pointer dereference with grayscale decoding with mpeg2_field_encoding.ts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-09 17:10:26 +02:00
Michael Niedermayer
33529104e5 avcodec/mpeg12dec: Fix "-flags +gray" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-09 15:58:02 +02:00
wm4
b9f7a67708 png: Set the color range as full range 
The format uses full range for the gray formats.

CC: libav-stable@libav.org
 2015-05-09 15:55:50 +02:00
Michael Niedermayer
9ba5dd37a9 avcodec/mpegvideo: Fix indention 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-09 12:03:36 +02:00
Michael Niedermayer
5c8809b45b avcodec/error_resilience: support grayscale 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-09 02:42:47 +02:00
Michael Niedermayer
82a6e18bbb avcodec/mpegvideo: Fix -flags +gray with xvid_vlc_trac7411.h263 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-09 01:36:53 +02:00
Michael Niedermayer
9025bc588a avcodec/h263dec: use PIX_FMT_GRAY8 when the user specified CODEC_FLAG_GRAY 
Fixes Ticket4542

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-09 01:13:55 +02:00
Michael Niedermayer
982e7bbfa6 avcodec/vc1: Skip chroma operations if CODEC_FLAG_GRAY is set 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-08 20:32:15 +02:00
Ronald S. Bultje
c97d30f02f vp9: de-duplicate some functions that are identical between 10/12 bpp. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-08 14:42:01 +02:00
Andreas Cadhalpun
243e8443cd alac: Reject rice_limit 0 if compression is used 
If in compression mode rice_limit = 0 leads to call
`show_bits(gb, k)` in `decode_scalar` with k = 0.

Request a sample in case it is valid and it should be accepted.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

CC: libav-stable@libav.org
 2015-05-08 11:10:51 +02:00
Andreas Cadhalpun
295e05a762 ape: Support _0000 files with nblock smaller than 64 
The decode_array_0000 assumed that 64 is the minimal block size
while it is not.

CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-05-08 11:10:51 +02:00
wm4
72e7553125 pngdec: set correct range 
AV_PIX_FMT_GRAY8/16 are considered YUV formats, and the color_range is
not set - so the API user will have to assume limitted range. (Unless
the API user adds a special-case for the PNG decoder.)

Just export the correct range - full range.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-08 00:44:06 +02:00
Tom Butterworth
288dc5b4a1 avcodec/s3tc: fix alpha decoding when dimensions are not a multiple of 4 
Fix alpha position error for edge blocks of odd-dimensioned frames

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-07 23:10:56 +02:00
Michael Niedermayer
b1b0baa3d6 avcodec/g2meet: Check init_get_bits8() return value 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-07 22:50:39 +02:00
Michael Niedermayer
43e94d5af4 avcodec/g2meet: Use init_get_bits8() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-07 22:50:23 +02:00
Michael Niedermayer
a7dd933b81 avcodec: Add av_packet_side_data_name() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-07 21:01:37 +02:00
Michael Niedermayer
daea320969 avcodec/txd: Fix input size checks for dxt1/3 for dimensions % 4 != 0 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-07 19:11:01 +02:00
Tom Butterworth
873d7e0e63 avcodec/s3tc: fix decoding when dimensions are not a multiple of 4 
Image dimensions were rounded down causing rows to wrap early if dimensions were not a multiple of 4.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-07 18:32:36 +02:00
Andreas Cadhalpun
584cc1ade1 aacsbr: break infinite loop in sbr_hf_calc_npatches 
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-07 17:32:23 +02:00
Shivraj Patil
7174df44fe avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for HEVC uni copy, uni horizontal and uni vertical mc functions 
Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-07 16:47:34 +02:00
Michael Niedermayer
cc77bb09e4 avcodec/x86/vp9dsp_init: Fix mix of declaration and statement 
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-07 14:33:10 +02:00
Michael Niedermayer
a6153977df avcodec/vp9dsp: Replace assert by av_assert0() 
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-07 14:32:50 +02:00
Michael Niedermayer
b28d5c49f7 Merge remote-tracking branch 'rbultje/vp9-profile23-wip' 
* rbultje/vp9-profile23-wip:
  libvpxdec: add 440 pixfmts.
  vp9: add profile 2/3 fate tests.
  vp9: add inter-frame profile 2/3 suport.
  vp9: add keyframe profile 2/3 support.
  vp9: parse profile 2/3 bitdepth in frame header.
  vp9: add profile 2/3 to exported profiles.
  fate: add/update reference files for 440 addition.
  swscale: add yuv440p10/12 pixfmts.
  lavc: add yuv440p10/12 formats to aligned pixfmt list.
  lavu: add yuv440p10/12 pixfmts.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-07 13:22:04 +02:00
Ronald S. Bultje
2293ec6ab3 libvpxdec: add 440 pixfmts. 2015-05-07 07:19:52 -04:00
Michael Niedermayer
9253cc496a avcodec/diracdec: Replace default_bsep[] by multiplication 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-07 05:07:55 +02:00
Carl Eugen Hoyos
b453e76842 lavc/qdrw: Also support real-world qdraw images. 2015-05-07 01:21:08 +02:00
Michael Niedermayer
0c015aa95c avcodec/tableprint_vlc: Do not define functions to nothing 
This avoids potential warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-07 00:52:47 +02:00
Michael Niedermayer
1caff5731d Merge commit '04070dbca0688ab1e24528ce5c135254a9a79c47' 
* commit '04070dbca0688ab1e24528ce5c135254a9a79c47':
  libx265: Fix 'braces around scalar initializer' warning

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-06 21:46:52 +02:00
Ronald S. Bultje
23ba4538f9 vp9: add inter-frame profile 2/3 suport. 2015-05-06 15:10:41 -04:00
Ronald S. Bultje
b224b165cb vp9: add keyframe profile 2/3 support. 2015-05-06 15:10:41 -04:00
Ronald S. Bultje
346ce5da19 vp9: parse profile 2/3 bitdepth in frame header. 2015-05-06 15:10:40 -04:00
Ronald S. Bultje
01e59d48ed vp9: add profile 2/3 to exported profiles. 2015-05-06 15:10:40 -04:00
Michael Niedermayer
39e89f5211 Merge commit '34efb8a169e4551326e069be47125c6c2cb7ab90' 
* commit '34efb8a169e4551326e069be47125c6c2cb7ab90':
  quickdraw: Support direct pixel blocks

Conflicts:
	Changelog
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-06 20:40:26 +02:00
Michael Niedermayer
251f9dcf22 Merge commit 'bb2cb0a66d86ec4ad9f43a488e8b6ab894c22d2f' 
* commit 'bb2cb0a66d86ec4ad9f43a488e8b6ab894c22d2f':
  quickdraw: Switch to greedy parsing

Conflicts:
	libavcodec/qdrw.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-06 20:32:52 +02:00
Michael Niedermayer
d423fc12e6 Merge commit 'd00f1e0fc10bb945cdf140a6c320eb0c9cd25162' 
* commit 'd00f1e0fc10bb945cdf140a6c320eb0c9cd25162':
  quickdraw: Convert to bytestream2

Conflicts:
	libavcodec/qdrw.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-06 20:23:54 +02:00
Ronald S. Bultje
57f970a704 lavc: add yuv440p10/12 formats to aligned pixfmt list. 2015-05-06 12:04:31 -04:00
Andreas Cadhalpun
75fc81c831 diracdec: check that block length is valid 
In init_planes p->xblen and p->yblen are set to:
            p->xblen = s->plane[0].xblen >> s->chroma_x_shift;
            p->yblen = s->plane[0].yblen >> s->chroma_y_shift;

These are later used as block_w and block_h arguments of
s->vdsp.emulated_edge_mc. If one of them is 0 it triggers an av_assert2
in emulated_edge_mc:
    av_assert2(start_x < end_x && block_w > 0);
    av_assert2(start_y < end_y && block_h > 0);

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-06 18:02:35 +02:00
Andreas Cadhalpun
4b13a542a2 dirac: use and forward error codes 
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-06 17:50:09 +02:00
Michael Niedermayer
0a6b410edf avcodec/vp8: Suppress empty body warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-06 16:03:56 +02:00
Vittorio Giovara
04070dbca0 libx265: Fix 'braces around scalar initializer' warning 
x265 Reordered the x265_picture fields in the commit

51b1518de2 (diff-945b5354d8767dfac13334f2d22cf58fR107)

Now the first field is an integer and not an array.
 2015-05-06 14:53:29 +01:00
Vittorio Giovara
34efb8a169 quickdraw: Support direct pixel blocks 
Data is stored in separated components so rework decode_rle() to support
stepping and offsets.
 2015-05-06 14:27:34 +01:00
Vittorio Giovara
bb2cb0a66d quickdraw: Switch to greedy parsing 
Quickdraw packs data as a series of codes that the application is supposed
to handle, but it does not define any order in which they might appear.
Since it's unfeasible to support *all* opcodes defined by the spec,
only handle well-known blocks containing video data and ignore any unknown
or unsupported ones.

Move palette loading and rle decoding to separate functions to resue them
in other blocks and drop format initialization in init since it can
support more formats than pal8.

Validate width and height.
 2015-05-06 14:26:30 +01:00