Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e87d335e7ea9
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7c066a8cc9d0
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Feb 15, 2020

  1. DVIDecoder: detect vsync, clear out old packets at start of decode

    @azonenberg
    azonenberg committed Feb 15, 2020
    Copy the full SHA
    7c066a8 View commit details
Showing with 7 additions and 3 deletions.
  1. +7 −0 scopeprotocols/DVIDecoder.cpp
  2. +0 −3 scopeprotocols/DVIDecoder.h
7 changes: 7 additions & 0 deletions scopeprotocols/DVIDecoder.cpp
View file
Original file line number Diff line number Diff line change
@@ -121,6 +121,8 @@ bool DVIDecoder::GetShowImageColumn()

void DVIDecoder::Refresh()
{
ClearPackets();

//Get the input data
if( (m_channels[0] == NULL) || (m_channels[1] == NULL) || (m_channels[2] == NULL) )
{
@@ -188,6 +190,11 @@ void DVIDecoder::Refresh()

else if(vsync)
{
auto pack = new Packet;
pack->m_offset = sblue.m_offset;
pack->m_headers["Type"] = "VSYNC";
m_packets.push_back(pack);

cap->m_samples.push_back(DVISample(
sblue.m_offset, sblue.m_duration,
DVISymbol(DVISymbol::DVI_TYPE_VSYNC)));
3 changes: 0 additions & 3 deletions scopeprotocols/DVIDecoder.h
View file
Original file line number Diff line number Diff line change
@@ -72,9 +72,6 @@ class VideoScanlinePacket : public Packet
{
public:
virtual ~VideoScanlinePacket();

//scanline data stretched to be several pixels high
std::vector<uint8_t> m_image;
};

typedef OscilloscopeSample<DVISymbol> DVISample;