Support for HEVC in cudacodec::VideoReader opencv#6054

Author: PaulinoAranda

modules/cudacodec/src/video_decoder.cpp

@@ -63,6 +63,11 @@ void cv::cudacodec::detail::VideoDecoder::create(const FormatInfo& videoFormat)
               cudaVideoCodec_VC1   == _codec ||
               cudaVideoCodec_H264  == _codec ||
               cudaVideoCodec_JPEG  == _codec ||
+              cudaVideoCodec_H264_SVC == _codec ||
+              cudaVideoCodec_H264_MVC == _codec ||
+              cudaVideoCodec_HEVC == _codec ||
+              cudaVideoCodec_VP8 == _codec ||
+              cudaVideoCodec_VP9 == _codec ||
               cudaVideoCodec_YUV420== _codec ||
               cudaVideoCodec_YV12  == _codec ||
               cudaVideoCodec_NV12  == _codec ||
@@ -84,7 +89,7 @@ void cv::cudacodec::detail::VideoDecoder::create(const FormatInfo& videoFormat)
     createInfo_.ulNumDecodeSurfaces = FrameQueue::MaximumSize;
 
     // Limit decode memory to 24MB (16M pixels at 4:2:0 = 24M bytes)
-    while (createInfo_.ulNumDecodeSurfaces * videoFormat.width * videoFormat.height > 16 * 1024 * 1024)
+    while (createInfo_.ulNumDecodeSurfaces * videoFormat.width * videoFormat.height > 16 * 4096 * 4096)
         createInfo_.ulNumDecodeSurfaces--;
 
     createInfo_.ChromaFormat    = _chromaFormat;
@@ -114,3 +119,4 @@ void cv::cudacodec::detail::VideoDecoder::release()
 }
 
 #endif // HAVE_NVCUVID
+

modules/videoio/src/cap_ffmpeg_impl.hpp

@@ -1558,7 +1558,7 @@ static AVStream *icv_add_video_stream_FFMPEG(AVFormatContext *oc,
      and qmin since they will be set to reasonable defaults by the libx264
      preset system. Also, use a crf encode with the default quality rating,
      this seems easier than finding an appropriate default bitrate. */
-    if (c->codec_id == AV_CODEC_ID_H264) {
+    if (c->codec_id == AV_CODEC_ID_H264 || c->codec_id == AV_CODEC_ID_HEVC) {
       c->gop_size = -1;
       c->qmin = -1;
       c->bit_rate = 0;
@@ -1707,7 +1707,7 @@ bool CvVideoWriter_FFMPEG::writeFrame( const unsigned char* data, int step, int
     const int CV_STEP_ALIGNMENT = 32;
     const size_t CV_SIMD_SIZE = 32;
     const size_t CV_PAGE_MASK = ~(4096 - 1);
-    const unsigned char* dataend = data + ((size_t)height * step);
+    const uchar* dataend = data + ((size_t)height * step);
     if (step % CV_STEP_ALIGNMENT != 0 ||
         (((size_t)dataend - CV_SIMD_SIZE) & CV_PAGE_MASK) != (((size_t)dataend + CV_SIMD_SIZE) & CV_PAGE_MASK))
     {
@@ -2555,6 +2555,9 @@ enum
     VideoCodec_JPEG,
     VideoCodec_H264_SVC,
     VideoCodec_H264_MVC,
+    VideoCodec_HEVC,
+    VideoCodec_VP8,
+    VideoCodec_VP9,
 
     // Uncompressed YUV
     VideoCodec_YUV420 = (('I'<<24)|('Y'<<16)|('U'<<8)|('V')),   // Y,U,V (4:2:0)
@@ -2665,13 +2668,18 @@ bool InputMediaStream_FFMPEG::open(const char* fileName, int* codec, int* chroma
                 *codec = ::VideoCodec_H264;
                 break;
 
+           case CV_CODEC(CODEC_ID_HEVC):
+                *codec = ::VideoCodec_HEVC;
+                break;
+
             default:
                 return false;
             };
 
             switch (enc->pix_fmt)
             {
             case AV_PIX_FMT_YUV420P:
+	    case AV_PIX_FMT_YUVJ420P:
                 *chroma_format = ::VideoChromaFormat_YUV420;
                 break;
 

modules/videoio/src/ffmpeg_codecs.hpp

@@ -78,6 +78,7 @@ typedef struct AVCodecTag {
 } AVCodecTag;
 
 #if (LIBAVCODEC_VERSION_INT <= AV_VERSION_INT(54, 51, 100))
+#define AV_CODEC_ID_HEVC CODEC_ID_HEVC
 #define AV_CODEC_ID_H264 CODEC_ID_H264
 #define AV_CODEC_ID_H263 CODEC_ID_H263
 #define AV_CODEC_ID_H263P CODEC_ID_H263P
@@ -143,6 +144,11 @@ typedef struct AVCodecTag {
 #endif
 
 const AVCodecTag codec_bmp_tags[] = {
+    { AV_CODEC_ID_HEVC, MKTAG('H', 'E', 'V', 'C') },
+    { AV_CODEC_ID_HEVC, MKTAG('h', 'e', 'v', 'c') },
+    { AV_CODEC_ID_HEVC, MKTAG('H', '2', '6', '5') },
+    { AV_CODEC_ID_HEVC, MKTAG('h', '2', '6', '5') },
+
     { AV_CODEC_ID_H264, MKTAG('H', '2', '6', '4') },
     { AV_CODEC_ID_H264, MKTAG('h', '2', '6', '4') },
     { AV_CODEC_ID_H264, MKTAG('X', '2', '6', '4') },