summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLeo Liu <[email protected]>2017-08-15 14:21:16 -0400
committerLeo Liu <[email protected]>2017-08-21 10:09:09 -0400
commit11ccb56e9fe7a032a4f7a303580e4811717ae97b (patch)
treeacac41398aaf81610d4967c905d1449ff75ce034 /src
parent2b1eacabfab56fedd084818b0ae7011875a1a20b (diff)
vl: add MJPEG profile and format
v2: move util video change to here Signed-off-by: Leo Liu <[email protected]> Reviewed-by: Christian König <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/gallium/auxiliary/util/u_video.h3
-rw-r--r--src/gallium/include/pipe/p_video_enums.h6
2 files changed, 7 insertions, 2 deletions
diff --git a/src/gallium/auxiliary/util/u_video.h b/src/gallium/auxiliary/util/u_video.h
index 251e144c792..f3596e08a19 100644
--- 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 1e05075bed7..2b7186857a7 100644
--- 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 */