MightyPork
/
airsonic-custom
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use `ffprobe` and not `ffmpeg` to scrape metadata

Browse Source 
This changes the behavior by searching for `ffprobe` in the trancode
directory and falling back to using `PATH` to locate `ffprobe` if it
doesn't exist in the transcode directory.

Signed-off-by: Peter Marheine <peter@taricorp.net>
master
Peter Marheine 7 years ago
parent dc14f35b17
commit f05237f059
1 changed files with 36 additions and 67 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 95
      airsonic-main/src/main/java/org/airsonic/player/service/metadata/FFmpegParser.java

95
airsonic-main/src/main/java/org/airsonic/player/service/metadata/FFmpegParser.java
Unescape View File

@ -19,11 +19,11 @@
*/ */
package org.airsonic.player.service.metadata; package org.airsonic.player.service.metadata;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.airsonic.player.domain.MediaFile; import org.airsonic.player.domain.MediaFile;
import org.airsonic.player.io.InputStreamReaderThread;
import org.airsonic.player.service.SettingsService; import org.airsonic.player.service.SettingsService;
import org.airsonic.player.service.TranscodingService; import org.airsonic.player.service.TranscodingService;
import org.airsonic.player.util.StringUtil;
import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.FilenameUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -31,9 +31,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.io.File; import java.io.File;
import java.io.InputStream; import java.util.ArrayList;
import java.util.regex.Matcher; import java.util.Arrays;
import java.util.regex.Pattern;
/** /**
* Parses meta data from video files using FFmpeg (http://ffmpeg.org/). * Parses meta data from video files using FFmpeg (http://ffmpeg.org/).
@ -46,10 +45,10 @@ import java.util.regex.Pattern;
public class FFmpegParser extends MetaDataParser { public class FFmpegParser extends MetaDataParser {
private static final Logger LOG = LoggerFactory.getLogger(FFmpegParser.class); private static final Logger LOG = LoggerFactory.getLogger(FFmpegParser.class);
private static final Pattern DURATION_PATTERN = Pattern.compile("Duration: (\\d+):(\\d+):(\\d+).(\\d+)"); private static final ObjectMapper objectMapper = new ObjectMapper();
private static final Pattern BITRATE_PATTERN = Pattern.compile("bitrate: (\\d+) kb/s"); private static final String[] FFPROBE_OPTIONS = {
private static final Pattern DIMENSION_PATTERN = Pattern.compile("Video.*?, (\\d+)x(\\d+)"); "-v", "quiet", "-print_format", "json", "-show_format", "-show_streams"
private static final Pattern PAR_PATTERN = Pattern.compile("PAR (\\d+):(\\d+)"); };
@Autowired @Autowired
private TranscodingService transcodingService; private TranscodingService transcodingService;
@ -69,66 +68,36 @@ public class FFmpegParser extends MetaDataParser {
MetaData metaData = new MetaData(); MetaData metaData = new MetaData();
try { try {
// Use `ffprobe` in the transcode directory if it exists, otherwise let the system sort it out.
File ffmpeg = new File(transcodingService.getTranscodeDirectory(), "ffmpeg"); String ffprobe;
File inTranscodeDirectory = new File(transcodingService.getTranscodeDirectory(), "ffprobe");
String[] command = new String[]{ffmpeg.getAbsolutePath(), "-i", file.getAbsolutePath()}; if (inTranscodeDirectory.exists()) {
Process process = Runtime.getRuntime().exec(command); ffprobe = inTranscodeDirectory.getAbsolutePath();
InputStream stdout = process.getInputStream(); } else {
InputStream stderr = process.getErrorStream(); ffprobe = "ffprobe";
// Consume stdout, we're not interested in that.
new InputStreamReaderThread(stdout, "ffmpeg", true).start();
// Read everything from stderr. It will contain text similar to:
// Input #0, avi, from 'foo.avi':
// Duration: 00:00:33.90, start: 0.000000, bitrate: 2225 kb/s
// Stream #0.0: Video: mpeg4, yuv420p, 352x240 [PAR 1:1 DAR 22:15], 29.97 fps, 29.97 tbr, 29.97 tbn, 30k tbc
// Stream #0.1: Audio: pcm_s16le, 44100 Hz, 2 channels, s16, 1411 kb/s
String[] lines = StringUtil.readLines(stderr);
Integer width = null;
Integer height = null;
Double par = 1.0;
for (String line : lines) {
Matcher matcher = DURATION_PATTERN.matcher(line);
if (matcher.find()) {
int hours = Integer.parseInt(matcher.group(1));
int minutes = Integer.parseInt(matcher.group(2));
int seconds = Integer.parseInt(matcher.group(3));
metaData.setDurationSeconds(hours * 3600 + minutes * 60 + seconds);
} }
matcher = BITRATE_PATTERN.matcher(line); ArrayList<String> command = new ArrayList<>(FFPROBE_OPTIONS.length + 2);
if (matcher.find()) { command.add(ffprobe);
metaData.setBitRate(Integer.valueOf(matcher.group(1))); command.addAll(Arrays.asList(FFPROBE_OPTIONS));
} command.add(file.getAbsolutePath());
matcher = DIMENSION_PATTERN.matcher(line); Process process = Runtime.getRuntime().exec((String[])command.toArray());
if (matcher.find()) { final JsonNode result = objectMapper.readTree(process.getInputStream());
width = Integer.valueOf(matcher.group(1));
height = Integer.valueOf(matcher.group(2));
}
// PAR = Pixel Aspect Rate metaData.setDurationSeconds(result.at("/format/duration").asInt());
matcher = PAR_PATTERN.matcher(line); // Bitrate is in Kb/s
if (matcher.find()) { metaData.setBitRate(result.at("/format/bit_rate").asInt() / 1000);
int a = Integer.parseInt(matcher.group(1));
int b = Integer.parseInt(matcher.group(2));
if (a > 0 && b > 0) {
par = (double) a / (double) b;
}
}
}
if (width != null && height != null) { // Find the first (if any) stream that has dimensions and use those.
width = (int) Math.round(width.doubleValue() * par); // 'width' and 'height' are display dimensions; compare to 'coded_width', 'coded_height'.
metaData.setWidth(width); for (JsonNode stream : result.at("/streams")) {
metaData.setHeight(height); if (stream.has("width") && stream.has("height")) {
metaData.setWidth(stream.get("width").asInt());
metaData.setHeight(stream.get("height").asInt());
break;
}
} }
} catch (Throwable x) { } catch (Throwable x) {
LOG.warn("Error when parsing metadata in " + file, x); LOG.warn("Error when parsing metadata in " + file, x);
} }

Write Preview
Loading…
Cancel
Save