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

98302 Commits

Author SHA1 Message Date
Limin Wang 42a3850360 avcodec/alac: Add FF_CODEC_CAP_INIT_CLEANUP 
Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
 2020-06-13 06:59:18 +08:00
Limin Wang 17e88bf0df avcodec/aacenc: add FF_CODEC_CAP_INIT_CLEANUP 
Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
 2020-06-13 06:59:18 +08:00
Limin Wang ee726e777b avcodec/ac3enc: add FF_CODEC_CAP_INIT_CLEANUP 
Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
 2020-06-13 06:59:18 +08:00
Limin Wang 61454bb6ff avcodec/apedec: add FF_CODEC_CAP_INIT_CLEANUP 
Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
 2020-06-13 06:59:18 +08:00
Limin Wang 3240121509 avcodec/adpcmenc: remove FF_ALLOC_OR_GOTO macros and gotos lable 
Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
 2020-06-13 06:59:18 +08:00
Limin Wang 0a1dc81723 avcodec/h264dec: remove FF_ALLOCZ_ARRAY_OR_GOTO and gotos lable 
Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
 2020-06-13 06:59:18 +08:00
Limin Wang d6cdedee4c avcodec/h264dec: store count of the tables into const variable for long lines 
Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
 2020-06-13 06:59:18 +08:00
Limin Wang 96cc392a17 avcodec/h264dec: cosmetics 
Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
 2020-06-13 06:59:18 +08:00
Michael Niedermayer 314d10f7a6 avcodec/wmalosslessdec: Check block_align maximum 
Fixes: Assertion failure
Fixes: 22737/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WMALOSSLESS_fuzzer-5958388889681920

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2020-06-13 00:43:09 +02:00
Michael Niedermayer aa88cdfd90 avcodec/loco: Fix signed integer overflow in loco_get_rice() 
Fixes: signed integer overflow: 2147483647 + 1 cannot be represented in type 'int'
Fixes: 22975/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LOCO_fuzzer-5658160970072064

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2020-06-13 00:43:09 +02:00
Michael Niedermayer 0e15b01b4e avformat/thp: Check fps 
Fixes: division by zero
Fixes: 23162/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-4856420817436672

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2020-06-13 00:43:09 +02:00
Michael Niedermayer 9a42a67c5c avformat/mpl2dec: Fix integer overflow with duration 
Fixes: signed integer overflow: 9223372036854775807 - -1 cannot be represented in type 'long'
Fixes: 23167/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-6425051741290496

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2020-06-13 00:43:09 +02:00
Michael Niedermayer 49ba60fed0 avcodec/cbs: Allocate more CodedBitstreamUnit at once in cbs_insert_unit() 
Fixes: Timeout (85sec -> 0.5sec)
Fixes: 20791/clusterfuzz-testcase-minimized-ffmpeg_BSF_AV1_FRAME_SPLIT_fuzzer-5659537719951360
Fixes: 21214/clusterfuzz-testcase-minimized-ffmpeg_BSF_MPEG2_METADATA_fuzzer-5165560875974656
Fixes: 21247/clusterfuzz-testcase-minimized-ffmpeg_BSF_H264_METADATA_fuzzer-5715175257931776

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2020-06-13 00:43:09 +02:00
Dale Curtis bf446711bc avformat/mov: Check if DTS is AV_NOPTS_VALUE in mov_find_next_sample(). 
Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2020-06-13 00:43:09 +02:00
Paul B Mahol c0e7164ba6 avfilter/vf_vaguedenoiser: fix small typo in option explanation 2020-06-13 00:41:16 +02:00
Paul B Mahol e65d76fb94 avfilter/af_rubberband: adjust nb_samples after every command 2020-06-13 00:21:07 +02:00
Paul B Mahol 49d07642f3 avformat/sccdec: split line with multiple subs 2020-06-13 00:20:55 +02:00
Lynne fd54add89c
doc/APIchanges: add new AV_PIX_FMT_X2RGB10 2020-06-12 17:57:08 +01:00
Fei Wang c00264f501 lavu/hwcontext_vaapi: add vaapi_format_map support for x2rgb10 
Signed-off-by: Fei Wang <fei.w.wang@intel.com>
 2020-06-12 17:56:15 +01:00
Fei Wang c721b45014 swscale: Add swscale input/output support for X2RGB10LE 
Signed-off-by: Fei Wang <fei.w.wang@intel.com>
 2020-06-12 17:56:15 +01:00
Fei Wang b09fb030c1 lavu/pix_fmt: add new pixel format x2rgb10 
The format is packed RGB with each channel 10 bits available and
include 2 bits unused.

Signed-off-by: Fei Wang <fei.w.wang@intel.com>
 2020-06-12 17:56:15 +01:00
Steven Liu 38737b3d4e mailmap: add entry for myself 2020-06-12 14:30:02 +08:00
Michael Niedermayer 0b182ff66d tools/target_dec_fuzzer: Adjust threshold for lagarith 
Fixes: Timeout (3minute 49 sec -> 3sec)
Fixes: 22020/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LAGARITH_fuzzer-5708544679870464

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2020-06-11 14:59:04 +02:00
Michael Niedermayer 48de8f5816 avcodec/mpeg12dec: remove outdated comments 
Found-by: Kieran
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2020-06-11 13:49:54 +02:00
Michael Niedermayer 38fbf33c72 avcodec/snowdec: Avoid integer overflow with huge qlog 
Fixes: integer overflow
Fixes: 22285/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SNOW_fuzzer-5682428762128384

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2020-06-11 13:49:54 +02:00
Michael Niedermayer d7a2311a2c avcodec/movtextdec: Fix shift overflows in mov_text_init() 
Fixes: left shift of 243 by 24 places cannot be represented in type 'int'
Fixes: 22716/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MOVTEXT_fuzzer-5704263425851392

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2020-06-11 13:49:54 +02:00
Michael Niedermayer d3747f4431 tools/target_dem_fuzzer: Use file extensions listed in input formats 
This should make it easier for the fuzzer to fuzz formats being detected only by
file extension and thus increase coverage

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2020-06-11 13:49:54 +02:00
Limin Wang bc8ab084fb avutil: add AV_FRAME_DATA_SEI_UNREGISTERED side data type 
Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
 2020-06-11 13:06:31 +08:00
Ting Fu 3ac2f7ccd7 dnn-layer-mathunary-test: add unit test for tan 
Signed-off-by: Ting Fu <ting.fu@intel.com>
Signed-off-by: Guo Yejun <yejun.guo@intel.com>
 2020-06-11 11:10:51 +08:00
Ting Fu 22d0860c13 dnn_backend_native_layer_mathunary: add tan support 
It can be tested with the model generated with below python scripy

import tensorflow as tf
import numpy as np
import imageio

in_img = imageio.imread('input.jpeg')
in_img = in_img.astype(np.float32)/255.0
in_data = in_img[np.newaxis, :]

x = tf.placeholder(tf.float32, shape=[1, None, None, 3], name='dnn_in')
x1 = tf.multiply(x, 0.78)
x2 = tf.tan(x1)
y = tf.identity(x2, name='dnn_out')

sess=tf.Session()
sess.run(tf.global_variables_initializer())

graph_def = tf.graph_util.convert_variables_to_constants(sess, sess.graph_def, ['dnn_out'])
tf.train.write_graph(graph_def, '.', 'image_process.pb', as_text=False)

print("image_process.pb generated, please use \
path_to_ffmpeg/tools/python/convert.py to generate image_process.model\n")

output = sess.run(y, feed_dict={x: in_data})
imageio.imsave("out.jpg", np.squeeze(output))

Signed-off-by: Ting Fu <ting.fu@intel.com>
Signed-off-by: Guo Yejun <yejun.guo@intel.com>
 2020-06-11 11:10:51 +08:00
Ting Fu dd3fe3e77c dnn-layer-mathunary-test: add unit test for cos 
Signed-off-by: Ting Fu <ting.fu@intel.com>
Signed-off-by: Guo Yejun <yejun.guo@intel.com>
 2020-06-11 11:10:51 +08:00
Ting Fu 88fb494f42 dnn_backend_native_layer_mathunary: add cos support 
It can be tested with the model generated with below python scripy

import tensorflow as tf
import numpy as np
import imageio

in_img = imageio.imread('input.jpeg')
in_img = in_img.astype(np.float32)/255.0
in_data = in_img[np.newaxis, :]

x = tf.placeholder(tf.float32, shape=[1, None, None, 3], name='dnn_in')
x1 = tf.multiply(x, 1.5)
x2 = tf.cos(x1)
y = tf.identity(x2, name='dnn_out')

sess=tf.Session()
sess.run(tf.global_variables_initializer())

graph_def = tf.graph_util.convert_variables_to_constants(sess, sess.graph_def, ['dnn_out'])
tf.train.write_graph(graph_def, '.', 'image_process.pb', as_text=False)

print("image_process.pb generated, please use \
path_to_ffmpeg/tools/python/convert.py to generate image_process.model\n")

output = sess.run(y, feed_dict={x: in_data})
imageio.imsave("out.jpg", np.squeeze(output))

Signed-off-by: Ting Fu <ting.fu@intel.com>
Signed-off-by: Guo Yejun <yejun.guo@intel.com>
 2020-06-11 11:10:51 +08:00
Ting Fu 3f7c5a375b dnn-layer-mathunary-test: add unit test for sin 
Signed-off-by: Ting Fu <ting.fu@intel.com>
Signed-off-by: Guo Yejun <yejun.guo@intel.com>
 2020-06-11 11:10:51 +08:00
Ting Fu 0b6d3f0d83 dnn_backend_native_layer_mathunary: add sin support 
It can be tested with the model file generated with below python scripy:

import tensorflow as tf
import numpy as np
import imageio

in_img = imageio.imread('input.jpeg')
in_img = in_img.astype(np.float32)/255.0
in_data = in_img[np.newaxis, :]

x = tf.placeholder(tf.float32, shape=[1, None, None, 3], name='dnn_in')
x1 = tf.multiply(x, 3.14)
x2 = tf.sin(x1)
y = tf.identity(x2, name='dnn_out')

sess=tf.Session()
sess.run(tf.global_variables_initializer())

graph_def = tf.graph_util.convert_variables_to_constants(sess, sess.graph_def, ['dnn_out'])
tf.train.write_graph(graph_def, '.', 'image_process.pb', as_text=False)

print("image_process.pb generated, please use \
path_to_ffmpeg/tools/python/convert.py to generate image_process.model\n")

output = sess.run(y, feed_dict={x: in_data})
imageio.imsave("out.jpg", np.squeeze(output))

Signed-off-by: Ting Fu <ting.fu@intel.com>
Signed-off-by: Guo Yejun <yejun.guo@intel.com>
 2020-06-11 11:10:51 +08:00
Andreas Rheinhardt c33e56c7a6 avformat/aviobuf: Also return truncated buffer in avio_get_dyn_buf() 
Two kinds of errors can happen when working with dynamic buffers:
(Re)allocation errors or truncation errors (one has to truncate the
buffer to a size of INT_MAX because avio_close_dyn_buf() and
avio_get_dyn_buf() both return an int). Right now, avio_get_dyn_buf()
returns an empty buffer in either case. But given that
avio_get_dyn_buf() does not destroy the dynamic buffer, one can return
the buffer in case of truncation and let the user check the error flags
and decide for himself instead of hardcoding a single way to proceed
in case of truncation.

(This actually restores the behaviour from before commit
163bb9ac0af495a5cb95441bdb5c02170440d28c.)

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-06-11 04:03:38 +02:00
Andreas Rheinhardt 7be9b0bb38 avformat/aviobuf: Return better error codes 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-06-11 03:29:22 +02:00
Andreas Rheinhardt fa0bc627c5 avformat/aviobuf: Stop restricting dynamic buffer sizes to INT_MAX/2 
This has originally been done in 568e18b15e
as a precaution against integer overflows, but it is actually easy to
support the full range of int without overflows.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-06-11 03:09:56 +02:00
Andreas Rheinhardt 88d5ae068f avformat/aviobuf: Simplify dyn_buf_write() a bit 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-06-11 02:01:56 +02:00
Andreas Rheinhardt 28a078eded avformat/aviobuf: Don't check for overflow after it happened 
If adding two ints overflows, it doesn't matter whether the result will
be stored in an unsigned or not; and checking afterwards does not make it
retroactively defined.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-06-11 01:18:54 +02:00
Anton Khirnov 7aa7d68971 AVFormatContext: switch to child_class_iterate() 2020-06-10 12:36:44 +02:00
Anton Khirnov 2cbd544519 AVIOContext: switch to child_class_iterate() 2020-06-10 12:36:44 +02:00
Anton Khirnov 43ed2b86d6 URLContext: switch to child_class_iterate() 2020-06-10 12:36:44 +02:00
Anton Khirnov c7d8d8d8d9 vf_spp: switch to child_class_iterate() 2020-06-10 12:36:44 +02:00
Anton Khirnov 6bfac4ee6f vf_scale: switch to child_class_iterate() 2020-06-10 12:36:44 +02:00
Anton Khirnov 344149cf01 framesync: switch to child_class_iterate() 2020-06-10 12:36:44 +02:00
Anton Khirnov aba98de6b8 avfilter: switch to child_class_iterate() 2020-06-10 12:36:44 +02:00
Anton Khirnov 342230a537 af_resample: switch to child_class_iterate() 2020-06-10 12:36:44 +02:00
Anton Khirnov 3dd324427a af_aresample: switch to child_class_iterate() 2020-06-10 12:36:44 +02:00
Anton Khirnov 851e0dfe29 AVCodecContext: switch to child_class_iterate() 2020-06-10 12:36:44 +02:00
Anton Khirnov c0d6eaca50 bsf: switch to child_class_iterate() 2020-06-10 12:36:44 +02:00