Showing the changes to libavcodec (2 of 2 files). Show all
Unified · Split
| @@ -247,27 +247,6 @@ StdVideoH265ProfileIdc ff_vk_h265_profile_to_vk(int profile) · 246 unmodified lines | |||
| 247 | } | 247 | } |
| 248 | } | 248 | } |
| 249 | 249 | ||
| 250 | int ff_vk_h264_profile_to_av(StdVideoH264ProfileIdc profile) | ||
| 251 | { | ||
| 252 | switch (profile) { | ||
| 253 | case STD_VIDEO_H264_PROFILE_IDC_BASELINE: return AV_PROFILE_H264_CONSTRAINED_BASELINE; | ||
| 254 | case STD_VIDEO_H264_PROFILE_IDC_MAIN: return AV_PROFILE_H264_MAIN; | ||
| 255 | case STD_VIDEO_H264_PROFILE_IDC_HIGH: return AV_PROFILE_H264_HIGH; | ||
| 256 | case STD_VIDEO_H264_PROFILE_IDC_HIGH_444_PREDICTIVE: return AV_PROFILE_H264_HIGH_444_PREDICTIVE; | ||
| 257 | default: return AV_PROFILE_UNKNOWN; | ||
| 258 | } | ||
| 259 | } | ||
| 260 | |||
| 261 | int ff_vk_h265_profile_to_av(StdVideoH264ProfileIdc profile) | ||
| 262 | { | ||
| 263 | switch (profile) { | ||
| 264 | case STD_VIDEO_H265_PROFILE_IDC_MAIN: return AV_PROFILE_HEVC_MAIN; | ||
| 265 | case STD_VIDEO_H265_PROFILE_IDC_MAIN_10: return AV_PROFILE_HEVC_MAIN_10; | ||
| 266 | case STD_VIDEO_H265_PROFILE_IDC_FORMAT_RANGE_EXTENSIONS: return AV_PROFILE_HEVC_REXT; | ||
| 267 | default: return AV_PROFILE_UNKNOWN; | ||
| 268 | } | ||
| 269 | } | ||
| 270 | |||
| 271 | int ff_vk_create_view(FFVulkanContext *s, FFVkVideoCommon *common, | 250 | int ff_vk_create_view(FFVulkanContext *s, FFVkVideoCommon *common, |
| 272 | VkImageView *view, VkImageAspectFlags *aspect, | 251 | VkImageView *view, VkImageAspectFlags *aspect, |
| 273 | AVVkFrame *src, VkFormat vkf, int is_dpb) | 252 | AVVkFrame *src, VkFormat vkf, int is_dpb) |
| @@ -77,8 +77,6 @@ StdVideoH265LevelIdc ff_vk_h265_level_to_vk(int level_idc); · 76 unmodified lines | |||
| 77 | */ | 77 | */ |
| 78 | StdVideoH264ProfileIdc ff_vk_h264_profile_to_vk(int profile); | 78 | StdVideoH264ProfileIdc ff_vk_h264_profile_to_vk(int profile); |
| 79 | StdVideoH265ProfileIdc ff_vk_h265_profile_to_vk(int profile); | 79 | StdVideoH265ProfileIdc ff_vk_h265_profile_to_vk(int profile); |
| 80 | int ff_vk_h264_profile_to_av(StdVideoH264ProfileIdc profile); | ||
| 81 | int ff_vk_h265_profile_to_av(StdVideoH264ProfileIdc profile); | ||
| 82 | 80 | ||
| 83 | /** | 81 | /** |
| 84 | * Creates image views for video frames. | 82 | * Creates image views for video frames. |