diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-25 11:39:07 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-01-25 15:20:42 +0000 |
commit | 6c91641271e536ffaa88a1dff5127e42ee99a91e (patch) | |
tree | 703d9dd49602377ddc90cbf886aad37913f2496b /chromium/third_party/decklink | |
parent | b145b7fafd36f0c260d6a768c81fc14e32578099 (diff) | |
download | qtwebengine-chromium-6c91641271e536ffaa88a1dff5127e42ee99a91e.tar.gz |
BASELINE: Update Chromium to 49.0.2623.23
Also adds missing printing sources.
Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/third_party/decklink')
9 files changed, 232 insertions, 16 deletions
diff --git a/chromium/third_party/decklink/README.chromium b/chromium/third_party/decklink/README.chromium index 84e0892e24b..68d3a0455f2 100644 --- a/chromium/third_party/decklink/README.chromium +++ b/chromium/third_party/decklink/README.chromium @@ -1,6 +1,6 @@ Name: Blackmagic DeckLink SDK - Mac -URL: http://sw.blackmagicdesign.com/DeckLink/v10.4.1/Blackmagic_DeckLink_SDK_10.4.1.zip?Key-Pair-Id=APKAJTKA3ZJMJRQITVEA&Signature=glPMv1v8mTCDSoGfUV0yTF1qfDfFpFJsGsVv6YRYXlyIxWwB5vpLoaAOfY/Y8sPV8WcwYoLz/zlrsS32FsoF95x7uxm4yVNL0+mR/k7LJBgV0cAG43On7Z0id+SgoL0qvp90pVqP6RQI8d7yhKtobNuVQ2l0+JpUVYCKVK6RDSSBzPfgAXFrV4O+bgqg+AuiKdudOPnbbsxug31llYXBoSjGeCdy3b4XVMO7JWvDm/IMw1Td5Djz2xa2/AS57FiGLelHCsFscFbMRdyf6UW6RX5ptwTpZwrSiUFBsaG8VoVef5HLlkrZqrcgVHwFeU5bGrh2pxBd4SgrRFd8Ronjjg==&Expires=1435721097 -Version: 10.4.1 +URL: http://sw.blackmagicdesign.com/DeckLink/v10.5.2/Blackmagic_DeckLink_SDK_10.5.2.zip?Key-Pair-Id=APKAJTKA3ZJMJRQITVEA&Signature=YRlsDaU0gNjrPNSoPp1IoTBQDavl09RGMnj1exrwAP+jbrNvSX2EuYTqOn2twguM+pQ8W0cqmIl/IHSVnEXJgQB6Eh57x+ba79t9z3fPsD8lb/a6PtK4qlFeqpLK5UBQ9yl18zxtHIZCnBBIeBNoj0G2CxX2Z4IXHVJmZ1KTbECIGaLyj+tBonW+cgIBQ7yw0dQHxGLJD+xzlCrZOXpGRmhJUBs981yLrnfZ7/LirvrHT+8CyzajzEgl9xBB7TFiZUh2DLXf1BvC4NeH0g/OnYRiR7F0VWh/ZiQM/KjCPbn2MajPo5Og0jVjzxYJbIhZf0HhB6ZN0ZI8aaiMMkmHMg==&Expires=1448991563 +Version: 10.5.2 License: BSL (v 1.0) License Android Compatible: yes License File: LICENSE @@ -13,7 +13,7 @@ Design DeckLink product line. The SDK provides both low-level control of hardware and high-level interfaces to allow developers to easily perform common tasks."" The SHA-512 sum, for security reasons, as generated by shasum: -bcedec3b5bfade4daf4b41e5c153688431286cbc37ee3d3c3490bc075c904818ccbaf2737e551d64d873e2ee6804b5bacbc86061403681af1b0e3e7d714bca16 +f0da72e16908de33caa6bdd9e506eeec8b3b55536840290a4e0ccf1875cfdca993e6f32fe253c79eba874b3aa382e35cb306fec003e959dbfebe3122aeb8e461 Local Modifications: - The original library contains code for Linux, Windows and Mac. Here only the diff --git a/chromium/third_party/decklink/mac/include/DeckLinkAPI.h b/chromium/third_party/decklink/mac/include/DeckLinkAPI.h index b10550ab9d1..897dcd0f399 100644 --- a/chromium/third_party/decklink/mac/include/DeckLinkAPI.h +++ b/chromium/third_party/decklink/mac/include/DeckLinkAPI.h @@ -1,5 +1,5 @@ /* -LICENSE-START- -** Copyright (c) 2014 Blackmagic Design +** Copyright (c) 2015 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 @@ -60,17 +60,23 @@ BMD_CONST REFIID IID_IDeckLinkVideoOutputCallback = /* 20AA5225-1958-47CB-820B-80A8D521A6EE */ {0x20,0xAA,0x52,0x25,0x19,0x58,0x47,0xCB,0x82,0x0B,0x80,0xA8,0xD5,0x21,0xA6,0xEE}; BMD_CONST REFIID IID_IDeckLinkInputCallback = /* DD04E5EC-7415-42AB-AE4A-E80C4DFC044A */ {0xDD,0x04,0xE5,0xEC,0x74,0x15,0x42,0xAB,0xAE,0x4A,0xE8,0x0C,0x4D,0xFC,0x04,0x4A}; +BMD_CONST REFIID IID_IDeckLinkEncoderInputCallback = /* ACF13E61-F4A0-4974-A6A7-59AFF6268B31 */ {0xAC,0xF1,0x3E,0x61,0xF4,0xA0,0x49,0x74,0xA6,0xA7,0x59,0xAF,0xF6,0x26,0x8B,0x31}; BMD_CONST REFIID IID_IDeckLinkMemoryAllocator = /* B36EB6E7-9D29-4AA8-92EF-843B87A289E8 */ {0xB3,0x6E,0xB6,0xE7,0x9D,0x29,0x4A,0xA8,0x92,0xEF,0x84,0x3B,0x87,0xA2,0x89,0xE8}; BMD_CONST REFIID IID_IDeckLinkAudioOutputCallback = /* 403C681B-7F46-4A12-B993-2BB127084EE6 */ {0x40,0x3C,0x68,0x1B,0x7F,0x46,0x4A,0x12,0xB9,0x93,0x2B,0xB1,0x27,0x08,0x4E,0xE6}; BMD_CONST REFIID IID_IDeckLinkIterator = /* 50FB36CD-3063-4B73-BDBB-958087F2D8BA */ {0x50,0xFB,0x36,0xCD,0x30,0x63,0x4B,0x73,0xBD,0xBB,0x95,0x80,0x87,0xF2,0xD8,0xBA}; BMD_CONST REFIID IID_IDeckLinkAPIInformation = /* 7BEA3C68-730D-4322-AF34-8A7152B532A4 */ {0x7B,0xEA,0x3C,0x68,0x73,0x0D,0x43,0x22,0xAF,0x34,0x8A,0x71,0x52,0xB5,0x32,0xA4}; BMD_CONST REFIID IID_IDeckLinkOutput = /* CC5C8A6E-3F2F-4B3A-87EA-FD78AF300564 */ {0xCC,0x5C,0x8A,0x6E,0x3F,0x2F,0x4B,0x3A,0x87,0xEA,0xFD,0x78,0xAF,0x30,0x05,0x64}; BMD_CONST REFIID IID_IDeckLinkInput = /* AF22762B-DFAC-4846-AA79-FA8883560995 */ {0xAF,0x22,0x76,0x2B,0xDF,0xAC,0x48,0x46,0xAA,0x79,0xFA,0x88,0x83,0x56,0x09,0x95}; +BMD_CONST REFIID IID_IDeckLinkEncoderInput = /* 270587DA-6B7D-42E7-A1F0-6D853F581185 */ {0x27,0x05,0x87,0xDA,0x6B,0x7D,0x42,0xE7,0xA1,0xF0,0x6D,0x85,0x3F,0x58,0x11,0x85}; BMD_CONST REFIID IID_IDeckLinkVideoFrame = /* 3F716FE0-F023-4111-BE5D-EF4414C05B17 */ {0x3F,0x71,0x6F,0xE0,0xF0,0x23,0x41,0x11,0xBE,0x5D,0xEF,0x44,0x14,0xC0,0x5B,0x17}; BMD_CONST REFIID IID_IDeckLinkMutableVideoFrame = /* 69E2639F-40DA-4E19-B6F2-20ACE815C390 */ {0x69,0xE2,0x63,0x9F,0x40,0xDA,0x4E,0x19,0xB6,0xF2,0x20,0xAC,0xE8,0x15,0xC3,0x90}; BMD_CONST REFIID IID_IDeckLinkVideoFrame3DExtensions = /* DA0F7E4A-EDC7-48A8-9CDD-2DB51C729CD7 */ {0xDA,0x0F,0x7E,0x4A,0xED,0xC7,0x48,0xA8,0x9C,0xDD,0x2D,0xB5,0x1C,0x72,0x9C,0xD7}; BMD_CONST REFIID IID_IDeckLinkVideoInputFrame = /* 05CFE374-537C-4094-9A57-680525118F44 */ {0x05,0xCF,0xE3,0x74,0x53,0x7C,0x40,0x94,0x9A,0x57,0x68,0x05,0x25,0x11,0x8F,0x44}; BMD_CONST REFIID IID_IDeckLinkVideoFrameAncillary = /* 732E723C-D1A4-4E29-9E8E-4A88797A0004 */ {0x73,0x2E,0x72,0x3C,0xD1,0xA4,0x4E,0x29,0x9E,0x8E,0x4A,0x88,0x79,0x7A,0x00,0x04}; +BMD_CONST REFIID IID_IDeckLinkEncoderPacket = /* B693F36C-316E-4AF1-B6C2-F389A4BCA620 */ {0xB6,0x93,0xF3,0x6C,0x31,0x6E,0x4A,0xF1,0xB6,0xC2,0xF3,0x89,0xA4,0xBC,0xA6,0x20}; +BMD_CONST REFIID IID_IDeckLinkEncoderVideoPacket = /* 4E7FD944-E8C7-4EAC-B8C0-7B77F80F5AE0 */ {0x4E,0x7F,0xD9,0x44,0xE8,0xC7,0x4E,0xAC,0xB8,0xC0,0x7B,0x77,0xF8,0x0F,0x5A,0xE0}; +BMD_CONST REFIID IID_IDeckLinkEncoderAudioPacket = /* 49E8EDC8-693B-4E14-8EF6-12C658F5A07A */ {0x49,0xE8,0xED,0xC8,0x69,0x3B,0x4E,0x14,0x8E,0xF6,0x12,0xC6,0x58,0xF5,0xA0,0x7A}; +BMD_CONST REFIID IID_IDeckLinkH265NALPacket = /* 639C8E0B-68D5-4BDE-A6D4-95F3AEAFF2E7 */ {0x63,0x9C,0x8E,0x0B,0x68,0xD5,0x4B,0xDE,0xA6,0xD4,0x95,0xF3,0xAE,0xAF,0xF2,0xE7}; BMD_CONST REFIID IID_IDeckLinkAudioInputPacket = /* E43D5870-2894-11DE-8C30-0800200C9A66 */ {0xE4,0x3D,0x58,0x70,0x28,0x94,0x11,0xDE,0x8C,0x30,0x08,0x00,0x20,0x0C,0x9A,0x66}; BMD_CONST REFIID IID_IDeckLinkScreenPreviewCallback = /* B1D3F49A-85FE-4C5D-95C8-0B5D5DCCD438 */ {0xB1,0xD3,0xF4,0x9A,0x85,0xFE,0x4C,0x5D,0x95,0xC8,0x0B,0x5D,0x5D,0xCC,0xD4,0x38}; BMD_CONST REFIID IID_IDeckLinkCocoaScreenPreviewCallback = /* D174152F-8F96-4C07-83A5-DD5F5AF0A2AA */ {0xD1,0x74,0x15,0x2F,0x8F,0x96,0x4C,0x07,0x83,0xA5,0xDD,0x5F,0x5A,0xF0,0xA2,0xAA}; @@ -94,6 +100,14 @@ enum _BMDVideoOutputFlags { bmdVideoOutputDualStream3D = 1 << 4 }; +/* Enum BMDPacketType - Type of packet */ + +typedef uint32_t BMDPacketType; +enum _BMDPacketType { + bmdPacketTypeStreamInterruptedMarker = 'sint', // A packet of this type marks the time when a video stream was interrupted, for example by a disconnected cable + bmdPacketTypeStreamData = 'sdat' // Regular stream data +}; + /* Enum BMDFrameFlags - Frame flags */ typedef uint32_t BMDFrameFlags; @@ -159,6 +173,13 @@ enum _BMDReferenceStatus { bmdReferenceLocked = 1 << 1 }; +/* Enum BMDAudioFormat - Audio Format */ + +typedef uint32_t BMDAudioFormat; +enum _BMDAudioFormat { + bmdAudioFormatPCM = 'lpcm' // Linear signed PCM samples +}; + /* Enum BMDAudioSampleRate - Audio sample rates supported for output/input */ typedef uint32_t BMDAudioSampleRate; @@ -275,6 +296,14 @@ enum _BMDIdleVideoOutputOperation { bmdIdleVideoOutputDesktop = 'desk' }; +/* Enum BMDVideoEncoderFrameCodingMode - Video frame coding mode */ + +typedef uint32_t BMDVideoEncoderFrameCodingMode; +enum _BMDVideoEncoderFrameCodingMode { + bmdVideoEncoderFrameCodingModeInter = 'inte', + bmdVideoEncoderFrameCodingModeIntra = 'intr' +}; + /* Enum BMDLinkConfiguration - Video link configuration */ typedef uint32_t BMDLinkConfiguration; @@ -284,6 +313,15 @@ enum _BMDLinkConfiguration { bmdLinkConfigurationQuadLink = 'lcql' }; +/* Enum BMDDeviceInterface - Device interface type */ + +typedef uint32_t BMDDeviceInterface; +enum _BMDDeviceInterface { + bmdDeviceInterfacePCI = 'pci ', + bmdDeviceInterfaceUSB = 'usb ', + bmdDeviceInterfaceThunderbolt = 'thun' +}; + /* Enum BMDDeckLinkAttributeID - DeckLink Attribute ID */ typedef uint32_t BMDDeckLinkAttributeID; @@ -309,6 +347,7 @@ enum _BMDDeckLinkAttributeID { BMDDeckLinkSupportsDualLinkSDI = 'sdls', BMDDeckLinkSupportsQuadLinkSDI = 'sqls', BMDDeckLinkSupportsIdleOutput = 'idou', + BMDDeckLinkHasLTCTimecodeInput = 'hltc', /* Integers */ @@ -324,6 +363,12 @@ enum _BMDDeckLinkAttributeID { BMDDeckLinkAudioInputConnections = 'aicn', BMDDeckLinkDeviceBusyState = 'dbst', BMDDeckLinkVideoIOSupport = 'vios', // Returns a BMDVideoIOSupport bit field + BMDDeckLinkDeckControlConnections = 'dccn', + BMDDeckLinkDeviceInterface = 'dbus', // Returns a BMDDeviceInterface + BMDDeckLinkAudioInputRCAChannelCount = 'airc', + BMDDeckLinkAudioInputXLRChannelCount = 'aixc', + BMDDeckLinkAudioOutputRCAChannelCount = 'aorc', + BMDDeckLinkAudioOutputXLRChannelCount = 'aoxc', /* Floats */ @@ -331,10 +376,15 @@ enum _BMDDeckLinkAttributeID { BMDDeckLinkVideoInputGainMaximum = 'vigx', BMDDeckLinkVideoOutputGainMinimum = 'vogm', BMDDeckLinkVideoOutputGainMaximum = 'vogx', + BMDDeckLinkMicrophoneInputGainMinimum = 'migm', + BMDDeckLinkMicrophoneInputGainMaximum = 'migx', /* Strings */ - BMDDeckLinkSerialPortDeviceName = 'slpn' + BMDDeckLinkSerialPortDeviceName = 'slpn', + BMDDeckLinkVendorName = 'vndr', + BMDDeckLinkDisplayName = 'dspn', + BMDDeckLinkModelName = 'mdln' }; /* Enum BMDDeckLinkAPIInformationID - DeckLinkAPI information ID */ @@ -385,17 +435,23 @@ enum _BMDNotifications { class IDeckLinkVideoOutputCallback; class IDeckLinkInputCallback; +class IDeckLinkEncoderInputCallback; class IDeckLinkMemoryAllocator; class IDeckLinkAudioOutputCallback; class IDeckLinkIterator; class IDeckLinkAPIInformation; class IDeckLinkOutput; class IDeckLinkInput; +class IDeckLinkEncoderInput; class IDeckLinkVideoFrame; class IDeckLinkMutableVideoFrame; class IDeckLinkVideoFrame3DExtensions; class IDeckLinkVideoInputFrame; class IDeckLinkVideoFrameAncillary; +class IDeckLinkEncoderPacket; +class IDeckLinkEncoderVideoPacket; +class IDeckLinkEncoderAudioPacket; +class IDeckLinkH265NALPacket; class IDeckLinkAudioInputPacket; class IDeckLinkScreenPreviewCallback; class IDeckLinkCocoaScreenPreviewCallback; @@ -432,6 +488,19 @@ protected: virtual ~IDeckLinkInputCallback () {} // call Release method to drop reference count }; +/* Interface IDeckLinkEncoderInputCallback - Frame arrival callback. */ + +class IDeckLinkEncoderInputCallback : public IUnknown +{ +public: + virtual HRESULT VideoInputSignalChanged (/* in */ BMDVideoInputFormatChangedEvents notificationEvents, /* in */ IDeckLinkDisplayMode *newDisplayMode, /* in */ BMDDetectedVideoInputFormatFlags detectedSignalFlags) = 0; + virtual HRESULT VideoPacketArrived (/* in */ IDeckLinkEncoderVideoPacket* videoPacket) = 0; + virtual HRESULT AudioPacketArrived (/* in */ IDeckLinkEncoderAudioPacket* audioPacket) = 0; + +protected: + virtual ~IDeckLinkEncoderInputCallback () {} // call Release method to drop reference count +}; + /* Interface IDeckLinkMemoryAllocator - Memory allocator for video frames. */ class IDeckLinkMemoryAllocator : public IUnknown @@ -570,6 +639,43 @@ protected: virtual ~IDeckLinkInput () {} // call Release method to drop reference count }; +/* Interface IDeckLinkEncoderInput - Created by QueryInterface from IDeckLink. */ + +class IDeckLinkEncoderInput : public IUnknown +{ +public: + virtual HRESULT DoesSupportVideoMode (/* in */ BMDDisplayMode displayMode, /* in */ BMDPixelFormat pixelFormat, /* in */ BMDVideoInputFlags flags, /* out */ BMDDisplayModeSupport *result, /* out */ IDeckLinkDisplayMode **resultDisplayMode) = 0; + virtual HRESULT GetDisplayModeIterator (/* out */ IDeckLinkDisplayModeIterator **iterator) = 0; + + /* Video Input */ + + virtual HRESULT EnableVideoInput (/* in */ BMDDisplayMode displayMode, /* in */ BMDPixelFormat pixelFormat, /* in */ BMDVideoInputFlags flags) = 0; + virtual HRESULT DisableVideoInput (void) = 0; + virtual HRESULT GetAvailablePacketsCount (/* out */ uint32_t *availablePacketsCount) = 0; + virtual HRESULT SetMemoryAllocator (/* in */ IDeckLinkMemoryAllocator *theAllocator) = 0; + + /* Audio Input */ + + virtual HRESULT EnableAudioInput (/* in */ BMDAudioFormat audioFormat, /* in */ BMDAudioSampleRate sampleRate, /* in */ BMDAudioSampleType sampleType, /* in */ uint32_t channelCount) = 0; + virtual HRESULT DisableAudioInput (void) = 0; + virtual HRESULT GetAvailableAudioSampleFrameCount (/* out */ uint32_t *availableSampleFrameCount) = 0; + + /* Input Control */ + + virtual HRESULT StartStreams (void) = 0; + virtual HRESULT StopStreams (void) = 0; + virtual HRESULT PauseStreams (void) = 0; + virtual HRESULT FlushStreams (void) = 0; + virtual HRESULT SetCallback (/* in */ IDeckLinkEncoderInputCallback *theCallback) = 0; + + /* Hardware Timing */ + + virtual HRESULT GetHardwareReferenceClock (/* in */ BMDTimeScale desiredTimeScale, /* out */ BMDTimeValue *hardwareTime, /* out */ BMDTimeValue *timeInFrame, /* out */ BMDTimeValue *ticksPerFrame) = 0; + +protected: + virtual ~IDeckLinkEncoderInput () {} // call Release method to drop reference count +}; + /* Interface IDeckLinkVideoFrame - Interface to encapsulate a video frame; can be caller-implemented. */ class IDeckLinkVideoFrame : public IUnknown @@ -643,6 +749,58 @@ protected: virtual ~IDeckLinkVideoFrameAncillary () {} // call Release method to drop reference count }; +/* Interface IDeckLinkEncoderPacket - Interface to encapsulate an encoded packet. */ + +class IDeckLinkEncoderPacket : public IUnknown +{ +public: + virtual HRESULT GetBytes (/* out */ void **buffer) = 0; + virtual long GetSize (void) = 0; + virtual HRESULT GetStreamTime (/* out */ BMDTimeValue *frameTime, /* in */ BMDTimeScale timeScale) = 0; + virtual BMDPacketType GetPacketType (void) = 0; + +protected: + virtual ~IDeckLinkEncoderPacket () {} // call Release method to drop reference count +}; + +/* Interface IDeckLinkEncoderVideoPacket - Provided by the IDeckLinkEncoderInput video packet arrival callback. */ + +class IDeckLinkEncoderVideoPacket : public IDeckLinkEncoderPacket +{ +public: + virtual BMDPixelFormat GetPixelFormat (void) = 0; + virtual HRESULT GetHardwareReferenceTimestamp (/* in */ BMDTimeScale timeScale, /* out */ BMDTimeValue *frameTime, /* out */ BMDTimeValue *frameDuration) = 0; + + virtual HRESULT GetTimecode (/* in */ BMDTimecodeFormat format, /* out */ IDeckLinkTimecode **timecode) = 0; + +protected: + virtual ~IDeckLinkEncoderVideoPacket () {} // call Release method to drop reference count +}; + +/* Interface IDeckLinkEncoderAudioPacket - Provided by the IDeckLinkEncoderInput audio packet arrival callback. */ + +class IDeckLinkEncoderAudioPacket : public IDeckLinkEncoderPacket +{ +public: + virtual BMDAudioFormat GetAudioFormat (void) = 0; + +protected: + virtual ~IDeckLinkEncoderAudioPacket () {} // call Release method to drop reference count +}; + +/* Interface IDeckLinkH265NALPacket - Obtained through QueryInterface() on an IDeckLinkEncoderVideoPacket object */ + +class IDeckLinkH265NALPacket : public IDeckLinkEncoderVideoPacket +{ +public: + virtual HRESULT GetUnitType (/* out */ uint8_t *unitType) = 0; + virtual HRESULT GetBytesNoPrefix (/* out */ void **buffer) = 0; + virtual long GetSizeNoPrefix (void) = 0; + +protected: + virtual ~IDeckLinkH265NALPacket () {} // call Release method to drop reference count +}; + /* Interface IDeckLinkAudioInputPacket - Provided by the IDeckLinkInput callback. */ class IDeckLinkAudioInputPacket : public IUnknown diff --git a/chromium/third_party/decklink/mac/include/DeckLinkAPIConfiguration.h b/chromium/third_party/decklink/mac/include/DeckLinkAPIConfiguration.h index 26ec19c1f5d..f5cf22df5c3 100644 --- a/chromium/third_party/decklink/mac/include/DeckLinkAPIConfiguration.h +++ b/chromium/third_party/decklink/mac/include/DeckLinkAPIConfiguration.h @@ -1,5 +1,5 @@ /* -LICENSE-START- -** Copyright (c) 2014 Blackmagic Design +** Copyright (c) 2015 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 @@ -43,6 +43,7 @@ // Interface ID Declarations BMD_CONST REFIID IID_IDeckLinkConfiguration = /* CB71734A-FE37-4E8D-8E13-802133A1C3F2 */ {0xCB,0x71,0x73,0x4A,0xFE,0x37,0x4E,0x8D,0x8E,0x13,0x80,0x21,0x33,0xA1,0xC3,0xF2}; +BMD_CONST REFIID IID_IDeckLinkEncoderConfiguration = /* 67455668-0848-45DF-8D8E-350A77C9A028 */ {0x67,0x45,0x56,0x68,0x08,0x48,0x45,0xDF,0x8D,0x8E,0x35,0x0A,0x77,0xC9,0xA0,0x28}; /* Enum BMDDeckLinkConfigurationID - DeckLink Configuration ID */ @@ -102,6 +103,7 @@ enum _BMDDeckLinkConfigurationID { bmdDeckLinkConfigVideoInputScanning = 'visc', // Applicable to H264 Pro Recorder only bmdDeckLinkConfigUseDedicatedLTCInput = 'dltc', // Use timecode from LTC input instead of SDI stream + bmdDeckLinkConfigSDIInput3DPayloadOverride = '3dds', /* Video Input Integers */ @@ -124,6 +126,10 @@ enum _BMDDeckLinkConfigurationID { bmdDeckLinkConfigVideoInputSVideoLumaGain = 'islg', bmdDeckLinkConfigVideoInputSVideoChromaGain = 'iscg', + /* Audio Input Flags */ + + bmdDeckLinkConfigMicrophonePhantomPower = 'mphp', + /* Audio Input Integers */ bmdDeckLinkConfigAudioInputConnection = 'aicn', @@ -135,6 +141,7 @@ enum _BMDDeckLinkConfigurationID { bmdDeckLinkConfigAnalogAudioInputScaleChannel3 = 'ais3', bmdDeckLinkConfigAnalogAudioInputScaleChannel4 = 'ais4', bmdDeckLinkConfigDigitalAudioInputScale = 'dais', + bmdDeckLinkConfigMicrophoneInputGain = 'micg', /* Audio Output Integers */ @@ -147,6 +154,7 @@ enum _BMDDeckLinkConfigurationID { bmdDeckLinkConfigAnalogAudioOutputScaleChannel3 = 'aos3', bmdDeckLinkConfigAnalogAudioOutputScaleChannel4 = 'aos4', bmdDeckLinkConfigDigitalAudioOutputScale = 'daos', + bmdDeckLinkConfigHeadphoneVolume = 'hvol', /* Device Information Strings */ @@ -155,12 +163,32 @@ enum _BMDDeckLinkConfigurationID { bmdDeckLinkConfigDeviceInformationCompany = 'dico', bmdDeckLinkConfigDeviceInformationPhone = 'diph', bmdDeckLinkConfigDeviceInformationEmail = 'diem', - bmdDeckLinkConfigDeviceInformationDate = 'dida' + bmdDeckLinkConfigDeviceInformationDate = 'dida', + + /* Deck Control Integers */ + + bmdDeckLinkConfigDeckControlConnection = 'dcco' +}; + +/* Enum BMDDeckLinkEncoderConfigurationID - DeckLink Encoder Configuration ID */ + +typedef uint32_t BMDDeckLinkEncoderConfigurationID; +enum _BMDDeckLinkEncoderConfigurationID { + + /* Video Encoder Integers */ + + bmdDeckLinkEncoderConfigPreferredBitDepth = 'epbr', + bmdDeckLinkEncoderConfigFrameCodingMode = 'efcm', + + /* HEVC/H.265 Encoder Integers */ + + bmdDeckLinkEncoderConfigH265TargetBitrate = 'htbr' }; // Forward Declarations class IDeckLinkConfiguration; +class IDeckLinkEncoderConfiguration; /* Interface IDeckLinkConfiguration - DeckLink Configuration interface */ @@ -181,6 +209,25 @@ protected: virtual ~IDeckLinkConfiguration () {} // call Release method to drop reference count }; +/* Interface IDeckLinkEncoderConfiguration - DeckLink Encoder Configuration interface. Obtained from IDeckLinkEncoderInput */ + +class IDeckLinkEncoderConfiguration : public IUnknown +{ +public: + virtual HRESULT SetFlag (/* in */ BMDDeckLinkEncoderConfigurationID cfgID, /* in */ bool value) = 0; + virtual HRESULT GetFlag (/* in */ BMDDeckLinkEncoderConfigurationID cfgID, /* out */ bool *value) = 0; + virtual HRESULT SetInt (/* in */ BMDDeckLinkEncoderConfigurationID cfgID, /* in */ int64_t value) = 0; + virtual HRESULT GetInt (/* in */ BMDDeckLinkEncoderConfigurationID cfgID, /* out */ int64_t *value) = 0; + virtual HRESULT SetFloat (/* in */ BMDDeckLinkEncoderConfigurationID cfgID, /* in */ double value) = 0; + virtual HRESULT GetFloat (/* in */ BMDDeckLinkEncoderConfigurationID cfgID, /* out */ double *value) = 0; + virtual HRESULT SetString (/* in */ BMDDeckLinkEncoderConfigurationID cfgID, /* in */ CFStringRef value) = 0; + virtual HRESULT GetString (/* in */ BMDDeckLinkEncoderConfigurationID cfgID, /* out */ CFStringRef *value) = 0; + virtual HRESULT GetDecoderConfigurationInfo (/* out */ void *buffer, /* in */ long bufferSize, /* out */ long *returnedSize) = 0; + +protected: + virtual ~IDeckLinkEncoderConfiguration () {} // call Release method to drop reference count +}; + /* Functions */ extern "C" { diff --git a/chromium/third_party/decklink/mac/include/DeckLinkAPIDeckControl.h b/chromium/third_party/decklink/mac/include/DeckLinkAPIDeckControl.h index 4075f328c8f..c2b1f09a026 100644 --- a/chromium/third_party/decklink/mac/include/DeckLinkAPIDeckControl.h +++ b/chromium/third_party/decklink/mac/include/DeckLinkAPIDeckControl.h @@ -1,5 +1,5 @@ /* -LICENSE-START- -** Copyright (c) 2014 Blackmagic Design +** Copyright (c) 2015 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 diff --git a/chromium/third_party/decklink/mac/include/DeckLinkAPIDiscovery.h b/chromium/third_party/decklink/mac/include/DeckLinkAPIDiscovery.h index adbde29a5e5..b737f23decc 100644 --- a/chromium/third_party/decklink/mac/include/DeckLinkAPIDiscovery.h +++ b/chromium/third_party/decklink/mac/include/DeckLinkAPIDiscovery.h @@ -1,5 +1,5 @@ /* -LICENSE-START- -** Copyright (c) 2014 Blackmagic Design +** Copyright (c) 2015 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 diff --git a/chromium/third_party/decklink/mac/include/DeckLinkAPIModes.h b/chromium/third_party/decklink/mac/include/DeckLinkAPIModes.h index 478a2fd3c63..e028f498e56 100644 --- a/chromium/third_party/decklink/mac/include/DeckLinkAPIModes.h +++ b/chromium/third_party/decklink/mac/include/DeckLinkAPIModes.h @@ -1,5 +1,5 @@ /* -LICENSE-START- -** Copyright (c) 2014 Blackmagic Design +** Copyright (c) 2015 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 @@ -135,7 +135,8 @@ enum _BMDPixelFormat { bmdFormat12BitRGB = 'R12B', // Big-endian RGB 12-bit per component with full range (0-4095). Packed as 12-bit per component bmdFormat12BitRGBLE = 'R12L', // Little-endian RGB 12-bit per component with full range (0-4095). Packed as 12-bit per component bmdFormat10BitRGBXLE = 'R10l', // Little-endian 10-bit RGB with SMPTE video levels (64-940) - bmdFormat10BitRGBX = 'R10b' // Big-endian 10-bit RGB with SMPTE video levels (64-940) + bmdFormat10BitRGBX = 'R10b', // Big-endian 10-bit RGB with SMPTE video levels (64-940) + bmdFormatH265 = 'hev1' // High Efficiency Video Coding (HEVC/h.265) }; /* Enum BMDDisplayModeFlags - Flags to describe the characteristics of an IDeckLinkDisplayMode. */ diff --git a/chromium/third_party/decklink/mac/include/DeckLinkAPIStreaming.h b/chromium/third_party/decklink/mac/include/DeckLinkAPIStreaming.h index 725c1879d32..4afb31acafd 100644 --- a/chromium/third_party/decklink/mac/include/DeckLinkAPIStreaming.h +++ b/chromium/third_party/decklink/mac/include/DeckLinkAPIStreaming.h @@ -1,5 +1,5 @@ /* -LICENSE-START- -** Copyright (c) 2014 Blackmagic Design +** Copyright (c) 2015 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 diff --git a/chromium/third_party/decklink/mac/include/DeckLinkAPITypes.h b/chromium/third_party/decklink/mac/include/DeckLinkAPITypes.h index 396680c81f9..79561f9295c 100644 --- a/chromium/third_party/decklink/mac/include/DeckLinkAPITypes.h +++ b/chromium/third_party/decklink/mac/include/DeckLinkAPITypes.h @@ -1,5 +1,5 @@ /* -LICENSE-START- -** Copyright (c) 2014 Blackmagic Design +** Copyright (c) 2015 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 @@ -77,7 +77,17 @@ enum _BMDAudioConnection { bmdAudioConnectionAESEBU = 1 << 1, bmdAudioConnectionAnalog = 1 << 2, bmdAudioConnectionAnalogXLR = 1 << 3, - bmdAudioConnectionAnalogRCA = 1 << 4 + bmdAudioConnectionAnalogRCA = 1 << 4, + bmdAudioConnectionMicrophone = 1 << 5, + bmdAudioConnectionHeadphones = 1 << 6 +}; + +/* Enum BMDDeckControlConnection - Deck control connections */ + +typedef uint32_t BMDDeckControlConnection; +enum _BMDDeckControlConnection { + bmdDeckControlConnectionRS422Remote1 = 1 << 0, + bmdDeckControlConnectionRS422Remote2 = 1 << 1 }; // Forward Declarations diff --git a/chromium/third_party/decklink/mac/include/DeckLinkAPIVersion.h b/chromium/third_party/decklink/mac/include/DeckLinkAPIVersion.h index 42e3a4652f9..2654db00b2e 100644 --- a/chromium/third_party/decklink/mac/include/DeckLinkAPIVersion.h +++ b/chromium/third_party/decklink/mac/include/DeckLinkAPIVersion.h @@ -30,8 +30,8 @@ #ifndef __DeckLink_API_Version_h__ #define __DeckLink_API_Version_h__ -#define BLACKMAGIC_DECKLINK_API_VERSION 0x0a040100 -#define BLACKMAGIC_DECKLINK_API_VERSION_STRING "10.4.1" +#define BLACKMAGIC_DECKLINK_API_VERSION 0x0a050200 +#define BLACKMAGIC_DECKLINK_API_VERSION_STRING "10.5.2" #endif // __DeckLink_API_Version_h__ |