generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
33,148 Commits 24 Branches 241 Tags 173 MiB
39993860e1
Commit Graph

117 Commits

Author SHA1 Message Date
Michael Niedermayer
e89f58810d libx264: remove check_default_settings() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-28 18:13:52 +02:00
Michael Niedermayer
d5a3635b2c libx264: free x4->sei 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-26 18:53:12 +02:00
Mike Scheutzow
e2dae1faa8 Fix a buffer overflow in libx264 interface to x264 encoder. Previous code ignored the compressed buffer size passed in. This change returns as many complete NALs as can fit in the buffer, and logs an error message. 
Signed-off-by: Mike Scheutzow <mike.scheutzow@alcatel-lucent.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-26 18:48:38 +02:00
Michael Niedermayer
93869d4e44 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  libx264: introduce slice-max-size option
  Fixed size given to init_get_bits().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-16 21:43:56 +02:00
Luca Barbato
3a78fb57de libx264: introduce slice-max-size option 
Yet another option useful for low latency streaming.
 2011-09-16 07:56:17 -07:00
Andrew Wason
5e85fd9f9c libx264: fix overwriting presets with flags2 
This fixes overwriting x264 preset settings for flags2 based options.
See https://ffmpeg.org/trac/ffmpeg/ticket/448
 2011-09-12 22:12:47 +02:00
Andrew Wason
3eb1e65f5f libx264: fix overwriting preset rc_lookahead 
This fixes https://ffmpeg.org/trac/ffmpeg/ticket/448 - at least for
rc_lookahead. A similar problem still exists for the flags2 based
options.
 2011-09-12 21:35:24 +02:00
Michael Niedermayer
f1b5693027 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Add LATM muxer
  v210enc: clip values according to specifications
  v210enc: switch to PIX_FMT_422P10
  v210dec: switch to PIX_FMT_422P10
  AVOptions: remove AVOption.offset <= 0 checks
  AVOptions: deprecate av_opt_set_defaults2
  AVOptions: move doxy for av_opt_set_defaults() from opt.c to opt.h
  libx264: fix setting some more parameters
  libx264: fix setting the H.264 level
  libx264: add 'direct-pred' private option
  libx264: add 'partitions' private option

Conflicts:
	Changelog
	libavcodec/Makefile
	libavcodec/libx264.c
	libavcodec/v210enc.c
	libavfilter/src_movie.c
	libavformat/version.h
	libavutil/opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-07 22:58:39 +02:00
Anton Khirnov
0962f23b35 libx264: fix setting some more parameters 
Specifically, trellis, nr, me_range, me_method, subq, b_strategy,
keyint_min, chroma_me and coder.
Change their defaults to -1 and apply them after
x264_param_default_preset() if the user explicitly set them.
 2011-09-07 10:36:15 +02:00
Andrej Peterka
2bb5d637fc libx264: fix setting the H.264 level 
Move setting it after x264_param_default_preset()

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-09-07 09:16:06 +02:00
Anton Khirnov
9c684feadc libx264: add 'direct-pred' private option 
Deprecate AVCodecContext.directpred
 2011-09-07 07:27:55 +02:00
Anton Khirnov
0635a8aa21 libx264: add 'partitions' private option 
Deprecate AVCodecContext.partitions.
 2011-09-07 07:27:18 +02:00
Michael Niedermayer
2fd4901921 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  libx264: add 'cplxblur' private option
  libx264: add 'deblock' private option
  libx264: add 'b-bias' private option
  libx264: fix setting some options.
  libx264: remove useless assignment
  ac3dec: avoid pointless alloc and indirection for input_buffer
  mpeg12: cosmetics: reformat as K&R

Conflicts:
	libavcodec/libx264.c
	libavcodec/mpeg12.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-06 21:35:18 +02:00
Anton Khirnov
7042337673 libx264: add 'cplxblur' private option 
Deprecate AVCodecContext.complexityblur
 2011-09-06 21:03:41 +02:00
Anton Khirnov
71b5f4427b libx264: add 'deblock' private option 
Deprecate AVCodecContext.deblockalpha/deblockbeta
 2011-09-06 21:02:45 +02:00
Anton Khirnov
f83c45183e libx264: add 'b-bias' private option 
Deprecate AVCodecContext.bframebias.
 2011-09-06 20:14:35 +02:00
Anton Khirnov
bb73cda2f6 libx264: fix setting some options. 
Specifically: gop_size, max_b_frames, scenechange_threshold, qmin, qmax,
max_qdiff, qblur, qcompress and refs.

Change their default values to -1 and only use them if the user
explicitly set them. Otherwise x264 defaults are used.

Move setting those options after x264_param_default_preset(), so they
don't get overwritten by it.
 2011-09-06 20:13:28 +02:00
Anton Khirnov
d8dee0e7bd libx264: remove useless assignment 
priv_data is memset to 0.
 2011-09-06 20:13:11 +02:00
Michael Niedermayer
58677d73ed Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avconv: fix some bugs introduced in 630902a1e1
  libmp3lame: fix typo
  AVOptions: drop av_ prefix from static av_get_number().
  libx264: use X264_THREADS_AUTO constant instead of 0.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-01 22:08:44 +02:00
Anton Khirnov
1440037411 libx264: use X264_THREADS_AUTO constant instead of 0. 2011-09-01 10:12:30 +02:00
Michael Niedermayer
0ed7bc49a3 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (31 commits)
  libx264: set default thread count to 0 (auto)
  lavc: cosmetics, group deprecated codec flags
  mpeg12: add 'scan_offset' private option.
  h263/p encoder: add 'structured_slices' private option.
  h263/p encoder: add 'obmc' private option.
  h263p encoder: add 'aiv' private option.
  h263p encoder: add 'umv' private option.
  mpeg12enc/mpeg4videoenc: add 'alternate_scan' private option.
  mjpegdec: add 'extern_huff' private option.
  mpeg4enc: add 'data_partitioning' private option.
  snow: add 'memc_only' private option.
  libx264: add 'mbtree' private option.
  libx264: add 'psy' private option.
  libmp3lame: add 'reservoir' private option.
  mpeg2enc: add 'non_linear_quant' private option
  mpeg12enc: add drop_frame_timecode private option.
  mpeg12enc: add intra_vlc private option.
  VC1: Support dynamic dimension changes
  mjpeg: treat external huffman table setup failure as codec init failure if external huffman table use requested
  lavc: deprecate CODEC_FLAG2_BRDO
  ...

Conflicts:
	avconv.c
	libavcodec/libmp3lame.c
	libavcodec/libx264.c
	libavcodec/mjpegdec.c
	libavcodec/mpeg12enc.c
	libavcodec/mpegvideo.h
	libavcodec/vc1.c
	libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-01 00:01:21 +02:00
Anton Khirnov
5d06f15235 libx264: set default thread count to 0 (auto) 2011-08-31 17:39:13 +02:00
Anton Khirnov
0dc5e12f1e libx264: add 'mbtree' private option. 
Deprecate CODEC_FLAG2_MBTREE
 2011-08-31 13:24:02 +02:00
Anton Khirnov
38934f19fe libx264: add 'psy' private option. 
Deprecate CODEC_FLAG2_PSY
 2011-08-31 13:23:37 +02:00
Anton Khirnov
cf90c5d0e0 libx264: add 'aud' private option. 
Deprecate CODEC_FLAG2_AUD.
 2011-08-31 10:26:11 +02:00
Anton Khirnov
3b82aeeec0 libx264: add 'fast-pskip' private option. 
Deprecate CODEC_FLAG2_FASTPSKIP.
 2011-08-31 10:25:54 +02:00
Anton Khirnov
373257fa79 libx264: add '8x8dct' private option. 
Deprecate CODEC_FLAG2_8X8DCT.
 2011-08-31 10:25:34 +02:00
Anton Khirnov
eab21c32e3 libx264: add 'mixed-refs' private option. 
Deprecate CODEC_FLAG2_MIXED_REFS.
 2011-08-31 10:25:06 +02:00
Anton Khirnov
0f29699db7 libx264: add 'weightb' private option. 
Deprecate CODEC_FLAG2_BPYRAMID.
 2011-08-31 10:24:56 +02:00
Anton Khirnov
34dda1251d libx264: add 'b-pyramid' private option. 
Deprecate CODEC_FLAG2_BPYRAMID.
 2011-08-31 10:24:17 +02:00
Anton Khirnov
5d4a1048ee libx264: add 'intra-refresh' private option. 
Deprecate CODEC_FLAG2_INTRA_REFRESH.
 2011-08-31 10:23:26 +02:00
Anton Khirnov
faaecd4708 libx264: add 'ssim' private option. 
Deprecate CODEC_FLAG2_SSIM.
 2011-08-31 10:23:03 +02:00
Anton Khirnov
3b81636f33 libx264: make options compatible with x264 
Replace '_' with '-', merge psy-trellis into psy-rd and rename cqp->qp
Also fix typo pdy-rd -> psy-rd
 2011-08-31 10:21:36 +02:00
Michael Niedermayer
bd4640375e Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avconv: Replace goto redo on decode fail with continue.
  avconv: Remove dead store.
  libx264: add 'crf_max' private option.
  libx264: add 'weightp' private option.
  libx264: add 'rc_lookahead' private option.
  libx264: add 'psy_trellis' private option.
  libx264: add 'psy_rd' private option.
  libx264: add 'aq_strength' private option.
  libx264: add 'aq_mode' private option.
  libx264: add 'cqp' private option.
  libx264: add 'crf' private option.
  lavc: remove vbv_delay option
  lavf utils: Fix bad indentation.
  avconv: use av_clip_int16 for audio clipping

Conflicts:
	libavcodec/libx264.c
	libavcodec/options.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-24 20:26:48 +02:00
Anton Khirnov
4ae30cac22 libx264: add 'crf_max' private option. 
Deprecate corresponding global option.
 2011-08-24 14:33:40 +02:00
Anton Khirnov
c5dd0bc4ca libx264: add 'weightp' private option. 
Deprecate corresponding global option.
 2011-08-24 14:32:24 +02:00
Anton Khirnov
d4b9671318 libx264: add 'rc_lookahead' private option. 
Deprecate corresponding global option.
 2011-08-24 14:31:55 +02:00
Anton Khirnov
2a44a8f609 libx264: add 'psy_trellis' private option. 
Deprecate corresponding global option.
 2011-08-24 14:31:07 +02:00
Anton Khirnov
93e623c642 libx264: add 'psy_rd' private option. 
Deprecate corresponding global option.
 2011-08-24 14:30:25 +02:00
Anton Khirnov
5c75b2a0b7 libx264: add 'aq_strength' private option. 
Deprecate corresponding global option.
 2011-08-24 14:30:00 +02:00
Anton Khirnov
85254fcb46 libx264: add 'aq_mode' private option. 
Deprecate corresponding global option.
 2011-08-24 14:28:40 +02:00
Anton Khirnov
9d508e4914 libx264: add 'cqp' private option. 
Deprecate corresponding global option.
 2011-08-24 14:28:07 +02:00
Anton Khirnov
d5dc8cc297 libx264: add 'crf' private option. 
Deprecate corresponding global option.

Ideally all x264 private options should be generated automatically, but
x264 doesn't provide the API for this yet.
 2011-08-24 14:26:12 +02:00
Michael Niedermayer
124deea1a0 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  libx264: only use ABR mode when the user explicitly set bitrate.
  libx264: use medium preset by default.
  mp2 encoder: make 128k the default bitrate.
  movenc: use libx264 by default when possible for mov, mp4 and psp
  avienc: saner default audio codec.
  matroskaenc: saner default codecs.
  avplay: add examples of how to specify size/pixel format through private options
  lavc: add A|E|D flags to "ac" and "ar" options

Conflicts:
	doc/ffplay.texi
	libavcodec/libx264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-22 15:00:53 +02:00
Anton Khirnov
ae60927aef libx264: only use ABR mode when the user explicitly set bitrate. 2011-08-22 07:17:39 +02:00
Anton Khirnov
03eff2bf43 libx264: use medium preset by default. 2011-08-22 07:17:38 +02:00
Michael Niedermayer
0cb233cf46 Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925' 
* commit 'b2c087871dafc7d030b2d48457ddff597dfd4925':
  Move x86util.asm from libavcodec/ to libavutil/.
  Move x86inc.asm to libavutil/.
  APIchanges: note error_recognition in lavf
  lavf: add support for error_recognition, use it in avidec, and bump minor API version
  avconv: change semantics of -map
  avconv: get rid of new* options.
  cmdutils: allow precisely specifying a stream for AVOptions.
  configure: add missing CFLAGS to fix building on the HURD
  libx264: Include hint for possible values for configuring libx264
  cmdutils: allow ':'-separated modifiers in option names.
  avconv: make -map_metadata work consistently with the other options
  avconv: remove deprecated options.
  avconv: make -map_chapters accept only the input file index.
  Make a copy of ffmpeg under a new name -- avconv.
  ffmpeg: add a warning stating that the program is deprecated.
  Add weighted motion compensation for RV40 B-frames
  RV3/4: calculate B-frame motion weights once per frame
  Move RV3/4-specific DSP functions into their own context
  mjpeg: propagate decode errors from ff_mjpeg_decode_sos and ff_mjpeg_decode_dqt
  h264: notice memory allocation failure

Conflicts:
	.gitignore
	Makefile
	cmdutils.c
	configure
	doc/ffplay.texi
	doc/ffprobe.texi
	doc/ffserver.texi
	libavcodec/libx264.c
	libavformat/avformat.h
	libavformat/avidec.c
	libavformat/version.h
	tests/lavf-regression.sh
	tests/lavfi-regression.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-13 02:56:08 +02:00
Reinhard Tartler
69c4bee8fa libx264: Include hint for possible values for configuring libx264 
The output of the x264 commandline tool contains the most uptodate
description of the possible values for the -preset, -tune and -profile
options.
 2011-08-12 14:09:59 +02:00
Michael Niedermayer
9a5f61ac62 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  libx264: do not set pic quality if no frame is output
  libx264: add preset, tune, profile and fastfirstpass private options

Conflicts:
	libavcodec/libx264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-09 00:01:48 +02:00
Baptiste Coudurier
5caa2de19e libx264: do not set pic quality if no frame is output 
Avoids uninitialized reads.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-08-08 14:33:09 +02:00