Skip to content

Commit

Permalink
adjustments for lookup renaming
Browse files Browse the repository at this point in the history
  • Loading branch information
Luca Rossetto committed Sep 5, 2016
1 parent f528da3 commit 8019783
Show file tree
Hide file tree
Showing 11 changed files with 31 additions and 31 deletions.
16 changes: 8 additions & 8 deletions src/org/vitrivr/cineast/api/JSONAPIThread.java
View file
Expand Up @@ -23,9 +23,9 @@
import org.vitrivr.cineast.core.db.ADAMproSelector;
import org.vitrivr.cineast.core.db.DBResultCache;
import org.vitrivr.cineast.core.db.DBSelector;
import org.vitrivr.cineast.core.db.ShotLookup;
import org.vitrivr.cineast.core.db.ShotLookup.SegmentDescriptor;
import org.vitrivr.cineast.core.db.VideoLookup;
import org.vitrivr.cineast.core.db.SgmentLookup;
import org.vitrivr.cineast.core.db.SgmentLookup.SegmentDescriptor;
import org.vitrivr.cineast.core.db.MultimediaObjectLookup;
import org.vitrivr.cineast.core.util.ContinousRetrievalLogic;
import org.vitrivr.cineast.core.util.LogHelper;

Expand Down Expand Up @@ -80,13 +80,13 @@ public void run() {
// String category = queryObject.get("category").asString();
String shotId = queryObject.get("shotid").asString();

ShotLookup sl = new ShotLookup();
SgmentLookup sl = new SgmentLookup();
SegmentDescriptor shot = sl.lookUpShot(shotId);
//List<ShotDescriptor> allShots = sl.lookUpVideo(shot.getVideoId());

//Send metadata
VideoLookup vl = new VideoLookup();
VideoLookup.MultimediaObjectDescriptor descriptor = vl.lookUpObjectById(shot.getVideoId());
MultimediaObjectLookup vl = new MultimediaObjectLookup();
MultimediaObjectLookup.MultimediaObjectDescriptor descriptor = vl.lookUpObjectById(shot.getVideoId());

JsonObject resultobj = JSONEncoder.encodeVideo(descriptor);

Expand Down Expand Up @@ -341,8 +341,8 @@ public void run() {
JsonArray shotidlist = query.get("shotidlist").asArray();
int limit = query.get("limit") == null ? 1 : query.get("limit").asInt();
DBSelector selector = new ADAMproSelector();
ShotLookup sl = new ShotLookup();
ShotLookup.SegmentDescriptor descriptor;
SgmentLookup sl = new SgmentLookup();
SgmentLookup.SegmentDescriptor descriptor;
this.printer.print('[');

// PreparedStatement select = selector.createPreparedStatement("(select id, startframe, endframe from cineast.shots WHERE video=? AND startframe<? ORDER BY startframe desc LIMIT ?)UNION(select id, startframe, endframe from cineast.shots WHERE video=? AND endframe>? ORDER BY startframe asc LIMIT ?)");
Expand Down
4 changes: 2 additions & 2 deletions src/org/vitrivr/cineast/api/JSONEncoder.java
View file
Expand Up @@ -3,8 +3,8 @@
import java.util.List;

import org.vitrivr.cineast.core.data.StringDoublePair;
import org.vitrivr.cineast.core.db.ShotLookup.SegmentDescriptor;
import org.vitrivr.cineast.core.db.VideoLookup.MultimediaObjectDescriptor;
import org.vitrivr.cineast.core.db.SgmentLookup.SegmentDescriptor;
import org.vitrivr.cineast.core.db.MultimediaObjectLookup.MultimediaObjectDescriptor;

import com.eclipsesource.json.JsonArray;
import com.eclipsesource.json.JsonObject;
Expand Down
14 changes: 7 additions & 7 deletions src/org/vitrivr/cineast/api/JSONUtils.java
View file
Expand Up @@ -17,10 +17,10 @@
import org.vitrivr.cineast.core.data.QueryContainer;
import org.vitrivr.cineast.core.data.QuerySubTitleItem;
import org.vitrivr.cineast.core.data.StringDoublePair;
import org.vitrivr.cineast.core.db.ShotLookup;
import org.vitrivr.cineast.core.db.ShotLookup.SegmentDescriptor;
import org.vitrivr.cineast.core.db.VideoLookup;
import org.vitrivr.cineast.core.db.VideoLookup.MultimediaObjectDescriptor;
import org.vitrivr.cineast.core.db.SgmentLookup;
import org.vitrivr.cineast.core.db.SgmentLookup.SegmentDescriptor;
import org.vitrivr.cineast.core.db.MultimediaObjectLookup;
import org.vitrivr.cineast.core.db.MultimediaObjectLookup.MultimediaObjectDescriptor;
import org.vitrivr.cineast.core.decode.subtitle.SubtitleItem;
import org.vitrivr.cineast.core.util.LogHelper;

Expand Down Expand Up @@ -181,7 +181,7 @@ public static void printResultsBatched(PrintStream printer, List<StringDoublePai

public static HashSet<String> printShotsBatched(PrintStream printer, List<StringDoublePair> resultlist, HashSet<String> shotids) {
ArrayList<SegmentDescriptor> sdList = new ArrayList<>(resultlist.size());
ShotLookup sl = new ShotLookup();
SgmentLookup sl = new SgmentLookup();

String[] ids = new String[resultlist.size()];
int i = 0;
Expand Down Expand Up @@ -217,8 +217,8 @@ public static HashSet<String> printShotsBatched(PrintStream printer, List<String
}

public static HashSet<String> printVideosBatched(PrintStream printer, List<StringDoublePair> resultlist, HashSet<String> videoids) {
ShotLookup sl = new ShotLookup();
VideoLookup vl = new VideoLookup();
SgmentLookup sl = new SgmentLookup();
MultimediaObjectLookup vl = new MultimediaObjectLookup();

String[] ids = new String[resultlist.size()];
int i = 0;
Expand Down
4 changes: 2 additions & 2 deletions src/org/vitrivr/cineast/core/db/MultimediaObjectLookup.java
View file
Expand Up @@ -12,13 +12,13 @@
import org.vitrivr.cineast.core.data.providers.primitive.ProviderDataType;
import org.vitrivr.cineast.core.setup.EntityCreator;

public class VideoLookup{
public class MultimediaObjectLookup{

private static final Logger LOGGER = LogManager.getLogger();

private final DBSelector selector;

public VideoLookup(){
public MultimediaObjectLookup(){
this.selector = Config.getDatabaseConfig().getSelectorSupplier().get();
this.selector.open(EntityCreator.CINEAST_MULTIMEDIAOBJECT);
}
Expand Down
4 changes: 2 additions & 2 deletions src/org/vitrivr/cineast/core/db/SgmentLookup.java
View file
Expand Up @@ -14,12 +14,12 @@
import org.vitrivr.cineast.core.data.providers.primitive.ProviderDataType;
import org.vitrivr.cineast.core.setup.EntityCreator;

public class ShotLookup {
public class SgmentLookup {

private static final Logger LOGGER = LogManager.getLogger();
private final DBSelector selector;

public ShotLookup(){
public SgmentLookup(){
this.selector = Config.getDatabaseConfig().getSelectorSupplier().get();
this.selector.open(EntityCreator.CINEAST_SEGMENT);
}
Expand Down
2 changes: 1 addition & 1 deletion src/org/vitrivr/cineast/core/decode/shotboundary/ShotBoundaryDecoder.java
View file
Expand Up @@ -4,7 +4,7 @@
import java.io.FileNotFoundException;
import java.util.List;

import org.vitrivr.cineast.core.db.ShotLookup.SegmentDescriptor;
import org.vitrivr.cineast.core.db.SgmentLookup.SegmentDescriptor;

public final class ShotBoundaryDecoder {

Expand Down
2 changes: 1 addition & 1 deletion src/org/vitrivr/cineast/core/decode/shotboundary/TrecvidMasterShotReferenceDecoder.java
View file
Expand Up @@ -10,7 +10,7 @@

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.vitrivr.cineast.core.db.ShotLookup.SegmentDescriptor;
import org.vitrivr.cineast.core.db.SgmentLookup.SegmentDescriptor;

public class TrecvidMasterShotReferenceDecoder {

Expand Down
2 changes: 1 addition & 1 deletion src/org/vitrivr/cineast/core/run/ExtractionJobRunner.java
View file
Expand Up @@ -12,7 +12,7 @@
import org.vitrivr.cineast.core.config.Config;
import org.vitrivr.cineast.core.db.PersistencyWriter;
import org.vitrivr.cineast.core.db.PersistentTuple;
import org.vitrivr.cineast.core.db.ShotLookup.SegmentDescriptor;
import org.vitrivr.cineast.core.db.SgmentLookup.SegmentDescriptor;
import org.vitrivr.cineast.core.decode.shotboundary.ShotBoundaryDecoder;
import org.vitrivr.cineast.core.decode.video.VideoDecoder;
import org.vitrivr.cineast.core.features.extractor.Extractor;
Expand Down
10 changes: 5 additions & 5 deletions src/org/vitrivr/cineast/core/run/FeatureExtractionRunner.java
View file
Expand Up @@ -11,10 +11,10 @@
import org.vitrivr.cineast.core.config.Config;
import org.vitrivr.cineast.core.db.PersistencyWriter;
import org.vitrivr.cineast.core.db.PersistentTuple;
import org.vitrivr.cineast.core.db.ShotLookup;
import org.vitrivr.cineast.core.db.VideoLookup;
import org.vitrivr.cineast.core.db.VideoLookup.MultimediaObjectDescriptor;
import org.vitrivr.cineast.core.db.ShotLookup.SegmentDescriptor;
import org.vitrivr.cineast.core.db.SgmentLookup;
import org.vitrivr.cineast.core.db.MultimediaObjectLookup;
import org.vitrivr.cineast.core.db.MultimediaObjectLookup.MultimediaObjectDescriptor;
import org.vitrivr.cineast.core.db.SgmentLookup.SegmentDescriptor;
import org.vitrivr.cineast.core.decode.subtitle.SubTitle;
import org.vitrivr.cineast.core.decode.subtitle.srt.SRTSubTitle;
import org.vitrivr.cineast.core.decode.video.VideoDecoder;
Expand Down Expand Up @@ -103,7 +103,7 @@ public void extract(File videoFile, String videoName){
// knownShots = lookup.lookUpVideo(id);
// lookup.close();

VideoLookup lookup = new VideoLookup();
MultimediaObjectLookup lookup = new MultimediaObjectLookup();
MultimediaObjectDescriptor descriptor = lookup.lookUpObjectByName(videoName);
if(descriptor.exists()){
id = descriptor.getId();
Expand Down
2 changes: 1 addition & 1 deletion src/org/vitrivr/cineast/core/run/SingleVideoToFileExtractor.java
View file
Expand Up @@ -14,7 +14,7 @@
import org.vitrivr.cineast.core.db.PersistencyWriter;
import org.vitrivr.cineast.core.db.PersistencyWriterSupplier;
import org.vitrivr.cineast.core.db.ProtobufFileWriter;
import org.vitrivr.cineast.core.db.ShotLookup.SegmentDescriptor;
import org.vitrivr.cineast.core.db.SgmentLookup.SegmentDescriptor;
import org.vitrivr.cineast.core.decode.subtitle.SubTitle;
import org.vitrivr.cineast.core.decode.subtitle.cc.CCSubTitle;
import org.vitrivr.cineast.core.decode.subtitle.srt.SRTSubTitle;
Expand Down
2 changes: 1 addition & 1 deletion src/org/vitrivr/cineast/core/segmenter/ShotSegmenter.java
View file
Expand Up @@ -11,7 +11,7 @@
import org.vitrivr.cineast.core.data.providers.ShotProvider;
import org.vitrivr.cineast.core.db.PersistencyWriter;
import org.vitrivr.cineast.core.db.PersistentTuple;
import org.vitrivr.cineast.core.db.ShotLookup.SegmentDescriptor;
import org.vitrivr.cineast.core.db.SgmentLookup.SegmentDescriptor;
import org.vitrivr.cineast.core.decode.subtitle.SubTitle;
import org.vitrivr.cineast.core.decode.subtitle.SubtitleItem;
import org.vitrivr.cineast.core.decode.video.VideoDecoder;
Expand Down

0 comments on commit 8019783

Please sign in to comment.