[FFmpeg-cvslog] avformat/segment: Fix "occured" typo
ffmpeg | branch: master | Michael Niedermayer | Thu
Mar 17 12:17:44 2016 +0100| [7660c135a30e4da8e833e0d563e83002c46e0594] |
committer: Michael Niedermayer
avformat/segment: Fix "occured" typo
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7660c135a30e4da8e833e0d563e83002c46e0594
---
libavformat/segment.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/segment.c b/libavformat/segment.c
index ccedd04..960a438 100644
--- a/libavformat/segment.c
+++ b/libavformat/segment.c
@@ -407,7 +407,7 @@ static int segment_end(AVFormatContext *s, int
write_trailer, int is_last)
rate = s->streams[i]->avg_frame_rate;/* Get fps from the
video stream */
err = av_timecode_init_from_string(&tc, rate, tcr->value,
s);
if (err < 0) {
-av_log(s, AV_LOG_WARNING, "Could not increment
timecode, error occured during timecode creation.");
+av_log(s, AV_LOG_WARNING, "Could not increment
timecode, error occurred during timecode creation.");
break;
}
tc.start += (int)((seg->cur_entry.end_time -
seg->cur_entry.start_time) * av_q2d(rate));/* increment timecode */
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] vc2enc_dwt: remove outdated comment
ffmpeg | branch: master | Rostislav Pehlivanov | Fri Mar
18 14:42:33 2016 +| [d6e76dd13239829a62db3b83d54163d797654bf9] | committer:
Rostislav Pehlivanov
vc2enc_dwt: remove outdated comment
Support for Haar was added a month or so ago.
Signed-off-by: Rostislav Pehlivanov
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d6e76dd13239829a62db3b83d54163d797654bf9
---
libavcodec/vc2enc_dwt.h |2 --
1 file changed, 2 deletions(-)
diff --git a/libavcodec/vc2enc_dwt.h b/libavcodec/vc2enc_dwt.h
index a39a1cd..af6fe3e 100644
--- a/libavcodec/vc2enc_dwt.h
+++ b/libavcodec/vc2enc_dwt.h
@@ -27,8 +27,6 @@
typedef int16_t dwtcoef;
-/* Only Deslauriers-Dubuc (9,7) and LeGall (5,3) supported! */
-
enum VC2TransformType {
VC2_TRANSFORM_9_7= 0, /* Deslauriers-Dubuc (9,7) */
VC2_TRANSFORM_5_3= 1, /* LeGall (5,3) */
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavf/avidec: Add blurb regarding the skipping of xxpc entries in the index
ffmpeg | branch: master | Mats Peterson | Fri Mar 18 11:09:18 2016 +0100| [d8a1633ee4b7141adac692831c1728dffd9c44d1] | committer: Michael Niedermayer lavf/avidec: Add blurb regarding the skipping of xxpc entries in the index Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d8a1633ee4b7141adac692831c1728dffd9c44d1 --- libavformat/avidec.c |2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 49c97d9..8ce07ab 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -1581,6 +1581,8 @@ static int avi_read_idx1(AVFormatContext *s, int size) st = s->streams[index]; ast = st->priv_data; +/* Skip 'xxpc' palette change entries in the index until a logic + * to process these is properly implemented. */ if ((tag >> 16 & 0xff) == 'p' && (tag >> 24 & 0xff) == 'c') continue; ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/resample: Remove disabled and faulty code
ffmpeg | branch: master | Michael Niedermayer | Wed
Mar 16 19:40:32 2016 +0100| [50ef7361cb5f78c94da2323f3bae86c6bbd618c8] |
committer: Michael Niedermayer
avcodec/resample: Remove disabled and faulty code
Fixes Ticket5345
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=50ef7361cb5f78c94da2323f3bae86c6bbd618c8
---
libavcodec/resample.c |6 --
1 file changed, 6 deletions(-)
diff --git a/libavcodec/resample.c b/libavcodec/resample.c
index 0f5ee84..4c5eb9f 100644
--- a/libavcodec/resample.c
+++ b/libavcodec/resample.c
@@ -291,12 +291,6 @@ int audio_resample(ReSampleContext *s, short *output,
short *input, int nb_sampl
short *output_bak = NULL;
int lenout;
-if (s->input_channels == s->output_channels && s->ratio == 1.0 && 0) {
-/* nothing to do */
-memcpy(output, input, nb_samples * s->input_channels * sizeof(short));
-return nb_samples;
-}
-
if (s->sample_fmt[0] != AV_SAMPLE_FMT_S16) {
int istride[1] = { s->sample_size[0] };
int ostride[1] = { 2 };
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] libwebpenc_animencoder: zero initialize the WebPAnimEncoderOptions struct
ffmpeg | branch: release/2.7 | James Almer | Thu Mar 17
00:50:08 2016 -0300| [c5e12dc10de83c70ce1ba88628c3691eb920ce53] | committer:
James Almer
libwebpenc_animencoder: zero initialize the WebPAnimEncoderOptions struct
This zeroes the WebPAnimEncoderOptions.verbose field, silencing library info
messages
printed to stderr.
Reviewed-by: James Zern
Signed-off-by: James Almer
(cherry picked from commit 626b6b769ced6d3e55d2661985ab2a1cb89f481e)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c5e12dc10de83c70ce1ba88628c3691eb920ce53
---
libavcodec/libwebpenc_animencoder.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/libwebpenc_animencoder.c
b/libavcodec/libwebpenc_animencoder.c
index e958201..7c1ac66 100644
--- a/libavcodec/libwebpenc_animencoder.c
+++ b/libavcodec/libwebpenc_animencoder.c
@@ -41,7 +41,7 @@ static av_cold int libwebp_anim_encode_init(AVCodecContext
*avctx)
int ret = ff_libwebp_encode_init_common(avctx);
if (!ret) {
LibWebPAnimContext *s = avctx->priv_data;
-WebPAnimEncoderOptions enc_options;
+WebPAnimEncoderOptions enc_options = { 0 };
WebPAnimEncoderOptionsInit(&enc_options);
// TODO(urvang): Expose some options on command-line perhaps.
s->enc = WebPAnimEncoderNew(avctx->width, avctx->height, &enc_options);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
Re: [FFmpeg-cvslog] lavc/dxva2_h264: Fix incorrect assert statement.
On 16 March 2016 at 22:32, Clément Bœsch wrote: > On Wed, Mar 16, 2016 at 12:31:35PM +0100, Matt Oliver wrote: > > ffmpeg | branch: master | Matt Oliver | Wed Mar > 16 22:28:29 2016 +1100| [109dfed7fc265f3e071854d5e6de5dd7f82ff9fb] | > committer: Matt Oliver > > > > lavc/dxva2_h264: Fix incorrect assert statement. > > > > Signed-off-by: Matt Oliver > > > > > > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=109dfed7fc265f3e071854d5e6de5dd7f82ff9fb > > --- > > > > libavcodec/dxva2_h264.c |7 ++- > > 1 file changed, 6 insertions(+), 1 deletion(-) > > > > diff --git a/libavcodec/dxva2_h264.c b/libavcodec/dxva2_h264.c > > index 61cce3a..54f2b80 100644 > > --- a/libavcodec/dxva2_h264.c > > +++ b/libavcodec/dxva2_h264.c > > @@ -426,7 +426,12 @@ static int > commit_bitstream_and_slice_buffer(AVCodecContext *avctx, > > slice_data = ctx_pic->slice_long; > > slice_size = ctx_pic->slice_count * > sizeof(*ctx_pic->slice_long); > > } > > -assert((bs->DataSize & 127) == 0); > > +#if CONFIG_D3D11VA > > +assertD3D11_VIDEO_DECODER_BUFFER_DESC *)bs)->DataSize & 127) == > 0); > > +#endif > > +#if CONFIG_DXVA2 > > +assertDXVA2_DecodeBufferDesc *)bs)->DataSize & 127) == 0); > > +#endif > > please use av_assert* My apologies, I just modified the existing assert usage so that it doesnt generate a compile error (which I thought was a rather trivial patch). There are other uses of assert instead of av_assert in the same file, do you want an additional patch that changes all uses (although im sure there are many other locations that use assert still) ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] dxva2_h264: fix size alignment asserts
ffmpeg | branch: master | Hendrik Leppkes | Wed Mar 16 13:12:59 2016 +0100| [c198295dedd5ef8e864c2794bf90c27848f23140] | committer: Hendrik Leppkes dxva2_h264: fix size alignment asserts Convert them to av_assert0 in the process > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c198295dedd5ef8e864c2794bf90c27848f23140 --- libavcodec/dxva2_h264.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/dxva2_h264.c b/libavcodec/dxva2_h264.c index 54f2b80..23cc9b1 100644 --- a/libavcodec/dxva2_h264.c +++ b/libavcodec/dxva2_h264.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/avassert.h" + #include "h264.h" #include "h264data.h" #include "mpegutils.h" @@ -405,6 +407,8 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx, dsc11->NumMBsInBuffer = mb_count; type = D3D11_VIDEO_DECODER_BUFFER_SLICE_CONTROL; + +av_assert0((dsc11->DataSize & 127) == 0); } #endif #if CONFIG_DXVA2 @@ -416,6 +420,8 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx, dsc2->NumMBsInBuffer = mb_count; type = DXVA2_SliceControlBufferType; + +av_assert0((dsc2->DataSize & 127) == 0); } #endif @@ -426,12 +432,6 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx, slice_data = ctx_pic->slice_long; slice_size = ctx_pic->slice_count * sizeof(*ctx_pic->slice_long); } -#if CONFIG_D3D11VA -assertD3D11_VIDEO_DECODER_BUFFER_DESC *)bs)->DataSize & 127) == 0); -#endif -#if CONFIG_DXVA2 -assertDXVA2_DecodeBufferDesc *)bs)->DataSize & 127) == 0); -#endif return ff_dxva2_commit_buffer(avctx, ctx, sc, type, slice_data, slice_size, mb_count); ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avfilter/vf_detelecine: Remove redundant declaration
ffmpeg | branch: master | Michael Niedermayer | Sat
Mar 19 12:26:14 2016 +0100| [48bda6c5f78c89cf3f341b7236e9d1f88259a08f] |
committer: Michael Niedermayer
avfilter/vf_detelecine: Remove redundant declaration
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=48bda6c5f78c89cf3f341b7236e9d1f88259a08f
---
libavfilter/vf_detelecine.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavfilter/vf_detelecine.c b/libavfilter/vf_detelecine.c
index 639a391..9a7b462 100644
--- a/libavfilter/vf_detelecine.c
+++ b/libavfilter/vf_detelecine.c
@@ -325,7 +325,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame
*inpicref)
}
s->nskip_fields = len;
-for (int i = 0; i < out; ++i) {
+for (i = 0; i < out; ++i) {
AVFrame *frame = av_frame_clone(s->frame[i]);
if (!frame) {
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavc/hevc: Allow arbitrary garbage in bytestream as long as at least one NAL unit is found.
ffmpeg | branch: master | Mark Thompson | Thu Mar 17 13:41:02
2016 +| [fbec157ea08f61063847bbe0dba28525e6283ff5] | committer: Michael
Niedermayer
lavc/hevc: Allow arbitrary garbage in bytestream as long as at least one NAL
unit is found.
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fbec157ea08f61063847bbe0dba28525e6283ff5
---
libavcodec/hevc_parse.c | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/libavcodec/hevc_parse.c b/libavcodec/hevc_parse.c
index 63ed84a..d557cc7 100644
--- a/libavcodec/hevc_parse.c
+++ b/libavcodec/hevc_parse.c
@@ -232,8 +232,14 @@ int ff_hevc_split_packet(HEVCContext *s, HEVCPacket *pkt,
const uint8_t *buf, in
++buf;
--length;
if (length < 4) {
-av_log(avctx, AV_LOG_ERROR, "No start code is found.\n");
-return AVERROR_INVALIDDATA;
+if (pkt->nb_nals > 0) {
+// No more start codes: we discarded some irrelevant
+// bytes at the end of the packet.
+return 0;
+} else {
+av_log(avctx, AV_LOG_ERROR, "No start code is
found.\n");
+return AVERROR_INVALIDDATA;
+}
}
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] vc2enc: increase the starting value of the size scaler
ffmpeg | branch: master | Rostislav Pehlivanov | Fri Mar 18 11:55:48 2016 +| [f4b30beac0c1a70d6da1e3ffe1e74e9e55397d8e] | committer: Rostislav Pehlivanov vc2enc: increase the starting value of the size scaler In some cases this caused the slice size rounding to generate invalid slice sizes and overwrite some slices. Signed-off-by: Rostislav Pehlivanov > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f4b30beac0c1a70d6da1e3ffe1e74e9e55397d8e --- libavcodec/vc2enc.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vc2enc.c b/libavcodec/vc2enc.c index 3bc60a3..f110dfc 100644 --- a/libavcodec/vc2enc.c +++ b/libavcodec/vc2enc.c @@ -971,7 +971,7 @@ static av_cold int vc2_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, int64_t max_frame_bytes, r_bitrate = avctx->bit_rate >> (s->interlaced); s->avctx = avctx; -s->size_scaler = 1; +s->size_scaler = 2; s->prefix_bytes = 0; s->last_parse_code = 0; s->next_parse_offset = 0; ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/error_resilience: wait for previous frame to be available
ffmpeg | branch: master | Michael Niedermayer | Fri
Mar 18 02:11:55 2016 +0100| [5694b2821132fa1da39ec6fc57cb6a8cf356865f] |
committer: Michael Niedermayer
avcodec/error_resilience: wait for previous frame to be available
This is possibly redundant but its more correct
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5694b2821132fa1da39ec6fc57cb6a8cf356865f
---
libavcodec/error_resilience.c |2 ++
1 file changed, 2 insertions(+)
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c
index 5a75fad..8bd2152 100644
--- a/libavcodec/error_resilience.c
+++ b/libavcodec/error_resilience.c
@@ -393,6 +393,8 @@ static void guess_mv(ERContext *s)
set_mv_strides(s, &mot_step, &mot_stride);
num_avail = 0;
+if (s->last_pic.motion_val[0])
+ff_thread_await_progress(s->last_pic.tf, mb_height-1, 0);
for (i = 0; i < mb_width * mb_height; i++) {
const int mb_xy = s->mb_index2xy[i];
int f = 0;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] libwebpenc_animencoder: zero initialize the WebPAnimEncoderOptions struct
ffmpeg | branch: release/3.0 | James Almer | Thu Mar 17
00:50:08 2016 -0300| [20d89a3a32716d0e485e74d43fc202c5a9f18ec8] | committer:
James Almer
libwebpenc_animencoder: zero initialize the WebPAnimEncoderOptions struct
This zeroes the WebPAnimEncoderOptions.verbose field, silencing library info
messages
printed to stderr.
Reviewed-by: James Zern
Signed-off-by: James Almer
(cherry picked from commit 626b6b769ced6d3e55d2661985ab2a1cb89f481e)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=20d89a3a32716d0e485e74d43fc202c5a9f18ec8
---
libavcodec/libwebpenc_animencoder.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/libwebpenc_animencoder.c
b/libavcodec/libwebpenc_animencoder.c
index d7437a9..35c456a 100644
--- a/libavcodec/libwebpenc_animencoder.c
+++ b/libavcodec/libwebpenc_animencoder.c
@@ -41,7 +41,7 @@ static av_cold int libwebp_anim_encode_init(AVCodecContext
*avctx)
int ret = ff_libwebp_encode_init_common(avctx);
if (!ret) {
LibWebPAnimContext *s = avctx->priv_data;
-WebPAnimEncoderOptions enc_options;
+WebPAnimEncoderOptions enc_options = { 0 };
WebPAnimEncoderOptionsInit(&enc_options);
// TODO(urvang): Expose some options on command-line perhaps.
s->enc = WebPAnimEncoderNew(avctx->width, avctx->height, &enc_options);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/mjpegenc_common: Store approximate aspect if exact cannot be stored
ffmpeg | branch: master | Michael Niedermayer | Sat
Mar 19 15:41:30 2016 +0100| [068026b0f7845e0f1850094d974f60d181480d64] |
committer: Michael Niedermayer
avcodec/mjpegenc_common: Store approximate aspect if exact cannot be stored
Fixes Ticket5244
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=068026b0f7845e0f1850094d974f60d181480d64
---
libavcodec/mjpegenc_common.c | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/libavcodec/mjpegenc_common.c b/libavcodec/mjpegenc_common.c
index 099d817..7a6fe746 100644
--- a/libavcodec/mjpegenc_common.c
+++ b/libavcodec/mjpegenc_common.c
@@ -122,6 +122,16 @@ static void jpeg_put_comments(AVCodecContext *avctx,
PutBitContext *p)
uint8_t *ptr;
if (avctx->sample_aspect_ratio.num > 0 && avctx->sample_aspect_ratio.den >
0) {
+AVRational sar = avctx->sample_aspect_ratio;
+
+if (sar.num > 65535 || sar.den > 65535) {
+if (!av_reduce(&sar.num, &sar.den, avctx->sample_aspect_ratio.num,
avctx->sample_aspect_ratio.den, 65535))
+av_log(avctx, AV_LOG_WARNING,
+"Cannot store exact aspect ratio %d:%d\n",
+avctx->sample_aspect_ratio.num,
+avctx->sample_aspect_ratio.den);
+}
+
/* JFIF header */
put_marker(p, APP0);
put_bits(p, 16, 16);
@@ -131,8 +141,8 @@ static void jpeg_put_comments(AVCodecContext *avctx,
PutBitContext *p)
* released revision. */
put_bits(p, 16, 0x0102);
put_bits(p, 8, 0); /* units type: 0 - aspect ratio */
-put_bits(p, 16, avctx->sample_aspect_ratio.num);
-put_bits(p, 16, avctx->sample_aspect_ratio.den);
+put_bits(p, 16, sar.num);
+put_bits(p, 16, sar.den);
put_bits(p, 8, 0); /* thumbnail width */
put_bits(p, 8, 0); /* thumbnail height */
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] libwebpenc_animencoder: print library messages in verbose log levels
ffmpeg | branch: release/3.0 | James Almer | Thu Mar 17
01:01:02 2016 -0300| [373bc77a356ad7e2cd51bd316c03750ad131c8fb] | committer:
James Almer
libwebpenc_animencoder: print library messages in verbose log levels
Reviewed-by: James Zern
Signed-off-by: James Almer
(cherry picked from commit f875ba48739f59691661393eed1f7cc2371c93f1)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=373bc77a356ad7e2cd51bd316c03750ad131c8fb
---
libavcodec/libwebpenc_animencoder.c |1 +
1 file changed, 1 insertion(+)
diff --git a/libavcodec/libwebpenc_animencoder.c
b/libavcodec/libwebpenc_animencoder.c
index 35c456a..61ecae8 100644
--- a/libavcodec/libwebpenc_animencoder.c
+++ b/libavcodec/libwebpenc_animencoder.c
@@ -43,6 +43,7 @@ static av_cold int libwebp_anim_encode_init(AVCodecContext
*avctx)
LibWebPAnimContext *s = avctx->priv_data;
WebPAnimEncoderOptions enc_options = { 0 };
WebPAnimEncoderOptionsInit(&enc_options);
+enc_options.verbose = av_log_get_level() >= AV_LOG_VERBOSE;
// TODO(urvang): Expose some options on command-line perhaps.
s->enc = WebPAnimEncoderNew(avctx->width, avctx->height, &enc_options);
if (!s->enc)
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] libwebpenc_animencoder: print library messages in verbose log levels
ffmpeg | branch: release/2.8 | James Almer | Thu Mar 17
01:01:02 2016 -0300| [175110a04128bd9f4aea1a185d3da4a4a2deee60] | committer:
James Almer
libwebpenc_animencoder: print library messages in verbose log levels
Reviewed-by: James Zern
Signed-off-by: James Almer
(cherry picked from commit f875ba48739f59691661393eed1f7cc2371c93f1)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=175110a04128bd9f4aea1a185d3da4a4a2deee60
---
libavcodec/libwebpenc_animencoder.c |1 +
1 file changed, 1 insertion(+)
diff --git a/libavcodec/libwebpenc_animencoder.c
b/libavcodec/libwebpenc_animencoder.c
index 35c456a..61ecae8 100644
--- a/libavcodec/libwebpenc_animencoder.c
+++ b/libavcodec/libwebpenc_animencoder.c
@@ -43,6 +43,7 @@ static av_cold int libwebp_anim_encode_init(AVCodecContext
*avctx)
LibWebPAnimContext *s = avctx->priv_data;
WebPAnimEncoderOptions enc_options = { 0 };
WebPAnimEncoderOptionsInit(&enc_options);
+enc_options.verbose = av_log_get_level() >= AV_LOG_VERBOSE;
// TODO(urvang): Expose some options on command-line perhaps.
s->enc = WebPAnimEncoderNew(avctx->width, avctx->height, &enc_options);
if (!s->enc)
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] libwebpenc_animencoder: print library messages in verbose log levels
ffmpeg | branch: master | James Almer | Thu Mar 17 01:01:02
2016 -0300| [f875ba48739f59691661393eed1f7cc2371c93f1] | committer: James Almer
libwebpenc_animencoder: print library messages in verbose log levels
Reviewed-by: James Zern
Signed-off-by: James Almer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f875ba48739f59691661393eed1f7cc2371c93f1
---
libavcodec/libwebpenc_animencoder.c |1 +
1 file changed, 1 insertion(+)
diff --git a/libavcodec/libwebpenc_animencoder.c
b/libavcodec/libwebpenc_animencoder.c
index 35c456a..61ecae8 100644
--- a/libavcodec/libwebpenc_animencoder.c
+++ b/libavcodec/libwebpenc_animencoder.c
@@ -43,6 +43,7 @@ static av_cold int libwebp_anim_encode_init(AVCodecContext
*avctx)
LibWebPAnimContext *s = avctx->priv_data;
WebPAnimEncoderOptions enc_options = { 0 };
WebPAnimEncoderOptionsInit(&enc_options);
+enc_options.verbose = av_log_get_level() >= AV_LOG_VERBOSE;
// TODO(urvang): Expose some options on command-line perhaps.
s->enc = WebPAnimEncoderNew(avctx->width, avctx->height, &enc_options);
if (!s->enc)
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/avio: Fix unknown protocol handling
ffmpeg | branch: master | Michael Niedermayer | Thu
Mar 17 01:53:02 2016 +0100| [6b7ce0ea0d6271cd78cec9baa48fc088bde5] |
committer: Michael Niedermayer
avformat/avio: Fix unknown protocol handling
Fixes regression since bb8cc89b2986df6f60831b67cd250da312cce1d0
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6b7ce0ea0d6271cd78cec9baa48fc088bde5
---
libavformat/avio.c | 18 ++
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/libavformat/avio.c b/libavformat/avio.c
index 0be820b..b2c2178 100644
--- a/libavformat/avio.c
+++ b/libavformat/avio.c
@@ -249,7 +249,6 @@ int ffurl_handshake(URLContext *c)
static const struct URLProtocol *url_find_protocol(const char *filename)
{
-const URLProtocol *up;
const URLProtocol **protocols;
char proto_str[128], proto_nested[128], *ptr;
size_t proto_len = strspn(filename, URL_SCHEME_CHARS);
@@ -271,16 +270,19 @@ static const struct URLProtocol *url_find_protocol(const
char *filename)
protocols = ffurl_get_protocols(NULL, NULL);
for (i = 0; protocols[i]; i++) {
-up = protocols[i];
-if (!strcmp(proto_str, up->name))
-break;
+const URLProtocol *up = protocols[i];
+if (!strcmp(proto_str, up->name)) {
+av_freep(&protocols);
+return up;
+}
if (up->flags & URL_PROTOCOL_FLAG_NESTED_SCHEME &&
-!strcmp(proto_nested, up->name))
-break;
+!strcmp(proto_nested, up->name)) {
+av_freep(&protocols);
+return up;
+}
}
-av_freep(&protocols);
-return up;
+return NULL;
}
int ffurl_alloc(URLContext **puc, const char *filename, int flags,
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] libwebpenc_animencoder: add missing braces to struct initialization
ffmpeg | branch: master | James Almer | Thu Mar 17 21:46:06
2016 -0300| [488e6409df2487a2aedbd5adb5ac3f7e74216588] | committer: James Almer
libwebpenc_animencoder: add missing braces to struct initialization
The first member of the WebPAnimEncoderOptions struct is non scalar
Signed-off-by: James Almer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=488e6409df2487a2aedbd5adb5ac3f7e74216588
---
libavcodec/libwebpenc_animencoder.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/libwebpenc_animencoder.c
b/libavcodec/libwebpenc_animencoder.c
index 61ecae8..91bf64c 100644
--- a/libavcodec/libwebpenc_animencoder.c
+++ b/libavcodec/libwebpenc_animencoder.c
@@ -41,7 +41,7 @@ static av_cold int libwebp_anim_encode_init(AVCodecContext
*avctx)
int ret = ff_libwebp_encode_init_common(avctx);
if (!ret) {
LibWebPAnimContext *s = avctx->priv_data;
-WebPAnimEncoderOptions enc_options = { 0 };
+WebPAnimEncoderOptions enc_options = { { 0 } };
WebPAnimEncoderOptionsInit(&enc_options);
enc_options.verbose = av_log_get_level() >= AV_LOG_VERBOSE;
// TODO(urvang): Expose some options on command-line perhaps.
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/file: Add crypto to default whitelist
ffmpeg | branch: master | Michael Niedermayer | Sat
Mar 19 18:37:53 2016 +0100| [efa98cdc2ff17a2f3b0ceb69e22864fd5bc433db] |
committer: Michael Niedermayer
avformat/file: Add crypto to default whitelist
Fixes Ticket5287
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=efa98cdc2ff17a2f3b0ceb69e22864fd5bc433db
---
libavformat/file.c |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavformat/file.c b/libavformat/file.c
index 0c16b49..f37db1a 100644
--- a/libavformat/file.c
+++ b/libavformat/file.c
@@ -345,7 +345,7 @@ const URLProtocol ff_file_protocol = {
.url_open_dir= file_open_dir,
.url_read_dir= file_read_dir,
.url_close_dir = file_close_dir,
-.default_whitelist = "file"
+.default_whitelist = "file,crypto"
};
#endif /* CONFIG_FILE_PROTOCOL */
@@ -384,7 +384,7 @@ const URLProtocol ff_pipe_protocol = {
.url_check = file_check,
.priv_data_size = sizeof(FileContext),
.priv_data_class = &pipe_class,
-.default_whitelist = "none"
+.default_whitelist = "crypto"
};
#endif /* CONFIG_PIPE_PROTOCOL */
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] libwebpenc_animencoder: print library messages in verbose log levels
ffmpeg | branch: release/2.7 | James Almer | Thu Mar 17
01:01:02 2016 -0300| [d2161b8a6daf0d519eb9ff9fd85d49bc95335441] | committer:
James Almer
libwebpenc_animencoder: print library messages in verbose log levels
Reviewed-by: James Zern
Signed-off-by: James Almer
(cherry picked from commit f875ba48739f59691661393eed1f7cc2371c93f1)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d2161b8a6daf0d519eb9ff9fd85d49bc95335441
---
libavcodec/libwebpenc_animencoder.c |1 +
1 file changed, 1 insertion(+)
diff --git a/libavcodec/libwebpenc_animencoder.c
b/libavcodec/libwebpenc_animencoder.c
index 7c1ac66..7a82ee6 100644
--- a/libavcodec/libwebpenc_animencoder.c
+++ b/libavcodec/libwebpenc_animencoder.c
@@ -43,6 +43,7 @@ static av_cold int libwebp_anim_encode_init(AVCodecContext
*avctx)
LibWebPAnimContext *s = avctx->priv_data;
WebPAnimEncoderOptions enc_options = { 0 };
WebPAnimEncoderOptionsInit(&enc_options);
+enc_options.verbose = av_log_get_level() >= AV_LOG_VERBOSE;
// TODO(urvang): Expose some options on command-line perhaps.
s->enc = WebPAnimEncoderNew(avctx->width, avctx->height, &enc_options);
if (!s->enc)
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavf/srtdec: do not be strict wrt timing digit lengths
ffmpeg | branch: master | Clément Bœsch | Fri Mar 18 16:41:20 2016 +0100| [7af3f27008b8406143a544f90590fd335806c1d7] | committer: Clément Bœsch lavf/srtdec: do not be strict wrt timing digit lengths Fixes a sample with 3-length digits for the seconds reported by wm4. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7af3f27008b8406143a544f90590fd335806c1d7 --- libavformat/srtdec.c |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/srtdec.c b/libavformat/srtdec.c index 6113f70..3734d39 100644 --- a/libavformat/srtdec.c +++ b/libavformat/srtdec.c @@ -53,7 +53,7 @@ static int srt_probe(AVProbeData *p) if (ff_subtitles_read_line(&tr, buf, sizeof(buf)) < 0) return 0; if (buf[0] >= '0' && buf[0] <= '9' && strstr(buf, " --> ") -&& sscanf(buf, "%*d:%*2d:%*2d%*1[,.]%*3d --> %*d:%*2d:%*2d%*1[,.]%3d", &v) == 1) +&& sscanf(buf, "%*d:%*d:%*d%*1[,.]%*d --> %*d:%*d:%*d%*1[,.]%d", &v) == 1) return AVPROBE_SCORE_MAX; return 0; @@ -74,7 +74,7 @@ static int get_event_info(const char *line, struct event_info *ei) ei->x1 = ei->x2 = ei->y1 = ei->y2 = ei->duration = -1; ei->pts = AV_NOPTS_VALUE; ei->pos = -1; -if (sscanf(line, "%d:%2d:%2d%*1[,.]%3d --> %d:%2d:%2d%*1[,.]%3d" +if (sscanf(line, "%d:%d:%d%*1[,.]%d --> %d:%d:%d%*1[,.]%d" "%*[ ]X1:%u X2:%u Y1:%u Y2:%u", &hh1, &mm1, &ss1, &ms1, &hh2, &mm2, &ss2, &ms2, ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavc/dxva2_h264: Fix incorrect assert statement.
ffmpeg | branch: master | Matt Oliver | Wed Mar 16 22:28:29 2016 +1100| [109dfed7fc265f3e071854d5e6de5dd7f82ff9fb] | committer: Matt Oliver lavc/dxva2_h264: Fix incorrect assert statement. Signed-off-by: Matt Oliver > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=109dfed7fc265f3e071854d5e6de5dd7f82ff9fb --- libavcodec/dxva2_h264.c |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavcodec/dxva2_h264.c b/libavcodec/dxva2_h264.c index 61cce3a..54f2b80 100644 --- a/libavcodec/dxva2_h264.c +++ b/libavcodec/dxva2_h264.c @@ -426,7 +426,12 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx, slice_data = ctx_pic->slice_long; slice_size = ctx_pic->slice_count * sizeof(*ctx_pic->slice_long); } -assert((bs->DataSize & 127) == 0); +#if CONFIG_D3D11VA +assertD3D11_VIDEO_DECODER_BUFFER_DESC *)bs)->DataSize & 127) == 0); +#endif +#if CONFIG_DXVA2 +assertDXVA2_DecodeBufferDesc *)bs)->DataSize & 127) == 0); +#endif return ff_dxva2_commit_buffer(avctx, ctx, sc, type, slice_data, slice_size, mb_count); ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avfilter/vf_waveform: add graticule to aflat filter
ffmpeg | branch: master | Paul B Mahol | Sat Mar 19 21:47:15
2016 +0100| [959c7dad88b63b721d55646ce17f7f90a46ab651] | committer: Paul B Mahol
avfilter/vf_waveform: add graticule to aflat filter
Signed-off-by: Paul B Mahol
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=959c7dad88b63b721d55646ce17f7f90a46ab651
---
libavfilter/vf_waveform.c | 125 +
1 file changed, 125 insertions(+)
diff --git a/libavfilter/vf_waveform.c b/libavfilter/vf_waveform.c
index b7a9e3c..82ceb6f 100644
--- a/libavfilter/vf_waveform.c
+++ b/libavfilter/vf_waveform.c
@@ -1731,6 +1731,102 @@ static const uint8_t black_yuva_color[4] = { 0, 127,
127, 255 };
static const uint8_t green_yuva_color[4] = { 255, 0, 0, 255 };
static const uint8_t black_gbrp_color[4] = { 0, 0, 0, 255 };
+static const GraticuleLines aflat_digital8[] = {
+{ { { "16", 16+128 }, { "16", 16+128 }, { "16", 16+128 }, { "0",
0+128 } } },
+{ { { "128", 128+128 }, { "128", 128+128 }, { "128", 128+128 }, { "128",
128+128 } } },
+{ { { "235", 235+128 }, { "240", 240+128 }, { "240", 240+128 }, { "255",
255+128 } } },
+};
+
+static const GraticuleLines aflat_digital9[] = {
+{ { { "32", 32+256 }, { "32", 32+256 }, { "32", 32+256 }, { "0",
0+256 } } },
+{ { { "256", 256+256 }, { "256", 256+256 }, { "256", 256+256 }, { "256",
256+256 } } },
+{ { { "470", 470+256 }, { "480", 480+256 }, { "480", 480+256 }, { "511",
511+256 } } },
+};
+
+static const GraticuleLines aflat_digital10[] = {
+{ { { "64", 64+512 }, { "64", 64+512 }, { "64", 64+512 }, {"0",
0+512 } } },
+{ { { "512", 512+512 }, { "512", 512+512 }, { "512", 512+512 }, { "512",
512+512 } } },
+{ { { "940", 940+512 }, { "960", 960+512 }, { "960", 960+512 }, { "1023",
1023+512 } } },
+};
+
+static const GraticuleLines aflat_digital12[] = {
+{ { { "256", 256+2048 }, { "256", 256+2048 }, { "256", 256+2048 }, {
"0",0+2048 } } },
+{ { { "2048", 2048+2048 }, { "2048", 2048+2048 }, { "2048", 2048+2048 }, {
"2048", 2048+2048 } } },
+{ { { "3760", 3760+2048 }, { "3840", 3840+2048 }, { "3840", 3840+2048 }, {
"4095", 4095+2048 } } },
+};
+
+static const GraticuleLines aflat_millivolts8[] = {
+{ { { "0", 16+128 }, { "0", 16+128 }, { "0", 16+128 }, { "0",
0+128 } } },
+{ { { "175", 71+128 }, { "175", 72+128 }, { "175", 72+128 }, { "175",
64+128 } } },
+{ { { "350", 126+128 }, { "350", 128+128 }, { "350", 128+128 }, { "350",
128+128 } } },
+{ { { "525", 180+128 }, { "525", 184+128 }, { "525", 184+128 }, { "525",
192+128 } } },
+{ { { "700", 235+128 }, { "700", 240+128 }, { "700", 240+128 }, { "700",
255+128 } } },
+};
+
+static const GraticuleLines aflat_millivolts9[] = {
+{ { { "0", 32+256 }, { "0", 32+256 }, { "0", 32+256 }, { "0",
0+256 } } },
+{ { { "175", 142+256 }, { "175", 144+256 }, { "175", 144+256 }, { "175",
128+256 } } },
+{ { { "350", 251+256 }, { "350", 256+256 }, { "350", 256+256 }, { "350",
256+256 } } },
+{ { { "525", 361+256 }, { "525", 368+256 }, { "525", 368+256 }, { "525",
384+256 } } },
+{ { { "700", 470+256 }, { "700", 480+256 }, { "700", 480+256 }, { "700",
511+256 } } },
+};
+
+static const GraticuleLines aflat_millivolts10[] = {
+{ { { "0", 64+512 }, { "0", 64+512 }, { "0", 64+512 }, { "0",
0+512 } } },
+{ { { "175", 283+512 }, { "175", 288+512 }, { "175", 288+512 }, { "175",
256+512 } } },
+{ { { "350", 502+512 }, { "350", 512+512 }, { "350", 512+512 }, { "350",
512+512 } } },
+{ { { "525", 721+512 }, { "525", 736+512 }, { "525", 736+512 }, { "525",
768+512 } } },
+{ { { "700", 940+512 }, { "700", 960+512 }, { "700", 960+512 }, { "700",
1023+512 } } },
+};
+
+static const GraticuleLines aflat_millivolts12[] = {
+{ { { "0", 256+2048 }, { "0", 256+2048 }, { "0", 256+2048 }, {
"0",0+2048 } } },
+{ { { "175", 1132+2048 }, { "175", 1152+2048 }, { "175", 1152+2048 }, {
"175", 1024+2048 } } },
+{ { { "350", 2008+2048 }, { "350", 2048+2048 }, { "350", 2048+2048 }, {
"350", 2048+2048 } } },
+{ { { "525", 2884+2048 }, { "525", 2944+2048 }, { "525", 2944+2048 }, {
"525", 3072+2048 } } },
+{ { { "700", 3760+2048 }, { "700", 3840+2048 }, { "700", 3840+2048 }, {
"700", 4095+2048 } } },
+};
+
+static const GraticuleLines aflat_ire8[] = {
+{ { { "-25", -39+128 }, { "-25", -40+128 }, { "-25", -40+128 }, { "-25",
-64+128 } } },
+{ { { "0", 16+128 }, { "0", 16+128 }, { "0", 16+128 }, { "0",
0+128 } } },
+{ { { "25", 71+128 }, { "25", 72+128 }, { "25", 72+128 }, { "25",
64+128 } } },
+{ { { "50", 126+128 }, { "50", 128+128 }, { "50", 128+128 }, { "50",
128+128 } } },
+{ { { "75", 180+128 }, { "75", 184+128 }, { "75", 184+128 }, { "75",
192+128 } } },
+{ { { "100", 235+128 }, { "100", 240+128 }, { "100", 240+128 }, { "100",
256+128 } } },
+
[FFmpeg-cvslog] avfilter/vf_waveform: add subsampling input support for remaining filters
ffmpeg | branch: master | Paul B Mahol | Sat Mar 19 20:44:59
2016 +0100| [c91b20c464b64ea03b488d76c3151088aceb] | committer: Paul B Mahol
avfilter/vf_waveform: add subsampling input support for remaining filters
Remove achroma filter, as same output can be done with lowpass filter
and multiple components with overlay display.
Signed-off-by: Paul B Mahol
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c91b20c464b64ea03b488d76c3151088aceb
---
doc/filters.texi |3 -
libavfilter/vf_waveform.c | 392 -
2 files changed, 138 insertions(+), 257 deletions(-)
diff --git a/doc/filters.texi b/doc/filters.texi
index c093927..e6ffbed 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -13171,9 +13171,6 @@ Similar as above, but shows difference between blue and
red chroma.
@item chroma
Displays only chroma.
-@item achroma
-Similar as above, but shows difference between blue and red chroma.
-
@item color
Displays actual color value on waveform.
diff --git a/libavfilter/vf_waveform.c b/libavfilter/vf_waveform.c
index a89d1ed..b7a9e3c 100644
--- a/libavfilter/vf_waveform.c
+++ b/libavfilter/vf_waveform.c
@@ -34,7 +34,6 @@ enum FilterType {
FLAT,
AFLAT,
CHROMA,
-ACHROMA,
COLOR,
ACOLOR,
NB_FILTERS
@@ -128,7 +127,6 @@ static const AVOption waveform_options[] = {
{ "flat" , NULL, 0, AV_OPT_TYPE_CONST, {.i64=FLAT},0, 0, FLAGS,
"filter" },
{ "aflat" , NULL, 0, AV_OPT_TYPE_CONST, {.i64=AFLAT}, 0, 0, FLAGS,
"filter" },
{ "chroma", NULL, 0, AV_OPT_TYPE_CONST, {.i64=CHROMA}, 0, 0, FLAGS,
"filter" },
-{ "achroma", NULL, 0, AV_OPT_TYPE_CONST, {.i64=ACHROMA}, 0, 0, FLAGS,
"filter" },
{ "color", NULL, 0, AV_OPT_TYPE_CONST, {.i64=COLOR}, 0, 0, FLAGS,
"filter" },
{ "acolor", NULL, 0, AV_OPT_TYPE_CONST, {.i64=ACOLOR}, 0, 0, FLAGS,
"filter" },
{ "graticule", "set graticule", OFFSET(graticule), AV_OPT_TYPE_INT,
{.i64=0}, 0, 1, FLAGS, "graticule" },
@@ -186,6 +184,21 @@ static const enum AVPixelFormat in_color_pix_fmts[] = {
AV_PIX_FMT_NONE
};
+static const enum AVPixelFormat in_flat_pix_fmts[] = {
+AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P,
+AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV440P,
+AV_PIX_FMT_YUV411P,
+AV_PIX_FMT_YUVJ440P, AV_PIX_FMT_YUVJ411P, AV_PIX_FMT_YUVJ420P,
+AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ444P,
+AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUVA422P, AV_PIX_FMT_YUVA420P,
+AV_PIX_FMT_YUV444P9, AV_PIX_FMT_YUV422P9, AV_PIX_FMT_YUV420P9,
+AV_PIX_FMT_YUVA444P9, AV_PIX_FMT_YUVA422P9, AV_PIX_FMT_YUVA420P9,
+AV_PIX_FMT_YUV444P10, AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV420P10,
+AV_PIX_FMT_YUVA444P10, AV_PIX_FMT_YUVA422P10, AV_PIX_FMT_YUVA420P10,
+AV_PIX_FMT_YUV444P12, AV_PIX_FMT_YUV422P12, AV_PIX_FMT_YUV420P12,
AV_PIX_FMT_YUV440P12,
+AV_PIX_FMT_NONE
+};
+
static const enum AVPixelFormat out_rgb8_lowpass_pix_fmts[] = {
AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP,
AV_PIX_FMT_NONE
@@ -241,30 +254,12 @@ static const enum AVPixelFormat flat_pix_fmts[] = {
static int query_formats(AVFilterContext *ctx)
{
WaveformContext *s = ctx->priv;
-AVFilterFormats *fmts_list;
const enum AVPixelFormat *out_pix_fmts;
const enum AVPixelFormat *in_pix_fmts;
-const enum AVPixelFormat *pix_fmts;
const AVPixFmtDescriptor *desc;
AVFilterFormats *avff;
int depth, rgb, i, ret, ncomp;
-if (s->filter != LOWPASS &&
-s->filter != COLOR &&
-s->filter != ACOLOR) {
-switch (s->filter) {
-case FLAT:
-case AFLAT:
-case CHROMA:
-case ACHROMA: pix_fmts = flat_pix_fmts;break;
-}
-
-fmts_list = ff_make_format_list(pix_fmts);
-if (!fmts_list)
-return AVERROR(ENOMEM);
-return ff_set_common_formats(ctx, fmts_list);
-}
-
if (!ctx->inputs[0]->in_formats ||
!ctx->inputs[0]->in_formats->nb_formats) {
return AVERROR(EAGAIN);
@@ -272,6 +267,9 @@ static int query_formats(AVFilterContext *ctx)
switch (s->filter) {
case LOWPASS: in_pix_fmts = in_lowpass_pix_fmts; break;
+case CHROMA:
+case AFLAT:
+case FLAT:in_pix_fmts = in_flat_pix_fmts;break;
case ACOLOR:
case COLOR: in_pix_fmts = in_color_pix_fmts; break;
}
@@ -711,6 +709,12 @@ static void flat16(WaveformContext *s, AVFrame *in,
AVFrame *out,
const int c0_linesize = in->linesize[ plane + 0 ] / 2;
const int c1_linesize = in->linesize[(plane + 1) % s->ncomp] / 2;
const int c2_linesize = in->linesize[(plane + 2) % s->ncomp] / 2;
+const int c0_shift_w = s->shift_w[ component + 0 ];
+const int c1_shift_w = s->shift_w[(component + 1) % s->ncomp];
+const int c2_shift_w = s->shift_w[(component + 2) % s->ncomp];
+const int c0_shift_h = s->shift_h[ component + 0 ];
+const int c1_shift_h = s->shift_h[(component + 1) % s->ncomp];
+cons
Re: [FFmpeg-cvslog] lavc/dxva2_h264: Fix incorrect assert statement.
On Wed, Mar 16, 2016 at 12:31:35PM +0100, Matt Oliver wrote: > ffmpeg | branch: master | Matt Oliver | Wed Mar 16 > 22:28:29 2016 +1100| [109dfed7fc265f3e071854d5e6de5dd7f82ff9fb] | committer: > Matt Oliver > > lavc/dxva2_h264: Fix incorrect assert statement. > > Signed-off-by: Matt Oliver > > > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=109dfed7fc265f3e071854d5e6de5dd7f82ff9fb > --- > > libavcodec/dxva2_h264.c |7 ++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/libavcodec/dxva2_h264.c b/libavcodec/dxva2_h264.c > index 61cce3a..54f2b80 100644 > --- a/libavcodec/dxva2_h264.c > +++ b/libavcodec/dxva2_h264.c > @@ -426,7 +426,12 @@ static int > commit_bitstream_and_slice_buffer(AVCodecContext *avctx, > slice_data = ctx_pic->slice_long; > slice_size = ctx_pic->slice_count * sizeof(*ctx_pic->slice_long); > } > -assert((bs->DataSize & 127) == 0); > +#if CONFIG_D3D11VA > +assertD3D11_VIDEO_DECODER_BUFFER_DESC *)bs)->DataSize & 127) == 0); > +#endif > +#if CONFIG_DXVA2 > +assertDXVA2_DecodeBufferDesc *)bs)->DataSize & 127) == 0); > +#endif please use av_assert* [...] -- Clément B. signature.asc Description: PGP signature ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/wtvdec: Set AVFMTCTX_NOHEADER
ffmpeg | branch: master | Michael Niedermayer | Sat
Mar 19 22:37:52 2016 +0100| [92dfeb5c31009b93a1b6cabe596c0548f54e5fc3] |
committer: Michael Niedermayer
avformat/wtvdec: Set AVFMTCTX_NOHEADER
Needed for noStreams.wtv unless something else forces continued parsing (like
looking for more than 1
frame in attachments)
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=92dfeb5c31009b93a1b6cabe596c0548f54e5fc3
---
libavformat/wtvdec.c |2 ++
1 file changed, 2 insertions(+)
diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c
index 16f1ef7..1c3aa26 100644
--- a/libavformat/wtvdec.c
+++ b/libavformat/wtvdec.c
@@ -1005,6 +1005,8 @@ static int read_header(AVFormatContext *s)
wtvfile_close(pb);
}
+s->ctx_flags |= AVFMTCTX_NOHEADER; // Needed for noStreams.wtv
+
/* read seek index */
if (s->nb_streams) {
AVStream *st = s->streams[0];
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/utils: Do not wait for more than 1 frame on attachments
ffmpeg | branch: master | Michael Niedermayer | Sat Mar 19 22:11:34 2016 +0100| [0ffa9e6ebae3be30ac84aed489ad723567a68f3d] | committer: Michael Niedermayer avformat/utils: Do not wait for more than 1 frame on attachments Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0ffa9e6ebae3be30ac84aed489ad723567a68f3d --- libavformat/utils.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 2936ed5..5cff3a7 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3313,7 +3313,7 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) break; if (st->first_dts == AV_NOPTS_VALUE && !(ic->iformat->flags & AVFMT_NOTIMESTAMPS) && -st->codec_info_nb_frames < ic->max_ts_probe && +st->codec_info_nb_frames < ((st->disposition & AV_DISPOSITION_ATTACHED_PIC) ? 1 : ic->max_ts_probe) && (st->codec->codec_type == AVMEDIA_TYPE_VIDEO || st->codec->codec_type == AVMEDIA_TYPE_AUDIO)) break; ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] libwebpenc_animencoder: zero initialize the WebPAnimEncoderOptions struct
ffmpeg | branch: master | James Almer | Thu Mar 17 00:50:08
2016 -0300| [626b6b769ced6d3e55d2661985ab2a1cb89f481e] | committer: James Almer
libwebpenc_animencoder: zero initialize the WebPAnimEncoderOptions struct
This zeroes the WebPAnimEncoderOptions.verbose field, silencing library info
messages
printed to stderr.
Reviewed-by: James Zern
Signed-off-by: James Almer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=626b6b769ced6d3e55d2661985ab2a1cb89f481e
---
libavcodec/libwebpenc_animencoder.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/libwebpenc_animencoder.c
b/libavcodec/libwebpenc_animencoder.c
index d7437a9..35c456a 100644
--- a/libavcodec/libwebpenc_animencoder.c
+++ b/libavcodec/libwebpenc_animencoder.c
@@ -41,7 +41,7 @@ static av_cold int libwebp_anim_encode_init(AVCodecContext
*avctx)
int ret = ff_libwebp_encode_init_common(avctx);
if (!ret) {
LibWebPAnimContext *s = avctx->priv_data;
-WebPAnimEncoderOptions enc_options;
+WebPAnimEncoderOptions enc_options = { 0 };
WebPAnimEncoderOptionsInit(&enc_options);
// TODO(urvang): Expose some options on command-line perhaps.
s->enc = WebPAnimEncoderNew(avctx->width, avctx->height, &enc_options);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/motion_est_template: Fix map cache use in qpel_motion_search()
ffmpeg | branch: master | Michael Niedermayer | Thu Mar 17 16:10:12 2016 +0100| [83df0a84a99d8291e5e1c5f7e2289cbd89107881] | committer: Michael Niedermayer avcodec/motion_est_template: Fix map cache use in qpel_motion_search() Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=83df0a84a99d8291e5e1c5f7e2289cbd89107881 --- libavcodec/motion_est_template.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/motion_est_template.c b/libavcodec/motion_est_template.c index 327a24b..9f6b2c2 100644 --- a/libavcodec/motion_est_template.c +++ b/libavcodec/motion_est_template.c @@ -299,7 +299,7 @@ static int qpel_motion_search(MpegEncContext * s, const int cy2= b + t - 2*c; int cxy; -if(map[(index-(1
[FFmpeg-cvslog] matroskaenc: set the actual PCM bitdepth in the header
ffmpeg | branch: master | Hendrik Leppkes | Wed Mar 16
12:39:19 2016 +0100| [c43d4858119e79db0c24f673bcbf20eb3870b307] | committer:
Hendrik Leppkes
matroskaenc: set the actual PCM bitdepth in the header
The actual bitdepth can be different to the storage format (ie. sample format).
Fixes the stored bitdepth for 24-bit formats like FLAC.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c43d4858119e79db0c24f673bcbf20eb3870b307
---
libavformat/matroskaenc.c |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 05b1b94..6ad9aed 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -850,8 +850,12 @@ static int mkv_write_track(AVFormatContext *s,
MatroskaMuxContext *mkv,
return 0;
}
-if (!bit_depth && codec->codec_id != AV_CODEC_ID_ADPCM_G726)
-bit_depth = av_get_bytes_per_sample(codec->sample_fmt) << 3;
+if (!bit_depth && codec->codec_id != AV_CODEC_ID_ADPCM_G726) {
+if (codec->bits_per_raw_sample)
+bit_depth = codec->bits_per_raw_sample;
+else
+bit_depth = av_get_bytes_per_sample(codec->sample_fmt) << 3;
+}
if (!bit_depth)
bit_depth = codec->bits_per_coded_sample;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] configure: check for SEC_I_CONTEXT_EXPIRED before enabling SChannel
ffmpeg | branch: release/3.0 | Hendrik Leppkes | Wed Mar
16 15:23:28 2016 +0100| [ee7c347935c02507b9a447f0e3d0869927f4c7de] | committer:
Hendrik Leppkes
configure: check for SEC_I_CONTEXT_EXPIRED before enabling SChannel
Fixes build on mingw32, which lacks this constant.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ee7c347935c02507b9a447f0e3d0869927f4c7de
---
configure |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure b/configure
index 2148f11..475c087 100755
--- a/configure
+++ b/configure
@@ -5659,7 +5659,7 @@ disabled securetransport || { check_func
SecIdentityCreate "-Wl,-framework,CoreF
enable securetransport; }
disabled schannel || { check_func_headers "windows.h Security.h"
InitializeSecurityContext -DSECURITY_WIN32 -lSecur32 &&
- enable schannel && add_extralibs -lSecur32; }
+ check_cpp_condition winerror.h
"defined(SEC_I_CONTEXT_EXPIRED)" && enable schannel && add_extralibs -lSecur32;
}
makeinfo --version > /dev/null 2>&1 && enable makeinfo || disable makeinfo
enabled makeinfo \
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/error_resilience: remove unneeded and disabled code
ffmpeg | branch: master | Michael Niedermayer | Thu
Mar 17 21:03:17 2016 +0100| [a7b8a6e704d3bea4a2bf724b6b6a3b1de1b08886] |
committer: Michael Niedermayer
avcodec/error_resilience: remove unneeded and disabled code
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a7b8a6e704d3bea4a2bf724b6b6a3b1de1b08886
---
libavcodec/error_resilience.c | 21 +++--
1 file changed, 3 insertions(+), 18 deletions(-)
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c
index 8bd2152..20af436 100644
--- a/libavcodec/error_resilience.c
+++ b/libavcodec/error_resilience.c
@@ -582,24 +582,9 @@ skip_mean_and_median:
/* zero MV */
pred_count++;
-if (!fixed[mb_xy] && 0) {
-if (s->avctx->codec_id == AV_CODEC_ID_H264) {
-// FIXME
-} else {
-ff_thread_await_progress(s->last_pic.tf,
- mb_y, 0);
-}
-if (!s->last_pic.motion_val[0] ||
-!s->last_pic.ref_index[0])
-goto skip_last_mv;
-prev_x = s->last_pic.motion_val[0][mot_index][0];
-prev_y = s->last_pic.motion_val[0][mot_index][1];
-prev_ref = s->last_pic.ref_index[0][4 * mb_xy];
-} else {
-prev_x = s->cur_pic.motion_val[0][mot_index][0];
-prev_y = s->cur_pic.motion_val[0][mot_index][1];
-prev_ref = s->cur_pic.ref_index[0][4 * mb_xy];
-}
+prev_x = s->cur_pic.motion_val[0][mot_index][0];
+prev_y = s->cur_pic.motion_val[0][mot_index][1];
+prev_ref = s->cur_pic.ref_index[0][4 * mb_xy];
/* last MV */
mv_predictor[pred_count][0] = prev_x;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
