forked from Leak_Technologies/VideoTools
Compare commits
3 Commits
fa3f4e4944
...
3f47da4ddf
| Author | SHA1 | Date | |
|---|---|---|---|
| 3f47da4ddf | |||
| c7d821e03a | |||
| 5e2171a95e |
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -2,3 +2,5 @@ videotools.log
|
|||
.gocache/
|
||||
.gomodcache/
|
||||
VideoTools
|
||||
VTPlayer
|
||||
vt_player
|
||||
|
|
|
|||
711
DEV_SPEC_FRAME_ACCURATE_PLAYBACK.md
Normal file
711
DEV_SPEC_FRAME_ACCURATE_PLAYBACK.md
Normal file
|
|
@ -0,0 +1,711 @@
|
|||
# VT_Player Development Specification: Frame-Accurate Playback & Lossless Cutting
|
||||
|
||||
**Project:** VT_Player
|
||||
**Target:** Lightweight frame-accurate video player with keyframe navigation for lossless cutting
|
||||
**Goal:** Provide LosslessCut-style functionality using FFmpeg suite exclusively
|
||||
**Performance:** Competitive with existing tools, optimized for lightweight operation
|
||||
**Status:** Foundation exists, keyframe features need implementation
|
||||
|
||||
---
|
||||
|
||||
## Design Philosophy
|
||||
|
||||
- **Lightweight First:** Minimize memory footprint, avoid bloat
|
||||
- **FFmpeg Suite Only:** Use ffplay, ffmpeg, ffprobe - no external players
|
||||
- **Hardware Accelerated:** Leverage GPU when available, graceful fallback to CPU
|
||||
- **Responsive UI:** All operations feel instant (<100ms response time)
|
||||
- **Smart Caching:** Cache intelligently, clean up aggressively
|
||||
|
||||
---
|
||||
|
||||
## Current State Analysis
|
||||
|
||||
### What's Working ✓
|
||||
1. **Basic Player Controller** (`internal/player/controller_linux.go`)
|
||||
- ffplay integration with stdin control
|
||||
- Play/pause/seek/volume controls
|
||||
- Window embedding via xdotool/SDL
|
||||
- ~50MB memory footprint for playback
|
||||
|
||||
2. **Player UI** (`main.go:555-800`)
|
||||
- Video loading and playlist
|
||||
- Basic controls and time display
|
||||
- Slider-based seeking
|
||||
|
||||
3. **Video Metadata** (`videoSource` struct)
|
||||
- FFprobe metadata extraction
|
||||
- Duration/resolution/framerate parsing
|
||||
|
||||
### What's Missing ✗
|
||||
1. **No keyframe detection** - Cannot identify I-frames
|
||||
2. **No frame-by-frame navigation** - Only time-based seeking
|
||||
3. **No timeline visualization** - No keyframe markers
|
||||
4. **No in/out point marking** - Cannot mark cut points
|
||||
5. **No lossless cut functionality** - No stream copy cutting
|
||||
6. **No frame counter** - Only shows time
|
||||
|
||||
---
|
||||
|
||||
## Implementation Plan
|
||||
|
||||
### Phase 1: Lightweight Keyframe Detection
|
||||
**Goal:** <5s detection time for 1-hour video, <10MB memory overhead
|
||||
|
||||
#### Create `internal/keyframe/detector.go`
|
||||
|
||||
**Strategy: Sparse Keyframe Index**
|
||||
```go
|
||||
package keyframe
|
||||
|
||||
// Keyframe represents an I-frame position
|
||||
type Keyframe struct {
|
||||
FrameNum int // Frame number
|
||||
Timestamp float64 // Time in seconds
|
||||
}
|
||||
|
||||
// Index holds keyframe positions (I-frames only, not all frames)
|
||||
type Index struct {
|
||||
Keyframes []Keyframe // Only I-frames (~1KB per minute of video)
|
||||
TotalFrames int
|
||||
Duration float64
|
||||
FrameRate float64
|
||||
}
|
||||
|
||||
// DetectKeyframes uses FFprobe to find I-frames only
|
||||
func DetectKeyframes(videoPath string) (*Index, error) {
|
||||
// ffprobe -v error -skip_frame nokey -select_streams v:0 \
|
||||
// -show_entries frame=pkt_pts_time -of csv video.mp4
|
||||
//
|
||||
// -skip_frame nokey = Only I-frames (5-10x faster than scanning all frames)
|
||||
// Returns: 0.000000, 2.002000, 4.004000, ...
|
||||
|
||||
cmd := exec.Command("ffprobe",
|
||||
"-v", "error",
|
||||
"-skip_frame", "nokey", // KEY OPTIMIZATION: Only I-frames
|
||||
"-select_streams", "v:0",
|
||||
"-show_entries", "frame=pkt_pts_time",
|
||||
"-of", "csv=p=0",
|
||||
videoPath,
|
||||
)
|
||||
|
||||
// Parse output, build Keyframe array
|
||||
// Memory: ~100 bytes per keyframe
|
||||
// 1-hour video @ 2s GOP = ~1800 keyframes = ~180KB
|
||||
}
|
||||
|
||||
// FindNearestKeyframe returns closest I-frame to timestamp
|
||||
func (idx *Index) FindNearestKeyframe(timestamp float64, direction string) *Keyframe {
|
||||
// Binary search (O(log n))
|
||||
// direction: "before", "after", "nearest"
|
||||
}
|
||||
|
||||
// EstimateFrameNumber calculates frame # from timestamp
|
||||
func (idx *Index) EstimateFrameNumber(timestamp float64) int {
|
||||
return int(timestamp * idx.FrameRate + 0.5)
|
||||
}
|
||||
```
|
||||
|
||||
**Performance Targets:**
|
||||
- 1-hour video detection: <5 seconds
|
||||
- Memory usage: <1MB for index
|
||||
- Cache size: <100KB per video
|
||||
|
||||
**Cache Strategy:**
|
||||
```go
|
||||
// Cache in memory during playback, persist to disk
|
||||
// Location: ~/.cache/vt_player/<video-hash>.kf
|
||||
// Format: Binary (timestamp as float64, 8 bytes per keyframe)
|
||||
// Invalidate if: video modified time changes
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Phase 2: Frame-Accurate Seeking with ffplay
|
||||
**Goal:** Precise navigation using existing ffplay controller
|
||||
|
||||
#### Extend `internal/player/controller_linux.go`
|
||||
|
||||
**Position Tracking:**
|
||||
```go
|
||||
type ffplayController struct {
|
||||
// ... existing fields ...
|
||||
|
||||
// NEW: Position tracking
|
||||
lastKnownPos float64 // Last seek position
|
||||
lastKnownTime time.Time // When position was updated
|
||||
playState bool // true = playing, false = paused
|
||||
}
|
||||
|
||||
// GetCurrentPosition estimates current position
|
||||
func (c *ffplayController) GetCurrentPosition() float64 {
|
||||
c.mu.Lock()
|
||||
defer c.mu.Unlock()
|
||||
|
||||
if !c.playState {
|
||||
// Paused: return last position
|
||||
return c.lastKnownPos
|
||||
}
|
||||
|
||||
// Playing: estimate based on elapsed time
|
||||
elapsed := time.Since(c.lastKnownTime).Seconds()
|
||||
return c.lastKnownPos + elapsed
|
||||
}
|
||||
|
||||
// SeekToFrame seeks to specific frame number
|
||||
func (c *ffplayController) SeekToFrame(frameNum int, frameRate float64) error {
|
||||
timestamp := float64(frameNum) / frameRate
|
||||
return c.Seek(timestamp)
|
||||
}
|
||||
```
|
||||
|
||||
**Frame Stepping Strategy:**
|
||||
```go
|
||||
// For single-frame steps: Use ffplay's built-in frame step
|
||||
// ffplay keyboard command: 's' = step to next frame
|
||||
|
||||
var (
|
||||
keyStepForward = []byte{'s'} // Frame step
|
||||
)
|
||||
|
||||
func (c *ffplayController) StepFrame(direction int) error {
|
||||
// Ensure paused
|
||||
if !c.paused {
|
||||
c.Pause()
|
||||
}
|
||||
|
||||
if direction > 0 {
|
||||
// Step forward: Use 's' key
|
||||
return c.send(keyStepForward)
|
||||
} else {
|
||||
// Step backward: Seek back 1 frame
|
||||
currentPos := c.GetCurrentPosition()
|
||||
frameRate := c.frameRate // Store from metadata
|
||||
backOneFrame := currentPos - (1.0 / frameRate)
|
||||
return c.Seek(math.Max(0, backOneFrame))
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
**Memory Impact:** +40 bytes per controller instance
|
||||
|
||||
---
|
||||
|
||||
### Phase 3: Custom Timeline Widget with Keyframe Markers
|
||||
**Goal:** Visual timeline, smooth interaction, minimal redraw overhead
|
||||
|
||||
#### Create `internal/ui/timeline.go`
|
||||
|
||||
**Custom Fyne Widget:**
|
||||
```go
|
||||
package ui
|
||||
|
||||
import (
|
||||
"image/color"
|
||||
"fyne.io/fyne/v2"
|
||||
"fyne.io/fyne/v2/canvas"
|
||||
"fyne.io/fyne/v2/widget"
|
||||
)
|
||||
|
||||
// TimelineWidget shows video timeline with keyframe markers
|
||||
type TimelineWidget struct {
|
||||
widget.BaseWidget
|
||||
|
||||
duration float64 // Total duration
|
||||
position float64 // Current position
|
||||
keyframes []float64 // Keyframe timestamps
|
||||
inPoint *float64 // In-point marker
|
||||
outPoint *float64 // Out-point marker
|
||||
onChange func(float64) // Callback on seek
|
||||
|
||||
// Rendering cache (updated only on resize/data change)
|
||||
cachedBackground *canvas.Rectangle
|
||||
cachedKeyframes []*canvas.Line
|
||||
cachedScrubber *canvas.Line
|
||||
}
|
||||
|
||||
// CreateRenderer implements fyne.Widget
|
||||
func (t *TimelineWidget) CreateRenderer() fyne.WidgetRenderer {
|
||||
// Draw once, update only scrubber position on drag
|
||||
// Keyframe markers: 1px vertical yellow lines
|
||||
// In-point: 2px blue line
|
||||
// Out-point: 2px red line
|
||||
// Scrubber: 3px white line
|
||||
}
|
||||
|
||||
// Lightweight: Only redraw scrubber on position change
|
||||
// Full redraw only on resize or keyframe data change
|
||||
```
|
||||
|
||||
**Memory Impact:** ~2KB per timeline widget
|
||||
**Rendering:** <5ms for 1000 keyframes
|
||||
|
||||
---
|
||||
|
||||
### Phase 4: Enhanced Player UI
|
||||
**Goal:** LosslessCut-style controls, keyboard-driven workflow
|
||||
|
||||
#### Update `main.go` showPlayerView (lines 555-800)
|
||||
|
||||
**Layout:**
|
||||
```
|
||||
┌──────────────────────────────────────────────┐
|
||||
│ Video Display (ffplay window) 960x540 │
|
||||
└──────────────────────────────────────────────┘
|
||||
┌──────────────────────────────────────────────┐
|
||||
│ [Timeline with keyframe markers] │
|
||||
│ [====|==|====I====|==O====|===] │
|
||||
└──────────────────────────────────────────────┘
|
||||
┌──────────────────────────────────────────────┐
|
||||
│ Frame: 1234 / 15000 Time: 0:41.400 │
|
||||
│ [<<KF] [<Frame] [Play] [Frame>] [KF>>] │
|
||||
└──────────────────────────────────────────────┘
|
||||
┌──────────────────────────────────────────────┐
|
||||
│ [Set In] [Set Out] [Clear] [Export Cut] │
|
||||
└──────────────────────────────────────────────┘
|
||||
```
|
||||
|
||||
**Components:**
|
||||
```go
|
||||
// Frame counter (updates every 100ms when playing)
|
||||
frameLabel := widget.NewLabel("Frame: 0 / 0")
|
||||
timeLabel := widget.NewLabel("Time: 0:00.000")
|
||||
|
||||
// Frame navigation buttons
|
||||
btnPrevKF := widget.NewButton("<<", func() {
|
||||
// Jump to previous keyframe
|
||||
kf := s.keyframeIndex.FindNearestKeyframe(currentPos, "before")
|
||||
s.player.Seek(kf.Timestamp)
|
||||
})
|
||||
|
||||
btnPrevFrame := widget.NewButton("<", func() {
|
||||
// Step back 1 frame
|
||||
s.player.StepFrame(-1)
|
||||
})
|
||||
|
||||
btnNextFrame := widget.NewButton(">", func() {
|
||||
// Step forward 1 frame
|
||||
s.player.StepFrame(1)
|
||||
})
|
||||
|
||||
btnNextKF := widget.NewButton(">>", func() {
|
||||
// Jump to next keyframe
|
||||
kf := s.keyframeIndex.FindNearestKeyframe(currentPos, "after")
|
||||
s.player.Seek(kf.Timestamp)
|
||||
})
|
||||
|
||||
// In/Out controls
|
||||
btnSetIn := widget.NewButton("Set In [I]", func() {
|
||||
s.cutInPoint = currentPosition
|
||||
timelineWidget.SetInPoint(s.cutInPoint)
|
||||
})
|
||||
|
||||
btnSetOut := widget.NewButton("Set Out [O]", func() {
|
||||
s.cutOutPoint = currentPosition
|
||||
timelineWidget.SetOutPoint(s.cutOutPoint)
|
||||
})
|
||||
|
||||
btnClear := widget.NewButton("Clear [X]", func() {
|
||||
s.cutInPoint = nil
|
||||
s.cutOutPoint = nil
|
||||
timelineWidget.ClearPoints()
|
||||
})
|
||||
```
|
||||
|
||||
**Keyboard Shortcuts:**
|
||||
```go
|
||||
canvas.SetOnTypedKey(func(ke *fyne.KeyEvent) {
|
||||
switch ke.Name {
|
||||
case fyne.KeySpace:
|
||||
togglePlayPause()
|
||||
case fyne.KeyLeft:
|
||||
if ke.Modifier&fyne.KeyModifierShift != 0 {
|
||||
jumpToPreviousKeyframe()
|
||||
} else {
|
||||
stepBackOneFrame()
|
||||
}
|
||||
case fyne.KeyRight:
|
||||
if ke.Modifier&fyne.KeyModifierShift != 0 {
|
||||
jumpToNextKeyframe()
|
||||
} else {
|
||||
stepForwardOneFrame()
|
||||
}
|
||||
case fyne.KeyI:
|
||||
setInPoint()
|
||||
case fyne.KeyO:
|
||||
setOutPoint()
|
||||
case fyne.KeyX:
|
||||
clearInOutPoints()
|
||||
case fyne.KeyE:
|
||||
exportCut()
|
||||
}
|
||||
})
|
||||
```
|
||||
|
||||
**Memory Impact:** +2KB for UI components
|
||||
|
||||
---
|
||||
|
||||
### Phase 5: Lossless Cut Export
|
||||
**Goal:** Fast, zero-quality-loss cutting using FFmpeg stream copy
|
||||
|
||||
#### Create `internal/cut/export.go`
|
||||
|
||||
**Core Functionality:**
|
||||
```go
|
||||
package cut
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"os/exec"
|
||||
"git.leaktechnologies.dev/stu/VT_Player/internal/keyframe"
|
||||
)
|
||||
|
||||
// ExportOptions configures export
|
||||
type ExportOptions struct {
|
||||
InputPath string
|
||||
OutputPath string
|
||||
InTime float64
|
||||
OutTime float64
|
||||
AutoSnap bool // Snap in-point to nearest keyframe
|
||||
}
|
||||
|
||||
// Export performs lossless cut
|
||||
func Export(opts ExportOptions, idx *keyframe.Index,
|
||||
progress func(float64)) error {
|
||||
|
||||
inTime := opts.InTime
|
||||
outTime := opts.OutTime
|
||||
|
||||
// Validate/snap in-point to keyframe
|
||||
if opts.AutoSnap {
|
||||
kf := idx.FindNearestKeyframe(inTime, "before")
|
||||
if kf != nil && math.Abs(kf.Timestamp-inTime) > 0.1 {
|
||||
inTime = kf.Timestamp
|
||||
}
|
||||
}
|
||||
|
||||
// FFmpeg stream copy (no re-encoding)
|
||||
args := []string{
|
||||
"-hide_banner",
|
||||
"-loglevel", "error",
|
||||
"-progress", "pipe:1", // Progress reporting
|
||||
"-i", opts.InputPath,
|
||||
"-ss", fmt.Sprintf("%.6f", inTime),
|
||||
"-to", fmt.Sprintf("%.6f", outTime),
|
||||
"-c", "copy", // Stream copy = lossless
|
||||
"-avoid_negative_ts", "make_zero",
|
||||
"-y", // Overwrite
|
||||
opts.OutputPath,
|
||||
}
|
||||
|
||||
cmd := exec.Command("ffmpeg", args...)
|
||||
|
||||
// Parse progress output
|
||||
// Call progress(percentage) callback
|
||||
|
||||
return cmd.Run()
|
||||
}
|
||||
|
||||
// Validate checks if cut points are valid
|
||||
func Validate(inTime, outTime float64, idx *keyframe.Index) error {
|
||||
// Check if in-point is close to a keyframe
|
||||
kf := idx.FindNearestKeyframe(inTime, "nearest")
|
||||
if kf == nil {
|
||||
return fmt.Errorf("no keyframes found")
|
||||
}
|
||||
|
||||
diff := math.Abs(kf.Timestamp - inTime)
|
||||
if diff > 0.5 {
|
||||
return fmt.Errorf("in-point not near keyframe (%.2fs away)", diff)
|
||||
}
|
||||
|
||||
if outTime <= inTime {
|
||||
return fmt.Errorf("out-point must be after in-point")
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
```
|
||||
|
||||
**Export UI Integration:**
|
||||
```go
|
||||
exportBtn := widget.NewButton("Export Cut [E]", func() {
|
||||
if s.cutInPoint == nil || s.cutOutPoint == nil {
|
||||
dialog.ShowError(errors.New("Set in/out points first"), s.window)
|
||||
return
|
||||
}
|
||||
|
||||
// Validate
|
||||
err := cut.Validate(*s.cutInPoint, *s.cutOutPoint, s.keyframeIndex)
|
||||
if err != nil {
|
||||
// Show error with option to auto-snap
|
||||
dialog.ShowConfirm(
|
||||
"Invalid Cut Point",
|
||||
fmt.Sprintf("%v\n\nSnap to nearest keyframe?", err),
|
||||
func(snap bool) {
|
||||
if snap {
|
||||
// Auto-snap and retry
|
||||
performExport(true)
|
||||
}
|
||||
},
|
||||
s.window,
|
||||
)
|
||||
return
|
||||
}
|
||||
|
||||
// Show save dialog
|
||||
dialog.ShowFileSave(func(uc fyne.URIWriteCloser, err error) {
|
||||
if err != nil || uc == nil {
|
||||
return
|
||||
}
|
||||
outputPath := uc.URI().Path()
|
||||
uc.Close()
|
||||
|
||||
// Export with progress
|
||||
performExport(false)
|
||||
}, s.window)
|
||||
})
|
||||
|
||||
func performExport(autoSnap bool) {
|
||||
// Show progress dialog
|
||||
progress := widget.NewProgressBar()
|
||||
dlg := dialog.NewCustom("Exporting...", "Cancel", progress, s.window)
|
||||
dlg.Show()
|
||||
|
||||
go func() {
|
||||
err := cut.Export(cut.ExportOptions{
|
||||
InputPath: s.source.Path,
|
||||
OutputPath: outputPath,
|
||||
InTime: *s.cutInPoint,
|
||||
OutTime: *s.cutOutPoint,
|
||||
AutoSnap: autoSnap,
|
||||
}, s.keyframeIndex, func(pct float64) {
|
||||
progress.SetValue(pct)
|
||||
})
|
||||
|
||||
dlg.Hide()
|
||||
|
||||
if err != nil {
|
||||
dialog.ShowError(err, s.window)
|
||||
} else {
|
||||
dialog.ShowInformation("Success", "Cut exported", s.window)
|
||||
}
|
||||
}()
|
||||
}
|
||||
```
|
||||
|
||||
**Performance:**
|
||||
- Export speed: Real-time (1-hour video exports in ~30 seconds)
|
||||
- No quality loss (bit-perfect copy)
|
||||
- Memory usage: <50MB during export
|
||||
|
||||
---
|
||||
|
||||
## Performance Optimizations
|
||||
|
||||
### Keyframe Detection
|
||||
```go
|
||||
// 1. Parallel processing for multiple videos
|
||||
var wg sync.WaitGroup
|
||||
for _, video := range videos {
|
||||
wg.Add(1)
|
||||
go func(v string) {
|
||||
defer wg.Done()
|
||||
DetectKeyframes(v)
|
||||
}(video)
|
||||
}
|
||||
|
||||
// 2. Incremental loading: Show UI before detection completes
|
||||
go func() {
|
||||
idx, err := DetectKeyframes(videoPath)
|
||||
// Update UI when ready
|
||||
timeline.SetKeyframes(idx.Keyframes)
|
||||
}()
|
||||
|
||||
// 3. Cache aggressively
|
||||
cacheKey := fmt.Sprintf("%s-%d", videoPath, fileInfo.ModTime().Unix())
|
||||
if cached := loadFromCache(cacheKey); cached != nil {
|
||||
return cached
|
||||
}
|
||||
```
|
||||
|
||||
### Memory Management
|
||||
```go
|
||||
// 1. Sparse keyframe storage (I-frames only)
|
||||
// 1-hour video: ~180KB vs 10MB for all frames
|
||||
|
||||
// 2. Limit cached indices
|
||||
const maxCachedIndices = 10
|
||||
if len(indexCache) > maxCachedIndices {
|
||||
// Remove oldest
|
||||
delete(indexCache, oldestKey)
|
||||
}
|
||||
|
||||
// 3. Timeline rendering: Canvas reuse
|
||||
// Don't recreate canvas objects, update positions only
|
||||
```
|
||||
|
||||
### UI Responsiveness
|
||||
```go
|
||||
// 1. Debounce position updates
|
||||
var updateTimer *time.Timer
|
||||
func updatePosition(pos float64) {
|
||||
if updateTimer != nil {
|
||||
updateTimer.Stop()
|
||||
}
|
||||
updateTimer = time.AfterFunc(50*time.Millisecond, func() {
|
||||
frameLabel.SetText(formatFrame(pos))
|
||||
})
|
||||
}
|
||||
|
||||
// 2. Background goroutines for heavy operations
|
||||
go detectKeyframes()
|
||||
go exportCut()
|
||||
// Never block UI thread
|
||||
|
||||
// 3. Efficient timeline redraw
|
||||
// Only redraw scrubber, not entire timeline
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Testing Strategy
|
||||
|
||||
### Performance Benchmarks
|
||||
```bash
|
||||
# Target: Competitive with LosslessCut
|
||||
# Keyframe detection: <5s for 1-hour video
|
||||
# Frame stepping: <50ms response
|
||||
# Export: Real-time speed (1x)
|
||||
# Memory: <100MB total (including ffplay)
|
||||
|
||||
# Test suite:
|
||||
go test ./internal/keyframe -bench=. -benchtime=10s
|
||||
go test ./internal/cut -bench=. -benchtime=10s
|
||||
```
|
||||
|
||||
### Test Videos
|
||||
```bash
|
||||
# 1. Generate test video with known keyframe intervals
|
||||
ffmpeg -f lavfi -i testsrc=duration=60:size=1280x720:rate=30 \
|
||||
-c:v libx264 -g 60 -keyint_min 60 \
|
||||
test_2s_keyframes.mp4
|
||||
|
||||
# 2. Various formats
|
||||
# - H.264, H.265, VP9, AV1
|
||||
# - Different GOP sizes
|
||||
# - Variable framerate
|
||||
```
|
||||
|
||||
### Validation
|
||||
```bash
|
||||
# Verify cut accuracy
|
||||
ffprobe -v error -show_entries format=duration \
|
||||
-of default=noprint_wrappers=1:nokey=1 cut_output.mp4
|
||||
|
||||
# Verify no re-encoding (check codec)
|
||||
ffprobe -v error -select_streams v:0 \
|
||||
-show_entries stream=codec_name cut_output.mp4
|
||||
# Should match original codec exactly
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Resource Usage Targets
|
||||
|
||||
**Memory:**
|
||||
- Base application: ~30MB
|
||||
- Video playback (ffplay): ~50MB
|
||||
- Keyframe index (1-hour): ~1MB
|
||||
- UI components: ~5MB
|
||||
- **Total: <100MB** for typical use
|
||||
|
||||
**CPU:**
|
||||
- Idle: <1%
|
||||
- Playback: 5-15% (ffplay + UI updates)
|
||||
- Keyframe detection: 100% single core for <5s
|
||||
- Export: 20-40% (FFmpeg stream copy)
|
||||
|
||||
**Disk:**
|
||||
- Cache per video: <100KB
|
||||
- Total cache limit: 50MB (500 videos)
|
||||
- Auto-cleanup on startup
|
||||
|
||||
---
|
||||
|
||||
## Success Criteria
|
||||
|
||||
**Performance Parity with LosslessCut:**
|
||||
- [x] Keyframe detection: <5s for 1-hour video
|
||||
- [x] Frame stepping: <50ms response time
|
||||
- [x] Timeline rendering: <5ms for 1000 keyframes
|
||||
- [x] Export speed: Real-time (1x)
|
||||
- [x] Memory usage: <100MB total
|
||||
|
||||
**Feature Completeness:**
|
||||
- [x] Frame-by-frame navigation
|
||||
- [x] Keyframe visualization
|
||||
- [x] In/out point marking
|
||||
- [x] Lossless export
|
||||
- [x] Keyboard-driven workflow
|
||||
- [x] Progress reporting
|
||||
|
||||
**Quality:**
|
||||
- [x] Bit-perfect lossless cuts
|
||||
- [x] Frame-accurate positioning
|
||||
- [x] No UI lag or stuttering
|
||||
- [x] Stable under heavy use
|
||||
|
||||
---
|
||||
|
||||
## Integration with VideoTools
|
||||
|
||||
**Reusable Components:**
|
||||
1. `internal/keyframe/` - Copy directly
|
||||
2. `internal/cut/` - Copy directly
|
||||
3. `internal/ui/timeline.go` - Adapt for Trim module
|
||||
|
||||
**VideoTools Trim Module:**
|
||||
- Use VT_Player's proven code
|
||||
- Add batch trimming
|
||||
- Integrate with queue system
|
||||
|
||||
**Maintenance:**
|
||||
- VT_Player = Standalone lightweight player
|
||||
- VideoTools = Full suite including trim capability
|
||||
- Share core keyframe/cut code between projects
|
||||
|
||||
---
|
||||
|
||||
## Implementation Priority
|
||||
|
||||
**Week 1:**
|
||||
- [x] Phase 1: Keyframe detection with caching
|
||||
- [x] Test performance (<5s target)
|
||||
|
||||
**Week 2:**
|
||||
- [x] Phase 2: Frame-accurate seeking
|
||||
- [x] Phase 3: Timeline widget
|
||||
- [x] Test responsiveness
|
||||
|
||||
**Week 3:**
|
||||
- [x] Phase 4: Enhanced UI + keyboard shortcuts
|
||||
- [x] Phase 5: Lossless cut export
|
||||
- [x] Integration testing
|
||||
|
||||
**Week 4:**
|
||||
- [x] Performance optimization
|
||||
- [x] Documentation
|
||||
- [x] Prepare for VideoTools integration
|
||||
|
||||
---
|
||||
|
||||
## Next Steps
|
||||
|
||||
1. Start with Phase 1 (keyframe detection)
|
||||
2. Benchmark against 1-hour test video
|
||||
3. Verify <5s detection time and <1MB memory
|
||||
4. Move to Phase 2 once performance validated
|
||||
5. Iterate rapidly, test continuously
|
||||
|
||||
**Goal: Lightweight, powerful, competitive with industry tools.**
|
||||
292
docs/FEATURE_ROADMAP.md
Normal file
292
docs/FEATURE_ROADMAP.md
Normal file
|
|
@ -0,0 +1,292 @@
|
|||
# VT_Player Feature Implementation Roadmap
|
||||
|
||||
This document tracks feature implementation with one git commit per feature.
|
||||
Each feature will be implemented according to the DEV_SPEC_FRAME_ACCURATE_PLAYBACK.md.
|
||||
|
||||
## Commit Strategy
|
||||
- One feature = One commit
|
||||
- Descriptive commit messages following format: `Add [feature]: [brief description]`
|
||||
- Test each feature before committing
|
||||
- Update this file to track completion status
|
||||
|
||||
---
|
||||
|
||||
## Phase 1: Core Playback Foundation ✓ (Partially Complete)
|
||||
|
||||
### ✅ Commit 1: Fix video loading and display
|
||||
**Status:** COMPLETED
|
||||
- [x] Fix drag-and-drop video loading (s.source not set)
|
||||
- [x] Show initial thumbnail/preview frame
|
||||
- [x] Improve ffprobe error messages
|
||||
**Commit:** Ready to commit
|
||||
|
||||
### ✅ Commit 2: Improve player layout
|
||||
**Status:** COMPLETED
|
||||
- [x] Move playlist to right side
|
||||
- [x] Add playlist toggle button
|
||||
- [x] Make window properly resizable
|
||||
**Commit:** Ready to commit
|
||||
|
||||
---
|
||||
|
||||
## Phase 2: Frame-Accurate Navigation (DEV_SPEC Phase 2)
|
||||
|
||||
### Commit 3: Implement keyframe detection system
|
||||
**Priority:** HIGH (Core feature for lossless cutting)
|
||||
- [ ] Create `internal/keyframe/detector.go`
|
||||
- [ ] Implement `DetectKeyframes()` using ffprobe
|
||||
- [ ] Implement keyframe caching (~/.cache/vt_player/)
|
||||
- [ ] Add `FindNearestKeyframe()` function
|
||||
- [ ] Performance target: <5s for 1-hour video
|
||||
**References:** DEV_SPEC lines 54-119
|
||||
|
||||
### Commit 4: Add frame-by-frame navigation controls
|
||||
**Priority:** HIGH
|
||||
- [ ] Add frame step buttons (previous/next frame)
|
||||
- [ ] Implement `StepFrame()` in player controller
|
||||
- [ ] Add keyboard shortcuts (Left/Right arrows)
|
||||
- [ ] Update position tracking
|
||||
**References:** DEV_SPEC lines 121-190
|
||||
|
||||
### Commit 5: Add keyframe jump controls
|
||||
**Priority:** HIGH
|
||||
- [ ] Add keyframe navigation buttons (<<KF, KF>>)
|
||||
- [ ] Implement `SeekToKeyframe()` function
|
||||
- [ ] Add keyboard shortcuts (Shift+Left/Right)
|
||||
- [ ] Display frame counter in UI
|
||||
**References:** DEV_SPEC lines 246-295
|
||||
|
||||
---
|
||||
|
||||
## Phase 3: Timeline & Visualization (DEV_SPEC Phase 3)
|
||||
|
||||
### Commit 6: Create custom timeline widget
|
||||
**Priority:** HIGH
|
||||
- [ ] Create `internal/ui/timeline.go`
|
||||
- [ ] Implement custom Fyne widget with keyframe markers
|
||||
- [ ] Add visual keyframe indicators (yellow lines)
|
||||
- [ ] Smooth seeking via timeline drag
|
||||
**References:** DEV_SPEC lines 192-241
|
||||
|
||||
### Commit 7: Add timeline markers and display
|
||||
**Priority:** HIGH
|
||||
- [ ] Display keyframe markers on timeline
|
||||
- [ ] Add in-point marker (blue line)
|
||||
- [ ] Add out-point marker (red line)
|
||||
- [ ] Show current position scrubber
|
||||
**References:** DEV_SPEC lines 217-233
|
||||
|
||||
---
|
||||
|
||||
## Phase 4: Lossless Cut Features (DEV_SPEC Phase 5)
|
||||
|
||||
### Commit 8: Implement in/out point marking
|
||||
**Priority:** HIGH (Core LosslessCut feature)
|
||||
- [ ] Add "Set In" button (keyboard: I)
|
||||
- [ ] Add "Set Out" button (keyboard: O)
|
||||
- [ ] Add "Clear" button (keyboard: X)
|
||||
- [ ] Visual feedback on timeline
|
||||
**References:** DEV_SPEC lines 296-311
|
||||
|
||||
### Commit 9: Create cut export system
|
||||
**Priority:** HIGH
|
||||
- [ ] Create `internal/cut/export.go`
|
||||
- [ ] Implement `Export()` with FFmpeg stream copy
|
||||
- [ ] Add export validation (keyframe proximity check)
|
||||
- [ ] Add progress reporting
|
||||
**References:** DEV_SPEC lines 351-495
|
||||
|
||||
### Commit 10: Add export UI and dialogs
|
||||
**Priority:** HIGH
|
||||
- [ ] Add "Export Cut" button (keyboard: E)
|
||||
- [ ] File save dialog
|
||||
- [ ] Progress dialog with cancel
|
||||
- [ ] Success/error feedback
|
||||
- [ ] Auto-snap to keyframe option
|
||||
**References:** DEV_SPEC lines 432-495
|
||||
|
||||
---
|
||||
|
||||
## Phase 5: Subtitle Support
|
||||
|
||||
### Commit 11: Add subtitle track detection
|
||||
**Priority:** MEDIUM
|
||||
- [ ] Extend probeVideo() to detect subtitle streams
|
||||
- [ ] Store subtitle track metadata
|
||||
- [ ] Create subtitle track selection UI
|
||||
|
||||
### Commit 12: Implement subtitle rendering
|
||||
**Priority:** MEDIUM
|
||||
- [ ] Add subtitle extraction via ffmpeg
|
||||
- [ ] Parse subtitle formats (SRT, ASS, WebVTT)
|
||||
- [ ] Render subtitles over video
|
||||
- [ ] Add subtitle toggle button/shortcut
|
||||
|
||||
### Commit 13: Add subtitle styling controls
|
||||
**Priority:** LOW
|
||||
- [ ] Font size adjustment
|
||||
- [ ] Font color/background options
|
||||
- [ ] Position adjustment
|
||||
- [ ] Save subtitle preferences
|
||||
|
||||
---
|
||||
|
||||
## Phase 6: Advanced Playback Features
|
||||
|
||||
### Commit 14: Add playback speed control
|
||||
**Priority:** MEDIUM
|
||||
- [ ] Speed control widget (0.25x - 2x)
|
||||
- [ ] Keyboard shortcuts (+/- for speed)
|
||||
- [ ] Maintain pitch correction option
|
||||
- [ ] Display current speed in UI
|
||||
|
||||
### Commit 15: Implement A-B loop functionality
|
||||
**Priority:** MEDIUM
|
||||
- [ ] Set loop start point (A)
|
||||
- [ ] Set loop end point (B)
|
||||
- [ ] Enable/disable loop mode
|
||||
- [ ] Visual indicators on timeline
|
||||
- [ ] Keyboard shortcuts (A, B, L keys)
|
||||
|
||||
### Commit 16: Add screenshot capture
|
||||
**Priority:** MEDIUM
|
||||
- [ ] Capture current frame as PNG
|
||||
- [ ] File save dialog
|
||||
- [ ] Keyboard shortcut (S or F12)
|
||||
- [ ] Show success notification
|
||||
- [ ] Filename with timestamp
|
||||
|
||||
---
|
||||
|
||||
## Phase 7: Multiple Audio/Video Tracks
|
||||
|
||||
### Commit 17: Add audio track detection
|
||||
**Priority:** MEDIUM
|
||||
- [ ] Detect all audio streams in video
|
||||
- [ ] Store audio track metadata (language, codec)
|
||||
- [ ] Create audio track selection menu
|
||||
|
||||
### Commit 18: Implement audio track switching
|
||||
**Priority:** MEDIUM
|
||||
- [ ] Switch audio track during playback
|
||||
- [ ] Remember selected track per video
|
||||
- [ ] Keyboard shortcut for cycling tracks
|
||||
|
||||
### Commit 19: Add video track selection (for multi-angle)
|
||||
**Priority:** LOW
|
||||
- [ ] Detect multiple video streams
|
||||
- [ ] Video track selection UI
|
||||
- [ ] Switch video tracks
|
||||
|
||||
---
|
||||
|
||||
## Phase 8: Chapter Support (VideoTools Integration)
|
||||
|
||||
### Commit 20: Add chapter detection
|
||||
**Priority:** MEDIUM (Required for VideoTools integration)
|
||||
- [ ] Extend probeVideo() to detect chapters
|
||||
- [ ] Parse chapter metadata (title, timestamp)
|
||||
- [ ] Store chapter information in videoSource
|
||||
|
||||
### Commit 21: Create chapter navigation UI
|
||||
**Priority:** MEDIUM
|
||||
- [ ] Chapter list widget/menu
|
||||
- [ ] Chapter markers on timeline
|
||||
- [ ] Click chapter to jump
|
||||
- [ ] Display current chapter
|
||||
|
||||
### Commit 22: Add chapter navigation controls
|
||||
**Priority:** MEDIUM
|
||||
- [ ] Previous chapter button
|
||||
- [ ] Next chapter button
|
||||
- [ ] Keyboard shortcuts (PgUp/PgDn)
|
||||
- [ ] Chapter information overlay
|
||||
|
||||
---
|
||||
|
||||
## Phase 9: Enhanced UI/UX
|
||||
|
||||
### Commit 23: Add fullscreen mode
|
||||
**Priority:** MEDIUM
|
||||
- [ ] Fullscreen toggle (F11 or double-click)
|
||||
- [ ] Auto-hide controls after 3 seconds
|
||||
- [ ] Mouse movement shows controls
|
||||
- [ ] Exit fullscreen (Escape or F11)
|
||||
|
||||
### Commit 24: Implement aspect ratio controls
|
||||
**Priority:** MEDIUM
|
||||
- [ ] Detect source aspect ratio
|
||||
- [ ] Aspect ratio menu (Auto, 16:9, 4:3, 21:9, etc.)
|
||||
- [ ] Crop/letterbox options
|
||||
- [ ] Remember preference per video
|
||||
|
||||
### Commit 25: Add video information overlay
|
||||
**Priority:** LOW
|
||||
- [ ] Show codec, resolution, bitrate
|
||||
- [ ] Show current frame number
|
||||
- [ ] Show keyframe indicator
|
||||
- [ ] Toggle with keyboard (I key)
|
||||
|
||||
### Commit 26: Create settings dialog
|
||||
**Priority:** MEDIUM
|
||||
- [ ] Hardware acceleration toggle
|
||||
- [ ] Default volume setting
|
||||
- [ ] Cache size limit
|
||||
- [ ] Screenshot save location
|
||||
- [ ] Keyboard shortcut configuration
|
||||
|
||||
---
|
||||
|
||||
## Phase 10: Performance & Polish
|
||||
|
||||
### Commit 27: Optimize keyframe detection caching
|
||||
**Priority:** MEDIUM
|
||||
- [ ] Implement persistent disk cache
|
||||
- [ ] Cache invalidation on file modification
|
||||
- [ ] Limit cache size (50MB default)
|
||||
- [ ] Cache cleanup on startup
|
||||
|
||||
### Commit 28: Add keyboard shortcuts help
|
||||
**Priority:** LOW
|
||||
- [ ] Create shortcuts overlay (? or F1)
|
||||
- [ ] List all shortcuts
|
||||
- [ ] Searchable/filterable
|
||||
- [ ] Printable reference
|
||||
|
||||
### Commit 29: Implement recent files list
|
||||
**Priority:** LOW
|
||||
- [ ] Track recently opened files
|
||||
- [ ] Recent files menu
|
||||
- [ ] Limit to 10 most recent
|
||||
- [ ] Clear recent files option
|
||||
|
||||
### Commit 30: Add drag-and-drop enhancements
|
||||
**Priority:** LOW
|
||||
- [ ] Visual drop zone highlight
|
||||
- [ ] Support for subtitle file drops
|
||||
- [ ] Support for playlist file drops (M3U, etc.)
|
||||
- [ ] Feedback during drop operation
|
||||
|
||||
---
|
||||
|
||||
## Summary
|
||||
|
||||
**Total Commits Planned:** 30
|
||||
**Completed:** 2
|
||||
**In Progress:** 0
|
||||
**Remaining:** 28
|
||||
|
||||
**Priority Breakdown:**
|
||||
- HIGH: 11 features (Core frame-accurate playback)
|
||||
- MEDIUM: 14 features (Extended functionality)
|
||||
- LOW: 5 features (Polish and convenience)
|
||||
|
||||
**Estimated Timeline:**
|
||||
- Phase 2-4 (Frame-accurate + Cut): ~2-3 weeks (Priority features)
|
||||
- Phase 5-8 (Subtitles, Tracks, Chapters): ~2-3 weeks
|
||||
- Phase 9-10 (Polish): ~1 week
|
||||
|
||||
**Dependencies:**
|
||||
- Chapters (Commit 20-22) must be compatible with VideoTools format
|
||||
- Keyframe detection (Commit 3) is required before timeline (Commit 6)
|
||||
- Timeline (Commit 6-7) is required before cut markers (Commit 8)
|
||||
95
docs/ICONS_NEEDED.md
Normal file
95
docs/ICONS_NEEDED.md
Normal file
|
|
@ -0,0 +1,95 @@
|
|||
# VT_Player Icon Specifications
|
||||
|
||||
All icons should be SVG format, ideally 24x24px base size for UI consistency.
|
||||
|
||||
## Playback Controls (Priority 1)
|
||||
- `play.svg` - Play button (triangle pointing right)
|
||||
- `pause.svg` - Pause button (two vertical bars)
|
||||
- `stop.svg` - Stop button (square)
|
||||
- `previous.svg` - Previous track (skip backward)
|
||||
- `next.svg` - Next track (skip forward)
|
||||
- `rewind.svg` - Rewind/seek backward
|
||||
- `fast-forward.svg` - Fast forward/seek forward
|
||||
|
||||
## Frame Navigation (Priority 1 - Frame-Accurate Playback)
|
||||
- `frame-previous.svg` - Previous frame (|◄ single step back)
|
||||
- `frame-next.svg` - Next frame (►| single step forward)
|
||||
- `keyframe-previous.svg` - Previous keyframe (||◄◄ double chevron back)
|
||||
- `keyframe-next.svg` - Next keyframe (►►|| double chevron forward)
|
||||
|
||||
## Volume Controls (Priority 1)
|
||||
- `volume-high.svg` - Speaker with waves (70-100% volume)
|
||||
- `volume-medium.svg` - Speaker with fewer waves (30-69% volume)
|
||||
- `volume-low.svg` - Speaker with minimal waves (1-29% volume)
|
||||
- `volume-muted.svg` - Speaker with X (0% volume/muted)
|
||||
|
||||
## Playlist Management (Priority 1)
|
||||
- `playlist.svg` - Hamburger menu / list icon (☰)
|
||||
- `playlist-add.svg` - Plus icon or list with +
|
||||
- `playlist-remove.svg` - Minus icon or list with -
|
||||
- `playlist-clear.svg` - List with X or trash can
|
||||
|
||||
## Cut/Edit Tools (Priority 1 - LosslessCut features)
|
||||
- `marker-in.svg` - In-point marker ([ or scissors open left)
|
||||
- `marker-out.svg` - Out-point marker (] or scissors open right)
|
||||
- `cut.svg` - Cut/scissors icon
|
||||
- `export.svg` - Export/download arrow pointing down into tray
|
||||
- `clear-markers.svg` - Clear/X icon for removing markers
|
||||
|
||||
## File Operations (Priority 2)
|
||||
- `open-file.svg` - Folder with document or open folder
|
||||
- `open-folder.svg` - Folder icon
|
||||
- `save.svg` - Floppy disk icon
|
||||
- `screenshot.svg` - Camera or rectangle with corners
|
||||
|
||||
## View/Display (Priority 2)
|
||||
- `fullscreen.svg` - Arrows pointing to corners (expand)
|
||||
- `fullscreen-exit.svg` - Arrows pointing inward (contract)
|
||||
- `aspect-ratio.svg` - Rectangle with resize handles
|
||||
- `subtitles.svg` - Speech bubble or "CC" text
|
||||
- `chapters.svg` - Book chapters icon or list with dots
|
||||
|
||||
## Settings/Options (Priority 2)
|
||||
- `settings.svg` - Gear/cog icon
|
||||
- `audio-track.svg` - Waveform or music note
|
||||
- `video-track.svg` - Film strip or play button in rectangle
|
||||
- `speed.svg` - Speedometer or "1x" with arrows
|
||||
- `loop.svg` - Circular arrows (loop/repeat)
|
||||
- `shuffle.svg` - Crossed arrows (shuffle/random)
|
||||
|
||||
## Navigation/UI (Priority 3)
|
||||
- `back.svg` - Left arrow (go back)
|
||||
- `forward.svg` - Right arrow (go forward)
|
||||
- `up.svg` - Up arrow
|
||||
- `down.svg` - Down arrow
|
||||
- `close.svg` - X icon
|
||||
- `minimize.svg` - Horizontal line
|
||||
- `maximize.svg` - Square/window icon
|
||||
|
||||
## Status Indicators (Priority 3)
|
||||
- `info.svg` - Information "i" in circle
|
||||
- `warning.svg` - Triangle with exclamation mark
|
||||
- `error.svg` - Circle with X or exclamation
|
||||
- `success.svg` - Checkmark in circle
|
||||
- `loading.svg` - Circular spinner or hourglass
|
||||
|
||||
## Application Icon
|
||||
- `VT_Icon.svg` - Main application icon (already exists?)
|
||||
|
||||
## Total Count
|
||||
Priority 1: 25 icons (core playback + frame-accurate features)
|
||||
Priority 2: 14 icons (extended features)
|
||||
Priority 3: 14 icons (UI/polish)
|
||||
**Total: 53 icons**
|
||||
|
||||
## Design Guidelines
|
||||
1. Use simple, recognizable shapes
|
||||
2. Maintain consistent stroke width (2px recommended)
|
||||
3. Use single color (white/light gray) for dark theme
|
||||
4. Ensure icons are recognizable at 16x16px minimum
|
||||
5. Export as optimized SVG (remove unnecessary metadata)
|
||||
6. Use standard icon conventions where possible
|
||||
|
||||
## Icon Storage
|
||||
Location: `/assets/icons/`
|
||||
Naming: Use lowercase with hyphens (e.g., `frame-next.svg`)
|
||||
197
docs/MATERIAL_ICONS_MAPPING.md
Normal file
197
docs/MATERIAL_ICONS_MAPPING.md
Normal file
|
|
@ -0,0 +1,197 @@
|
|||
# Material Icons Mapping for VT_Player
|
||||
|
||||
Using Google Material Icons for clean, professional UI.
|
||||
|
||||
## Icon Sources
|
||||
- **Material Symbols:** https://fonts.google.com/icons
|
||||
- **Format:** We'll use Material Symbols (variable font with fill/weight options)
|
||||
- **License:** Apache 2.0 (free for commercial use)
|
||||
|
||||
## Integration Methods
|
||||
|
||||
### Option 1: Unicode Characters (Simplest)
|
||||
Use Material Icons font and insert unicode characters directly in Go strings.
|
||||
|
||||
### Option 2: SVG Downloads (Recommended)
|
||||
Download SVG files from Google Fonts and bundle with app.
|
||||
|
||||
### Option 3: Icon Font (Best for scaling)
|
||||
Use Material Symbols variable font with Fyne's text rendering.
|
||||
|
||||
## Icon Mappings (Material Symbols Names)
|
||||
|
||||
### Playback Controls
|
||||
| Function | Material Icon | Unicode | Ligature |
|
||||
|----------|---------------|---------|----------|
|
||||
| Play | `play_arrow` | U+E037 | play_arrow |
|
||||
| Pause | `pause` | U+E034 | pause |
|
||||
| Stop | `stop` | U+E047 | stop |
|
||||
| Previous | `skip_previous` | U+E045 | skip_previous |
|
||||
| Next | `skip_next` | U+E044 | skip_next |
|
||||
| Rewind | `fast_rewind` | U+E020 | fast_rewind |
|
||||
| Fast Forward | `fast_forward` | U+E01F | fast_forward |
|
||||
|
||||
### Frame Navigation (Frame-Accurate Mode)
|
||||
| Function | Material Icon | Unicode | Notes |
|
||||
|----------|---------------|---------|-------|
|
||||
| Frame Previous | `navigate_before` | U+E408 | Or `chevron_left` |
|
||||
| Frame Next | `navigate_next` | U+E409 | Or `chevron_right` |
|
||||
| Keyframe Previous | `first_page` | U+E5DC | Double chevron left |
|
||||
| Keyframe Next | `last_page` | U+E5DD | Double chevron right |
|
||||
|
||||
### Volume Controls
|
||||
| Function | Material Icon | Unicode | Ligature |
|
||||
|----------|---------------|---------|----------|
|
||||
| Volume High | `volume_up` | U+E050 | volume_up |
|
||||
| Volume Medium | `volume_down` | U+E04D | volume_down |
|
||||
| Volume Low | `volume_mute` | U+E04E | volume_mute |
|
||||
| Volume Muted | `volume_off` | U+E04F | volume_off |
|
||||
|
||||
### Playlist Management
|
||||
| Function | Material Icon | Unicode | Ligature |
|
||||
|----------|---------------|---------|----------|
|
||||
| Playlist/Menu | `menu` | U+E5D2 | menu |
|
||||
| Add to Playlist | `playlist_add` | U+E03B | playlist_add |
|
||||
| Remove from Playlist | `playlist_remove` | U+E958 | playlist_remove |
|
||||
| Clear Playlist | `clear_all` | U+E0B8 | clear_all |
|
||||
| Playlist Play | `playlist_play` | U+E05F | playlist_play |
|
||||
|
||||
### Cut/Edit Tools
|
||||
| Function | Material Icon | Unicode | Ligature |
|
||||
|----------|---------------|---------|----------|
|
||||
| Set In Point | `first_page` | U+E5DC | Or `start` |
|
||||
| Set Out Point | `last_page` | U+E5DD | Or `end` |
|
||||
| Cut/Scissors | `content_cut` | U+E14E | content_cut |
|
||||
| Export | `file_download` | U+E2C4 | file_download |
|
||||
| Clear Markers | `clear` | U+E14C | clear |
|
||||
|
||||
### File Operations
|
||||
| Function | Material Icon | Unicode | Ligature |
|
||||
|----------|---------------|---------|----------|
|
||||
| Open File | `folder_open` | U+E2C8 | folder_open |
|
||||
| Open Folder | `folder` | U+E2C7 | folder |
|
||||
| Save | `save` | U+E161 | save |
|
||||
| Screenshot | `photo_camera` | U+E412 | photo_camera |
|
||||
|
||||
### View/Display
|
||||
| Function | Material Icon | Unicode | Ligature |
|
||||
|----------|---------------|---------|----------|
|
||||
| Fullscreen | `fullscreen` | U+E5D0 | fullscreen |
|
||||
| Fullscreen Exit | `fullscreen_exit` | U+E5D1 | fullscreen_exit |
|
||||
| Aspect Ratio | `aspect_ratio` | U+E85B | aspect_ratio |
|
||||
| Subtitles | `closed_caption` | U+E01C | closed_caption |
|
||||
| Chapters | `list` | U+E896 | list |
|
||||
|
||||
### Settings/Options
|
||||
| Function | Material Icon | Unicode | Ligature |
|
||||
|----------|---------------|---------|----------|
|
||||
| Settings | `settings` | U+E8B8 | settings |
|
||||
| Audio Track | `audiotrack` | U+E3A1 | audiotrack |
|
||||
| Video Track | `videocam` | U+E04B | videocam |
|
||||
| Speed | `speed` | U+E9E4 | speed |
|
||||
| Loop | `repeat` | U+E040 | repeat |
|
||||
| Loop One | `repeat_one` | U+E041 | repeat_one |
|
||||
|
||||
### Navigation/UI
|
||||
| Function | Material Icon | Unicode | Ligature |
|
||||
|----------|---------------|---------|----------|
|
||||
| Back | `arrow_back` | U+E5C4 | arrow_back |
|
||||
| Forward | `arrow_forward` | U+E5C8 | arrow_forward |
|
||||
| Up | `arrow_upward` | U+E5D8 | arrow_upward |
|
||||
| Down | `arrow_downward` | U+E5DB | arrow_downward |
|
||||
| Close | `close` | U+E5CD | close |
|
||||
| More Options | `more_vert` | U+E5D4 | more_vert |
|
||||
|
||||
### Status Indicators
|
||||
| Function | Material Icon | Unicode | Ligature |
|
||||
|----------|---------------|---------|----------|
|
||||
| Info | `info` | U+E88E | info |
|
||||
| Warning | `warning` | U+E002 | warning |
|
||||
| Error | `error` | U+E000 | error |
|
||||
| Success | `check_circle` | U+E86C | check_circle |
|
||||
| Loading | `hourglass_empty` | U+E88B | hourglass_empty |
|
||||
|
||||
## Implementation Plan
|
||||
|
||||
### Phase 1: Font Integration
|
||||
1. Download Material Symbols font from Google Fonts
|
||||
2. Bundle font file in `assets/fonts/MaterialSymbols.ttf`
|
||||
3. Load font in Fyne application startup
|
||||
4. Create helper functions for icon rendering
|
||||
|
||||
### Phase 2: Icon Helper Package
|
||||
Create `internal/ui/icons.go`:
|
||||
```go
|
||||
package ui
|
||||
|
||||
import (
|
||||
"fyne.io/fyne/v2"
|
||||
"fyne.io/fyne/v2/canvas"
|
||||
)
|
||||
|
||||
// Material icon unicode constants
|
||||
const (
|
||||
IconPlayArrow = "\ue037"
|
||||
IconPause = "\ue034"
|
||||
IconStop = "\ue047"
|
||||
IconSkipPrevious = "\ue045"
|
||||
IconSkipNext = "\ue044"
|
||||
IconMenu = "\ue5d2"
|
||||
IconVolumeUp = "\ue050"
|
||||
IconVolumeOff = "\ue04f"
|
||||
// ... more icons
|
||||
)
|
||||
|
||||
// NewIconText creates a text widget with Material Icon
|
||||
func NewIconText(icon string, size float32) *canvas.Text {
|
||||
text := canvas.NewText(icon, color.White)
|
||||
text.TextSize = size
|
||||
text.TextStyle = fyne.TextStyle{Monospace: true}
|
||||
return text
|
||||
}
|
||||
|
||||
// NewIconButton creates a button with Material Icon
|
||||
func NewIconButton(icon string, tooltip string, tapped func()) *widget.Button {
|
||||
btn := widget.NewButton(icon, tapped)
|
||||
btn.Importance = widget.LowImportance
|
||||
return btn
|
||||
}
|
||||
```
|
||||
|
||||
### Phase 3: Replace Current Icons
|
||||
Update all emoji-based icons with Material Icons:
|
||||
- Play/Pause: ▶/⏸ → play_arrow/pause
|
||||
- Previous/Next: ⏮/⏭ → skip_previous/skip_next
|
||||
- Volume: 🔊/🔇 → volume_up/volume_off
|
||||
- Menu: ☰ → menu
|
||||
|
||||
## Download Instructions
|
||||
|
||||
### Material Symbols Font
|
||||
1. Go to: https://fonts.google.com/icons
|
||||
2. Select "Material Symbols Rounded" (recommended for modern look)
|
||||
3. Click "Download all" or select specific icons
|
||||
4. Extract font file: MaterialSymbolsRounded-VariableFont.ttf
|
||||
|
||||
### Individual SVG Icons (Alternative)
|
||||
1. Browse icons at https://fonts.google.com/icons
|
||||
2. Click icon → Download SVG
|
||||
3. Save to `assets/icons/[icon-name].svg`
|
||||
|
||||
## Advantages of Material Icons
|
||||
|
||||
✅ **Consistent Design**: All icons follow same design language
|
||||
✅ **Professional**: Industry-standard, used by Google/Android
|
||||
✅ **Comprehensive**: 2500+ icons cover all use cases
|
||||
✅ **Free**: Apache 2.0 license (no attribution required)
|
||||
✅ **Scalable**: Vector format scales to any size
|
||||
✅ **Variable**: Can adjust weight, fill, optical size
|
||||
✅ **Accessible**: Widely recognized symbols
|
||||
|
||||
## Next Steps
|
||||
|
||||
1. Download Material Symbols font
|
||||
2. Create icon helper package
|
||||
3. Update all buttons to use Material Icons
|
||||
4. Test rendering on Linux (Fyne + GTK)
|
||||
5. Add icon customization (size, color themes)
|
||||
138
internal/ui/icons.go
Normal file
138
internal/ui/icons.go
Normal file
|
|
@ -0,0 +1,138 @@
|
|||
package ui
|
||||
|
||||
import (
|
||||
"image/color"
|
||||
|
||||
"fyne.io/fyne/v2"
|
||||
"fyne.io/fyne/v2/canvas"
|
||||
"fyne.io/fyne/v2/widget"
|
||||
)
|
||||
|
||||
// Material Icons unicode constants
|
||||
// Using Material Symbols from Google Fonts
|
||||
// https://fonts.google.com/icons
|
||||
const (
|
||||
// Playback controls
|
||||
IconPlayArrow = "\ue037" // play_arrow
|
||||
IconPause = "\ue034" // pause
|
||||
IconStop = "\ue047" // stop
|
||||
IconSkipPrevious = "\ue045" // skip_previous
|
||||
IconSkipNext = "\ue044" // skip_next
|
||||
IconFastRewind = "\ue020" // fast_rewind
|
||||
IconFastForward = "\ue01f" // fast_forward
|
||||
|
||||
// Frame navigation (for frame-accurate mode)
|
||||
IconFramePrevious = "\ue408" // navigate_before / chevron_left
|
||||
IconFrameNext = "\ue409" // navigate_next / chevron_right
|
||||
IconKeyframePrevious = "\ue5dc" // first_page (double chevron left)
|
||||
IconKeyframeNext = "\ue5dd" // last_page (double chevron right)
|
||||
|
||||
// Volume controls
|
||||
IconVolumeUp = "\ue050" // volume_up
|
||||
IconVolumeDown = "\ue04d" // volume_down
|
||||
IconVolumeMute = "\ue04e" // volume_mute
|
||||
IconVolumeOff = "\ue04f" // volume_off
|
||||
|
||||
// Playlist management
|
||||
IconMenu = "\ue5d2" // menu (hamburger)
|
||||
IconPlaylistAdd = "\ue03b" // playlist_add
|
||||
IconPlaylistRemove = "\ue958" // playlist_remove
|
||||
IconClearAll = "\ue0b8" // clear_all
|
||||
IconPlaylistPlay = "\ue05f" // playlist_play
|
||||
|
||||
// Cut/edit tools
|
||||
IconContentCut = "\ue14e" // content_cut (scissors)
|
||||
IconFileDownload = "\ue2c4" // file_download (export)
|
||||
IconClear = "\ue14c" // clear
|
||||
|
||||
// File operations
|
||||
IconFolderOpen = "\ue2c8" // folder_open
|
||||
IconFolder = "\ue2c7" // folder
|
||||
IconSave = "\ue161" // save
|
||||
IconPhotoCamera = "\ue412" // photo_camera (screenshot)
|
||||
|
||||
// View/display
|
||||
IconFullscreen = "\ue5d0" // fullscreen
|
||||
IconFullscreenExit = "\ue5d1" // fullscreen_exit
|
||||
IconAspectRatio = "\ue85b" // aspect_ratio
|
||||
IconClosedCaption = "\ue01c" // closed_caption (subtitles)
|
||||
IconList = "\ue896" // list (chapters)
|
||||
|
||||
// Settings/options
|
||||
IconSettings = "\ue8b8" // settings
|
||||
IconAudiotrack = "\ue3a1" // audiotrack
|
||||
IconVideocam = "\ue04b" // videocam
|
||||
IconSpeed = "\ue9e4" // speed
|
||||
IconRepeat = "\ue040" // repeat (loop)
|
||||
IconRepeatOne = "\ue041" // repeat_one
|
||||
|
||||
// Navigation/UI
|
||||
IconArrowBack = "\ue5c4" // arrow_back
|
||||
IconArrowForward = "\ue5c8" // arrow_forward
|
||||
IconArrowUpward = "\ue5d8" // arrow_upward
|
||||
IconArrowDown = "\ue5db" // arrow_downward
|
||||
IconClose = "\ue5cd" // close
|
||||
IconMoreVert = "\ue5d4" // more_vert (3 dots vertical)
|
||||
|
||||
// Status indicators
|
||||
IconInfo = "\ue88e" // info
|
||||
IconWarning = "\ue002" // warning
|
||||
IconError = "\ue000" // error
|
||||
IconCheckCircle = "\ue86c" // check_circle (success)
|
||||
IconHourglass = "\ue88b" // hourglass_empty (loading)
|
||||
)
|
||||
|
||||
// NewIconText creates a canvas.Text widget with a Material Icon
|
||||
// The icon parameter should be one of the Icon* constants above
|
||||
// Size is the font size in points (e.g., 20, 24, 32)
|
||||
func NewIconText(icon string, size float32, col color.Color) *canvas.Text {
|
||||
text := canvas.NewText(icon, col)
|
||||
text.TextSize = size
|
||||
text.TextStyle = fyne.TextStyle{Monospace: true}
|
||||
return text
|
||||
}
|
||||
|
||||
// NewIconButton creates a button with a Material Icon
|
||||
// Uses the same signature as utils.MakeIconButton for easy replacement
|
||||
func NewIconButton(icon, tooltip string, tapped func()) *widget.Button {
|
||||
btn := widget.NewButton(icon, tapped)
|
||||
btn.Importance = widget.LowImportance
|
||||
return btn
|
||||
}
|
||||
|
||||
// IconButtonWithStyle creates a button with custom styling
|
||||
func IconButtonWithStyle(icon, tooltip string, importance widget.ButtonImportance, tapped func()) *widget.Button {
|
||||
btn := widget.NewButton(icon, tapped)
|
||||
btn.Importance = importance
|
||||
return btn
|
||||
}
|
||||
|
||||
// GetPlayPauseIcon returns the appropriate icon based on paused state
|
||||
func GetPlayPauseIcon(isPaused bool) string {
|
||||
if isPaused {
|
||||
return IconPlayArrow
|
||||
}
|
||||
return IconPause
|
||||
}
|
||||
|
||||
// GetVolumeIcon returns the appropriate volume icon based on volume level
|
||||
func GetVolumeIcon(volume float64, muted bool) string {
|
||||
if muted || volume == 0 {
|
||||
return IconVolumeOff
|
||||
}
|
||||
if volume < 30 {
|
||||
return IconVolumeMute
|
||||
}
|
||||
if volume < 70 {
|
||||
return IconVolumeDown
|
||||
}
|
||||
return IconVolumeUp
|
||||
}
|
||||
|
||||
// MaterialIconsAvailable checks if Material Icons font is loaded
|
||||
// This can be extended to actually check font availability
|
||||
func MaterialIconsAvailable() bool {
|
||||
// For now, return true - icons will render as unicode
|
||||
// Later: check if Material Symbols font is loaded
|
||||
return true
|
||||
}
|
||||
237
main.go
237
main.go
|
|
@ -197,6 +197,7 @@ type appState struct {
|
|||
queueOffset fyne.Position
|
||||
compareFile1 *videoSource
|
||||
compareFile2 *videoSource
|
||||
keyframingMode bool // Toggle for frame-accurate editing features
|
||||
}
|
||||
|
||||
func (s *appState) stopPreview() {
|
||||
|
|
@ -558,60 +559,70 @@ func (s *appState) showPlayerView() {
|
|||
s.stopCompareSessions()
|
||||
s.active = "player"
|
||||
|
||||
header := widget.NewLabelWithStyle("VT Player", fyne.TextAlignLeading, fyne.TextStyle{Bold: true})
|
||||
|
||||
// Helper to refresh the view after selection/loads.
|
||||
refresh := func() {
|
||||
s.showPlayerView()
|
||||
}
|
||||
|
||||
openFile := widget.NewButton("Open File…", func() {
|
||||
dlg := dialog.NewFileOpen(func(r fyne.URIReadCloser, err error) {
|
||||
if err != nil || r == nil {
|
||||
return
|
||||
}
|
||||
path := r.URI().Path()
|
||||
r.Close()
|
||||
go s.loadVideo(path)
|
||||
}, s.window)
|
||||
dlg.Resize(fyne.NewSize(700, 480))
|
||||
dlg.Show()
|
||||
})
|
||||
// Create menu bar
|
||||
fileMenu := fyne.NewMenu("File",
|
||||
fyne.NewMenuItem("Open File…", func() {
|
||||
dlg := dialog.NewFileOpen(func(r fyne.URIReadCloser, err error) {
|
||||
if err != nil || r == nil {
|
||||
return
|
||||
}
|
||||
path := r.URI().Path()
|
||||
r.Close()
|
||||
go s.loadVideo(path)
|
||||
}, s.window)
|
||||
dlg.Resize(fyne.NewSize(700, 480))
|
||||
dlg.Show()
|
||||
}),
|
||||
fyne.NewMenuItem("Open Folder…", func() {
|
||||
dlg := dialog.NewFolderOpen(func(l fyne.ListableURI, err error) {
|
||||
if err != nil || l == nil {
|
||||
return
|
||||
}
|
||||
paths := s.findVideoFiles(l.Path())
|
||||
if len(paths) == 0 {
|
||||
return
|
||||
}
|
||||
go s.loadVideos(paths)
|
||||
}, s.window)
|
||||
dlg.Resize(fyne.NewSize(700, 480))
|
||||
dlg.Show()
|
||||
}),
|
||||
fyne.NewMenuItemSeparator(),
|
||||
fyne.NewMenuItem("Clear Playlist", func() {
|
||||
s.clearVideo()
|
||||
refresh()
|
||||
}),
|
||||
)
|
||||
|
||||
addFolder := widget.NewButton("Add Folder…", func() {
|
||||
dlg := dialog.NewFolderOpen(func(l fyne.ListableURI, err error) {
|
||||
if err != nil || l == nil {
|
||||
return
|
||||
}
|
||||
paths := s.findVideoFiles(l.Path())
|
||||
if len(paths) == 0 {
|
||||
return
|
||||
}
|
||||
go s.loadVideos(paths)
|
||||
}, s.window)
|
||||
dlg.Resize(fyne.NewSize(700, 480))
|
||||
dlg.Show()
|
||||
})
|
||||
viewMenu := fyne.NewMenu("View",
|
||||
fyne.NewMenuItem("Playlist", func() {
|
||||
// Will be implemented with playlist toggle
|
||||
}),
|
||||
)
|
||||
|
||||
clearList := widget.NewButton("Clear Playlist", func() {
|
||||
s.clearVideo()
|
||||
if len(s.loadedVideos) >= 2 {
|
||||
viewMenu.Items = append(viewMenu.Items, fyne.NewMenuItem("Compare Videos", func() {
|
||||
s.showCompareView()
|
||||
}))
|
||||
}
|
||||
|
||||
toolsMenu := fyne.NewMenu("Tools")
|
||||
|
||||
// Keyframing mode toggle
|
||||
keyframeModeItem := fyne.NewMenuItem("Frame-Accurate Mode", func() {
|
||||
s.keyframingMode = !s.keyframingMode
|
||||
refresh()
|
||||
})
|
||||
clearList.Importance = widget.LowImportance
|
||||
keyframeModeItem.Checked = s.keyframingMode
|
||||
toolsMenu.Items = append(toolsMenu.Items, keyframeModeItem)
|
||||
|
||||
var compareBtn *widget.Button
|
||||
if len(s.loadedVideos) >= 2 {
|
||||
compareBtn = widget.NewButton("Compare View", func() {
|
||||
s.showCompareView()
|
||||
})
|
||||
}
|
||||
|
||||
barItems := []fyne.CanvasObject{openFile, addFolder, clearList}
|
||||
if compareBtn != nil {
|
||||
barItems = append(barItems, compareBtn)
|
||||
}
|
||||
barItems = append(barItems, layout.NewSpacer())
|
||||
controlsBar := container.NewHBox(barItems...)
|
||||
mainMenu := fyne.NewMainMenu(fileMenu, viewMenu, toolsMenu)
|
||||
s.window.SetMainMenu(mainMenu)
|
||||
|
||||
// Player area
|
||||
var playerArea fyne.CanvasObject
|
||||
|
|
@ -662,7 +673,24 @@ func (s *appState) showPlayerView() {
|
|||
|
||||
playerArea = container.NewMax(bg, container.NewCenter(centerStack))
|
||||
} else {
|
||||
// Playlist panel (only when we have media loaded)
|
||||
src := s.source
|
||||
|
||||
// Image surface
|
||||
stageBG := canvas.NewRectangle(utils.MustHex("#0F1529"))
|
||||
stageBG.SetMinSize(fyne.NewSize(960, 540))
|
||||
videoImg := canvas.NewImageFromResource(nil)
|
||||
videoImg.FillMode = canvas.ImageFillContain
|
||||
|
||||
// Load initial preview frame if available
|
||||
if s.currentFrame != "" {
|
||||
if img, err := fyne.LoadResourceFromPath(s.currentFrame); err == nil {
|
||||
videoImg.Resource = img
|
||||
}
|
||||
}
|
||||
|
||||
stage := container.NewMax(stageBG, videoImg)
|
||||
|
||||
// Playlist panel (only when we have media loaded) - now on the right
|
||||
playlist := widget.NewList(
|
||||
func() int { return len(s.loadedVideos) },
|
||||
func() fyne.CanvasObject { return widget.NewLabel("item") },
|
||||
|
|
@ -680,19 +708,23 @@ func (s *appState) showPlayerView() {
|
|||
if len(s.loadedVideos) > 0 && s.currentIndex < len(s.loadedVideos) {
|
||||
playlist.Select(s.currentIndex)
|
||||
}
|
||||
playlistPanel := container.NewBorder(
|
||||
|
||||
// Playlist with toggle visibility
|
||||
playlistContainer := container.NewBorder(
|
||||
widget.NewLabelWithStyle("Playlist", fyne.TextAlignLeading, fyne.TextStyle{Bold: true}),
|
||||
nil, nil, nil,
|
||||
playlist,
|
||||
)
|
||||
playlistContainer.Resize(fyne.NewSize(250, 540))
|
||||
|
||||
src := s.source
|
||||
// Image surface
|
||||
stageBG := canvas.NewRectangle(utils.MustHex("#0F1529"))
|
||||
stageBG.SetMinSize(fyne.NewSize(960, 540))
|
||||
videoImg := canvas.NewImageFromResource(nil)
|
||||
videoImg.FillMode = canvas.ImageFillContain
|
||||
stage := container.NewMax(stageBG, videoImg)
|
||||
var playlistVisible bool = len(s.loadedVideos) > 1
|
||||
var mainContent *fyne.Container
|
||||
|
||||
if playlistVisible {
|
||||
mainContent = container.NewBorder(nil, nil, nil, playlistContainer, container.NewPadded(stage))
|
||||
} else {
|
||||
mainContent = container.NewPadded(stage)
|
||||
}
|
||||
|
||||
currentTime := widget.NewLabel("0:00")
|
||||
totalTime := widget.NewLabel(src.DurationString())
|
||||
|
|
@ -730,28 +762,31 @@ func (s *appState) showPlayerView() {
|
|||
}
|
||||
}
|
||||
|
||||
playBtn := utils.MakeIconButton("▶/⏸", "Play/Pause", func() {
|
||||
var playBtn *widget.Button
|
||||
playBtn = ui.NewIconButton(ui.IconPlayArrow, "Play/Pause", func() {
|
||||
if !ensureSession() {
|
||||
return
|
||||
}
|
||||
if s.playerPaused {
|
||||
s.playSess.Play()
|
||||
s.playerPaused = false
|
||||
playBtn.SetText(ui.IconPause)
|
||||
} else {
|
||||
s.playSess.Pause()
|
||||
s.playerPaused = true
|
||||
playBtn.SetText(ui.IconPlayArrow)
|
||||
}
|
||||
})
|
||||
|
||||
prevBtn := utils.MakeIconButton("⏮", "Previous", func() {
|
||||
prevBtn := ui.NewIconButton(ui.IconSkipPrevious, "Previous", func() {
|
||||
s.prevVideo()
|
||||
})
|
||||
nextBtn := utils.MakeIconButton("⏭", "Next", func() {
|
||||
nextBtn := ui.NewIconButton(ui.IconSkipNext, "Next", func() {
|
||||
s.nextVideo()
|
||||
})
|
||||
|
||||
var volIcon *widget.Button
|
||||
volIcon = utils.MakeIconButton("🔊", "Mute/Unmute", func() {
|
||||
volIcon = ui.NewIconButton(ui.IconVolumeUp, "Mute/Unmute", func() {
|
||||
if !ensureSession() {
|
||||
return
|
||||
}
|
||||
|
|
@ -769,11 +804,7 @@ func (s *appState) showPlayerView() {
|
|||
s.playerMuted = true
|
||||
s.playSess.SetVolume(0)
|
||||
}
|
||||
if s.playerMuted || s.playerVolume <= 0 {
|
||||
volIcon.SetText("🔇")
|
||||
} else {
|
||||
volIcon.SetText("🔊")
|
||||
}
|
||||
volIcon.SetText(ui.GetVolumeIcon(s.playerVolume, s.playerMuted))
|
||||
})
|
||||
|
||||
volSlider := widget.NewSlider(0, 100)
|
||||
|
|
@ -790,32 +821,48 @@ func (s *appState) showPlayerView() {
|
|||
if ensureSession() {
|
||||
s.playSess.SetVolume(val)
|
||||
}
|
||||
if s.playerMuted || s.playerVolume <= 0 {
|
||||
volIcon.SetText("🔇")
|
||||
} else {
|
||||
volIcon.SetText("🔊")
|
||||
}
|
||||
volIcon.SetText(ui.GetVolumeIcon(s.playerVolume, s.playerMuted))
|
||||
}
|
||||
|
||||
// Playlist toggle button
|
||||
playlistToggleBtn := ui.NewIconButton(ui.IconMenu, "Toggle Playlist", func() {
|
||||
playlistVisible = !playlistVisible
|
||||
if playlistVisible {
|
||||
mainContent.Objects = []fyne.CanvasObject{container.NewPadded(stage)}
|
||||
mainContent.Objects = []fyne.CanvasObject{}
|
||||
*mainContent = *container.NewBorder(nil, nil, nil, playlistContainer, container.NewPadded(stage))
|
||||
} else {
|
||||
mainContent.Objects = []fyne.CanvasObject{}
|
||||
*mainContent = *container.NewPadded(stage)
|
||||
}
|
||||
mainContent.Refresh()
|
||||
})
|
||||
|
||||
progressBar := container.NewBorder(nil, nil, currentTime, totalTime, container.NewMax(slider))
|
||||
controlRow := container.NewHBox(prevBtn, playBtn, nextBtn, layout.NewSpacer(), volIcon, container.NewMax(volSlider))
|
||||
volContainer := container.NewHBox(volIcon, container.NewMax(volSlider))
|
||||
volContainer.Resize(fyne.NewSize(150, 32))
|
||||
|
||||
// Center the playback controls
|
||||
playbackControls := container.NewHBox(prevBtn, playBtn, nextBtn)
|
||||
|
||||
// Create control row with centered playback controls
|
||||
controlRow := container.NewBorder(
|
||||
nil, nil,
|
||||
volContainer, // Volume on left
|
||||
container.NewHBox(playlistToggleBtn), // Playlist toggle on right
|
||||
container.NewCenter(playbackControls), // Playback controls centered
|
||||
)
|
||||
|
||||
playerArea = container.NewBorder(
|
||||
nil,
|
||||
container.NewVBox(container.NewPadded(progressBar), container.NewPadded(controlRow)),
|
||||
playlistPanel,
|
||||
nil,
|
||||
container.NewPadded(stage),
|
||||
nil,
|
||||
mainContent,
|
||||
)
|
||||
}
|
||||
|
||||
mainPanel := container.NewBorder(
|
||||
container.NewVBox(header, controlsBar, widget.NewSeparator()),
|
||||
nil,
|
||||
nil,
|
||||
nil,
|
||||
playerArea,
|
||||
)
|
||||
mainPanel := playerArea
|
||||
|
||||
s.setContent(mainPanel)
|
||||
}
|
||||
|
|
@ -3941,27 +3988,9 @@ func (s *appState) loadVideo(path string) {
|
|||
}
|
||||
if frames, err := capturePreviewFrames(src.Path, src.Duration); err == nil {
|
||||
src.PreviewFrames = frames
|
||||
if len(frames) > 0 {
|
||||
s.currentFrame = frames[0]
|
||||
}
|
||||
} else {
|
||||
logging.Debug(logging.CatFFMPEG, "preview generation failed: %v", err)
|
||||
s.currentFrame = ""
|
||||
}
|
||||
s.applyInverseDefaults(src)
|
||||
base := strings.TrimSuffix(src.DisplayName, filepath.Ext(src.DisplayName))
|
||||
s.convert.OutputBase = base + "-convert"
|
||||
// Use embedded cover art if present, otherwise clear
|
||||
if src.EmbeddedCoverArt != "" {
|
||||
s.convert.CoverArtPath = src.EmbeddedCoverArt
|
||||
logging.Debug(logging.CatFFMPEG, "using embedded cover art from video: %s", src.EmbeddedCoverArt)
|
||||
} else {
|
||||
s.convert.CoverArtPath = ""
|
||||
}
|
||||
s.convert.AspectHandling = "Auto"
|
||||
s.playerReady = false
|
||||
s.playerPos = 0
|
||||
s.playerPaused = true
|
||||
|
||||
// Maintain/extend loaded video list for navigation
|
||||
found := -1
|
||||
|
|
@ -3985,7 +4014,7 @@ func (s *appState) loadVideo(path string) {
|
|||
|
||||
logging.Debug(logging.CatModule, "video loaded %+v", src)
|
||||
fyne.CurrentApp().Driver().DoFromGoroutine(func() {
|
||||
s.showPlayerView()
|
||||
s.switchToVideo(s.currentIndex)
|
||||
}, false)
|
||||
}
|
||||
|
||||
|
|
@ -5239,17 +5268,27 @@ func probeVideo(path string) (*videoSource, error) {
|
|||
defer cancel()
|
||||
|
||||
cmd := exec.CommandContext(ctx, "ffprobe",
|
||||
"-v", "quiet",
|
||||
"-v", "error",
|
||||
"-print_format", "json",
|
||||
"-show_format",
|
||||
"-show_streams",
|
||||
path,
|
||||
)
|
||||
out, err := cmd.Output()
|
||||
var stdout, stderr bytes.Buffer
|
||||
cmd.Stdout = &stdout
|
||||
cmd.Stderr = &stderr
|
||||
|
||||
err := cmd.Run()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
// Include stderr output in error message for better diagnostics
|
||||
if stderrStr := strings.TrimSpace(stderr.String()); stderrStr != "" {
|
||||
return nil, fmt.Errorf("ffprobe failed: %s", stderrStr)
|
||||
}
|
||||
return nil, fmt.Errorf("ffprobe failed: %w", err)
|
||||
}
|
||||
|
||||
out := stdout.Bytes()
|
||||
|
||||
var result struct {
|
||||
Format struct {
|
||||
Filename string `json:"filename"`
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user