fix ticket: #6490
Signed-off-by: Steven Liu
---
libavformat/hls.c | 4
1 file changed, 4 insertions(+)
diff --git a/libavformat/hls.c b/libavformat/hls.c
index 0995345bbf..7572fe6e06 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -898,6 +898,10 @@ static int
On Wed, Aug 30, 2017 at 5:09 PM, Michael Niedermayer
wrote:
> On Tue, Aug 29, 2017 at 11:40:06AM -0700, Alex Converse wrote:
>> Fixes ticket 6398.
>>
>> Debugged with the help of James Almer and Hendrik Leppkes.
>> ---
>> libavformat/flvdec.c | 1 +
>> 1 file changed, 1
From: Pavel Koshevoy
Steps to reproduce:
1. revert 4240e5b047379b29c33dd3f4438bc4e610527b83
2. ./ffmpeg -f lavfi -i sine=d=1 -af aselect=e=0,atempo=0.5 -y atempo.wav
---
libavfilter/af_atempo.c | 5 +
1 file changed, 5 insertions(+)
diff --git a/libavfilter/af_atempo.c
On 8/30/2017 2:14 AM, James Almer wrote:
> Signed-off-by: James Almer
> ---
> libavfilter/lavfutils.c | 20 +---
> 1 file changed, 17 insertions(+), 3 deletions(-)
Ping.
___
ffmpeg-devel mailing list
From: Pavel Koshevoy
This reverts commit 4240e5b047379b29c33dd3f4438bc4e610527b83.
---
libavfilter/af_atempo.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavfilter/af_atempo.c b/libavfilter/af_atempo.c
index 944df1dd32..9eee8a63a8 100644
---
Skip the invalid data in an attempt to find one instead, and continue decoding
from there.
Fixes ticket #6634
Signed-off-by: James Almer
---
libavformat/aacdec.c | 41 +
1 file changed, 29 insertions(+), 12 deletions(-)
diff --git
On Sun, Sep 3, 2017 at 9:26 AM, Marton Balint wrote:
>
> On Sun, 3 Sep 2017, Pavel Koshevoy wrote:
>
>> On 08/30/2017 03:01 PM, Pavel Koshevoy wrote:
>> You can probably revert 4240e5b047379b29c33dd3f4438bc4e610527b83 -- I
>> tried it locally and I no longer see the false
Hi,
On Sun, Sep 3, 2017 at 7:54 PM, Michael Niedermayer
wrote:
> Its unprofessional to fail decoding a file but not provide any
> hint as to why a failure occured.
>
[..]
> Our code is already quite terse and devoid of comments and
> documentation, error messages do not
On Mon, 4 Sep 2017 at 00:56 Michael Niedermayer
wrote:
> We have always printed error messages for the case that an error
> occured.
> Its unprofessional to fail decoding a file but not provide any
> hint as to why a failure occured.
>
> If we remove all error messages
On Sun, Sep 03, 2017 at 11:43:54AM -0300, James Almer wrote:
> On 9/3/2017 10:49 AM, Ronald S. Bultje wrote:
> > Hi,
> >
> > On Sun, Sep 3, 2017 at 6:23 AM, Michael Niedermayer
> > wrote:
> >
> >> Fixes: Timeout
> >> Fixes: 3142/clusterfuzz-testcase-5007853163118592
> >>
On Sat, Sep 02, 2017 at 08:17:38PM +0200, Clément Bœsch wrote:
> From: Clément Bœsch
>
> On ARM platforms, accessing the PMU registers requires special user
> access permissions. Since there is no other way to get accurate timers,
> the current implementation of timers in
Hello,
Thanks Ivan for your comments and explanations,
---
> > [...]
> > +;**
>
> > +
> > +%include "libavutil/x86/x86util.asm"
>
> Still missing explicit x86inc.asm
>
if i include x86inc instead of x86util, i have
On 03/09/17 18:25, Muhammad Faiz wrote:
> On Sun, Sep 3, 2017 at 5:21 AM, Mark Thompson wrote:
>> Intended for use with hardware frames for which rawvideo is not
>> sufficient.
>> ---
>> Kindof nasty. Any thoughts on better ways of achieving the same result
>> (hardware frames
On Sat, Sep 02, 2017 at 08:17:40PM +0200, Clément Bœsch wrote:
> From: Clément Bœsch
>
> Refer to "checkasm: use perf API on Linux ARM*" commit for the
> rationale.
>
> The implementation is somehow duplicated with checkasm, but so is the
> current usage of AV_READ_TIME().
On 03/09/17 17:54, Jorge Ramirez wrote:
> On 09/03/2017 02:27 AM, Mark Thompson wrote:
>>> +/* in ffmpeg there is a single thread could be queueing/dequeuing buffers
>>> so a
>>> + * timeout is * required when retrieving a frame in case the driver has
>>> not received
>>> + * enough input * to
On 09/03/2017 08:13 PM, Mark Thompson wrote:
On 03/09/17 16:26, Jorge Ramirez wrote:
On 09/03/2017 04:56 PM, Jorge Ramirez wrote:
On 09/03/2017 02:27 AM, Mark Thompson wrote:
+.long_name = NULL_IF_CONFIG_SMALL("V4L2 mem2mem " LONGNAME " decoder
wrapper"),\
+.type =
On 03/09/17 17:07, Jorge Ramirez wrote:
> On 09/03/2017 02:27 AM, Mark Thompson wrote:
>>> # Enable hwaccels by default.
>>> -enable_weak d3d11va dxva2 vaapi vda vdpau videotoolbox_hwaccel xvmc
>>> +enable_weak d3d11va dxva2 vaapi v4l2_m2m vda vdpau videotoolbox_hwaccel
>>> xvmc
>> [This line
On 03/09/17 16:26, Jorge Ramirez wrote:
> On 09/03/2017 04:56 PM, Jorge Ramirez wrote:
>> On 09/03/2017 02:27 AM, Mark Thompson wrote:
+.long_name = NULL_IF_CONFIG_SMALL("V4L2 mem2mem " LONGNAME "
decoder wrapper"),\
+.type = AVMEDIA_TYPE_VIDEO,\
+
On 03/09/17 15:36, Jorge Ramirez wrote:
> On 09/03/2017 02:27 AM, Mark Thompson wrote:
>>> +}
>>> +
>>> +/* 2.1 update the AVCodecContext */
>>> +avctx->pix_fmt =
>>> ff_v4l2_v4l2fmt_to_avfmt(capture->format.fmt.pix_mp.pixelformat,
>>> AV_CODEC_ID_RAWVIDEO);
>>> +
On 03/09/17 14:21, Jorge Ramirez wrote:
> On 09/03/2017 02:27 AM, Mark Thompson wrote:
>>> +/* 0. subscribe to source change event */
>>> +memset(, 0, sizeof(sub));
>>> +sub.type = V4L2_EVENT_SOURCE_CHANGE;
>>> +ret = ioctl(s->fd, VIDIOC_SUBSCRIBE_EVENT, );
>>> +if ( ret < 0)
On 03/09/17 14:10, Jorge Ramirez wrote:
> On 09/03/2017 02:27 AM, Mark Thompson wrote:
>>> +av_log(s->avctx, AV_LOG_ERROR, "setting capture format\n");
>>> +return ret;
>>> +}
>>> +
>>> +/* 5. do lazy initialization */
>>> +ret = ff_v4l2_context_init(>capture,
On Sun, Sep 3, 2017 at 5:21 AM, Mark Thompson wrote:
> Intended for use with hardware frames for which rawvideo is not
> sufficient.
> ---
> Kindof nasty. Any thoughts on better ways of achieving the same result
> (hardware frames out of lavd) very welcome!
>
>
>
On 09/03/2017 02:27 AM, Mark Thompson wrote:
+
+return 0;
+}
+
+static int v4l2m2m_send_frame(AVCodecContext *avctx, const AVFrame *frame)
+{
+V4L2m2mContext *s = avctx->priv_data;
+V4L2Context *const output = >output;
+
+return ff_v4l2_enqueue_frame(output, frame);
+}
+
+/* Send
Signed-off-by: Yevhen Kyriukha
---
libavcodec/mmaldec.c | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/libavcodec/mmaldec.c b/libavcodec/mmaldec.c
index 0b1195dc3e..19ca6ce7e7 100644
--- a/libavcodec/mmaldec.c
+++ b/libavcodec/mmaldec.c
@@ -295,6
On 09/03/2017 02:27 AM, Mark Thompson wrote:
+/* in ffmpeg there is a single thread could be queueing/dequeuing buffers so a
+ * timeout is * required when retrieving a frame in case the driver has not
received
+ * enough input * to start generating output.
+ *
+ * once decoding starts, the
On 09/03/2017 02:53 PM, Mark Thompson wrote:
On 03/09/17 13:20, Jorge Ramirez wrote:
On 09/03/2017 02:27 AM, Mark Thompson wrote:
+# check V4L2 codecs available in the API
check_header linux/fb.h
check_header linux/videodev.h
check_header linux/videodev2.h
check_code cc
On 09/03/2017 02:27 AM, Mark Thompson wrote:
# Enable hwaccels by default.
-enable_weak d3d11va dxva2 vaapi vda vdpau videotoolbox_hwaccel xvmc
+enable_weak d3d11va dxva2 vaapi v4l2_m2m vda vdpau videotoolbox_hwaccel xvmc
[This line has disappeared on rebase.]
ok, just rebased today and saw
On Sun, 3 Sep 2017, Pavel Koshevoy wrote:
On 08/30/2017 03:01 PM, Pavel Koshevoy wrote:
On Wed, Aug 30, 2017 at 2:00 PM, Marton Balint wrote:
On Mon, 19 Dec 2016, Marton Balint wrote:
On Sat, 17 Dec 2016, pkoshe...@gmail.com wrote:
From: Pavel Koshevoy
On 09/03/2017 04:56 PM, Jorge Ramirez wrote:
On 09/03/2017 02:27 AM, Mark Thompson wrote:
+.long_name = NULL_IF_CONFIG_SMALL("V4L2 mem2mem " LONGNAME " decoder
wrapper"),\
+.type = AVMEDIA_TYPE_VIDEO,\
+.id = CODEC ,\
+.priv_data_size =
On 09/03/2017 02:27 AM, Mark Thompson wrote:
+
+val = lfind(, profile, , sizeof(profile[0]), match_profile);
+if (val)
+return val->v4l2_val;
+
+return FF_PROFILE_UNKNOWN;
Returning FF_PROFILE_UNKNOWN here is bit weird because it mixes the namespaces.
I know that's how you
Signed-off-by: Paras Chadha
---
This fixes the failed fate tests on ppc64be:
http://fate.ffmpeg.org/report.cgi?time=20170903050743=ppc64be-RHEL7.0-gcc-4.8.5-ibmcrl
libavcodec/fitsdec.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
On 09/03/2017 02:27 AM, Mark Thompson wrote:
+.long_name = NULL_IF_CONFIG_SMALL("V4L2 mem2mem " LONGNAME " decoder
wrapper"),\
+.type = AVMEDIA_TYPE_VIDEO,\
+.id = CODEC ,\
+.priv_data_size = sizeof(V4L2m2mContext),\
+.priv_class = _m2m_ ##
On Thu, 31 Aug 2017, kjeya...@akamai.com wrote:
From: Karthick J
Signed-off-by: Karthick J
---
libavcodec/avcodec.h | 7 ++
libavdevice/decklink_dec.cpp | 167 ---
2 files changed, 165 insertions(+), 9
On 9/3/2017 10:49 AM, Ronald S. Bultje wrote:
> Hi,
>
> On Sun, Sep 3, 2017 at 6:23 AM, Michael Niedermayer
> wrote:
>
>> Fixes: Timeout
>> Fixes: 3142/clusterfuzz-testcase-5007853163118592
>>
>> Found-by: continuous fuzzing process https://github.com/google/oss-
>>
On 09/03/2017 02:27 AM, Mark Thompson wrote:
+}
+
+/* 2.1 update the AVCodecContext */
+avctx->pix_fmt =
ff_v4l2_v4l2fmt_to_avfmt(capture->format.fmt.pix_mp.pixelformat,
AV_CODEC_ID_RAWVIDEO);
+capture->av_pix_fmt = avctx->pix_fmt;
+
+/* 3. set the crop parameters */
+
Hi,
On Sun, Sep 3, 2017 at 6:23 AM, Michael Niedermayer
wrote:
> Fixes: Timeout
> Fixes: 3142/clusterfuzz-testcase-5007853163118592
>
> Found-by: continuous fuzzing process https://github.com/google/oss-
> fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael
On 03/09/17 13:36, LongChair . wrote:
> Le 01/09/2017 à 21:13, Carl Eugen Hoyos a écrit :
>> This is Apache 2.0 (afaict) meaning it requires version 3 in case of
>> --enable-gpl.
> That is right, although it seems MPP clearly contains some ffmpeg 2.2 or
> something old code.
> see :
On 09/03/2017 02:27 AM, Mark Thompson wrote:
+/* 0. subscribe to source change event */
+memset(, 0, sizeof(sub));
+sub.type = V4L2_EVENT_SOURCE_CHANGE;
+ret = ioctl(s->fd, VIDIOC_SUBSCRIBE_EVENT, );
+if ( ret < 0)
+av_log(avctx, AV_LOG_WARNING, "decoding does not
On 09/03/2017 02:27 AM, Mark Thompson wrote:
+int ff_v4l2m2m_codec_end(AVCodecContext *avctx)
+{
+V4L2m2mContext *s = avctx->priv_data;
+
+av_log(avctx, AV_LOG_DEBUG, "Closing context\n");
+
+return ff_v4l2_m2m_codec_end(s);
+}
+
+int ff_v4l2m2m_codec_init(AVCodecContext *avctx)
+{
+
On 09/03/2017 02:27 AM, Mark Thompson wrote:
+av_log(s->avctx, AV_LOG_ERROR, "setting capture format\n");
+return ret;
+}
+
+/* 5. do lazy initialization */
+ret = ff_v4l2_context_init(>capture, s->capture.lazy_init);
+if (ret) {
+av_log(s->avctx,
On 03/09/17 13:25, Jorge Ramirez wrote:
> On 09/03/2017 02:27 AM, Mark Thompson wrote:
>>> +REGISTER_ENCDEC (H264_V4L2M2M, h264_v4l2m2m);
>>> REGISTER_DECODER(H264_MEDIACODEC, h264_mediacodec);
>>> REGISTER_DECODER(H264_MMAL, h264_mmal);
>>>
On 03/09/17 13:20, Jorge Ramirez wrote:
> On 09/03/2017 02:27 AM, Mark Thompson wrote:
>>> +# check V4L2 codecs available in the API
>>> check_header linux/fb.h
>>> check_header linux/videodev.h
>>> check_header linux/videodev2.h
>>> check_code cc linux/videodev2.h "struct v4l2_frmsizeenum
On 01/09/17 16:45, LongChair . wrote:
> From: LongChair
>
> Add support for RockChip Media Process Platform This adds hardware decoding
> for h264 / HEVC / VP8 using MPP Rockchip API. Will return frames holding an
> AVDRMFrameDescriptor struct in buf[0] that allows drm /
On 09/03/2017 02:27 AM, Mark Thompson wrote:
+
+static inline int splane_video(struct v4l2_capability *cap)
+{
+if (cap->capabilities & (V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OUTPUT) &
V4L2_CAP_STREAMING)
From videodev2.h:
#define V4L2_CAP_VIDEO_CAPTURE 0x0001 /* Is a
Le 01/09/2017 à 21:13, Carl Eugen Hoyos a écrit :
> This is Apache 2.0 (afaict) meaning it requires version 3 in case of
> --enable-gpl.
That is right, although it seems MPP clearly contains some ffmpeg 2.2 or
something old code.
see :
On 09/03/2017 02:27 AM, Mark Thompson wrote:
+
+/* memcpy to the v4l2_buffer planes array when needed */
+struct v4l2_plane planes[VIDEO_MAX_PLANES];
+struct v4l2_buffer buf;
+
+int bytesperline[4];
Why 4? Should this be VIDEO_MAX_PLANES again?
yes
On 09/03/2017 02:27 AM, Mark Thompson wrote:
+REGISTER_ENCDEC (H264_V4L2M2M, h264_v4l2m2m);
REGISTER_DECODER(H264_MEDIACODEC, h264_mediacodec);
REGISTER_DECODER(H264_MMAL, h264_mmal);
REGISTER_DECODER(H264_QSV, h264_qsv);
@@ -220,6 +222,7 @@ static
On 09/03/2017 02:27 AM, Mark Thompson wrote:
vorbis_data.o
OBJS-$(CONFIG_VORBIS_ENCODER) += vorbisenc.o vorbis.o \
vorbis_data.o
+OBJS-$(CONFIG_VPLAYER_DECODER) += textdec.o ass.o
Stray
On 09/03/2017 02:27 AM, Mark Thompson wrote:
+# check V4L2 codecs available in the API
check_header linux/fb.h
check_header linux/videodev.h
check_header linux/videodev2.h
check_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width =
0;" && enable_safe
On 09/03/2017 02:27 AM, Mark Thompson wrote:
diff --git a/Changelog b/Changelog
index 8309417..c6fcda3 100644
--- a/Changelog
+++ b/Changelog
@@ -40,6 +40,7 @@ version :
They must always be used by name.
- FITS demuxer and decoder
- FITS muxer and encoder
+- V4L2 mem2mem HW accelerated
On Wed, Aug 30, 2017 at 01:44:53PM +, Kieran Kunhya wrote:
> Padded SPS/PPS is perfectly legal.
thats likely true.
IIRC the case ive seen was not valid padding but random unindentified
bytes though.
Also the implementation truncates arbitrarily at 4096 bytes
additional bytes might be
On Thu, 31 Aug 2017, kjeya...@akamai.com wrote:
From: Karthick J
In preparation to support multiple VANC data decode
Signed-off-by: Karthick J
---
libavdevice/decklink_dec.cpp | 31 ++-
1 file changed, 18 insertions(+),
On Thu, 31 Aug 2017, kjeya...@akamai.com wrote:
From: Karthick J
In preparation to make VANC decode modular, to support multiple other VANC data.
Signed-off-by: Karthick J
---
libavdevice/decklink_dec.cpp | 86
On 9/3/17, Leo Izen wrote:
> ---
> doc/filters.texi | 8 +---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
applied
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Signed-off-by: Paul B Mahol
---
doc/filters.texi | 14 ++
libavfilter/Makefile | 1 +
libavfilter/allfilters.c | 1 +
libavfilter/vf_convolve.c | 513 ++
4 files changed, 529 insertions(+)
create mode 100644
Fixes: Timeout
Fixes: 3142/clusterfuzz-testcase-5007853163118592
Found-by: continuous fuzzing process
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer
---
libavcodec/snowdec.c | 19 +++
1 file changed, 15
---
doc/filters.texi | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/doc/filters.texi b/doc/filters.texi
index afcb99d876..c898c43557 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -14911,7 +14911,7 @@ This filter accepts the following options:
@item
On Sat, Sep 02, 2017 at 07:32:17PM -0300, James Almer wrote:
> On 9/2/2017 7:26 PM, Clément Bœsch wrote:
> > This code is disabled since 2012. V4L1 was dropped from the kernel more
> > than 10 years ago.
> > ---
> > configure| 2 -
> > libavdevice/Makefile | 1 -
> >
On 08/30/2017 03:01 PM, Pavel Koshevoy wrote:
On Wed, Aug 30, 2017 at 2:00 PM, Marton Balint wrote:
On Mon, 19 Dec 2016, Marton Balint wrote:
On Sat, 17 Dec 2016, pkoshe...@gmail.com wrote:
From: Pavel Koshevoy
Steps to reproduce:
./ffmpeg_g -f s16be
59 matches
Mail list logo