Re: [FFmpeg-devel] [PATCH] avformat/hlsenc: skip first char after compare path with path separator

2020-03-29 Thread Limin Wang
On Sun, Mar 29, 2020 at 11:14:37AM +0800, Steven Liu wrote: > before patch: > ffmpeg -i input -g 25 -y -c:a aac -map 0:v -map 0:a > -master_pl_name playlist.m3u8 -var_stream_map "v:0,a:0" c%v.m3u8" > the master file playlist.m3u8 context is > #EXTM3U > #EXT-X-VERSION:3 > > #EXT-X-STREA

Re: [FFmpeg-devel] [PATCH v1 1/4] avformat/hlsenc: remove the first slash of the relative path line in the master m3u8 file

2020-03-29 Thread Steven Liu
> 2020年3月26日 下午9:56,lance.lmw...@gmail.com 写道: > > From: Limin Wang > > Please testing with the following command: > ./ffmpeg -y -i input.mkv \ > -b:v:0 5250k -c:v h264 -pix_fmt yuv420p -profile:v main -level 4.1 \ > -b:a:0 256k \ > -c:a mp2 -ar 48000 -ac 2 -map 0:v -map 0:a:0\ > -f hls -var_s

Re: [FFmpeg-devel] [PATCH v1 2/4] avformat/hlsplaylist: simplify code for checking whether the string is empty

2020-03-29 Thread Steven Liu
> 2020年3月26日 下午9:56,lance.lmw...@gmail.com 写道: > > From: Limin Wang > > Signed-off-by: Limin Wang > --- > libavformat/hlsplaylist.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/libavformat/hlsplaylist.c b/libavformat/hlsplaylist.c > index 9cbd02353f..56244496

Re: [FFmpeg-devel] [PATCH v1 3/4] avformat: add subtitle support in master playlist m3u8

2020-03-29 Thread Steven Liu
> 2020年3月26日 下午9:56,lance.lmw...@gmail.com 写道: > > From: Limin Wang > > Test with the following command for the webvtt subtitle: > $ ./ffmpeg -y -i input_with_subtitle.mkv \ > -b:v:0 5250k -c:v h264 -pix_fmt yuv420p -profile:v main -level 4.1 \ > -b:a:0 256k \ > -c:s webvtt -c:a mp2 -ar 48000

Re: [FFmpeg-devel] [PATCH v1 4/4] avformat/hlsenc: use av_asprintf()

2020-03-29 Thread Steven Liu
> 2020年3月26日 下午9:57,lance.lmw...@gmail.com 写道: > > From: Limin Wang > > Signed-off-by: Limin Wang > --- > libavformat/hlsenc.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c > index d7b9c0e20a..694dab42dd 100644 > --- a/

Re: [FFmpeg-devel] [PATCH v2 2/3] avfilter/vf_mix: Check sscanf() return value

2020-03-29 Thread Nicolas George
Limin Wang (12020-03-29): > OK, update the patch to print a message and return error. Thanks. I have no objection to that new version, but I do not maintain that code. Regards, -- Nicolas George ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org

Re: [FFmpeg-devel] [PATCH 5/5] avformat/mpeg: Don't use unintialized value

2020-03-29 Thread Andreas Rheinhardt
Andreas Rheinhardt: > Michael Niedermayer: >> On Sun, Jan 19, 2020 at 02:43:00PM +, Andreas Rheinhardt wrote: >>> Michael Niedermayer: On Tue, Oct 22, 2019 at 03:16:45PM +0200, Andreas Rheinhardt wrote: > vobsub_read_packet() didn't check whether an index in array of AVPackets > wa

[FFmpeg-devel] [PATCH 1/5] avformat/smacker: Read extradata directly into extradata

2020-03-29 Thread Andreas Rheinhardt
The Smacker demuxer reads four consecutive 32bit values from the file header into its demux context (as four uint32_t), converting it to native endianness in the process and then writing these four values later (after extradata has been allocated) to extradata as four 32bit values (converting to li

[FFmpeg-devel] [PATCH v2 3/4] avformat: add subtitle support in master playlist m3u8

2020-03-29 Thread lance . lmwang
From: Limin Wang Test with the following command for the webvtt subtitle: $ ./ffmpeg -y -i input_with_subtitle.mkv \ -b:v:0 5250k -c:v h264 -pix_fmt yuv420p -profile:v main -level 4.1 \ -b:a:0 256k \ -c:s webvtt -c:a mp2 -ar 48000 -ac 2 -map 0:v -map 0:a:0 -map 0:s:0 \ -f hls -var_stream_map

[FFmpeg-devel] [PATCH 2/5] avformat/smacker: Create audio streams immediately

2020-03-29 Thread Andreas Rheinhardt
The Smacker demuxer currently parses several fields that indicate how many audio streams a file contains. This data is parsed and stored into arrays in the demuxer's context and although the data is used only to initialize the audio streams, it is kept for the whole lifetime of the demuxer. This h

[FFmpeg-devel] [PATCH 4/5] avformat/smacker: Remove unused structure

2020-03-29 Thread Andreas Rheinhardt
Signed-off-by: Andreas Rheinhardt --- libavformat/smacker.c | 5 - 1 file changed, 5 deletions(-) diff --git a/libavformat/smacker.c b/libavformat/smacker.c index 1e8858dd4e..c934615c54 100644 --- a/libavformat/smacker.c +++ b/libavformat/smacker.c @@ -61,11 +61,6 @@ typedef struct SmackerCo

[FFmpeg-devel] [PATCH 3/5] avformat/smacker: Only store what is needed later

2020-03-29 Thread Andreas Rheinhardt
This commit removes data that is only used during smacker_read_header() from the demuxer's context and replaces the data that is used by local variables. The other data is completely dropped. Signed-off-by: Andreas Rheinhardt --- libavformat/smacker.c | 74 +++

[FFmpeg-devel] [PATCH 5/5] avformat/smacker: Cosmetics

2020-03-29 Thread Andreas Rheinhardt
This is mainly about improving legibility of the code and getting rid of overlong lines by using variables for st->codecpar instead of accessing the codec parameters via st->codecpar->. Also, some code has been moved to better fitting places. Signed-off-by: Andreas Rheinhardt --- libavformat/sm

Re: [FFmpeg-devel] [PATCH v1 3/4] avformat: add subtitle support in master playlist m3u8

2020-03-29 Thread Limin Wang
On Sun, Mar 29, 2020 at 04:32:06PM +0800, Steven Liu wrote: > > > > 2020年3月26日 下午9:56,lance.lmw...@gmail.com 写道: > > > > From: Limin Wang > > > > Test with the following command for the webvtt subtitle: > > $ ./ffmpeg -y -i input_with_subtitle.mkv \ > > -b:v:0 5250k -c:v h264 -pix_fmt yuv420p

Re: [FFmpeg-devel] [PATCH v2 2/2] avformat: add demuxer for Pro Pinball Series' Soundbanks

2020-03-29 Thread Zane van Iperen
On Sun, 29 Mar 2020 01:49:32 +0100 "Carl Eugen Hoyos" wrote: > Apart from what I wrote on irc: > What surprises me most is that iirc, you explained that the > sample_rate is written repeatedly to the file and is always identical > in one file. Why is that not checked? > The main reason is that

Re: [FFmpeg-devel] [PATCH] avformat/mxfdec: Correct confusing struct tag

2020-03-29 Thread Paul B Mahol
lgtm On 3/29/20, Andreas Rheinhardt wrote: > Don't use typedef struct MXFTrack {...} MXFTimecodeComponent, in > particular given the fact that MXFTrack is a type of its own. > > Signed-off-by: Andreas Rheinhardt > --- > libavformat/mxfdec.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-

[FFmpeg-devel] Query regarding codec parsers

2020-03-29 Thread Gautam Ramakrishnan
Hello, I had gone through ticket #7445 and it mentions about JPEG2000 parser. What exactly does a parser do and how is it different from a decoder? I am unable to understand the exact use case of a parser. -- - Gautam | ___ ffmpeg-devel mai

Re: [FFmpeg-devel] Query regarding codec parsers

2020-03-29 Thread Carl Eugen Hoyos
Am So., 29. März 2020 um 14:23 Uhr schrieb Gautam Ramakrishnan : > I had gone through ticket #7445 Better tickets are imo: https://trac.ffmpeg.org/ticket/4669 https://trac.ffmpeg.org/ticket/4679 sample in http://samples.ffmpeg.org/ffmpeg-bugs/trac/ticket4679/ https://trac.ffmpeg.org/ticket/4827 h

Re: [FFmpeg-devel] [PATCH] avformat/mxfdec: Correct confusing struct tag

2020-03-29 Thread Tomas Härdin
sön 2020-03-29 klockan 06:06 +0200 skrev Andreas Rheinhardt: > Don't use typedef struct MXFTrack {...} MXFTimecodeComponent, in > particular given the fact that MXFTrack is a type of its own. > > Signed-off-by: Andreas Rheinhardt > --- > libavformat/mxfdec.c | 2 +- > 1 file changed, 1 insertion

[FFmpeg-devel] [PATCH v5 1/2] avcodec: add support for Cunning Developments' ADPCM

2020-03-29 Thread Zane van Iperen
Signed-off-by: Zane van Iperen --- Changelog | 1 + doc/general.texi| 1 + libavcodec/Makefile | 1 + libavcodec/adpcm.c | 33 + libavcodec/adpcm_data.c | 13 + libavcodec/adpcm_data.h | 2 ++ libavcodec/allcodecs.c |

[FFmpeg-devel] [PATCH v5 0/2] Pro Pinball Series Soundbank demuxer + decoder.

2020-03-29 Thread Zane van Iperen
Adds support for the soundbank files used by the Pro Pinball series of games. Please CC for review. v5: - add probe function - add flag #define's v4: - fix adpcm index table type v3: - fix potential memory leak if read_header() fails - fix a buffer overread - attempt seek before upd

[FFmpeg-devel] [PATCH v5 2/2] avformat: add demuxer for Pro Pinball Series' Soundbanks

2020-03-29 Thread Zane van Iperen
Signed-off-by: Zane van Iperen --- Changelog| 1 + libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/pp_bnk.c | 259 +++ libavformat/version.h| 2 +- 5 files changed, 263 insertions(+), 1 deletion(-) cr

Re: [FFmpeg-devel] Query regarding codec parsers

2020-03-29 Thread Gautam Ramakrishnan
On Sun, Mar 29, 2020 at 6:12 PM Carl Eugen Hoyos wrote: > > Am So., 29. März 2020 um 14:23 Uhr schrieb Gautam Ramakrishnan > : > > > I had gone through ticket #7445 > > Better tickets are imo: > https://trac.ffmpeg.org/ticket/4669 > https://trac.ffmpeg.org/ticket/4679 > sample in http://samples.ff

Re: [FFmpeg-devel] [PATCH v2] avcodec/v4l2_m2m: fix setting the frame rate

2020-03-29 Thread Andriy Gelman
On Tue, 17. Mar 19:29, Ming Qian wrote: > v4l2 set the frame rate through frame intervals, > not set frame rate directly. > the frame rate and frame intervals are reciprocal. > so in libavdevice/v4l2.c we can see the following code: > tpf->numerator = framerate_q.den; > tpf->denominat

Re: [FFmpeg-devel] Query regarding codec parsers

2020-03-29 Thread Carl Eugen Hoyos
Am So., 29. März 2020 um 16:45 Uhr schrieb Gautam Ramakrishnan : > > > What exactly does a parser do and how is it different from a decoder? > > > I am unable to understand the exact use case of a parser. > > > > Try the following: > > $ cat 1.jpg 2.jpg | ffmpeg -i -f null - > > (Is expected to de

Re: [FFmpeg-devel] [PATCH v3] avcodec/v4l2_m2m: handle the v4l2 eos event

2020-03-29 Thread Andriy Gelman
On Tue, 17. Mar 19:39, Ming Qian wrote: > when the last frame of capture is dequeueed, > driver may send this V4L2_EVENT_EOS event, > if this event is received, then we can set the capture port done s/dequeueed/dequeued Also I'd change the last line to: "If this event is received, then the captur

[FFmpeg-devel] [RFC, PATCH]lavu/log: Do not change the terminal background colour

2020-03-29 Thread Carl Eugen Hoyos
Hi! Attached patch fixes ticket #8587, not sure if we want this or not, but I do not consider the missing encircled / blinking effect (that is not used by our command line tools) an issue. Please comment, Carl Eugen From 64eeec19197fe7726f3bb103417ae3277b1cd8f9 Mon Sep 17 00:00:00 2001 From: Carl

Re: [FFmpeg-devel] [PATCH v5 2/2] avformat: add demuxer for Pro Pinball Series' Soundbanks

2020-03-29 Thread Michael Niedermayer
On Sun, Mar 29, 2020 at 01:30:36PM +, Zane van Iperen wrote: [...] > +static int pp_bnk_probe(const AVProbeData *p) > +{ > +uint32_t sample_rate = AV_RL32(p->buf + 4); > +uint32_t track_count = AV_RL32(p->buf + 12); > +uint32_t flags = AV_RL32(p->buf + 16); > + > +if (tr

Re: [FFmpeg-devel] [PATCH v5 2/2] avformat: add demuxer for Pro Pinball Series' Soundbanks

2020-03-29 Thread Zane van Iperen
On Sun, 29 Mar 2020 18:21:37 +0200 "Michael Niedermayer" wrote: > On Sun, Mar 29, 2020 at 01:30:36PM +, Zane van Iperen wrote: > [...] > > > +static int pp_bnk_probe(const AVProbeData *p) > > +{ > > +uint32_t sample_rate = AV_RL32(p->buf + 4); > > +uint32_t track_count = AV_RL32(p->

[FFmpeg-devel] [PATCH v6 1/2] avcodec: add support for Cunning Developments' ADPCM

2020-03-29 Thread Zane van Iperen
Signed-off-by: Zane van Iperen --- Changelog | 1 + doc/general.texi| 1 + libavcodec/Makefile | 1 + libavcodec/adpcm.c | 33 + libavcodec/adpcm_data.c | 13 + libavcodec/adpcm_data.h | 2 ++ libavcodec/allcodecs.c |

[FFmpeg-devel] [PATCH v6 2/2] avformat: add demuxer for Pro Pinball Series' Soundbanks

2020-03-29 Thread Zane van Iperen
Signed-off-by: Zane van Iperen --- Changelog| 1 + libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/pp_bnk.c | 263 +++ libavformat/version.h| 2 +- 5 files changed, 267 insertions(+), 1 deletion(-) cr

[FFmpeg-devel] [PATCH v6 0/2] Pro Pinball Series Soundbank demuxer + decoder.

2020-03-29 Thread Zane van Iperen
Adds support for the soundbank files used by the Pro Pinball series of games. Please CC for review. v6: - fix tools/probetest failure v5: - add probe function - add flag #define's v4: - fix adpcm index table type v3: - fix potential memory leak if read_header() fails - fix a buffer

[FFmpeg-devel] [PATCH] mov: fix seek to next root atom in fragmented mp4

2020-03-29 Thread John Stebbins
If some but not all moof's are referenced in an sidx, whole fragments were being skipped. Fixes tickets 7377, 7389, and 8502 May also fix 8070 but the sample links expired, so I can't test. --- libavformat/mov.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/mov

Re: [FFmpeg-devel] [PATCH] mov: fix seek to next root atom in fragmented mp4

2020-03-29 Thread Andreas Rheinhardt
John Stebbins: > If some but not all moof's are referenced in an sidx, whole fragments > were being skipped. > > Fixes tickets 7377, 7389, and 8502 > May also fix 8070 but the sample links expired, so I can't test. Sample can be found here: https://samples.ffmpeg.org/ffmpeg-bugs/trac/ticket8070/

Re: [FFmpeg-devel] [PATCH] mov: fix seek to next root atom in fragmented mp4

2020-03-29 Thread John Stebbins
On Sun, 2020-03-29 at 22:38 +0200, Andreas Rheinhardt wrote: > John Stebbins: > > If some but not all moof's are referenced in an sidx, whole > > fragments > > were being skipped. > > > > Fixes tickets 7377, 7389, and 8502 > > May also fix 8070 but the sample links expired, so I can't test. > > S

[FFmpeg-devel] [PATCH] avformat/mpegts: use a buffer pool for PES payloads

2020-03-29 Thread James Almer
This produces a small speed up in demuxing Signed-off-by: James Almer --- libavformat/mpegts.c | 20 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 7f56bacb2c..7746a524c4 100644 --- a/libavformat/mpegts.c +++

[FFmpeg-devel] [PATCH] libavformat/mov: fix multiple trun per traf

2020-03-29 Thread John Stebbins
dts would start over at the beginning of each trun when they should be computed contiguously for each trun in a traf Fixes ticket 8070 --- libavformat/isom.h | 1 + libavformat/mov.c | 12 +++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/libavformat/isom.h b/libavform

Re: [FFmpeg-devel] [PATCH] mov: fix seek to next root atom in fragmented mp4

2020-03-29 Thread Carl Eugen Hoyos
Am So., 29. März 2020 um 22:33 Uhr schrieb John Stebbins : > > If some but not all moof's are referenced in an sidx, whole fragments > were being skipped. > > Fixes tickets 7377, 7389, and 8502 > May also fix 8070 but the sample links expired, so I can't test. Thank you for looking into this! Car

[FFmpeg-devel] [GSoC] [WIP] [RFC] FLIF Encoder & Decoder Project

2020-03-29 Thread Kartik K. Khullar
This is my WIP patch for GSoC and I worked on transformations involved in encoding/decoding FLIF images. I have created a module under libavcodec and as guided by my mentors I have tried to use pixel data from AVFrame structs. Module covers all the chunks of code for YCoCg Transformation that will

Re: [FFmpeg-devel] [PATCH v6 2/2] libavcodec/jpeg2000dec.c: Handle non EOC streams

2020-03-29 Thread Michael Niedermayer
On Sat, Mar 28, 2020 at 09:16:41PM +0530, gautamr...@gmail.com wrote: > From: Gautam Ramakrishnan > > This patch allows decoding of j2k streams which do > not have an EOC marker. OpenJPEG implements a similar > check. > --- > libavcodec/jpeg2000dec.c | 8 ++-- > 1 file changed, 6 insertions(

Re: [FFmpeg-devel] [PATCH v6 1/2] libavcodec/jpeg2000dec.c: Add functions and modify structs for PPT marker support

2020-03-29 Thread Michael Niedermayer
On Sat, Mar 28, 2020 at 09:16:40PM +0530, gautamr...@gmail.com wrote: > From: Gautam Ramakrishnan > > This patch adds support for the PPT marker. It breaks down the > jpeg2000_decode_packet() function to decode headers and data > separately. > --- > libavcodec/jpeg2000dec.c | 202 +++

Re: [FFmpeg-devel] [PATCH 4/4] avfilter/vf_derain.c: put all the calculation in model file.

2020-03-29 Thread Guo, Yejun
> -Original Message- > From: Steven Liu [mailto:l...@chinaffmpeg.org] > Sent: Monday, March 23, 2020 1:05 PM > To: FFmpeg development discussions and patches > Cc: Steven Liu ; Guo, Yejun > Subject: Re: [FFmpeg-devel] [PATCH 4/4] avfilter/vf_derain.c: put all the > calculation in model

Re: [FFmpeg-devel] [PATCH v6 1/2] libavcodec/jpeg2000dec.c: Add functions and modify structs for PPT marker support

2020-03-29 Thread Gautam Ramakrishnan
On Mon, Mar 30, 2020 at 6:31 AM Michael Niedermayer wrote: > > On Sat, Mar 28, 2020 at 09:16:40PM +0530, gautamr...@gmail.com wrote: > > From: Gautam Ramakrishnan > > > > This patch adds support for the PPT marker. It breaks down the > > jpeg2000_decode_packet() function to decode headers and dat

[FFmpeg-devel] [PATCH v7 2/3] libavcodec/jpeg2000dec.c: Add support for PPT marker

2020-03-29 Thread gautamramk
From: Gautam Ramakrishnan This patch adds functional changes to support the PPT marker. --- libavcodec/jpeg2000dec.c | 178 +++ 1 file changed, 144 insertions(+), 34 deletions(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 4ee20e41b

[FFmpeg-devel] [PATCH v7 3/3] libavcodec/jpeg2000dec.c: Handle non EOC streams

2020-03-29 Thread gautamramk
From: Gautam Ramakrishnan This patch allows decoding of j2k streams which do not have an EOC marker. --- libavcodec/jpeg2000dec.c | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 71f1245fc1..a319297ae7 100644 --

[FFmpeg-devel] [PATCH v7 1/3] libavcodec/jpeg2000dec.c: Split function and modify structs for PPM marker support

2020-03-29 Thread gautamramk
From: Gautam Ramakrishnan --- libavcodec/jpeg2000dec.c | 48 ++-- 1 file changed, 41 insertions(+), 7 deletions(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 7103cd6ceb..4ee20e41b1 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavc