Fixed issue where Data track fails to be added

AirenSoft · Jan 6, 2025 · 04a3b4f · 04a3b4f
1 parent 0dba720
commit 04a3b4f
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 26 deletions.
diff --git a/src/projects/mediarouter/mediarouter_stream.cpp b/src/projects/mediarouter/mediarouter_stream.cpp
@@ -888,8 +888,11 @@ bool MediaRouteStream::NormalizeMediaPacket(std::shared_ptr<MediaTrack> &media_t
 		case cmn::BitstreamFormat::MP3:
 			result = ProcessMP3Stream(media_track, media_packet); 
 			break;
+		// Data Format
 		case cmn::BitstreamFormat::ID3v2:
 		case cmn::BitstreamFormat::OVEN_EVENT:
+		case cmn::BitstreamFormat::CUE:
+		case cmn::BitstreamFormat::AMF:
 			result = true;
 			break;
 		case cmn::BitstreamFormat::JPEG:

diff --git a/src/projects/modules/containers/mpegts/mpegts_packetizer.cpp b/src/projects/modules/containers/mpegts/mpegts_packetizer.cpp
@@ -57,15 +57,7 @@ namespace mpegts
             return false;
         }
 
-		if (media_track->GetMediaType() == cmn::MediaType::Data)
-		{
-			if (media_track->GetOriginBitstream() != cmn::BitstreamFormat::ID3v2)
-			{
-				logte("Data Track (%s bitstream format) is not supported", GetBitstreamFormatString(media_track->GetOriginBitstream()).CStr());
-				return false;
-			}
-		}
-		else if (media_track->GetMediaType() == cmn::MediaType::Audio || media_track->GetMediaType() == cmn::MediaType::Video)
+		if (media_track->GetMediaType() == cmn::MediaType::Audio || media_track->GetMediaType() == cmn::MediaType::Video)
 		{
 			auto stream_type = GetElementaryStreamTypeByCodecId(media_track->GetCodecId());
 			if (stream_type == WellKnownStreamTypes::None)
@@ -312,20 +304,17 @@ namespace mpegts
 				continue;
 			}
 
-			if (track->GetOriginBitstream() == cmn::BitstreamFormat::ID3v2)
+			auto es_info = std::make_shared<ESInfo>();
+			auto es_descriptor = BuildID3MetadataDescriptor();
+			auto es_descriptor_data = es_descriptor->Build();
+
+			if (es_descriptor_data != nullptr)
 			{
-				auto es_info = std::make_shared<ESInfo>();
-				auto es_descriptor = BuildID3MetadataDescriptor();
-				auto es_descriptor_data = es_descriptor->Build();
-
-				if (es_descriptor_data != nullptr)
-				{
-					es_info->_stream_type = static_cast<uint8_t>(WellKnownStreamTypes::METADATA_CARRIED_IN_PES);
-					es_info->_elementary_pid = GetElementaryPid(track->GetId());
-					es_info->_es_info_length = es_descriptor_data->GetLength();
-					es_info->_es_descriptors.emplace_back(es_descriptor);
-					_pmt._es_info_list.push_back(es_info);
-				}
+				es_info->_stream_type = static_cast<uint8_t>(WellKnownStreamTypes::METADATA_CARRIED_IN_PES);
+				es_info->_elementary_pid = GetElementaryPid(track->GetId());
+				es_info->_es_info_length = es_descriptor_data->GetLength();
+				es_info->_es_descriptors.emplace_back(es_descriptor);
+				_pmt._es_info_list.push_back(es_info);
 			}
 		}
 

diff --git a/src/projects/providers/file/file_stream.cpp b/src/projects/providers/file/file_stream.cpp
@@ -223,7 +223,7 @@ namespace pvd
 			data_track->SetId(FILE_DATA_TRACK_ID);
 			data_track->SetMediaType(cmn::MediaType::Data);
 			data_track->SetTimeBase(1, 1000);
-			data_track->SetOriginBitstream(cmn::BitstreamFormat::ID3v2);
+			data_track->SetOriginBitstream(cmn::BitstreamFormat::Unknown);
 
 			AddTrack(data_track);
 		}

diff --git a/src/projects/providers/rtmp/rtmp_stream.cpp b/src/projects/providers/rtmp/rtmp_stream.cpp
@@ -2076,7 +2076,7 @@ namespace pvd
 			data_track->SetId(RTMP_DATA_TRACK_ID);
 			data_track->SetMediaType(cmn::MediaType::Data);
 			data_track->SetTimeBase(1, 1000);
-			data_track->SetOriginBitstream(cmn::BitstreamFormat::ID3v2);
+			data_track->SetOriginBitstream(cmn::BitstreamFormat::Unknown);
 
 			AddTrack(data_track);
 		}

diff --git a/src/projects/providers/scheduled/scheduled_stream.cpp b/src/projects/providers/scheduled/scheduled_stream.cpp
@@ -801,7 +801,7 @@ namespace pvd
 			data_track->SetId(kScheduledDataTrackId);
 			data_track->SetMediaType(cmn::MediaType::Data);
 			data_track->SetTimeBase(1, 1000); // Data track time base is always 1/1000 in
-			data_track->SetOriginBitstream(cmn::BitstreamFormat::ID3v2);
+			data_track->SetOriginBitstream(cmn::BitstreamFormat::Unknown);
 
 			UpdateTrack(data_track);
 		}
@@ -1177,7 +1177,7 @@ namespace pvd
 			data_track->SetId(kScheduledDataTrackId);
 			data_track->SetMediaType(cmn::MediaType::Data);
 			data_track->SetTimeBase(1, 1000); // Data track time base is always 1/1000 in
-			data_track->SetOriginBitstream(cmn::BitstreamFormat::ID3v2);
+			data_track->SetOriginBitstream(cmn::BitstreamFormat::Unknown);
 
 			UpdateTrack(data_track);
 		}