[vlc-devel] [PATCH 2/2] gstdecode: handle fourcc mismatch between gst vlc
Vikram Fugro
vikram.fugro at gmail.com
Sun Sep 27 18:33:00 CEST 2020
On Sun, 27 Sep 2020 at 16:16, Rémi Denis-Courmont <remi at remlab.net> wrote:
> Le sunnuntaina 27. syyskuuta 2020, 12.12.58 EEST Vikram Fugro a écrit :
> > Add raw video fourcc conversion support to convert
> > from gstreamer representation (for strings that are
> > not equal to length 4) to vlc representation.
> > ---
> > modules/codec/Makefile.am | 4 +-
> > modules/codec/gstreamer/fourcc.c | 84 +++++++++++++++++++
> > modules/codec/gstreamer/gstvlc.h | 34 ++++++++
> > .../gstreamer/gstvlcpictureplaneallocator.c | 25 +++++-
> > 4 files changed, 142 insertions(+), 5 deletions(-)
> > create mode 100644 modules/codec/gstreamer/fourcc.c
> > create mode 100644 modules/codec/gstreamer/gstvlc.h
> >
> > diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am
> > index f8ff8b35bc..cd61920831 100644
> > --- a/modules/codec/Makefile.am
> > +++ b/modules/codec/Makefile.am
> > @@ -604,7 +604,9 @@ libgstdecode_plugin_la_SOURCES =
> > codec/gstreamer/gstdecode.c \ codec/gstreamer/gstvlcvideopool.c \
> >
> codec/gstreamer/gstvlcvideopool.h \
> >
> codec/gstreamer/gstvlcvideosink.c \
> > -
> codec/gstreamer/gstvlcvideosink.h
> > +
> codec/gstreamer/gstvlcvideosink.h \
> > +
> codec/gstreamer/fourcc.c \
> > +
> codec/gstreamer/gstvlc.h
> > libgstdecode_plugin_la_CFLAGS = $(AM_CFLAGS) $(GST_VIDEO_CFLAGS)
> > $(GST_APP_CFLAGS) libgstdecode_plugin_la_LIBADD = $(GST_VIDEO_LIBS)
> > $(GST_APP_LIBS) if HAVE_GST_DECODE
> > diff --git a/modules/codec/gstreamer/fourcc.c
> > b/modules/codec/gstreamer/fourcc.c new file mode 100644
> > index 0000000000..8602fc3bb2
> > --- /dev/null
> > +++ b/modules/codec/gstreamer/fourcc.c
> > @@ -0,0 +1,84 @@
> > +
> >
> +/**************************************************************************
> > *** + * fourcc.c: convert between gst <-> vlc formats
> > +
> >
> ***************************************************************************
> > ** + * Copyright (C) 2020 VLC authors and VideoLAN
> > + * $Id:
> > + *
> > + * Author: Vikram Fugro <vikram.fugro at gmail.com>
> > + *
> > + * This library is free software; you can redistribute it and/or
> > + * modify it under the terms of the GNU Library General Public
> > + * License as published by the Free Software Foundation; either
> > + * version 2.1 of the License, or (at your option) any later version.
> > + *
> > + * This library 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 Library General Public
> > + * License along with this library; if not, write to the Free Software
> > + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
> > 02110-1301 USA +
> >
> ***************************************************************************
> > **/ +
> >
> +/**************************************************************************
> > *** + * Preamble
> > +
> >
> ***************************************************************************
> > **/ +
> > +#include "gstvlc.h"
> > +
> > +struct gst_vlc_rawvideo_fourcc
> > +{
> > + char gst [32];
>
> Seems like it could be smaller. You'll get a warning if it's too small
> anyway.
>
> > + vlc_fourcc_t i_fourcc;
> > +};
> > +
> > +/*
> > + * Raw Video Formats
> > + */
> > +static const struct gst_vlc_rawvideo_fourcc raw_video_fmts[] =
> > +{
> > + { "I420_9LE", VLC_CODEC_I420_9L },
> > + { "I420_9BE", VLC_CODEC_I420_9B },
> > + { "I420_10LE", VLC_CODEC_I420_10L },
> > + { "I420_10BE", VLC_CODEC_I420_10B },
> > + { "I420_12LE", VLC_CODEC_I420_12L },
> > + { "I420_12BE", VLC_CODEC_I420_12B },
> > + { "I420_16LE", VLC_CODEC_I420_16L },
> > + { "I420_16BE", VLC_CODEC_I420_16B },
> > + { "I422_9LE", VLC_CODEC_I422_9L },
> > + { "I422_9BE", VLC_CODEC_I422_9B },
> > + { "I422_10LE", VLC_CODEC_I422_10L },
> > + { "I422_10BE", VLC_CODEC_I422_10B },
> > + { "I422_12LE", VLC_CODEC_I422_12L },
> > + { "I422_12BE", VLC_CODEC_I422_12B },
> > + { "I422_16LE", VLC_CODEC_I422_16L },
> > + { "I422_16BE", VLC_CODEC_I422_16B },
> > + { "I444_9LE", VLC_CODEC_I444_9L },
> > + { "I444_9BE", VLC_CODEC_I444_9B },
> > + { "I444_10LE", VLC_CODEC_I444_10L },
> > + { "I444_10BE", VLC_CODEC_I444_10B },
> > + { "I444_12LE", VLC_CODEC_I444_12L },
> > + { "I444_12BE", VLC_CODEC_I444_12B },
> > + { "I444_16LE", VLC_CODEC_I444_16L },
> > + { "I444_16BE", VLC_CODEC_I444_16B },
> > +};
> > +
> > +vlc_fourcc_t GetGstVLCFourcc( const char* gst )
> > +{
> > + if( !gst )
> > + {
> > + return VLC_CODEC_UNKNOWN;
> > + }
> > +
> > + for( size_t i = 0; i < ARRAY_SIZE(raw_video_fmts); i++ )
> > + {
> > + if( !strcmp( gst, raw_video_fmts[i].gst ))
> > + {
> > + return raw_video_fmts[i].i_fourcc;
> > + }
> > + }
>
> Maybe sort alphabetically and use bsearch() ?
>
Do you mean autogenerate a header file first with sorted entries,
precompilation ?
>
> > +
> > + return VLC_CODEC_UNKNOWN;
> > +}
> > diff --git a/modules/codec/gstreamer/gstvlc.h
> > b/modules/codec/gstreamer/gstvlc.h new file mode 100644
> > index 0000000000..f99b827d8f
> > --- /dev/null
> > +++ b/modules/codec/gstreamer/gstvlc.h
> > @@ -0,0 +1,34 @@
> >
> +/**************************************************************************
> > *** + * gst.h:
> > +
> >
> ***************************************************************************
> > ** + * Copyright (C) 2020 VLC authors and VideoLAN
> > + *
> > + * Author: Vikram Fugro <vikram.fugro at gmail.com>
> > + *
> > + * This library is free software; you can redistribute it and/or
> > + * modify it under the terms of the GNU Library General Public
> > + * License as published by the Free Software Foundation; either
> > + * version 2.1 of the License, or (at your option) any later version.
> > + *
> > + * This library 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 Library General Public
> > + * License along with this library; if not, write to the Free Software
> > + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
> > 02110-1301 USA +
> >
> ***************************************************************************
> > **/ +
> >
> +/**************************************************************************
> > *** + * Preamble
> > +
> >
> ***************************************************************************
> > **/ +#ifndef VLC_GST_H_
> > +#define VLC_GST_H_
> > +
> > +#include <vlc_common.h>
> > +#include <vlc_codec.h>
> > +
> > +vlc_fourcc_t GetGstVLCFourcc( const char* );
> > +
> > +#endif /* VLC_GST_H_ */
> > diff --git a/modules/codec/gstreamer/gstvlcpictureplaneallocator.c
> > b/modules/codec/gstreamer/gstvlcpictureplaneallocator.c index
> > 2245ee551a..31a27a7ce7 100644
> > --- a/modules/codec/gstreamer/gstvlcpictureplaneallocator.c
> > +++ b/modules/codec/gstreamer/gstvlcpictureplaneallocator.c
> > @@ -27,6 +27,7 @@
> > #include <gst/gst.h>
> >
> > #include "gstvlcpictureplaneallocator.h"
> > +#include "gstvlc.h"
> >
> > #include <vlc_common.h>
> >
> > @@ -221,10 +222,26 @@ bool gst_vlc_set_vout_fmt( GstVideoInfo *p_info,
> > GstVideoAlignment *p_align, vlc_fourcc_t i_chroma;
> > int i_padded_width, i_padded_height;
> >
> > - i_chroma = p_outfmt->i_codec = vlc_fourcc_GetCodecFromString(
> > - VIDEO_ES,
> > - gst_structure_get_string( p_str, "format" ) );
> > - if( !i_chroma )
> > + const char* psz_fourcc = gst_structure_get_string( p_str, "format"
> );
> > + if( psz_fourcc )
> > + {
> > + if( strlen( psz_fourcc ) != 4 )
> > + {
> > + i_chroma = p_outfmt->i_codec = GetGstVLCFourcc( psz_fourcc
> );
> > + }
> > + else
> > + {
> > + i_chroma = p_outfmt->i_codec =
> vlc_fourcc_GetCodecFromString(
> > + VIDEO_ES, psz_fourcc );
>
> Could probably move that into the new function.
>
> > + }
> > + }
> > + else
> > + {
> > + msg_Err( p_dec, "video chroma type not found in output caps" );
> > + return false;
> > + }
> > +
> > + if( !i_chroma || i_chroma == VLC_CODEC_UNKNOWN )
> > {
> > msg_Err( p_dec, "video chroma type not supported" );
> > return false;
>
>
> --
> Rémi Denis-Courmont
> http://www.remlab.net/
>
>
>
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20200927/931a29d8/attachment.html>
More information about the vlc-devel
mailing list