diff options
| author |  Dandelion Man? <dandelion@google.com> | 2017-12-15 18:15:07 -0800 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2017-12-15 18:19:09 -0800 |
| commit | 90e42f3ac8c43474633136af4242dca04b6a1e09 (patch) | |
| tree | 64dbb44252c89c847bee86db07cea5aa94072e7c /tensorflow/contrib/ffmpeg | |
| parent | 713d45278491d792c525344de6038a61ebcb2136 (diff) | |
Automated g4 rollback of changelist 179260538
PiperOrigin-RevId: 179263865
Diffstat (limited to 'tensorflow/contrib/ffmpeg')
| -rw-r--r-- | tensorflow/contrib/ffmpeg/__init__.py | 1 | ||||
| -rw-r--r-- | tensorflow/contrib/ffmpeg/default/ffmpeg_lib.cc | 6 | ||||
| -rw-r--r-- | tensorflow/contrib/ffmpeg/default/ffmpeg_lib_utility_test.cc | 2 | ||||
| -rw-r--r-- | tensorflow/contrib/ffmpeg/ffmpeg_ops.py | 1 |
4 files changed, 8 insertions, 2 deletions
diff --git a/tensorflow/contrib/ffmpeg/__init__.py b/tensorflow/contrib/ffmpeg/__init__.py index 484ffee3e7..daba965a98 100644 --- a/tensorflow/contrib/ffmpeg/__init__.py +++ b/tensorflow/contrib/ffmpeg/__init__.py @@ -28,6 +28,7 @@ from __future__ import print_function from tensorflow.contrib.ffmpeg.ffmpeg_ops import decode_audio from tensorflow.contrib.ffmpeg.ffmpeg_ops import decode_video from tensorflow.contrib.ffmpeg.ffmpeg_ops import encode_audio +from tensorflow.contrib.ffmpeg.ffmpeg_ops import decode_video from tensorflow.python.util.all_util import remove_undocumented diff --git a/tensorflow/contrib/ffmpeg/default/ffmpeg_lib.cc b/tensorflow/contrib/ffmpeg/default/ffmpeg_lib.cc index 1245f515fe..1e8af1458c 100644 --- a/tensorflow/contrib/ffmpeg/default/ffmpeg_lib.cc +++ b/tensorflow/contrib/ffmpeg/default/ffmpeg_lib.cc @@ -49,7 +49,8 @@ std::vector<string> FfmpegAudioCommandLine(const string& input_filename, "-nostdin", // No interactive commands accepted. "-f", input_format_id, // eg: "mp3" "-probesize", StrCat(kDefaultProbeSize), "-i", input_filename, - "-loglevel", "info", // Enable verbose logging to support debugging. + "-loglevel", "error", // Print errors only. + "-hide_banner", // Skip printing build options, version, etc. "-map_metadata", "-1", // Copy global metadata from input to output. "-vn", // No video recording. "-ac:a:0", StrCat(channel_count), "-ar:a:0", @@ -72,7 +73,8 @@ std::vector<string> FfmpegVideoCommandLine(const string& input_filename, "-probesize", StrCat(kDefaultProbeSize), "-loglevel", - "info", // Enable verbose logging to support debugging. + "error", // Print errors only. + "-hide_banner", // Skip printing build options, version, etc. "-vcodec", "rawvideo", "-pix_fmt", diff --git a/tensorflow/contrib/ffmpeg/default/ffmpeg_lib_utility_test.cc b/tensorflow/contrib/ffmpeg/default/ffmpeg_lib_utility_test.cc index d6c885a324..36fc71794b 100644 --- a/tensorflow/contrib/ffmpeg/default/ffmpeg_lib_utility_test.cc +++ b/tensorflow/contrib/ffmpeg/default/ffmpeg_lib_utility_test.cc @@ -20,6 +20,8 @@ #include <string> #include <vector> + +#include "tensorflow/core/lib/io/path.h" #include "tensorflow/core/lib/core/threadpool.h" #include "tensorflow/core/lib/io/path.h" #include "tensorflow/core/platform/env.h" diff --git a/tensorflow/contrib/ffmpeg/ffmpeg_ops.py b/tensorflow/contrib/ffmpeg/ffmpeg_ops.py index 5bb011f41c..08b5a6ea48 100644 --- a/tensorflow/contrib/ffmpeg/ffmpeg_ops.py +++ b/tensorflow/contrib/ffmpeg/ffmpeg_ops.py @@ -21,6 +21,7 @@ from __future__ import print_function from tensorflow.contrib.ffmpeg.ops import gen_decode_audio_op_py from tensorflow.contrib.ffmpeg.ops import gen_decode_video_op_py from tensorflow.contrib.ffmpeg.ops import gen_encode_audio_op_py +from tensorflow.contrib.ffmpeg.ops import gen_decode_video_op_py from tensorflow.contrib.util import loader from tensorflow.python.framework import ops from tensorflow.python.platform import resource_loader |