February 2015 - ffmpeg-cvslog

Merge commit 'f726fc21ef76a8ba3445448066f7b2a687fbca16'
by git＠videolan.org 01 Feb '15

01 Feb '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sun Feb 1 13:22:21 2015 +0100| [9bacb576bcdfc86473c04dba8296426fe185ad07] | committer: Michael Niedermayer Merge commit 'f726fc21ef76a8ba3445448066f7b2a687fbca16' * commit 'f726fc21ef76a8ba3445448066f7b2a687fbca16': ogg: Provide an option to offset the serial number Conflicts: libavformat/oggenc.c Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9bacb576bcdfc8647… ---

1 0

ogg: Provide an option to offset the serial number
by git＠videolan.org 01 Feb '15

01 Feb '15

ffmpeg | branch: master | Luca Barbato <lu_zero(a)gentoo.org> | Fri Jan 30 17:29:22 2015 +0100| [f726fc21ef76a8ba3445448066f7b2a687fbca16] | committer: Luca Barbato ogg: Provide an option to offset the serial number The ogg serial number doubles as codec id and sequence value for concatenated samples. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f726fc21ef76a8ba3… --- doc/muxers.texi | 5 +++++ libavformat/oggenc.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index d71eb09..bcfdb49 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -504,6 +504,11 @@ is 1 second. A value of 0 will fill all segments, making pages as large as possible. A value of 1 will effectively use 1 packet-per-page in most situations, giving a small seek granularity at the cost of additional container overhead. +@item -serial_offset @var{value} +Serial value from which to set the streams serial number. +Setting it to different and sufficiently large values ensures that the produced +ogg files can be safely chained. + @end table @section segment diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c index c7d6491..1b2644d 100644 --- a/libavformat/oggenc.c +++ b/libavformat/oggenc.c @@ -71,12 +71,15 @@ typedef struct { OGGPageList *page_list; int pref_size; ///< preferred page size (0 => fill all segments) int64_t pref_duration; ///< preferred page duration (0 => fill all segments) + int serial_offset; } OGGContext; #define OFFSET(x) offsetof(OGGContext, x) #define PARAM AV_OPT_FLAG_ENCODING_PARAM static const AVOption options[] = { + { "serial_offset", "serial number offset", + OFFSET(serial_offset), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, PARAM }, { "pagesize", "preferred page size in bytes (deprecated)", OFFSET(pref_size), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, MAX_PAGE_SIZE, PARAM }, { "page_duration", "preferred page duration, in microseconds", @@ -418,7 +421,7 @@ static int ogg_write_header(AVFormatContext *s) for (i = 0; i < s->nb_streams; i++) { AVStream *st = s->streams[i]; - unsigned serial_num = i; + unsigned serial_num = i + ogg->serial_offset; if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) if (st->codec->codec_id == AV_CODEC_ID_OPUS)

1 0

avcodec/put_bits: remove unneeded #include, there are no assert()
by git＠videolan.org 01 Feb '15

01 Feb '15

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sat Jan 31 09:13:37 2015 +0000| [01a3c5dae0e07d81672839caac5b5bb2a7fc74fb] | committer: Paul B Mahol avcodec/put_bits: remove unneeded #include, there are no assert() Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=01a3c5dae0e07d816… --- libavcodec/put_bits.h | 1 - 1 file changed, 1 deletion(-) diff --git a/libavcodec/put_bits.h b/libavcodec/put_bits.h index 8858caa..81be6b3 100644 --- a/libavcodec/put_bits.h +++ b/libavcodec/put_bits.h @@ -28,7 +28,6 @@ #include <stdint.h> #include <stddef.h> -#include <assert.h> #include "libavutil/intreadwrite.h" #include "libavutil/avassert.h"

1 0

avcodec/motion_est: remove unneeded #include, there are no assert() only av_assert*
by git＠videolan.org 01 Feb '15

01 Feb '15

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sat Jan 31 09:26:54 2015 +0000| [021c0c5f5246351a290c701e7b5c98458ede1b54] | committer: Paul B Mahol avcodec/motion_est: remove unneeded #include, there are no assert() only av_assert* Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=021c0c5f5246351a2… --- libavcodec/motion_est.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index 749af72..a0a5965 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -36,9 +36,6 @@ #include "mpegutils.h" #include "mpegvideo.h" -#undef NDEBUG -#include <assert.h> - #define P_LEFT P[1] #define P_TOP P[2] #define P_TOPRIGHT P[3]

1 0

dvenc: fix 2x4x8 (interlaced) weight table
by git＠videolan.org 01 Feb '15

01 Feb '15

ffmpeg | branch: master | Christophe Gisquet <christophe.gisquet(a)gmail.com> | Fri Jan 30 19:43:03 2015 +0100| [cb335b3af2022ada18cd89cd503ca270c54129ac] | committer: Michael Niedermayer dvenc: fix 2x4x8 (interlaced) weight table Since the decoder has been fixed to output something similar to other implementations, the encoder weight table needed this fix. Reference PSNR values on a progressive sequence (from tiny_psnr) from a chained encoding and decoding: Full progressive: stddev: 0.74 PSNR: 50.69 MAXDIFF: 19 Before: stddev: 1.43 PSNR: 44.97 MAXDIFF: 17 This patch: stddev: 0.76 PSNR: 50.44 MAXDIFF: 14 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cb335b3af2022ada1… --- libavcodec/dvenc.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavcodec/dvenc.c b/libavcodec/dvenc.c index 7061508..2442f2b 100644 --- a/libavcodec/dvenc.c +++ b/libavcodec/dvenc.c @@ -232,14 +232,14 @@ static const int dv_weight_88[64] = { 170627, 165371, 160727, 153560, 160727, 144651, 144651, 136258, }; static const int dv_weight_248[64] = { - 131072, 242189, 257107, 237536, 229376, 200636, 242189, 223754, - 224969, 196781, 262144, 242189, 229376, 200636, 257107, 237536, - 211916, 185364, 235923, 217965, 229376, 211916, 206433, 180568, - 242189, 223754, 224969, 196781, 211916, 185364, 235923, 217965, - 200704, 175557, 222935, 205965, 200636, 185364, 195068, 170627, - 229376, 211916, 206433, 180568, 200704, 175557, 222935, 205965, - 175557, 153560, 188995, 174609, 165371, 144651, 200636, 185364, - 195068, 170627, 175557, 153560, 188995, 174609, 165371, 144651, + 131072, 262144, 257107, 257107, 242189, 242189, 242189, 242189, + 237536, 237536, 229376, 229376, 200636, 200636, 224973, 224973, + 223754, 223754, 235923, 235923, 229376, 229376, 217965, 217965, + 211916, 211916, 196781, 196781, 185364, 185364, 206433, 206433, + 211916, 211916, 222935, 222935, 200636, 200636, 205964, 205964, + 200704, 200704, 180568, 180568, 175557, 175557, 195068, 195068, + 185364, 185364, 188995, 188995, 174606, 174606, 175557, 175557, + 170627, 170627, 153560, 153560, 165371, 165371, 144651, 144651, }; static av_always_inline int dv_init_enc_block(EncBlockInfo *bi, uint8_t *data,

1 0