VirtualBox

Changeset 75344 in vbox for trunk


Ignore:
Timestamp:
Nov 9, 2018 9:17:06 AM (6 years ago)
Author:
vboxsync
Message:

Recording/Main: More file renaming.

Location:
trunk/src/VBox/Main
Files:
6 edited
10 moved

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Main/Makefile.kmk

    r75341 r75344  
    804804   VBoxC_DEFS += VBOX_WITH_LIBVPX
    805805   VBoxC_SOURCES += \
    806         src-client/VideoRec.cpp \
    807         src-client/VideoRecInternals.cpp \
    808         src-client/VideoRecStream.cpp \
    809         src-client/VideoRecUtils.cpp
     806        src-client/Recording.cpp \
     807        src-client/RecordingInternals.cpp \
     808        src-client/RecordingStream.cpp \
     809        src-client/RecordingUtils.cpp
    810810  else
    811    $(error "VBox: No alternative for VPX when using video capturing support yet")
     811   $(error "VBox: No alternative for VPX when using recording support yet")
    812812  endif
    813813endif
    … …  
    818818   VBoxC_DEFS += VBOX_WITH_LIBOPUS
    819819  else
    820    $(error "VBox: No alternative for Opus when using audio support for video capturing yet")
     820   $(error "VBox: No alternative for Opus when using audio support for recording yet")
    821821  endif
    822822endif
    … …  
    933933        src-client/AudioDriver.cpp \
    934934        $(if $(VBOX_WITH_AUDIO_VRDE),src-client/DrvAudioVRDE.cpp,) \
    935         $(if $(VBOX_WITH_AUDIO_VIDEOREC),src-client/DrvAudioVideoRec.cpp,)
     935        $(if $(VBOX_WITH_AUDIO_VIDEOREC),src-client/DrvAudioRec.cpp,)
    936936
    937937VBoxC_SOURCES.win = \

  • trunk/src/VBox/Main/include/ConsoleImpl.h

    r75341 r75344  
    2525#include "ConsoleWrap.h"
    2626#ifdef VBOX_WITH_VIDEOREC
    27 # include "VideoRec.h"
     27# include "Recording.h"
    2828#endif
    2929

  • trunk/src/VBox/Main/include/DrvAudioRec.h

    r75343 r75344  
    2525
    2626#include "AudioDriver.h"
    27 #include "VideoRec.h"
     27#include "Recording.h"
    2828
    2929using namespace com;

  • trunk/src/VBox/Main/include/Recording.h

    r75343 r75344  
    11/* $Id$ */
    22/** @file
    3  * Video recording code header.
     3 * Recording code header.
    44 */
    55
    … …  
    2727using namespace com;
    2828
    29 #include "VideoRecInternals.h"
    30 #include "VideoRecStream.h"
     29#include "RecordingInternals.h"
     30#include "RecordingStream.h"
    3131
    3232class Console;

  • trunk/src/VBox/Main/include/RecordingInternals.h

    r75343 r75344  
    11/* $Id$ */
    22/** @file
    3  * Video recording internals header.
     3 * Recording internals header.
    44 */
    55

  • trunk/src/VBox/Main/include/RecordingStream.h

    r75343 r75344  
    11/* $Id$ */
    22/** @file
    3  * Video recording stream code header.
     3 * Recording stream code header.
    44 */
    55
    … …  
    2929#include <VBox/settings.h>
    3030
    31 #include "VideoRecInternals.h"
     31#include "RecordingInternals.h"
    3232
    3333class WebMWriter;

  • trunk/src/VBox/Main/include/RecordingUtils.h

    r75343 r75344  
    11/* $Id$ */
    22/** @file
    3  * Video recording utility header.
     3 * Recording utility header.
    44 */
    55

  • trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

    r75341 r75344  
    6363#endif
    6464#ifdef VBOX_WITH_AUDIO_VIDEOREC
    65 # include "DrvAudioVideoRec.h"
     65# include "DrvAudioRec.h"
    6666#endif
    6767#include "Nvram.h"
    … …  
    8484
    8585#ifdef VBOX_WITH_VIDEOREC
    86 # include "VideoRec.h"
     86# include "Recording.h"
    8787#endif
    8888
    … …  
    56215621        if (RT_BOOL(fEnable) != fIsEnabled)
    56225622        {
    5623             LogRel(("VideoRec: %s\n", fEnable ? "Enabling" : "Disabling"));
     5623            LogRel(("Recording: %s\n", fEnable ? "Enabling" : "Disabling"));
    56245624
    56255625            pDisplay->i_videoRecInvalidate();
    … …  
    56575657
    56585658            if (RT_FAILURE(vrc))
    5659                 LogRel(("VideoRec: %s failed with %Rrc\n", fEnable ? "Enabling" : "Disabling", vrc));
     5659                LogRel(("Recording: %s failed with %Rrc\n", fEnable ? "Enabling" : "Disabling", vrc));
    56605660        }
    56615661        else /* Should not happen. */
    … …  
    70097009        return VINF_SUCCESS;
    70107010
    7011     LogRel(("VideoRec: Starting ...\n"));
     7011    LogRel(("Recording: Starting ...\n"));
    70127012
    70137013    int rc = Capture.mpVideoRecCtx->Start();
    … …  
    70197019
    70207020    if (RT_FAILURE(rc))
    7021         LogRel(("VideoRec: Failed to start video recording (%Rrc)\n", rc));
     7021        LogRel(("Recording: Failed to start video recording (%Rrc)\n", rc));
    70227022
    70237023    LogFlowFuncLeaveRC(rc);
    … …  
    70347034        return VINF_SUCCESS;
    70357035
    7036     LogRel(("VideoRec: Stopping ...\n"));
     7036    LogRel(("Recording: Stopping ...\n"));
    70377037
    70387038    int rc = Capture.mpVideoRecCtx->Stop();
    … …  
    70497049        ComAssertComRC(hrc);
    70507050
    7051         LogRel(("VideoRec: Stopped\n"));
     7051        LogRel(("Recording: Stopped\n"));
    70527052    }
    70537053    else
    7054         LogRel(("VideoRec: Failed to stop video recording (%Rrc)\n", rc));
     7054        LogRel(("Recording: Failed to stop video recording (%Rrc)\n", rc));
    70557055
    70567056    LogFlowFuncLeaveRC(rc);
    … …  
    1016210162            }
    1016310163            else
    10164                LogRel(("VideoRec: Failed with %Rrc on VM power up\n", vrc2));
     10164               LogRel(("Recording: Failed with %Rrc on VM power up\n", vrc2));
    1016510165
    1016610166            /** Note: Do not use vrc here, as starting the video recording isn't critical to

  • trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

    r75331 r75344  
    126126#endif
    127127#ifdef VBOX_WITH_AUDIO_VIDEOREC
    128 # include "DrvAudioVideoRec.h"
     128# include "DrvAudioRec.h"
    129129#endif
    130130#include "NetworkServiceRunner.h"

  • trunk/src/VBox/Main/src-client/DisplayImpl.cpp

    r75341 r75344  
    5555#ifdef VBOX_WITH_VIDEOREC
    5656# include <iprt/path.h>
    57 # include "VideoRec.h"
     57# include "Recording.h"
    5858
    5959# ifdef VBOX_WITH_LIBVPX

  • trunk/src/VBox/Main/src-client/DrvAudioRec.cpp

    r75343 r75344  
    8686#include "LoggingNew.h"
    8787
    88 #include "DrvAudioVideoRec.h"
     88#include "DrvAudioRec.h"
    8989#include "ConsoleImpl.h"
    9090
    … …  
    322322    if (cChannels > 2)
    323323    {
    324         LogRel(("VideoRec: Warning: More than 2 (stereo) channels are not supported at the moment\n"));
     324        LogRel(("Recording: Warning: More than 2 (stereo) channels are not supported at the moment\n"));
    325325        cChannels = 2;
    326326    }
    … …  
    330330    if (orc != OPUS_OK)
    331331    {
    332         LogRel(("VideoRec: Audio codec failed to initialize: %s\n", opus_strerror(orc)));
     332        LogRel(("Recording: Audio codec failed to initialize: %s\n", opus_strerror(orc)));
    333333        return VERR_AUDIO_BACKEND_INIT_FAILED;
    334334    }
    … …  
    344344            pEnc = NULL;
    345345
    346             LogRel(("VideoRec: Audio codec failed to set bitrate (%RU32): %s\n", uBitrate, opus_strerror(orc)));
     346            LogRel(("Recording: Audio codec failed to set bitrate (%RU32): %s\n", uBitrate, opus_strerror(orc)));
    347347            return VERR_AUDIO_BACKEND_INIT_FAILED;
    348348        }
    … …  
    357357        pEnc = NULL;
    358358
    359         LogRel(("VideoRec: Audio codec failed to %s VBR mode: %s\n", fUseVBR ? "enable" : "disable", opus_strerror(orc)));
     359        LogRel(("Recording: Audio codec failed to %s VBR mode: %s\n", fUseVBR ? "enable" : "disable", opus_strerror(orc)));
    360360        return VERR_AUDIO_BACKEND_INIT_FAILED;
    361361    }
    … …  
    398398                        if (RT_SUCCESS(rc))
    399399                        {
    400                             LogRel(("VideoRec: Recording audio to audio file '%s'\n", pszFile));
     400                            LogRel(("Recording: Recording audio to audio file '%s'\n", pszFile));
    401401                        }
    402402                        else
    403                             LogRel(("VideoRec: Error creating audio track for audio file '%s' (%Rrc)\n", pszFile, rc));
     403                            LogRel(("Recording: Error creating audio track for audio file '%s' (%Rrc)\n", pszFile, rc));
    404404                    }
    405405                    else
    406                         LogRel(("VideoRec: Error creating audio file '%s' (%Rrc)\n", pszFile, rc));
     406                        LogRel(("Recording: Error creating audio file '%s' (%Rrc)\n", pszFile, rc));
    407407                }
    408408                break;
    … …  
    454454        }
    455455
    456         LogRel(("VideoRec: Error creating sink (%Rrc)\n", rc));
     456        LogRel(("Recording: Error creating sink (%Rrc)\n", rc));
    457457    }
    458458
    … …  
    484484            if (pSink->Con.WebM.pWebM)
    485485            {
    486                 LogRel2(("VideoRec: Finished recording audio to file '%s' (%zu bytes)\n",
     486                LogRel2(("Recording: Finished recording audio to file '%s' (%zu bytes)\n",
    487487                         pSink->Con.WebM.pWebM->GetFileName().c_str(), pSink->Con.WebM.pWebM->GetFileSize()));
    488488
    … …  
    526526        AssertFailed();
    527527
    528         LogRel2(("VideoRec: Support for surround audio not implemented yet\n"));
     528        LogRel2(("Recording: Support for surround audio not implemented yet\n"));
    529529        return VERR_NOT_SUPPORTED;
    530530    }
    … …  
    656656    PDRVAUDIOVIDEOREC pThis = PDMIHOSTAUDIO_2_DRVAUDIOVIDEOREC(pInterface);
    657657
    658     LogRel(("VideoRec: Audio driver is using %RU32Hz, %RU16bit, %RU8 %s\n",
     658    LogRel(("Recording: Audio driver is using %RU32Hz, %RU16bit, %RU8 %s\n",
    659659            pThis->CodecParms.PCMProps.uHz, pThis->CodecParms.PCMProps.cBytes * 8,
    660660            pThis->CodecParms.PCMProps.cChannels, pThis->CodecParms.PCMProps.cChannels == 1 ? "channel" : "channels"));
    … …  
    663663    if (RT_FAILURE(rc))
    664664    {
    665         LogRel(("VideoRec: Audio recording driver failed to initialize, rc=%Rrc\n", rc));
     665        LogRel(("Recording: Audio recording driver failed to initialize, rc=%Rrc\n", rc));
    666666    }
    667667    else
    668         LogRel2(("VideoRec: Audio recording driver initialized\n"));
     668        LogRel2(("Recording: Audio recording driver initialized\n"));
    669669
    670670    return rc;

  • trunk/src/VBox/Main/src-client/Recording.cpp

    r75343 r75344  
    11/* $Id$ */
    22/** @file
    3  * Video recording (with optional audio recording) code.
     3 * Recording (with optional audio recording) code.
    44 *
    55 * This code employs a separate encoding thread per recording context
    … …  
    4444
    4545#include "ConsoleImpl.h"
    46 #include "VideoRec.h"
    47 #include "VideoRecInternals.h"
    48 #include "VideoRecStream.h"
    49 #include "VideoRecUtils.h"
     46#include "Recording.h"
     47#include "RecordingInternals.h"
     48#include "RecordingStream.h"
     49#include "RecordingUtils.h"
    5050#include "WebMWriter.h"
    5151
    … …  
    145145
    146146        if (RT_FAILURE(rc))
    147             LogRel(("VideoRec: Encoding thread failed with rc=%Rrc\n", rc));
     147            LogRel(("Recording: Encoding thread failed with rc=%Rrc\n", rc));
    148148
    149149        /* Keep going in case of errors. */

  • trunk/src/VBox/Main/src-client/RecordingInternals.cpp

    r75343 r75344  
    11/* $Id$ */
    22/** @file
    3  * Video recording internals code.
     3 * Recording internals code.
    44 */
    55
    … …  
    1616 */
    1717
    18 #include "VideoRecInternals.h"
     18#include "RecordingInternals.h"
    1919
    2020#include <iprt/assert.h>

  • trunk/src/VBox/Main/src-client/RecordingStream.cpp

    r75343 r75344  
    11/* $Id$ */
    22/** @file
    3  * Video recording stream code.
     3 * Recording stream code.
    44 */
    55
    … …  
    3636#include <VBox/com/VirtualBox.h>
    3737
    38 #include "VideoRec.h"
    39 #include "VideoRecStream.h"
    40 #include "VideoRecUtils.h"
     38#include "Recording.h"
     39#include "RecordingStream.h"
     40#include "RecordingUtils.h"
    4141#include "WebMWriter.h"
    4242
    … …  
    165165            if (RT_FAILURE(rc))
    166166            {
    167                 LogRel(("VideoRec: Failed to open file '%s' for screen %RU32, rc=%Rrc\n",
     167                LogRel(("Recording: Failed to open file '%s' for screen %RU32, rc=%Rrc\n",
    168168                        pszFile ? pszFile : "<Unnamed>", this->uScreenID, rc));
    169169            }
    … …  
    200200            else
    201201            {
    202                 LogRel(("VideoRec: Setting encoder deadline to '%s'\n", value.c_str()));
     202                LogRel(("Recording: Setting encoder deadline to '%s'\n", value.c_str()));
    203203                this->Video.Codec.VPX.uEncoderDeadline = value.toUInt32();
    204204#endif
    … …  
    211211                this->ScreenSettings.featureMap[RecordFeature_Video] = false;
    212212#ifdef VBOX_WITH_AUDIO_VIDEOREC
    213                 LogRel(("VideoRec: Only audio will be recorded\n"));
     213                LogRel(("Recording: Only audio will be recorded\n"));
    214214#endif
    215215            }
    … …  
    223223            }
    224224            else
    225                 LogRel(("VideoRec: Only video will be recorded\n"));
     225                LogRel(("Recording: Only video will be recorded\n"));
    226226#endif
    227227        }
    … …  
    248248        }
    249249        else
    250             LogRel(("VideoRec: Unknown option '%s' (value '%s'), skipping\n", key.c_str(), value.c_str()));
     250            LogRel(("Recording: Unknown option '%s' (value '%s'), skipping\n", key.c_str(), value.c_str()));
    251251
    252252    } /* while */
    … …  
    291291            && this->File.pWEBM->GetAvailableSpace() < 0x100000) /** @todo r=andy WTF? Fix this. */
    292292        {
    293             LogRel(("VideoRec: Not enough free storage space available, stopping video capture\n"));
     293            LogRel(("Recording: Not enough free storage space available, stopping video capture\n"));
    294294            return true;
    295295        }
    … …  
    715715            if (RT_FAILURE(rc))
    716716            {
    717                 LogRel(("VideoRec: Failed to create the capture output file '%s' (%Rrc)\n", pszFile, rc));
     717                LogRel(("Recording: Failed to create the capture output file '%s' (%Rrc)\n", pszFile, rc));
    718718                break;
    719719            }
    … …  
    725725                if (RT_FAILURE(rc))
    726726                {
    727                     LogRel(("VideoRec: Failed to add video track to output file '%s' (%Rrc)\n", pszFile, rc));
     727                    LogRel(("Recording: Failed to add video track to output file '%s' (%Rrc)\n", pszFile, rc));
    728728                    break;
    729729                }
    730730
    731                 LogRel(("VideoRec: Recording video of screen #%u with %RU32x%RU32 @ %RU32 kbps, %RU32 FPS (track #%RU8)\n",
     731                LogRel(("Recording: Recording video of screen #%u with %RU32x%RU32 @ %RU32 kbps, %RU32 FPS (track #%RU8)\n",
    732732                        this->uScreenID, Settings.Video.ulWidth, Settings.Video.ulHeight, Settings.Video.ulRate,
    733733                        Settings.Video.ulFPS, this->uTrackVideo));
    … …  
    741741                if (RT_FAILURE(rc))
    742742                {
    743                     LogRel(("VideoRec: Failed to add audio track to output file '%s' (%Rrc)\n", pszFile, rc));
     743                    LogRel(("Recording: Failed to add audio track to output file '%s' (%Rrc)\n", pszFile, rc));
    744744                    break;
    745745                }
    746746
    747                 LogRel(("VideoRec: Recording audio in %RU16Hz, %RU8 bit, %RU8 %s (track #%RU8)\n",
     747                LogRel(("Recording: Recording audio in %RU16Hz, %RU8 bit, %RU8 %s (track #%RU8)\n",
    748748                        Settings.Audio.uHz, Settings.Audio.cBits, Settings.Audio.cChannels,
    749749                        Settings.Audio.cChannels ? "channels" : "channel", this->uTrackAudio));
    … …  
    768768                }
    769769#endif
    770                 LogRel(("VideoRec: Recording %s to '%s'\n", szWhat, pszFile));
     770                LogRel(("Recording: Recording %s to '%s'\n", szWhat, pszFile));
    771771            }
    772772
    … …  
    828828        this->Blocks.Clear();
    829829
    830         LogRel(("VideoRec: Recording screen #%u stopped\n", this->uScreenID));
     830        LogRel(("Recording: Recording screen #%u stopped\n", this->uScreenID));
    831831    }
    832832
    833833    if (RT_FAILURE(rc))
    834834    {
    835         LogRel(("VideoRec: Error stopping recording screen #%u, rc=%Rrc\n", this->uScreenID, rc));
     835        LogRel(("Recording: Error stopping recording screen #%u, rc=%Rrc\n", this->uScreenID, rc));
    836836        return rc;
    837837    }
    … …  
    846846                if (RT_SUCCESS(rc))
    847847                {
    848                     LogRel(("VideoRec: Closed file '%s'\n", this->ScreenSettings.File.strName.c_str()));
     848                    LogRel(("Recording: Closed file '%s'\n", this->ScreenSettings.File.strName.c_str()));
    849849                }
    850850                else
    851851                {
    852                     LogRel(("VideoRec: Error closing file '%s', rc=%Rrc\n", this->ScreenSettings.File.strName.c_str(), rc));
     852                    LogRel(("Recording: Error closing file '%s', rc=%Rrc\n", this->ScreenSettings.File.strName.c_str(), rc));
    853853                    break;
    854854                }
    … …  
    983983    if (rcv != VPX_CODEC_OK)
    984984    {
    985         LogRel(("VideoRec: Failed to get default config for VPX encoder: %s\n", vpx_codec_err_to_string(rcv)));
     985        LogRel(("Recording: Failed to get default config for VPX encoder: %s\n", vpx_codec_err_to_string(rcv)));
    986986        return VERR_AVREC_CODEC_INIT_FAILED;
    987987    }
    … …  
    10031003    if (rcv != VPX_CODEC_OK)
    10041004    {
    1005         LogRel(("VideoRec: Failed to initialize VPX encoder: %s\n", vpx_codec_err_to_string(rcv)));
     1005        LogRel(("Recording: Failed to initialize VPX encoder: %s\n", vpx_codec_err_to_string(rcv)));
    10061006        return VERR_AVREC_CODEC_INIT_FAILED;
    10071007    }
    … …  
    10101010                       this->ScreenSettings.Video.ulWidth, this->ScreenSettings.Video.ulHeight, 1))
    10111011    {
    1012         LogRel(("VideoRec: Failed to allocate image %RU32x%RU32\n",
     1012        LogRel(("Recording: Failed to allocate image %RU32x%RU32\n",
    10131013                this->ScreenSettings.Video.ulWidth, this->ScreenSettings.Video.ulHeight));
    10141014        return VERR_NO_MEMORY;
    … …  
    10651065        if (this->Video.cFailedEncodingFrames++ < 64) /** @todo Make this configurable. */
    10661066        {
    1067             LogRel(("VideoRec: Failed to encode video frame: %s\n", vpx_codec_err_to_string(rcv)));
     1067            LogRel(("Recording: Failed to encode video frame: %s\n", vpx_codec_err_to_string(rcv)));
    10681068            return VERR_GENERAL_FAILURE;
    10691069        }

  • trunk/src/VBox/Main/src-client/RecordingUtils.cpp

    r75343 r75344  
    11/* $Id$ */
    22/** @file
    3  * Video recording utility code.
     3 * Recording utility code.
    44 */
    55
    … …  
    1616 */
    1717
    18 #include "VideoRec.h"
    19 #include "VideoRecUtils.h"
     18#include "Recording.h"
     19#include "RecordingUtils.h"
    2020
    2121#include <iprt/asm.h>

  • trunk/src/VBox/Main/src-client/VBoxDriversRegister.cpp

    r70496 r75344  
    3232#endif
    3333#ifdef VBOX_WITH_AUDIO_VIDEOREC
    34 # include "DrvAudioVideoRec.h"
     34# include "DrvAudioRec.h"
    3535#endif
    3636#include "Nvram.h"
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette