You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ma...@apache.org on 2017/04/30 22:12:57 UTC
[tika] branch master updated (562e4fa -> 49bb469)
This is an automated email from the ASF dual-hosted git repository.
mattmann pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git.
from 562e4fa TIKA-2346 -- add unit tests and configurability for doc, xls and SAX docx parser.
adds 6c903f2 fix for TIKA-2322 contributed by msharan@usc.edu
adds 1efe2e9 Minor edits in java comments
adds 1fa7fc4 Removed local code
adds 70343df Moving video imports inside classigy_video method
adds 10529eb Fix URL to inceptionapi.py
adds 92a90c7 Update to v4 inception.
adds 7c431b3 Adding opencv support in Inception File
adds 91d18a6 Merge branch 'TIKA-2322' of https://github.com/smadha/tika into TIKA-2322
adds bbd4647 Changing v3 to v4, moving import at the top
adds 0cb3a19 Fixed changes as per v4 PR
adds 6a32d49 V3 to v4 in documentation
adds ba00902 Updating v4 in Java default value
adds 932a4a8 Supporting both opencv 2 and 3
adds 434736b Adding opencv with ffmpeg
adds 58a116c Removed personal repository
adds 310fa54 Installing ffmpeg from opt and cone from bash
adds e141640 Update Dockerfile for InceptionVideoRest to depend on ubuntu 16.04 (get ffmpeg via apt-get); build OpenCV+Python from scratch and bind to apt-get ffmpeg. Contributed by ThejanW.
new 49bb469 Merge pull request #168 from smadha/TIKA-2322
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../recognition/tf/TensorflowRESTRecogniser.java | 8 +-
.../tf/TensorflowRESTVideoRecogniser.java | 79 ++++++++++++
.../parser/recognition/tf/InceptionRestDockerfile | 2 +-
.../recognition/tf/InceptionVideoRestDockerfile | 93 ++++++++++++++
.../tika/parser/recognition/tf/inceptionapi.py | 141 +++++++++++++++++++++
.../tika/parser/recognition/tf/video_util.py | 113 +++++++++++++++++
...Test.java => TensorflowVideoRecParserTest.java} | 15 +--
...w-rest.xml => tika-config-tflow-video-rest.xml} | 8 +-
.../test/resources/test-documents/testVideoMp4.mp4 | Bin 0 -> 1053651 bytes
9 files changed, 444 insertions(+), 15 deletions(-)
create mode 100644 tika-parsers/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowRESTVideoRecogniser.java
create mode 100644 tika-parsers/src/main/resources/org/apache/tika/parser/recognition/tf/InceptionVideoRestDockerfile
create mode 100644 tika-parsers/src/main/resources/org/apache/tika/parser/recognition/tf/video_util.py
copy tika-parsers/src/test/java/org/apache/tika/parser/recognition/tf/{TensorflowImageRecParserTest.java => TensorflowVideoRecParserTest.java} (78%)
copy tika-parsers/src/test/resources/org/apache/tika/parser/recognition/{tika-config-tflow-rest.xml => tika-config-tflow-video-rest.xml} (76%)
create mode 100644 tika-parsers/src/test/resources/test-documents/testVideoMp4.mp4
--
To stop receiving notification emails like this one, please contact
['"commits@tika.apache.org" <co...@tika.apache.org>'].
[tika] 01/01: Merge pull request #168 from smadha/TIKA-2322
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mattmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 49bb4691393c016d8d65e6b11febca9e56feedef
Merge: 562e4fa e141640
Author: Chris Mattmann <ch...@gmail.com>
AuthorDate: Sun Apr 30 15:12:55 2017 -0700
Merge pull request #168 from smadha/TIKA-2322
fix for TIKA-2322 contributed by msharan@usc.edu
.../recognition/tf/TensorflowRESTRecogniser.java | 8 +-
.../tf/TensorflowRESTVideoRecogniser.java | 79 ++++++++++++
.../parser/recognition/tf/InceptionRestDockerfile | 2 +-
.../recognition/tf/InceptionVideoRestDockerfile | 93 ++++++++++++++
.../tika/parser/recognition/tf/inceptionapi.py | 141 +++++++++++++++++++++
.../tika/parser/recognition/tf/video_util.py | 113 +++++++++++++++++
.../tf/TensorflowVideoRecParserTest.java | 55 ++++++++
.../recognition/tika-config-tflow-video-rest.xml | 32 +++++
.../test/resources/test-documents/testVideoMp4.mp4 | Bin 0 -> 1053651 bytes
9 files changed, 520 insertions(+), 3 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@tika.apache.org" <co...@tika.apache.org>.