cf283f2dfb
Revert "avcodec/libopusenc: Fix warning when encoding ambisonics with channel mapping 2"
...
This reverts commit 4cd6f08d20
2018-11-28 23:53:51 +00:00
4cd6f08d20
avcodec/libopusenc: Fix warning when encoding ambisonics with channel mapping 2
...
Also adds checks on the number of channels.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-29 00:07:35 +01:00
3d2cf50ebb
avcodec/libopusenc: support encoding packets of sizes bigger than 60ms
...
Packets of sizes 80ms, 100ms and 120ms are allowed since libopus 1.2
Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com >
Signed-off-by: James Almer <jamrial@gmail.com >
2018-08-24 13:21:09 -03:00
204c7caf0d
avcodec/libopus: support disabling phase inversion.
...
Signed-off-by: Menno <mrdegier@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-02-06 23:07:10 +01:00
b945fed629
avcodec: add metadata to identify wrappers and hardware decoders
...
Explicitly identify decoder/encoder wrappers with a common name. This
saves API users from guessing by the name suffix. For example, they
don't have to guess that "h264_qsv" is the h264 QSV implementation, and
instead they can just check the AVCodec .codec and .wrapper_name fields.
Explicitly mark AVCodec entries that are hardware decoders or most
likely hardware decoders with new AV_CODEC_CAPs. The purpose is allowing
API users listing hardware decoders in a more generic way. The proposed
AVCodecHWConfig does not provide this information fully, because it's
concerned with decoder configuration, not information about the fact
whether the hardware is used or not.
AV_CODEC_CAP_HYBRID exists specifically for QSV, which can have software
implementations in case the hardware is not capable.
Based on a patch by Philip Langdale <philipl@overt.org >.
Merges Libav commit 47687a2f8a
2017-12-14 19:37:56 +01:00
724cf83f10
Remove some unneeded casts of bit_rate.
2017-09-22 01:33:22 +02:00
73bed07373
avocdec/libopus: fix typo
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-01 01:19:07 +02:00
37941878f1
libopusenc: Add channel mapping family argument
...
The default value of -1 indicates that ffmpeg should determine the channel
mapping automatically, which was the behavior before this commit.
Unless the -mapping_family argument is provided, behavior is unchanged.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-02 23:31:16 +02:00
a1e3c7cf0f
libopusenc: Refactor to simplify forthcoming mapping_family parameter
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-02 23:31:10 +02:00
c2f861ca42
Replace remaining occurances of av_free_packet with av_packet_unref
2015-10-27 14:35:30 +01:00
7404f3bdb9
lavc: Switch bitrate to 64bit unless compatibility with avconv was requested.
2015-09-15 18:02:43 +02:00
6701c92fa4
avcodec/libopusenc: Fix infinite loop on flushing after 0 input
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2015-08-27 12:44:31 +02:00
29d147c94d
Merge commit '059a934806d61f7af9ab3fd9f74994b838ea5eba'
...
* commit '059a934806d61f7af9ab3fd9f74994b838ea5eba':
lavc: Consistently prefix input buffer defines
Conflicts:
doc/examples/decoding_encoding.c
libavcodec/4xm.c
libavcodec/aac_adtstoasc_bsf.c
libavcodec/aacdec.c
libavcodec/aacenc.c
libavcodec/ac3dec.h
libavcodec/asvenc.c
libavcodec/avcodec.h
libavcodec/avpacket.c
libavcodec/dvdec.c
libavcodec/ffv1enc.c
libavcodec/g2meet.c
libavcodec/gif.c
libavcodec/h264.c
libavcodec/h264_mp4toannexb_bsf.c
libavcodec/huffyuvdec.c
libavcodec/huffyuvenc.c
libavcodec/jpeglsenc.c
libavcodec/libxvid.c
libavcodec/mdec.c
libavcodec/motionpixels.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c
libavcodec/noise_bsf.c
libavcodec/nuv.c
libavcodec/nvenc.c
libavcodec/options.c
libavcodec/parser.c
libavcodec/pngenc.c
libavcodec/proresenc_kostya.c
libavcodec/qsvdec.c
libavcodec/svq1enc.c
libavcodec/tiffenc.c
libavcodec/truemotion2.c
libavcodec/utils.c
libavcodec/utvideoenc.c
libavcodec/vc1dec.c
libavcodec/wmalosslessdec.c
libavformat/adxdec.c
libavformat/aiffdec.c
libavformat/apc.c
libavformat/apetag.c
libavformat/avidec.c
libavformat/bink.c
libavformat/cafdec.c
libavformat/flvdec.c
libavformat/id3v2.c
libavformat/isom.c
libavformat/matroskadec.c
libavformat/mov.c
libavformat/mpc.c
libavformat/mpc8.c
libavformat/mpegts.c
libavformat/mvi.c
libavformat/mxfdec.c
libavformat/mxg.c
libavformat/nutdec.c
libavformat/oggdec.c
libavformat/oggparsecelt.c
libavformat/oggparseflac.c
libavformat/oggparseopus.c
libavformat/oggparsespeex.c
libavformat/omadec.c
libavformat/rawdec.c
libavformat/riffdec.c
libavformat/rl2.c
libavformat/rmdec.c
libavformat/rtpdec_latm.c
libavformat/rtpdec_mpeg4.c
libavformat/rtpdec_qdm2.c
libavformat/rtpdec_svq3.c
libavformat/sierravmd.c
libavformat/smacker.c
libavformat/smush.c
libavformat/spdifenc.c
libavformat/takdec.c
libavformat/tta.c
libavformat/utils.c
libavformat/vqf.c
libavformat/westwood_vqa.c
libavformat/xmv.c
libavformat/xwma.c
libavformat/yop.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc >
2015-07-27 23:15:19 +02:00
444e9874a7
Merge commit 'def97856de6021965db86c25a732d78689bd6bb0'
...
* commit 'def97856de6021965db86c25a732d78689bd6bb0':
lavc: AV-prefix all codec capabilities
Conflicts:
cmdutils.c
ffmpeg.c
ffplay.c
libavcodec/8svx.c
libavcodec/aacenc.c
libavcodec/ac3dec.c
libavcodec/adpcm.c
libavcodec/alac.c
libavcodec/atrac3plusdec.c
libavcodec/bink.c
libavcodec/dnxhddec.c
libavcodec/dvdec.c
libavcodec/dvenc.c
libavcodec/ffv1dec.c
libavcodec/ffv1enc.c
libavcodec/fic.c
libavcodec/flacdec.c
libavcodec/flacenc.c
libavcodec/flvdec.c
libavcodec/fraps.c
libavcodec/frwu.c
libavcodec/gifdec.c
libavcodec/h261dec.c
libavcodec/hevc.c
libavcodec/iff.c
libavcodec/imc.c
libavcodec/libopenjpegdec.c
libavcodec/libvo-aacenc.c
libavcodec/libvorbisenc.c
libavcodec/libvpxdec.c
libavcodec/libvpxenc.c
libavcodec/libx264.c
libavcodec/mjpegbdec.c
libavcodec/mjpegdec.c
libavcodec/mpegaudiodec_float.c
libavcodec/msmpeg4dec.c
libavcodec/mxpegdec.c
libavcodec/nvenc_h264.c
libavcodec/nvenc_hevc.c
libavcodec/pngdec.c
libavcodec/qpeg.c
libavcodec/ra288.c
libavcodec/rv10.c
libavcodec/s302m.c
libavcodec/sp5xdec.c
libavcodec/takdec.c
libavcodec/tiff.c
libavcodec/tta.c
libavcodec/utils.c
libavcodec/v210dec.c
libavcodec/vp6.c
libavcodec/vp9.c
libavcodec/wavpack.c
libavcodec/yop.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc >
2015-07-27 22:50:18 +02:00
059a934806
lavc: Consistently prefix input buffer defines
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
2015-07-27 15:24:59 +01:00
def97856de
lavc: AV-prefix all codec capabilities
...
Express bitfields more simply.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
2015-07-27 15:24:58 +01:00
e36db49b7b
avcodec: Add a min size parameter to ff_alloc_packet2()
...
This parameter can be used to inform the allocation code about how much
downsizing might occur, and can be used to optimize how to allocate the
packet
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2015-07-27 19:57:52 +02:00
1f4ef3ccae
avcodec/libopusenc: Use av_mallocz_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-01-17 12:58:56 +01:00
7b824e8b25
Merge commit '8dd0a2c5cf40a8a49faae985adc11750b6429132'
...
* commit '8dd0a2c5cf40a8a49faae985adc11750b6429132':
libopusenc: prevent an out-of-bounds read by returning early
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-11-13 12:12:27 +01:00
3c6e148e84
Merge commit 'b09cf8afc5199d359ac985ad7cea72a6a9f20e4e'
...
* commit 'b09cf8afc5199d359ac985ad7cea72a6a9f20e4e':
libopusenc: check return value
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-11-13 12:02:05 +01:00
8dd0a2c5cf
libopusenc: prevent an out-of-bounds read by returning early
...
CC: libav-stable@libav.org
Bug-Id: CID 1244188
2014-11-13 01:41:25 +01:00
b09cf8afc5
libopusenc: check return value
...
CC: libav-stable@libav.org
Bug-Id: CID 739870
2014-11-13 01:41:25 +01:00
da2189596d
Merge commit '2df0c32ea12ddfa72ba88309812bfb13b674130f'
...
* commit '2df0c32ea12ddfa72ba88309812bfb13b674130f':
lavc: use a separate field for exporting audio encoder padding
Conflicts:
libavcodec/audio_frame_queue.c
libavcodec/avcodec.h
libavcodec/libvorbisenc.c
libavcodec/utils.c
libavcodec/version.h
libavcodec/wmaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-10-14 02:16:16 +02:00
2df0c32ea1
lavc: use a separate field for exporting audio encoder padding
...
Currently, the amount of padding inserted at the beginning by some audio
encoders, is exported through AVCodecContext.delay. However
- the term 'delay' is heavily overloaded and can have multiple different
meanings even in the case of audio encoding.
- this field has entirely different meanings, depending on whether the
codec context is used for encoding or decoding (and has yet another
different meaning for video), preventing generic handling of the codec
context.
Therefore, add a new field -- AVCodecContext.initial_padding. It could
conceivably be used for decoding as well at a later point.
2014-10-13 19:09:01 +00:00
fb33bff990
Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'
...
* commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39':
cosmetics: Write NULL pointer equality checks more compactly
Conflicts:
cmdutils.c
ffmpeg_opt.c
ffplay.c
libavcodec/dvbsub.c
libavcodec/dvdsubdec.c
libavcodec/dvdsubenc.c
libavcodec/dxa.c
libavcodec/libxvid_rc.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/rv10.c
libavcodec/tiffenc.c
libavcodec/utils.c
libavcodec/vc1dec.c
libavcodec/zmbv.c
libavdevice/v4l2.c
libavformat/matroskadec.c
libavformat/movenc.c
libavformat/sdp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-08-15 21:00:50 +02:00
63debaa74c
libopusenc: Change default frame duration to 20 ms
...
20 ms is the default in the libopus encoder, and gives better
quality than 10 ms.
Signed-off-by: Martin Storsjö <martin@martin.st >
2014-01-06 18:56:44 +02:00
74906d3727
avcodec/libopusenc: change default frame duration to 20 ms
...
20 ms is used by libopus encoder.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-11-18 01:46:32 +00:00
ee77140afa
Merge commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2'
...
* commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2':
cosmetics: Group .name and .long_name together in codec/format declarations
Conflicts:
libavcodec/8svx.c
libavcodec/alac.c
libavcodec/cljr.c
libavcodec/dnxhddec.c
libavcodec/dnxhdenc.c
libavcodec/dpxenc.c
libavcodec/dvdec.c
libavcodec/dvdsubdec.c
libavcodec/dvdsubenc.c
libavcodec/ffv1dec.c
libavcodec/flacdec.c
libavcodec/flvdec.c
libavcodec/fraps.c
libavcodec/frwu.c
libavcodec/g726.c
libavcodec/gif.c
libavcodec/gifdec.c
libavcodec/h261dec.c
libavcodec/h263dec.c
libavcodec/iff.c
libavcodec/imc.c
libavcodec/libopencore-amr.c
libavcodec/libopenjpegdec.c
libavcodec/libopenjpegenc.c
libavcodec/libspeexenc.c
libavcodec/libvo-amrwbenc.c
libavcodec/libvorbisenc.c
libavcodec/libvpxenc.c
libavcodec/libx264.c
libavcodec/libxavs.c
libavcodec/libxvid.c
libavcodec/ljpegenc.c
libavcodec/mjpegbdec.c
libavcodec/mjpegdec.c
libavcodec/mpeg12dec.c
libavcodec/mpeg4videodec.c
libavcodec/msmpeg4dec.c
libavcodec/pgssubdec.c
libavcodec/pngdec.c
libavcodec/pngenc.c
libavcodec/proresdec_lgpl.c
libavcodec/proresenc_kostya.c
libavcodec/ra144enc.c
libavcodec/rawdec.c
libavcodec/rv10.c
libavcodec/sp5xdec.c
libavcodec/takdec.c
libavcodec/tta.c
libavcodec/v210dec.c
libavcodec/vp6.c
libavcodec/wavpack.c
libavcodec/xbmenc.c
libavcodec/yop.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-10-04 12:34:23 +02:00
b2bed9325d
cosmetics: Group .name and .long_name together in codec/format declarations
2013-10-03 23:32:01 +02:00
ae12d65538
lavcodec: Adding support for End Trimming in Opus encoder
...
Adds the end trimming value (duration to be trimmed from the end
of the file due to padding) to the packet's side data. This is
then made use by the muxer to put the value in the container.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-11 01:03:07 +02:00
a1f234be11
make the ordering of the return type and av_cold consistent
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-05 13:13:00 +02:00
1811f1d840
libopusenc: use ff_alloc_packet2
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-03-06 10:31:56 +00:00
13811b19d6
lavc/libopusenc: report an error if global_quality is set.
2013-02-27 19:01:34 +01:00
f5b31daa5e
libopusenc: use more specific and correct name for the channel order
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-10-02 17:34:10 +02:00
82db8ee321
Merge commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d'
...
* commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d':
avconv: improve sample format negotiation for decoder request
Opus encoder using libopus
mpegts: Drop pointless casting of hex_dump_debug arguments
avformat: const correctness for av_hex_dump / av_hex_dump_log
wmadec: Adjust debug printf argument length modifier
Conflicts:
Changelog
ffmpeg.c
libavcodec/libopusdec.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2012-10-02 14:58:19 +02:00
6cb8c85409
Opus encoder using libopus
...
Signed-off-by: Diego Biurrun <diego@biurrun.de >
2012-10-01 14:42:40 +02:00
