'gfv' update

Author: epitron

x renamed to arf2

@@ -8,9 +8,15 @@ use FlashVideo::Utils;
 use FlashVideo::JSON;
 use HTML::Entities;
 
-our $VERSION = '0.02';
+our $VERSION = '0.03';
 sub Version() { $VERSION;}
 
+my $bitrate_index = {
+  high   => 0,
+  medium => 1,
+  low    => 2
+};
+
 sub find_video_svt {
   my ($self, $browser, $embed_url, $prefs, $oppet_arkiv) = @_;
   my @rtmpdump_commands;
@@ -72,47 +78,33 @@ sub find_video_svt {
 
   # If we found an m3u8 file we generate the ffmpeg download command
   if (!($m3u8 eq "")) {
-      $browser->get($m3u8);
-      if (!$browser->success) {
-          die "Couldn't download $m3u8: " . $browser->response->status_line;
-      }
 
-      my @lines = split(/\r?\n/, $browser->content);
-      $bitrate = -1;
-      my $video_url = "";
-      my $i = 0;
-
-      # Select highest bitrate available
-      foreach my $line (@lines) {
-        if ($line =~ /BANDWIDTH/) {
-          $line =~ /BANDWIDTH=([0-9]*),/;
-          my $this_rate = $1;
-
-          if ($bitrate < $this_rate) {
-            $video_url = $lines[$i + 1];
-            $bitrate = $this_rate;
-          }
-        }
-        $i++;
-      }
+    my %urls = read_hls_playlist($browser, $m3u8);
+
+    # Sort the urls and select the suitable one based upon quality preference
+    my $quality = $bitrate_index->{$prefs->{quality}};
+    my $min = $quality < scalar(keys(%urls)) ? $quality : scalar(keys(%urls));
+    my $key = (sort {int($b) <=> int($a)} keys %urls)[$min];
+
+    my $video_url = $urls{$key};
+    my $filename = title_to_filename($name, "mp4");
+
+    # Set the arguments for ffmpeg
+    my @ffmpeg_args = (
+      "-i", "$video_url",
+      "-acodec", "copy",
+      "-vcodec", "copy",
+      "-absf", "aac_adtstoasc",
+      "-f", "mp4",
+      "$filename"
+    );
+
+    return {
+      downloader => "ffmpeg",
+      flv        => $filename,
+      args       => \@ffmpeg_args
+    };
 
-      my $filename = title_to_filename($name, "mp4");
-
-      # Set the arguments for ffmpeg
-      my @ffmpeg_args = (
-        "-i", "$video_url",
-        "-acodec", "copy",
-        "-vcodec", "copy",
-        "-absf", "aac_adtstoasc",
-        "-f", "mp4",
-        "$filename"
-      );
-
-      return {
-        downloader => "ffmpeg",
-        flv       => $filename,
-        args       => \@ffmpeg_args
-      };
   } else {
     return {
       flv    => title_to_filename($name, "flv"),

lib/FlashVideo/Site/Svtplay.pm

@@ -5,7 +5,7 @@ use warnings;
 use FlashVideo::Utils;
 use List::Util qw(reduce);
 
-our $VERSION = '0.01';
+our $VERSION = '0.02';
 sub Version() { $VERSION;}
 
 my $bitrate_index = {
@@ -14,33 +14,15 @@ my $bitrate_index = {
   low    => 2
 };
 
-sub read_m3u {
-  my $content = shift;
-  my @lines = split(/\r?\n/, $content);
-  my %urltable = ();
-  my $i = 0;
-
-  # Fill the url table
-  foreach my $line (@lines) {
-    if ($line =~ /BANDWIDTH/) {
-      $line =~ /BANDWIDTH=([0-9]*),/;
-      $urltable{int($1)} = $lines[$i + 1];
-    }
-    $i++;
-  }
-
-  return %urltable;
-}
-
 sub find_video {
   my ($self, $browser, $embed_url, $prefs) = @_;
   my $video_id = ($embed_url =~ /video_id=([0-9]*)/)[0];
   my $smi_url = "http://premium.tv4play.se/api/web/asset/$video_id/play?protocol=hls";
-  my $title = ($browser->content =~ /property="og:title" content="(.*?)"/)[0];
+  my $title = extract_title($browser);
   $browser->get($smi_url);
   my $content = from_xml($browser);
   my $subtitle_url;
-  my $hls_m3u;
+  my $hls_m3u = "";
   my $hls_base;
 
   foreach my $item (@{ $content->{items}->{item} || [] }) {
@@ -59,11 +41,7 @@ sub find_video {
     }
   }
 
-  if ($hls_m3u eq "") {die "No stream found!"};
-  $browser->get($hls_m3u);
-  if (!$browser->success) {
-    die "Couldn't download $hls_m3u: " . $browser->response->status_line;
-  }
+  if ($hls_m3u eq "") {die "No HLS stream found!"};
 
   # Download subtitles
   if ($prefs->{subtitles} == 1) {
@@ -85,7 +63,7 @@ sub find_video {
     }
   }
 
-  my %urls = read_m3u($browser->content);
+  my %urls = read_hls_playlist($browser, $hls_m3u);
 
   # Sort the urls and select the suitable one based upon quality preference
   my $quality = $bitrate_index->{$prefs->{quality}};
@@ -100,6 +78,7 @@ sub find_video {
     "-i", "$hls_base$video_url",
     "-acodec", "copy",
     "-vcodec", "copy",
+    "-absf", "aac_adtstoasc",
     "-f", "mp4",
     "$filename"
   );

lib/FlashVideo/Site/Tv4play.pm

@@ -17,7 +17,7 @@ our @EXPORT = qw(debug info error
   swfhash swfhash_data EXTENSIONS get_user_config_dir get_win_codepage
   is_program_on_path get_terminal_width json_unescape
   convert_sami_subtitles_to_srt from_xml
-  convert_ttml_subtitles_to_srt);
+  convert_ttml_subtitles_to_srt read_hls_playlist);
 
 sub debug(@) {
   # Remove some sensitive data
@@ -525,4 +525,28 @@ sub from_xml {
   return $xml;
 }
 
+sub read_hls_playlist {
+  my($browser, $url) = @_;
+
+  $browser->get($url);
+  if (!$browser->success) {
+    die "Couldn't download m3u file, $url: " . $browser->response->status_line;
+  }
+
+  my @lines = split(/\r?\n/, $browser->content);
+  my %urltable = ();
+  my $i = 0;
+
+  # Fill the url table
+  foreach my $line (@lines) {
+    if ($line =~ /BANDWIDTH/) {
+      $line =~ /BANDWIDTH=([0-9]*),/;
+      $urltable{int($1)} = $lines[$i + 1];
+    }
+    $i++;
+  }
+
+  return %urltable;
+}
+
 1;