[vlc-devel] [PATCH 2/2] gstdecode: handle fourcc mismatch between gst vlc
Thomas Guillem
thomas at gllm.fr
Mon Oct 12 09:14:35 CEST 2020
LGTM, but I would remove the gstvlc.h file and put the GetGstVLCFourcc() declaration in top of gstvlcpictureplaneallocator.c
If you are OK, I can do this change myself and push.
On Mon, Oct 12, 2020, at 05:26, Vikram Fugro wrote:
> Please review.
>
> On Sun, 27 Sep 2020 at 23:58, Vikram Fugro <vikram.fugro at gmail.com> wrote:
>> 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 | 92 +++++++++++++++++++
>> modules/codec/gstreamer/gstvlc.h | 34 +++++++
>> .../gstreamer/gstvlcpictureplaneallocator.c | 26 +++++-
>> 4 files changed, 151 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..28d92890bf
>> --- /dev/null
>> +++ b/modules/codec/gstreamer/fourcc.c
>> @@ -0,0 +1,92 @@
>> +
>> +/*****************************************************************************
>> + * 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"
>> +
>> +typedef struct
>> +{
>> + char gst [10];
>> + vlc_fourcc_t i_fourcc;
>> +} gst_vlc_rawvideo_fourcc;
>> +
>> +/*
>> + * Raw Video Formats
>> + */
>> +static const gst_vlc_rawvideo_fourcc raw_video_fmts[] =
>> +{
>> + // NOTE: These should be sorted entries, keyed by `gst` field
>> + // cat entries | tr -dc "[:alnum:][:space:]_" | sort -n -k1 | xargs printf "{ \"%s\", %s },\n"
>> + { "I420_10BE", VLC_CODEC_I420_10B },
>> + { "I420_10LE", VLC_CODEC_I420_10L },
>> + { "I420_12BE", VLC_CODEC_I420_12B },
>> + { "I420_12LE", VLC_CODEC_I420_12L },
>> + { "I420_16BE", VLC_CODEC_I420_16B },
>> + { "I420_16LE", VLC_CODEC_I420_16L },
>> + { "I420_9BE", VLC_CODEC_I420_9B },
>> + { "I420_9LE", VLC_CODEC_I420_9L },
>> + { "I422_10BE", VLC_CODEC_I422_10B },
>> + { "I422_10LE", VLC_CODEC_I422_10L },
>> + { "I422_12BE", VLC_CODEC_I422_12B },
>> + { "I422_12LE", VLC_CODEC_I422_12L },
>> + { "I422_16BE", VLC_CODEC_I422_16B },
>> + { "I422_16LE", VLC_CODEC_I422_16L },
>> + { "I422_9BE", VLC_CODEC_I422_9B },
>> + { "I422_9LE", VLC_CODEC_I422_9L },
>> + { "I444_10BE", VLC_CODEC_I444_10B },
>> + { "I444_10LE", VLC_CODEC_I444_10L },
>> + { "I444_12BE", VLC_CODEC_I444_12B },
>> + { "I444_12LE", VLC_CODEC_I444_12L },
>> + { "I444_16BE", VLC_CODEC_I444_16B },
>> + { "I444_16LE", VLC_CODEC_I444_16L },
>> + { "I444_9BE", VLC_CODEC_I444_9B },
>> + { "I444_9LE", VLC_CODEC_I444_9L },
>> +};
>> +
>> +static int compare_func( const void* key, const void* ent )
>> +{
>> + return strcmp( (char*)key, ((gst_vlc_rawvideo_fourcc*)ent)->gst );
>> +}
>> +
>> +vlc_fourcc_t GetGstVLCFourcc( const char* gst )
>> +{
>> + gst_vlc_rawvideo_fourcc* found = NULL;
>> +
>> + if( !gst )
>> + {
>> + return VLC_CODEC_UNKNOWN;
>> + }
>> +
>> + found = bsearch( gst, raw_video_fmts,
>> + ARRAY_SIZE(raw_video_fmts), sizeof(gst_vlc_rawvideo_fourcc),
>> + compare_func );
>> +
>> + if( !found )
>> + return VLC_CODEC_UNKNOWN;
>> + else
>> + return found->i_fourcc;
>> +}
>> 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..e240435107 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>
>>
>> @@ -130,6 +131,22 @@ static GstMemory* gst_vlc_picture_plane_copy(
>> return NULL;
>> }
>>
>> +static vlc_fourcc_t gst_vlc_to_map_format( char* psz_fourcc )
>> +{
>> + if( !psz_fourcc )
>> + return VLC_CODEC_UNKNOWN;
>> +
>> + if( strlen( psz_fourcc ) != 4 )
>> + {
>> + return GetGstVLCFourcc( psz_fourcc );
>> + }
>> + else
>> + {
>> + return vlc_fourcc_GetCodecFromString(
>> + VIDEO_ES, psz_fourcc );
>> + }
>> +}
>> +
>> void gst_vlc_picture_plane_allocator_release(
>> GstVlcPicturePlaneAllocator *p_allocator, GstBuffer *p_buffer )
>> {
>> @@ -212,6 +229,7 @@ bool gst_vlc_picture_plane_allocator_alloc(
>> return true;
>> }
>>
>> +
>> bool gst_vlc_set_vout_fmt( GstVideoInfo *p_info, GstVideoAlignment *p_align,
>> GstCaps *p_caps, decoder_t *p_dec )
>> {
>> @@ -221,10 +239,10 @@ 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" );
>> +
>> + i_chroma = p_outfmt->i_codec = gst_vlc_to_map_format( psz_fourcc );
>> + if( !i_chroma || i_chroma == VLC_CODEC_UNKNOWN )
>> {
>> msg_Err( p_dec, "video chroma type not supported" );
>> return false;
>> --
>> 2.25.1
>>
> _______________________________________________
> 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/20201012/6d402a7b/attachment.html>
More information about the vlc-devel
mailing list