scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-22 01:40:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switched to 16 bits per sample for audio sending. This is just a general compatibility issue. 24b does not alway work which introduces additional issues while debugging the audio.

Browse Source 
Correct numbers of Blackmagic devices.
This commit is contained in:
xliska
2010-04-28 09:48:46 +00:00
parent b6e82b61f2
commit aeb90b2dfa
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ultragrid/src/audio/audio.c
View File

@@ -129,7 +129,7 @@ int audio_init(int output_device, int input_device)
if(input_device != -2)
{
inputParameters.channelCount = 1;
inputParameters.sampleFormat = paInt24;
inputParameters.sampleFormat = paInt16;
if(!interleaved)
inputParameters.sampleFormat |= paNonInterleaved;
@@ -141,7 +141,7 @@ int audio_init(int output_device, int input_device)
if(output_device != -2)
{
outputParameters.channelCount = 1; // output channels
outputParameters.sampleFormat = paInt24;
outputParameters.sampleFormat = paInt16;
if(!interleaved)
outputParameters.sampleFormat |= paNonInterleaved;
outputParameters.suggestedLatency = Pa_GetDeviceInfo( outputParameters.device )->defaultHighOutputLatency;

8
ultragrid/src/video_capture/decklink.cpp
View File

@@ -220,6 +220,9 @@ decklink_help()
IDeckLink* deckLink;
int numDevices = 0;
HRESULT result;
printf("Decklink options:\n");
printf("\tdevice:mode\n");
// Create an IDeckLinkIterator object to enumerate all DeckLink cards in the system
deckLinkIterator = CreateDeckLinkIteratorInstance();
@@ -234,8 +237,6 @@ decklink_help()
{
char * deviceNameString = NULL;
// Increment the total number of DeckLink cards found
numDevices++;
// *** Print the model name of the DeckLink card
result = deckLink->GetModelName((const char **) &deviceNameString);
@@ -245,6 +246,9 @@ decklink_help()
free(deviceNameString);
}
// Increment the total number of DeckLink cards found
numDevices++;
// ** List the video output display modes supported by the card
print_output_modes(deckLink);