Sync refactoring for multiple platforms

[mardrone] / mardrone / dronelib / video.cpp

diff --git a/mardrone/dronelib/video.cpp b/mardrone/dronelib/video.cpp
index 0aa269b..5bf3328 100644 (file)
--- a/mardrone/dronelib/video.cpp
+++ b/mardrone/dronelib/video.cpp
@@ -102,7 +102,7 @@ void VideoThread::run()
     picture.cr_line_size  = pictureWidth / 2;
     picture.y_pad         = 0;
     picture.c_pad         = 0;
-    video_codec_open(&controller, (codec_type_t)UVLC_CODEC);
+    qDebug() << "video_codec_open=" << video_codec_open(&controller, (codec_type_t)codec_type);
     //stateTimer->start(1000);
     qDebug() << "videoThread::run() initialized";
     sendVideoPort("AT");
@@ -149,8 +149,9 @@ void VideoThread::decodeTransform(QByteArray &videoData)
     controller.in_stream.code    = 0;
 
     bool_t got_image = FALSE;
-    //qDebug() <<"VideoThread::decodeTransform";
-    video_decode_blockline( &controller, &picture, &got_image );
+    //qDebug() <<"VideoThread::decodeTransform" << controller.video_codec;
+    if(controller.video_codec!=NULL)  video_decode_blockline( &controller, &picture, &got_image );
+    //else qDebug() << "No video controller";
     //qDebug() <<"VideoThread::decodeTransform 2";
     //video_decode_picture( &controller, &picture, &stream, &got_image );
     if( got_image )