| Message ID | b9d79779-e520-4d78-3665-03b5e5b19563@snafu.de |
|---|---|
| State | New |
| Headers | show |
On Thu, Apr 4, 2019 at 3:12 PM Peter Belkner <pbelkner@snafu.de> wrote: > > On 04.04.2019 08:49, mypopy@gmail.com wrote: > > On Thu, Apr 4, 2019 at 2:33 PM Peter Belkner <pbelkner@snafu.de> wrote: > > This patch does not improve or fix something instead it is meant for > easily reproducing issue 7827 (as requested, cf. > https://trac.ffmpeg.org/ticket/7827). I've to admit that I don't know > how to produce a patch by "git format-patch" instead it was made by "git > diff > muxing.patch". > > A lot of docs for this type question, this is a refer > https://www.x.org/wiki/Development/Documentation/SubmittingPatches/ > > You can used the command like: > > git format-patch HEAD~1 # create a patch for the last commit > > And I think "git diff > muxing.patch" will drop the commit message, > it's a part of the patch for review, Tks. > > The patch produced with your command is attached. This is *not* the patch I want to provide. > > Just believe me: I'm able to search the internet myself and luckily finally found https://stackoverflow.com/questions/5159185/create-a-git-patch-from-the-changes-in-the-current-working-directory. > > BTW: I already spend hours to narrow this issue to libavformat. Just eat the provided patch either from the issue itself (cf. https://trac.ffmpeg.org/ticket/7827) or from this mailing list OR LET IT BE. > > Cheers. Please try the patch https://patchwork.ffmpeg.org/patch/12612/, Thanks.
diff --git a/doc/bitstream_filters.texi b/doc/bitstream_filters.texi index 076b910e40..25bbf8372b 100644 --- a/doc/bitstream_filters.texi +++ b/doc/bitstream_filters.texi @@ -87,6 +87,9 @@ the timing info in the sequence header. Set the number of ticks in each picture, to indicate that the stream has a fixed framerate. Ignored if @option{tick_rate} is not also set. +@item delete_padding +Deletes Padding OBUs. + @end table @section chomp diff --git a/libavcodec/av1_metadata_bsf.c b/libavcodec/av1_metadata_bsf.c index 2b74b697e4..fe208feaf5 100644 --- a/libavcodec/av1_metadata_bsf.c +++ b/libavcodec/av1_metadata_bsf.c @@ -46,6 +46,8 @@ typedef struct AV1MetadataContext { AVRational tick_rate; int num_ticks_per_picture; + + int delete_padding; } AV1MetadataContext; @@ -158,6 +160,19 @@ static int av1_metadata_filter(AVBSFContext *bsf, AVPacket *out) } } + if (ctx->delete_padding) { + for (i = 0; i < frag->nb_units; i++) { + if (frag->units[i].type == AV1_OBU_PADDING) { + err = ff_cbs_delete_unit(ctx->cbc, frag, i); + if (err < 0) { + av_log(bsf, AV_LOG_ERROR, "Failed to delete Padding OBU.\n"); + goto fail; + } + --i; + } + } + } + err = ff_cbs_write_packet(ctx->cbc, out, frag); if (err < 0) { av_log(bsf, AV_LOG_ERROR, "Failed to write packet.\n"); @@ -275,6 +290,10 @@ static const AVOption av1_metadata_options[] = { OFFSET(num_ticks_per_picture), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, FLAGS }, + { "delete_padding", "Delete all Padding OBUs", + OFFSET(delete_padding), AV_OPT_TYPE_BOOL, + { .i64 = 0 }, 0, 1, FLAGS}, + { NULL } }; diff --git a/libavcodec/version.h b/libavcodec/version.h index d1cd356524..02cb5c3ec1 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 58 #define LIBAVCODEC_VERSION_MINOR 48 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \