mirror
/
photoview
mirror of https://github.com/photoview/photoview.git
1
Fork 0
Code

Add ffmpeg worker and supported video formats

This commit is contained in:
viktorstrate 2020-07-09 15:07:39 +02:00
parent aafcd64c23
commit 7caad82059
4 changed files with 135 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/scanner/cache.go
View File

@ -7,14 +7,14 @@ import (
type AlbumScannerCache struct {
path_contains_photos map[string]bool
photo_types map[string]ImageType
photo_types map[string]MediaType
mutex sync.Mutex
}
func MakeAlbumCache() *AlbumScannerCache {
return &AlbumScannerCache{
path_contains_photos: make(map[string]bool),
photo_types: make(map[string]ImageType),
photo_types: make(map[string]MediaType),
}
}
@ -54,14 +54,14 @@ func (c *AlbumScannerCache) AlbumContainsPhotos(path string) *bool {
return nil
}
func (c *AlbumScannerCache) InsertPhotoType(path string, content_type ImageType) {
func (c *AlbumScannerCache) InsertPhotoType(path string, content_type MediaType) {
c.mutex.Lock()
defer c.mutex.Unlock()
(c.photo_types)[path] = content_type
}
func (c *AlbumScannerCache) GetPhotoType(path string) *ImageType {
func (c *AlbumScannerCache) GetPhotoType(path string) *MediaType {
c.mutex.Lock()
defer c.mutex.Unlock()

4
api/scanner/encode_photo.go
View File

@ -48,7 +48,7 @@ type EncodeImageData struct {
photo *models.Photo
_photoImage image.Image
_thumbnailImage image.Image
_contentType *ImageType
_contentType *MediaType
}
func EncodeImageJPEG(image image.Image, outputPath string, jpegQuality int) error {
@ -85,7 +85,7 @@ func GetPhotoDimensions(imagePath string) (*PhotoDimensions, error) {
}
// ContentType reads the image to determine its content type
func (img *EncodeImageData) ContentType() (*ImageType, error) {
func (img *EncodeImageData) ContentType() (*MediaType, error) {
if img._contentType != nil {
return img._contentType, nil
}

46
api/scanner/executable_worker.go
View File

@ -10,10 +10,21 @@ import (
"github.com/pkg/errors"
)
var DarktableCli = newDarktableWorker()
var FfmpegCli = newFfmpegWorker()
type ExecutableWorker interface {
Path() string
}
type DarktableWorker struct {
path string
}
type FfmpegWorker struct {
path string
}
func newDarktableWorker() DarktableWorker {
path, err := exec.LookPath("darktable-cli")
if err != nil {
@ -27,10 +38,27 @@ func newDarktableWorker() DarktableWorker {
}
}
func newFfmpegWorker() FfmpegWorker {
path, err := exec.LookPath("ffmpeg")
if err != nil {
log.Println("Executable worker not found: ffmpeg")
} else {
log.Println("Found executable worker: ffmpeg")
}
return FfmpegWorker{
path: path,
}
}
func (worker *DarktableWorker) IsInstalled() bool {
return worker.path != ""
}
func (worker *FfmpegWorker) IsInstalled() bool {
return worker.path != ""
}
func (worker *DarktableWorker) EncodeJpeg(inputPath string, outputPath string, jpegQuality int) error {
tmpDir, err := ioutil.TempDir("/tmp", "photoview-darktable")
if err != nil {
@ -57,4 +85,20 @@ func (worker *DarktableWorker) EncodeJpeg(inputPath string, outputPath string, j
return nil
}
var DarktableCli = newDarktableWorker()
func (worker *FfmpegWorker) EncodeMp4(inputPath string, outputPath string) error {
args := []string{
"-i",
inputPath,
"-vcodec", "h264",
"-acodec", "aac",
outputPath,
}
cmd := exec.Command(worker.path, args...)
if err := cmd.Run(); err != nil {
return errors.Wrapf(err, "encoding video using: %s", worker.path)
}
return nil
}

129
api/scanner/photo_type.go
View File

@ -11,49 +11,61 @@ import (
"github.com/pkg/errors"
)
type ImageType string
type MediaType string
const (
TypeJpeg ImageType = "image/jpeg"
TypePng ImageType = "image/png"
TypeTiff ImageType = "image/tiff"
TypeWebp ImageType = "image/webp"
TypeBmp ImageType = "image/bmp"
TypeJpeg MediaType = "image/jpeg"
TypePng MediaType = "image/png"
TypeTiff MediaType = "image/tiff"
TypeWebp MediaType = "image/webp"
TypeBmp MediaType = "image/bmp"
// Raw formats
TypeDNG ImageType = "image/x-adobe-dng"
TypeARW ImageType = "image/x-sony-arw"
TypeSR2 ImageType = "image/x-sony-sr2"
TypeSRF ImageType = "image/x-sony-srf"
TypeCR2 ImageType = "image/x-canon-cr2"
TypeCRW ImageType = "image/x-canon-crw"
TypeERF ImageType = "image/x-epson-erf"
TypeDCS ImageType = "image/x-kodak-dcs"
TypeDRF ImageType = "image/x-kodak-drf"
TypeDCR ImageType = "image/x-kodak-dcr"
TypeK25 ImageType = "image/x-kodak-k25"
TypeKDC ImageType = "image/x-kodak-kdc"
TypeMRW ImageType = "image/x-minolta-mrw"
TypeMDC ImageType = "image/x-minolta-mdc"
TypeNEF ImageType = "image/x-nikon-nef"
TypeNRW ImageType = "image/x-nikon-nrw"
TypeORF ImageType = "image/x-olympus-orf"
TypePEF ImageType = "image/x-pentax-pef"
TypeRAF ImageType = "image/x-fuji-raf"
TypeRAW ImageType = "image/x-panasonic-raw"
TypeRW2 ImageType = "image/x-panasonic-rw2"
TypeGPR ImageType = "image/x-gopro-gpr"
Type3FR ImageType = "image/x-hasselblad-3fr"
TypeFFF ImageType = "image/x-hasselblad-fff"
TypeMEF ImageType = "image/x-mamiya-mef"
TypeCap ImageType = "image/x-phaseone-cap"
TypeIIQ ImageType = "image/x-phaseone-iiq"
TypeMOS ImageType = "image/x-leaf-mos"
TypeRWL ImageType = "image/x-leica-rwl"
TypeSRW ImageType = "image/x-samsung-srw"
TypeDNG MediaType = "image/x-adobe-dng"
TypeARW MediaType = "image/x-sony-arw"
TypeSR2 MediaType = "image/x-sony-sr2"
TypeSRF MediaType = "image/x-sony-srf"
TypeCR2 MediaType = "image/x-canon-cr2"
TypeCRW MediaType = "image/x-canon-crw"
TypeERF MediaType = "image/x-epson-erf"
TypeDCS MediaType = "image/x-kodak-dcs"
TypeDRF MediaType = "image/x-kodak-drf"
TypeDCR MediaType = "image/x-kodak-dcr"
TypeK25 MediaType = "image/x-kodak-k25"
TypeKDC MediaType = "image/x-kodak-kdc"
TypeMRW MediaType = "image/x-minolta-mrw"
TypeMDC MediaType = "image/x-minolta-mdc"
TypeNEF MediaType = "image/x-nikon-nef"
TypeNRW MediaType = "image/x-nikon-nrw"
TypeORF MediaType = "image/x-olympus-orf"
TypePEF MediaType = "image/x-pentax-pef"
TypeRAF MediaType = "image/x-fuji-raf"
TypeRAW MediaType = "image/x-panasonic-raw"
TypeRW2 MediaType = "image/x-panasonic-rw2"
TypeGPR MediaType = "image/x-gopro-gpr"
Type3FR MediaType = "image/x-hasselblad-3fr"
TypeFFF MediaType = "image/x-hasselblad-fff"
TypeMEF MediaType = "image/x-mamiya-mef"
TypeCap MediaType = "image/x-phaseone-cap"
TypeIIQ MediaType = "image/x-phaseone-iiq"
TypeMOS MediaType = "image/x-leaf-mos"
TypeRWL MediaType = "image/x-leica-rwl"
TypeSRW MediaType = "image/x-samsung-srw"
// Video formats
TypeMP4 MediaType = "video/mp4"
TypeMPEG MediaType = "video/mpeg"
Type3GP MediaType = "video/3gpp"
Type3G2 MediaType = "video/3gpp2"
TypeOGV MediaType = "video/ogg"
TypeWMV MediaType = "video/x-ms-wmv"
TypeAVI MediaType = "video/x-msvideo"
TypeWEBM MediaType = "video/webm"
TypeMOV MediaType = "video/quicktime"
TypeTS MediaType = "video/mp2t"
)
var SupportedMimetypes = [...]ImageType{
var SupportedMimetypes = [...]MediaType{
TypeJpeg,
TypePng,
TypeTiff,
@ -92,14 +104,14 @@ var SupportedMimetypes = [...]ImageType{
TypeSRW,
}
var WebMimetypes = [...]ImageType{
var WebMimetypes = [...]MediaType{
TypeJpeg,
TypePng,
TypeWebp,
TypeBmp,
}
var RawMimeTypes = [...]ImageType{
var RawMimeTypes = [...]MediaType{
TypeDNG,
TypeARW,
TypeSR2,
@ -132,7 +144,20 @@ var RawMimeTypes = [...]ImageType{
TypeSRW,
}
var fileExtensions = map[string]ImageType{
var VideoMimetypes = [...]MediaType{
TypeMP4,
TypeMPEG,
Type3GP,
Type3G2,
TypeOGV,
TypeWMV,
TypeAVI,
TypeWEBM,
TypeMOV,
TypeTS,
}
var fileExtensions = map[string]MediaType{
".jpg": TypeJpeg,
".jpeg": TypeJpeg,
".png": TypePng,
@ -163,9 +188,23 @@ var fileExtensions = map[string]ImageType{
".gpr": TypeGPR,
".3fr": Type3FR,
".fff": TypeFFF,
// Video formats
"mp4": TypeMP4,
"m4v": TypeMP4,
"mpeg": TypeMPEG,
"3gp": Type3GP,
"3g2": Type3G2,
"ogv": TypeOGV,
"wmv": TypeWMV,
"avi": TypeAVI,
"webm": TypeWEBM,
"mov": TypeMOV,
"qt": TypeMOV,
"ts": TypeTS,
}
func (imgType *ImageType) isRaw() bool {
func (imgType *MediaType) isRaw() bool {
for _, raw_mime := range RawMimeTypes {
if raw_mime == *imgType {
return true
@ -175,7 +214,7 @@ func (imgType *ImageType) isRaw() bool {
return false
}
func (imgType *ImageType) isWebCompatible() bool {
func (imgType *MediaType) isWebCompatible() bool {
for _, web_mime := range WebMimetypes {
if web_mime == *imgType {
return true
@ -185,7 +224,7 @@ func (imgType *ImageType) isWebCompatible() bool {
return false
}
func (imgType *ImageType) isSupported() bool {
func (imgType *MediaType) isSupported() bool {
for _, supported_mime := range SupportedMimetypes {
if supported_mime == *imgType {
return true
@ -195,7 +234,7 @@ func (imgType *ImageType) isSupported() bool {
return false
}
func getImageType(path string) (*ImageType, error) {
func getImageType(path string) (*MediaType, error) {
ext := filepath.Ext(path)
@ -226,7 +265,7 @@ func getImageType(path string) (*ImageType, error) {
return nil, nil
}
imgType := ImageType(_imgType.MIME.Value)
imgType := MediaType(_imgType.MIME.Value)
if imgType.isSupported() {
return &imgType, nil
}