feature/Add MP4 video handling and update IPCamera configuration #191

cedricve · 2025-05-22T06:49:54Z

Description

Pull Request Description: feature/Add MP4 video handling and update IPCamera configuration

Motivation

The primary motivation behind this pull request is to enhance the video handling capabilities of the project by integrating MP4 video processing and updating the IPCamera configuration. This improvement ensures more efficient, accurate, and standardized video recording and playback, which is essential for high-quality video surveillance and monitoring applications.

Changes and Improvements

Integration of MP4 Video Handling:
- Added the github.com/Eyevinn/mp4ff library to handle MP4 video files.
- Implemented a new MP4 struct in machinery/src/video/mp4.go to manage MP4 video creation, track addition, and sample handling.
- Updated HandleRecordStream in machinery/src/capture/main.go to utilize the new MP4 handling methods for video and audio streams.
- Added sample conversion and track management functions to ensure proper video recording and playback.
Update IPCamera Configuration:
- Extended the IPCamera struct in machinery/src/models/Config.go to include SPS and PPS NALUs for H264 codec, which are critical for MP4 video initialization.
- Updated Kerberos.go to set SPS and PPS values from the camera configuration dynamically.
- Enhanced stream handling in gortsplib.go by adding stream index management for better organization and retrieval.
Miscellaneous Improvements:
- Refined the packet and stream handling logic to include stream indices, improving the clarity and management of different streams.
- Ensured compatibility with existing video handling mechanisms while introducing new MP4 capabilities.

Benefits

Enhanced Video Quality: The new MP4 handling ensures that video files are created with proper codecs and configurations, improving playback quality and compatibility.
Improved Configuration Management: By updating the IPCamera configuration to include SPS and PPS NALUs, the project ensures that video streams are initialized correctly, reducing errors and improving reliability.
Streamlined Codebase: The integration of the mp4ff library and the introduction of new video handling methods make the codebase more modular and easier to maintain.

This pull request significantly improves the project's video handling capabilities, making it more robust and efficient for surveillance and monitoring applications.

- Introduced a new video package with MP4 struct for video file handling. - Updated IPCamera struct to include SPS and PPS NALUs. - Enhanced stream handling in the capture process to utilize the new MP4 library. - Added stream index management for better tracking of video and audio streams.

Copilot

Pull Request Overview

This PR introduces an MP4 handling layer using the mp4ff library, extends IPCamera config to carry SPS/PPS NALUs, and updates capture flows to leverage the new MP4 package and stream indexing.

New video.MP4 type with init-segment, fragment and writing support
Added SPSNALUs/PPSNALUs to IPCamera and populated them in Kerberos.go
Updated capture routines to use video.MP4, manage stream indices, and write segments with both libraries

Reviewed Changes

Copilot reviewed 8 out of 8 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
machinery/src/video/mp4.go	New MP4 wrapper type and methods using Eyevinn/mp4ff
machinery/src/packets/stream.go	Added `Index` field for stream identification
machinery/src/models/Config.go	Extended `IPCamera` with SPS/PPS NALU slices
machinery/src/components/Kerberos.go	Set `IPCamera.SPSNALUs`/`PPSNALUs` from discovered streams
machinery/src/capture/main.go	Integrated `video.MP4` into recording logic and file naming
machinery/src/capture/gortsplib.go	Assigned `Stream.Index` when appending new streams
machinery/go.mod	Added `github.com/Eyevinn/mp4ff` dependency

Comments suppressed due to low confidence (5)

machinery/src/video/mp4.go:8

Duplicate import of the same mp4ff package under two names; remove the redundant import and use a single alias.

mp4ff "github.com/Eyevinn/mp4ff/mp4"

machinery/src/video/mp4.go:47

[nitpick] Receiver name 'mp4' shadows the package alias and is non-idiomatic; consider renaming it to something like 'm' or 'p'.

func (mp4 *MP4) SetWidth(width int) {

machinery/src/capture/main.go:233

[nitpick] Go variable names should use CamelCase; rename 'new_name' to 'newName'.

new_name := s + "_new.mp4"

machinery/src/capture/main.go:251

The MP4 writer is initialized with 'new_fullName' but the muxer is writing to 'fullName'; align file paths so both write to the intended location.

mp4Video = video.NewMP4(new_fullName, spsNALUS, ppsNALUs)

machinery/src/video/mp4.go:1

No unit tests accompany the new MP4 logic; add tests covering initialization, sample addition, and output file writing.

package video

Copilot · 2025-05-22T06:52:45Z

machinery/src/video/mp4.go

+	includePS := true
+	err := trak.SetAVCDescriptor("avc1", spsNALUs, ppsNALUs, includePS)
+	if err != nil {
+		panic(err)


Avoid using panic for error handling in library code; return errors to the caller so they can be handled gracefully.

Suggested change

panic(err)

return nil, err

Copilot · 2025-05-22T06:52:46Z

machinery/src/video/mp4.go

+	// Add a video track to the MP4 file
+	// This is a placeholder function
+	// In a real implementation, this would add a video track to the MP4 file


This method is currently a stub with no implementation; either implement actual track-addition logic or remove it to avoid confusion.

Suggested change

// Add a video track to the MP4 file

// This is a placeholder function

// In a real implementation, this would add a video track to the MP4 file

// Create a new video track in the Init segment

videoTimescale := uint32(180000) // Example timescale for video

trackID := uint32(len(mp4.TrackIDs) + 1) // Generate a new track ID

err := mp4.Init.AddEmptyTrack(videoTimescale, "video", "und")

if err != nil {

panic(err)

}

// Set codec-specific parameters

trak := mp4.Init.Moov.Trak

includePS := true

err = trak.SetAVCDescriptor(codec, nil, nil, includePS)

if err != nil {

panic(err)

}

// Append the new track ID to the TrackIDs slice

mp4.TrackIDs = append(mp4.TrackIDs, trackID)

Copilot · 2025-05-22T06:52:46Z

machinery/src/capture/main.go

@@ -122,6 +125,10 @@ func HandleRecordStream(queue *packets.Queue, configDirectory string, configurat
 					// Write the last packet
 					ttime := convertPTS(pkt.TimeLegacy)
 					if pkt.IsVideo {
+
+						// New method using new mp4 library
+						mp4Video.AddSampleToTrack(0, pkt.Data, ttime, ttime-previousDuration)


[nitpick] This sample-addition and duration logic is duplicated in several blocks; consider extracting it into a helper to reduce repetition.

Copilot · 2025-05-22T06:52:46Z

machinery/src/packets/stream.go

@@ -1,6 +1,9 @@
 package packets

 type Stream struct {
+	// The ID of the stream.
+	Index int


[nitpick] The new 'Index' field lacks JSON/BSON struct tags; add tags if it needs to be serialized for consistency with other fields.

Suggested change

Index int

Index int `json:"index" bson:"index"`

…tion

…tion handling and segment management

Copilot AI review requested due to automatic review settings May 22, 2025 06:49

Copilot AI reviewed May 22, 2025

View reviewed changes

cedricve added 5 commits May 26, 2025 06:00

Refactor MP4 handling to improve sample addition and segment management

bee522a

Update mp4.go

055fb67

Refactor MP4 handling to improve sample addition and duration calcula…

756aeaa

…tion

Add custom UUID box and enhance MP4 file closing logic

78d786b

Refactor MP4 initialization and sample addition logic to enhance dura…

24fc340

…tion handling and segment management

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feature/Add MP4 video handling and update IPCamera configuration #191

feature/Add MP4 video handling and update IPCamera configuration #191

Uh oh!

cedricve commented May 22, 2025 •

edited by uug-ai-bot

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI May 22, 2025

Uh oh!

Copilot AI May 22, 2025

Uh oh!

Copilot AI May 22, 2025

Uh oh!

Copilot AI May 22, 2025

Uh oh!

Uh oh!

-	// Add a video track to the MP4 file
-	// This is a placeholder function
-	// In a real implementation, this would add a video track to the MP4 file
+	// Create a new video track in the Init segment
+	videoTimescale := uint32(180000) // Example timescale for video
+	trackID := uint32(len(mp4.TrackIDs) + 1) // Generate a new track ID
+	err := mp4.Init.AddEmptyTrack(videoTimescale, "video", "und")
+	if err != nil {
+		panic(err)
+	}
+	// Set codec-specific parameters
+	trak := mp4.Init.Moov.Trak
+	includePS := true
+	err = trak.SetAVCDescriptor(codec, nil, nil, includePS)
+	if err != nil {
+		panic(err)
+	}
+	// Append the new track ID to the TrackIDs slice
+	mp4.TrackIDs = append(mp4.TrackIDs, trackID)

feature/Add MP4 video handling and update IPCamera configuration #191

Are you sure you want to change the base?

feature/Add MP4 video handling and update IPCamera configuration #191

Uh oh!

Conversation

cedricve commented May 22, 2025 • edited by uug-ai-bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Pull Request Description: feature/Add MP4 video handling and update IPCamera configuration

Motivation

Changes and Improvements

Benefits

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Copilot AI May 22, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI May 22, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI May 22, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI May 22, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

cedricve commented May 22, 2025 •

edited by uug-ai-bot

Loading