aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* dnn_backend_native_layer_mathunary: add asin supportTing Fu2020-06-254-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It can be tested with the model generated with below python script: 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.asin(x) x2 = tf.divide(x1, 3.1416/2) # pi/2 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>
* avformat/smoothstreaming: Forward errors from copying white/blacklistsAndreas Rheinhardt2020-06-241-1/+3
| | | | Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
* avcodec/cbs_av1: Simplify writing uvlc elementsAndreas Rheinhardt2020-06-241-10/+5
| | | | | | | There is no reason to special-case writing a value of zero as uvlc element as the generic code is perfectly capable of doing so. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
* avcodec/cbs_av1: Fix writing uvlc numbers >= INT_MAXAndreas Rheinhardt2020-06-241-2/+3
| | | | | | | | | | Fixes: assertion failure Fixes: left shift of 1 by 31 places cannot be represented in type 'int' Fixes: 23264/clusterfuzz-testcase-minimized-ffmpeg_BSF_AV1_METADATA_fuzzer-6308429248593920 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
* avcodec/hevc: export chroma sample locationHendrik Leppkes2020-06-241-0/+9
|
* avfilter/vf_v360: do not ignore return value of allocate_plane()Paul B Mahol2020-06-231-2/+5
|
* avcodec/ccaption_dec: add support for background colorsPaul B Mahol2020-06-231-4/+64
|
* lavc: Lower MediaFoundation audio encoder priority.Carl Eugen Hoyos2020-06-231-3/+3
| | | | | The actual encoders may not be available. Fixes ticket #8699.
* doc/general: mention BT20 decoderPaul B Mahol2020-06-231-0/+2
|
* doc/general: merge dupe ProRes entriesPaul B Mahol2020-06-231-2/+1
| | | | While here add missing fourcc.
* doc/general: mention NotchLCPaul B Mahol2020-06-231-0/+1
|
* avfilter/vf_v360: add orthographic projection supportPaul B Mahol2020-06-233-2/+156
|
* avfilters/vf_v360: add equisolid projection supportPaul B Mahol2020-06-223-0/+150
|
* avfilter/vf_showpalette: Don't pretend disp_palette can failAndreas Rheinhardt2020-06-221-5/+3
| | | | | | | | | It can't fail, yet it returns an int and other code checks whether it failed; yet if it did fail, an AVFrame would leak. One could of course add an av_frame_free for this (that compilers could optimize away), yet it is easier to simply stop pretending that disp_palette could fail. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
* avformat/sccdec: Avoid variable that is always zeroAndreas Rheinhardt2020-06-221-2/+1
| | | | Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
* avformat/pjsdec: Avoid variable that is always zeroAndreas Rheinhardt2020-06-221-2/+1
| | | | Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
* avformat/mpl2dec: Avoid variable that is always zeroAndreas Rheinhardt2020-06-221-2/+1
| | | | Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
* avformat/mov: CosmeticsAndreas Rheinhardt2020-06-221-60/+54
| | | | Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
* avformat/mov: Avoid allocation when reading ddts atomAndreas Rheinhardt2020-06-221-13/+4
| | | | Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
* avformat/mov: Use ffio_read_size where appropriateAndreas Rheinhardt2020-06-221-22/+12
| | | | Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
* avformat/mov: Avoid allocation+copy when moving extradataAndreas Rheinhardt2020-06-221-5/+2
| | | | Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
* avformat/mov: Read attached pics directly into st->attached_picAndreas Rheinhardt2020-06-221-8/+4
| | | | | | | | | | Given that av_get_packet returns a blank packet on error, the only difference to the current approach (that uses intermediate AVPackets on the stack) is that st->attached_pic will be properly initialized on error (i.e. the timestamps are AV_NOPTS_VALUE) whereas right now st->attached_pic is only zeroed. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
* avformat/mov: Check earlier whether reel_name string is emptyAndreas Rheinhardt2020-06-221-7/+4
| | | | Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
* avcodec, avformat: Remove unnecessary initializations of side data sizeAndreas Rheinhardt2020-06-2212-15/+13
| | | | | Reviewed-by: Anton Khirnov <anton@khirnov.net> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
* avformat/avformat: Improve documentation of av_stream_get_side_dataAndreas Rheinhardt2020-06-221-1/+2
| | | | | | | | Document that it also sets the size in case the desired side data is absent (if the pointer has been supplied). Reviewed-by: Anton Khirnov <anton@khirnov.net> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
* avcodec/packet: Improve documentation of av_packet_get_side_dataAndreas Rheinhardt2020-06-221-1/+2
| | | | | | | | Document that it also sets the size in case the desired side data is absent (if the pointer has been supplied). Reviewed-by: Anton Khirnov <anton@khirnov.net> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
* avformat/flvdec: CosmeticsAndreas Rheinhardt2020-06-221-15/+10
| | | | | Reviewed-by: Anton Khirnov <anton@khirnov.net> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
* avcodec/nellymoserdec: Don't use invalid AVPacketSideDataTypeAndreas Rheinhardt2020-06-221-10/+0
| | | | | | | | | | | | | | | | | | | Commits 957a593cd95b15a5dcb2f50306fbac59f09d8e9e and 11828b8885cc1d87ffc7b1b4bbe642ce9720b194 made the flv demuxer export a certain flag as side data to be used by the nellymoser decoder for mid-stream sample rate changes. It used a custom side data type 'F' that was never officially documented. Yet since 2215c39e94e01f57b3191a29e0e51d7e230daf49 (merged in commit 52c522c72090233edeeb0486a9bd8bee925a710a) this information is exported via the properly documented AV_PKT_DATA_PARAM_CHANGE side data. The merge commit therefore stopped exporting the 'F' sidedata; yet the changes in the Nellymoser decoder (which are now dead code (and would become dangerous if lots of new side data types were added)) have not been removed. This commit does this. Reviewed-by: Anton Khirnov <anton@khirnov.net> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
* avformat/dashenc: Calculate average bitrate for adaptation sets in static ↵Przemysław Sobala2020-06-221-8/+16
| | | | | | | | | manifest If stream's bitrate is not specified: - for static manifest: an average bitrate will be calculated and used, - for dynamic manifest: first segment's bitrate will be calculated and used, as before, for bandwidth setting in adaptation sets.
* Revert "avformat/dashenc: use AVStream timebase when computing missing bitrate"Przemysław Sobala2020-06-221-1/+1
| | | | This reverts commit 2a9ffd89fcb09bd69b2130da039ad2caba79cf33 as duration is always in AV_TIME_BASE units
* avfilter/af_ladspa: check return value of getenv()Paul B Mahol2020-06-211-2/+3
|
* avfilter/af_ladspa: add latency compensationPaul B Mahol2020-06-212-3/+60
|
* avfilter/af_ladspa: check another directory for pluginsPaul B Mahol2020-06-211-0/+5
|
* avcodec/hcadec: get intensity from correct channelsummertriangle.dev@gmail.com2020-06-211-1/+1
| | | | | | | Fixes an issue with one output channel being slightly louder than the other. The output now matches other public HCA decoders. Signed-off-by: t <summertriangle.dev@gmail.com>
* avcodec/hcadec: fix decoding of hfr channelssummertriangle.dev@gmail.com2020-06-212-7/+10
| | | | | | | | I suspect this was originally broken by b7e5c8f , but even then, it only worked because it read out of bounds from intensity_ratio_table. Signed-off-by: t <summertriangle.dev@gmail.com>
* avcodec/adpcmenc: remove forward declarationAndriy Gelman2020-06-201-2/+0
| | | | | Reviewed-by: Limin Wang <lance.lmwang@gmail.com> Signed-off-by: Andriy Gelman <andriy.gelman@gmail.com>
* avcodec/mpeg12dec: do not discard older a53 captionsPaul B Mahol2020-06-201-5/+17
| | | | Fixes #6105.
* avcodec/ccaption_dec: use uint8_t type for prev_cmd arrayPaul B Mahol2020-06-201-1/+1
| | | | Commands are unsigned so be consistent.
* avcodec/ccaption_dec: do not modify packet data in case of parity errorPaul B Mahol2020-06-201-8/+8
| | | | To dissallow similar errors in future, make pointers const.
* avcodec/ccaption_dec: allow selection of second field captionsPaul B Mahol2020-06-201-3/+12
|
* avcodec/ccaption_dec: rework non-real-time mode with pop-on captions by delayingPaul B Mahol2020-06-201-49/+68
| | | | So it give similar output as visual output of real-time mode.
* doc/encoders: fix the misleading usage of profileLimin Wang2020-06-201-3/+3
| | | | | | | | | | users are getting mislead by the integer, although profile can support both const string and integer. http://ffmpeg.org/pipermail/ffmpeg-user/2020-June/049025.html Also fix the order of high and main, it's not my intention. Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
* avfilter: add D2TS, TS2D, TS2T as a common macro in internal.hLimin Wang2020-06-1912-29/+4
| | | | Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
* avformat/dvenc: return error code of dv_assemble_frame()Limin Wang2020-06-191-2/+3
| | | | Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
* avcodec/av1_parser: initialize avctx->pix_fmtManoj Bonda2020-06-191-0/+2
| | | | | | | | | | | Initialize avctx->pix_fmt in av1_parser.c AV1 Chroma format is invalid when quering using below code if no AV1 decoder is available: iVideoStream = av_find_best_stream(fmtc, AVMEDIA_TYPE_VIDEO, -1, -1, NULL, 0); eChromaFormat = (AVPixelFormat)fmtc->streams[iVideoStream]->codecpar->format; Signed-off-by: James Almer <jamrial@gmail.com>
* avcodec/av1_parser: add missing parsing for RGB pixel format signalingJames Almer2020-06-191-0/+10
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* avcodec/av1_parser: set context values outside the OBU parsing loopJames Almer2020-06-191-29/+32
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* fate: add yuv420p10 and yuv422p10 tests for overlay filterLimin Wang2020-06-195-0/+34
| | | | Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
* avfilter/vf_overlay: add yuv420p10 and yuv422p10 10bit format supportLimin Wang2020-06-193-0/+87
| | | | Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
* avfilter/vf_overlay: support for 8bit and 10bit overlay with macro-based ↵Limin Wang2020-06-191-197/+220
| | | | | | function Signed-off-by: Limin Wang <lance.lmwang@gmail.com>