add decode exception, add sdl support

Author: zeng-qinghui

README.md

@@ -30,8 +30,10 @@ h264_data = source.read()
 #### 2. Use VideoDecoder
 ```python
 decoder = VideoDecoder()
+# output OpenCV format frame
 frames = decoder.decode(h264_data)
-# frames can be NULL or List<frame>
+# output SDL format frame
+frames = decoder.decode(h264_data, 1)
 ```
 
 #### 3. Use VideoEncoder

nvcodec-python.cpp

@@ -33,7 +33,7 @@ static PyObject* VideoSource_read(NvCodec* Self)
     AVPacket *packet = av_packet_alloc();
     if(videoSource_read(m_handle, packet) < 0){
         av_packet_free(&packet);
-        return NULL;
+        return Py_None;
     }
     PyObject* rtn = PyBytes_FromStringAndSize((const char*)packet->data, packet->size);
     av_packet_free(&packet);
@@ -105,23 +105,31 @@ static PyObject* VideoDecoder_decode(NvCodec* Self, PyObject* pArgs)
 
     unsigned char* data;
     int len;
-    if(!PyArg_ParseTuple(pArgs, "y#", &data, &len)){
+    unsigned int type = 0;
+    if(!PyArg_ParseTuple(pArgs, "y#|I", &data, &len, &type)){
         PyErr_SetString(PyExc_ValueError, "Parse the argument FAILED! You should video byte data!");
-        return NULL;
+        return Py_None;
     }
 
-    videoFrameList* list = videoDecoder_decode(m_handle, data, len);
+    PyObject* rtn = Py_BuildValue("[]");
+    char error_str[128];
+    videoFrameList* list = videoDecoder_decode(m_handle, data, len, error_str);
     if(list == NULL){
-        Py_INCREF(Py_None);
-        return Py_None;
+        if(error_str[0] != NULL){
+            PyErr_Format(PyExc_ValueError, "%s", error_str);
+            return NULL;
+        }
+        return rtn;
     }
 
-    PyObject* rtn = Py_BuildValue("[]");
     npy_intp dims[3] = {(npy_intp)(list->height), (npy_intp)(list->width), 4};
     PyObject* tempFrame;
     for(int i = 0;i<list->length;i++){
         tempFrame = PyArray_SimpleNewFromData(3, dims, NPY_UINT8, list->pFrames + (i*(list->perFrameSize)));
         PyArray_ENABLEFLAGS((PyArrayObject*) tempFrame, NPY_ARRAY_OWNDATA);
+        if(type != 0){
+            tempFrame = PyArray_SwapAxes((PyArrayObject*)tempFrame, 0, 1);
+        }
         PyList_Append(rtn, tempFrame);
     }
     videoFrameList_destory(&list);

setup.py

@@ -30,7 +30,7 @@ def build_extensions(self):
 
 from distutils.core import setup, Extension
 setup(name='pynvcodec',
-    version='0.0.4',
+    version='0.0.5',
     ext_modules=[module],
     cmdclass={'build_ext': custom_build_ext},
     author="Usingnet",

src/cuvid/NvDecoder/NvDecoder.cpp

@@ -178,6 +178,8 @@ int NvDecoder::HandleVideoSequence(CUVIDEOFORMAT *pVideoFormat)
     ;
     m_videoInfo << std::endl;
 
+    // std::cout << m_videoInfo.str();
+
     int nDecodeSurface = pVideoFormat->min_num_decode_surfaces;
 
     CUVIDDECODECAPS decodecaps;
@@ -192,7 +194,9 @@ int NvDecoder::HandleVideoSequence(CUVIDEOFORMAT *pVideoFormat)
     CUDA_DRVAPI_CALL(cuCtxPopCurrent(NULL));
 
     if(!decodecaps.bIsSupported){
+        std::cout << m_videoInfo.str();
         NVDEC_THROW_ERROR("Codec not supported on this GPU", CUDA_ERROR_NOT_SUPPORTED);
+        // NVDEC_THROW_ERROR("Codec not supported on this GPU", CUDA_ERROR_NOT_SUPPORTED);
         return nDecodeSurface;
     }
 

src/decoder.cpp

@@ -51,15 +51,24 @@ videoFrameList* videoFrameList_init(int width, int height, int length){
 }
 
 
-videoFrameList* videoDecoder_decode(videoDecoderHandle handle, u_int8_t* in, size_t in_size){
+videoFrameList* videoDecoder_decode(videoDecoderHandle handle, u_int8_t* in, size_t in_size, char*error){
     int nFrameReturned;
     int i;
     int frameSize;
     uint8_t *pVideo = NULL, *pFrame;
     videoFrameList* frameList = NULL;
     CUdeviceptr dpFrame = 0, nv12Frame = 0;
-
-    nFrameReturned = DEC(handle)->Decode(in, in_size);
+    if(error!=NULL){
+        error[0] = NULL;
+    }
+    try{
+        nFrameReturned = DEC(handle)->Decode(in, in_size);
+    }catch(NVDECException e){
+        if(error != NULL){
+            strcpy(error, e.what());
+        }
+        return NULL;
+    }
     for (i = 0; i < nFrameReturned; i++) {
         pFrame = DEC(handle)->GetFrame();
         frameSize = DEC(handle)->GetFrameSize();

src/decoder.h

@@ -37,7 +37,7 @@ typedef struct
 
 videoDecoderHandle videoDecoder_init(enum AVCodecID codec);
 int videoDecoder_destroy(videoDecoderHandle handle);
-videoFrameList* videoDecoder_decode(videoDecoderHandle handle, u_int8_t* in, size_t in_size);
+videoFrameList* videoDecoder_decode(videoDecoderHandle handle, u_int8_t* in, size_t in_size, char*error);
 void videoFrameList_destory(videoFrameList**);
 videoFrameList* videoFrameList_init(int width, int height, int length);
 

tests/python/read_source.py tests/python/read_source_opencv.pytests/python/read_source.py renamed to tests/python/read_source_opencv.py

@@ -6,11 +6,14 @@
 sys.path.append(lib_path)
 from nvcodec import VideoSource, VideoDecoder, VideoEncoder
 
-source = VideoSource("rtmp://58.200.131.2:1935/livetv/hunantv", 0)
+source = VideoSource("rtmp://58.200.131.2:1935/livetv/hunantv")
 decoder = VideoDecoder()
 while True:
     h264_data = source.read()
+    if not h264_data:
+        break
     frames = decoder.decode(h264_data)
-    if frames:
-        cv2.imshow("Demo", frames[0])
+    for frame in frames:
+        cv2.imshow("Demo", frame)
         cv2.waitKey(1)
+

tests/python/read_source_sdl.py

@@ -0,0 +1,37 @@
+import os
+import sys
+from cv2 import cv2
+import sdl2
+import sdl2.ext
+import numpy
+import time
+
+lib_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '../../build/lib.linux-x86_64-3.6'))
+sys.path.append(lib_path)
+from nvcodec import VideoSource, VideoDecoder, VideoEncoder
+
+windowArray = None
+window = None
+
+def showImage(image):
+    global windowArray, window
+    if windowArray is None:
+        sdl2.ext.init()
+        window = sdl2.ext.Window("test", size=(image.shape[0],image.shape[1]))
+        window.show()
+        windowSurf = sdl2.SDL_GetWindowSurface(window.window)
+        windowArray = sdl2.ext.pixels3d(windowSurf.contents)
+    numpy.copyto(windowArray, image)
+    window.refresh()
+
+
+# source = VideoSource("rtmp://58.200.131.2:1935/livetv/hunantv")
+source = VideoSource("/tmp/1.mp4")
+decoder = VideoDecoder()
+while True:
+    h264_data = source.read()
+    if not h264_data:
+        break
+    frames = decoder.decode(h264_data, 1)
+    for frame in frames:
+        showImage(frame)