Skip to content
Browse files

v bump

  • Loading branch information...
1 parent dc8fa3e commit 7220bedb867a7831a9e05c9491837bc14eac8964 @rdp committed
View
6 ChangeLog
@@ -1,3 +1,9 @@
+0.2.7 1-5-12
+ some minor directshow stuff has been updated, I believe
+
+0.2.6
+ some stuff from earlier, like adding bigger buffers and setting it to the graph's timestamp.
+
0.2.3: better timestamps barely
0.2.2: rename program files icon, new README
View
2 installer_options.iss
@@ -1,4 +1,4 @@
-#define AppVer "0.2.6"
+#define AppVer "0.2.7"
#define AppName "virtual audio capture grabber device"
[UninstallRun]
View
84 notes
@@ -1,3 +1,87 @@
+
+adding "sleeps"
+resulted in this message fast:
+...
+main debug: Decoder buffering done in 0 ms
+main warning: received buffer in the future
+main warning: received buffer in the future
+main warning: PTS is out of range (-10000), dropping buffer
+main warning: PTS is out of range (-21000), dropping buffer
+main warning: PTS is out of range (-32000), dropping buffer
+main warning: output date isn't PTS date, requesting resampling (68000)
+*repeat* with similar numbers.
+
+"normal" doesn't have the output date isn't PTS date message, just
+ main warning: buffer is 40569 late, triggering upsampling
+ main warning: resampling stopped after 5324000 usec (drift: -1875)
+ after awhile
+
+MIN() didn't help VLC
+
+with "choose the MAX I know what you want!:"
+creeps up,
+tons of
+
+main warning: received buffer in the future
+main warning: PTS is out of range (-10000), dropping buffer
+main warning: PTS is out of range (-33219), dropping buffer
+main warning: buffer is 68850 late, triggering upsampling
+main warning: output date isn't PTS date, requesting resampling (58561)
+main warning: audio drift is too big (120953), dropping buffer
+main warning: timing screwed, stopping resampling
+main warning: buffer is 110795 late, triggering upsampling
+main warning: audio drift is too big (120316), dropping buffer
+main warning: output date isn't PTS date, requesting resampling (45000)
+main warning: audio drift is too big (155214), dropping buffer
+
+
+with "subtract":
+
+main debug: Buffering 80%
+main debug: Buffering 90%
+main debug: Stream buffering done (100 ms in 110 ms)
+main debug: Decoder buffering done in 0 ms
+main warning: received buffer in the future
+main warning: PTS is out of range (-10000), dropping buffer
+main warning: PTS is out of range (-33219), dropping buffer
+main warning: PTS is out of range (-9841), dropping buffer
+main warning: PTS is out of range (-18841), dropping buffer
+main warning: output date isn't PTS date, requesting resampling (40159)
+main warning: buffer is 68108 late, triggering upsampling
+main warning: output date isn't PTS date, requesting resampling (45000)
+main warning: resampling stopped after 7688000 usec (drift: -40807)
+main warning: buffer is 40966 late, triggering upsampling
+main warning: output date isn't PTS date, requesting resampling (45000)
+main warning: resampling stopped after 5839000 usec (drift: -43702)
+main warning: buffer is 43860 late, triggering upsampling
+weird weird stuff there...gah!
+
+
+normal "set it like they tell me to:"
+
+main debug: Buffering 71%
+main debug: Buffering 81%
+main debug: Buffering 91%
+main debug: Stream buffering done (101 ms in 95 ms)
+main debug: Decoder buffering done in 0 ms
+main warning: PTS is out of range (-10000), dropping buffer
+main warning: PTS is out of range (-20158), dropping buffer
+main warning: PTS is out of range (-30317), dropping buffer
+
+after a long while:
+
+main warning: buffer is 40176 late, triggering upsampling
+main warning: output date isn't PTS date, requesting resampling (44524)
+main warning: resampling stopped after 5862000 usec (drift: -42776)
+main warning: buffer is 42777 late, triggering upsampling
+main warning: resampling stopped after 6079000 usec (drift: 765)
+main warning: output date isn't PTS date, requesting resampling (45000)
+main warning: buffer is 44792 late, triggering upsampling
+main warning: resampling stopped after 6225000 usec (drift: 1394)
+
+
+
+
threaded:
with 5 other threads, dual core, they both seem to start giving bad feedback, possibly single threaded with smaller sizes [?]
View
BIN source_code/Release/audio_sniffer.ax
Binary file not shown.
View
4 source_code/acam/acam.vcxproj.user
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LocalDebuggerCommand>c:\dev\ruby\sensible-cinema\vendor\cache\ffmpeg\ffmpeg.exe</LocalDebuggerCommand>
+ <LocalDebuggerCommand>C:\Program Files (x86)\VideoLAN\VLC\vlc.exe</LocalDebuggerCommand>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
- <LocalDebuggerCommandArguments>-y -f dshow -i audio=virtual-audio-capturer -t 5 yo.wav</LocalDebuggerCommandArguments>
+ <LocalDebuggerCommandArguments>dshow:// :dshow-vdev=none :dshow-adev="virtual-audio-capturer" :dshow-caching=100</LocalDebuggerCommandArguments>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LocalDebuggerCommand>C:\Program Files (x86)\VideoLAN\VLC\vlc.exe</LocalDebuggerCommand>
View
16 source_code/acam/directshow_fillbuffer.cpp
@@ -42,23 +42,29 @@ HRESULT CVCamStream::FillBuffer(IMediaSample *pms)
// Now set the sample's start and end time stamps...
+ WAVEFORMATEX* pwfexCurrent = (WAVEFORMATEX*)m_mt.Format();
+ CRefTime sampleTimeUsed = (REFERENCE_TIME)(UNITS * pms->GetActualDataLength()) /
+ (REFERENCE_TIME)pwfexCurrent->nAvgBytesPerSec;
+
CRefTime rtStart;
- if(bFirstPacket) { //bFirstPacket/true
+ if(true) { //bFirstPacket/true
m_pParent->StreamTime(rtStart); // gets current graph ref time [now] as its "start", as normal "capture" devices would
- ShowOutput("got a first packet");
+ if(bFirstPacket)
+ ShowOutput("got a first packet");
} else {
// since there hasn't been discontinuity, I think we should be safe to tell it
// that this packet starts where the previous packet ended off
// since that's theoretically accurate...
+ // exept that it ends up being bad
// I don't "think" this will hurt graphs that have no reference clock...hopefully...
+ CRefTime cur_time;
+ m_pParent->StreamTime(cur_time);
REFERENCE_TIME previousEnd = m_rtSampleEndTime;
rtStart = previousEnd;
}
// I once tried to change it to always have monotonicity of timestamps at this point, but it didn't fix any problems, and seems to do all right without it so maybe ok [?]
- WAVEFORMATEX* pwfexCurrent = (WAVEFORMATEX*)m_mt.Format();
- m_rtSampleEndTime = rtStart + (REFERENCE_TIME)(UNITS * pms->GetActualDataLength()) /
- (REFERENCE_TIME)pwfexCurrent->nAvgBytesPerSec;
+ m_rtSampleEndTime = rtStart + sampleTimeUsed;
// NB that this *can* set it to a negative start time...hmm...which apparently is "ok" when a graph is just starting up it's expected...
hr = pms->SetTime((REFERENCE_TIME*)&rtStart, (REFERENCE_TIME*)&m_rtSampleEndTime);
View
8 source_code/acam/loopback-capture.cpp
@@ -321,10 +321,10 @@ BYTE *captureData;
} else {
// we...shouldn't need this...maybe?
// seems to make no difference...
- //hr = SetThreadPriority(m_hThread, THREAD_PRIORITY_TIME_CRITICAL);
- //if (FAILED(hr)) { // of course we always want to be a high prio thread, right? [we don't use much cpu...]
- // return hr;
- //}
+ hr = SetThreadPriority(m_hThread, THREAD_PRIORITY_TIME_CRITICAL);
+ if (FAILED(hr)) { // of course we always want to be a high prio thread, right? [we don't use much cpu...]
+ return hr;
+ }
}
return hr;
View
5 source_code/graphedit_startup
@@ -1,5 +0,0 @@
-G:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\graphedt
-c:\dev\ruby\virtual-audio-output-sniffer\yo.grf
-
-C:\Program Files (x86)\VideoLAN\VLC\vlc.exe
-dshow:// :dshow-vdev=none :dshow-adev="Virtual audio sniffer1" :dshow-caching=100
View
10 startup_debug_options
@@ -0,0 +1,10 @@
+G:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\graphedt
+c:\dev\ruby\virtual-audio-output-sniffer\yo.grf
+
+C:\Program Files (x86)\VideoLAN\VLC\vlc.exe
+dshow:// :dshow-vdev=none :dshow-adev="virtual-audio-capturer" :dshow-caching=100
+
+
+
+c:\dev\ruby\sensible-cinema\vendor\cache\ffmpeg\ffmpeg.exe
+-y -f dshow -i audio=virtual-audio-capturer -t 5 yo.wav

0 comments on commit 7220bed

Please sign in to comment.
Something went wrong with that request. Please try again.