h265

orestonce · Mar 19, 2024 · a406549 · a406549
1 parent 103602a
commit a406549
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/merge.go b/merge.go
@@ -34,7 +34,7 @@ func MergeTsFileListToSingleMp4(req MergeTsFileListToSingleMp4_Req) (err error)
 	if err != nil {
 		return err
 	}
-	vtid := muxer.AddVideoTrack(mp4.MP4_CODEC_H264)
+	var vtid uint32 // video track id
 	atid := muxer.AddAudioTrack(mp4.MP4_CODEC_AAC)
 
 	demuxer := mpeg2.NewTSDemuxer()
@@ -61,6 +61,17 @@ func MergeTsFileListToSingleMp4(req MergeTsFileListToSingleMp4_Req) (err error)
 				}
 			})
 		} else if cid == mpeg2.TS_STREAM_H264 || cid == mpeg2.TS_STREAM_H265 {
+			if vtid == 0 {
+				switch cid {
+				case mpeg2.TS_STREAM_H264:
+					vtid = muxer.AddVideoTrack(mp4.MP4_CODEC_H264)
+				case mpeg2.TS_STREAM_H265:
+					vtid = muxer.AddVideoTrack(mp4.MP4_CODEC_H265)
+				default:
+					OnFrameErr = errors.New("unknown cid2 " + strconv.Itoa(int(cid)))
+					return
+				}
+			}
 			err = muxer.Write(vtid, frame, pts, dts)
 			if err != nil {
 				OnFrameErr = err