diff mbox series

[FFmpeg-devel,v3,1/2] avformat/ttml: split TTML paragraph based or not check into header

Message ID 20210726134104.42737-2-jeebjp@gmail.com
State New
Headers show
Series TTML in MP4, part 1
Related show

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate success Make fate finished

Commit Message

Jan Ekström July 26, 2021, 1:41 p.m. UTC
From: Jan Ekström <jan.ekstrom@24i.com>

This way it can be re-utilized in movenc.

Signed-off-by: Jan Ekström <jan.ekstrom@24i.com>
---
 libavformat/ttmlenc.c |  9 ++-------
 libavformat/ttmlenc.h | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 7 deletions(-)
 create mode 100644 libavformat/ttmlenc.h

Comments

Andreas Rheinhardt Aug. 2, 2021, 12:53 p.m. UTC | #1
Jan Ekström:
> From: Jan Ekström <jan.ekstrom@24i.com>
> 
> This way it can be re-utilized in movenc.
> 
> Signed-off-by: Jan Ekström <jan.ekstrom@24i.com>
> ---
>  libavformat/ttmlenc.c |  9 ++-------
>  libavformat/ttmlenc.h | 39 +++++++++++++++++++++++++++++++++++++++
>  2 files changed, 41 insertions(+), 7 deletions(-)
>  create mode 100644 libavformat/ttmlenc.h
> 
> diff --git a/libavformat/ttmlenc.c b/libavformat/ttmlenc.c
> index 7577cb543b..5c4cd8b5e9 100644
> --- a/libavformat/ttmlenc.c
> +++ b/libavformat/ttmlenc.c
> @@ -29,6 +29,7 @@
>  
>  #include "avformat.h"
>  #include "internal.h"
> +#include "ttmlenc.h"
>  #include "libavcodec/ttmlenc.h"
>  #include "libavutil/internal.h"
>  
> @@ -137,13 +138,7 @@ static int ttml_write_header(AVFormatContext *ctx)
>                                                0);
>          const char *printed_lang = (lang && lang->value) ? lang->value : "";
>  
> -        // Not perfect, but decide whether the packet is a document or not
> -        // by the existence of the lavc ttmlenc extradata.
> -        ttml_ctx->input_type = (st->codecpar->extradata &&
> -                                st->codecpar->extradata_size >= TTMLENC_EXTRADATA_SIGNATURE_SIZE &&
> -                                !memcmp(st->codecpar->extradata,
> -                                        TTMLENC_EXTRADATA_SIGNATURE,
> -                                        TTMLENC_EXTRADATA_SIGNATURE_SIZE)) ?
> +        ttml_ctx->input_type = ff_is_ttml_stream_paragraph_based(st->codecpar) ?
>                                 PACKET_TYPE_PARAGRAPH :
>                                 PACKET_TYPE_DOCUMENT;
>  
> diff --git a/libavformat/ttmlenc.h b/libavformat/ttmlenc.h
> new file mode 100644
> index 0000000000..2da233b8f1
> --- /dev/null
> +++ b/libavformat/ttmlenc.h
> @@ -0,0 +1,39 @@
> +/*
> + * Generic TTML helpers
> + * Copyright (c) 2021 24i
> + *
> + * This file is part of FFmpeg.
> + *
> + * FFmpeg is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Lesser General Public
> + * License as published by the Free Software Foundation; either
> + * version 2.1 of the License, or (at your option) any later version.
> + *
> + * FFmpeg is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> + * Lesser General Public License for more details.
> + *
> + * You should have received a copy of the GNU Lesser General Public
> + * License along with FFmpeg; if not, write to the Free Software
> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
> + */
> +
> +#ifndef AVFORMAT_TTMLENC_H
> +#define AVFORMAT_TTMLENC_H
> +
> +#include "avformat.h"

You actually only need libavcodec/codec_par.h

> +#include "libavcodec/ttmlenc.h"
> +
> +static inline unsigned int ff_is_ttml_stream_paragraph_based(AVCodecParameters *codecpar)

Missing const.

> +{
> +    // Not perfect, but decide whether the packet is a document or not
> +    // by the existence of the lavc ttmlenc extradata.
> +    return (codecpar->extradata &&
> +            codecpar->extradata_size >= TTMLENC_EXTRADATA_SIGNATURE_SIZE &&
> +            !memcmp(codecpar->extradata,
> +                    TTMLENC_EXTRADATA_SIGNATURE,
> +                    TTMLENC_EXTRADATA_SIGNATURE_SIZE));
> +}
> +
> +#endif /* AVFORMAT_TTMLENC_H */
>
Jan Ekström Aug. 9, 2021, 1:05 p.m. UTC | #2
On Mon, Aug 2, 2021 at 3:54 PM Andreas Rheinhardt
<andreas.rheinhardt@outlook.com> wrote:
>
> Jan Ekström:
> > From: Jan Ekström <jan.ekstrom@24i.com>
> >
> > This way it can be re-utilized in movenc.
> >
> > Signed-off-by: Jan Ekström <jan.ekstrom@24i.com>
> > ---
> >  libavformat/ttmlenc.c |  9 ++-------
> >  libavformat/ttmlenc.h | 39 +++++++++++++++++++++++++++++++++++++++
> >  2 files changed, 41 insertions(+), 7 deletions(-)
> >  create mode 100644 libavformat/ttmlenc.h
> >
> > diff --git a/libavformat/ttmlenc.c b/libavformat/ttmlenc.c
> > index 7577cb543b..5c4cd8b5e9 100644
> > --- a/libavformat/ttmlenc.c
> > +++ b/libavformat/ttmlenc.c
> > @@ -29,6 +29,7 @@
> >
> >  #include "avformat.h"
> >  #include "internal.h"
> > +#include "ttmlenc.h"
> >  #include "libavcodec/ttmlenc.h"
> >  #include "libavutil/internal.h"
> >
> > @@ -137,13 +138,7 @@ static int ttml_write_header(AVFormatContext *ctx)
> >                                                0);
> >          const char *printed_lang = (lang && lang->value) ? lang->value : "";
> >
> > -        // Not perfect, but decide whether the packet is a document or not
> > -        // by the existence of the lavc ttmlenc extradata.
> > -        ttml_ctx->input_type = (st->codecpar->extradata &&
> > -                                st->codecpar->extradata_size >= TTMLENC_EXTRADATA_SIGNATURE_SIZE &&
> > -                                !memcmp(st->codecpar->extradata,
> > -                                        TTMLENC_EXTRADATA_SIGNATURE,
> > -                                        TTMLENC_EXTRADATA_SIGNATURE_SIZE)) ?
> > +        ttml_ctx->input_type = ff_is_ttml_stream_paragraph_based(st->codecpar) ?
> >                                 PACKET_TYPE_PARAGRAPH :
> >                                 PACKET_TYPE_DOCUMENT;
> >
> > diff --git a/libavformat/ttmlenc.h b/libavformat/ttmlenc.h
> > new file mode 100644
> > index 0000000000..2da233b8f1
> > --- /dev/null
> > +++ b/libavformat/ttmlenc.h
> > @@ -0,0 +1,39 @@
> > +/*
> > + * Generic TTML helpers
> > + * Copyright (c) 2021 24i
> > + *
> > + * This file is part of FFmpeg.
> > + *
> > + * FFmpeg is free software; you can redistribute it and/or
> > + * modify it under the terms of the GNU Lesser General Public
> > + * License as published by the Free Software Foundation; either
> > + * version 2.1 of the License, or (at your option) any later version.
> > + *
> > + * FFmpeg is distributed in the hope that it will be useful,
> > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> > + * Lesser General Public License for more details.
> > + *
> > + * You should have received a copy of the GNU Lesser General Public
> > + * License along with FFmpeg; if not, write to the Free Software
> > + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
> > + */
> > +
> > +#ifndef AVFORMAT_TTMLENC_H
> > +#define AVFORMAT_TTMLENC_H
> > +
> > +#include "avformat.h"
>
> You actually only need libavcodec/codec_par.h
>

Switched to that specific header.

> > +#include "libavcodec/ttmlenc.h"
> > +
> > +static inline unsigned int ff_is_ttml_stream_paragraph_based(AVCodecParameters *codecpar)
>
> Missing const.
>

Added const.

Jan
diff mbox series

Patch

diff --git a/libavformat/ttmlenc.c b/libavformat/ttmlenc.c
index 7577cb543b..5c4cd8b5e9 100644
--- a/libavformat/ttmlenc.c
+++ b/libavformat/ttmlenc.c
@@ -29,6 +29,7 @@ 
 
 #include "avformat.h"
 #include "internal.h"
+#include "ttmlenc.h"
 #include "libavcodec/ttmlenc.h"
 #include "libavutil/internal.h"
 
@@ -137,13 +138,7 @@  static int ttml_write_header(AVFormatContext *ctx)
                                               0);
         const char *printed_lang = (lang && lang->value) ? lang->value : "";
 
-        // Not perfect, but decide whether the packet is a document or not
-        // by the existence of the lavc ttmlenc extradata.
-        ttml_ctx->input_type = (st->codecpar->extradata &&
-                                st->codecpar->extradata_size >= TTMLENC_EXTRADATA_SIGNATURE_SIZE &&
-                                !memcmp(st->codecpar->extradata,
-                                        TTMLENC_EXTRADATA_SIGNATURE,
-                                        TTMLENC_EXTRADATA_SIGNATURE_SIZE)) ?
+        ttml_ctx->input_type = ff_is_ttml_stream_paragraph_based(st->codecpar) ?
                                PACKET_TYPE_PARAGRAPH :
                                PACKET_TYPE_DOCUMENT;
 
diff --git a/libavformat/ttmlenc.h b/libavformat/ttmlenc.h
new file mode 100644
index 0000000000..2da233b8f1
--- /dev/null
+++ b/libavformat/ttmlenc.h
@@ -0,0 +1,39 @@ 
+/*
+ * Generic TTML helpers
+ * Copyright (c) 2021 24i
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVFORMAT_TTMLENC_H
+#define AVFORMAT_TTMLENC_H
+
+#include "avformat.h"
+#include "libavcodec/ttmlenc.h"
+
+static inline unsigned int ff_is_ttml_stream_paragraph_based(AVCodecParameters *codecpar)
+{
+    // Not perfect, but decide whether the packet is a document or not
+    // by the existence of the lavc ttmlenc extradata.
+    return (codecpar->extradata &&
+            codecpar->extradata_size >= TTMLENC_EXTRADATA_SIGNATURE_SIZE &&
+            !memcmp(codecpar->extradata,
+                    TTMLENC_EXTRADATA_SIGNATURE,
+                    TTMLENC_EXTRADATA_SIGNATURE_SIZE));
+}
+
+#endif /* AVFORMAT_TTMLENC_H */