mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-05-14 02:14:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

decklink: Clean up warnings introduced by caption code

Browse Source
This commit is contained in:
Colin Edwards
2020-11-03 17:15:49 -06:00
committed by Jim
parent 6bef0a8619
commit 5b8f89d86e
6 changed files with 61 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
plugins/decklink/decklink-device-instance.cpp
View File

@@ -157,7 +157,7 @@ void DeckLinkDeviceInstance::HandleVideoFrame(
auto sdid = packet->GetSDID();
// Caption data
if (did == 0x61 & sdid == 0x01) {
if (did == 0x61 && sdid == 0x01) {
this->HandleCaptionPacket(packet, timestamp);
}
@@ -193,8 +193,6 @@ void DeckLinkDeviceInstance::HandleVideoFrame(
void DeckLinkDeviceInstance::HandleCaptionPacket(
IDeckLinkAncillaryPacket *packet, const uint64_t timestamp)
{
auto line = packet->GetLineNumber();
const void *data;
uint32_t size;
packet->GetBytes(bmdAncillaryPacketFormatUInt8, &data, &size);
@@ -203,29 +201,41 @@ void DeckLinkDeviceInstance::HandleCaptionPacket(
struct bitstream_reader reader;
bitstream_reader_init(&reader, anc, size);
auto header1 = bitstream_reader_r8(&reader);
auto header2 = bitstream_reader_r8(&reader);
// header1
bitstream_reader_r8(&reader);
// header2
bitstream_reader_r8(&reader);
uint8_t length = bitstream_reader_r8(&reader);
uint8_t frameRate = bitstream_reader_read_bits(&reader, 4);
// length
bitstream_reader_r8(&reader);
// frameRate
bitstream_reader_read_bits(&reader, 4);
//reserved
bitstream_reader_read_bits(&reader, 4);
auto cdp_timecode_added = bitstream_reader_read_bits(&reader, 1);
auto cdp_data_block_added = bitstream_reader_read_bits(&reader, 1);
auto cdp_service_info_added = bitstream_reader_read_bits(&reader, 1);
auto cdp_service_info_start = bitstream_reader_read_bits(&reader, 1);
auto cdp_service_info_changed = bitstream_reader_read_bits(&reader, 1);
auto cdp_service_info_end = bitstream_reader_read_bits(&reader, 1);
// cdp_data_block_added
bitstream_reader_read_bits(&reader, 1);
// cdp_service_info_added
bitstream_reader_read_bits(&reader, 1);
// cdp_service_info_start
bitstream_reader_read_bits(&reader, 1);
// cdp_service_info_changed
bitstream_reader_read_bits(&reader, 1);
// cdp_service_info_end
bitstream_reader_read_bits(&reader, 1);
auto cdp_contains_captions = bitstream_reader_read_bits(&reader, 1);
//reserved
bitstream_reader_read_bits(&reader, 1);
auto cdp_counter = bitstream_reader_r8(&reader);
auto cdp_counter2 = bitstream_reader_r8(&reader);
// cdp_counter
bitstream_reader_r8(&reader);
// cdp_counter2
bitstream_reader_r8(&reader);
if (cdp_timecode_added) {
auto timecodeSectionID = bitstream_reader_r8(&reader);
// timecodeSectionID
bitstream_reader_r8(&reader);
//reserved
bitstream_reader_read_bits(&reader, 2);
bitstream_reader_read_bits(&reader, 2);
@@ -244,14 +254,15 @@ void DeckLinkDeviceInstance::HandleCaptionPacket(
}
if (cdp_contains_captions) {
auto cdp_data_section = bitstream_reader_r8(&reader);
// cdp_data_section
bitstream_reader_r8(&reader);
auto process_em_data_flag =
bitstream_reader_read_bits(&reader, 1);
auto process_cc_data_flag =
bitstream_reader_read_bits(&reader, 1);
auto additional_data_flag =
bitstream_reader_read_bits(&reader, 1);
//process_em_data_flag
bitstream_reader_read_bits(&reader, 1);
// process_cc_data_flag
bitstream_reader_read_bits(&reader, 1);
//additional_data_flag
bitstream_reader_read_bits(&reader, 1);
auto cc_count = bitstream_reader_read_bits(&reader, 5);