Re: [FFmpeg-devel] [PATCH] h264_mp4toannexb_bsf: always set idr_sps_pps_seen when SPS/PPS is seen.
Hi, - Mail original - > Michael Niedermayer gmx.at> writes: > > > > > On Fri, Aug 01, 2014 at 01:54:14AM +0200, Michael Niedermayer > > wrote: > > > On Thu, Jul 31, 2014 at 03:40:51PM +0200, Benoit Fouet wrote: > > > > In order not to break a sequence like "SPS IDR SPS IDR", the > boolean > > > > telling that the SPS/PPS has been seen should always be set. > > > > --- > > > > libavcodec/h264_mp4toannexb_bsf.c | 2 +- > > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > LGTM > > > > applied > > > > thanks > > A GitHub user "@thomag" commented on this commit: > > > Consider an mp4 files with just pps in the h264 stream (no sps in > > the > > NAL units, but available from avcc). > > In this case 'ctx->idr_sps_pps_seen' prevents inserting sps in the > > extracted h264, which is then unusable. > > FYI. I cannot confirm if it is correct or not, and what the correct > solution would be. > I'm willing to try and fix this when/if we have a sample to test that. If there is also an example with just sps in the avcc and only pps in the stream, that'd be perfect... Thanks, -- Ben ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] xtory codec support
Hi, - Mail original - > On Wed, Sep 24, 2014 at 10:21:01AM +0400, I.C. Wiener wrote: > > > > Hello, i have just upload the sample of dxtory 2.0 output file with > > ffmpeg stder dump(in corresponding txt file) to > > ftp://upload.ffmpeg.org/incoming . Please, have a look. Recent > > version of avcodec can not decode it. > > fixed > ref_slice_height is now unused in dxtory_decode_v2_4[12]0 functions, and should be removed. -- Ben ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] Branchpoint tags
On Thu, Sep 25, 2014 at 08:46:48PM -0700, Timothy Gu wrote: > On Tue, Sep 16, 2014 at 8:46 AM, Carl Eugen Hoyos wrote: > > Michael Niedermayer gmx.at> writes: > > > >> Should we add git tags to the revissions where > >> releases are branched off ? > > > > Yes please, this would make my life much easier. > > > > n2.5-dev sounds ok. > > Ping. Personally I think we should use n2.4-post, as it is more > consistent with RELEASE file, and doesn't have the ambiguity that > comes with "dev" (i.e. does 2.5-dev < 2.5 ? or > 2.5?). > -dev is a very common convention. [...] -- Clément B. pgpsBRy1gULbd.pgp Description: PGP signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH v7] Add SUP/PGS subtitle demuxer
On Wed, Sep 24, 2014 at 05:38:58PM +0200, wm4 wrote: > --- > doc reference, bump minor, no other changes > --- > doc/general.texi | 1 + > libavformat/Makefile | 1 + > libavformat/allformats.c | 1 + > libavformat/supdec.c | 109 > +++ > libavformat/version.h| 4 +- > 5 files changed, 114 insertions(+), 2 deletions(-) > create mode 100644 libavformat/supdec.c > Thanks, applied with a few trivial changes such as adding Changelog entry (see also below) > diff --git a/doc/general.texi b/doc/general.texi > index 8d7555d..7f6fb86 100644 > --- a/doc/general.texi > +++ b/doc/general.texi > @@ -453,6 +453,7 @@ library: > @item Sony PlayStation STR @tab @tab X > @item Sony Wave64 (W64) @tab X @tab X > @item SoX native format @tab X @tab X > +@item SUP raw PGS subtitles @tab @tab X > @item SUN AU format @tab X @tab X both swapped (as noticed by Compn) [...] > +static int sup_read_packet(struct AVFormatContext *s, AVPacket *pkt) "struct" dropped [...] > diff --git a/libavformat/version.h b/libavformat/version.h > index 61decb9..b1dde2c 100644 > --- a/libavformat/version.h > +++ b/libavformat/version.h > @@ -30,8 +30,8 @@ > #include "libavutil/version.h" > > #define LIBAVFORMAT_VERSION_MAJOR 56 > -#define LIBAVFORMAT_VERSION_MINOR 4 > -#define LIBAVFORMAT_VERSION_MICRO 103 > +#define LIBAVFORMAT_VERSION_MINOR 5 > +#define LIBAVFORMAT_VERSION_MICRO 100 rebased to current [...] Thank you for the patch. Looking forward the muxer, and a FATE test. -- Clément B. pgpfpyyIBcT6A.pgp Description: PGP signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] Please help update tasks and mentor/backups for OPW
2014-09-25 19:20 GMT+02:00 Reynaldo H. Verdejo Pinochet : > Things that need urgent attention are ensuring listed projects > are still relevant as well as making sure their mentors are > still available and willing to take part on the program. I took > the liberty of CCing some of the currently listed mentors so > they can hopefully help with the latter. I am still available as a mentor for the Symmetric-key block ciphers project. Regards, Giorgio Vazzana ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH]Autodetect jpg images
Carl Eugen Hoyos ag.or.at> writes: > Attached patch fixes ticket #2541 for me. Merged by Michael. Carl Eugen ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH]Allow using libopenjpeg 2.x
Reimar Döffinger gmx.de> writes: > > Attached patch allows using libopenjpeg 2.x (tested > > with 2.1) here. > > Doesn't it make sense to prefer the newest version, > i.e. we should check for this first and not last? Merged by Michael with that change. Carl Eugen ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH]Make high bit-depth libvpx samples show the correct bit depth
Carl Eugen Hoyos ag.or.at> writes: > -avctx->pix_fmt = AV_PIX_FMT_YUV420P; > return 0; This variant was merged by Michael. Carl Eugen ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH v7] Add SUP/PGS subtitle demuxer
Clément Bœsch pkh.me> writes: > Thank you for the patch. Looking forward the muxer, and a FATE test. Is there a reason why you didn't merge the muxer? http://thread.gmane.org/gmane.comp.video.ffmpeg.devel/182167 Thank you for the commit, Carl Eugen ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH 4/5] lavd/avfoundation: Use microseconds as common timebase.
On Wed, Sep 24, 2014 at 12:43:48PM +0200, Thilo Borgmann wrote: > > avfoundation.m |2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > 6e245812ea51224f0f2eb0529b4243d2da2812fa > 0004-lavd-avfoundation-Use-microseconds-as-common-timebas.patch > From 1aa75436cbb8ee1244e8bf5a08193db47e39e813 Mon Sep 17 00:00:00 2001 > From: Thilo Borgmann > Date: Tue, 23 Sep 2014 16:49:59 +0200 > Subject: [PATCH 4/5] lavd/avfoundation: Use microseconds as common timebase. > > --- > libavdevice/avfoundation.m | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) applied thanks [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB The greatest way to live with honor in this world is to be what we pretend to be. -- Socrates signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH v7] Add SUP/PGS subtitle demuxer
On Fri, Sep 26, 2014 at 10:13:34AM +, Carl Eugen Hoyos wrote: > Clément Bœsch pkh.me> writes: > > > Thank you for the patch. Looking forward the muxer, and a FATE test. > > Is there a reason why you didn't merge the muxer? > http://thread.gmane.org/gmane.comp.video.ffmpeg.devel/182167 > I didn't look at it really but I thought it was still waiting for a few changes. [...] -- Clément B. pgpIbvZAOqO0L.pgp Description: PGP signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH v7] Add SUP/PGS subtitle demuxer
Clément Bœsch pkh.me> writes: > > Is there a reason why you didn't merge the muxer? > > http://thread.gmane.org/gmane.comp.video.ffmpeg.devel/182167 > > > > I didn't look at it really but I thought it was > still waiting for a few changes. None were requested... Carl Eugen ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH v7] Add SUP/PGS subtitle demuxer
On pe, 2014-09-26 at 12:26 +0200, Clément Bœsch wrote: > On Fri, Sep 26, 2014 at 10:13:34AM +, Carl Eugen Hoyos wrote: > > Clément Bœsch pkh.me> writes: > > > > > Thank you for the patch. Looking forward the muxer, and a FATE test. > > > > Is there a reason why you didn't merge the muxer? > > http://thread.gmane.org/gmane.comp.video.ffmpeg.devel/182167 > > > > I didn't look at it really but I thought it was still waiting for a few > changes. > I'll try to send new version this weekend. I have also some ideas how to avoid broken files when muxing to .sup from matroska. - Petri ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH v7] Add SUP/PGS subtitle demuxer
On Fri, Sep 26, 2014 at 01:32:09PM +0300, Petri Hintukainen wrote: > On pe, 2014-09-26 at 12:26 +0200, Clément Bœsch wrote: > > On Fri, Sep 26, 2014 at 10:13:34AM +, Carl Eugen Hoyos wrote: > > > Clément Bœsch pkh.me> writes: > > > > > > > Thank you for the patch. Looking forward the muxer, and a FATE test. > > > > > > Is there a reason why you didn't merge the muxer? > > > http://thread.gmane.org/gmane.comp.video.ffmpeg.devel/182167 > > > > > > > I didn't look at it really but I thought it was still waiting for a few > > changes. > > > > I'll try to send new version this weekend. > Cool. Please don't forget to update the Changelog and doc/general.texi (compare with the demuxer commit). > I have also some ideas how to avoid broken files when muxing to .sup > from matroska. > > > - Petri > -- Clément B. pgp9v7TkrOif4.pgp Description: PGP signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] xtory codec support
On Fri, Sep 26, 2014 at 09:35:54AM +0200, Benoit Fouet wrote: > Hi, > > - Mail original - > > On Wed, Sep 24, 2014 at 10:21:01AM +0400, I.C. Wiener wrote: > > > > > > Hello, i have just upload the sample of dxtory 2.0 output file with > > > ffmpeg stder dump(in corresponding txt file) to > > > ftp://upload.ffmpeg.org/incoming . Please, have a look. Recent > > > version of avcodec can not decode it. > > > > fixed > > > > ref_slice_height is now unused in dxtory_decode_v2_4[12]0 functions, and > should be removed. fixed thx [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Observe your enemies, for they first find out your faults. -- Antisthenes signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] libavformat/iff: print error message when DSDIFF compression type is not supported
On Fri, Sep 26, 2014 at 03:44:46PM +1000, Peter Ross wrote: > Signed-off-by: Peter Ross > --- > libavformat/iff.c | 8 +++- > 1 file changed, 7 insertions(+), 1 deletion(-) applied thanks [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Observe your enemies, for they first find out your faults. -- Antisthenes signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] avfilter/signalstats: add more pixel formats
On Sep 25, 2014, at 1:26 PM, Paul B Mahol wrote:
> Signed-off-by: Paul B Mahol
> ---
> libavfilter/vf_signalstats.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/libavfilter/vf_signalstats.c b/libavfilter/vf_signalstats.c
> index 53f7401..47545aa 100644
> --- a/libavfilter/vf_signalstats.c
> +++ b/libavfilter/vf_signalstats.c
> @@ -96,6 +96,9 @@ static int query_formats(AVFilterContext *ctx)
> // TODO: add more
> static const enum AVPixelFormat pix_fmts[] = {
> AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P,
> AV_PIX_FMT_YUV411P,
> +AV_PIX_FMT_YUV440P,
> +AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ420P,
> AV_PIX_FMT_YUVJ411P,
> +AV_PIX_FMT_YUVJ440P,
> AV_PIX_FMT_NONE
> };
>
> --
> 1.7.11.2
Tested and works for me.
Thanks,
Dave Rice
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH] ffplay: Separate AVFrame from AVSubtitle
This is more robust and should avoid false positives in coverity
That is if the type is ever mixed up, after this patch that would
just be a null pointer dereference instead of a random possibly
out of array access
Signed-off-by: Michael Niedermayer
---
ffplay.c | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/ffplay.c b/ffplay.c
index 7728452..8fa5ca3 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -546,9 +546,8 @@ static void decoder_init(Decoder *d, AVCodecContext *avctx,
PacketQueue *queue,
d->start_pts = AV_NOPTS_VALUE;
}
-static int decoder_decode_frame(Decoder *d, void *fframe) {
+static int decoder_decode_frame(Decoder *d, AVFrame *frame, AVSubtitle *sub) {
int got_frame = 0;
-AVFrame *frame = fframe;
d->flushed = 0;
@@ -608,7 +607,7 @@ static int decoder_decode_frame(Decoder *d, void *fframe) {
}
break;
case AVMEDIA_TYPE_SUBTITLE:
-ret = avcodec_decode_subtitle2(d->avctx, fframe, &got_frame,
&d->pkt_temp);
+ret = avcodec_decode_subtitle2(d->avctx, sub, &got_frame,
&d->pkt_temp);
break;
}
@@ -1863,7 +1862,7 @@ static int get_video_frame(VideoState *is, AVFrame *frame)
{
int got_picture;
-if ((got_picture = decoder_decode_frame(&is->viddec, frame)) < 0)
+if ((got_picture = decoder_decode_frame(&is->viddec, frame, NULL)) < 0)
return -1;
if (got_picture) {
@@ -2219,7 +2218,7 @@ static int subtitle_thread(void *arg)
if (!(sp = frame_queue_peek_writable(&is->subpq)))
return 0;
-if ((got_subtitle = decoder_decode_frame(&is->subdec, &sp->sub)) < 0)
+if ((got_subtitle = decoder_decode_frame(&is->subdec, NULL, &sp->sub))
< 0)
break;
pts = 0;
@@ -2483,7 +2482,7 @@ static int audio_decode_frame(VideoState *is)
return resampled_data_size;
}
-if ((got_frame = decoder_decode_frame(&is->auddec, is->frame)) < 0)
+if ((got_frame = decoder_decode_frame(&is->auddec, is->frame, NULL)) <
0)
return -1;
if (is->auddec.flushed)
--
1.7.9.5
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] h264_mp4toannexb_bsf: always set idr_sps_pps_seen when SPS/PPS is seen.
On Fri, Sep 26, 2014 at 09:27:01AM +0200, Benoit Fouet wrote: > Hi, > > - Mail original - > > Michael Niedermayer gmx.at> writes: > > > > > > > > On Fri, Aug 01, 2014 at 01:54:14AM +0200, Michael Niedermayer > > > wrote: > > > > On Thu, Jul 31, 2014 at 03:40:51PM +0200, Benoit Fouet wrote: > > > > > In order not to break a sequence like "SPS IDR SPS IDR", the > > boolean > > > > > telling that the SPS/PPS has been seen should always be set. > > > > > --- > > > > > libavcodec/h264_mp4toannexb_bsf.c | 2 +- > > > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > > > LGTM > > > > > > applied > > > > > > thanks > > > > A GitHub user "@thomag" commented on this commit: > > > > > Consider an mp4 files with just pps in the h264 stream (no sps in > > > the > > > NAL units, but available from avcc). > > > In this case 'ctx->idr_sps_pps_seen' prevents inserting sps in the > > > extracted h264, which is then unusable. > > > > FYI. I cannot confirm if it is correct or not, and what the correct > > solution would be. > > > > I'm willing to try and fix this when/if we have a sample to test that. > If there is also an example with just sps in the avcc and only pps in the > stream, that'd be perfect... forwarding from github Michael, Here is a short clip @ https://s3.amazonaws.com/quickfire-public/dwclip2.mp4 which has just PPS in the h264 stream. Please let me know if you need anything else. Regards, Thomas. [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Avoid a single point of failure, be that a person or equipment. signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] h264_mp4toannexb_bsf: always set idr_sps_pps_seen when SPS/PPS is seen.
Hi, Le 26/09/2014 18:38, Michael Niedermayer a écrit : > On Fri, Sep 26, 2014 at 09:27:01AM +0200, Benoit Fouet wrote: >> Hi, >> >> - Mail original - >>> Michael Niedermayer gmx.at> writes: >>> On Fri, Aug 01, 2014 at 01:54:14AM +0200, Michael Niedermayer wrote: > On Thu, Jul 31, 2014 at 03:40:51PM +0200, Benoit Fouet wrote: >> In order not to break a sequence like "SPS IDR SPS IDR", the >>> boolean >> telling that the SPS/PPS has been seen should always be set. >> --- >> libavcodec/h264_mp4toannexb_bsf.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) > > LGTM applied thanks >>> >>> A GitHub user "@thomag" commented on this commit: >>> Consider an mp4 files with just pps in the h264 stream (no sps in the NAL units, but available from avcc). In this case 'ctx->idr_sps_pps_seen' prevents inserting sps in the extracted h264, which is then unusable. >>> >>> FYI. I cannot confirm if it is correct or not, and what the correct >>> solution would be. >>> >> >> I'm willing to try and fix this when/if we have a sample to test that. >> If there is also an example with just sps in the avcc and only pps in the stream, that'd be perfect... > > forwarding from github > > Michael, > Here is a short clip @ https://s3.amazonaws.com/quickfire-public/dwclip2.mp4 > which has just PPS in the h264 stream. > Please let me know if you need anything else. > Regards, > Thomas. > OK, cool. I'll have a look at this after the weekend then. -- Ben ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH 2/2] libavfilter/af_channelmap: avoid derreferencing possible null
ff_all_channel_layouts() might return null on alloc failure.
Fixes CID1241517
Signed-off-by: Reynaldo H. Verdejo Pinochet
---
libavfilter/af_channelmap.c | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/libavfilter/af_channelmap.c b/libavfilter/af_channelmap.c
index 0bf2fe9..c3454c5 100644
--- a/libavfilter/af_channelmap.c
+++ b/libavfilter/af_channelmap.c
@@ -287,10 +287,16 @@ static av_cold int channelmap_init(AVFilterContext *ctx)
static int channelmap_query_formats(AVFilterContext *ctx)
{
ChannelMapContext *s = ctx->priv;
+AVFilterChannelLayouts *layouts;
ff_set_common_formats(ctx, ff_planar_sample_fmts());
ff_set_common_samplerates(ctx, ff_all_samplerates());
-ff_channel_layouts_ref(ff_all_channel_layouts(),
&ctx->inputs[0]->out_channel_layouts);
+
+layouts = ff_all_channel_layouts();
+if (!layouts)
+return AVERROR(ENOMEM);
+
+ff_channel_layouts_ref(layouts, &ctx->inputs[0]->out_channel_layouts);
ff_channel_layouts_ref(s->channel_layouts,
&ctx->outputs[0]->in_channel_layouts);
return 0;
--
2.1.0
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH 1/2] libavfilter/af_join: avoid derreferencing possible null
ff_all_channel_layouts() might return null on alloc failure.
Fixes CID1241518
Signed-off-by: Reynaldo H. Verdejo Pinochet
---
libavfilter/af_join.c | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c
index 560c5c8..a1717c6 100644
--- a/libavfilter/af_join.c
+++ b/libavfilter/af_join.c
@@ -248,9 +248,12 @@ static int join_query_formats(AVFilterContext *ctx)
ff_add_channel_layout(&layouts, s->channel_layout);
ff_channel_layouts_ref(layouts, &ctx->outputs[0]->in_channel_layouts);
-for (i = 0; i < ctx->nb_inputs; i++)
-ff_channel_layouts_ref(ff_all_channel_layouts(),
- &ctx->inputs[i]->out_channel_layouts);
+for (i = 0; i < ctx->nb_inputs; i++) {
+layouts = ff_all_channel_layouts();
+if (!layouts)
+return AVERROR(ENOMEM);
+ff_channel_layouts_ref(layouts, &ctx->inputs[i]->out_channel_layouts);
+}
ff_set_common_formats(ctx, ff_planar_sample_fmts());
ff_set_common_samplerates(ctx, ff_all_samplerates());
--
2.1.0
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH] libavfilter/af_amix: avoid derreferencing possible null
ff_all_channel_layouts() might return null on alloc failure.
Fixes CID1241516
Signed-off-by: Reynaldo H. Verdejo Pinochet
---
libavfilter/af_amix.c | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/libavfilter/af_amix.c b/libavfilter/af_amix.c
index d8a6651..47cbb45 100644
--- a/libavfilter/af_amix.c
+++ b/libavfilter/af_amix.c
@@ -528,10 +528,17 @@ static av_cold void uninit(AVFilterContext *ctx)
static int query_formats(AVFilterContext *ctx)
{
AVFilterFormats *formats = NULL;
+AVFilterChannelLayouts *layouts;
+
+layouts = ff_all_channel_layouts();
+
+if (!layouts)
+return AVERROR(ENOMEM);
+
ff_add_format(&formats, AV_SAMPLE_FMT_FLT);
ff_add_format(&formats, AV_SAMPLE_FMT_FLTP);
ff_set_common_formats(ctx, formats);
-ff_set_common_channel_layouts(ctx, ff_all_channel_layouts());
+ff_set_common_channel_layouts(ctx, layouts);
ff_set_common_samplerates(ctx, ff_all_samplerates());
return 0;
}
--
2.1.0
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH] x86/fmtconvert: add ff_int32_to_float_fmul_array8_{sse, sse2}
About two times faster than the c wrapper.
Signed-off-by: James Almer
---
libavcodec/x86/fmtconvert.asm| 38 ++
libavcodec/x86/fmtconvert_init.c | 6 ++
2 files changed, 44 insertions(+)
diff --git a/libavcodec/x86/fmtconvert.asm b/libavcodec/x86/fmtconvert.asm
index 0d3f821..0e11908 100644
--- a/libavcodec/x86/fmtconvert.asm
+++ b/libavcodec/x86/fmtconvert.asm
@@ -77,6 +77,44 @@ INT32_TO_FLOAT_FMUL_SCALAR 5
INIT_XMM sse2
INT32_TO_FLOAT_FMUL_SCALAR 3
+;--
+; void ff_int32_to_float_fmul_array8(FmtConvertContext *c, float *dst, const
int32_t *src,
+;const float *mul, int len);
+;--
+%macro INT32_TO_FLOAT_FMUL_ARRAY8 0
+cglobal int32_to_float_fmul_array8, 5, 5, 5, c, dst, src, mul, len
+shl lenq, 2
+add srcq, lenq
+add dstq, lenq
+neg lenq
+.loop:
+movss m0, [mulq]
+SPLATDm0
+%if cpuflag(sse2)
+cvtdq2ps m1, [srcq+lenq ]
+cvtdq2ps m2, [srcq+lenq+16]
+%else
+cvtpi2ps m1, [srcq+lenq ]
+cvtpi2ps m3, [srcq+lenq+ 8]
+cvtpi2ps m2, [srcq+lenq+16]
+cvtpi2ps m4, [srcq+lenq+24]
+movlhps m1, m3
+movlhps m2, m4
+%endif
+mulps m1, m0
+mulps m2, m0
+mova [dstq+lenq ], m1
+mova [dstq+lenq+16], m2
+add mulq, 4
+add lenq, 32
+jl .loop
+RET
+%endmacro
+
+INIT_XMM sse
+INT32_TO_FLOAT_FMUL_ARRAY8
+INIT_XMM sse2
+INT32_TO_FLOAT_FMUL_ARRAY8
;--
; void ff_float_to_int16(int16_t *dst, const float *src, long len);
diff --git a/libavcodec/x86/fmtconvert_init.c b/libavcodec/x86/fmtconvert_init.c
index d300dfd..cbb96e2 100644
--- a/libavcodec/x86/fmtconvert_init.c
+++ b/libavcodec/x86/fmtconvert_init.c
@@ -32,6 +32,10 @@
void ff_int32_to_float_fmul_scalar_sse (float *dst, const int32_t *src, float
mul, int len);
void ff_int32_to_float_fmul_scalar_sse2(float *dst, const int32_t *src, float
mul, int len);
+void ff_int32_to_float_fmul_array8_sse (FmtConvertContext *c, float *dst,
const int32_t *src,
+const float *mul, int len);
+void ff_int32_to_float_fmul_array8_sse2(FmtConvertContext *c, float *dst,
const int32_t *src,
+const float *mul, int len);
void ff_float_to_int16_3dnow(int16_t *dst, const float *src, long len);
void ff_float_to_int16_sse (int16_t *dst, const float *src, long len);
@@ -134,12 +138,14 @@ av_cold void ff_fmt_convert_init_x86(FmtConvertContext
*c, AVCodecContext *avctx
}
if (EXTERNAL_SSE(cpu_flags)) {
c->int32_to_float_fmul_scalar = ff_int32_to_float_fmul_scalar_sse;
+c->int32_to_float_fmul_array8 = ff_int32_to_float_fmul_array8_sse;
c->float_to_int16 = ff_float_to_int16_sse;
c->float_to_int16_interleave = float_to_int16_interleave_sse;
c->float_interleave = float_interleave_sse;
}
if (EXTERNAL_SSE2(cpu_flags)) {
c->int32_to_float_fmul_scalar = ff_int32_to_float_fmul_scalar_sse2;
+c->int32_to_float_fmul_array8 = ff_int32_to_float_fmul_array8_sse2;
c->float_to_int16 = ff_float_to_int16_sse2;
c->float_to_int16_interleave = float_to_int16_interleave_sse2;
}
--
1.8.5.5
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH 1/2] libavfilter/af_join: avoid derreferencing possible null
On Fri, Sep 26, 2014 at 04:19:02PM -0300, Reynaldo H. Verdejo Pinochet wrote: > ff_all_channel_layouts() might return null on alloc failure. > > Fixes CID1241518 > > Signed-off-by: Reynaldo H. Verdejo Pinochet > --- > libavfilter/af_join.c | 9 ++--- > 1 file changed, 6 insertions(+), 3 deletions(-) should be ok [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Complexity theory is the science of finding the exact solution to an approximation. Benchmarking OTOH is finding an approximation of the exact signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH 2/2] libavfilter/af_channelmap: avoid derreferencing possible null
On Fri, Sep 26, 2014 at 04:19:03PM -0300, Reynaldo H. Verdejo Pinochet wrote: > ff_all_channel_layouts() might return null on alloc failure. > > Fixes CID1241517 > > Signed-off-by: Reynaldo H. Verdejo Pinochet > --- > libavfilter/af_channelmap.c | 8 +++- > 1 file changed, 7 insertions(+), 1 deletion(-) should be ok [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Frequently ignored answer#1 FFmpeg bugs should be sent to our bugtracker. User questions about the command line tools should be sent to the ffmpeg-user ML. And questions about how to use libav* should be sent to the libav-user ML. signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] libavfilter/af_amix: avoid derreferencing possible null
On Fri, Sep 26, 2014 at 04:41:28PM -0300, Reynaldo H. Verdejo Pinochet wrote: > ff_all_channel_layouts() might return null on alloc failure. > > Fixes CID1241516 > > Signed-off-by: Reynaldo H. Verdejo Pinochet > --- > libavfilter/af_amix.c | 9 - > 1 file changed, 8 insertions(+), 1 deletion(-) should be ok thanks [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB I know you won't believe me, but the highest form of Human Excellence is to question oneself and others. -- Socrates signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH 1/2] libavfilter/af_join: avoid derreferencing possible null
Set pushed. Thanks for taking a look. -- Reynaldo H. Verdejo Pinochet Open Source Group Samsung Research America / Silicon Valley ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] libavfilter/af_amix: avoid derreferencing possible null
Pushed. Thanks for taking a look. -- Reynaldo H. Verdejo Pinochet Open Source Group Samsung Research America / Silicon Valley ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] ffplay: Separate AVFrame from AVSubtitle
On Fri, 26 Sep 2014, Michael Niedermayer wrote:
This is more robust and should avoid false positives in coverity
That is if the type is ever mixed up, after this patch that would
just be a null pointer dereference instead of a random possibly
out of array access
Signed-off-by: Michael Niedermayer
---
ffplay.c | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/ffplay.c b/ffplay.c
index 7728452..8fa5ca3 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -546,9 +546,8 @@ static void decoder_init(Decoder *d, AVCodecContext *avctx,
PacketQueue *queue,
d->start_pts = AV_NOPTS_VALUE;
}
-static int decoder_decode_frame(Decoder *d, void *fframe) {
+static int decoder_decode_frame(Decoder *d, AVFrame *frame, AVSubtitle *sub) {
int got_frame = 0;
-AVFrame *frame = fframe;
d->flushed = 0;
@@ -608,7 +607,7 @@ static int decoder_decode_frame(Decoder *d, void *fframe) {
}
break;
case AVMEDIA_TYPE_SUBTITLE:
-ret = avcodec_decode_subtitle2(d->avctx, fframe, &got_frame,
&d->pkt_temp);
+ret = avcodec_decode_subtitle2(d->avctx, sub, &got_frame,
&d->pkt_temp);
break;
}
@@ -1863,7 +1862,7 @@ static int get_video_frame(VideoState *is, AVFrame *frame)
{
int got_picture;
-if ((got_picture = decoder_decode_frame(&is->viddec, frame)) < 0)
+if ((got_picture = decoder_decode_frame(&is->viddec, frame, NULL)) < 0)
return -1;
if (got_picture) {
@@ -2219,7 +2218,7 @@ static int subtitle_thread(void *arg)
if (!(sp = frame_queue_peek_writable(&is->subpq)))
return 0;
-if ((got_subtitle = decoder_decode_frame(&is->subdec, &sp->sub)) < 0)
+if ((got_subtitle = decoder_decode_frame(&is->subdec, NULL, &sp->sub))
< 0)
break;
pts = 0;
@@ -2483,7 +2482,7 @@ static int audio_decode_frame(VideoState *is)
return resampled_data_size;
}
-if ((got_frame = decoder_decode_frame(&is->auddec, is->frame)) < 0)
+if ((got_frame = decoder_decode_frame(&is->auddec, is->frame, NULL)) <
0)
return -1;
if (is->auddec.flushed)
--
1.7.9.5
LGTM, thanks.
Marton
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] x86/fmtconvert: add ff_int32_to_float_fmul_array8_{sse, sse2}
On Fri, Sep 26, 2014 at 05:15:03PM -0300, James Almer wrote: > About two times faster than the c wrapper. > > Signed-off-by: James Almer > --- > libavcodec/x86/fmtconvert.asm| 38 ++ > libavcodec/x86/fmtconvert_init.c | 6 ++ > 2 files changed, 44 insertions(+) LGTM thanks [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB I am the wisest man alive, for I know one thing, and that is that I know nothing. -- Socrates signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] x86/fmtconvert: add ff_int32_to_float_fmul_array8_{sse, sse2}
On 26/09/14 8:21 PM, Michael Niedermayer wrote: > On Fri, Sep 26, 2014 at 05:15:03PM -0300, James Almer wrote: >> About two times faster than the c wrapper. >> >> Signed-off-by: James Almer >> --- >> libavcodec/x86/fmtconvert.asm| 38 ++ >> libavcodec/x86/fmtconvert_init.c | 6 ++ >> 2 files changed, 44 insertions(+) > > LGTM > > thanks Pushed. ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] ffplay: Separate AVFrame from AVSubtitle
On Sat, Sep 27, 2014 at 12:38:28AM +0200, Marton Balint wrote:
>
> On Fri, 26 Sep 2014, Michael Niedermayer wrote:
>
> >This is more robust and should avoid false positives in coverity
> >That is if the type is ever mixed up, after this patch that would
> >just be a null pointer dereference instead of a random possibly
> >out of array access
> >
> >Signed-off-by: Michael Niedermayer
> >---
> >ffplay.c | 11 +--
> >1 file changed, 5 insertions(+), 6 deletions(-)
> >
> >diff --git a/ffplay.c b/ffplay.c
> >index 7728452..8fa5ca3 100644
> >--- a/ffplay.c
> >+++ b/ffplay.c
> >@@ -546,9 +546,8 @@ static void decoder_init(Decoder *d, AVCodecContext
> >*avctx, PacketQueue *queue,
> >d->start_pts = AV_NOPTS_VALUE;
> >}
> >
> >-static int decoder_decode_frame(Decoder *d, void *fframe) {
> >+static int decoder_decode_frame(Decoder *d, AVFrame *frame, AVSubtitle
> >*sub) {
> >int got_frame = 0;
> >-AVFrame *frame = fframe;
> >
> >d->flushed = 0;
> >
> >@@ -608,7 +607,7 @@ static int decoder_decode_frame(Decoder *d, void
> >*fframe) {
> >}
> >break;
> >case AVMEDIA_TYPE_SUBTITLE:
> >-ret = avcodec_decode_subtitle2(d->avctx, fframe,
> >&got_frame, &d->pkt_temp);
> >+ret = avcodec_decode_subtitle2(d->avctx, sub, &got_frame,
> >&d->pkt_temp);
> >break;
> >}
> >
> >@@ -1863,7 +1862,7 @@ static int get_video_frame(VideoState *is, AVFrame
> >*frame)
> >{
> >int got_picture;
> >
> >-if ((got_picture = decoder_decode_frame(&is->viddec, frame)) < 0)
> >+if ((got_picture = decoder_decode_frame(&is->viddec, frame, NULL)) < 0)
> >return -1;
> >
> >if (got_picture) {
> >@@ -2219,7 +2218,7 @@ static int subtitle_thread(void *arg)
> >if (!(sp = frame_queue_peek_writable(&is->subpq)))
> >return 0;
> >
> >-if ((got_subtitle = decoder_decode_frame(&is->subdec, &sp->sub)) <
> >0)
> >+if ((got_subtitle = decoder_decode_frame(&is->subdec, NULL,
> >&sp->sub)) < 0)
> >break;
> >
> >pts = 0;
> >@@ -2483,7 +2482,7 @@ static int audio_decode_frame(VideoState *is)
> >return resampled_data_size;
> >}
> >
> >-if ((got_frame = decoder_decode_frame(&is->auddec, is->frame)) < 0)
> >+if ((got_frame = decoder_decode_frame(&is->auddec, is->frame,
> >NULL)) < 0)
> >return -1;
> >
> >if (is->auddec.flushed)
> >--
> >1.7.9.5
>
> LGTM, thanks.
applied
thanks
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
Why not whip the teacher when the pupil misbehaves? -- Diogenes of Sinope
signature.asc
Description: Digital signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] compiling on MAC OSX10.9 crashes on <=10.85
Hello,
i compiled ffmpeg under macosx 10.9 and had to find out, that my app what
uses libavformat is crashing on mac osx up to 10.85
the crash log says:
Dyld Error Message:
Symbol not found: ___sincosf_stret
export MES=/Users/aa/tmp/ffmpeg
export TARGET="/Volumes/${VOLNAME}/"
export CMPL="/Volumes/${VOLNAME}/compile"
export PATH=${TARGET}/bin:$PATH
mkdir ${CMPL}
./configure --prefix=${TARGET} --as=yasm --extra-version=snowy
--enable-shared --enable-static --extra-cflags="-I${TARGET}/include"
--extra-ldflags="-L${TARGET}/lib ---disable-ffplay --disable-ffserver
--enable-gpl --enable-pthreads --enable-postproc --enable-gray
--enable-libfaac --enable-libfaad --enable-libmp3lame --enable-libtheora
--enable-libvorbis --enable-libx264 --enable-libxvid --enable-libspeex
--enable-bzlib --enable-zlib --enable-libopencore-amrnb
--enable-libopencore-amrwb --enable-libxavs --enable-nonfree
--enable-version3 --enable-libvo-aacenc --enable-libvo-amrwbenc
--enable-libvpx --enable-libgsm --enable-libopus --enable-libtwolame
--enable-openal --enable-libsoxr --enable-libfdk-aac --enable-libwavpack
--enable-libutvideo --enable-libzmq --enable-libvidstab --enable-libilbc
--enable-libx265
i guess i have to add some more flags to configure ffmpeg correct
with regards
georg
---
Diese E-Mail ist frei von Viren und Malware, denn der avast! Antivirus Schutz
ist aktiv.
http://www.avast.com
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] Please help update tasks and mentor/backups for OPW
On Thu, Sep 25, 2014 at 02:20:21PM -0300, Reynaldo H. Verdejo Pinochet wrote: > If you were listed as a mentor please update your availability > and/or willingness status on the wiki. If you were listed as a > backup mentor for a mentorless project, please consider becoming > a full fledged mentor for it. Whatever the case, if you are updating > your availability or status on the wiki, please also let us > know on this same thread so we can easily keep tabs on who do we > still need to chase down ;) I am unable to help out this time around, even as backup. (Too busy). Cheers, -- Peter (A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B) signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] x86: inline asm cpuid vs. yasm cpuid
ff_cpu_cpuid routine (in libavutil/x86/cpuid.asm) clears ECX register before cpuid instruction. Inline asm version (in libavutil/x86/cpu.c) doesn't do this. As a result, FFmpeg will probably misdetect AVX2/BMI1/BMI2 if yasm is not enabled. As far as I understand GNU asm, the last line of cpuid macro should be changed from : "0" (index)) to : "0" (index), "2"(0)) ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
