[vlc-commits] [Git][videolan/vlc][master] 4 commits: fourcc: add QOI

[Tristan Matthews (@tmatth)]

Tristan Matthews pushed to branch master at VideoLAN / VLC


Commits:
b710e792 by Tristan Matthews at 2023-04-05T09:51:06-04:00
fourcc: add QOI

QOI - The “Quite OK Image Format” for fast, lossless image compression

See:
https://github.com/phoboslab/qoi

- - - - -
cd2f48d4 by Tristan Matthews at 2023-04-05T09:51:06-04:00
avcodec: fourcc: map QOI image format

- - - - -
78d148d0 by Tristan Matthews at 2023-04-05T09:51:06-04:00
mime: add image/qoi

- - - - -
7ffc36f0 by Tristan Matthews at 2023-04-05T09:51:06-04:00
image: add qoi

- - - - -


5 changed files:

- include/vlc_fourcc.h
- modules/codec/avcodec/fourcc.c
- src/misc/fourcc_list.h
- src/misc/image.c
- src/misc/mime.c


Changes:

=====================================
include/vlc_fourcc.h
=====================================
@@ -93,6 +93,7 @@
 #define VLC_CODEC_TRUEMOTION2     VLC_FOURCC('T','M','2','0')
 #define VLC_CODEC_QTRLE           VLC_FOURCC('r','l','e',' ')
 #define VLC_CODEC_QDRAW           VLC_FOURCC('q','d','r','w')
+#define VLC_CODEC_QOI             VLC_FOURCC('q','o','i','f')
 #define VLC_CODEC_QPEG            VLC_FOURCC('Q','P','E','G')
 #define VLC_CODEC_ULTI            VLC_FOURCC('U','L','T','I')
 #define VLC_CODEC_VIXL            VLC_FOURCC('V','I','X','L')


=====================================
modules/codec/avcodec/fourcc.c
=====================================
@@ -113,6 +113,9 @@ static const struct vlc_avcodec_fourcc video_codecs[] =
     { VLC_CODEC_LCL_MSZH, AV_CODEC_ID_MSZH },
     { VLC_CODEC_LCL_ZLIB, AV_CODEC_ID_ZLIB },
     { VLC_CODEC_QTRLE, AV_CODEC_ID_QTRLE },
+#if LIBAVCODEC_VERSION_CHECK(59, 33, 100)
+    { VLC_CODEC_QOI, AV_CODEC_ID_QOI },
+#endif
     { VLC_CODEC_TSCC, AV_CODEC_ID_TSCC },
     { VLC_CODEC_ULTI, AV_CODEC_ID_ULTI },
     { VLC_CODEC_QDRAW, AV_CODEC_ID_QDRAW },


=====================================
src/misc/fourcc_list.h
=====================================
@@ -625,6 +625,9 @@ static const staticentry_t p_list_video[] = {
     B(VLC_CODEC_QDRAW, "Apple QuickDraw Video"),
         A("qdrw"),
 
+    B(VLC_CODEC_QOI, "Quite OK Image Format"),
+        A("qoif"),
+
     B(VLC_CODEC_QPEG, "QPEG Video"),
         A("QPEG"),
         A("Q1.0"),


=====================================
src/misc/image.c
=====================================
@@ -607,6 +607,7 @@ static const struct
     { VLC_FOURCC('x','c','f',' '), "xcf" },
     { VLC_CODEC_PCX,               "pcx" },
     { VLC_CODEC_GIF,               "gif" },
+    { VLC_CODEC_QOI,               "qoi" },
     { VLC_CODEC_SVG,               "svg" },
     { VLC_CODEC_TIFF,              "tif" },
     { VLC_CODEC_TIFF,              "tiff" },
@@ -652,6 +653,7 @@ static const struct
     { VLC_CODEC_BPG,               "image/bpg" },
     { VLC_CODEC_PCX,               "image/pcx" },
     { VLC_CODEC_PNG,               "image/png" },
+    { VLC_CODEC_QOI,               "image/qoi" },
     { VLC_CODEC_SVG,               "image/svg+xml" },
     { VLC_CODEC_TIFF,              "image/tiff" },
     { VLC_CODEC_TARGA,             "image/x-tga" },


=====================================
src/misc/mime.c
=====================================
@@ -51,6 +51,7 @@ static const struct
     { ".jpg",   "image/jpeg" },
     { ".jpeg",  "image/jpeg" },
     { ".png",   "image/png" },
+    { ".qoi",   "image/qoi" },
     { ".pct",   "image/x-pict" },
     /* same as modules/mux/mpjpeg.c here: */
     { ".mpjpeg","multipart/x-mixed-replace; boundary=7b3cc56e5f51db803f790dad720ed50a" },



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/6dc0701b983082cd8fc7155ca608a8ceff2a0af6...7ffc36f0e946cc49d8aed83a702f9e77a1e7061d

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/6dc0701b983082cd8fc7155ca608a8ceff2a0af6...7ffc36f0e946cc49d8aed83a702f9e77a1e7061d
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance