vl: add MJPEG profile and format

v2: move util video change to here

Signed-off-by: Leo Liu <leo.liu@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>

diff --git a/src/gallium/auxiliary/util/u_video.h b/src/gallium/auxiliary/util/u_video.h
index 251e144c7926b7cbb9ea411db5b2ed52288aa95a..f3596e08a19a0cc92b6642c39eb14b9e4767eae9 100644 (file)
--- a/src/gallium/auxiliary/util/u_video.h
+++ b/src/gallium/auxiliary/util/u_video.h
@@ -76,6 +76,9 @@ u_reduce_video_profile(enum pipe_video_profile profile)
       case PIPE_VIDEO_PROFILE_HEVC_MAIN_444:
          return PIPE_VIDEO_FORMAT_HEVC;
 
+      case PIPE_VIDEO_PROFILE_JPEG_BASELINE:
+         return PIPE_VIDEO_FORMAT_JPEG;
+
       default:
          return PIPE_VIDEO_FORMAT_UNKNOWN;
    }

diff --git a/src/gallium/include/pipe/p_video_enums.h b/src/gallium/include/pipe/p_video_enums.h
index 1e05075bed749ac894e344fea5a91a6b344319ab..2b7186857a744ea8cafb8ad38764fdf514aba873 100644 (file)
--- a/src/gallium/include/pipe/p_video_enums.h
+++ b/src/gallium/include/pipe/p_video_enums.h
@@ -39,7 +39,8 @@ enum pipe_video_format
    PIPE_VIDEO_FORMAT_MPEG4,    /**< DIVX, XVID */
    PIPE_VIDEO_FORMAT_VC1,      /**< WMV */
    PIPE_VIDEO_FORMAT_MPEG4_AVC,/**< H.264 */
-   PIPE_VIDEO_FORMAT_HEVC      /**< H.265 */
+   PIPE_VIDEO_FORMAT_HEVC,     /**< H.265 */
+   PIPE_VIDEO_FORMAT_JPEG      /**< JPEG */
 };
 
 enum pipe_video_profile
@@ -65,7 +66,8 @@ enum pipe_video_profile
    PIPE_VIDEO_PROFILE_HEVC_MAIN_10,
    PIPE_VIDEO_PROFILE_HEVC_MAIN_STILL,
    PIPE_VIDEO_PROFILE_HEVC_MAIN_12,
-   PIPE_VIDEO_PROFILE_HEVC_MAIN_444
+   PIPE_VIDEO_PROFILE_HEVC_MAIN_444,
+   PIPE_VIDEO_PROFILE_JPEG_BASELINE
 };
 
 /* Video caps, can be different for each codec/profile */