On Fri, Dec 09, 2016 at 01:02:08AM +0100, Andreas Cadhalpun wrote: > On 08.12.2016 22:53, Michael Niedermayer wrote: > > This decreases the amount of computations and memory needed for analysing > > mpeg1/2 streams > > > > Signed-off-by: Michael Niedermayer <[email protected]> > > --- > > libavcodec/mpeg12dec.c | 6 +++++- > > 1 file changed, 5 insertions(+), 1 deletion(-) > > > > diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c > > index ac8160daff..63979079c8 100644 > > --- a/libavcodec/mpeg12dec.c > > +++ b/libavcodec/mpeg12dec.c > > @@ -1655,7 +1655,6 @@ static int mpeg_field_start(MpegEncContext *s, const > > uint8_t *buf, int buf_size) > > if (sd) > > memcpy(sd->data, s1->a53_caption, s1->a53_caption_size); > > av_freep(&s1->a53_caption); > > - avctx->properties |= FF_CODEC_PROPERTY_CLOSED_CAPTIONS; > > } > > > > if (s1->has_stereo3d) { > > @@ -2258,6 +2257,7 @@ static int mpeg_decode_a53_cc(AVCodecContext *avctx, > > s1->a53_caption = av_malloc(s1->a53_caption_size); > > if (s1->a53_caption) > > memcpy(s1->a53_caption, p + 7, s1->a53_caption_size); > > + avctx->properties |= FF_CODEC_PROPERTY_CLOSED_CAPTIONS; > > } > > return 1; > > } else if (buf_size >= 11 && > > @@ -2313,6 +2313,7 @@ static int mpeg_decode_a53_cc(AVCodecContext *avctx, > > p += 6; > > } > > } > > + avctx->properties |= FF_CODEC_PROPERTY_CLOSED_CAPTIONS; > > } > > return 1; > > } > > How are the above changes related to the commit message?
the update is moved from code that is skiped if skip_frame is set
to code that is not skiped so the change below doesnt loose that
from being executed
>
> > @@ -2868,6 +2869,7 @@ AVCodec ff_mpeg1video_decoder = {
> > .capabilities = AV_CODEC_CAP_DRAW_HORIZ_BAND |
> > AV_CODEC_CAP_DR1 |
> > AV_CODEC_CAP_TRUNCATED | AV_CODEC_CAP_DELAY |
> > AV_CODEC_CAP_SLICE_THREADS,
> > + .caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM,
> > .flush = flush,
> > .max_lowres = 3,
> > .update_thread_context =
> > ONLY_IF_THREADS_ENABLED(mpeg_decode_update_thread_context)
> > @@ -2885,6 +2887,7 @@ AVCodec ff_mpeg2video_decoder = {
> > .capabilities = AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_DR1 |
> > AV_CODEC_CAP_TRUNCATED | AV_CODEC_CAP_DELAY |
> > AV_CODEC_CAP_SLICE_THREADS,
> > + .caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM,
> > .flush = flush,
> > .max_lowres = 3,
> > .profiles = NULL_IF_CONFIG_SMALL(ff_mpeg2_video_profiles),
> > @@ -2901,6 +2904,7 @@ AVCodec ff_mpegvideo_decoder = {
> > .close = mpeg_decode_end,
> > .decode = mpeg_decode_frame,
> > .capabilities = AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_DR1 |
> > AV_CODEC_CAP_TRUNCATED | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_SLICE_THREADS,
> > + .caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM,
> > .flush = flush,
> > .max_lowres = 3,
> > };
> >
>
> Adding these here is probably OK.
>
> Best regards,
> Andreas
> _______________________________________________
> ffmpeg-devel mailing list
> [email protected]
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
The educated differ from the uneducated as much as the living from the
dead. -- Aristotle
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
