Changeset 4283

Timestamp:

03/07/10 10:36:22 (6 months ago)

Author:

andoma

Message:

Add support for opensubtitles.org

Location:

trunk/showtime

Files:

• Makefile (modified) (2 diffs)
• src/api (added)
• src/api/opensubtitles.c (added)
• src/api/opensubtitles.h (added)
• src/api/xmlrpc.c (added)
• src/api/xmlrpc.h (added)
• src/fileaccess/fa_video.c (modified) (8 diffs)
• src/main.c (modified) (2 diffs)
• src/misc/gz.c (added)
• src/misc/gz.h (added)
• src/video/subtitles.c (modified) (2 diffs)
• src/video/subtitles.h (modified) (1 diff)

trunk/showtime/Makefile

@@ -53 +53 @@
         src/misc/pixmap.c \
         src/misc/jpeg.c \
+        src/misc/gz.c \
 
 #
@@ -104 +105 @@
 
 SRCS                   += src/scrappers/scrappers.c
+
+#
+# APIs
+#
+SRCS +=                 src/api/xmlrpc.c \
+                        src/api/opensubtitles.c \
 
 #

trunk/showtime/src/fileaccess/fa_video.c

@@ -37 +37 @@
 #include "notifications.h"
 #include "video/subtitles.h"
+#include "api/opensubtitles.h"
 
 /**
@@ -330 +331 @@
       event_select_track_t *est = (event_select_track_t *)e;
       const char *id = est->id;
-      
-      if(id[0] >= '0' && id[0] <= '9') {
+
+      if(!strcmp(id, "sub:off")) {
+        prop_set_string(mp->mp_prop_subtitle_track_current, id);
+        mp->mp_video.mq_stream2 = -1;
+
+        if(sub != NULL) {
+          subtitles_destroy(sub);
+          sub = NULL;
+        }
+
+
+      } else if(!strcmp(id, "audio:off")) {
+        prop_set_string(mp->mp_prop_subtitle_track_current, id);
+        mp->mp_video.mq_stream2 = -1;
+
+      } else if(id[0] >= '0' && id[0] <= '9') {
         unsigned int idx = atoi(est->id);
         if(idx < fctx->nb_streams) {
@@ -339 +354 @@
             prop_set_int(mp->mp_prop_audio_track_current, idx);
           } else if(ctx->codec_type == CODEC_TYPE_SUBTITLE) {
+
+            if(sub != NULL) {
+              subtitles_destroy(sub);
+              sub = NULL;
+            }
+
             mp->mp_video.mq_stream2 = idx;
             prop_set_int(mp->mp_prop_subtitle_track_current, idx);
           }
         }
+      } else {
+        mp->mp_video.mq_stream2 = -1;
+
+        prop_set_string(mp->mp_prop_subtitle_track_current, est->id);
+
+        if(sub != NULL)
+          subtitles_destroy(sub);
+
+        sub = subtitles_load(est->id);
       }
 
@@ -359 +389 @@
   return e;
 }
+
+/**
+ *
+ */
+static void
+add_off_stream(prop_t *prop, const char *id)
+{
+  prop_t *p = prop_create(prop, NULL);
+  
+  prop_set_string(prop_create(p, "id"), id);
+  prop_set_string(prop_create(p, "title"), "Off");
+}
+
 
 /**
@@ -377 +420 @@
   fa_handle_t *fh;
 
+  uint64_t hash;
+  uint64_t fsize;
+  int valid_hash = 0;
+
   if(fa_stat(url, &buf, errbuf, errlen))
     return NULL;
@@ -405 +452 @@
 #endif
   }
+
+
+  valid_hash = !opensub_compute_hash(fh, &hash);
+  fsize = fa_fsize(fh);
   fa_close(fh);
-
-
+  
   /**
    * Open input file
@@ -427 +477 @@
   TRACE(TRACE_DEBUG, "Video", "Starting playback of %s", url);
 
+  add_off_stream(prop_create(mp->mp_prop_metadata, "subtitlestreams"),
+                 "sub:off");
+
+  add_off_stream(prop_create(mp->mp_prop_metadata, "audiostreams"),
+                 "audio:off");
+
   /**
    * Update property metadata
    */
   fa_probe_load_metaprop(mp->mp_prop_metadata, fctx, faurl);
+
+  /**
+   * Query opensubtitles.org
+   */
+
+  opensub_add_subtitles(prop_create(mp->mp_prop_metadata, "subtitlestreams"),
+                        opensub_build_query(NULL, hash, fsize, NULL, NULL));
 
   /**
@@ -462 +525 @@
   prop_set_int(mp->mp_prop_audio_track_current, mp->mp_audio.mq_stream);
 
+  prop_set_string(mp->mp_prop_subtitle_track_current, "sub:off");
+
   mp_set_play_caps(mp, MP_PLAY_CAPS_SEEK | MP_PLAY_CAPS_PAUSE);
 

trunk/showtime/src/main.c

@@ -42 +42 @@
 #include "scrappers/scrappers.h"
 #include "misc/callout.h"
+#include "api/opensubtitles.h"
 
 /**
@@ -217 +218 @@
   /* Service discovery. Must be after ipc_init() (d-bus and threads, etc) */
   sd_init();
+
+  /* opensubtitles.org */
+  opensub_init();
 
   TRACE(TRACE_DEBUG, "core", "Starting UI");

trunk/showtime/src/video/subtitles.c

@@ -19 +19 @@
 #include <stdio.h>
 #include <string.h>
-#include <sys/time.h>
-#include <time.h>
+#include <unistd.h>
 
 #include "showtime.h"
 #include "subtitles.h"
 #include "fileaccess/fileaccess.h"
-#include <unistd.h>
+#include "misc/gz.h"
 
 #if 0
@@ -599 +598 @@
 }
 
-#if 1
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
-
-
+
+/**
+ *
+ */
 subtitles_t *
-subtitles_test(const char *fname)
-{
-  struct stat st;
-  int fd = open(fname, O_RDONLY);
-  if(fd == -1)
+subtitles_load(const char *url)
+{
+  subtitles_t *sub;
+  char errbuf[256];
+  size_t datalen;
+
+  char *data = fa_quickload(url, &datalen, NULL, errbuf, sizeof(errbuf));
+
+  if(data == NULL) {
+    TRACE(TRACE_ERROR, "Subtitles", "Unable to load %s -- %s", 
+          url, errbuf);
     return NULL;
-
-  if(fstat(fd, &st))
-    return NULL;
-
-  char *mem = malloc(st.st_size);
-  if(read(fd, mem, st.st_size) != st.st_size)
-    return NULL;
-
-  close(fd);
-  printf("Reading subtitles\n");
-  return subtitles_create(mem, st.st_size);
-}
-#endif
+  }
+
+  if(gz_check(data, datalen)) {
+    // is .gz compressed, inflate it
+
+    char *inflated;
+    size_t inflatedlen;
+
+    inflated = gz_inflate(data, datalen, &inflatedlen, errbuf, sizeof(errbuf));
+
+    free(data);
+    if(inflated == NULL) {
+      TRACE(TRACE_ERROR, "Subtitles", "Unable to decompress %s -- %s", 
+            url, errbuf);
+      return NULL;
+    } else {
+      data = inflated;
+      datalen = inflatedlen;
+    }
+  }
+
+  sub = subtitles_create(data, datalen);
+
+  free(data);
+
+  if(sub == NULL)
+    TRACE(TRACE_ERROR, "Subtitles", "Unable to load %s -- Unknown format", 
+          url);
+  return sub;
+}

trunk/showtime/src/video/subtitles.h

@@ -46 +46 @@
 subtitle_entry_t *subtitles_pick(subtitles_t *sub, int64_t pts);
 
+subtitles_t *subtitles_load(const char *url);
+
 #endif /* SUBTITLES_H_ */