huihui 5 vuotta sitten
vanhempi
commit
6c659c871d

BIN
bin32/ScreenSender.exe


+ 1 - 1
src/Media/Audio/AudioEncoder.cpp

@@ -157,7 +157,7 @@ AACFramePtr AudioEncoder::encode(uint8_t *inputbuf, int bufferSize)
             return false;
         }
 
-#if 1 ///写入aac文件
+#if 0 ///写入aac文件
         uint8_t * aac_buf = (uint8_t *)malloc(packet->size+7);
         addADTStoPacket(aac_buf, 7+packet->size);
         memcpy(aac_buf+7, packet->data, packet->size);

+ 2 - 2
src/Media/Audio/GetAudioThread.cpp

@@ -111,8 +111,8 @@ bool GetAudioThread::init()
 
     AVInputFormat *ifmt = av_find_input_format("dshow"); //使用dshow
 
-//    if(avformat_open_input(&pFormatCtx, "audio=virtual-audio-capturer", ifmt, nullptr)!=0)
-    if(avformat_open_input(&pFormatCtx, "audio=@device_cm_{33D9A762-90C8-11D0-BD43-00A0C911CE86}\\wave_{DA3EBB84-3C1D-47F9-A2A8-BCD7CC9AA4E7}", ifmt, nullptr)!=0)
+    if(avformat_open_input(&pFormatCtx, "audio=virtual-audio-capturer", ifmt, nullptr)!=0)
+//    if(avformat_open_input(&pFormatCtx, "audio=@device_cm_{33D9A762-90C8-11D0-BD43-00A0C911CE86}\\wave_{DA3EBB84-3C1D-47F9-A2A8-BCD7CC9AA4E7}", ifmt, nullptr)!=0)
     {
         fprintf(stderr, "Couldn't open input stream video.(无法打开输入流)\n");
         return false;

+ 2 - 0
src/mainwindow.cpp

@@ -12,7 +12,9 @@
 
 #include <QFileDialog>
 
+#ifndef WIN32
 #define QStringLiteral QString
+#endif
 
 MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),

+ 4 - 0
vlc_play.sdp

@@ -0,0 +1,4 @@
+m=video 6000 RTP/AVP 96
+a=rtpmap:96 H264
+a=framerate:15
+c=IN IP4 127.0.0.1