| Message ID | 20181204084200.15162-1-kjeyapal@akamai.com |
|---|---|
| State | Accepted |
| Headers | show |
On 04-12-2018 02:11 PM, Karthick J wrote: > diff --git a/doc/muxers.texi b/doc/muxers.texi > index f1cc6f5fee..6ca27b04a3 100644 > --- a/doc/muxers.texi > +++ b/doc/muxers.texi > @@ -1325,6 +1325,8 @@ more efficient), but with this option set, the muxer writes one moof/mdat > pair for each track, making it easier to separate tracks. > > This option is implicitly set when writing ismv (Smooth Streaming) files. > +@item -movflags no_sidx > +Don't write sidx atom. Append a short note advising when this is required or recommended and when not. Thanks, Gyan
On 04.12.2018 09:41, Karthick J wrote: > --- > doc/muxers.texi | 2 ++ > libavformat/movenc.c | 7 +++++-- > libavformat/movenc.h | 1 + > 3 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/doc/muxers.texi b/doc/muxers.texi > index f1cc6f5fee..6ca27b04a3 100644 > --- a/doc/muxers.texi > +++ b/doc/muxers.texi > @@ -1325,6 +1325,8 @@ more efficient), but with this option set, the muxer writes one moof/mdat > pair for each track, making it easier to separate tracks. > > This option is implicitly set when writing ismv (Smooth Streaming) files. > +@item -movflags no_sidx > +Don't write sidx atom. > @item -movflags faststart > Run a second pass moving the index (moov atom) to the beginning of the file. > This operation can take a while, and will not work in various situations such What about naming the option "skip_sidx" for symmetry with the existing "skip_trailer"? Just my personal thought. Also it might be worth mentioning in the docs how global_sidx and the new option correlate (which one is preferred if both exists, or is it an error to specify both?). > > [...] > > diff --git a/libavformat/movenc.h b/libavformat/movenc.h > index fe605d1ad2..ee6749bce2 100644 > --- a/libavformat/movenc.h > +++ b/libavformat/movenc.h > @@ -257,6 +257,7 @@ typedef struct MOVMuxContext { > #define FF_MOV_FLAG_SKIP_TRAILER (1 << 18) > #define FF_MOV_FLAG_NEGATIVE_CTS_OFFSETS (1 << 19) > #define FF_MOV_FLAG_FRAG_EVERY_FRAME (1 << 20) > +#define FF_MOV_FLAG_NO_SIDX (1 << 21) > > int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt); > > Regards, Tobias
On 12/4/18, 4:25 PM, "Tobias Rapp" <t.rapp@noa-archive.com> wrote: >>On 04.12.2018 09:41, Karthick J wrote: >>[...] >> Run a second pass moving the index (moov atom) to the beginning of the file. >> This operation can take a while, and will not work in various situations such > >What about naming the option "skip_sidx" for symmetry with the existing >"skip_trailer"? Just my personal thought. > >Also it might be worth mentioning in the docs how global_sidx and the >new option correlate (which one is preferred if both exists, or is it an >error to specify both?). Thanks for your comments. I have addressed both your feedbacks points in PATCH v2 http://ffmpeg.org/pipermail/ffmpeg-devel/2018-December/237181.html Regards, Karthick > >> >> [...] > >Regards, >Tobias _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
On 12/4/18, 2:18 PM, "Gyan Doshi" <gyandoshi@gmail.com> wrote: >On 04-12-2018 02:11 PM, Karthick J wrote: > >> [...] >> +@item -movflags no_sidx >> +Don't write sidx atom. > >Append a short note advising when this is required or recommended and >when not. Thanks for your comment. I have added more details in PATCH v2. http://ffmpeg.org/pipermail/ffmpeg-devel/2018-December/237181.html Regards, Karthick > >Thanks, >Gyan
diff --git a/doc/muxers.texi b/doc/muxers.texi index f1cc6f5fee..6ca27b04a3 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -1325,6 +1325,8 @@ more efficient), but with this option set, the muxer writes one moof/mdat pair for each track, making it easier to separate tracks. This option is implicitly set when writing ismv (Smooth Streaming) files. +@item -movflags no_sidx +Don't write sidx atom. @item -movflags faststart Run a second pass moving the index (moov atom) to the beginning of the file. This operation can take a while, and will not work in various situations such diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 6dab5193b0..83278e8bfd 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -75,6 +75,7 @@ static const AVOption options[] = { { "frag_discont", "Signal that the next fragment is discontinuous from earlier ones", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_FRAG_DISCONT}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" }, { "delay_moov", "Delay writing the initial moov until the first fragment is cut, or until the first fragment flush", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_DELAY_MOOV}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" }, { "global_sidx", "Write a global sidx index at the start of the file", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_GLOBAL_SIDX}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" }, + { "no_sidx", "Don't write sidx atom", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_NO_SIDX}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" }, { "write_colr", "Write colr atom (Experimental, may be renamed or changed, do not use from scripts)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_WRITE_COLR}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" }, { "write_gama", "Write deprecated gama atom", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_WRITE_GAMA}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" }, { "use_metadata_tags", "Use mdta atom for metadata.", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_USE_MDTA}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" }, @@ -4603,7 +4604,8 @@ static int mov_write_moof_tag(AVIOContext *pb, MOVMuxContext *mov, int tracks, mov_write_moof_tag_internal(avio_buf, mov, tracks, 0); moof_size = ffio_close_null_buf(avio_buf); - if (mov->flags & FF_MOV_FLAG_DASH && !(mov->flags & FF_MOV_FLAG_GLOBAL_SIDX)) + if (mov->flags & FF_MOV_FLAG_DASH && + !(mov->flags & (FF_MOV_FLAG_GLOBAL_SIDX | FF_MOV_FLAG_NO_SIDX))) mov_write_sidx_tags(pb, mov, tracks, moof_size + 8 + mdat_size); if (mov->write_prft > MOV_PRFT_NONE && mov->write_prft < MOV_PRFT_NB) @@ -5422,7 +5424,8 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) * the next fragment. This means the cts of the first sample must * be the same in all fragments, unless end_pts was updated by * the packet causing the fragment to be written. */ - if ((mov->flags & FF_MOV_FLAG_DASH && !(mov->flags & FF_MOV_FLAG_GLOBAL_SIDX)) || + if ((mov->flags & FF_MOV_FLAG_DASH && + !(mov->flags & (FF_MOV_FLAG_GLOBAL_SIDX | FF_MOV_FLAG_NO_SIDX))) || mov->mode == MODE_ISM) pkt->pts = pkt->dts + trk->end_pts - trk->cluster[trk->entry].dts; } else { diff --git a/libavformat/movenc.h b/libavformat/movenc.h index fe605d1ad2..ee6749bce2 100644 --- a/libavformat/movenc.h +++ b/libavformat/movenc.h @@ -257,6 +257,7 @@ typedef struct MOVMuxContext { #define FF_MOV_FLAG_SKIP_TRAILER (1 << 18) #define FF_MOV_FLAG_NEGATIVE_CTS_OFFSETS (1 << 19) #define FF_MOV_FLAG_FRAG_EVERY_FRAME (1 << 20) +#define FF_MOV_FLAG_NO_SIDX (1 << 21) int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt);