Full shuffle and rename

It is a more or less full overhaul of the sources

COPYING

@@ -1,5 +1,5 @@
 Copyright (c) 2009 Blackmagic Design
-Copyright (c) 2010 Luca Barbato
+Copyright (c) 2011 Luca Barbato
 
 Permission is hereby granted, free of charge, to any person or organization
 obtaining a copy of the software and accompanying documentation covered by
@@ -22,4 +22,3 @@ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
 FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
-

Makefile

@@ -24,13 +24,20 @@
 #** DEALINGS IN THE SOFTWARE.
 #** -LICENSE-END-
 
-CC=g++
+CXX=g++
 SDK_PATH=../../include
 CFLAGS=-Wno-multichar -I $(SDK_PATH) -fno-rtti -D__STDC_CONSTANT_MACROS -g
 LDFLAGS=-lm -ldl -lpthread `pkg-config --libs libavformat`
 
-CaptureFFmpeg: CaptureFFmpeg.cpp $(SDK_PATH)/DeckLinkAPIDispatch.cpp
-	$(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS)
+all: bmdcapture bmdplay
+
+bmdcapture: bmdcapture.cpp $(SDK_PATH)/DeckLinkAPIDispatch.cpp
+	$(CXX) -o $@ $^ $(CFLAGS) $(LDFLAGS)
+
+bmdplay: bmdplay.cpp $(SDK_PATH)/DeckLinkAPIDispatch.cpp
+	$(CXX) -o $@ $^ $(CFLAGS) $(LDFLAGS)
+
+
 
 clean:
-	rm -f CaptureFFmpeg
+	-rm -f bmdcapture bmdplay

Play.h

@@ -0,0 +1,91 @@
+/* -LICENSE-START-
+** Copyright (c) 2009 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+
+#include "DeckLinkAPI.h"
+
+enum OutputSignal {
+	kOutputSignalPip		= 0,
+	kOutputSignalDrop		= 1
+};
+
+
+class TestPattern : public IDeckLinkVideoOutputCallback, public IDeckLinkAudioOutputCallback
+{
+public:
+	TestPattern();
+
+protected:
+	bool							m_running;
+	IDeckLink*						m_deckLink;
+	IDeckLinkOutput*				m_deckLinkOutput;
+
+	unsigned long					m_frameWidth;
+	unsigned long					m_frameHeight;
+	BMDTimeValue					m_frameDuration;
+	BMDTimeScale					m_frameTimescale;
+	unsigned long					m_framesPerSecond;
+	IDeckLinkMutableVideoFrame*		m_videoFrameBlack;
+	IDeckLinkMutableVideoFrame*		m_videoFrameBars;
+	unsigned long					m_totalFramesScheduled;
+
+	OutputSignal					m_outputSignal;
+	void*							m_audioBuffer;
+	unsigned long					m_audioBufferSampleLength;
+	unsigned long					m_audioBufferOffset;
+	unsigned long					m_audioChannelCount;
+	BMDAudioSampleRate				m_audioSampleRate;
+	unsigned long					m_audioSampleDepth;
+
+	// Generated message map functions
+
+	// Signal Generator Implementation
+	void			StartRunning (int videomode);
+	void			StopRunning ();
+	void			ScheduleNextFrame (bool prerolling);
+	void			WriteNextAudioSamples ();
+
+	IDeckLinkDisplayMode *GetDisplayModeByIndex(int selectedIndex);
+
+public:
+	bool			Init(int videomode, int connection, int camera);
+
+	// *** DeckLink API implementation of IDeckLinkVideoOutputCallback IDeckLinkAudioOutputCallback *** //
+	// IUnknown needs only a dummy implementation
+	virtual HRESULT STDMETHODCALLTYPE	QueryInterface (REFIID iid, LPVOID *ppv)	{return E_NOINTERFACE;}
+	virtual ULONG STDMETHODCALLTYPE		AddRef ()									{return 1;}
+	virtual ULONG STDMETHODCALLTYPE		Release ()									{return 1;}
+
+	virtual HRESULT STDMETHODCALLTYPE	ScheduledFrameCompleted (IDeckLinkVideoFrame* completedFrame, BMDOutputFrameCompletionResult result);
+	virtual HRESULT STDMETHODCALLTYPE	ScheduledPlaybackHasStopped ();
+
+	virtual HRESULT STDMETHODCALLTYPE	RenderAudioSamples (bool preroll);
+};
+
+
+void	FillSine (void* audioBuffer, unsigned long samplesToWrite, unsigned long channels, unsigned long sampleDepth);
+void	FillColourBars (IDeckLinkVideoFrame* theFrame);
+void	FillBlack (IDeckLinkVideoFrame* theFrame);

README

@@ -1,13 +1,17 @@
 
  -- What is it?
 
-This is a quite simple A/V capture based on ffmpeg for Blackmagic Design
+It started as a quite simple A/V capture based on ffmpeg for Blackmagic Design
 DeckLink systems.
 
-It isn't exactly feature complete and had been used as testbed to develop
-a crude avdevice for ffmpeg and then kept around since it comes handy in many
-occasions since the avdevice has it's share of issues I don't have time nor
-will to debug given I don't own a decklink card myself.
+It wasn't and isn't exactly feature complete and had been used as testbed to
+develop a crude avdevice for ffmpeg and then kept around since it comes handy
+in many occasions since the avdevice has it's share of issues I don't have
+time nor will to debug right now.
+
+It had been improved thanks to TodoStreaming support to be even more useful
+paired with a simple player that could be used as example for the output side
+as well.
 
  -- How to build?
 
@@ -17,7 +21,7 @@ it will build fine
 
  -- How to use?
 
-./CaptureFFmpeg -C 1 -m 2 -I 1 -F nut -f pipe:1 | ffmpeg -y -i - <your options here>
+./bmdcapture -C 1 -m 2 -I 1 -F nut -f pipe:1 | ffmpeg -y -i - <your options here>
 
 -I switch from the default (HDMI) source to Analog (both audio and video)
 
@@ -27,6 +31,15 @@ it will build fine
 
 -f output file name, any libavformat compatible url is supported.
 
+
+ffmpeg -i <source> -f nut - | ./bmdplay -f pipe:0
+
+[TBD]
+
+-C select the capture device if more than one is present.
+
+-f input file name, any libavformat compatible url is supported.
+
   -- Contact
 
 You can contact me either at lu_zero@gentoo.org or luca.barbato@axant.it