Changeset 7400 in vbox for trunk/src/VBox/Frontends/VBoxHeadless

Timestamp:

Mar 10, 2008 1:44:45 PM (17 years ago)

Author:

vboxsync

Message:

VBoxHeadless: don't segfault if we couldn't open the output file

Location:

trunk/src/VBox/Frontends/VBoxHeadless/VideoCapture

Files:

• FFmpegFB.cpp (modified) (4 diffs)
• FFmpegFB.h (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxHeadless/VideoCapture/FFmpegFB.cpp

@@ -26 +26 @@
 #include <VBox/log.h>
 #include <png.h>
+#include <iprt/stream.h>
 
 // external constructor for dynamic loading
@@ -75 +76 @@
 FFmpegFB::FFmpegFB(ULONG width, ULONG height, ULONG bitrate,
                    com::Bstr filename) :
+    mfUrlOpen(false),
     mBitRate(bitrate),
     mPixelFormat(FramebufferPixelFormat_Opaque),
@@ -131 +133 @@
     if (mpFormatContext != 0)
     {
-        /* Dummy update to make sure we get all the frame (timing). */
-        BOOL dummy;
-        NotifyUpdate(0, 0, 0, 0, &dummy);
-        /* Write the last pending frame before exiting */
-        int rc = do_rgb_to_yuv_conversion();
-        if (rc == S_OK)
-            do_encoding_and_write();
+        if (mfUrlOpen)
+        {
+            /* Dummy update to make sure we get all the frame (timing). */
+            BOOL dummy;
+            NotifyUpdate(0, 0, 0, 0, &dummy);
+            /* Write the last pending frame before exiting */
+            int rc = do_rgb_to_yuv_conversion();
+            if (rc == S_OK)
+                do_encoding_and_write();
 #if 1
-        /* Add another 10 seconds. */
-        for (int i = 10*25; i > 0; i--)
-            do_encoding_and_write();
+            /* Add another 10 seconds. */
+            for (int i = 10*25; i > 0; i--)
+                do_encoding_and_write();
 #endif
-        /* write a png file of the last frame */
-        write_png();
-        avcodec_close(mpStream->codec);
-        av_write_trailer(mpFormatContext);
-        /* free the streams */
-        for(int i = 0; i < mpFormatContext->nb_streams; i++) {
-            av_freep(&mpFormatContext->streams[i]->codec);
-            av_freep(&mpFormatContext->streams[i]);
+            /* write a png file of the last frame */
+            write_png();
+            avcodec_close(mpStream->codec);
+            av_write_trailer(mpFormatContext);
+            /* free the streams */
+            for(int i = 0; i < mpFormatContext->nb_streams; i++) {
+                av_freep(&mpFormatContext->streams[i]->codec);
+                av_freep(&mpFormatContext->streams[i]);
+            }
+            url_fclose(&mpFormatContext->pb);
         }
-        url_fclose(&mpFormatContext->pb);
         av_free(mpFormatContext);
     }
@@ -782 +787 @@
                                szFileName, URL_WRONLY);
     AssertReturn(rcUrlFopen >= 0, E_UNEXPECTED);
+    mfUrlOpen = true;
     av_write_header(mpFormatContext);
     return S_OK;

trunk/src/VBox/Frontends/VBoxHeadless/VideoCapture/FFmpegFB.h

@@ -109 +109 @@
 
 private:
+    /** true if url_fopen actually succeeded */
+    bool mfUrlOpen;
     /** Guest framebuffer width */
     ULONG mGuestWidth;