[vlc-commits] [Git][videolan/vlc][3.0.x] 3 commits: gstdecode: Add support for more video codecs
Rémi Denis-Courmont (@Courmisch)
gitlab at videolan.org
Tue Feb 22 11:43:28 UTC 2022
Rémi Denis-Courmont pushed to branch 3.0.x at VideoLAN / VLC
Commits:
f12b4ed7 by Vikram Fugro at 2022-02-22T11:26:25+00:00
gstdecode: Add support for more video codecs
Add support for vp9 and hevc
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit 9894f84b1286cadf3d2d15362e153dab6c4038cf)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
- - - - -
7ecfff94 by Tristan Matthews at 2022-02-22T11:26:25+00:00
gstdecode: add AV1
(cherry picked from commit 58202004426ce9ac2d8e32ede722a3353a5cbad1)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
- - - - -
e4869da2 by Vikram Fugro at 2022-02-22T11:26:25+00:00
gstdecode: handle fourcc mismatch between gst vlc
Add raw video fourcc conversion support to convert
from gstreamer representation (for strings that are
not equal to length 4) to vlc representation.
Signed-off-by: Thomas Guillem <thomas at gllm.fr>
(cherry picked from commit a6c52d8943cd172ed0853c00d61dcf5b090edd41)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
- - - - -
4 changed files:
- modules/codec/Makefile.am
- + modules/codec/gstreamer/fourcc.c
- modules/codec/gstreamer/gstdecode.c
- modules/codec/gstreamer/gstvlcpictureplaneallocator.c
Changes:
=====================================
modules/codec/Makefile.am
=====================================
@@ -633,7 +633,8 @@ 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
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
=====================================
modules/codec/gstreamer/fourcc.c
=====================================
@@ -0,0 +1,94 @@
+
+/*****************************************************************************
+ * fourcc.c: convert between gst <-> vlc formats
+ *****************************************************************************
+ * 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
+ *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_codec.h>
+
+vlc_fourcc_t GetGstVLCFourcc( const char* gst );
+
+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;
+}
=====================================
modules/codec/gstreamer/gstdecode.c
=====================================
@@ -357,6 +357,11 @@ static GstStructure* vlc_to_gst_fmt( const es_format_t *p_fmt )
gst_structure_set( p_str, "stream-format", G_TYPE_STRING,
"byte-stream", NULL );
break;
+ case VLC_CODEC_HEVC:
+ p_str = gst_structure_new_empty( "video/x-h265" );
+ gst_structure_set( p_str, "alignment", G_TYPE_STRING, "au",
+ "stream-format", G_TYPE_STRING, "hvc1", NULL );
+ break;
case VLC_CODEC_MP4V:
p_str = gst_structure_new_empty( "video/mpeg" );
gst_structure_set( p_str, "mpegversion", G_TYPE_INT, 4,
@@ -365,6 +370,12 @@ static GstStructure* vlc_to_gst_fmt( const es_format_t *p_fmt )
case VLC_CODEC_VP8:
p_str = gst_structure_new_empty( "video/x-vp8" );
break;
+ case VLC_CODEC_VP9:
+ p_str = gst_structure_new_empty( "video/x-vp9" );
+ break;
+ case VLC_CODEC_AV1:
+ p_str = gst_structure_new_empty( "video/x-av1" );
+ break;
case VLC_CODEC_MPGV:
p_str = gst_structure_new_empty( "video/mpeg" );
gst_structure_set( p_str, "mpegversion", G_TYPE_INT, 2,
=====================================
modules/codec/gstreamer/gstvlcpictureplaneallocator.c
=====================================
@@ -30,6 +30,9 @@
#include <vlc_common.h>
+/* from gstreamer/fourcc.c */
+vlc_fourcc_t GetGstVLCFourcc( const char* );
+
#define gst_vlc_picture_plane_allocator_parent_class parent_class
G_DEFINE_TYPE (GstVlcPicturePlaneAllocator, gst_vlc_picture_plane_allocator, \
GST_TYPE_ALLOCATOR);
@@ -132,6 +135,22 @@ static GstMemory* gst_vlc_picture_plane_copy(
return NULL;
}
+static vlc_fourcc_t gst_vlc_to_map_format( const 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 )
{
@@ -223,10 +242,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;
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/d3e78c235b349fe25e3952980ead13a49d39b136...e4869da270e1adb526fa0bebf2071d3301a6c18e
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/d3e78c235b349fe25e3952980ead13a49d39b136...e4869da270e1adb526fa0bebf2071d3301a6c18e
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list