video_file 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07dc12f8d9cb04c871af4f1643f4d0e48d225989cc1d651a1c08c185f5a6ab81
-  data.tar.gz: 941df4b9e058b79aa84ab9c54c605aea3312adf8bdd94b65c2c3e49c20216d98
+  metadata.gz: b32f432c6b89bda31fae5d777f1ef5735abe6d1fa23903e3addb447245cf5121
+  data.tar.gz: 2f91edfb3d8fdacc146c2c48fbb22da9f0a920916ecc100524c2bb7b26d2c42a
 SHA512:
-  metadata.gz: 2341339f983f200a532258cc1e3237d403218626eea4f26ec534399c9d14ba26338a24cea22a9db2197448e616f84ac5f0899cc0186f221dd4170a80a4d4d1ac
-  data.tar.gz: 422b51b2d1d1f2d37c8ac808abb032e29ac8d0711acc8ab211192cdba801e701b8b35aeb884d3a977d697dcba191017c180cb8e4fa0ed4dd0b63ce6a05b11db0
+  metadata.gz: 6bbe6bde902606c50a7253e4d40832f7b0bcfa165bd069ee134cc4d961266917c08f056d966c79e9cfea66fda1786b070ba1b179d51b980fa39eb7439829139f
+  data.tar.gz: efd352a10b247dee6275eeed60bb02b3afed09115797425866391a3cbb6b379755ddad7d3d213a2b44709bd68b043f1448578d1e5687fbe89654d8e2174cf15e

data/CMakeLists.txt

@@ -23,6 +23,6 @@ add_library(video_file_ext SHARED ${SOURCE_FILES})
 
 set_target_properties(video_file_ext PROPERTIES PREFIX "")
 set_target_properties(video_file_ext PROPERTIES LIBRARY_OUTPUT_DIRECTORY  "${PROJECT_SOURCE_DIR}/lib")
-target_compile_definitions(video_file_ext PRIVATE AV_ENABLE_DEBUG)
+target_compile_definitions(video_file_ext PRIVATE VF_ENABLE_DEBUG)
 target_include_directories(video_file_ext PRIVATE ${RUBY_INCLUDE_DIRS})
 target_link_libraries(video_file_ext ${LIBAV_LIBRARIES} ${JPEG_LIBRARIES} ${RUBY_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})

data/ext/video_file_ext/ext.c

@@ -137,7 +137,7 @@ VALUE thumbnailer_m_initialize(int argc, VALUE* argv, VALUE self)
 {
     VALUE file = Qnil;
     VALUE width = Qnil;
-    VALUE count = INT2FIX(1);
+    VALUE count = Qnil;
     rb_scan_args(argc, argv, "21", &file, &width, &count);
 
     Check_TypedStruct(file, &file_type);
@@ -148,7 +148,7 @@ VALUE thumbnailer_m_initialize(int argc, VALUE* argv, VALUE self)
     TypedData_Get_Struct(file, VfFile, &file_type, file_);
 
     int width_ = FIX2INT(width);
-    unsigned n_ = FIX2UINT(count);
+    unsigned n_ = count == Qnil ? 1 : FIX2UINT(count);
 
     if(!vf_thumbnailer_init(&thumbnailer->thumbnailer, file_, width_, n_)) {
         rb_raise(eError, "%s", thumbnailer->thumbnailer.last_error_str);

data/ext/video_file_ext/vf-thumbnailer.c

@@ -97,6 +97,10 @@ vf_thumbnailer_init(VfThumbnailer* thumbnailer,
       width = file->video_codec_context->width;
   }
 
+  if(n == 0) {
+      n = 1;
+  }
+
   thumbnailer->video_file = file;
   thumbnailer->width = width;
   thumbnailer->position = -1;
@@ -225,6 +229,8 @@ vf_thumbnailer_get_frame(VfThumbnailer* thumbnailer,
 
   int64_t position = (int64_t)(AV_TIME_BASE * seconds);
   if (format_context->duration < position || position < 0) {
+    VF_DEBUG("invalid position %ld (duration is: %ld)\n", position, format_context->duration);
+    strncpy(thumbnailer->last_error_str, "invalid position", sizeof(thumbnailer->last_error_str));
     goto fail;
   }
 

data/lib/video_file/version.rb

@@ -1,3 +1,3 @@
 module VideoFile
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: video_file
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - furunkel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-17 00:00:00.000000000 Z
+date: 2019-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler